From c14e17e27137e4ba8c7fd1608c260fbcd8c0ed99 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Tue, 5 Feb 2013 14:36:35 +0100 Subject: [PATCH 01/24] Set to version 1.2.1pre --- VERSION.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index ee06024c13..e40b00e1ec 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,5 +1,5 @@ set( VERSION_MAJOR 1 ) set( VERSION_MINOR 2 ) -set( VERSION_PATCH 0 ) -set( VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) +set( VERSION_PATCH 1 ) +set( VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}pre) From 7734656ae34c4f3cd69fb7d61094567b1e71d789 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Tue, 5 Feb 2013 14:36:52 +0100 Subject: [PATCH 02/24] Make mirall packager for win bundle the new openSSL dlls. --- cmake/modules/NSIS.template.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index a06f4c2e20..367d3fce98 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -343,8 +343,8 @@ Section "${APPLICATION_NAME}" SEC_OWNCLOUD ;File "${MING_BIN}\libpng15-15.dll" ;File "${MING_BIN}\libjpeg-8.dll" File "${MING_BIN}\zlib1.dll" - File "${MING_BIN}\libcrypto-8.dll" - File "${MING_BIN}\libssl-8.dll" + File "${MING_BIN}\libcrypto-10.dll" + File "${MING_BIN}\libssl-10.dll" ; CSync configs File "${SOURCE_PATH}/sync-exclude.lst" From 0bcb65db29eb80071216222a23106ce30b30ac34 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 4 Feb 2013 12:10:20 +0100 Subject: [PATCH 03/24] Do not allow to press Finished if connection to the server fails This does not yet consider cases where the connection succeeds but webdav fails. --- src/mirall/owncloudsetupwizard.cpp | 1 + src/mirall/owncloudwizard.cpp | 15 ++++++++++++++- src/mirall/owncloudwizard.h | 5 +++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp index 06ea2b6a24..6b0edc4f15 100644 --- a/src/mirall/owncloudsetupwizard.cpp +++ b/src/mirall/owncloudsetupwizard.cpp @@ -461,6 +461,7 @@ void OwncloudSetupWizard::finalizeSetup( bool success ) .arg(Theme::instance()->appName()) + QLatin1String("

")); _ocWizard->appendToResultWidget( tr("Press Finish to permanently accept this connection.")); + _ocWizard->enableFinishOnResultWidget(true); } else { _ocWizard->appendToResultWidget(QLatin1String("

") + tr("Connection to %1 could not be established. Please check again.") diff --git a/src/mirall/owncloudwizard.cpp b/src/mirall/owncloudwizard.cpp index 3abc7ca34a..9bf49890a4 100644 --- a/src/mirall/owncloudwizard.cpp +++ b/src/mirall/owncloudwizard.cpp @@ -423,12 +423,19 @@ OwncloudWizardResultPage::~OwncloudWizardResultPage() void OwncloudWizardResultPage::initializePage() { + _complete = false; // _ui.lineEditOCAlias->setText( "Owncloud" ); } +void OwncloudWizardResultPage::setComplete(bool complete) +{ + _complete = complete; + emit completeChanged(); +} + bool OwncloudWizardResultPage::isComplete() const { - return true; + return _complete; } void OwncloudWizardResultPage::appendResultText( const QString& msg, OwncloudWizard::LogType type ) @@ -509,6 +516,12 @@ QString OwncloudWizard::ocUrl() const return url; } +void OwncloudWizard::enableFinishOnResultWidget(bool enable) +{ + OwncloudWizardResultPage *p = static_cast (page( Page_Install )); + p->setComplete(enable); +} + void OwncloudWizard::slotCurrentPageChanged( int id ) { qDebug() << "Current Wizard page changed to " << id; diff --git a/src/mirall/owncloudwizard.h b/src/mirall/owncloudwizard.h index acc34676b7..dcf3a15cb3 100644 --- a/src/mirall/owncloudwizard.h +++ b/src/mirall/owncloudwizard.h @@ -78,6 +78,8 @@ public: void setupCustomMedia( QVariant, QLabel* ); QString ocUrl() const; + void enableFinishOnResultWidget(bool enable); + public slots: void appendToResultWidget( const QString& msg, LogType type = LogParagraph ); void slotCurrentPageChanged( int ); @@ -198,6 +200,8 @@ public: virtual bool isComplete() const; virtual void initializePage(); + void setComplete(bool complete); + public slots: void appendResultText( const QString&, OwncloudWizard::LogType type = OwncloudWizard::LogParagraph ); void showOCUrlLabel( const QString&, bool ); @@ -206,6 +210,7 @@ protected: void setupCustomization(); private: + bool _complete; Ui_OwncloudWizardResultPage _ui; }; From b6d521388005acb46940b7fe0b37e3b2012ec658 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Tue, 5 Feb 2013 15:42:53 +0100 Subject: [PATCH 04/24] Add suffix, to be added with -DVERSION_SUFFIX=... --- VERSION.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/VERSION.cmake b/VERSION.cmake index e40b00e1ec..af8286368f 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,5 +1,6 @@ set( VERSION_MAJOR 1 ) set( VERSION_MINOR 2 ) set( VERSION_PATCH 1 ) -set( VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}pre) +set( VERSION +${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}pre${VERSION_SUFFIX}) From 3f97047abc0bd2d09d59913e77e0b3221bab9382 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 6 Feb 2013 00:07:36 +0100 Subject: [PATCH 05/24] [tx-robot] updated from transifex --- translations/mirall_ca.ts | 4 ++-- translations/mirall_cs_CZ.ts | 4 ++-- translations/mirall_de.ts | 4 ++-- translations/mirall_el.ts | 4 ++-- translations/mirall_en.ts | 4 ++-- translations/mirall_eo.ts | 4 ++-- translations/mirall_es.ts | 14 +++++++------- translations/mirall_es_AR.ts | 4 ++-- translations/mirall_eu.ts | 4 ++-- translations/mirall_fi_FI.ts | 4 ++-- translations/mirall_fr.ts | 4 ++-- translations/mirall_gl.ts | 4 ++-- translations/mirall_it.ts | 4 ++-- translations/mirall_ja_JP.ts | 4 ++-- translations/mirall_ko.ts | 4 ++-- translations/mirall_nl.ts | 4 ++-- translations/mirall_pl.ts | 4 ++-- translations/mirall_pt_BR.ts | 4 ++-- translations/mirall_pt_PT.ts | 4 ++-- translations/mirall_ru.ts | 4 ++-- translations/mirall_ru_RU.ts | 4 ++-- translations/mirall_sk_SK.ts | 4 ++-- translations/mirall_sl.ts | 4 ++-- translations/mirall_sv.ts | 4 ++-- translations/mirall_ta_LK.ts | 4 ++-- translations/mirall_th_TH.ts | 4 ++-- translations/mirall_uk.ts | 4 ++-- translations/mirall_vi.ts | 4 ++-- translations/mirall_zh_CN.ts | 4 ++-- translations/mirall_zh_TW.ts | 4 ++-- 30 files changed, 65 insertions(+), 65 deletions(-) diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts index 2fe838e43f..294b355c45 100644 --- a/translations/mirall_ca.ts +++ b/translations/mirall_ca.ts @@ -1230,7 +1230,7 @@ No s'ha pogut configurar S'ha connectat amb èxit amb %1! - + Connection to %1 could not be established. Please check again. No s'ha pogut establir la connexió amb %1. Comproveu-ho de nou. @@ -1324,7 +1324,7 @@ No s'ha pogut configurar - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Felicitats! El <a href="%1" title="%1">nou %2</a> està actiu i funcionant! diff --git a/translations/mirall_cs_CZ.ts b/translations/mirall_cs_CZ.ts index 8cfc69f420..80bba10f56 100644 --- a/translations/mirall_cs_CZ.ts +++ b/translations/mirall_cs_CZ.ts @@ -1240,7 +1240,7 @@ Nastavení nelze provést. Úspěšně spojeno s %1. - + Connection to %1 could not be established. Please check again. Spojení s %1 nelze navázat. Prosím zkuste to znovu. @@ -1334,7 +1334,7 @@ Nastavení nelze provést. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Gratulujeme. Váš <a href="%1" title="%1">nový %2</a> je nyní funkční. diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index 1b3da7f527..0cc0932472 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -1240,7 +1240,7 @@ Das Setup kann nicht ausgeführt werden. Erfolgreich zu %1 verbunden! - + Connection to %1 could not be established. Please check again. Die Verbindung zu %1 konnte nicht hergestellt werden. Bitte prüfen Sie die Einstellungen erneut. @@ -1334,7 +1334,7 @@ Das Setup kann nicht ausgeführt werden. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Herzlichen Glückwunsch! Ihre <a href="%1" title="%1">neue %2</a> ist nun bereit! diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index e1b27d4d23..cd26098bf7 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -1240,7 +1240,7 @@ Setup can not be done. Επιτυχημένη σύνδεση σε %1! - + Connection to %1 could not be established. Please check again. Αδυναμία σύνδεσης στον %1. Παρακαλώ ελέξτε ξανά. @@ -1334,7 +1334,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Συγχαρητήρια! Το <a href="%1" title="%1">νέο %2</a> έχει εγκατασταθεί και εκτελείται! diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts index 31366b7ba7..657758130c 100644 --- a/translations/mirall_en.ts +++ b/translations/mirall_en.ts @@ -1252,7 +1252,7 @@ Setup can not be done. - + Connection to %1 could not be established. Please check again. @@ -1346,7 +1346,7 @@ Setup can not be done. Congratulations! Your <a href="%1" title="%1">new ownCloud</a> is now up and running! - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! diff --git a/translations/mirall_eo.ts b/translations/mirall_eo.ts index 700496ef57..afde718cd5 100644 --- a/translations/mirall_eo.ts +++ b/translations/mirall_eo.ts @@ -1234,7 +1234,7 @@ Agordado ne povas fariĝi. Sukcesis konektado al %1! - + Connection to %1 could not be established. Please check again. Konekto al %1 ne povis stariĝi. Bonvolu rekontroli. @@ -1328,7 +1328,7 @@ Agordado ne povas fariĝi. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Gratulon! Via <a href="%1" title="%1">nova %2</a> nun leviĝis kaj funkcias! diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index 67729bdd87..294bac6a1e 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -371,7 +371,7 @@ p, li { white-space: pre-wrap; }⏎ %1 user credentials are wrong. Please check configuration. - + Las credenciales del usuario %1 son incorrectas. Verifique la configuracion. @@ -761,7 +761,7 @@ Please write a bug report. No password entry found in keychain. Please reconfigure. - + No se encontro la contraseña en la cadena de claves. Por favor reconfigure. @@ -797,7 +797,7 @@ Please write a bug report. File Count - + Conteo de archivos @@ -1241,7 +1241,7 @@ No se puede completar la instalación. ¡Conectado a %1! - + Connection to %1 could not be established. Please check again. No se pudo establecer la conexión a %1. Por favor inténtalo de nuevo. @@ -1320,12 +1320,12 @@ No se puede completar la instalación. <p>In order to connect to your %1 server, you need to provide the server address as well as your credentials.</p><p>This wizard will guide you through the process.<p><p>If you have not received this information, please contact your %1 provider.</p> - + <p>Para conectarse al servidor %1 , es necesario proporcionar la dirección del servidor, así como sus credenciales. </p><p> Este asistente le guiará a través del proceso. <p> <p> Si usted no ha recibido esta información, póngase en contacto con el proveedor de %1 . </p> <p>In order to connect to your %1 server, you need to provide your credentials.</p><p>This wizard will guide you through the setup process.</p> - + <p> Para conectarse al servidor %1 , tiene que proporcionar sus credenciales. </p> <p>Este asistente lo guiará a través del proceso de configuración. </p> @@ -1335,7 +1335,7 @@ No se puede completar la instalación. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! ¡Felicitaciones! Su <a href="%1" title="%1">nuevo %2</a> ya está funcionando. diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts index 82450d693c..abdfaf58de 100644 --- a/translations/mirall_es_AR.ts +++ b/translations/mirall_es_AR.ts @@ -1229,7 +1229,7 @@ Setup can not be done. ¡Conectado con éxito a %1! - + Connection to %1 could not be established. Please check again. No fue posible establecer la conexión a %1. Por favor, intentalo nuevamente. @@ -1323,7 +1323,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! ¡Perfecto! Tu <a href="%1" title="%1">nuevo %2</a> ya está funcionando. diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts index 0fa3c3e4a9..b98602131c 100644 --- a/translations/mirall_eu.ts +++ b/translations/mirall_eu.ts @@ -1240,7 +1240,7 @@ Ezin da konfigurazioa egin. %1-era ongi konektatu da! - + Connection to %1 could not be established. Please check again. %1 konexioa ezin da ezarri. Mesedez egiaztatu berriz. @@ -1334,7 +1334,7 @@ Ezin da konfigurazioa egin. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Zorionak! zure <a href="%1" title="%1">%2 berria</a> martxan da! diff --git a/translations/mirall_fi_FI.ts b/translations/mirall_fi_FI.ts index 1eec1ece9a..f88e073a42 100644 --- a/translations/mirall_fi_FI.ts +++ b/translations/mirall_fi_FI.ts @@ -1239,7 +1239,7 @@ Setup can not be done. Yhteys muodostettu onnistuneesti kohteeseen %1! - + Connection to %1 could not be established. Please check again. @@ -1333,7 +1333,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Onnittelut! Uusi <a href="%1" title="%1">%2</a> on nyt käytettävissä! diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index 9bc72813e3..2e808f72fa 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -1241,7 +1241,7 @@ L'installation ne peut pas continuer. Connexion réussie à %1! - + Connection to %1 could not be established. Please check again. La connexion à %1 n'a pu être établie. Essayez encore svp. @@ -1335,7 +1335,7 @@ L'installation ne peut pas continuer. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Félicitation ! Votre <a href="%1" title="%1">nouvel %2</a> est maintenant en ligne ! diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index 60e2591a04..980f9b15c4 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -1240,7 +1240,7 @@ Non se pode realizar a instalación. Conectouse correctamente con %1! - + Connection to %1 could not be established. Please check again. Non se puido estabelecer a conexión con %1. Compróbao de novo. @@ -1334,7 +1334,7 @@ Non se pode realizar a instalación. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Parabéns! O teu <a href="%1" title="%1"> novo %2</a> está listo e executándose! diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index c2da49960c..91d7399f77 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -1240,7 +1240,7 @@ La configurazione non può essere completata. Connesso correttamente a %1. - + Connection to %1 could not be established. Please check again. La connessione a %1 non può essere stabilita. Prova ancora. @@ -1334,7 +1334,7 @@ La configurazione non può essere completata. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Congratulazioni! Il tuo <a href="%1" title="%1">nuovo %2</a> è attivo e in esecuzione! diff --git a/translations/mirall_ja_JP.ts b/translations/mirall_ja_JP.ts index 039e20b8d4..9b55dda1e1 100644 --- a/translations/mirall_ja_JP.ts +++ b/translations/mirall_ja_JP.ts @@ -1240,7 +1240,7 @@ Setup can not be done. 正常に %1 に接続されました！ - + Connection to %1 could not be established. Please check again. %1 への接続を確立できませんでした。もう一度確認して下さい。 @@ -1334,7 +1334,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! おめでとうございます！あなたの <a href="%1" title="%1">新しい %2</a> の設定は完了し、実行中です！ diff --git a/translations/mirall_ko.ts b/translations/mirall_ko.ts index fcf2c22c55..c0035fd746 100644 --- a/translations/mirall_ko.ts +++ b/translations/mirall_ko.ts @@ -1242,7 +1242,7 @@ Setup can not be done. %1에 연결하였습니다! - + Connection to %1 could not be established. Please check again. %1에 연결할 수 없습니다. 다시 시도하십시오. @@ -1336,7 +1336,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! 축하합니다! 이제부터 <a href="%1" title="%1">새로운 %2</a>을(를) 사용할 수 있습니다! diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index edc02f66c1..865f76a832 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -1240,7 +1240,7 @@ De setup kan niet worden uitgevoerd. Verbinding naar %1 was succesvol! - + Connection to %1 could not be established. Please check again. Verbinding met %1 niet geslaagd. Probeer het nog eens. @@ -1334,7 +1334,7 @@ De setup kan niet worden uitgevoerd. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Gefeliciteerd! Uw <a href="%1" title="%1">nieuwe %2</a> draait! diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index 5aee8857c8..dfd7367f22 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -1240,7 +1240,7 @@ Instalacja nie może być wykonywana. Udane połączenie z %1! - + Connection to %1 could not be established. Please check again. Połączenie z %1 nie może być nawiązane. Prosze sprawdź ponownie. @@ -1334,7 +1334,7 @@ Instalacja nie może być wykonywana. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Gratulacje! Twoje <a href="%1" title="%1">nowe %2</a> w pełni działa! diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index 1241fb454d..d3b7fd43f8 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -1240,7 +1240,7 @@ A configuração não pôde ser concluida. Conectado com sucesso à %1! - + Connection to %1 could not be established. Please check again. Conexão à %1 não foi estabelecida. Por favor verifique novamente. @@ -1334,7 +1334,7 @@ A configuração não pôde ser concluida. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Parabéns! Seu <a href="%1" title="%1">novo %2</a> está configurado e funcionando! diff --git a/translations/mirall_pt_PT.ts b/translations/mirall_pt_PT.ts index cbfd253187..2ad08c9988 100644 --- a/translations/mirall_pt_PT.ts +++ b/translations/mirall_pt_PT.ts @@ -1241,7 +1241,7 @@ Não é possível correr o programa de instalação ou configuração.Ligação com sucesso a %1 ! - + Connection to %1 could not be established. Please check again. Não foi possível ligar a %1 . Por Favor verifique novamente. @@ -1335,7 +1335,7 @@ Não é possível correr o programa de instalação ou configuração. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Parabéns! O seu <a href="%1" title="%1"> novo %2 </a> está ligado e a correr! diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 2d568752d6..61e070371d 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -1240,7 +1240,7 @@ Setup can not be done. Успешно подключено к %1! - + Connection to %1 could not be established. Please check again. Подключение к %1 не воможно. Пожалуйста, проверьте еще раз. @@ -1334,7 +1334,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Поздравляем! Ваш <a href="%1" title="%1">новый %2</a> запущен и работает! diff --git a/translations/mirall_ru_RU.ts b/translations/mirall_ru_RU.ts index 1dac1777db..d406144ab5 100644 --- a/translations/mirall_ru_RU.ts +++ b/translations/mirall_ru_RU.ts @@ -1230,7 +1230,7 @@ Setup can not be done. Успешно подключено к %1! - + Connection to %1 could not be established. Please check again. Подключение к %1 не может быть установлено. Пожалуйста, проверьте еще ​​раз. @@ -1324,7 +1324,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Поздравления! Ваш <a href="%1" title="%1">новый %2</a> сейчас установлен и запущен! diff --git a/translations/mirall_sk_SK.ts b/translations/mirall_sk_SK.ts index 434364df58..3850228b46 100644 --- a/translations/mirall_sk_SK.ts +++ b/translations/mirall_sk_SK.ts @@ -1241,7 +1241,7 @@ Inštalácia nemôže pokračovať. Úspešne pripojené k %1! - + Connection to %1 could not be established. Please check again. Pripojenie k %1 nemohlo byť iniciované. Prosím skontrolujte znova. @@ -1335,7 +1335,7 @@ Inštalácia nemôže pokračovať. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Blahoprajeme! Váš <a href="%1" title="%1">nový %2</a> je konečne v prevádzke! diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index 2323bb316b..f5b4e51371 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -1240,7 +1240,7 @@ Namestitev ne se ne more izvesti. Uspešno povezan na %1! - + Connection to %1 could not be established. Please check again. Povezavo z %1 ni bilo mogoče vzpostaviti. Prosimo, če poskusite znova. @@ -1334,7 +1334,7 @@ Namestitev ne se ne more izvesti. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Čestitamo! Vaš <a href="%1" title="%1">nov %2</a> sedaj deluje! diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index 137189be16..068e1fb4bf 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -1240,7 +1240,7 @@ Inställning kan inte utföras. Lyckades ansluta till %1! - + Connection to %1 could not be established. Please check again. Anslutningen till %1 kunde inte etableras. Var god kontrollera och försök igen. @@ -1334,7 +1334,7 @@ Inställning kan inte utföras. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Gratulerar! Din <a href="%1" title="%1">nya %2</a> är nu startad! diff --git a/translations/mirall_ta_LK.ts b/translations/mirall_ta_LK.ts index 86497f3fe1..10c143c9e7 100644 --- a/translations/mirall_ta_LK.ts +++ b/translations/mirall_ta_LK.ts @@ -1230,7 +1230,7 @@ Setup can not be done. %1 இற்கு வெற்றிகரமாக இணைக்கப்பட்டது! - + Connection to %1 could not be established. Please check again. %1 இற்கு இணைப்பை ஏற்படுத்தமுடியவில்லை. தயவுசெய்து மீண்டும் சரிபார்க்க. @@ -1324,7 +1324,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! வாழ்த்துக்கள்! உங்களுடைய <a href="%1" title="%1"> புதிய %2 </a> இப்போது ஓடுகிறது! diff --git a/translations/mirall_th_TH.ts b/translations/mirall_th_TH.ts index 76b8ab7b6c..eace3d65ad 100644 --- a/translations/mirall_th_TH.ts +++ b/translations/mirall_th_TH.ts @@ -1240,7 +1240,7 @@ Setup can not be done. เชื่อมต่อกับ %1 เสร็จเรียบร้อยแล้ว! - + Connection to %1 could not be established. Please check again. การเชื่อมต่อกับ %1 ไม่สามารถดำเนินการได้ กรุณาตรวจสอบอีกครั้ง @@ -1334,7 +1334,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! ขอแสดงความยินดี! <a href="%1" title="%1">new %2</a> ของคุณได้รับการปรับปรุงแล้ว! diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index 9679171a78..e42ed1e1c1 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -1240,7 +1240,7 @@ Setup can not be done. Успішно підключено до %1! - + Connection to %1 could not be established. Please check again. Підключення до %1 встановити не вдалося. Будь ласка, перевірте ще раз. @@ -1334,7 +1334,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Вітаємо! Ваш <a href="%1" title="%1">новий %2</a> встановлено і запущено! diff --git a/translations/mirall_vi.ts b/translations/mirall_vi.ts index b923aee549..a19fe90180 100644 --- a/translations/mirall_vi.ts +++ b/translations/mirall_vi.ts @@ -1239,7 +1239,7 @@ Setup can not be done. Đã kết nối thành công đến %1! - + Connection to %1 could not be established. Please check again. Kết nối đến %1 không thể thiết lập. Vui lòng kiểm tra lại. @@ -1333,7 +1333,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Xin chúc mừng! <a href="%1" title="%1">%2</a> mới của bạn đã hoàn tất và đang chạy! diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index c79df72772..de697c8dc9 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -1241,7 +1241,7 @@ Setup can not be done. 成功连接到 %1！ - + Connection to %1 could not be established. Please check again. 无法建立到 %1的链接，请稍后重试 @@ -1335,7 +1335,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! 恭喜！您的 <a href="%1" title="%1">新 %2</a> 已经启动并运行！ diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts index fc1feeff66..f807973224 100644 --- a/translations/mirall_zh_TW.ts +++ b/translations/mirall_zh_TW.ts @@ -1240,7 +1240,7 @@ Setup can not be done. 成功的連線到%1 - + Connection to %1 could not be established. Please check again. 無法建立連線%1, 請重新檢查 @@ -1334,7 +1334,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! 恭喜!您的 <a href="%1" title="%1">new %2</a>啟用並執行中! From cece465947614e18bfa58449abe9d86ae4974b1d Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Tue, 5 Feb 2013 20:55:34 +0200 Subject: [PATCH 06/24] Link libdl explicitely. --- src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c8a4ca46f5..615a3ce669 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -115,6 +115,7 @@ qt4_wrap_cpp(syncMoc ${libsync_HEADERS}) list(APPEND libsync_LINK_TARGETS ${QT_LIBRARIES} ${CSYNC_LIBRARY} + dl ) if(QTKEYCHAIN_FOUND) From fa6331a40ad18089f591aa7699ea76c3bab017e5 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 6 Feb 2013 10:05:30 +0200 Subject: [PATCH 07/24] Removed use of CredentialStore from class and added setter for credentials. This makes handling of temporar credentials for the setup dialog easier and streamlines the code. --- src/mirall/owncloudinfo.cpp | 68 ++++++++++++++++++++++++++++++++----- src/mirall/owncloudinfo.h | 14 ++++++++ 2 files changed, 74 insertions(+), 8 deletions(-) diff --git a/src/mirall/owncloudinfo.cpp b/src/mirall/owncloudinfo.cpp index f470c8506c..dddabe6e49 100644 --- a/src/mirall/owncloudinfo.cpp +++ b/src/mirall/owncloudinfo.cpp @@ -16,7 +16,6 @@ #include "mirall/mirallconfigfile.h" #include "mirall/version.h" #include "mirall/theme.h" -#include "mirall/credentialstore.h" #include #include @@ -26,6 +25,8 @@ #include #endif +#define DEFAULT_CONNECTION QLatin1String("default"); + namespace Mirall { @@ -131,8 +132,14 @@ void ownCloudInfo::mkdirRequest( const QString& dir ) conMode = QHttp::ConnectionModeHttps; QHttp* qhttp = new QHttp(QString(url.encodedHost()), conMode, 0, this); - qhttp->setUser( CredentialStore::instance()->user(_connection), - CredentialStore::instance()->password(_connection) ); + + QString con = _configHandle; + if( con.isEmpty() ) con = DEFAULT_CONNECTION; + if( _credentials.contains(con)) { + oCICredentials creds = _credentials.value(con); + + qhttp->setUser( creds.user, creds.passwd ); + } connect(qhttp, SIGNAL(requestStarted(int)), this,SLOT(qhttpRequestStarted(int))); connect(qhttp, SIGNAL(requestFinished(int, bool)), this,SLOT(qhttpRequestFinished(int,bool))); @@ -147,7 +154,16 @@ void ownCloudInfo::mkdirRequest( const QString& dir ) header.setValue("Connection", "keep-alive"); header.setContentType("application/x-www-form-urlencoded"); //important header.setContentLength(0); - header.setValue("Authorization", CredentialStore::instance()->basicAuthHeader()); + + QString con = _configHandle; + if( con.isEmpty() ) con = DEFAULT_CONNECTION; + if( _credentials.contains(con)) { + oCICredentials creds = _credentials.value(con); + QString concatenated = creds.user + QLatin1Char(':') + creds.passwd; + const QString b(QLatin1String("Basic ")); + QByteArray data = b.toLocal8Bit() + concatenated.toLocal8Bit().toBase64(); + header.setValue("Authorization", data); + } int david = qhttp->request(header,0,0); //////////////// connect(davinfo, SIGNAL(dataSendProgress(int,int)), this, SLOT(SendStatus(int, int))); @@ -242,8 +258,18 @@ void ownCloudInfo::slotAuthentication( QNetworkReply *reply, QAuthenticator *aut MirallConfigFile cfgFile( configHandle ); qDebug() << "Authenticating request for " << reply->url(); if( reply->url().toString().startsWith( cfgFile.ownCloudUrl( _connection, true )) ) { - auth->setUser( CredentialStore::instance()->user() ); //_connection ) ); - auth->setPassword( CredentialStore::instance()->password() ); // _connection )); + + QString con = configHandle; + if( con.isEmpty() ) con = DEFAULT_CONNECTION; + if( _credentials.contains(con)) { + oCICredentials creds = _credentials.value(con); + + auth->setUser( creds.user ); + auth->setPassword( creds.passwd ); + } else { + qDebug() << "Unable to get Credentials, not set!"; + reply->close(); + } } else { qDebug() << "WRN: attempt to authenticate to different url - attempt " <<_authAttempts; } @@ -251,7 +277,6 @@ void ownCloudInfo::slotAuthentication( QNetworkReply *reply, QAuthenticator *aut qDebug() << "Too many attempts to authenticate. Stop request."; reply->close(); } - } QString ownCloudInfo::configHandle(QNetworkReply *reply) @@ -431,6 +456,24 @@ void ownCloudInfo::slotError( QNetworkReply::NetworkError err) qDebug() << "ownCloudInfo Network Error: " << err; } +void ownCloudInfo::setCredentials( const QString& user, const QString& passwd, + const QString& configHandle ) +{ + QString con( configHandle ); + if( configHandle.isEmpty() ) + con = DEFAULT_CONNECTION; + + if( _credentials.contains(con) ) { + qDebug() << "Overwriting credentials for connection " << con; + } + + oCICredentials creds; + creds.user = user; + creds.passwd = passwd; + creds.connection = con; + _credentials[con] = creds; +} + // ============================================================================ void ownCloudInfo::setupHeaders( QNetworkRequest & req, quint64 size ) { @@ -441,7 +484,16 @@ void ownCloudInfo::setupHeaders( QNetworkRequest & req, quint64 size ) req.setRawHeader( QByteArray("Host"), url.host().toUtf8() ); req.setRawHeader( QByteArray("User-Agent"), QString::fromLatin1("mirall-%1") .arg(QLatin1String(MIRALL_STRINGIFY(MIRALL_VERSION))).toAscii()); - req.setRawHeader( QByteArray("Authorization"), CredentialStore::instance()->basicAuthHeader() ); + + QString con = _configHandle; + if( con.isEmpty() ) con = DEFAULT_CONNECTION; + if( _credentials.contains(con)) { + oCICredentials creds = _credentials.value(con); + QString concatenated = creds.user + QLatin1Char(':') + creds.passwd; + const QString b(QLatin1String("Basic ")); + QByteArray data = b.toLocal8Bit() + concatenated.toLocal8Bit().toBase64(); + req.setRawHeader( QByteArray("Authorization"), data ); + } if (size) { req.setHeader( QNetworkRequest::ContentLengthHeader, size); diff --git a/src/mirall/owncloudinfo.h b/src/mirall/owncloudinfo.h index 28ba1fb5f4..ccc7db383c 100644 --- a/src/mirall/owncloudinfo.h +++ b/src/mirall/owncloudinfo.h @@ -27,6 +27,12 @@ namespace Mirall { +typedef struct { + QString user; + QString passwd; + QString connection; +} oCICredentials; + class ownCloudInfo : public QObject { Q_OBJECT @@ -89,6 +95,13 @@ public: */ QList certificateChain() const; + /** + * Store credentials for a given connection. Empty connection parameter + * means "default connection". + */ + void setCredentials( const QString&, const QString&, + const QString& configHandle = QString::null ); + signals: // result signal with url- and version string. void ownCloudInfoFound( const QString&, const QString&, const QString&, const QString& ); @@ -138,6 +151,7 @@ private: QList _certificateChain; bool _certsUntrusted; int _authAttempts; + QMap _credentials; }; }; From 2ae5ae69621fee230777bb99bba0c9bb4eefa2ad Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 6 Feb 2013 10:07:10 +0200 Subject: [PATCH 08/24] Change interface to not support customHandles. --- src/mirall/credentialstore.cpp | 13 ++----------- src/mirall/credentialstore.h | 11 +++-------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/mirall/credentialstore.cpp b/src/mirall/credentialstore.cpp index 21645fa605..694bd32f93 100644 --- a/src/mirall/credentialstore.cpp +++ b/src/mirall/credentialstore.cpp @@ -47,11 +47,11 @@ CredentialStore *CredentialStore::instance() return CredentialStore::_instance; } -QString CredentialStore::password( const QString& ) const +QString CredentialStore::password() const { return _passwd; } -QString CredentialStore::user( const QString& ) const +QString CredentialStore::user() const { return _user; } @@ -281,15 +281,6 @@ QString CredentialStore::errorMessage() return _errorMsg; } -QByteArray CredentialStore::basicAuthHeader() const -{ - QString concatenated = _user + QLatin1Char(':') + _passwd; - const QString b(QLatin1String("Basic ")); - QByteArray data = b.toLocal8Bit() + concatenated.toLocal8Bit().toBase64(); - - return data; -} - void CredentialStore::setCredentials( const QString& url, const QString& user, const QString& pwd ) { _passwd = pwd; diff --git a/src/mirall/credentialstore.h b/src/mirall/credentialstore.h index c0a66422f9..d361d2f40d 100644 --- a/src/mirall/credentialstore.h +++ b/src/mirall/credentialstore.h @@ -74,8 +74,8 @@ public: KeyChain }; - QString password( const QString& connection = QString::null ) const; - QString user( const QString& connection = QString::null ) const; + QString password( ) const; + QString user( ) const; /** * @brief state @@ -91,12 +91,6 @@ public: */ void fetchCredentials(); - /** - * @brief basicAuthHeader - return a basic authentication header. - * @return a QByteArray with a ready to use Header for HTTP basic auth. - */ - QByteArray basicAuthHeader() const; - /** * @brief instance - singleton pointer. * @return the singleton pointer to access the object. @@ -109,6 +103,7 @@ public: * This function is called from the setup wizard to set the credentials * int this store. Note that it does not store the password. * The function also sets the state to ok. + * @param url - the connection url * @param user - the user name * @param password - the password. */ From 08babbf38df9dbba7d068453ea61fdc9d145c0eb Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 6 Feb 2013 10:07:58 +0200 Subject: [PATCH 09/24] Set credentials in ownCloudInfo after these have been fetched. --- src/mirall/application.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp index 1377493d9e..b778312659 100644 --- a/src/mirall/application.cpp +++ b/src/mirall/application.cpp @@ -324,6 +324,8 @@ void Application::slotCredentialsFetched(bool ok) _actionAddFolder->setEnabled( false ); _actionOpenStatus->setEnabled( false ); } else { + ownCloudInfo::instance()->setCredentials( CredentialStore::instance()->user(), + CredentialStore::instance()->password() ); // Credential fetched ok. QTimer::singleShot( 0, this, SLOT( slotCheckAuthentication() )); } From 72b2e6778af5556f4b6722de50068f8c4de8da96 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 6 Feb 2013 10:08:36 +0200 Subject: [PATCH 10/24] Use new ownCloudInfo / CredentialStore interface. --- src/mirall/mirallconfigfile.cpp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/mirall/mirallconfigfile.cpp b/src/mirall/mirallconfigfile.cpp index e6acc02681..6a14e7292b 100644 --- a/src/mirall/mirallconfigfile.cpp +++ b/src/mirall/mirallconfigfile.cpp @@ -15,6 +15,7 @@ #include "config.h" #include "mirall/mirallconfigfile.h" +#include "mirall/owncloudinfo.h" #include "mirall/owncloudtheme.h" #include "mirall/miralltheme.h" #include "mirall/credentialstore.h" @@ -125,7 +126,6 @@ void MirallConfigFile::writeOwncloudConfig( const QString& connection, { const QString file = configFile(); qDebug() << "*** writing mirall config to " << file << " Skippwd: " << skipPwd; - QString pwd( passwd ); QSettings settings( file, QSettings::IniFormat); settings.setIniCodec( "UTF-8" ); @@ -141,9 +141,7 @@ void MirallConfigFile::writeOwncloudConfig( const QString& connection, settings.beginGroup( connection ); settings.setValue( QLatin1String("url"), cloudsUrl ); settings.setValue( QLatin1String("user"), user ); - if( skipPwd ) { - pwd.clear(); - } + #ifdef WITH_QTKEYCHAIN // Password is stored to QtKeyChain now by default in CredentialStore @@ -154,13 +152,18 @@ void MirallConfigFile::writeOwncloudConfig( const QString& connection, if( !skipPwd ) writePassword( passwd ); #endif + if( !skipPwd ) + writePassword( passwd ); + else + clearPasswordFromConfig(); // wipe the password. + settings.setValue( QLatin1String("nostoredpassword"), QVariant(skipPwd) ); settings.sync(); // check the perms, only read-write for the owner. QFile::setPermissions( file, QFile::ReadOwner|QFile::WriteOwner ); // Store credentials temporar until the config is finalized. - CredentialStore::instance()->setCredentials( cloudsUrl, user, passwd ); + ownCloudInfo::instance()->setCredentials( user, passwd, _customHandle ); } @@ -438,7 +441,15 @@ void MirallConfigFile::acceptCustomConfig() QFile::remove( targetBak ); // inform the credential store about the password change. - CredentialStore::instance()->saveCredentials( ); + QString url = ownCloudUrl(); + QString user = ownCloudUser(); + QString pwd = ownCloudPasswd(); + if( pwd.isEmpty() ) { + qDebug() << "Password is empty, skipping to write cred store."; + } else { + CredentialStore::instance()->setCredentials(url, user, pwd); + CredentialStore::instance()->saveCredentials(); + } } void MirallConfigFile::setProxyType(int proxyType, From 22cbebb7a720ffe6337564bb0e6a5aa94cce3426 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 6 Feb 2013 10:41:25 +0200 Subject: [PATCH 11/24] Fix build on debian with ancient Qt, thanks Mr. Jenkins for notifying. --- src/mirall/owncloudinfo.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/mirall/owncloudinfo.cpp b/src/mirall/owncloudinfo.cpp index dddabe6e49..7d1d9a8160 100644 --- a/src/mirall/owncloudinfo.cpp +++ b/src/mirall/owncloudinfo.cpp @@ -133,14 +133,6 @@ void ownCloudInfo::mkdirRequest( const QString& dir ) QHttp* qhttp = new QHttp(QString(url.encodedHost()), conMode, 0, this); - QString con = _configHandle; - if( con.isEmpty() ) con = DEFAULT_CONNECTION; - if( _credentials.contains(con)) { - oCICredentials creds = _credentials.value(con); - - qhttp->setUser( creds.user, creds.passwd ); - } - connect(qhttp, SIGNAL(requestStarted(int)), this,SLOT(qhttpRequestStarted(int))); connect(qhttp, SIGNAL(requestFinished(int, bool)), this,SLOT(qhttpRequestFinished(int,bool))); connect(qhttp, SIGNAL(responseHeaderReceived(QHttpResponseHeader)), this, SLOT(qhttpResponseHeaderReceived(QHttpResponseHeader))); @@ -163,6 +155,8 @@ void ownCloudInfo::mkdirRequest( const QString& dir ) const QString b(QLatin1String("Basic ")); QByteArray data = b.toLocal8Bit() + concatenated.toLocal8Bit().toBase64(); header.setValue("Authorization", data); + + qhttp->setUser( creds.user, creds.passwd ); } int david = qhttp->request(header,0,0); From 977a513ee5a037296e9f02d2ca097a4d1ad0f01a Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 6 Feb 2013 11:21:50 +0200 Subject: [PATCH 12/24] Always set the connect result to en/disable the Finish button. --- src/mirall/owncloudsetupwizard.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp index 6b0edc4f15..334396f211 100644 --- a/src/mirall/owncloudsetupwizard.cpp +++ b/src/mirall/owncloudsetupwizard.cpp @@ -450,6 +450,9 @@ void OwncloudSetupWizard::slotCreateRemoteFolderFinished( QNetworkReply::Network void OwncloudSetupWizard::finalizeSetup( bool success ) { + // enable/disable the finish button. + _ocWizard->enableFinishOnResultWidget(success); + if( success ) { if( !(_localFolder.isEmpty() || _remoteFolder.isEmpty() )) { _ocWizard->appendToResultWidget( tr("A sync connection from %1 to remote directory %2 was set up.") @@ -461,7 +464,6 @@ void OwncloudSetupWizard::finalizeSetup( bool success ) .arg(Theme::instance()->appName()) + QLatin1String("

")); _ocWizard->appendToResultWidget( tr("Press Finish to permanently accept this connection.")); - _ocWizard->enableFinishOnResultWidget(true); } else { _ocWizard->appendToResultWidget(QLatin1String("

") + tr("Connection to %1 could not be established. Please check again.") From 7a3be7145212550533536ca5f72ebee1a2d4ab84 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 6 Feb 2013 11:41:47 +0200 Subject: [PATCH 13/24] The user name is not really to be protected. --- src/mirall/mirallconfigfile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mirall/mirallconfigfile.h b/src/mirall/mirallconfigfile.h index 1f466d8473..f697f058ca 100644 --- a/src/mirall/mirallconfigfile.h +++ b/src/mirall/mirallconfigfile.h @@ -55,6 +55,7 @@ public: void removeConnection( const QString& connection = QString() ); + QString ownCloudUser( const QString& connection = QString() ) const; QString ownCloudUrl( const QString& connection = QString(), bool webdav = false ) const; void setOwnCloudUrl(const QString &connection, const QString& ); @@ -97,7 +98,6 @@ public: protected: // these classes can only be access from CredentialStore as a friend class. QString ownCloudPasswd( const QString& connection = QString() ) const; - QString ownCloudUser( const QString& connection = QString() ) const; void clearPasswordFromConfig( const QString& connect = QString() ); bool writePassword( const QString& passwd, const QString& connection = QString() ); From 82d2851a6b2ba69a3b1d26c73ac07edc5bb470bf Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 6 Feb 2013 11:42:36 +0200 Subject: [PATCH 14/24] Set username in connection dialog if there. --- src/mirall/owncloudsetupwizard.cpp | 4 ++++ src/mirall/owncloudwizard.cpp | 20 ++++++++++++++++++++ src/mirall/owncloudwizard.h | 3 +++ 3 files changed, 27 insertions(+) diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp index 334396f211..dacac61a39 100644 --- a/src/mirall/owncloudsetupwizard.cpp +++ b/src/mirall/owncloudsetupwizard.cpp @@ -336,6 +336,10 @@ void OwncloudSetupWizard::startWizard(bool intro) if( !url.isEmpty() ) { _ocWizard->setOCUrl( url ); } + QString user = cfgFile.ownCloudUser(); + if( !user.isEmpty() ) { + _ocWizard->setOCUser( user ); + } #ifdef OWNCLOUD_CLIENT if (intro) _ocWizard->setStartId(OwncloudWizard::Page_oCWelcome); diff --git a/src/mirall/owncloudwizard.cpp b/src/mirall/owncloudwizard.cpp index 9bf49890a4..a6882bfb1c 100644 --- a/src/mirall/owncloudwizard.cpp +++ b/src/mirall/owncloudwizard.cpp @@ -110,6 +110,13 @@ OwncloudSetupPage::~OwncloudSetupPage() { } +void OwncloudSetupPage::setOCUser( const QString & user ) +{ + if( _ui.leUsername->text().isEmpty() ) { + _ui.leUsername->setText(user); + } +} + void OwncloudSetupPage::setOCUrl( const QString& newUrl ) { QString url( newUrl ); @@ -585,4 +592,17 @@ void OwncloudWizard::setOCUrl( const QString& url ) } +void OwncloudWizard::setOCUser( const QString& user ) +{ + _oCUser = user; +#ifdef OWNCLOUD_CLIENT + OwncloudSetupPage *p = static_cast(page(Page_oCSetup)); +#else + OwncloudWizardSelectTypePage *p = static_cast(page( Page_SelectType )); +#endif + if( p ) + p->setOCUser( user ); + +} + } // end namespace diff --git a/src/mirall/owncloudwizard.h b/src/mirall/owncloudwizard.h index dcf3a15cb3..90c97b7cca 100644 --- a/src/mirall/owncloudwizard.h +++ b/src/mirall/owncloudwizard.h @@ -41,6 +41,7 @@ public: virtual void initializePage(); virtual int nextId() const; void setOCUrl( const QString& ); + void setOCUser( const QString& ); protected slots: void slotPwdStoreChanged( int ); @@ -74,6 +75,7 @@ public: OwncloudWizard(QWidget *parent = 0L); void setOCUrl( const QString& ); + void setOCUser( const QString& ); void setupCustomMedia( QVariant, QLabel* ); QString ocUrl() const; @@ -94,6 +96,7 @@ signals: private: QString _configFile; QString _oCUrl; + QString _oCUser; }; From 2ac764bd1afd93bdd015f4ef7878d0ca1d5ee205 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 6 Feb 2013 11:58:14 +0200 Subject: [PATCH 15/24] Fix compile without OWNCLOUD_CLIENT define, thx Jenkins --- src/mirall/owncloudsetupwizard.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp index dacac61a39..7dffa8f233 100644 --- a/src/mirall/owncloudsetupwizard.cpp +++ b/src/mirall/owncloudsetupwizard.cpp @@ -336,11 +336,11 @@ void OwncloudSetupWizard::startWizard(bool intro) if( !url.isEmpty() ) { _ocWizard->setOCUrl( url ); } +#ifdef OWNCLOUD_CLIENT QString user = cfgFile.ownCloudUser(); if( !user.isEmpty() ) { _ocWizard->setOCUser( user ); } -#ifdef OWNCLOUD_CLIENT if (intro) _ocWizard->setStartId(OwncloudWizard::Page_oCWelcome); else From 7b53e0f953c38d71a4cdd7ea820ad7555365db93 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 28 Dec 2012 13:41:26 +0100 Subject: [PATCH 16/24] Fix return from non void function. --- src/mirall/mirallconfigfile.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mirall/mirallconfigfile.cpp b/src/mirall/mirallconfigfile.cpp index 6a14e7292b..1e223744dc 100644 --- a/src/mirall/mirallconfigfile.cpp +++ b/src/mirall/mirallconfigfile.cpp @@ -200,6 +200,8 @@ bool MirallConfigFile::writePassword( const QString& passwd, const QString& conn QByteArray pwdba = pwd.toUtf8(); settings.setValue( QLatin1String("passwd"), QVariant(pwdba.toBase64()) ); settings.sync(); + + return true; } // set the url, called from redirect handling. From 07258deaaf99e8327c76ba16902bdb7865054eb8 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 6 Feb 2013 15:05:34 +0100 Subject: [PATCH 17/24] Fix build for mirall target. --- src/mirall/owncloudwizard.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mirall/owncloudwizard.cpp b/src/mirall/owncloudwizard.cpp index a6882bfb1c..44d218c0e9 100644 --- a/src/mirall/owncloudwizard.cpp +++ b/src/mirall/owncloudwizard.cpp @@ -597,11 +597,11 @@ void OwncloudWizard::setOCUser( const QString& user ) _oCUser = user; #ifdef OWNCLOUD_CLIENT OwncloudSetupPage *p = static_cast(page(Page_oCSetup)); + if( p ) + p->setOCUser( user ); #else OwncloudWizardSelectTypePage *p = static_cast(page( Page_SelectType )); #endif - if( p ) - p->setOCUser( user ); } From dc16f277cecfffeee807d38bfa8683f2062f546d Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 7 Feb 2013 00:12:34 +0100 Subject: [PATCH 18/24] [tx-robot] updated from transifex --- translations/mirall_ca.ts | 100 +++++++++++++++++------------------ translations/mirall_cs_CZ.ts | 100 +++++++++++++++++------------------ translations/mirall_de.ts | 100 +++++++++++++++++------------------ translations/mirall_el.ts | 100 +++++++++++++++++------------------ translations/mirall_en.ts | 100 +++++++++++++++++------------------ translations/mirall_eo.ts | 100 +++++++++++++++++------------------ translations/mirall_es.ts | 100 +++++++++++++++++------------------ translations/mirall_es_AR.ts | 100 +++++++++++++++++------------------ translations/mirall_eu.ts | 100 +++++++++++++++++------------------ translations/mirall_fi_FI.ts | 100 +++++++++++++++++------------------ translations/mirall_fr.ts | 100 +++++++++++++++++------------------ translations/mirall_gl.ts | 100 +++++++++++++++++------------------ translations/mirall_it.ts | 100 +++++++++++++++++------------------ translations/mirall_ja_JP.ts | 100 +++++++++++++++++------------------ translations/mirall_ko.ts | 100 +++++++++++++++++------------------ translations/mirall_nl.ts | 100 +++++++++++++++++------------------ translations/mirall_pl.ts | 100 +++++++++++++++++------------------ translations/mirall_pt_BR.ts | 100 +++++++++++++++++------------------ translations/mirall_pt_PT.ts | 100 +++++++++++++++++------------------ translations/mirall_ru.ts | 100 +++++++++++++++++------------------ translations/mirall_ru_RU.ts | 100 +++++++++++++++++------------------ translations/mirall_sk_SK.ts | 100 +++++++++++++++++------------------ translations/mirall_sl.ts | 100 +++++++++++++++++------------------ translations/mirall_sv.ts | 100 +++++++++++++++++------------------ translations/mirall_ta_LK.ts | 100 +++++++++++++++++------------------ translations/mirall_th_TH.ts | 100 +++++++++++++++++------------------ translations/mirall_uk.ts | 100 +++++++++++++++++------------------ translations/mirall_vi.ts | 100 +++++++++++++++++------------------ translations/mirall_zh_CN.ts | 100 +++++++++++++++++------------------ translations/mirall_zh_TW.ts | 100 +++++++++++++++++------------------ 30 files changed, 1500 insertions(+), 1500 deletions(-) diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts index 294b355c45..efd9ee482d 100644 --- a/translations/mirall_ca.ts +++ b/translations/mirall_ca.ts @@ -295,7 +295,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). la sincronització ha començat per les carpetes %1 configurades. @@ -304,27 +304,27 @@ p, li { white-space: pre-wrap; } - + Open status... Obre l'estat... - + Add folder... Afegeix una carpeta... - + Configure... Configura... - + Configure proxy... Configura proxy... - + Quit Surt @@ -379,63 +379,63 @@ p, li { white-space: pre-wrap; } El diàleg de contrasenya s'ha cancel·lat! - - + + No %1 Connection No %1 Connexió - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Les credencials %1 no són correctes.</p><p>Corregiu-les inicant el diàleg de configuració des de la safata!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>El nom d'usuari o la contrasenya ownCloud no són correctes.</p><p>Corregiu-les iniciant el diàleg de configuració des de la safata!</p> - + %1 Sync Started %1 Sincronització iniciada - + Open %1 in browser... Obre %1 en el navegador... - + About... Sobre... - + Open %1 folder Obre la carpeta %1 - + Managed Folders: Fitxers gestionats: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>Construït des de la revisió <a href="%1">%2</a> a %3, %4<br>de Git, usant OCsync %5 i Qt %6.</small><p> - + About %1 Sobre %1 - + Confirm Folder Remove Confirma l'eliminació de la carpeta - + Do you really want to remove upload folder <i>%1</i>? Esteu segurs d'eliminar la carpeta de pujada <i>%1</i>? @@ -448,32 +448,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. S'està sincronitzant. - + Server is currently not available. El servidor no està disponible actualment. - + Last Sync was successful. La darrera sincronització va ser correcta. - + Syncing Error. Error de sincronització. - + Setup Error. Error de configuració. - + Undefined Error State. Estat d'error no definit. @@ -501,27 +501,27 @@ p, li { white-space: pre-wrap; } - + Sync Running S'està sincronitzant - + The syncing operation is running.<br/>Do you want to terminate it? S'està sincronitzant.<br/>Voleu parar-la? - + Undefined State. Estat indefinit. - + Waits to start syncing. Espera per començar la sincronització. - + (Sync is paused) (La sincronització està pausada) @@ -530,7 +530,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. No hi ha fitxers de sincronització configurats @@ -740,7 +740,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org elmeudomini.org @@ -1101,7 +1101,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.elmeudomini.org @@ -1193,49 +1193,49 @@ Please write a bug report. <font color="green">La instal·lació de %1 ha tingut èxit!</font> - + The owncloud admin script can not be found. Setup can not be done. No s'ha trobat l'script de owncloud-admin. No s'ha pogut configurar - + Creation of remote folder %1 could not be started. No s'ha pogut crear la carpeta remota %1. - + Remote folder %1 created successfully. La carpeta remota %1 s'ha creat correctament. - + The remote folder %1 already exists. Connecting it for syncing. La carpeta remota %1 ja existeix. S'hi està connectant per sincronitzar-les. - + The folder creation resulted in HTTP error code %1 La creació de la carpeta ha resultat en el codi d'error HTTP %1 - + A sync connection from %1 to remote directory %2 was set up. S'ha establert una connexió de sincronització des de %1 a la carpeta remota %2. - + Succesfully connected to %1! S'ha connectat amb èxit amb %1! - + Connection to %1 could not be established. Please check again. No s'ha pogut establir la connexió amb %1. Comproveu-ho de nou. - + Press Finish to permanently accept this connection. Premeu Acaba per acceptar permanentment aquesta connexió @@ -1248,12 +1248,12 @@ No s'ha pogut configurar - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> La carpeta local %1 ja existeix, s'està configurant per sincronitzar.<br/><br/> - + Creating local sync folder %1... Creant carpeta local de sincronització %1... @@ -1262,12 +1262,12 @@ No s'ha pogut configurar - + ok correcte - + failed. ha fallat. @@ -1289,12 +1289,12 @@ No s'ha pogut configurar - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">La creació de la carpeta remota ha fallat, provablement perquè les credencials facilitades són incorrectes.</font><br/>Comproveu les vostres credencials.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. La creació de la carpeta remota %1 ha fallat amb l'error <tt>%2</tt>. @@ -1324,7 +1324,7 @@ No s'ha pogut configurar - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Felicitats! El <a href="%1" title="%1">nou %2</a> està actiu i funcionant! @@ -1332,7 +1332,7 @@ No s'ha pogut configurar Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.elmeudomini.org diff --git a/translations/mirall_cs_CZ.ts b/translations/mirall_cs_CZ.ts index 80bba10f56..f5c21a646a 100644 --- a/translations/mirall_cs_CZ.ts +++ b/translations/mirall_cs_CZ.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Synchronizace spuštěna pro %1 nastavené synchronizované složky. @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Otevřít stav... - + Add folder... Přidat složku... - + Configure... Nastavit... - + Configure proxy... Nastavit proxy... - + Quit Ukončit @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } Dialog zadání hesla byl zrušen. - - + + No %1 Connection Žádné spojení s %1 - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Vaše přihlašovací údaje k %1 nejsou správné.</p><p>Prosím opravte je spuštěním dialogu nastavení ze systémové části panelu.</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Vaše uživatelské jméno, nebo heslo, nejsou správné.</p><p>Prosím opravte je spuštěním dialogu nastavení ze systémové části panelu.</p> - + %1 Sync Started Synchronizace s %1 zahájena - + Open %1 in browser... Otevřít %1 v prohlížeči... - + About... O aplikaci... - + Open %1 folder Otevřít složku %1 - + Managed Folders: Spravované složky: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>Sestaveno z Git revize <a href="%1">%2</a> na %3, %4<br>používá OCsync %5 a Qt %6.</small><p> - + About %1 O %1 - + Confirm Folder Remove Potvrdit odstranění složky - + Do you really want to remove upload folder <i>%1</i>? Opravdu si přejete odstranit odesílací složku <i>%1</i>? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Synchronizace probíhá. - + Server is currently not available. Server nyní není dostupný. - + Last Sync was successful. Poslední synchronizace byla úspěšná. - + Syncing Error. Chyba synchronizace. - + Setup Error. Chyba nastavení. - + Undefined Error State. Nedefinovatelná chyba. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Synchronizace probíhá - + The syncing operation is running.<br/>Do you want to terminate it? Probíhá operace synchronizace.<br/>Přejete si ji přerušit? - + Undefined State. Nedefinovatelný stav. - + Waits to start syncing. Vyčkává na spuštění synchronizace. - + (Sync is paused) (Synchronizace je pozastavena) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Nejsou nastaveny žádné synchronizované složky. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mojedomena.org @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mojedomena.org @@ -1203,49 +1203,49 @@ Please write a bug report. <font color="green">Instalace %1 proběhla úspěšně.</font> - + The owncloud admin script can not be found. Setup can not be done. Skript správce ownCloud nelze nalézt. Nastavení nelze provést. - + Creation of remote folder %1 could not be started. Vytváření vzdálené složky %1 nemohlo být zahájeno. - + Remote folder %1 created successfully. Vzdálená složka %1 byla úspěšně vytvořena. - + The remote folder %1 already exists. Connecting it for syncing. Vzdálená složka %1 již existuje. Spojuji ji pro synchronizaci. - + The folder creation resulted in HTTP error code %1 Vytvoření složky selhalo chybou HTTP %1 - + A sync connection from %1 to remote directory %2 was set up. Bylo nastaveno synchronizované spojení z %1 ke vzdálenému adresáři %2. - + Succesfully connected to %1! Úspěšně spojeno s %1. - + Connection to %1 could not be established. Please check again. Spojení s %1 nelze navázat. Prosím zkuste to znovu. - + Press Finish to permanently accept this connection. Stiskněte Dokončit pro trvalé přijmutí tohoto spojení. @@ -1258,12 +1258,12 @@ Nastavení nelze provést. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Místní synchronizovaná složka %1 existuje, nastavuji ji pro synchronizaci.<br/><br/> - + Creating local sync folder %1... Vytvářím místní synchronizovanou složku %1... @@ -1272,12 +1272,12 @@ Nastavení nelze provést. - + ok OK - + failed. selhalo. @@ -1299,12 +1299,12 @@ Nastavení nelze provést. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Vytvoření vzdálené složky selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.</font><br/>Vraťte se, prosím, zpět a zkontrolujte je.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Vytváření vzdálené složky %1 selhalo s chybou <tt>%2</tt>. @@ -1334,7 +1334,7 @@ Nastavení nelze provést. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Gratulujeme. Váš <a href="%1" title="%1">nový %2</a> je nyní funkční. @@ -1342,7 +1342,7 @@ Nastavení nelze provést. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mojedomena.org diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index 0cc0932472..f7e4f06289 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Synchronisation wurde für %1 konfigurierte Sync-Ordner gestartet @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Status anzeigen... - + Add folder... Ordner hinzufügen... - + Configure... Konfiguriere... - + Configure proxy... Proxy-Einstellungen - + Quit Beenden @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } Die Passwortabfrage wurde abgebrochen! - - + + No %1 Connection Keine %1-Verbindung - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Ihre %1 Eingaben sind nicht korrekt.</p><p>Bitte berichtigen Sie diese, indem Sie den Konfigurations-Bildschirm über den Tray öffnen!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Entweder Ihr Benutzername oder Ihr Passwort ist nicht korrekt.</p><p>Bitte berichtigen Sie dies, indem Sie den Konfigurations-Bildschirm öffnen!</p> - + %1 Sync Started %1 Sync gestartet - + Open %1 in browser... %1 im Browser öffnen... - + About... Über... - + Open %1 folder Ordner %1 öffnen - + Managed Folders: Verwaltete Ordner: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>Erstellt aus Git revision <a href="%1">%2</a> vom %3, %4<br>mit OCsync %5 und Qt %6.</small><p> - + About %1 Über %1 - + Confirm Folder Remove Löschen des Ordners bestätigen - + Do you really want to remove upload folder <i>%1</i>? Soll der Upload-Ordner <i>%1</i> wirklich gelöscht werden? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Synchronisation läuft. - + Server is currently not available. Der Server ist momentan nicht erreichbar. - + Last Sync was successful. Die letzte Synchronisation war erfolgreich. - + Syncing Error. Fehler bei der Synchronisation. - + Setup Error. Setup-Fehler. - + Undefined Error State. Undefinierter Fehler-Zustand. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Synchronisation läuft - + The syncing operation is running.<br/>Do you want to terminate it? Die Synchronistation läuft gerade.<br/>Wollen Sie diese beenden? - + Undefined State. Undefinierter Zustand. - + Waits to start syncing. Wartet auf Beginn der Synchronistation - + (Sync is paused) (Synchronisation pausiert) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Keine Sync-Ordner konfiguriert. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mydomain.org @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mydomain.org @@ -1203,49 +1203,49 @@ Please write a bug report. <font color="green">Die Installation von %1 war erfolgreich!</font> - + The owncloud admin script can not be found. Setup can not be done. Das owncloud-admin-Skript kann nicht gefunden werden. Das Setup kann nicht ausgeführt werden. - + Creation of remote folder %1 could not be started. Die Erstellung des Remoteordners %1 konnte nicht gestartet werden. - + Remote folder %1 created successfully. Remoteordner %1 erfolgreich erstellt. - + The remote folder %1 already exists. Connecting it for syncing. Der Ordner %1 ist auf dem Server bereits vorhanden. Verbinde zur Synchronisation. - + The folder creation resulted in HTTP error code %1 Das Erstellen des Verzeichnisses erzeugte den HTTP-Fehler-Code %1 - + A sync connection from %1 to remote directory %2 was set up. Eine Synchronisationsverbindung für Ordner %1 zum entfernten Ordner %2 wurde eingerichtet. - + Succesfully connected to %1! Erfolgreich zu %1 verbunden! - + Connection to %1 could not be established. Please check again. Die Verbindung zu %1 konnte nicht hergestellt werden. Bitte prüfen Sie die Einstellungen erneut. - + Press Finish to permanently accept this connection. Drücken Sie auf Abschließen, um diese Verbindung zu speichern. @@ -1258,12 +1258,12 @@ Das Setup kann nicht ausgeführt werden. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Lokaler Sync-Ordner %1 existiert bereits, aktiviere Synchronistation.<br/><br/> - + Creating local sync folder %1... Erstelle lokalen Sync-Ordner %1... @@ -1272,12 +1272,12 @@ Das Setup kann nicht ausgeführt werden. - + ok ok - + failed. fehlgeschlagen. @@ -1299,12 +1299,12 @@ Das Setup kann nicht ausgeführt werden. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Die Remote-Ordner-Erstellung ist fehlgeschlagen, vermutlich sind die angegebenen Zugangsdaten falsch.</font><br/>Bitte gehen Sie zurück und überprüfen Sie Ihre Zugangsdaten.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Remote-Ordner %1 konnte mit folgendem Fehler nicht erstellt werden: <tt>%2</tt>. @@ -1334,7 +1334,7 @@ Das Setup kann nicht ausgeführt werden. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Herzlichen Glückwunsch! Ihre <a href="%1" title="%1">neue %2</a> ist nun bereit! @@ -1342,7 +1342,7 @@ Das Setup kann nicht ausgeführt werden. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index cd26098bf7..a242fa6887 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Ο συγχρονισμός ξεκίνησε για το 1% του ρυθμισμένου(ων) φακέλου(ων). @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Προβολή κατάστασης... - + Add folder... Προσθήκη φακέλου... - + Configure... Ρύθμιση... - + Configure proxy... Ρύθμιση διαμεσολαβητή... - + Quit Έξοδος @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } Το παράθυρο συνθηματικού ακυρώθηκε! - - + + No %1 Connection - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Δεν είναι ορθά τα διαπιστευτήριά σας για το %1.</p><p>Παρακαλώ διορθώστε τα εκκινώντας το παράθυρο ρύθμισης από την μπάρα!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>To όνομα χρήστη ή o κωδικός πρόσβασης σας δεν είναι σωστός.</p> Παρακαλούμε διορθώστε το με την έναρξη του διαλόγου διαμόρφωσης από τον χώρο ειδοποιήσεων!</p> - + %1 Sync Started - + Open %1 in browser... Άνοιγμα %1 στον περιηγητή... - + About... Περί... - + Open %1 folder Άνοιγμα %1 φακέλου - + Managed Folders: Διαχείριση αρχείων: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> - + About %1 Σχετικά %1 - + Confirm Folder Remove Επιβεβαίωση αφαίρεσης φακέλου - + Do you really want to remove upload folder <i>%1</i>? Θέλετε πραγματικά να αφαιρέσετε τον φάκελο μεταφόρτωσης <i>%1</ i>; @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Ο συγχρονισμός εκτελείται. - + Server is currently not available. Ο διακομιστής δεν είναι διαθέσιμος προς το παρόν. - + Last Sync was successful. Ο τελευταίος συγχρονισμός ήταν επιτυχής. - + Syncing Error. Σφάλμα Συγχρονισμού. - + Setup Error. Σφάλμα Ρύθμισης. - + Undefined Error State. Απροσδιόριστη κατάσταση σφάλματος. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Ο Συγχρονισμός Εκτελείται - + The syncing operation is running.<br/>Do you want to terminate it? Η λειτουργία συγχρονισμού λειτουργεί.<br/> Θέλετε να την τερματίσετε; - + Undefined State. Απροσδιόριστη κατάσταση. - + Waits to start syncing. Αναμονή έναρξης συγχρονισμού. - + (Sync is paused) (Παύση συγχρονισμού) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Δεν έχουν οριστεί φάκελοι συγχρονισμού. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mydomain.org @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mydomain.org @@ -1203,49 +1203,49 @@ Please write a bug report. <font color="green">Η εγκατάσταση του %1 ήταν επιτυχής!</font> - + The owncloud admin script can not be found. Setup can not be done. Δεν μπορεί να βρεθεί το script διαχειριστή του owncloud. Δεν μπορεί να γίνει η ρύθμιση. - + Creation of remote folder %1 could not be started. Δεν ήταν δυνατή η εκκίνηση της δημιουργίας του απομακρυσμένου φακέλου %1 - + Remote folder %1 created successfully. Ο απομακρυσμένος φάκελος %1 δημιουργήθηκε με επιτυχία. - + The remote folder %1 already exists. Connecting it for syncing. Ο απομακρυσμένος φάκελος %1 υπάρχει, ήδη. Πραγματοποιείτε σύνδεση για ενημέρωση. - + The folder creation resulted in HTTP error code %1 - + A sync connection from %1 to remote directory %2 was set up. - + Succesfully connected to %1! Επιτυχημένη σύνδεση σε %1! - + Connection to %1 could not be established. Please check again. Αδυναμία σύνδεσης στον %1. Παρακαλώ ελέξτε ξανά. - + Press Finish to permanently accept this connection. Επιλέξτε Τερματισμό για να αποδεχτείτε μόνιμα αυτή τη σύνδεση. @@ -1258,12 +1258,12 @@ Setup can not be done. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Υπάρχει ήδη ο τοπικός κατάλογος %1 για συγχρονισμό, ρυθμίστε τον για συγχρονισμό.<br/><br/> - + Creating local sync folder %1... Δημιουργία τοπικού καταλόγου %1 για συγχρονισμό... @@ -1272,12 +1272,12 @@ Setup can not be done. - + ok οκ - + failed. απέτυχε. @@ -1299,12 +1299,12 @@ Setup can not be done. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Η απομακρυσμένη δημιουργία φακέλου απέτυχε, επειδή πιθανώς τα διαπιστευτήρια που δόθηκαν είναι λάθος.</font><br/>Παρακαλώ επιστρέψτε πίσω και ελέγξτε τα διαπιστευτήρια σας.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Η απομακρυσμένη δημιουργία φακέλου %1 απέτυχε με σφάλμα <tt>%2</tt>. @@ -1334,7 +1334,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Συγχαρητήρια! Το <a href="%1" title="%1">νέο %2</a> έχει εγκατασταθεί και εκτελείται! @@ -1342,7 +1342,7 @@ Setup can not be done. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts index 657758130c..8a64053f12 100644 --- a/translations/mirall_en.ts +++ b/translations/mirall_en.ts @@ -307,7 +307,7 @@ p, li { white-space: pre-wrap; } ownCloud Sync Started - + Sync started for %1 configured sync folder(s). Sync started for %1 configured sync folder(s). @@ -316,27 +316,27 @@ p, li { white-space: pre-wrap; } Open ownCloud... - + Open status... Open status... - + Add folder... Add folder... - + Configure... Configure... - + Configure proxy... - + Quit Quit @@ -391,63 +391,63 @@ p, li { white-space: pre-wrap; } - - + + No %1 Connection - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> - + %1 Sync Started - + Open %1 in browser... - + About... - + Open %1 folder - + Managed Folders: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> - + About %1 - + Confirm Folder Remove Confirm Folder Remove - + Do you really want to remove upload folder <i>%1</i>? Do you really want to remove upload folder <i>%1</i>? @@ -460,32 +460,32 @@ p, li { white-space: pre-wrap; } The folder waits to start syncing. - + Sync is running. Sync is running. - + Server is currently not available. - + Last Sync was successful. Last Sync was successful. - + Syncing Error. Syncing Error. - + Setup Error. Setup Error. - + Undefined Error State. Undefined Error State. @@ -516,27 +516,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Sync Running - + The syncing operation is running.<br/>Do you want to terminate it? The syncing operation is running.<br/>Do you want to terminate it? - + Undefined State. Undefined State. - + Waits to start syncing. Waits to start syncing. - + (Sync is paused) @@ -545,7 +545,7 @@ p, li { white-space: pre-wrap; } Sync is paused. - + No sync folders configured. No sync folders configured. @@ -759,7 +759,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mydomain.org @@ -1123,7 +1123,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mydomain.org @@ -1215,49 +1215,49 @@ Please write a bug report. - + The owncloud admin script can not be found. Setup can not be done. The owncloud admin script can not be found. Setup can not be done. - + Creation of remote folder %1 could not be started. - + Remote folder %1 created successfully. - + The remote folder %1 already exists. Connecting it for syncing. - + The folder creation resulted in HTTP error code %1 - + A sync connection from %1 to remote directory %2 was set up. - + Succesfully connected to %1! - + Connection to %1 could not be established. Please check again. - + Press Finish to permanently accept this connection. @@ -1270,12 +1270,12 @@ Setup can not be done. Checking local sync folder %1 - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Local sync folder %1 already exists, setting it up for sync.<br/><br/> - + Creating local sync folder %1... Creating local sync folder %1... @@ -1284,12 +1284,12 @@ Setup can not be done. Creating local sync folder %1 - + ok ok - + failed. failed. @@ -1311,12 +1311,12 @@ Setup can not be done. The remote folder %1 already exists. Automatic sync setup is skipped for security reasons. Please configure your sync folder manually. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Remote folder %1 creation failed with error <tt>%2</tt>. @@ -1346,7 +1346,7 @@ Setup can not be done. Congratulations! Your <a href="%1" title="%1">new ownCloud</a> is now up and running! - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! @@ -1354,7 +1354,7 @@ Setup can not be done. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org diff --git a/translations/mirall_eo.ts b/translations/mirall_eo.ts index afde718cd5..95146a1400 100644 --- a/translations/mirall_eo.ts +++ b/translations/mirall_eo.ts @@ -299,7 +299,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Sinkronigo komencis por %1 agordita(j) sinkroniga(j) dosierujo(j). @@ -308,27 +308,27 @@ p, li { white-space: pre-wrap; } - + Open status... Malfermi staton... - + Add folder... Aldoni dosierujon... - + Configure... Agordi... - + Configure proxy... Agordi prokuran servilon... - + Quit Forlasi @@ -383,63 +383,63 @@ p, li { white-space: pre-wrap; } Pasvorta dialogo nuliĝis! - - + + No %1 Connection Neniu konekto %1 - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Aŭ via uzantonomo aŭ via pasvorto ne ĝustas.</p><p>Bonvolu ĝustigi ĝin per lanĉo de la agorda dialogujo el la pleto!</p> - + %1 Sync Started Sinkronigo %1 komencis - + Open %1 in browser... Malfermi %1 en foliumilo... - + About... Pri... - + Open %1 folder Malfermi la dosierujon %1 - + Managed Folders: Mastrumataj dosierujoj: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> - + About %1 Pri %1 - + Confirm Folder Remove Konfirmi forigon de dosierujo - + Do you really want to remove upload folder <i>%1</i>? Ĉu vi vere volas forigi la alŝutan dosierujon <i>%1</i>? @@ -452,32 +452,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Sinkronigo okazas. - + Server is currently not available. - + Last Sync was successful. La lasta sinkronigo sukcesis. - + Syncing Error. Sinkroniga eraro. - + Setup Error. Agorda eraro. - + Undefined Error State. Sendifina erarostato. @@ -505,27 +505,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Sinkronigo okazanta - + The syncing operation is running.<br/>Do you want to terminate it? La sinkroniga operacio funkcias.<br/>Ĉu vi volas fini ĝin? - + Undefined State. Sendifina stato. - + Waits to start syncing. Atendanta komencon de sinkronigo. - + (Sync is paused) (Sinkronigo paŭzas) @@ -534,7 +534,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Neniu sinkroniga dosierujo agordita. @@ -744,7 +744,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org miaretregiono.org @@ -1105,7 +1105,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.miaretejo.org @@ -1197,49 +1197,49 @@ Please write a bug report. <font color"green">Instalo de %1 sukcesis!</font> - + The owncloud admin script can not be found. Setup can not be done. La administra skripto de ownCloud ne troviĝis. Agordado ne povas fariĝi. - + Creation of remote folder %1 could not be started. Kreo de malloka dosierujo %1 ne povis komenciĝi. - + Remote folder %1 created successfully. La malloka dosierujo %1 estas sukcese kreita. - + The remote folder %1 already exists. Connecting it for syncing. La malloka dosierujo %1 jam ekzistas. Konektante al ĝi por sinkronigo. - + The folder creation resulted in HTTP error code %1 La kreo de la dosierujo rezultigis HTTP-eraron, kodo %1 - + A sync connection from %1 to remote directory %2 was set up. Sinkroniga konekto el %1 al malloka dosierujo al %2 stariĝis. - + Succesfully connected to %1! Sukcesis konektado al %1! - + Connection to %1 could not be established. Please check again. Konekto al %1 ne povis stariĝi. Bonvolu rekontroli. - + Press Finish to permanently accept this connection. Premu Fini por daŭre akcepti ĉi tiun konekton. @@ -1252,12 +1252,12 @@ Agordado ne povas fariĝi. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Loka sinkroniga dosierujo %1 jam ekzistas, do ĝi estas agordata por sinkronigo.<br/><br/> - + Creating local sync folder %1... Kreanta lokan sinkronigan dosierujon %1 @@ -1266,12 +1266,12 @@ Agordado ne povas fariĝi. - + ok akcepti - + failed. malsukcesis. @@ -1293,12 +1293,12 @@ Agordado ne povas fariĝi. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Kreo de malloka dosierujo malsukcesis, probable ĉar la donitaj aŭtentigiloj malĝustas.</font><br/>Bonvolu antaŭeniri kaj kontroli vian aŭtentigilojn.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Kreo de la malloka dosierujo %1 malsukcesis pro la eraro <tt>%2</tt>. @@ -1328,7 +1328,7 @@ Agordado ne povas fariĝi. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Gratulon! Via <a href="%1" title="%1">nova %2</a> nun leviĝis kaj funkcias! @@ -1336,7 +1336,7 @@ Agordado ne povas fariĝi. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.miaretregiono.org diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index 294bac6a1e..7a5ed5bdb7 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -306,7 +306,7 @@ p, li { white-space: pre-wrap; }⏎ - + Sync started for %1 configured sync folder(s). Comenzando sincronización para %1 carpeta(s) de sincronización. @@ -315,27 +315,27 @@ p, li { white-space: pre-wrap; }⏎ - + Open status... Abrir estado... - + Add folder... Añadir carpeta... - + Configure... Configurar... - + Configure proxy... Configuración del proxy - + Quit Salir @@ -390,63 +390,63 @@ p, li { white-space: pre-wrap; }⏎ El dialogo de contraseña ha sido cancelado - - + + No %1 Connection Sin conexión a %1 - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Sus credenciales de %1 son incorrectas.</p><p>¡Por favor corríjalas iniciando el diálogo de configuración desde la bandeja del sistema!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Su nombre de usuario o contraseña no son correctos.</p><p>¡Por favor corríjalos iniciando el diálogo de configuración desde la bandeja del sistema!</p> - + %1 Sync Started Sincronización de %1 iniciada - + Open %1 in browser... Abrir %1 en el navegador... - + About... Acerca de... - + Open %1 folder Abrir carpeta %1 - + Managed Folders: Carpetas administradas: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>Compilador de una revisión en Git <a href="%1">%2</a> el %3, %4<br>usando OCsync %5 y Qt %6.</small><p> - + About %1 Acerca de %1 - + Confirm Folder Remove Confirmar la eliminación de la carpeta - + Do you really want to remove upload folder <i>%1</i>? ¿Está seguro que quiere borrar la carpeta de subida de archivos <i>%1</i>? @@ -459,32 +459,32 @@ p, li { white-space: pre-wrap; }⏎ - + Sync is running. Sincronización en funcionamiento. - + Server is currently not available. El servidor no se encuentra disponible actualmente. - + Last Sync was successful. La última sincronización fue exitosa. - + Syncing Error. Error de sincronización. - + Setup Error. Error de configuración. - + Undefined Error State. Fallo sin definir. @@ -512,27 +512,27 @@ p, li { white-space: pre-wrap; }⏎ - + Sync Running Sincronización en curso - + The syncing operation is running.<br/>Do you want to terminate it? La sincronización está en curso.<br/>¿Desea interrumpirla? - + Undefined State. Estado no definido. - + Waits to start syncing. Esperando el inicio de la sincronización. - + (Sync is paused) (Sincronización en pausa) @@ -541,7 +541,7 @@ p, li { white-space: pre-wrap; }⏎ - + No sync folders configured. Las carpetas de sincronización no están configuradas. @@ -751,7 +751,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mi-dominio.org @@ -1112,7 +1112,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mi-dominio.org @@ -1204,49 +1204,49 @@ Please write a bug report. <font color="green">¡Instalación de %1 satisfactoria!</font> - + The owncloud admin script can not be found. Setup can not be done. No se encuentra el script owncloud-admin. No se puede completar la instalación. - + Creation of remote folder %1 could not be started. La creación de la carpeta remota %1 no pudo ser iniciada. - + Remote folder %1 created successfully. Carpeta remota %1 creada exitosamente. - + The remote folder %1 already exists. Connecting it for syncing. La carpeta remota %1 ya existe. Conectándola para sincronizar. - + The folder creation resulted in HTTP error code %1 La creación de la carpeta resultó en el error de código de HTTP %1 - + A sync connection from %1 to remote directory %2 was set up. Una conexión de sincronización desde %1 al directorio remoto %2 se ha configurado. - + Succesfully connected to %1! ¡Conectado a %1! - + Connection to %1 could not be established. Please check again. No se pudo establecer la conexión a %1. Por favor inténtalo de nuevo. - + Press Finish to permanently accept this connection. Pulse Finalizar para aceptar permanentemente esta conexión. @@ -1259,12 +1259,12 @@ No se puede completar la instalación. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> La carpeta de sincronización local %1 ya existe, configurándola para la sincronización.<br/><br/> - + Creating local sync folder %1... Creando la carpeta local %1... @@ -1273,12 +1273,12 @@ No se puede completar la instalación. - + ok ok - + failed. falló. @@ -1300,12 +1300,12 @@ No se puede completar la instalación. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Falló la creación de la carpeta remota probablemente porque las credenciales provistas son incorrectas.</font><br/>Por favor, vuelve atrás y chequea tus credenciales.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Error <tt>%2</tt> al crear la carpeta %1. @@ -1335,7 +1335,7 @@ No se puede completar la instalación. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! ¡Felicitaciones! Su <a href="%1" title="%1">nuevo %2</a> ya está funcionando. @@ -1343,7 +1343,7 @@ No se puede completar la instalación. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mi-dominio.org diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts index abdfaf58de..261bf25b67 100644 --- a/translations/mirall_es_AR.ts +++ b/translations/mirall_es_AR.ts @@ -295,7 +295,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Comenzando la sincronización para %1 directorio(s) de sincronización. @@ -304,27 +304,27 @@ p, li { white-space: pre-wrap; } - + Open status... Abrir estado... - + Add folder... Agregar directorio... - + Configure... Configurar... - + Configure proxy... Configurar el proxy... - + Quit Salir @@ -379,63 +379,63 @@ p, li { white-space: pre-wrap; } El diálogo de la contraseña fue cancelado! - - + + No %1 Connection Sin conexión a %1 - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Tus credenciales de %1 son incorrectas.</p><p>¡Por favor, correjilas mediante el diálogo de configuración desde la bandeja del sistema!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Tu nombre de usuario o contraseña no son correctos.</p><p>¡Por favor, correjilos iniciando el diálogo de configuración desde la bandeja del sistema!</p> - + %1 Sync Started Sincronización de %1 iniciada - + Open %1 in browser... Abrir %1 en el navegador... - + About... Acerca de... - + Open %1 folder Abrir directorio %1 - + Managed Folders: Directorios administrados: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>Construido de la versión Git <a href="%1">%2</a> en %3, %4<br>usando OCsync %5 y Qt %6.</small><p> - + About %1 Sobre %1 - + Confirm Folder Remove Confirmá la eliminación del directorio - + Do you really want to remove upload folder <i>%1</i>? ¿Estás seguro que querés borrar el directorio de subida <i>%1</i>? @@ -448,32 +448,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Sincronización en funcionamiento. - + Server is currently not available. El servidor no está disponible actualmente. - + Last Sync was successful. La última sincronización fue exitosa. - + Syncing Error. Error de sincronización. - + Setup Error. Error de configuración. - + Undefined Error State. Error no definido. @@ -501,27 +501,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Sincronización en curso - + The syncing operation is running.<br/>Do you want to terminate it? La sincronización está en curso.<br/>¿Querés interrumpirla? - + Undefined State. Estado no definido. - + Waits to start syncing. Esperando el comienzo de la sincronización. - + (Sync is paused) (La sincronización está pausada) @@ -530,7 +530,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Los directorios de sincronización no están configurados. @@ -740,7 +740,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mi-dominio.org.ar @@ -1101,7 +1101,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mi-dominio.org.ar @@ -1193,48 +1193,48 @@ Please write a bug report. font color="green">¡La instalación de %1 terminó correctamente!</font> - + The owncloud admin script can not be found. Setup can not be done. No se encuentra el script owncloud-admin. No es posible completar la instalación. - + Creation of remote folder %1 could not be started. No fue posible crear el directorio remoto %1. - + Remote folder %1 created successfully. El directorio remoto %1 fue creado con éxito. - + The remote folder %1 already exists. Connecting it for syncing. El directorio remoto %1 ya existe. Estableciendo conexión para sincronizar. - + The folder creation resulted in HTTP error code %1 La creación del directorio resultó en un error HTTP con código de error %1 - + A sync connection from %1 to remote directory %2 was set up. Fue creada una conexión de sincronización desde %1 al directorio remoto %2. - + Succesfully connected to %1! ¡Conectado con éxito a %1! - + Connection to %1 could not be established. Please check again. No fue posible establecer la conexión a %1. Por favor, intentalo nuevamente. - + Press Finish to permanently accept this connection. Elegí Finalizar para aceptar permanentemente esta conexión. @@ -1247,12 +1247,12 @@ Setup can not be done. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> El directorio de sincronización local %1 ya existe, configurándolo para la sincronización.<br/><br/> - + Creating local sync folder %1... Creando el directorio %1... @@ -1261,12 +1261,12 @@ Setup can not be done. - + ok aceptar - + failed. Error. @@ -1288,12 +1288,12 @@ Setup can not be done. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Error al crear el directorio remoto, probablemente porque las credenciales provistas son incorrectas.</font><br/>Por favor, volvé atrás y verificá tus credenciales.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Se prtodujo un error <tt>%2</tt> al crear el directorio remoto %1. @@ -1323,7 +1323,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! ¡Perfecto! Tu <a href="%1" title="%1">nuevo %2</a> ya está funcionando. @@ -1331,7 +1331,7 @@ Setup can not be done. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mi-dominio.org.ar diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts index b98602131c..bbe9735f92 100644 --- a/translations/mirall_eu.ts +++ b/translations/mirall_eu.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). CSync konfiguratutako %1 karpetentzat hasi da. @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Ikusi egoera... - + Add folder... Gehitu karpeta... - + Configure... Konfiguratu... - + Configure proxy... Konfiguratu proxya... - + Quit Kendu @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } Pasahitza elkarrizketa koadroa ezeztatua izan da! - - + + No %1 Connection Ez dago %1-ekin konexiorik - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Zure %1 kredentzialak ez dira zuzenak.</p><p>Mesedez zuzendu erretilutiko ikonotik konfigurazio elkarrizketa koadroa abiarazten!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Zure erabiltzaile izena edo pasahitza ez dira zuzenak.</p><p>Mesedez zuzendu erretilutiko ikonotik konfigurazio elkarrizketa koadroa abiarazten!</p> - + %1 Sync Started %1 Sinkronizazioa hasi da - + Open %1 in browser... Ireki %1 arakatzailean... - + About... Honi buruz... - + Open %1 folder Ireki %1 karpeta - + Managed Folders: Kudeatutako karpetak: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small> <a href="%1">%2</a> Git errebisiotik eraikita hemen %3, %4<br>OCsync %5 eta Qt %6 erabiliz.</small><p> - + About %1 %1 buruz - + Confirm Folder Remove Baieztatu karpetaren ezabatzea - + Do you really want to remove upload folder <i>%1</i>? Ziur zaude <i>%1</i> karpeta ezabatu nahi duzula? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Sinkronizazioa martxan da. - + Server is currently not available. Zerbitzaria orain ez dago eskuragarri. - + Last Sync was successful. Azkeneko sinkronizazioa ongi burutu zen. - + Syncing Error. Sinkronizazio errorea. - + Setup Error. Konfigurazio errorea. - + Undefined Error State. Definitu gabeko errore egoera. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Sinkronizazioa martxan da - + The syncing operation is running.<br/>Do you want to terminate it? Sinkronizazio martxan da.<br/>Bukatu nahi al duzu? - + Undefined State. Definitu gabeko egoera. - + Waits to start syncing. Itxoiten sinkronizazioa hasteko. - + (Sync is paused) (Sinkronizazioa pausatuta dago) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Ez dago sinkronizazio karpetarik definituta. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mydomain.org @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mydomain.org @@ -1203,49 +1203,49 @@ Please write a bug report. <font color="green">%1-en instalazioa ongi burutu da!</font> - + The owncloud admin script can not be found. Setup can not be done. ownCloud admin gidoia ezin da aurkitu. Ezin da konfigurazioa egin. - + Creation of remote folder %1 could not be started. Urruneko %1 karpetaren sorrera ezin da hasi. - + Remote folder %1 created successfully. Urruneko %1 karpeta ongi sortu da. - + The remote folder %1 already exists. Connecting it for syncing. Urruneko %1 karpeta dagoeneko existintzen da. Bertara konetatuko da sinkronizatzeko. - + The folder creation resulted in HTTP error code %1 Karpeta sortzeak HTTP %1 errore kodea igorri du - + A sync connection from %1 to remote directory %2 was set up. Sinkronizazio konexio bat konfiguratu da %1 karpetatik urruneko %2 karpetara. - + Succesfully connected to %1! %1-era ongi konektatu da! - + Connection to %1 could not be established. Please check again. %1 konexioa ezin da ezarri. Mesedez egiaztatu berriz. - + Press Finish to permanently accept this connection. Sakatu Bukatu konexio hau behin-betirako onartzeko. @@ -1258,12 +1258,12 @@ Ezin da konfigurazioa egin. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Bertako %1 karpeta dagoeneko existitzen da, sinkronizaziorako prestatzen.<br/><br/> - + Creating local sync folder %1... Bertako sinkronizazio %1 karpeta sortzen... @@ -1272,12 +1272,12 @@ Ezin da konfigurazioa egin. - + ok ados - + failed. huts egin du. @@ -1299,12 +1299,12 @@ Ezin da konfigurazioa egin. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Urruneko karpeten sortzeak huts egin du ziuraski emandako kredentzialak gaizki daudelako.</font><br/>Mesedez atzera joan eta egiaztatu zure kredentzialak.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Urruneko %1 karpetaren sortzeak huts egin du <tt>%2</tt> errorearekin. @@ -1334,7 +1334,7 @@ Ezin da konfigurazioa egin. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Zorionak! zure <a href="%1" title="%1">%2 berria</a> martxan da! @@ -1342,7 +1342,7 @@ Ezin da konfigurazioa egin. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org diff --git a/translations/mirall_fi_FI.ts b/translations/mirall_fi_FI.ts index f88e073a42..164691509b 100644 --- a/translations/mirall_fi_FI.ts +++ b/translations/mirall_fi_FI.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Synkronointi aloitettu %1 asetetulle täsmäyskansioille. @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Avaa tila... - + Add folder... Lisää kansio... - + Configure... Asetukset.. - + Configure proxy... Välityspalvelimen asetukset... - + Quit Lopeta @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } Salasanakysely peruttiin! - - + + No %1 Connection Ei %1-yhteyttä - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> - + %1 Sync Started - + Open %1 in browser... Avaa %1 selaimessa... - + About... Tietoja... - + Open %1 folder Avaa %1-kansio - + Managed Folders: Hallitut kansiot: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> - + About %1 Tietoja - %1 - + Confirm Folder Remove Vahvista kansion poisto - + Do you really want to remove upload folder <i>%1</i>? Haluatko varmasti poistaa latauskansion <i>%1</i>? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Synkronointi on meneillään. - + Server is currently not available. Palvelin ei ole juuri nyt käytettävissä. - + Last Sync was successful. Viimeisin synkronointi suoritettiin onnistuneesti. - + Syncing Error. Synkronointivirhe. - + Setup Error. Asetusvirhe. - + Undefined Error State. Määrittelemätön virhetila. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Synkronointi meneillään - + The syncing operation is running.<br/>Do you want to terminate it? Synkronointioperaatio on meneillään.<br/>Haluatko keskeyttää sen? - + Undefined State. Määrittelemätön tila. - + Waits to start syncing. Odottaa synkronoinnin alkamista. - + (Sync is paused) (Synkronointi on keskeytetty) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Synkronointikansioita ei ole määritetty. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mydomain.org @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mydomain.org @@ -1203,48 +1203,48 @@ Please write a bug report. <font color="green">%1 - asennus onnistui!</font> - + The owncloud admin script can not be found. Setup can not be done. Ylläpitäjän ownCloud-skriptiä ei löydy. Asetusten tekeminen ei onnistu. - + Creation of remote folder %1 could not be started. Etäkansion %1 luomista ei voitu aloittaa. - + Remote folder %1 created successfully. Etäkansio %1 luotiin onnistuneesti. - + The remote folder %1 already exists. Connecting it for syncing. Etäkansio %1 on jo olemassa. Otetaan siihen yhteyttä tiedostojen täsmäystä varten. - + The folder creation resulted in HTTP error code %1 Kansion luonti aiheutti HTTP-virhekoodin %1 - + A sync connection from %1 to remote directory %2 was set up. Täsmäysyhteys kansiosta %1 etäkansioon %2 on asetettu. - + Succesfully connected to %1! Yhteys muodostettu onnistuneesti kohteeseen %1! - + Connection to %1 could not be established. Please check again. - + Press Finish to permanently accept this connection. Napsauta "Valmis" hyväksyäksesi lopullisesti tämän yhteyden. @@ -1257,12 +1257,12 @@ Setup can not be done. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Paikallinen kansio %1 on jo olemassa, asetetaan se synkronoitavaksi.<br/><br/> - + Creating local sync folder %1... Luodaan paikallista synkronointikansiota %1... @@ -1271,12 +1271,12 @@ Setup can not be done. - + ok ok - + failed. epäonnistui. @@ -1298,12 +1298,12 @@ Setup can not be done. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Pilvipalvelun etäkansion luominen ei onnistunut , koska tunnistautumistietosi ovat todennäköisesti väärin.</font><br/>Palaa takaisin ja tarkista käyttäjätunnus ja salasana.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Etäkansion %1 luonti epäonnistui, virhe <tt>%2</tt>. @@ -1333,7 +1333,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Onnittelut! Uusi <a href="%1" title="%1">%2</a> on nyt käytettävissä! @@ -1341,7 +1341,7 @@ Setup can not be done. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index 2e808f72fa..ada30d9f34 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; }⏎ - + Sync started for %1 configured sync folder(s). Synchronisation lancée pour le(s) %1 dossier(s) configuré(s). @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; }⏎ - + Open status... Consulter l'état... - + Add folder... Ajouter un dossier... - + Configure... Configurer... - + Configure proxy... Configurer un serveur mandataire… - + Quit Quitter @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; }⏎ La fenêtre de saisie du mot de passe a été fermée ! - - + + No %1 Connection Pas de connexion %1 - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Vos %1 identifiants sont incorrects.</p><p>Veuillez les corriger en utilisant le menu configuration</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Votre nom d'utilisateur ou votre mot de passe ownCloud est incorrect.</p><p>Merci de les corriger via la boite de dialogue accessible depuis l'icône de la zone de notifications !</p> - + %1 Sync Started %1 Synchronisation démarrée - + Open %1 in browser... Ouvrir %1 dans le navigateur - + About... À propos de… - + Open %1 folder Ouvrir le répertoire %1 - + Managed Folders: Répertoires suivis : - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>Compilé depuis la révision Git <a href="%1">%2</a> sur %3, %4<br>en utilisant OCsync %5 et Qt %6.</small><p> - + About %1 À propos de %1 - + Confirm Folder Remove Confirmer le retrait du dossier - + Do you really want to remove upload folder <i>%1</i>? Voulez-vous vraiment supprimer le dossier de téléchargement <i>%1</i>? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; }⏎ - + Sync is running. La synchronisation est en cours. - + Server is currently not available. Le serveur est indisponible pour le moment. - + Last Sync was successful. Dernière synchronisation effectuée avec succès - + Syncing Error. Erreur de synchronisation. - + Setup Error. Erreur d'installation. - + Undefined Error State. Status d'erreur indéfini @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; }⏎ - + Sync Running Synchronisation en cours - + The syncing operation is running.<br/>Do you want to terminate it? La synchronisation est en cours.<br/>Voulez-vous y mettre un terme? - + Undefined State. Statut indéfini. - + Waits to start syncing. En attente de synchronisation . - + (Sync is paused) (La synchronisation est en pause) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; }⏎ - + No sync folders configured. Aucun répertoire synchronisé n'est configuré. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mondomaine.org @@ -1112,7 +1112,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mondomaine.org @@ -1204,49 +1204,49 @@ Please write a bug report. <font color="green">L'installation de %1 a réussie!</font> - + The owncloud admin script can not be found. Setup can not be done. Le script d'administration d'ownCloud ne peut être trouvé. L'installation ne peut pas continuer. - + Creation of remote folder %1 could not be started. La création du dossier distant %1 ne peut être démarrée. - + Remote folder %1 created successfully. Le dossier distant %1 a été créé avec succès. - + The remote folder %1 already exists. Connecting it for syncing. Le dossier distant %1 existe déjà. Veuillez vous y connecter pour la synchronisation. - + The folder creation resulted in HTTP error code %1 La création du dossier a généré le code d'erreur HTTP %1 - + A sync connection from %1 to remote directory %2 was set up. Une synchronisation entre le dossier local %1 et le dossier distant %2 a été configurée. - + Succesfully connected to %1! Connexion réussie à %1! - + Connection to %1 could not be established. Please check again. La connexion à %1 n'a pu être établie. Essayez encore svp. - + Press Finish to permanently accept this connection. Cliquez sur Terminer pour accepter définitivement cette connexion. @@ -1259,12 +1259,12 @@ L'installation ne peut pas continuer. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Le dossier de synchronisation local %1 existe déjà, configuration de la synchronisation.<br/><br/> - + Creating local sync folder %1... Création du dossier de synchronisation local %1 … @@ -1273,12 +1273,12 @@ L'installation ne peut pas continuer. - + ok ok - + failed. échoué. @@ -1300,12 +1300,12 @@ L'installation ne peut pas continuer. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">La création du dossier distant a échoué probablement parce que les informations d'identification fournies sont fausses.</font><br/>Veuillez revenir à l'étape précédente et vérifier vos informations d'identification.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. La création du dossier distant "%1" a échouée avec l'erreur <tt>%2</tt> @@ -1335,7 +1335,7 @@ L'installation ne peut pas continuer. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Félicitation ! Votre <a href="%1" title="%1">nouvel %2</a> est maintenant en ligne ! @@ -1343,7 +1343,7 @@ L'installation ne peut pas continuer. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mondomaine.org diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index 980f9b15c4..84c89443c7 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Comezou a sincronización para %1 cartafol(es) con sincronización configurada. @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Abrir o estado... - + Add folder... Engadir un cartafol... - + Configure... Configurar... - + Configure proxy... Configurar o proxy... - + Quit Saír @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } Cancelouse o diálogo de contrasinais! - - + + No %1 Connection Sen a conexión %1 - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>As túas credenciais de %1 non son correctas.</p><p>Corríxeas comezando o diálogo de configuración dende a bandexa do sistema</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Ou o teu nome de usuario ou o teu contrasinal son incorrectos.</p><p>Corríxeos usando o diálogo de configuración da bandexa do sistema</p> - + %1 Sync Started Comezou a sincronización %1 - + Open %1 in browser... Abrir %1 nun navegador... - + About... Acerca de... - + Open %1 folder Abrir o cartafol %1 - + Managed Folders: Cartafoles xestionados: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> - + About %1 Acerca de %1 - + Confirm Folder Remove Confirmar a eliminación do cartafol - + Do you really want to remove upload folder <i>%1</i>? Seguro que queres eliminar o cartafol de subida <i>%1</i>? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Estase sincronizando. - + Server is currently not available. - + Last Sync was successful. A última sincronización fíxose correctamente. - + Syncing Error. Erro de sincronización. - + Setup Error. Erro de configuración. - + Undefined Error State. Estado de erro sen definir. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Sincronización en proceso - + The syncing operation is running.<br/>Do you want to terminate it? Estase realizando a sincronización.<br/>Quere interrompela e rematala? - + Undefined State. Estado sen definir. - + Waits to start syncing. Agardando polo comezo da sincronización. - + (Sync is paused) (sincronización en pausa) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Con se configuraron cartafoles de sincronización. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org omeudominio.org @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.omeudominio.org @@ -1203,49 +1203,49 @@ Please write a bug report. <font color="green">Instalouse %1 correctamente!</font> - + The owncloud admin script can not be found. Setup can not be done. Non se atopa o engadido de administración de ownCloud. Non se pode realizar a instalación. - + Creation of remote folder %1 could not be started. Non se puido iniciar a creación do cartafol remoto %1. - + Remote folder %1 created successfully. O cartafol remoto %1 creouse correctamente. - + The remote folder %1 already exists. Connecting it for syncing. O cartafol remoto %1 xa existe. Conectándoo para a sincronización. - + The folder creation resulted in HTTP error code %1 A creación do cartafol resultou nun código de erro HTTP %1 - + A sync connection from %1 to remote directory %2 was set up. A conexión de sincronización de %1 ao directorio remoto %2 estableceuse. - + Succesfully connected to %1! Conectouse correctamente con %1! - + Connection to %1 could not be established. Please check again. Non se puido estabelecer a conexión con %1. Compróbao de novo. - + Press Finish to permanently accept this connection. Dálle a rematar para aceptar esta conexión de xeito permanente. @@ -1258,12 +1258,12 @@ Non se pode realizar a instalación. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> O cartafol de sincronización local %1 xa existe. Configurándoo para a sincronización.<br/><br/> - + Creating local sync folder %1... Creando un cartafol local de sincronización %1... @@ -1272,12 +1272,12 @@ Non se pode realizar a instalación. - + ok aceptar - + failed. fallou. @@ -1299,12 +1299,12 @@ Non se pode realizar a instalación. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">A creación do cartafol remoto fallou probablemente debido a que as credenciais que se deron non foran as correctas.</font><br/>Volve atrás e comproba os teus credenciais.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. A creación do cartafol remoto %1 fallou e dou o erro <tt>%2</tt>. @@ -1334,7 +1334,7 @@ Non se pode realizar a instalación. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Parabéns! O teu <a href="%1" title="%1"> novo %2</a> está listo e executándose! @@ -1342,7 +1342,7 @@ Non se pode realizar a instalación. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.omeudominio.org diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index 91d7399f77..64b26c7c7e 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Sincronizzazione iniziata per %1 cartelle configurate. @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Stato di connessione... - + Add folder... Aggiungi cartella... - + Configure... Configura... - + Configure proxy... Configura proxy... - + Quit Esci @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } La finestra della password è stata annullata! - - + + No %1 Connection Nessuna connessione di %1 - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Le credenziali di %1 non sono corrette.</p><p>Correggile avviando la finestra di configurazione dal vassoio di sistema!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Il nome utente o la password non sono corretti.</p><p>Correggili avviando la finestra di configurazione dal vassoio di sistema!</p> - + %1 Sync Started %1 Sincronizzazione iniziata - + Open %1 in browser... Apri %1 nel browser... - + About... Informazioni... - + Open %1 folder Apri la cartella %1 - + Managed Folders: Cartelle gestite: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>Compilato dalla revisione Git <a href="%1">%2</a> il %3, %4<br>utilizzando OCsync %5 e Qt %6.</small><p> - + About %1 Informazioni su %1 - + Confirm Folder Remove Conferma la rimozione della cartella - + Do you really want to remove upload folder <i>%1</i>? Vuoi veramente rimuovere la cartella <i>%1</i>? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. La sincronizzazione è in corso. - + Server is currently not available. Il server è attualmente non disponibile. - + Last Sync was successful. L'ultima sincronizzazione è stato completata correttamente. - + Syncing Error. Errore di sincronizzazione. - + Setup Error. Errore di configurazione. - + Undefined Error State. Stato di errore non definito. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running La sincronizzazione è in corso - + The syncing operation is running.<br/>Do you want to terminate it? L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla? - + Undefined State. Stato non definito. - + Waits to start syncing. Attende l'inizio della sincronizzazione. - + (Sync is paused) (La sincronizzazione è sospesa) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Nessuna cartella configurata per la sincronizzazione. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org miodominio.org @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.miodominio.org @@ -1203,49 +1203,49 @@ Please write a bug report. <font color="green">Installazione di %1 completata!</font> - + The owncloud admin script can not be found. Setup can not be done. Lo script owncloud admin non è stato trovato. La configurazione non può essere completata. - + Creation of remote folder %1 could not be started. La creazione della cartella remota %1 non può essere iniziata. - + Remote folder %1 created successfully. La cartella remota %1 è stata creata correttamente. - + The remote folder %1 already exists. Connecting it for syncing. La cartella remota %1 esiste già. Connessione in corso per la sincronizzazione - + The folder creation resulted in HTTP error code %1 La creazione della cartella ha restituito un codice di errore HTTP %1 - + A sync connection from %1 to remote directory %2 was set up. Una connessione di sincronizzazione da %1 alla cartella remota %2 è stata stabilita. - + Succesfully connected to %1! Connesso correttamente a %1. - + Connection to %1 could not be established. Please check again. La connessione a %1 non può essere stabilita. Prova ancora. - + Press Finish to permanently accept this connection. Premi Fine per accettare definitivamente questa connessione. @@ -1258,12 +1258,12 @@ La configurazione non può essere completata. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> La cartella di sincronizzazione locale %1 esiste già, impostata per la sincronizzazione.<br/><br/> - + Creating local sync folder %1... Creazione della cartella locale di sincronizzazione %1 in corso... @@ -1272,12 +1272,12 @@ La configurazione non può essere completata. - + ok ok - + failed. non riuscita. @@ -1299,12 +1299,12 @@ La configurazione non può essere completata. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">La creazione della cartella remota non è riuscita probabilmente perché le credenziali fornite non sono corrette.</font><br/>Torna indietro e controlla le credenziali inserite.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Creazione della cartella remota %1 non riuscita con errore <tt>%2</tt>. @@ -1334,7 +1334,7 @@ La configurazione non può essere completata. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Congratulazioni! Il tuo <a href="%1" title="%1">nuovo %2</a> è attivo e in esecuzione! @@ -1342,7 +1342,7 @@ La configurazione non può essere completata. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.miodominio.org diff --git a/translations/mirall_ja_JP.ts b/translations/mirall_ja_JP.ts index 9b55dda1e1..b6eac9dab5 100644 --- a/translations/mirall_ja_JP.ts +++ b/translations/mirall_ja_JP.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). 設定された %1 フォルダの同期を開始しました。 @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... 状態を確認... - + Add folder... フォルダを追加... - + Configure... 設定... - + Configure proxy... プロキシを設定... - + Quit 終了 @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } パスワードダイアログはキャンセルされました！ - - + + No %1 Connection %1 未接続 - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>あなたの %1 の資格情報は正しくありません。</p><p>トレイから設定ダイアログを表示して、修正してください。</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>ユーザ名もしくはパスワードのいずれかが正しくありません。</p><p>トレイから設定ダイアログを表示して、修正してください。</p> - + %1 Sync Started %1 同期開始 - + Open %1 in browser... %1 をブラウザーで開く... - + About... ownCloudについて... - + Open %1 folder %1 フォルダを開く - + Managed Folders: 管理フォルダ: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>Git版ビルド<a href="%1">%2</a>%3, %4<br>OCsync %5，Qt %6。</small><p> - + About %1 %1 について - + Confirm Folder Remove フォルダの削除を確認 - + Do you really want to remove upload folder <i>%1</i>? 本当にアップロードフォルダ <i>%1</i> を削除してよろしいですか？ @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. 同期を実行中です。 - + Server is currently not available. サーバは現在利用できません。 - + Last Sync was successful. 最後の同期は成功しました。 - + Syncing Error. 同期エラー。 - + Setup Error. 設定エラー。 - + Undefined Error State. 未定義のエラー状態。 @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running 同期実行中 - + The syncing operation is running.<br/>Do you want to terminate it? 同期操作が実行中です。<br/>終了してもよろしいですか？ - + Undefined State. 未定義の状態。 - + Waits to start syncing. 同期開始を待機中 - + (Sync is paused) (同期を一時停止) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. 同期フォルダが設定されていません。 @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mydomain.org @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mydomain.org @@ -1203,49 +1203,49 @@ Please write a bug report. <font color="green">%1 のインストールに成功しました！</font> - + The owncloud admin script can not be found. Setup can not be done. owncloudの管理者用スクリプトが見つかりません。 セットアップを完了できません。 - + Creation of remote folder %1 could not be started. リモートフォルダ %1 の生成を開始できませんでした。 - + Remote folder %1 created successfully. リモートフォルダ %1 は正常に生成されました。 - + The remote folder %1 already exists. Connecting it for syncing. リモートフォルダ %1 は既に存在します。同期のために接続しています。 - + The folder creation resulted in HTTP error code %1 フォルダの作成はHTTPのエラーコード %1 で終了しました - + A sync connection from %1 to remote directory %2 was set up. %1 からリモートディレクトリ %2 への同期接続を設定しました。 - + Succesfully connected to %1! 正常に %1 に接続されました！ - + Connection to %1 could not be established. Please check again. %1 への接続を確立できませんでした。もう一度確認して下さい。 - + Press Finish to permanently accept this connection. この接続を常に許可する場合は完了を押してください。 @@ -1258,12 +1258,12 @@ Setup can not be done. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> ローカルの同期フォルダ %1 はすでに存在しています、同期のために設定してください。<br/><br/> - + Creating local sync folder %1... ローカルの同期フォルダ %1 を作成中... @@ -1272,12 +1272,12 @@ Setup can not be done. - + ok OK - + failed. 失敗。 @@ -1299,12 +1299,12 @@ Setup can not be done. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">おそらく資格情報が間違っているため、リモートフォルダの作成に失敗しました。</font><br/>前に戻り、資格情報をチェックしてください。</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. リモートフォルダ %1 の作成がエラーで失敗しました。<tt>%2</tt>. @@ -1334,7 +1334,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! おめでとうございます！あなたの <a href="%1" title="%1">新しい %2</a> の設定は完了し、実行中です！ @@ -1342,7 +1342,7 @@ Setup can not be done. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org diff --git a/translations/mirall_ko.ts b/translations/mirall_ko.ts index c0035fd746..047a6bdda8 100644 --- a/translations/mirall_ko.ts +++ b/translations/mirall_ko.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). 설정된 동기화 폴더 %1개의 동기화가 시작되었습니다. @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... 상태 열기... - + Add folder... 폴더 추가... - + Configure... 설정... - + Configure proxy... 프록시 설정... - + Quit 끝내기 @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } 암호 대화상자가 취소되었습니다! - - + + No %1 Connection %1 접속 없음 - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>%1 계정 정보가 올바르지 않습니다.</p><p>트레이의 설정 대화 상자에서 이 정보를 수정하십시오!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>사용자 이름 및 암호가 올바르지 않습니다.</p><p>트레이에서 설정 대화 상자를 열어서 올바른 정보를 입력하십시오!</p> - + %1 Sync Started %1 동기화 시작됨 - + Open %1 in browser... 웹 브라우저에서 %1 열기... - + About... ownCloud 정보... - + Open %1 folder %1 폴더 열기 - + Managed Folders: 관리된 폴더: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>Git 리비전 <a href="%1">%2</a>을(를) 사용하여 %4 %3에 빌드됨<br>OCsync %5 및 Qt %6 사용.</small><p> - + About %1 %1 정보 - + Confirm Folder Remove 폴더 삭제 확인 - + Do you really want to remove upload folder <i>%1</i>? 업로드 폴더 <i>%1</i>을(를) 삭제하시겠습니까? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. 동기화 중입니다. - + Server is currently not available. 서버를 사용할 수 없습니다. - + Last Sync was successful. 마지막 동기화를 성공적으로 마쳤습니다. - + Syncing Error. 동기화 오류가 발생하였습니다. - + Setup Error. 설치 오류가 발생하였습니다. - + Undefined Error State. 정의되지 않은 오류 상태입니다. @@ -511,29 +511,29 @@ p, li { white-space: pre-wrap; } - + Sync Running 동기화 진행 중 - + The syncing operation is running.<br/>Do you want to terminate it? 동기화 진행 중입니다.<br/>작업을 종료하시겠습니까? - + Undefined State. 정의되지 않은 상태. - + Waits to start syncing. 동기화 시작 대기 중. - + (Sync is paused) (동기화 일시 정지됨) @@ -542,7 +542,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. 동기화 폴더가 구성되지 않았습니다. @@ -752,7 +752,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mydomain.org @@ -1113,7 +1113,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mydomain.org @@ -1205,49 +1205,49 @@ Please write a bug report. <font color="green">%1 설치가 성공하였습니다!</font> - + The owncloud admin script can not be found. Setup can not be done. owncloud 관리자 스크립트를 찾을 수 없습니다. 설치를 완료할 수 없습니다. - + Creation of remote folder %1 could not be started. 원격 폴더 %1을(를) 생성할 수 없습니다. - + Remote folder %1 created successfully. 원격 폴더 %1을(를) 생성하였습니다. - + The remote folder %1 already exists. Connecting it for syncing. 원격 폴더 %1이(가) 이미 존재합니다. 동기화하기 위해서 연결합니다. - + The folder creation resulted in HTTP error code %1 폴더 생성 작업이 HTTP 오류 %1을(를) 반환하였습니다 - + A sync connection from %1 to remote directory %2 was set up. %1와(과) 원격 디렉터리 %2와(과)의 동기화 연결이 수립되었습니다. - + Succesfully connected to %1! %1에 연결하였습니다! - + Connection to %1 could not be established. Please check again. %1에 연결할 수 없습니다. 다시 시도하십시오. - + Press Finish to permanently accept this connection. 완료를 누르면 이 연결을 항상 사용합니다. @@ -1260,12 +1260,12 @@ Setup can not be done. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> 로컬 동기화 폴더 %1이(가) 이미 존재합니다. 동기화할 때 사용합니다.<br/><br/> - + Creating local sync folder %1... 로컬 동기화 폴더 %1 생성 중... @@ -1274,12 +1274,12 @@ Setup can not be done. - + ok 확인 - + failed. 실패. @@ -1301,12 +1301,12 @@ Setup can not be done. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">원격 폴더 생성이 실패하였습니다. 가능한 원인은 로그인 정보 오류입니다.</font><br/>이전 단계로 돌아가서 로그인 정보를 확인하십시오.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. 원격 폴더 %1을(를) 생성하는 중 오류 <tt>%2</tt>이(가) 발생하였습니다. @@ -1336,7 +1336,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! 축하합니다! 이제부터 <a href="%1" title="%1">새로운 %2</a>을(를) 사용할 수 있습니다! @@ -1344,7 +1344,7 @@ Setup can not be done. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index 865f76a832..e1dcdb24a2 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Synchronisatie gestart voor %1 geconfigureerde map(pen). @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Open status... - + Add folder... Voeg map toe... - + Configure... Configureer... - + Configure proxy... Configureer proxy... - + Quit Afsluiten @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } Wachtwoord dialoog geannuleerd! - - + + No %1 Connection Geen %1 Verbinding - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Uw %1 inloggegevens zijn niet juist.</p><p>Herstel ze door de dialoog opnieuw te starten vanuit de tray!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Uw gebruikersnaam en/of uw wachtwoord is onjuist.</p><p>Herstel dit in de configuratie dialoog via het systeemvak!</p> - + %1 Sync Started %1 Sync Gestart - + Open %1 in browser... Open %1 in browser... - + About... About... - + Open %1 folder Open %1 map - + Managed Folders: Beheerde mappen: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>Gecompileerd van Git revisie <a href="%1">%2</a> op %3, %4<br>m.b.v. OCsync %5 en Qt %6.</small><p> - + About %1 About %1 - + Confirm Folder Remove Bevestig het verwijderen van de map - + Do you really want to remove upload folder <i>%1</i>? Weet je zeker dat je de upload map wilt verwijderen <i>%1</i>? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Bezig met synchroniseren. - + Server is currently not available. Server is op dit moment niet beschikbaar. - + Last Sync was successful. Laatste synchronisatie was succesvol. - + Syncing Error. Synchroniseerfout. - + Setup Error. Installatiefout. - + Undefined Error State. Ongedefiniëerde fout. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Bezig met synchroniseren - + The syncing operation is running.<br/>Do you want to terminate it? Bezig met synchroniseren.<br/>Wil je stoppen met synchroniseren? - + Undefined State. Ongedefiniëerde staat - + Waits to start syncing. In afwachting van synchronisatie. - + (Sync is paused) (Sync is gepauseerd) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Geen synchronisatie-mappen geconfigureerd. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mydomain.org @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mydomain.org @@ -1203,49 +1203,49 @@ Please write a bug report. <font color="green">Installatie van %1 succesvol!</font> - + The owncloud admin script can not be found. Setup can not be done. Het owncloud admin script is niet gevonden. De setup kan niet worden uitgevoerd. - + Creation of remote folder %1 could not be started. Het aanmaken van remote map %1 kon niet beginnen. - + Remote folder %1 created successfully. Externe map %1 succesvol gecreërd. - + The remote folder %1 already exists. Connecting it for syncing. De remote map %1 bestaat al. Verbinden voor synchroniseren. - + The folder creation resulted in HTTP error code %1 Het aanmaken van de map resulteerde in HTTP foutcode %1 - + A sync connection from %1 to remote directory %2 was set up. Er is een sync verbinding van %1 naar remote directory %2 opgezet. - + Succesfully connected to %1! Verbinding naar %1 was succesvol! - + Connection to %1 could not be established. Please check again. Verbinding met %1 niet geslaagd. Probeer het nog eens. - + Press Finish to permanently accept this connection. Druk op Afronden om deze verbinding permanentte accepteren. @@ -1258,12 +1258,12 @@ De setup kan niet worden uitgevoerd. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Lokale synch map %1 bestaat al, deze wordt ingesteld voor synchronisatie.<br/><br/> - + Creating local sync folder %1... Creër lokale sync map %1... @@ -1272,12 +1272,12 @@ De setup kan niet worden uitgevoerd. - + ok ok - + failed. mislukt. @@ -1299,12 +1299,12 @@ De setup kan niet worden uitgevoerd. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.</font><br/>ga terug en controleer uw inloggevens.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Aanmaken van remote map %1 mislukt met fout <tt>%2</tt>. @@ -1334,7 +1334,7 @@ De setup kan niet worden uitgevoerd. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Gefeliciteerd! Uw <a href="%1" title="%1">nieuwe %2</a> draait! @@ -1342,7 +1342,7 @@ De setup kan niet worden uitgevoerd. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index dfd7367f22..9e89d00df7 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Synchronizacja rozpoczęta dla %1 folderu(ów). @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Otwieranie statusów... - + Add folder... Dodaj katalog... - + Configure... Konfiguruj... - + Configure proxy... Konfiguruj serwer proxy... - + Quit Wyjdź @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } Hasło zostało anulowane! - - + + No %1 Connection %1 Nie ma połączenia - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Twoje %1 dane nie są poprawne.</p><p>Prosze popraw je, startując okno dialogowe konfiguracji w zasobniku!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Błędna nazwa użytkownika lub hasło.</p><p>Prosze popraw to, startując okno dialogowe konfiguracji w zasobniku!</p> - + %1 Sync Started %1 Synchronizacja Rozpoczęta - + Open %1 in browser... Otwórz %1 w przeglądarce... - + About... O... - + Open %1 folder Otwórz folder %1 - + Managed Folders: Zarządzane foldery: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>Zbudowano z rewizji Git <a href="%1">%2</a> w dniu %3, %4<br>używając OCsync %5 oraz Qt %6.</small></p> - + About %1 O %1 - + Confirm Folder Remove Potwierdź usunięcie katalogu - + Do you really want to remove upload folder <i>%1</i>? Czy na pewno chcesz usunąć wczytany folder <i>%1</i>? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Synchronizacja w toku - + Server is currently not available. Serwer jest obecnie niedostępny. - + Last Sync was successful. Ostatnia synchronizacja zakończona powodzeniem. - + Syncing Error. Błąd synchronizacji - + Setup Error. Błąd konfiguracji. - + Undefined Error State. Niezdefiniowany błąd stanu. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Synchronizacja uruchomiona - + The syncing operation is running.<br/>Do you want to terminate it? Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć? - + Undefined State. Niezdefiniowany stan - + Waits to start syncing. Czekają na uruchomienie synchronizacji. - + (Sync is paused) (Synchronizacja jest zatrzymana) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Nie skonfigurowano synchronizacji folderów. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mojadomena.pl @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mojadomena.pl @@ -1203,49 +1203,49 @@ Please write a bug report. <font color="green">Instalacja %1 powiodła się!</font> - + The owncloud admin script can not be found. Setup can not be done. Nie można odnaleźć skryptu owncloud-admin. Instalacja nie może być wykonywana. - + Creation of remote folder %1 could not be started. Tworzenie folderu zdalnego %1 nie może zostać uruchomione. - + Remote folder %1 created successfully. Zdalny folder %1 został utworzony pomyślnie. - + The remote folder %1 already exists. Connecting it for syncing. Zdalny folder %1 już istnieje. Podłączyć go do synchronizowania. - + The folder creation resulted in HTTP error code %1 Tworzenie folderu spowodowało kod błędu HTTP %1 - + A sync connection from %1 to remote directory %2 was set up. Połączenie synchronizacji z %1 do zdalnego katalogu %2 zostało skonfigurowane. - + Succesfully connected to %1! Udane połączenie z %1! - + Connection to %1 could not be established. Please check again. Połączenie z %1 nie może być nawiązane. Prosze sprawdź ponownie. - + Press Finish to permanently accept this connection. Naciśnij przycisk Zakończ, aby zaakceptować to połączenie. @@ -1258,12 +1258,12 @@ Instalacja nie może być wykonywana. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Lokalna synchronizacja folderu %1 już istnieje, ustawienie go do synchronizacji. - + Creating local sync folder %1... Tworzenie synchronizacji folderu lokalnego %1... @@ -1272,12 +1272,12 @@ Instalacja nie może być wykonywana. - + ok OK - + failed. Błąd. @@ -1299,12 +1299,12 @@ Instalacja nie może być wykonywana. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Tworzenie folderu zdalnego nie udane, prawdopodobnie dostarczone poświadczenia są błędne.</font><br/>Proszę wróć i sprawdź poświadczenia.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Tworzenie folderu zdalnego %1 nie powiodło się z powodu błędu <tt>%2</tt>. @@ -1334,7 +1334,7 @@ Instalacja nie może być wykonywana. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Gratulacje! Twoje <a href="%1" title="%1">nowe %2</a> w pełni działa! @@ -1342,7 +1342,7 @@ Instalacja nie może być wykonywana. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mojadomena.pl diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index d3b7fd43f8..8c9569c7f1 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Sincronização iniciada para %1 pasta(s) configuradas. @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Mostrar status... - + Add folder... Adicionar pasta... - + Configure... Configurar... - + Configure proxy... Configurar proxy... - + Quit Sair @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } O diálogo de senha foi cancelado! - - + + No %1 Connection Sem Conexão %1 - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Suas %1 credenciais não estão corretas.</p><p>Por favor as corrija ao iniciar a configuração através do ícone na barra de tarefas!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Ou seu usuário ou senha estão incorretos.</p><p>Por favor as corrija ao iniciar a configuração através do ícone na barra de tarefas!</p> - + %1 Sync Started %1 Sincronização Iniciada - + Open %1 in browser... Abrir %1 no navegador... - + About... Sobre... - + Open %1 folder Abrir pasta %1 - + Managed Folders: Pastas Gerenciadas: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> - + About %1 Sobre %1 - + Confirm Folder Remove Confirma remoção da pasta - + Do you really want to remove upload folder <i>%1</i>? Tem certeza que deseja remover a pasta que foi feito upload <i>%1</i>? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. A sincronização está ocorrendo. - + Server is currently not available. - + Last Sync was successful. A última sincronização foi feita com sucesso. - + Syncing Error. Erro na sincronização. - + Setup Error. Erro de configuração. - + Undefined Error State. Erro de estado indefinido. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Sincronização acontecendo - + The syncing operation is running.<br/>Do you want to terminate it? A operação de sincronização está acontecendo.<br/>deseja finaliza-la? - + Undefined State. Estado indefinido. - + Waits to start syncing. Aguardando o inicio da sincronização. - + (Sync is paused) (Sincronização está pausada) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Pastas de sincronização não configuradas. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org meudominio.org @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.meudominio.org @@ -1203,49 +1203,49 @@ Please write a bug report. <font color="green">Instalação de %1 bem sucedida!</font> - + The owncloud admin script can not be found. Setup can not be done. O script owncloud-admin não foi encontrado. A configuração não pôde ser concluida. - + Creation of remote folder %1 could not be started. Criação da pasta remota %1 não pode ser iniciada. - + Remote folder %1 created successfully. Pasta remota %1 criada com sucesso. - + The remote folder %1 already exists. Connecting it for syncing. Pasta remota %1 já existe. Conectando para sincronizar. - + The folder creation resulted in HTTP error code %1 A criação da pasta resultou em um erro HTTP %1 - + A sync connection from %1 to remote directory %2 was set up. Uma conexão de sincronização de %1 para o diretório remoto %2 foi realizada. - + Succesfully connected to %1! Conectado com sucesso à %1! - + Connection to %1 could not be established. Please check again. Conexão à %1 não foi estabelecida. Por favor verifique novamente. - + Press Finish to permanently accept this connection. Pressione Finalizar para aceitar permanentemente essa conexão; @@ -1258,12 +1258,12 @@ A configuração não pôde ser concluida. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Pasta local de sincronização %1 já existe, configurando para sincronização. <br/><br/> - + Creating local sync folder %1... Criando pasta local de sincronização %1... @@ -1272,12 +1272,12 @@ A configuração não pôde ser concluida. - + ok ok - + failed. falhou. @@ -1299,12 +1299,12 @@ A configuração não pôde ser concluida. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Prováveis causas da falha na criação da pasta remota são credenciais erradas</font><br/>Volte e verifique suas credenciais, por favor.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Criação da pasta remota %1 com erro <tt>%2</tt>. @@ -1334,7 +1334,7 @@ A configuração não pôde ser concluida. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Parabéns! Seu <a href="%1" title="%1">novo %2</a> está configurado e funcionando! @@ -1342,7 +1342,7 @@ A configuração não pôde ser concluida. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.meudominio.org diff --git a/translations/mirall_pt_PT.ts b/translations/mirall_pt_PT.ts index 2ad08c9988..c5da874119 100644 --- a/translations/mirall_pt_PT.ts +++ b/translations/mirall_pt_PT.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). A sincronização iniciou para %1 pasta(s) configuradas @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Abrir estado... - + Add folder... Adicionar pasta... - + Configure... Configure... - + Configure proxy... Configurar proxy... - + Quit Sair @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } Dialogo da palavra-passe cancelado - - + + No %1 Connection Sem %1 Ligação. - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>%1 As suas credenciais não estão correctas..</p><p>Por favor actualize as suas credenciais a partir do menu de configuração a partir da barra de tarefas!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Tanto o nome de utilizador como a palavra-passe estão incorrectas.</p><p>Por favor actualize as suas credenciais a partir do menu de configuração a partir da barra de tarefas!</p> - + %1 Sync Started %1 A sincronização inicou. - + Open %1 in browser... Abrir %1 no browser. - + About... Sobre... - + Open %1 folder Abrir a pasta %1 - + Managed Folders: Pastas Geridas: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>Compilado da revisão Git <a href="%1">%2</a> on %3, %4<br>usando OCsync %5 e Qt %6.</small><p> - + About %1 Sobre %1 - + Confirm Folder Remove Confirme a remoção da pasta - + Do you really want to remove upload folder <i>%1</i>? Deseja remover a pasta <i>%1</i>? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. A sincronização está a correr. - + Server is currently not available. O servidor está indisponível - + Last Sync was successful. A última sincronização foi efectuada com sucesso. - + Syncing Error. Erro na sincronização. - + Setup Error. Erro na instalação. - + Undefined Error State. Estado do erro não definido. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running A sincronização está a decorrer - + The syncing operation is running.<br/>Do you want to terminate it? A operação de sincronização está a ser executada.<br/>Deseja terminar? - + Undefined State. Estado indefinido. - + Waits to start syncing. A aguardar o inicio da sincronização. - + (Sync is paused) (Sincronização Pausada) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Nenhuma pasta de sincronização configurada. @@ -751,7 +751,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org meudominio.org @@ -1112,7 +1112,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.meudominio.org @@ -1204,49 +1204,49 @@ Please write a bug report. <font color="green">A instalação de %1 concluída com sucesso!</font> - + The owncloud admin script can not be found. Setup can not be done. O script de adminstração de owncloud não foi encontrado. Não é possível correr o programa de instalação ou configuração. - + Creation of remote folder %1 could not be started. A criação da pasta remota %1 não pode ser iniciada. - + Remote folder %1 created successfully. Criação da pasta remota %1 com sucesso! - + The remote folder %1 already exists. Connecting it for syncing. A pasta remota %1 já existe. Ligue-a para sincronizar. - + The folder creation resulted in HTTP error code %1 A criação da pasta resultou num erro HTTP com o código %1 - + A sync connection from %1 to remote directory %2 was set up. A sincronização de %1 com a pasta remota %2 foi criada com sucesso. - + Succesfully connected to %1! Ligação com sucesso a %1 ! - + Connection to %1 could not be established. Please check again. Não foi possível ligar a %1 . Por Favor verifique novamente. - + Press Finish to permanently accept this connection. Escolha terminar para aceitar esta ligação permanentemente @@ -1259,12 +1259,12 @@ Não é possível correr o programa de instalação ou configuração. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> A pasta de sincronização locl %1 já existe, a configurar para sincronizar.<br/><br/> - + Creating local sync folder %1... A criar a pasta de sincronização local %1 ... @@ -1273,12 +1273,12 @@ Não é possível correr o programa de instalação ou configuração. - + ok ok - + failed. Falhou. @@ -1300,12 +1300,12 @@ Não é possível correr o programa de instalação ou configuração. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">A criação da pasta remota falhou, provavelmente por ter introduzido as credenciais erradas.</font><br/>Por favor, verifique as suas credenciais.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. A criação da pasta remota %1 falhou com o erro <tt>%2</tt>. @@ -1335,7 +1335,7 @@ Não é possível correr o programa de instalação ou configuração. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Parabéns! O seu <a href="%1" title="%1"> novo %2 </a> está ligado e a correr! @@ -1343,7 +1343,7 @@ Não é possível correr o programa de instalação ou configuração. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.meudominio.org diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 61e070371d..c4adace128 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Синхронизация начата для %1 выбранных папок. @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Открыть статусы... - + Add folder... Добавить папку... - + Configure... Настроить... - + Configure proxy... Конфигурация прокси... - + Quit Выйти @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } Ввод пароля был отменен! - - + + No %1 Connection Нет %1 подключения - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Ваши %1 учетные данные не верны.</p><p>Пожалуйста, запустите диалог настройки из трея и исправьте данные!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Либо имя пользователя либо пароль не верны.</p><p>Пожалуйста, запустите диалог настройки из трея и исправьте данные!</p> - + %1 Sync Started %1 Синхронизация начата - + Open %1 in browser... Открыть %1 в браузере... - + About... Про... - + Open %1 folder Открыть %1 папку - + Managed Folders: Управляемые папки: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> - + About %1 Про %1 - + Confirm Folder Remove Подтвердите удаление папки - + Do you really want to remove upload folder <i>%1</i>? Вы действительно хотите удалить папку загрузки <i>%1</i>? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Идет синхронизация. - + Server is currently not available. - + Last Sync was successful. Последняя синхронизация прошла успешно. - + Syncing Error. Ошибка синхронизации. - + Setup Error. Ошибка установки. - + Undefined Error State. Неопределенное состояние ошибки. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Синхронизация запущена - + The syncing operation is running.<br/>Do you want to terminate it? Синхронизация запущена.<br/>Вы хотите, остановить ее? - + Undefined State. Неопределенное состояние. - + Waits to start syncing. Ожидает, чтобы начать синхронизацию. - + (Sync is paused) (Синхронизация приостановлена) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Нет папок для синхронизации. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mydomain.org @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mydomain.org @@ -1203,49 +1203,49 @@ Please write a bug report. <font color="green">Установка %1 прошла успешно!</font> - + The owncloud admin script can not be found. Setup can not be done. Сценарий owncloud admin не может быть найден. Программа установки не может быть запущена. - + Creation of remote folder %1 could not be started. Создание удалённой папки %1 не может быть начато. - + Remote folder %1 created successfully. Удалённая папка %1 успешно создана. - + The remote folder %1 already exists. Connecting it for syncing. Удалённая папка %1 уже существует. Подключение к ней для синхронизации. - + The folder creation resulted in HTTP error code %1 Создание папки завершилось с HTTP-ошибкой %1 - + A sync connection from %1 to remote directory %2 was set up. Установлено соединение синхронизации с %1 к удалённой директории %2. - + Succesfully connected to %1! Успешно подключено к %1! - + Connection to %1 could not be established. Please check again. Подключение к %1 не воможно. Пожалуйста, проверьте еще раз. - + Press Finish to permanently accept this connection. Нажмите Finish чтобы постоянно принимать это соединение. @@ -1258,12 +1258,12 @@ Setup can not be done. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Локальная синхронизация папки %1 уже существует, ее настройки для синхронизации.<br/><br/> - + Creating local sync folder %1... Создание локальной папки синхронизации %1... @@ -1272,12 +1272,12 @@ Setup can not be done. - + ok ок - + failed. не удалось. @@ -1299,12 +1299,12 @@ Setup can not be done. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Удаленное создание папки не удалось, вероятно, потому, что предоставленные учетные данные неверны.</font><br/>Пожалуйста, вернитесь назад и проверьте данные.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Удаленная папка %1 не создана из-за ошибки <tt>%2</tt>. @@ -1334,7 +1334,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Поздравляем! Ваш <a href="%1" title="%1">новый %2</a> запущен и работает! @@ -1342,7 +1342,7 @@ Setup can not be done. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org diff --git a/translations/mirall_ru_RU.ts b/translations/mirall_ru_RU.ts index d406144ab5..7fa30b9804 100644 --- a/translations/mirall_ru_RU.ts +++ b/translations/mirall_ru_RU.ts @@ -295,7 +295,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Синхронизация запущена для %1для настроенных папок. @@ -304,27 +304,27 @@ p, li { white-space: pre-wrap; } - + Open status... Открытие статуса... - + Add folder... Добавление папки... - + Configure... Конфигурирование - + Configure proxy... Сконфигурировать прокси... - + Quit Выход @@ -379,63 +379,63 @@ p, li { white-space: pre-wrap; } Диалог ввода пароля был отменен! - - + + No %1 Connection Нет %1 подключения - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Ваши %1 учетные данные не верны.</p><p>Пожалуйста, исправьте их, запустив диалог настройки из панели!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Ваше имя пользователя или пароль не верны.</p><p>Пожалуйста, исправьте это, запустив диалог настройки из панели!</p> - + %1 Sync Started %1 синхронизация начата - + Open %1 in browser... Открыть %1 в браузере... - + About... О программе... - + Open %1 folder Открыть %1 папку - + Managed Folders: Управляемые папки: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>Построенный по Git-пересмотру<a href="%1">%2</a>на %3, %4<br>с использованием OCsync %5 и Qt %6.</small><p> - + About %1 О %1 - + Confirm Folder Remove Подтвердить удаление папки - + Do you really want to remove upload folder <i>%1</i>? Вы действительно хотите удалить папку загрузки <i>%1</i>? @@ -448,32 +448,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Идет синхронизация. - + Server is currently not available. - + Last Sync was successful. Последняя синхронизация была успешной. - + Syncing Error. Ошибка синхронизации. - + Setup Error. Ошибка установки. - + Undefined Error State. Состояние неопределенной ошибки. @@ -501,27 +501,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Идет синхронизация - + The syncing operation is running.<br/>Do you want to terminate it? Выполняется операция синхронизации.<br/>Хотите прекратить ее? - + Undefined State. Неопределенный статус. - + Waits to start syncing. Ожидает начала синхронизации. - + (Sync is paused) (Синхронизация приостановлена) @@ -530,7 +530,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Не сконфигурированы папки синхронизации. @@ -740,7 +740,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mydomain.org @@ -1101,7 +1101,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mydomain.org @@ -1193,49 +1193,49 @@ Please write a bug report. <font color="green">Установка %1 прошла успешно!</font> - + The owncloud admin script can not be found. Setup can not be done. Сценарий owncloud админ не может быть найден. Установка не может быть выполнена. - + Creation of remote folder %1 could not be started. Создание удаленной папки %1не может быть начато. - + Remote folder %1 created successfully. Удаленная папка %1успешно создана. - + The remote folder %1 already exists. Connecting it for syncing. Удаленная папка %1уже существует. Подключение ее для синхронизации. - + The folder creation resulted in HTTP error code %1 Создание папки привело к HTTP-ошибке с кодом %1 - + A sync connection from %1 to remote directory %2 was set up. Соединение синхронизации от %1 к удаленному каталогу %2 было установлено. - + Succesfully connected to %1! Успешно подключено к %1! - + Connection to %1 could not be established. Please check again. Подключение к %1 не может быть установлено. Пожалуйста, проверьте еще ​​раз. - + Press Finish to permanently accept this connection. Нажмите Готово для постоянного приема этого соединения. @@ -1248,12 +1248,12 @@ Setup can not be done. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Локальная папка синхронизации %1 уже существует, настройка ее для синхронизации.<br/><br/> - + Creating local sync folder %1... Создание локальной папки синхронизации %1... @@ -1262,12 +1262,12 @@ Setup can not be done. - + ok ok - + failed. не удалось. @@ -1289,12 +1289,12 @@ Setup can not be done. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Создание удаленной папки не удалось возможно по причине предоставления неверных учетных данных.</font><br/>Пожалуйста, вернитесь назад и проверьте Ваши учетные данные.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Создание удаленной папки %1не удалось с ошибкой <tt>%2</tt>. @@ -1324,7 +1324,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Поздравления! Ваш <a href="%1" title="%1">новый %2</a> сейчас установлен и запущен! @@ -1332,7 +1332,7 @@ Setup can not be done. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org diff --git a/translations/mirall_sk_SK.ts b/translations/mirall_sk_SK.ts index 3850228b46..32e2f4ab52 100644 --- a/translations/mirall_sk_SK.ts +++ b/translations/mirall_sk_SK.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Synchronizácia spustená pre %1 konfigurovaných synch. priečinkov. @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Otvoriť status... - + Add folder... Pridať priečinok... - + Configure... Konfigurovať... - + Configure proxy... Nastaviť proxy... - + Quit Ukončiť @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } Dialóg z heslom bol zrušený! - - + + No %1 Connection Žiadne %1 Spojenie - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Vaše %1 prihlasovacie údaje nie sú správne.</p><p>Prosím opravte ich vyvolaním konfiguračného dialógu z tray panela!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Vaše používateľské meno, prípadne heslo nie je správne.</p><p>Prosím opravte ho vyvolaním konfiguračného dialógu z tray lišty!</p> - + %1 Sync Started %1 Synchronizácia Začala - + Open %1 in browser... Otvoriť %1 v prehliadači... - + About... O... - + Open %1 folder Otvoriť %1 adresár - + Managed Folders: Spravované adresáre: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>Zostavené z Git revízie <a href="%1">%2</a> na %3, %4<br>používa OCsync %5 a Qt %6.</small><p> - + About %1 O %1 - + Confirm Folder Remove Potvrdiť odstránenie priečinka - + Do you really want to remove upload folder <i>%1</i>? Chcete rozhodne odstrániť priečinok na "upload" <i>%1</i>? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Synchronizácia prebieha. - + Server is currently not available. Server je teraz nedostupný. - + Last Sync was successful. Posledná synchronizácia úspešne skončila. - + Syncing Error. Synchronizačná chyba. - + Setup Error. Chyba pri inštalácii. - + Undefined Error State. Nedefinovaný chybový stav. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Prebiehajúca synchronizácia. - + The syncing operation is running.<br/>Do you want to terminate it? Proces synchronizácie práve prebieha.<br/>Chcete ho ukončiť? - + Undefined State. Nedefinovaný stav. - + Waits to start syncing. Čakanie na štart synchronizácie. - + (Sync is paused) (Synchronizácia zapauzovaná) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Nenastavené žiadne synchronizačné priečinky. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mojadomena.org @@ -1112,7 +1112,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mojadomena.org @@ -1204,49 +1204,49 @@ Please write a bug report. <font color="green">Inštalácia %1 úspešná!</font> - + The owncloud admin script can not be found. Setup can not be done. Skript potrebný k administrácii nebol nájdený. Inštalácia nemôže pokračovať. - + Creation of remote folder %1 could not be started. Proces vytvárania vzdialeného adresára %1 nebolo možné iniciovať. - + Remote folder %1 created successfully. Vzdialený adresár %1 úspešne vytvorený. - + The remote folder %1 already exists. Connecting it for syncing. Vzdialený adresár %1 už existuje. Prebieha jeho pripájanie pre synchronizáciu. - + The folder creation resulted in HTTP error code %1 Vytváranie adresára skončilo z HTTP chybovým kódom %1 - + A sync connection from %1 to remote directory %2 was set up. Synchronizačné spojenie z %1 do vzidaleného adresára %2 bolo práve nastavené. - + Succesfully connected to %1! Úspešne pripojené k %1! - + Connection to %1 could not be established. Please check again. Pripojenie k %1 nemohlo byť iniciované. Prosím skontrolujte znova. - + Press Finish to permanently accept this connection. Stlačte Dokončiť pre permanentnú akceptáciu daného spojenia. @@ -1259,12 +1259,12 @@ Inštalácia nemôže pokračovať. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Lokálny synch. priečinok %1 už existuje, prebieha jeho nastavovanie pre synchronizáciu.<br/><br/> - + Creating local sync folder %1... Vytváranie lokálneho synch. priečinka %1 ... @@ -1273,12 +1273,12 @@ Inštalácia nemôže pokračovať. - + ok v poriadku - + failed. neúspešné. @@ -1300,12 +1300,12 @@ Inštalácia nemôže pokračovať. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Vytvorenie vzdialeného priečinka pravdepodobne zlyhalo kvôli nesprávnym prihlasovacím údajom.</font><br/>Prosím choďte späť a skontrolujte ich.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Vytvorenie vzdialeného priečinka %1 zlyhalo s chybou <tt>%2</tt>. @@ -1335,7 +1335,7 @@ Inštalácia nemôže pokračovať. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Blahoprajeme! Váš <a href="%1" title="%1">nový %2</a> je konečne v prevádzke! @@ -1343,7 +1343,7 @@ Inštalácia nemôže pokračovať. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mojadomena.org diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index f5b4e51371..a9f75a7caf 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Usklajevanje se je začelo za naslednje število map: %1. @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Odpri stanje... - + Add folder... Dodaj mapo... - + Configure... Nastavi... - + Configure proxy... Nastavi proxy... - + Quit Končaj @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } Pogovorno okno za geslo je bilo zaprto! - - + + No %1 Connection Ni %1 povezave - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Vaša %1 poverila niso pravilna.</p><p>Prosimo, če jih popravite v nastavitvah!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Vaše uporabniško ime ali geslo ni pravilno.</p><p>Prosimo, če jih popravite v nastavitvah!</p> - + %1 Sync Started %1 Usklajevenje se je začelo - + Open %1 in browser... Odpri %1 v brskalniku ... - + About... O ... - + Open %1 folder Odpri %1 mapo - + Managed Folders: Upravljane mape: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> - + About %1 O %1 - + Confirm Folder Remove Potrdi odstranitev mape - + Do you really want to remove upload folder <i>%1</i>? Ali res želite odstraniti naloženo mapo <i>%1</i>? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Usklajevanje se izvaja. - + Server is currently not available. - + Last Sync was successful. Zadnje usklajevanje je bilo uspešno. - + Syncing Error. Napaka pri usklajevanju. - + Setup Error. Napaka nastavitev. - + Undefined Error State. Nedoločeno stanje napake. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Usklajevanje se izvaja - + The syncing operation is running.<br/>Do you want to terminate it? Izvaja se usklajevanje.<br/>Ali ga želite prekiniti? - + Undefined State. Nedoločeno stanje. - + Waits to start syncing. Čakam na začetek usklajevanja. - + (Sync is paused) (Usklajevanje je začasno prekinjeno) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Ni nastavljenih map za usklajevanje. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mojadomena.si @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mojadomena.si @@ -1203,49 +1203,49 @@ Please write a bug report. <font color="green">Namestitev %1 je bila uspešna!</font> - + The owncloud admin script can not be found. Setup can not be done. Skrbniška skripta za ownCloud ni bila najdena. Namestitev ne se ne more izvesti. - + Creation of remote folder %1 could not be started. Ustvarjanje oddaljene mape %1 ni bilo mogoče začeti. - + Remote folder %1 created successfully. Oddaljena mapa %1 je bila uspešno ustvarjena. - + The remote folder %1 already exists. Connecting it for syncing. Oddaljena mapa %1 že obstaja. Povezujem jo za usklajevanje. - + The folder creation resulted in HTTP error code %1 Ustvarjanje mape je povzročilo HTTP napako %1 - + A sync connection from %1 to remote directory %2 was set up. Usklajevalna povezava med %1 in oddaljeno mapo %2 je bila nastavljena. - + Succesfully connected to %1! Uspešno povezan na %1! - + Connection to %1 could not be established. Please check again. Povezavo z %1 ni bilo mogoče vzpostaviti. Prosimo, če poskusite znova. - + Press Finish to permanently accept this connection. Pritisnite Končaj, da trajno sprejmete to povezavo. @@ -1258,12 +1258,12 @@ Namestitev ne se ne more izvesti. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Lokalna mapa %1 že obstaja. Nastavljam jo za usklajevanje.<br/><br/> - + Creating local sync folder %1... Ustvarjam mapo za lokalno usklajevanje %1... @@ -1272,12 +1272,12 @@ Namestitev ne se ne more izvesti. - + ok je v redu - + failed. je spodletelo. @@ -1299,12 +1299,12 @@ Namestitev ne se ne more izvesti. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Ustvarjanje oddaljene mape je spodletelo. Najverjetneje je vzrok v napačnih poverilih.</font><br/>Prosimo, pojdite nazaj in preverite svoja poverila.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Ustvarjanje oddaljene mape %1 je spodletelo z napako <tt>%2</tt>. @@ -1334,7 +1334,7 @@ Namestitev ne se ne more izvesti. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Čestitamo! Vaš <a href="%1" title="%1">nov %2</a> sedaj deluje! @@ -1342,7 +1342,7 @@ Namestitev ne se ne more izvesti. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mojadomena.si diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index 068e1fb4bf..8a094a1cd0 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Synkroniseringen har startat för %1 synkroniseringskatalog(er). @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Öppna status... - + Add folder... Lägg till en mapp... - + Configure... Konfigurera... - + Configure proxy... Konfigurera proxy... - + Quit Avsluta @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } Lösenordsrutan avbröts! - - + + No %1 Connection Ingen %1 anslutning - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Dina %1 inloggningsuppgifter stämmer inte.</p><p>Kontrollera uppgifterna genom att välja Konfigurera på ownCloud-ikonen i systemfältet!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Felaktigt användarnamn eller lösenord.</p><p>Kontrollera genom att välja Konfigurera på ownCloud-ikonen i systemfältet!</p> - + %1 Sync Started %1 Synk startad - + Open %1 in browser... Öppna %1 i webbläsaren... - + About... Om... - + Open %1 folder Öppna %1 mappen - + Managed Folders: Hanterade mappar: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>Byggd från Git revision <a href="%1">%2</a> på %3, %4<br>använt OCsync %5 och Qt %6.</small><p> - + About %1 Om %1 - + Confirm Folder Remove Bekräfta radering av mapp - + Do you really want to remove upload folder <i>%1</i>? Vill du verkligen ta bort uppladdningsmapp <i>%1</i>? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Synkronisering pågår. - + Server is currently not available. Servern är för närvarande inte tillgänglig. - + Last Sync was successful. Senaste synkronisering lyckades. - + Syncing Error. Synkroniseringsfel. - + Setup Error. Inställningsfel. - + Undefined Error State. Odefinierat fel. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Synkronisering pågår - + The syncing operation is running.<br/>Do you want to terminate it? En synkronisering pågår.<br/>Vill du avbryta den? - + Undefined State. Okänt tillstånd. - + Waits to start syncing. Väntar på att starta synkronisering. - + (Sync is paused) (Synk är stoppad) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Ingen synkroniseringsmapp är konfigurerad. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mindomän.org @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mindomän.org @@ -1203,49 +1203,49 @@ Please write a bug report. <font color="green">Installationen av %1 lyckades!</font> - + The owncloud admin script can not be found. Setup can not be done. Admin-skriptet kan inte hittas. Inställning kan inte utföras. - + Creation of remote folder %1 could not be started. Skapande av fjärrmapp %1 kunde inte startas. - + Remote folder %1 created successfully. Fjärrmapp %1 har skapats. - + The remote folder %1 already exists. Connecting it for syncing. Fjärrmappen %1 finns redan. Ansluter den för synkronisering. - + The folder creation resulted in HTTP error code %1 Skapande av mapp resulterade i HTTP felkod %1 - + A sync connection from %1 to remote directory %2 was set up. En synkroniseringsanslutning från %1 till fjärrmappen %2 har skapats. - + Succesfully connected to %1! Lyckades ansluta till %1! - + Connection to %1 could not be established. Please check again. Anslutningen till %1 kunde inte etableras. Var god kontrollera och försök igen. - + Press Finish to permanently accept this connection. Tryck på Slutför för att permanent acceptera denna anslutning. @@ -1258,12 +1258,12 @@ Inställning kan inte utföras. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Lokal synkmapp %1 finns redan, aktiverar den för synk.<br/><br/> - + Creating local sync folder %1... Skapar lokal synkmapp %1... @@ -1272,12 +1272,12 @@ Inställning kan inte utföras. - + ok ok - + failed. misslyckades. @@ -1299,12 +1299,12 @@ Inställning kan inte utföras. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Misslyckades skapa fjärrmappen, troligen p.g.a felaktiga inloggningsuppgifter.</font><br/>Vänligen kontrollera dina inloggningsuppgifter.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Misslyckades skapa fjärrmapp %1 med fel <tt>%2</tt>. @@ -1334,7 +1334,7 @@ Inställning kan inte utföras. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Gratulerar! Din <a href="%1" title="%1">nya %2</a> är nu startad! @@ -1342,7 +1342,7 @@ Inställning kan inte utföras. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org diff --git a/translations/mirall_ta_LK.ts b/translations/mirall_ta_LK.ts index 10c143c9e7..ac655e2c9d 100644 --- a/translations/mirall_ta_LK.ts +++ b/translations/mirall_ta_LK.ts @@ -296,7 +296,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). தகவமைக்கப்பட்ட கோப்புறையில் (களில்) %1 ஒத்திசைக்க தொடங்கியுள்ளது. @@ -305,27 +305,27 @@ p, li { white-space: pre-wrap; } - + Open status... திறந்த நிலை... - + Add folder... கோப்புறையை சேர்க்க... - + Configure... தகவமைத்தல்... - + Configure proxy... proxy ஐ தகவமைக்குக... - + Quit விலகுக @@ -380,63 +380,63 @@ p, li { white-space: pre-wrap; } கடவுச்சொல் - - + + No %1 Connection %1 இணைப்பு இல்லை - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>உங்களுடைய %1 சான்று ஆவணம் சரியாக இல்லை.</p> <p>தயவுசெய்து தட்டில் உள்ள dialog ஐ தகவமைப்பதை ஆரம்பிப்பதன் மூலம் சரி செய்க!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>உங்களுடைய பயனாளர் பெயர் அல்லது கடவுச்சொல் சரியானது அல்ல.</p><p>தயவுசெய்து தட்டில் உள்ள dialog ஐ தகவமைப்பதை ஆரம்பிப்பதன் மூலம் சரி செய்க!</p> - + %1 Sync Started %1 ஒத்திசைவு ஆரம்பிக்கப்பட்டுள்ளது - + Open %1 in browser... %1 ஐ உலாவியில் திறக்க - + About... பற்றி்... - + Open %1 folder %1 கோப்புறையை திறக்க - + Managed Folders: கட்டுப்படுத்தப்பட்ட கோப்புறை : - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> - + About %1 %1 பற்றி - + Confirm Folder Remove கோப்புறை அகற்றுவதை உறுதிப்படுத்துக - + Do you really want to remove upload folder <i>%1</i>? உங்களுக்கு பதிவேற்றப்பட்ட கோப்புறையை அகற்றவேண்டுமா <i>%1</i>? @@ -449,32 +449,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. ஒத்திசைவு ஓடிக்கொண்டிருக்கின்றது. - + Server is currently not available. - + Last Sync was successful. இறுதி ஒத்திசைவு வெற்றிகரமானது. - + Syncing Error. ஒத்திசைவில் வழு - + Setup Error. நிறுவு வழு - + Undefined Error State. வரையறுக்கப்படாத வழு நிலைமை @@ -502,27 +502,27 @@ p, li { white-space: pre-wrap; } - + Sync Running ஒத்திசைவு ஓடிக்கொண்டிருக்கின்றன - + The syncing operation is running.<br/>Do you want to terminate it? ஒத்திசைவு செயல் ஓடிக்கொண்டிருக்கிருக்கின்றன. <br/>உங்களுக்கு இதை முடிக்கவேண்டுமா? - + Undefined State. வரையறுக்கப்படாத நிலை - + Waits to start syncing. ஒத்திசைவை ஆரம்பிக்க காத்திருக்கின்றது. - + (Sync is paused) (ஒத்திசைவு நிறுத்தப்பட்டது) @@ -531,7 +531,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. ஒத்திசைவு கோப்புறைகள் தவகமைக்கப்படவில்லை. @@ -741,7 +741,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mydomain.org @@ -1102,7 +1102,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mydomain.org @@ -1194,48 +1194,48 @@ Please write a bug report. <font color="பச்சை">வெற்றிகரமாக %1 நிறுவப்பட்டது!</font> - + The owncloud admin script can not be found. Setup can not be done. owncloud இன் நிர்வாக விரிவுரைக் குறிப்பை கண்டுப்பிடிக்கமுடியவில்லை.⏎ அமைப்பை செய்ய முடியவில்லை. - + Creation of remote folder %1 could not be started. தொலைவு கோப்புறை %1 ஐ உருவாக்கலை ஆரம்பிக்கமுடியாது. - + Remote folder %1 created successfully. தொலைவு கோப்புறை %1 ஐ வெற்றிகரமாக உருவாக்கப்பட்டது. - + The remote folder %1 already exists. Connecting it for syncing. தொலைவு கோப்புறை %1 ஏற்கனவே உள்ளது. ஒத்திசைவிற்காக அவற்றை இணைக்குக. - + The folder creation resulted in HTTP error code %1 கோப்புறை உருவாக்கத்தின் முடிவு HTTP வழு குறியீடு %1 - + A sync connection from %1 to remote directory %2 was set up. %1 முதல் தொலைவு அடைவு %2 வரை ஒரு ஒத்திசைவு இணைப்பு அமைக்கப்பட்டது. - + Succesfully connected to %1! %1 இற்கு வெற்றிகரமாக இணைக்கப்பட்டது! - + Connection to %1 could not be established. Please check again. %1 இற்கு இணைப்பை ஏற்படுத்தமுடியவில்லை. தயவுசெய்து மீண்டும் சரிபார்க்க. - + Press Finish to permanently accept this connection. இந்த இணைப்பை நிரந்தரமாக ஏற்றுக்கொள்வதற்கு முடிவை அழுத்துக @@ -1248,12 +1248,12 @@ Setup can not be done. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> இடத்துரி ஒத்திசைவு கோப்புறை %1 ஏற்கனவே உள்ளது, ஒத்திசைவிற்கு அமைக்குக. <br/><br/> - + Creating local sync folder %1... இடத்துரி ஒத்திசைவு கோப்புறை %1 உருவாக்கல் @@ -1262,12 +1262,12 @@ Setup can not be done. - + ok சரி - + failed. தோல்வியுற்றது. @@ -1289,12 +1289,12 @@ Setup can not be done. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="சிகப்பு">தொலைவு கோப்புறை உருவாக்கல் தோல்வியுற்றது ஏனென்றால் அநேகமாக வழங்கப்பட்ட சான்று ஆவணம் தவறானதாக இருக்கலாம்.</font><br/>தயவுசெய்து முன்னால் சென்று உங்களுடைய சான்று ஆவணத்தை சரிபார்க்க. </p> - + Remote folder %1 creation failed with error <tt>%2</tt>. ​தொலைவு கோப்புறை %1 உருவாக்கல் இந்த வழுவுடன் <tt>%2</tt> தோல்வியுற்றது @@ -1324,7 +1324,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! வாழ்த்துக்கள்! உங்களுடைய <a href="%1" title="%1"> புதிய %2 </a> இப்போது ஓடுகிறது! @@ -1332,7 +1332,7 @@ Setup can not be done. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org diff --git a/translations/mirall_th_TH.ts b/translations/mirall_th_TH.ts index eace3d65ad..58a81c99ba 100644 --- a/translations/mirall_th_TH.ts +++ b/translations/mirall_th_TH.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). เริ่มผสานข้อมูลแล้วสำหรับ %1 โฟลเดอร์ที่ถูกกำหนดให้ผสานข้อมูล @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... เปิดสถานะ... - + Add folder... เพิ่มโฟลเดอร์... - + Configure... กำหนดค่า... - + Configure proxy... กำหนดค่าพร็อกซี่... - + Quit ออก @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } กล่องโต้ตอบรหัสผ่านถูกยกเลิกแล้ว! - - + + No %1 Connection ยังไม่มีการเชื่อมต่อ %1 - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>ข้อมูลประจำตัว %1 ของคุณไม่ถูกต้อง.</p><p>กรุณาแก้ไขข้อมูลดังกล่าวด้วยการเปิดกล่องโต้ตอบเพื่อกำหนดค่าจากถาดเครื่องมือ!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>ชื่อผู้ใช้งาน หรือรหัสผ่านของคุณไม่ถูกต้อง.</p><p>กรุณาแก้ไขให้ถูกต้องโดยเปิดกล่องโต้ตอบเพื่อกำหนดค่าจากถาดเครื่องมือ!</p> - + %1 Sync Started การซิงค์ข้อมูล %1 เริ่มต้นแล้ว - + Open %1 in browser... เปิด %1 ในโปรแกราบราวเซอร์... - + About... เกี่ยวกับ... - + Open %1 folder เปิดโฟลเดอร์ %1 - + Managed Folders: โฟลเดอร์ที่มีการจัดการแล้ว: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>สร้างจาก Git revision <a href="%1">%2</a> เมื่อ %3, %4<br>โดยใช้ OCsync %5 และ Qt %6.</small><p> - + About %1 เกี่ยวกับ %1 - + Confirm Folder Remove ยืนยันการลบโฟลเดอร์ - + Do you really want to remove upload folder <i>%1</i>? คุณแน่ใจแล้วหรือว่าต้องการลบโฟลเดอร์ที่อัพโหลด <i>%1-</i>นี้ทิ้งไป? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. การซิงค์ข้อมูลกำลังทำงาน - + Server is currently not available. เซิร์ฟเวอร์ไม่สามารถใช้งานได้ขณะนี้ - + Last Sync was successful. การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว - + Syncing Error. การซิงค์ข้อมูลเกิดข้อผิดพลาด - + Setup Error. เกิดข้อผิดพลาดในการติดตั้ง - + Undefined Error State. ไม่สามารถระบุข้อผิดพลาดได้ @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running การซิงค์ข้อมูลกำลังทำงาน - + The syncing operation is running.<br/>Do you want to terminate it? การดำเนินการเพื่อถ่ายโอนข้อมูลกำลังทำงานอยู่ <br/>คุณต้องการสิ้นสุดการทำงานหรือไม่? - + Undefined State. สถานะที่ยังไม่ได้ถูกกำหนด - + Waits to start syncing. รอการเริ่มต้นซิงค์ข้อมูล - + (Sync is paused) (การผสานข้อมูลถูกหยุดชั่วคราว) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. ยังไม่มีการกำหนดค่าโฟลเดอร์ที่ต้องการซิงค์ข้อมูล @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mydomain.org @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mydomain.org @@ -1203,49 +1203,49 @@ Please write a bug report. <font color="green">การติดตั้ง %1 เสร็จสิ้นแล้ว!</font> - + The owncloud admin script can not be found. Setup can not be done. ไม่พบสคริปต์ของผู้ดูแล owncloud . ไม่สามารถตั้งค่าได้. - + Creation of remote folder %1 could not be started. การสร้างโฟลเดอร์ระยะไกล %1 ไม่สามารถเริ่มต้นได้ - + Remote folder %1 created successfully. โฟลเดอร์ระยะไกล %1 ถูกสร้างเรียบร้อยแล้ว - + The remote folder %1 already exists. Connecting it for syncing. โฟลเดอร์ระยะไกล %1 มีอยู่แล้ว กำลังเชื่อมต่อเพื่อถ่ายโอนข้อมูล - + The folder creation resulted in HTTP error code %1 การสร้างโฟลเดอร์ดังกล่าวส่งผลให้เกิดรหัสข้อผิดพลาด HTTP error code %1 - + A sync connection from %1 to remote directory %2 was set up. การเชื่อมต่อเผื่อผสานข้อมูลจาก %1 ไปที่ไดเร็กทอรี่ระยะไกล %2 ได้ถูกติดตั้งแล้ว - + Succesfully connected to %1! เชื่อมต่อกับ %1 เสร็จเรียบร้อยแล้ว! - + Connection to %1 could not be established. Please check again. การเชื่อมต่อกับ %1 ไม่สามารถดำเนินการได้ กรุณาตรวจสอบอีกครั้ง - + Press Finish to permanently accept this connection. กดที่ปุ่ม สิ้นสุด เพื่ออนุมัติการเชื่อมต่อนี้เป็นการถาวร @@ -1258,12 +1258,12 @@ Setup can not be done. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> โฟลเดอร์สำหรับถ่ายโอนข้อมูลภายในเครื่อง %1 มีอยู่แล้ว กรุณาตั้งค่าเพื่อถ่ายข้อมูล <br/<br/> - + Creating local sync folder %1... กำลังสร้างโฟลเดอร์สำหรับโอนถ่ายข้อมูลภายในเครื่อง %1 ... @@ -1272,12 +1272,12 @@ Setup can not be done. - + ok ตกลง - + failed. ล้มเหลว @@ -1299,12 +1299,12 @@ Setup can not be done. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">การสร้างโฟลเดอร์ระยะไกลล้มเหลว ซึ่งอาจมีสาเหตุมาจากการกรอกข้อมูลส่วนตัวเพื่อเข้าใช้งานไม่ถูกต้อง.</font><br/>กรุณาย้อนกลับไปแล้วตรวจสอบข้อมูลส่วนตัวของคุณอีกครั้ง.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. การสร้างโฟลเดอร์ระยะไกล %1 ล้มเหลวเนื่องข้อผิดพลาด <tt>%2</tt> @@ -1334,7 +1334,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! ขอแสดงความยินดี! <a href="%1" title="%1">new %2</a> ของคุณได้รับการปรับปรุงแล้ว! @@ -1342,7 +1342,7 @@ Setup can not be done. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index e42ed1e1c1..bf42f0fc2e 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Почалась синхронізація для %1 тек. @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Відкривається статус... - + Add folder... Додати теку... - + Configure... Налаштування... - + Configure proxy... Налаштування проксі... - + Quit Вийти @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } Діалог вводу пароля був скасований! - - + + No %1 Connection Відсутнє %1 підключення - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Ваші %1 облікові дані помилкові.</p><p>Будь ласка, виправте їх шляхом запуску діалогу конфігурації із трея!</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Ваше ім'я користувача або пароль вказано не вірно.</p><p>Будь ласка, виправте їх шляхом запуску діалогу конфігурації із трея!</p> - + %1 Sync Started %1 синхронізація розпочата - + Open %1 in browser... Відкрити %1 у браузері... - + About... Про... - + Open %1 folder Відкрити %1 теку - + Managed Folders: Керовані теки: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>Створено з версії Git <a href="%1">%2</a> на %3, %4<br>використовуючи OCsync %5 та Qt %6.</small><p> - + About %1 Про %1 - + Confirm Folder Remove Підтвердіть видалення теки - + Do you really want to remove upload folder <i>%1</i>? Ви дійсно бажаєто видалити теку завантаження <i>%1</i>? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Синхронізація запущена. - + Server is currently not available. - + Last Sync was successful. Остання синхронізація була успішною. - + Syncing Error. Помилка синхронізації. - + Setup Error. Помилка установки. - + Undefined Error State. Невизначена помилка. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Виконується синхронізація - + The syncing operation is running.<br/>Do you want to terminate it? Виконується процедура синхронізації.<br/>Бажаєте відмінити? - + Undefined State. Невизначений стан. - + Waits to start syncing. Очікування початку синхронізації. - + (Sync is paused) (Синхронізація призупинена) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Жодна тека не налаштована для синхронізації. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mydomain.org @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mydomain.org @@ -1203,49 +1203,49 @@ Please write a bug report. <font color="green">Інсталяція %1 завершилась успішно!</font> - + The owncloud admin script can not be found. Setup can not be done. Відсутній owncloud admin скрипт. Установка не можлива. - + Creation of remote folder %1 could not be started. Створення віддаленої теки %1 не вдається розпочати. - + Remote folder %1 created successfully. Віддалена тека %1 успішно створена. - + The remote folder %1 already exists. Connecting it for syncing. Віддалена тека %1 вже існує. Під'єднання для синхронізації. - + The folder creation resulted in HTTP error code %1 Створення теки завершилось HTTP помилкою %1 - + A sync connection from %1 to remote directory %2 was set up. З'єднання для синхронізації %1 з віддаленою текою %2 було встановлено. - + Succesfully connected to %1! Успішно підключено до %1! - + Connection to %1 could not be established. Please check again. Підключення до %1 встановити не вдалося. Будь ласка, перевірте ще раз. - + Press Finish to permanently accept this connection. Натисніть Готово, щоб постійно приймати це підключення. @@ -1258,12 +1258,12 @@ Setup can not be done. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Локальна тека синхронізації %1 вже існує, налаштування її для синхронізації.<br/><br/> - + Creating local sync folder %1... Створення локальної теки для синхронізації %1... @@ -1272,12 +1272,12 @@ Setup can not be done. - + ok ok - + failed. не вдалося. @@ -1299,12 +1299,12 @@ Setup can not be done. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Створити віддалену теку не вдалося, можливо, через невірно вказані облікові дані.</font><br/>Будь ласка, поверніться назад та перевірте облікові дані.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Не вдалося створити віддалену теку %1 через помилку <tt>%2</tt>. @@ -1334,7 +1334,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Вітаємо! Ваш <a href="%1" title="%1">новий %2</a> встановлено і запущено! @@ -1342,7 +1342,7 @@ Setup can not be done. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org diff --git a/translations/mirall_vi.ts b/translations/mirall_vi.ts index a19fe90180..f5e6c0c152 100644 --- a/translations/mirall_vi.ts +++ b/translations/mirall_vi.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). Bắt đầu đồng bộ %1 thư mục đồng bộ cấu hình. @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... Mở trạng thái ... - + Add folder... Thêm folder... - + Configure... Cấu hình ... - + Configure proxy... Cấu hình proxy... - + Quit Thoát @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } Hộp thoại mật khẩu đã bị hủy! - - + + No %1 Connection Không có %1 kết nối - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>Thông tin %1 của bạn không chính xác.</p><p>Vui lòng chỉnh sửa lại chúng từ hộp thoại cấu hình</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>Hay do tên người dùng hoặc mật khẩu của bạn không đúng.</p><p>Vui lòng chỉnh sửa lại từ hộp thoại cấu hình!</p> - + %1 Sync Started %1 Đồng bộ dữ liệu đã bắt đầu - + Open %1 in browser... Mở %1 trong trình duyệt ... - + About... Về... - + Open %1 folder Mở %1 thư mục - + Managed Folders: Quản lý thư mục: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> - + About %1 Về %1 - + Confirm Folder Remove Xác nhận xóa thư mục - + Do you really want to remove upload folder <i>%1</i>? Bạn có thật sự muốn xóa thư mục tải lên <i>%1</i>? @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. Đang đồng bộ. - + Server is currently not available. - + Last Sync was successful. Lần đồng bộ sau cùng thành công - + Syncing Error. Đồng bộ Lỗi. - + Setup Error. Thiết lập lỗi. - + Undefined Error State. Tình trạng lỗi không xác định. @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running Đang đồng bộ - + The syncing operation is running.<br/>Do you want to terminate it? Hoạt động đồng bộ đang được thực hiện.<br/>Bạn có muốn hủy nó? - + Undefined State. Tình trạng không xác định. - + Waits to start syncing. Vui lòng chờ đang bắt đầu đồng bộ. - + (Sync is paused) (Đồng bộ dữ liệu tạm dừng) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. Không đồng bộ những thư mục đã được cấu hình. @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mydomain.org @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mydomain.org @@ -1203,48 +1203,48 @@ Please write a bug report. <font color="green">Cài đặt của %1 đã thành công!</font> - + The owncloud admin script can not be found. Setup can not be done. script owncloud-admin không được tìm thấy.⏎ Hệ thống không thể thực hiện. - + Creation of remote folder %1 could not be started. Khởi tạo thư mục từ xa %1 không thể thực hiện. - + Remote folder %1 created successfully. Thư mục từ xa %1 đã được tạo thành công. - + The remote folder %1 already exists. Connecting it for syncing. Thư mục từ xa %1 đã tồn tại. Kết nối nó để đồng bộ dữ liệu. - + The folder creation resulted in HTTP error code %1 Việc tạo thư mục đã dẫn đến mã lỗi HTTP %1 - + A sync connection from %1 to remote directory %2 was set up. Một kết nối đồng bộ từ %1 đến thư mục từ xa %2 được thiết lập. - + Succesfully connected to %1! Đã kết nối thành công đến %1! - + Connection to %1 could not be established. Please check again. Kết nối đến %1 không thể thiết lập. Vui lòng kiểm tra lại. - + Press Finish to permanently accept this connection. Nhấn hoàn thành để chấp nhận kết nối này. @@ -1257,12 +1257,12 @@ Setup can not be done. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Đồng bộ thư mục cục bộ %1 đã tồn tại, thiết lập nó để đồng bộ. <br/> <br/> - + Creating local sync folder %1... Tạo thư mục đồng bộ cục bộ %1... @@ -1271,12 +1271,12 @@ Setup can not be done. - + ok Đồng ý - + failed. Thất bại. @@ -1298,12 +1298,12 @@ Setup can not be done. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">tạo thư mục từ xa không thành công có thể là các thông tin cung cấp bị sai. </ font> <br/> Xin vui lòng quay trở lại và kiểm tra lại thông tin của bạn. </ p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Truy cập thư mục %1 tạo thất bại với lỗi <tt>%2</tt>. @@ -1333,7 +1333,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! Xin chúc mừng! <a href="%1" title="%1">%2</a> mới của bạn đã hoàn tất và đang chạy! @@ -1341,7 +1341,7 @@ Setup can not be done. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index de697c8dc9..d048ba5f15 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). 开始同步已配置的同步文件夹 %1 @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... 打开 状态... - + Add folder... 添加文件夹... - + Configure... 配置... - + Configure proxy... 配置代理… - + Quit 退出 @@ -390,63 +390,63 @@ p, li { white-space: pre-wrap; } 密码输出框已被取消！ - - + + No %1 Connection %1 连接失败 - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>您的 %1 信息不正确。</p><p>请从托盘图标处启动配置对话框并更正之！</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>您的用户名或密码不正确。</p><p>请从托盘图标处启动配置对话框并更改</p> - + %1 Sync Started %1 同步已启动 - + Open %1 in browser... 在浏览器中打开%1…… - + About... 关于 - + Open %1 folder 打开 %1 目录 - + Managed Folders: 管理的文件夹： - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>从 Git 版本构建 <a href="%1">%2</a> %3, %4<br>需使用 OCsync %5 和 Qt %6。</small><p> - + About %1 关于%1 - + Confirm Folder Remove 确认移除文件夹 - + Do you really want to remove upload folder <i>%1</i>? 您确定想要移除上传文件夹 <i>%1</i>? @@ -459,32 +459,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. 同步正在运行。 - + Server is currently not available. 服务器当前不可用。 - + Last Sync was successful. 最后一次同步成功。 - + Syncing Error. 同步失败。 - + Setup Error. 安装失败 - + Undefined Error State. 未知错误状态 @@ -512,27 +512,27 @@ p, li { white-space: pre-wrap; } - + Sync Running 同步正在运行 - + The syncing operation is running.<br/>Do you want to terminate it? 正在执行同步。<br />您确定要关闭它吗？ - + Undefined State. 未知状态。 - + Waits to start syncing. 等待启动同步。 - + (Sync is paused) (同步已暂停) @@ -541,7 +541,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. 没有已配置的同步文件夹。 @@ -751,7 +751,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mydomain.org @@ -1112,7 +1112,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mydomain.org @@ -1204,49 +1204,49 @@ Please write a bug report. <font color="green">%1安装成功</font> - + The owncloud admin script can not be found. Setup can not be done. owncloud admin 脚本未找到。 设置无法完成。 - + Creation of remote folder %1 could not be started. 无法启动远程文件夹 %1的创建过程。 - + Remote folder %1 created successfully. 远程目录%1成功创建。 - + The remote folder %1 already exists. Connecting it for syncing. 远程文件夹 %1 已存在。连接它以供同步。 - + The folder creation resulted in HTTP error code %1 创建文件夹出现 HTTP 错误代码 %1 - + A sync connection from %1 to remote directory %2 was set up. 已经设置了一个 %1 到远程文件夹 %2 的同步连接 - + Succesfully connected to %1! 成功连接到 %1！ - + Connection to %1 could not be established. Please check again. 无法建立到 %1的链接，请稍后重试 - + Press Finish to permanently accept this connection. 按完成以永久接受此连接。 @@ -1259,12 +1259,12 @@ Setup can not be done. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> 本地同步文件夹 %1 已存在，将使用它来同步。<br/><br/> - + Creating local sync folder %1... 正在创建本地同步文件夹 %1... @@ -1273,12 +1273,12 @@ Setup can not be done. - + ok 成功 - + failed. 失败 @@ -1300,12 +1300,12 @@ Setup can not be done. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">远程文件夹创建失败，可能是由于提供的用户名密码不正确。</font><br/>请返回并检查它们。</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. 创建远程文件夹 %1 失败，错误为 <tt>%2</tt>。 @@ -1335,7 +1335,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! 恭喜！您的 <a href="%1" title="%1">新 %2</a> 已经启动并运行！ @@ -1343,7 +1343,7 @@ Setup can not be done. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts index f807973224..84237346a0 100644 --- a/translations/mirall_zh_TW.ts +++ b/translations/mirall_zh_TW.ts @@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; } - + Sync started for %1 configured sync folder(s). 開始同步 %1 已組態的同步資料夾 @@ -314,27 +314,27 @@ p, li { white-space: pre-wrap; } - + Open status... 查看狀態... - + Add folder... 添加資料夾... - + Configure... 配置... - + Configure proxy... 設定代理伺服器... - + Quit 離開 @@ -389,63 +389,63 @@ p, li { white-space: pre-wrap; } 密碼對話框被取消! - - + + No %1 Connection 無%1 連線 - + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> <p>您的%1 帳號密碼不正確</P> <p>請藉由右下角ownCloud圖示去更正</p> - + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> <p>您的帳號或密碼錯誤</p><p>請藉由右下角ownCloud圖示去更正</p> - + %1 Sync Started %1同步已經開始 - + Open %1 in browser... 瀏覽器中開啟%1 - + About... 關於... - + Open %1 folder 開啟%1資料夾 - + Managed Folders: 管理的資料夾: - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> <p><small>基於 Git 版本 <a href="%1">%2</a> 在 %3, %4<br>使用 OCsync %5 和 Qt %6.</small><p> - + About %1 關於 %1 - + Confirm Folder Remove 確認移除資料夾 - + Do you really want to remove upload folder <i>%1</i>? 你確定要移除上傳資料夾 <i>%1</i> @@ -458,32 +458,32 @@ p, li { white-space: pre-wrap; } - + Sync is running. 同步執行中 - + Server is currently not available. 伺服器目前無法使用。 - + Last Sync was successful. 最後一次同步成功 - + Syncing Error. 同步失敗 - + Setup Error. 安裝失敗 - + Undefined Error State. 未知的錯誤狀態 @@ -511,27 +511,27 @@ p, li { white-space: pre-wrap; } - + Sync Running 同步中 - + The syncing operation is running.<br/>Do you want to terminate it? 正在同步中<br/>你真的想要中斷？ - + Undefined State. 未知狀態 - + Waits to start syncing. 等待啟動同步 - + (Sync is paused) (同步暫停) @@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; } - + No sync folders configured. 無已配置的同步資料夾 @@ -750,7 +750,7 @@ Please write a bug report. Mirall::CreateAnOwncloudPage - + mydomain.org mydomain.org @@ -1111,7 +1111,7 @@ Please write a bug report. Mirall::OwncloudFTPAccessPage - + ftp.mydomain.org ftp.mydomain.org @@ -1203,49 +1203,49 @@ Please write a bug report. <font color="green">安裝 %1 成功!</font> - + The owncloud admin script can not be found. Setup can not be done. 無法找到ownCloud admin腳本 設定無法完成 - + Creation of remote folder %1 could not be started. 無法開始建立遠端資料夾%1 - + Remote folder %1 created successfully. 遠端資料夾%1建立成功! - + The remote folder %1 already exists. Connecting it for syncing. 遠端資料夾%1已存在,連線同步中 - + The folder creation resulted in HTTP error code %1 在HTTP建立資料夾失敗, error code %1 - + A sync connection from %1 to remote directory %2 was set up. 從%1到遠端資料夾%2的連線已建立 - + Succesfully connected to %1! 成功的連線到%1 - + Connection to %1 could not be established. Please check again. 無法建立連線%1, 請重新檢查 - + Press Finish to permanently accept this connection. 按完成永久接受此連線 @@ -1258,12 +1258,12 @@ Setup can not be done. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> 本地同步資料夾%1已存在, 將其設置為同步<br/><br/> - + Creating local sync folder %1... 建立本地同步資料夾 %1 @@ -1272,12 +1272,12 @@ Setup can not be done. - + ok ok - + failed. 失敗 @@ -1299,12 +1299,12 @@ Setup can not be done. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">遠端資料夾建立失敗,也許是因為所提供的帳號密碼錯誤</font><br/>請重新檢查您的帳號密碼</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. 建立遠端資料夾%1發生錯誤<tt>%2</tt>失敗 @@ -1334,7 +1334,7 @@ Setup can not be done. - + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! 恭喜!您的 <a href="%1" title="%1">new %2</a>啟用並執行中! @@ -1342,7 +1342,7 @@ Setup can not be done. Mirall::OwncloudWizardSelectTypePage - + http://owncloud.mydomain.org http://owncloud.mydomain.org From a617a04295261fcc0ee9b54a92c5df8c5f64f659 Mon Sep 17 00:00:00 2001 From: LukeOwncloud Date: Thu, 7 Feb 2013 08:50:49 +0100 Subject: [PATCH 19/24] Update doc/usage.rst --- doc/usage.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/usage.rst b/doc/usage.rst index cef8404da9..0670dbcf83 100644 --- a/doc/usage.rst +++ b/doc/usage.rst @@ -36,12 +36,14 @@ Config File .. index:: config file ownCloud Client reads a configuration file which on Linux can be found at ``$HOME/.local/share/data/ownCloud/owncloud.cfg`` -On Windows, it can be found in ``\Users\\AppData\Local\ownCloud\owncloud.cfg`` +On Windows, it can be found in ``%LOCALAPPDATA%\ownCloud\owncloud.cfg`` .. todo:: Mac? It contains settings in the ini file format known from Windows. .. note:: Changes here should be done carefully as wrong settings can cause disfunctionality. +.. note:: Changes may be overwritten by using ownCloud's configuration dialog. + These are config settings that may be changed: From f75eb24bfe43e9a20d5a9ca0e7eb602782d0d7a4 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 8 Feb 2013 00:14:28 +0100 Subject: [PATCH 20/24] [tx-robot] updated from transifex --- translations/mirall_lv.ts | 2109 +++++++++++++++++++++++++++++++++++++ translations/mirall_uk.ts | 50 +- 2 files changed, 2134 insertions(+), 25 deletions(-) create mode 100644 translations/mirall_lv.ts diff --git a/translations/mirall_lv.ts b/translations/mirall_lv.ts new file mode 100644 index 0000000000..7edf907951 --- /dev/null +++ b/translations/mirall_lv.ts @@ -0,0 +1,2109 @@ + + + CreateAnOwncloudPage + + + Form + Forma + + + + Create a new ownCloud + Izveidot jaunu ownCloud + + + + Where do you want to create your ownCloud? + Kur vēlaties izveidot savu ownCloud? + + + + create ownCloud on this computer + izveidot ownCloud uz šī datora + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#585858;">installs the ownCloud on this computer. Other people will not be able to access your data by default.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#585858;">Instalē ownCloud uz šī datora. Pēc noklusējuma citi cilvēki nevarēs piekļūt jūsu datiem.</span></p></body></html> + + + + create ownCloud on my internet domain + izveidot ownCloud uz mana interneta domēna + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#585858;">installs ownCloud on a domain you control. You need the FTP credentials for the installation.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; color:#585858;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#585858;">This ownCloud will be accessible from the internet.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#585858;">instalē ownCloud uz domēna, ko jūs kontrolējat. Jums vajag FTP datus, lai varētu instalēt.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; color:#585858;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#585858;">Šis ownCloud būs pieejams no interneta.</span></p></body></html> + + + + &Domain: + &Domēns: + + + mydomain.org + + + + + FolderWizardNetworkPage + + + Form + Forma + + + + Network Settings + Tīkla iestatījumi + + + + Set networking options: + Iestatīt tīklošanas opcijas: + + + + Only enable if network is available + Aktivēt tikai, ja ir pieejams tīkls + + + + restrict to this local network + ierobežot uz lokālo tīklu + + + + FolderWizardOwncloudPage + + + Form + Forma + + + + ownCloud Settings + ownCloud iestatījumi + + + + URL: + URL: + + + + User: + Lietotājs: + + + + Password: + Parole: + + + + Alias: + Segvārds: + + + + ownCloud + ownCloud + + + + FolderWizardSourcePage + + + Form + Forma + + + + Sync Directory + Sinhronizējamā direktorija + + + + Pick a local folder on your computer to sync: + Izvēlieties lokālu mapi uz sava datora, ko sinhronizēt: + + + + &Choose... + &Izvēlēties... + + + + &Directory alias name: + &Direktorijas segvārda nosaukums: + + + + /home/local1 + /home/local1 + + + + Music + Mūzika + + + + FolderWizardTargetPage + + + Form + Forma + + + Express Upload Target + + + + Pick a place where the data should go to: + + + + to your &ownCloud + + + + + Synchronization Target + Sinhronizēšanas mērķis + + + + Select a destination folder for your data + Izvēlieties savu datu mērķa mpi + + + + on your &ownCloud server + uz jūsu &ownCloud servera + + + + Folder on ownCloud: + Mape uz ownCloud: + + + + to a &local folder + uz &lokālu mapi + + + + Folder name: + Mapes nosaukums: + + + + C&hoose.. + I&zvēlēties... + + + + to a &remote folder (URL) + uz &attālinātu mapi (URL) + + + + URL: + URL: + + + + TextLabel + TextLabel + + + + create + izveidot + + + + root + root + + + + /home/local + /home/local + + + + scp://john@host.com//myfolder + scp://juris@serveris.lv//manamape + + + + Mirall::Application + + No ownCloud Configuration + + + + <p>No ownCloud connection was configured yet.</p><p>Please configure one by clicking on the tray icon!</p> + + + + <p>The ownCloud at %1 could not be reached.</p> + + + + + <p>The detailed error message is<br/><tt>%1</tt></p> + <p>Sīkāks kļūdas ziņojums ir<br/><tt>%1</tt></p> + + + + <p>Please check your configuration by clicking on the tray icon.</p> + <p>Lūdzu, pārbaudi savu konfigurāciju, spiežot uz paplātes ikonas.</p> + + + ownCloud Connection Failed + + + + No ownCloud Connection + + + + <p>Your ownCloud credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> + + + + <p>Your ownCloud user name or password is not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> + + + + ownCloud Sync Started + + + + + Sync started for %1 configured sync folder(s). + Sinhronizēšana ir sākta %1 konfigurētai(-ām) sinhronizēšanas mapei(-ēm) + + + Open ownCloud... + + + + + Open status... + Atvērt statusu... + + + + Add folder... + Pievienot mapi... + + + + Configure... + Konfigurēt... + + + + Configure proxy... + Konfigurēt starpnieku... + + + + Quit + Iziet + + + open folder %1 + + + + + %1 Server Mismatch + %1 serveru neatbilstība + + + + <p>The configured server for this client is too old.</p><p>Please update to the latest %1 server and restart the client.</p> + <p>Šim klientam konfigurētais serveris ir pārāk vecs.</p><p>Lūdzu, atjauniniet serveri uz vismaz versiju %1 un pārstartējiet klientu.</p> + + + + <p>The %1 at %2 could not be reached.</p> + <p>Nevarēja sasnieg %1 pie %2.</p> + + + + %1 Connection Failed + %1 savienojums neizdevās + + + + Too many attempts to get a valid password. + Pārāk daudz mēģinājumu saņemt derīgu paroli. + + + + %1 user credentials are wrong. Please check configuration. + %1 lietotāja akreditācijas dati nav pareizi. Lūdzu, pārbaudiet konfigurāciju. + + + + + Credentials + Akreditācijas dati + + + + Error: Could not retrieve the password! + Kļūda — nevarēja saņemt paroli! + + + + Password dialog was canceled! + Paroles dialoglodziņš tika atcelts! + + + + + No %1 Connection + Nav %1 savienojuma + + + + <p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p> + <p>Jūsu %1 akreditācijas dati nav pareizi.</p><p>Lūdzu, izlabojiet tos, palaižot konfigurācijas dialoglodziņu no paplātes!</p> + + + + <p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p> + <p>Lietotājvārds vai parole nav pareizi.</p><p>Lūdzu, izlabojiet tos, palaižot konfigurācijas dialoglodziņu no paplātes!</p> + + + + %1 Sync Started + %1 sinhronizēšana ir sākta + + + + Open %1 in browser... + Atvērt %1 pārlūkā... + + + + About... + Par... + + + + Open %1 folder + Atvērt %1 mapi + + + + Managed Folders: + Pārvaldītās mapes: + + + + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> + <p><small>Būvēts no Git revīzijas <a href="%1">%2</a> %3, %4<br>izmantojot OCsync %5 un Qt %6.</small><p> + + + + About %1 + Par %1 + + + + Confirm Folder Remove + Apstiprināt mapes izņemšanu + + + + Do you really want to remove upload folder <i>%1</i>? + Vai tiešām vēlaties izņemt augšupielādes mapi <i>%1</i>? + + + Undefined Folder State + + + + The folder waits to start syncing. + + + + + Sync is running. + Sinhronizācija darbojas. + + + + Server is currently not available. + Serveris pašlaik nav pieejams. + + + + Last Sync was successful. + Pēdējā sinhronizācija bija veiksmīga. + + + + Syncing Error. + Sinhronizēšanas kļūda. + + + + Setup Error. + Iestatīšanas kļūda. + + + + Undefined Error State. + Nedefinēts kļūdas stāvoklis. + + + Folder information + + + + Unknown + + + + Changed files: + + + + + Added files: + + + + + New files in the server, or files deleted locally: + + + + + + Sync Running + Sinhronizācija darbojas + + + + The syncing operation is running.<br/>Do you want to terminate it? + Darbojas sinhronizēšanas darbība.<br/>Vai vēlaties to apturēt? + + + + Undefined State. + Nedefinēts stāvoklis + + + + Waits to start syncing. + Gaida uz sinhronizēšanas sākumu. + + + + (Sync is paused) + (Sinhronizēšana ir pauzēta) + + + Sync is paused. + + + + + No sync folders configured. + Nav konfigurētu sinhronizēšanas mapju. + + + + Mirall::CSyncThread + + + CSync create failed. + Neizdevās izveidot CSync. + + + + CSync failed to create a lock file. + CSync neizdevās izveidot slēgšanas datni. + + + + Success. + Veiksmīgi. + + + + CSync Logging setup failed. + Neizdevās iestatīt CSync reģistrēšanu. + + + + CSync failed to load the state db. + CSync neizdevās ielādēt stāvokļa db. + + + The system time between the local machine and the server differs too much. Please use a time syncronization service (ntp) on both machines. + + + + + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. + Sistēmas laiks uz šī klienta atšķiras no sistēmas laika uz servera. Lūdzu, izmantojiet laika sinhronizēšanas pakalpojumu (NTP) uz servera un klienta datoriem, lai laiks būtu tāds pats. + + + + CSync could not detect the filesystem type. + CSync nevarēja noteikt datņu sistēmas tipu. + + + + CSync got an error while processing internal trees. + CSync saņēma kļūdu, apstrādājot iekšējos kokus. + + + <p>The target directory %1 does not exist.</p><p>Please create it and try again.</p> + + + + + <p>The target directory %1 does not exist.</p><p>Please check the sync setup.</p> + <p>Mērķa direktorija %1 neeksistē.</p><p>Lūdzu, pārbaudiet sinhronizēšanas iestatījumus.</p> + + + <p>The ownCloud plugin for csync could not be loaded.<br/>Please verify the installation!</p> + + + + + The local filesystem can not be written. Please check permissions. + Nevar rakstīt lokālo datņu sistēmu. Lūdzu, pārbaudiet atļaujas. + + + + A remote file can not be written. Please check the remote access. + Nevar rakstīt attālināto datni. Lūdzu, pārbaudiet attālināto pieeju. + + + + CSync failed to reserve memory. + CSync neizdevās rezervēt atmiņu. + + + + CSync fatal parameter error. + CSybx gadījās fatāla parametra kļūda. + + + + CSync processing step update failed. + CSync neizdevās atjaunināt parametra soli. + + + + CSync processing step reconcile failed. + CSync neizdevās pieņemt parametra soli. + + + + CSync processing step propagate failed. + CSync neizdevās pavairot parametra soli. + + + + CSync failed to connect through a proxy. + CSync neizdevās savienoties caur starpnieku. + + + + CSync failed to lookup proxy or server. + CSync neizdevās uzmeklēt starpnieku vai serveri. + + + + CSync failed to authenticate at the %1 server. + CSync neizdevās autentificēties ar serveri %1. + + + + CSync failed to authenticate at the proxy. + CSync neizdevās autentificēties ar starpnieku. + + + + CSync failed to connect to the network. + CSync neizdevās savienoties ar tīklu. + + + + A network connection timeout happend. + Gadījās tīkla savienojuma noildze. + + + + A HTTP transmission error happened. + Gadījās HTTP pārraides kļūda. + + + + CSync failed due to not handled permission deniend. + CSync cieta neveiksmi dēļ atļauju lieguma. + + + + CSync failed to find a specific file. + CSync neizdevās atrast noteiktu datni. + + + + CSync tried to create a directory that already exists. + CSync mēģināja izveidot mapi, kas jau eksistē. + + + + CSync: No space on %1 server available. + CSync — uz servera %1 nepietiek vietas. + + + + CSync unspecified error. + CSync nespecificēta kļūda. + + + + An internal error number %1 happend. + Gadījās iekšēja kļūda ar numuru %1. + + + + <br/>Backend Message: + <br/>aizmugures ziņojums: + + + CSync Update failed. + + + + The local filesystem has directories which are write protected. +That prevents ownCloud from successful syncing. +Please make sure that all directories are writeable. + + + + + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> + <p>%1 csync spraudni nevarēja ielādēt.<br/>Lūdzu, pārbaudiet instalācijas!</p> + + + CSync encountered an error while examining the file system. +Syncing is not possible. + + + + CSync update generated a strange instruction. +Please write a bug report. + + + + Local filesystem problems. Better disable Syncing and check. + + + + CSync reconcile failed. + + + + CSync propagate failed. + + + + + Mirall::CreateAnOwncloudPage + + + mydomain.org + mansdomēns.lv + + + + Mirall::CredentialStore + + + No password entry found in keychain. Please reconfigure. + Atslēgu saišķi nav atrasts ieraksts. Lūdzu, konfigurējiet. + + + + Mirall::DownloadNotifier + + + New file available + Ir pieejama jauna datne + + + + '%1' has been synced to this machine. + “%1” tika sinhronizēts ar šo datoru. + + + + New files available + Ir pieejamas jaunas datnes + + + + '%1' and %n other file(s) have been synced to this machine. + '%1' un %n citu datņu tika sinhronizēta ar šo datoru.'%1' un %n cita datne tika sinhronizēta ar šo datoru.'%1' un %n citas datnes tika sinhronizētas ar šo datoru. + + + + Mirall::FileItemDialog + + + Files + Datnes + + + + File Count + Datņu skaits + + + + Copy + Kopēt + + + + Sync Protocol + Sinhronizēšanas protokols + + + + Undefined Folder State + Nedefinēts mapes stāvoklis + + + + The folder waits to start syncing. + Mape gaida sinhronizēšanas sākumu. + + + + Server is currently not available. + Serveris pašlaik nav pieejams. + + + + Sync is running. + Sinhronizācija darbojas. + + + + Last Sync was successful. + Pēdējā sinhronizācija bija veiksmīga. + + + + Syncing Error. + Sinhronizēšanas kļūda. + + + + Setup Error. + Iestatīšanas kļūda. + + + + Undefined Error State. + Nedefinēts kļūdas stāvoklis. + + + + %1 (finished %2 sec. ago) + %1 (pabeigts pirms %2 sekundēm) + + + + Synced Files + Sinhronizētās datnes + + + + New Files + Jaunās datnes + + + + Deleted Files + Dzēstās datnes + + + + Renamed Files + Pārsauktās datnes + + + + Ignored Files + Ignorēt datnes + + + + Errors + Kļūdas + + + + Conflicts + Konflikti + + + + Up + Augšup + + + + Down + Lejup + + + + Mirall::Folder + + + Local folder %1 does not exist. + Lokālā mape %1 neeksistē. + + + + %1 should be a directory but is not. + %1 vajadzētu būt direktorijai, bet tas tā nav. + + + + %1 is not readable. + %1 nav lasāms. + + + + Mirall::FolderViewDelegate + + + Remote path: %1 + Attālinātais ceļš: %1 + + + + Mirall::FolderWizard + + + %1 Folder Wizard + %1 mapju vednis + + + + Mirall::FolderWizardSourcePage + + + No local directory selected! + Nav izvēlēta direktorija! + + + + The local path %1 is already an upload folder.<br/>Please pick another one! + Lokālais ceļš %1 jau ir augšupielādes mape.<br/>Lūdzu, izvēlieties citu! + + + + An already configured folder is contained in the current entry. + Jau konfigurēta mape satur pašreizējo ierakstu. + + + + An already configured folder contains the currently entered directory. + Jau konfigurēta mape satur pašlaik ievadīto direktoriju. + + + + The alias can not be empty. Please provide a descriptive alias word. + Aizstājvārds nedrīkst būt tukšs. Lūdzu, norādiet aprakstošu aizstājvārdu. + + + + <br/>The alias <i>%1</i> is already in use. Please pick another alias. + <br/>Aizstājvārds <i>%1</i> jau tiek izmantots. Lūdzu, izvēlieties citu aizstājvārdu. + + + + Select the source folder + Izvēlieties avota mapi + + + + Mirall::FolderWizardTargetPage + + The folder is not available on your ownCloud.<br/>Click to let mirall create it. + + + + Folder on ownCloud was successfully created. + + + + Failed to create the folder on ownCloud.<br/>Please check manually. + + + + + The folder is not available on your %1.<br/>Click to create it. + Mape nav pieejama uz jūsu %1.<br/>Spiediet šeit, lai to izveidotu. + + + + Folder was successfully created on %1. + Mape uz %1 tika veiksmīgi izveidota. + + + + Failed to create the folder on %1.<br/>Please check manually. + Neizdevās izveidot mapi uz %1.<br/>Lūdzu, pārbaudiet pašrocīgi. + + + + Better do not use the remote root directory.<br/>If you do, you can <b>not</b> mirror another local folder. + Labāk neizmantot attālinātu saknes direktoriju.<br/>Ja nu tomēr, jūs <b>ne</b>varat dublēt citu lokālo mapi. + + + + to your <a href="%1">%2</a> (version %3) + uz savu <a href="%1">%2</a> (versija %3) + + + + no configured %1 found! + nav atrastu konfigurētu %1! + + + + %1 could not be reached:<br/><tt>%2</tt> + %1 nevar sasniegt:<br/><tt>%2</tt> + + + to your <a href="%1">ownCloud</a> (version %2) + + + + no configured ownCloud found! + + + + Your ownCloud could not be reached:<br/><tt>%1</tt> + + + + + Select the target folder + Izvēlieties mērķa mapi + + + + Mirall::LogBrowser + + + Log Output + Izvadi reģistrēt žurnālā + + + + &Search: + &Meklēt: + + + + &Find + &Arast + + + + Clear + Attīrīt + + + + Clear the log display. + Attīrīt žurnāla attēlošanu. + + + + S&ave + &Saglabāt + + + + Save the log file to a file on disk for debugging. + Saglabāt žurnāla datni uz diska atkļūdošanai. + + + + + Error + Kļūda + + + + <nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr> + <nobr>Datni '%1'<br/>nevar atvērt rakstīšanai.<br/><br/>Žurnāla izvadi <b>ne</b>var saglabāt!</nobr> + + + + Save log file + Saglabāt žurnāla datni + + + + Could not write to log file + Nevarēja rakstīt žurnāla datnē + + + + Mirall::OwncloudCredentialsPage + + john + + + + secret + + + + + Mirall::OwncloudFTPAccessPage + + + ftp.mydomain.org + ftp.mansdomēns.lv + + + john + + + + secret + + + + + Mirall::OwncloudSetupPage + + john + + + + secret + + + + + Create Connection to %1 + Izveidot savienojumu ar %1 + + + + Mirall::OwncloudSetupWizard + + + %1 Connection Wizard + %1 savienojumu vednis + + + Trying to connect to ownCloud at %1... + + + + <font color="green">Successfully connected to %1: ownCloud version %2 (%3)</font><br/><br/> + + + + <font color="red">Failed to connect to ownCloud!</font> + + + + + Trying to connect to %1 at %2... + Mēģina savienoties ar %1 pie %2... + + + + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> + <font color="green">Veiksmīgi savienojās ar %1: %2 versija %3 (%4)</font><br/><br/> + + + + <font color="red">Failed to connect to %1!</font> + <font color="red">Neizdevās savienoties ar %1!</font> + + + + Error: <tt>%1</tt> + Kļūda: <tt>%1</tt> + + + + Starting script owncloud-admin... + Palaiž skriptu owncloud-admin... + + + <font color="red">Installation of ownCloud failed!</font> + + + + <font color="green">Installation of ownCloud succeeded!</font> + + + + + <font color="red">Installation of %1 failed!</font> + <font color="red">%1 instalēšana neizdevās!</font> + + + + <font color="green">Installation of %1 succeeded!</font> + <font color="red">%1 instalēšana bija veiksmīga!</font> + + + + The owncloud admin script can not be found. +Setup can not be done. + Nevar atrast owncloud admin skriptu. +Nevar instalēt. + + + + Creation of remote folder %1 could not be started. + Nevarēja sākt attālinātās mapes %1 veidošanu. + + + + Remote folder %1 created successfully. + Attālinātā mape %1 ir veiksmīgi izveidota. + + + + The remote folder %1 already exists. Connecting it for syncing. + Attālinātā mape %1 jau eksistē. Savienojas ar to, lai sinhronizētos. + + + + The folder creation resulted in HTTP error code %1 + Mapes veidošana beidzās ar HTTP kļūdas kodu %1 + + + + A sync connection from %1 to remote directory %2 was set up. + Sinhronizēšanas savienojums no %1 uz attālināto mapi %2 tika iestatīts. + + + + Succesfully connected to %1! + Veiksmīgi savienojies ar %1! + + + + Connection to %1 could not be established. Please check again. + Nevarēja izveidot savienojumu ar %1. Lūdzu, pārbaudiet atkal. + + + + Press Finish to permanently accept this connection. + Spiediet Pabeigt, lai pavisam pieņemtu šo savienojumu. + + + Skipping automatic setup of sync folders as there are already sync folders. + + + + Checking local sync folder %1 + + + + + Local sync folder %1 already exists, setting it up for sync.<br/><br/> + Jau eksistē lokālā sinhronizēšanas mape %1, iestata to sinhronizēšanai.<br/><br/> + + + + Creating local sync folder %1... + Izveido lokālo sinhronizēšanas mapi %1... + + + Creating local sync folder %1 + + + + + ok + sanāca + + + + failed. + cieta neveiksmi. + + + Start Creation of remote folder %1 failed. + + + + Remote folder %1 created sucessfully. + + + + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> + <font color="green"><b>Lokālā sinhronizēšanas mape %1 ir veiksmīgi izveidota!</b></font> + + + The remote folder %1 already exists. Automatic sync setup is skipped for security reasons. Please configure your sync folder manually. + + + + + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> + <p><font color="red">Attālinātā mapju izveide cieta neveiksmi, jo, visdrīzāk, dotie akreditācijas dati bija nepareizi.</font><br/>Lūdzu, dotieties atpakaļ un pārbaudiet savus akreditācijas datus.</p> + + + + Remote folder %1 creation failed with error <tt>%2</tt>. + Attālinātās mapes %1 veidošana cieta neveiksmi ar kļūdu <tt>%2</tt>. + + + + Mirall::OwncloudWelcomePage + + + Welcome to %1 + Laipni lūdzam %1 + + + + <p>In order to connect to your %1 server, you need to provide the server address as well as your credentials.</p><p>This wizard will guide you through the process.<p><p>If you have not received this information, please contact your %1 provider.</p> + <p>Lai savienotos ar savu %1 serveri, jums vajadzēs norādīt servera adresi un savus akreditācijas datus.</p><p>Šis vednis palīdzēs jums tikt galā ar šo procesu.<p><p>Ja neesat saņēmis šo informāciju, lūdzu, sazinieties ar savu %1 piegādātāju.</p> + + + + <p>In order to connect to your %1 server, you need to provide your credentials.</p><p>This wizard will guide you through the setup process.</p> + <p>Lai savienotos ar savu %1 serveri, jums vajadzēs norādīt servera adresi un savus akreditācijas datus.</p><p>Šis vednis palīdzēs jums tikt galā ar šo procesu.<p> + + + + Mirall::OwncloudWizardResultPage + + Congratulations! Your <a href="%1" title="%1">new ownCloud</a> is now up and running! + + + + + Congratulations! Your <a href="%1" title="%1">new %2</a> is now up and running! + Apsveicu! Jūsu <a href="%1" title="%1">jaunais %2</a> ir gatavs un darbojas! + + + + Mirall::OwncloudWizardSelectTypePage + + + http://owncloud.mydomain.org + http://owncloud.mansdomēns.lv + + + + Mirall::ProxyDialog + + + Hostname of proxy server + Starpniekservera nosaukums + + + + Username for proxy server + Starpniekservera lietotājvārds + + + + Password for proxy server + Starpniekservera parole + + + + Mirall::SslErrorDialog + + + SSL Connection + SSL savienojums + + + + Warnings about current SSL Connection: + Brīdinājumi par pašreizējo SSL savienojumu: + + + + with Certificate %1 + ar sertifikātu %1 + + + + + + &lt;not specified&gt; + &lt;nav norādīts&gt; + + + + + Organization: %1 + Organizācija: %1 + + + + + Unit: %1 + Vienums: %1 + + + + + Country: %1 + Valsts: %1 + + + + Fingerprint (MD5): <tt>%1</tt> + Nospiedums (MD5): <tt>%1</tt> + + + + Fingerprint (SHA1): <tt>%1</tt> + Nospiedums (SHA1): <tt>%1</tt> + + + + Effective Date: %1 + Sākuma datums: %1 + + + + Expiry Date: %1 + Termiņa datums: %1 + + + + Issuer: %1 + Sniedzējs: %1 + + + + Mirall::StatusDialog + + + Pause + Pauze + + + + Resume + Turpināt + + + + Checking %1 connection... + Pārbauda %1 savienojumu... + + + + No %1 connection configured. + Nav konfigurēts %1 savienojums. + + + + Connected to <a href="%1">%1</a> as <i>%2</i>. + Savienoties ar <a href="%1">%1</a> kā <i>%2</i>. + + + + Version: %1 (%2) + Versija — %1 (%2) + + + + <p>Failed to connect to %1: <tt>%2</tt></p> + <p>Neizdevās savienoties ar %1: <tt>%2</tt></p> + + + Checking ownCloud connection... + + + + No ownCloud connection configured. + + + + Connected to <a href="%1">%2</a>, ownCloud %3 + + + + Version: %1 + + + + + unknown problem. + nezināma problēma. + + + <p>Failed to connect to ownCloud: <tt>%1</tt></p> + + + + + Mirall::Theme + + Status undefined + + + + Waiting to start sync + + + + Sync is running + + + + Sync Success + + + + Sync Error - Click info button for details. + + + + Setup Error + + + + + Mirall::UpdateDetector + + + Client Version Check + Klienta versijas pārbaude + + + + <p>A new version of the %1 client is available. + <p>Ir pieejama jauna %1 klienta versija. + + + <p>A new version of the ownCloud Client is available. + + + + + %1 is available. The installed version is %3.<p/><p>For more information see <a href="%2">%2</a></p> + %1 ir pieejams. Instalētā versija ir %3. <p/><p>Lai uzzinātu vairāk, skatiet <a href="%2">%2</a></p> + + + + Mirall::ownCloudFolder + + + The CSync thread terminated. + CSync pavediens ir pārtraukts. + + + + MirallConfigFile + + ownCloud Password Required + + + + Please enter your ownCloud password: + + + + + Password Required + Nepieciešama parole + + + + Please enter your %1 password: + Lūdzu, ievadiet savu %1 paroli: + + + + OwncloudCredentialsPage + + + Form + Forma + + + + ownCloud Credentials + ownCloud akreditācijas dati + + + + Provide ownCloud Credentials + Sniegt ownCloud akreditācijas datus + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; color:#585858;">Please enter the username and password for your ownCloud Instance. </span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; color:#585858;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; color:#585858;">If you do not wish to store the credentials on your local machine, check the box. ownCloud will prompt you for your password every time the client starts.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; color:#585858;">Lūdzu, ievadiet savas ownCloud instances lietotājvārdu un paroli. </span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; color:#585858;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; color:#585858;">Ja nevēlaties glabāt akreditācijas datus uz sava datora, atzīmējiet kastīt. ownCloud prasīs jūsu paroli katrā pieteikšanās reizē.</span></p></body></html> + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; color:#585858;">Provide username and password to connect your ownCloud Instance. </span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; color:#585858;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; color:#585858;">If you do not want to store the credentials on your local machine, check the button. ownCloud will ask you for the passwort on every start than.</span></p></body></html> + + + + + ownCloud-User: + ownCloud-lietotājs: + + + + Password: + Parole: + + + + Do not store password on local machine. + Uz lokālā datora neglabāt paroles. + + + john + + + + secret + + + + + OwncloudFTPAccessPage + + + Form + Forma + + + + FTP Access to your Webaccount: + FTP pieeja jūsu tīmekļa kontam: + + + + FTP Details and Credentials + FTP informācija un akreditācijas dati + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#585858;">The details here are used to install the owncloud data on your web space which is accessible over ftp. </span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#585858;">Šeit pieejamā informācija tiks izmantota, lai instalētu owncloud datus uz jūsu tīmekļa servera, kas ir pieejams caur ftp. </span></p></body></html> + + + + FTP-URL: + FTP-URL: + + + + FTP-User: + FTP-lietotājs: + + + + Password: + Parole: + + + ftp.mydomain.org + + + + john + + + + + OwncloudSetupPage + + + Form + Forma + + + + Server &address: + Servera &adrese: + + + + https:// + https:// + + + + Enter the url of the ownCloud you want to connect to (without http or https). + Ievadiet url adresi ownCloud, ar ko vēlaties savienoties (bez http vai https). + + + + Use &secure connection + Lietot drošu &savienojumu + + + + CheckBox + Kastīte + + + + &Username: + &Lietotājvārds + + + + Enter the ownCloud username. + Ievadiet ownCloud lietotājvārdu. + + + + &Password: + &Parole: + + + + Enter the ownCloud password. + Ievadiet ownCloud paroli. + + + + Do not allow the local storage of the password. + Neļaut paroli glabāt lokāli. + + + + &Do not store password on local machine. + Paroles neglabāt uz lokālā &datora. + + + + + + TextLabel + TextLabel + + + + OwncloudWizardResultPage + + + Form + Forma + + + + Result + Rezultāts + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#585858;">This page shows the status of the connection.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#585858;">Šī lapa rāda savienojuma statusu.</span></p></body></html> + + + + + TextLabel + TextLabel + + + + OwncloudWizardSelectTypePage + + + Form + Forma + + + + Create an ownCloud Connection + Izveidot ownCloud savienojumu + + + + Select the ownCloud you want to connect to + Izvēlieties ownCloud, ar ko vēlaties savienoties + + + + connect my ownCloud + savienoties ar savu ownCloud + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; color:#585858;">Specify the ownCloud you want to connect to.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; color:#585858;">Enter the web address of your ownCloud server below.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; color:#585858;">Specify the ownCloud you want to connect to.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; color:#585858;">Ievadiet zemāk sava ownCloud servera tīmekļa adresi.</span></p></body></html> + + + + ownCloud-Link: + ownCloud-saite: + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#585858;">Select this option if you have an ownCloud instance running on a server.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; color:#585858;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#585858;">Enter the web address of your ownCloud below.</span></p></body></html> + + + + ownCloud-URL: + + + + + Note: To specify an SSL secured connection, start the url with https. + Piezīme — lai norādītu, ka jāizmanto drošais SSL savienojums, url jāsāk ar https. + + + + create a new ownCloud + izveidot jaunu ownCloud + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#585858;">Select if you want to create a new ownCloud either on the local machine or on your server. </span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; color:#585858;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#585858;">This wizard will guide you through all neccessary steps.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#585858;">Izvēlieties to, ja vēlaties izveidot jaunu ownCloud uz lokālā datora vai uz sava servera. </span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; color:#585858;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#585858;">Šis vednis jums palīdzēs iziet cauri vajadzīgajiem soļiem.</span></p></body></html> + + + http://owncloud.mydomain.org + + + + + QObject + + ownCloud Password Required + + + + Please enter your ownCloud password: + + + + + + Status undefined + Statuss nav definēts + + + + Waiting to start sync + Gaida uz sinhronizēšanas sākumu + + + + Sync is running + Sinhronizēšana darbojas + + + + Sync Success + Sinhronizēšana ir veiksmīga + + + + Sync Error - Click info button for details. + Sinhronizēšanas kļūda — spiediet informācijas pogu, lai uzzinātu vairāk. + + + + Setup Error + Iestatīšanas kļūda + + + + _fileItemDialog + + + Form + Forma + + + + Detailed Sync Protocol + Detalizēts sinhronizēšanas protokols + + + + + TextLabel + TextLabel + + + + appname + + ownCloud + + + + + ownCloudTheme::about() + + + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4<br>using OCsync %5 and Qt %6.</small><p> + <p><small>Būvēts no Git revīzijas <a href="%1">%2</a> on %3, %4<br>izmantojot OCsync %5 un Qt %6.</small><p> + + + + <p><b>%1 Client Version %2</b></p><p><b>Authors</b><br><a href="mailto:freitag@owncloud.com">Klaas Freitag</a>, ownCloud, Inc.<br><a href="mailto:danimo@owncloud.com">Daniel Molkentin</a>, ownCloud, Inc.<br><br>Based on Mirall by Duncan Mac-Vicar P.</p><p>For more information visit <a href="%3">%4</a>.</p>%7 + <p><b>%1 Klienta versija %2</b></p><p><b>Autori</b><br><a href="mailto:freitag@owncloud.com">Klaas Freitag</a>, ownCloud, Inc.<br><a href="mailto:danimo@owncloud.com">Daniel Molkentin</a>, ownCloud, Inc.<br><br>Balstīts uz Mirall, ko sarakstījis Duncan Mac-Vicar P.</p><p>Lai uzzinātu vairāk, skatiet <a href="%3">%4</a>.</p>%7 + + + + proxyDialog + + + Proxy Settings + Starpnieka iestatījumi + + + + Configure Proxies + Konfigurēt starpniekums + + + + No Proxy + Nav starpnieku + + + + Use system proxy + Lietot sistēmas starpnieku + + + + Manual proxy configuration + Pašrocīgā starpnieka konfigurācija + + + + User + Lietotājs + + + + Password + Parole + + + + Port + Ports + + + + Host + Resursdators + + + + Proxy server requires password + Starpniekserveris pieprasa paroli + + + + sslErrorDialog + + + Form + Forma + + + + Trust this certificate anyway + Tomēr uzticēties šim sertifikātam + + + + SSL Connection + SSL savienojums + + + + sslErrorsDialog + + Form + + + + Check if you want t continue via SSL and trust the shown certificates. + + + + SSL Connection + + + + + statusDialog + + + Form + Forma + + + + Sync Directory Status + Sinhronizēšanas direktorijas statuss + + + + Add Sync... + Pievienot sinhronizāciju... + + + + Remove... + Izņemt... + + + + Fetch... + Saņemt... + + + + Push... + Grūst.. + + + + Pause + Pauze + + + + Info... + Informācija... + + + + TextLabel + TextLabel + + + + Close + Aizvērt + + + \ No newline at end of file diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index bf42f0fc2e..63fb520de3 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -370,7 +370,7 @@ p, li { white-space: pre-wrap; } %1 user credentials are wrong. Please check configuration. - + %1 облікові дані невірні. Будь ласка, перевірте налаштування. @@ -465,7 +465,7 @@ p, li { white-space: pre-wrap; } Server is currently not available. - + Сервер зараз недоступний. @@ -760,7 +760,7 @@ Please write a bug report. No password entry found in keychain. Please reconfigure. - + Не знайдено запису про пароль в брелку. Будь ласка, переналаштуйте. @@ -796,17 +796,17 @@ Please write a bug report. File Count - + Кількість Файлів Copy - + Копіювати Sync Protocol - + Протокол Синхронізації @@ -821,82 +821,82 @@ Please write a bug report. Server is currently not available. - + Сервер зараз недоступний. Sync is running. - + Синхронізація запущена Last Sync was successful. - + Остання синхронізація була неуспішна. Syncing Error. - + Помилка синхронізації. Setup Error. - + Помилка налаштування. Undefined Error State. - + Невизначена помилка. %1 (finished %2 sec. ago) - + %1 (завершено %2 сек. назад) Synced Files - + Синхронізовано Файлів New Files - + Нових Файлів Deleted Files - + Видалено Файлів Renamed Files - + Переіменовано Файлів Ignored Files - + Проігноровано Файлів Errors - + Помилок Conflicts - + Конфліктів Up - + Вгору Down - + Вниз @@ -1933,18 +1933,18 @@ p, li { white-space: pre-wrap; } Form - + Форма Detailed Sync Protocol - + Докладний Протокол Синхронізації TextLabel - + ТекстоваМітка From 9c9e377cf4c08ec67ee9fad95a06696e58ea7e72 Mon Sep 17 00:00:00 2001 From: hefee Date: Fri, 8 Feb 2013 18:21:59 +0100 Subject: [PATCH 21/24] adding soname version to libowncloudsync and libmirallsync --- VERSION.cmake | 4 ++-- src/CMakeLists.txt | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index af8286368f..ef4b3daef2 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,6 +1,6 @@ set( VERSION_MAJOR 1 ) set( VERSION_MINOR 2 ) set( VERSION_PATCH 1 ) -set( VERSION -${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}pre${VERSION_SUFFIX}) +set( VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}pre${VERSION_SUFFIX}) +set( SOVERSION 0 ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 615a3ce669..ed6cf358d8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -126,6 +126,16 @@ endif() add_library(mirallsync SHARED ${libsync_SRCS} ${syncMoc}) add_library(owncloudsync SHARED ${libsync_SRCS} ${syncMoc}) set_target_properties( owncloudsync PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT) +set_target_properties( owncloudsync PROPERTIES + VERSION ${VERSION} + SOVERSION ${SOVERSION} +) + +set_target_properties( mirallsync PROPERTIES + VERSION ${VERSION} + SOVERSION ${SOVERSION} +) + target_link_libraries(mirallsync ${libsync_LINK_TARGETS} ) target_link_libraries(owncloudsync ${libsync_LINK_TARGETS} ) From cfa777260cd3b8b0e094f8afafad6692f6627a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Knau=C3=9F?= Date: Fri, 8 Feb 2013 18:37:29 +0100 Subject: [PATCH 22/24] removing version for mirallsync (it is'nt build anymore :) --- src/CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5e8f035326..a37682dd49 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -130,12 +130,6 @@ set_target_properties( owncloudsync PROPERTIES SOVERSION ${SOVERSION} ) -set_target_properties( mirallsync PROPERTIES - VERSION ${VERSION} - SOVERSION ${SOVERSION} -) - - target_link_libraries(owncloudsync ${libsync_LINK_TARGETS} ) if ( APPLE ) From dbb0cbaff8ac3e2e9944df2afd40d2bb757881dd Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 8 Feb 2013 19:17:50 +0100 Subject: [PATCH 23/24] Removed build of obsolete mirallsync lib which is equal to owncloudsync. --- src/CMakeLists.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 615a3ce669..b7bba9d299 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -123,20 +123,17 @@ if(QTKEYCHAIN_FOUND) include_directories(${QTKEYCHAIN_INCLUDE_DIR}) endif() -add_library(mirallsync SHARED ${libsync_SRCS} ${syncMoc}) add_library(owncloudsync SHARED ${libsync_SRCS} ${syncMoc}) set_target_properties( owncloudsync PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT) -target_link_libraries(mirallsync ${libsync_LINK_TARGETS} ) target_link_libraries(owncloudsync ${libsync_LINK_TARGETS} ) if ( APPLE ) - target_link_libraries(mirallsync /System/Library/Frameworks/CoreServices.framework) target_link_libraries(owncloudsync /System/Library/Frameworks/CoreServices.framework) endif() if(NOT BUILD_OWNCLOUD_OSX_BUNDLE) - install(TARGETS mirallsync owncloudsync + install(TARGETS owncloudsync RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -147,7 +144,7 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_SHORTNAME}.desktop DESTINATION share/applications ) endif() else() - install(TARGETS mirallsync owncloudsync DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS) + install(TARGETS owncloudsync DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS) endif() set(mirall_SRCS @@ -234,7 +231,7 @@ endif(NOT WIN32) add_executable( mirall WIN32 main.cpp ${final_src}) target_link_libraries(mirall ${QT_LIBRARIES} ) - target_link_libraries(mirall mirallsync) + target_link_libraries(mirall owncloudsync) target_link_libraries(mirall ${CSYNC_LIBRARY}) set_target_properties( mirall PROPERTIES From 1296be71ede855f7a7b9524cf6449ee836edf529 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 9 Feb 2013 00:15:51 +0100 Subject: [PATCH 24/24] [tx-robot] updated from transifex --- translations/mirall_ru_RU.ts | 48 ++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/translations/mirall_ru_RU.ts b/translations/mirall_ru_RU.ts index 7fa30b9804..4913ecb39f 100644 --- a/translations/mirall_ru_RU.ts +++ b/translations/mirall_ru_RU.ts @@ -360,7 +360,7 @@ p, li { white-space: pre-wrap; } %1 user credentials are wrong. Please check configuration. - + Полномочия пользователя %1 неверны. Пожалуйста, проверте конфигурацию. @@ -455,7 +455,7 @@ p, li { white-space: pre-wrap; } Server is currently not available. - + Сервер не доступен. @@ -555,7 +555,7 @@ p, li { white-space: pre-wrap; } CSync Logging setup failed. - + Настройка логирования CSync не удалась. @@ -607,27 +607,27 @@ p, li { white-space: pre-wrap; } CSync failed to reserve memory. - + CSync не удалось зарезервировать память. CSync fatal parameter error. - + Фатальная ошибка параметра CSync. CSync processing step update failed. - + Процесс обновления CSync не удался. CSync processing step reconcile failed. - + Процесс согласования CSync не удался. CSync processing step propagate failed. - + Процесс передачи CSync не удался. @@ -637,7 +637,7 @@ p, li { white-space: pre-wrap; } CSync failed to lookup proxy or server. - + CSync не удалось найти прокси сервер. @@ -647,7 +647,7 @@ p, li { white-space: pre-wrap; } CSync failed to authenticate at the proxy. - + CSync не удалось авторизоваться на прокси сервере. @@ -657,22 +657,22 @@ p, li { white-space: pre-wrap; } A network connection timeout happend. - + Произошёл таймаут соединения сети. A HTTP transmission error happened. - + Произошла ошибка передачи http. CSync failed due to not handled permission deniend. - + CSync упал в связи с отутствием обработки из-за отказа в доступе. CSync failed to find a specific file. - + CSync не смог найти заданный файл. @@ -801,17 +801,17 @@ Please write a bug report. Undefined Folder State - + Неопределнённый статус папки The folder waits to start syncing. - + Папка ожидает начала синхронизации. Server is currently not available. - + Сейчас сервер не доступен. @@ -821,7 +821,7 @@ Please write a bug report. Last Sync was successful. - + Последняя синхронизация была удачна. @@ -836,17 +836,17 @@ Please write a bug report. Undefined Error State. - + Неизвестный статус ошибки. %1 (finished %2 sec. ago) - + %1 (окончено %2 сек. назад) Synced Files - + Синхронизированные файлы @@ -866,7 +866,7 @@ Please write a bug report. Ignored Files - + Проигнорированные файлы @@ -876,7 +876,7 @@ Please write a bug report. Conflicts - + Конфликты @@ -1928,7 +1928,7 @@ p, li { white-space: pre-wrap; } Detailed Sync Protocol - + Детализированный протокол синхронизации