Comparar commits

..

1 Commits

Autor SHA1 Mensagem Data
Markus Goetz eaeed08544 VERSION.cmake: 2.2.4 final 2016-09-27 10:53:37 +02:00
40 arquivos alterados com 147 adições e 306 exclusões
+2 -2
Ver Arquivo
@@ -1,11 +1,11 @@
set( MIRALL_VERSION_MAJOR 2 )
set( MIRALL_VERSION_MINOR 2 )
set( MIRALL_VERSION_PATCH 5 )
set( MIRALL_VERSION_PATCH 4 )
set( MIRALL_VERSION_YEAR 2016 )
set( MIRALL_SOVERSION 0 )
if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
set( MIRALL_VERSION_SUFFIX "git") #e.g. beta1, beta2, rc1
set( MIRALL_VERSION_SUFFIX "") #e.g. beta1, beta2, rc1
endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
if( NOT DEFINED MIRALL_VERSION_BUILD )
-109
Ver Arquivo
@@ -352,114 +352,6 @@ X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
GenericName[oc]=Dorsièr de Sincronizacion
@@ -595,7 +487,6 @@ Comment[th_TH]=@APPLICATION_NAME@ ไคลเอนต์ประสานข
GenericName[th_TH]=ประสานข้อมูลโฟลเดอร์
Name[th_TH]= @APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
Icon[th_TH]=@APPLICATION_EXECUTABLE@
GenericName[es_MX]=Sincronización de Carpetas
Comment[nb_NO]=@APPLICATION_NAME@ skrivebordssynkroniseringsklient
GenericName[nb_NO]=Mappesynkronisering
Name[nb_NO]=@APPLICATION_NAME@ skrivebordssynkroniseringsklient
-11
Ver Arquivo
@@ -68,14 +68,11 @@ bool AccountManager::restore()
bool AccountManager::restoreFromLegacySettings()
{
// try to open the correctly themed settings
auto settings = Account::settingsWithGroup(Theme::instance()->appName());
bool migratedCreds = false;
qDebug() << "LEGACY!" << Theme::instance()->appName() << settings->childKeys();
// if the settings file could not be opened, the childKeys list is empty
// then try to load settings from a very old place
if( settings->childKeys().isEmpty() ) {
@@ -217,15 +214,11 @@ AccountPtr AccountManager::loadAccountHelper(QSettings& settings)
QString authType = settings.value(QLatin1String(authTypeC)).toString();
QString overrideUrl = Theme::instance()->overrideServerUrl();
QString forceAuth = Theme::instance()->forceConfigAuthType();
qDebug() << "LOADING ACCOUNT" << authType << overrideUrl << forceAuth << settings.value(QLatin1String(urlC));
if(!forceAuth.isEmpty() && !overrideUrl.isEmpty() ) {
// If forceAuth is set, this might also mean the overrideURL has changed.
// See enterprise issues #1126
acc->setUrl(overrideUrl);
authType = forceAuth;
qDebug() << "SHOULD NOT BE THERE !!!!!!";
} else {
acc->setUrl(settings.value(QLatin1String(urlC)).toUrl());
}
@@ -240,12 +233,8 @@ AccountPtr AccountManager::loadAccountHelper(QSettings& settings)
acc->_settingsMap.insert(key, settings.value(key));
}
qDebug() << acc->_settingsMap << "from" << settings.childKeys();
acc->setCredentials(CredentialsFactory::create(authType));
qDebug() << "Loaded Cred" << acc->credentials() << authType;
// now the cert, it is in the general group
settings.beginGroup(QLatin1String("General"));
acc->setApprovedCerts(QSslCertificate::fromData(settings.value(caCertsKeyC).toByteArray()));
-3
Ver Arquivo
@@ -18,8 +18,6 @@
#include "creds/dummycredentials.h"
#include "creds/shibbolethcredentials.h"
#include <QDebug>
namespace OCC
{
@@ -28,7 +26,6 @@ namespace CredentialsFactory
AbstractCredentials* create(const QString& type)
{
qDebug() << type;
// empty string might happen for old version of configuration
if (type == "http" || type == "") {
return new HttpCredentialsGui;
+2 -22
Ver Arquivo
@@ -53,10 +53,7 @@ ShibbolethCredentials::ShibbolethCredentials()
_ready(false),
_stillValid(false),
_browser(0)
{
qDebug() << "HELO ShibbolethCredentials 1";
}
{}
ShibbolethCredentials::ShibbolethCredentials(const QNetworkCookie& cookie)
: _ready(true),
@@ -64,7 +61,6 @@ ShibbolethCredentials::ShibbolethCredentials(const QNetworkCookie& cookie)
_browser(0),
_shibCookie(cookie)
{
qDebug() << "HELO ShibbolethCredentials 2" << cookie.toRawForm();
}
void ShibbolethCredentials::setAccount(Account* account)
@@ -76,8 +72,6 @@ void ShibbolethCredentials::setAccount(Account* account)
_user = _account->credentialSetting(QLatin1String(userC)).toString();
}
qDebug() << _user;
// When constructed with a cookie (by the wizard), we usually don't know the
// user name yet. Request it now from the server.
if (_ready && _user.isEmpty()) {
@@ -113,19 +107,13 @@ QString ShibbolethCredentials::user() const
QNetworkAccessManager* ShibbolethCredentials::getQNAM() const
{
QNetworkAccessManager* qnam(new AccessManager);
bool ok = connect(qnam, SIGNAL(finished(QNetworkReply*)),
connect(qnam, SIGNAL(finished(QNetworkReply*)),
this, SLOT(slotReplyFinished(QNetworkReply*)));
qDebug() << "QNAM creaded and connected" << ok;
return qnam;
}
void ShibbolethCredentials::slotReplyFinished(QNetworkReply* r)
{
qWarning() << r->request().url() << _browser << r->attribute(QNetworkRequest::HttpStatusCodeAttribute)
<< r->attribute(QNetworkRequest::RedirectionTargetAttribute) << r->header(QNetworkRequest::LocationHeader);
if (!_browser.isNull()) {
return;
}
@@ -175,7 +163,6 @@ bool ShibbolethCredentials::stillValid(QNetworkReply *reply)
void ShibbolethCredentials::persist()
{
qDebug() << _shibCookie;
storeShibCookie(_shibCookie);
if (!_user.isEmpty()) {
_account->setCredentialSetting(QLatin1String(userC), _user);
@@ -214,7 +201,6 @@ void ShibbolethCredentials::onShibbolethCookieReceived(const QNetworkCookie& shi
{
storeShibCookie(shibCookie);
_shibCookie = shibCookie;
qDebug() << _shibCookie;
addToCookieJar(shibCookie);
slotFetchUser();
@@ -266,13 +252,10 @@ void ShibbolethCredentials::slotBrowserRejected()
void ShibbolethCredentials::slotReadJobDone(QKeychain::Job *job)
{
qDebug() << "FROM KEYCHAIN" << job->error();
if (job->error() == QKeychain::NoError) {
ReadPasswordJob *readJob = static_cast<ReadPasswordJob*>(job);
delete readJob->settings();
QList<QNetworkCookie> cookies = QNetworkCookie::parseCookies(readJob->textData().toUtf8());
qDebug() <<readJob->textData() << cookies.count();
if (cookies.count() > 0) {
_shibCookie = cookies.first();
addToCookieJar(_shibCookie);
@@ -291,9 +274,6 @@ void ShibbolethCredentials::slotReadJobDone(QKeychain::Job *job)
void ShibbolethCredentials::showLoginWindow()
{
qWarning() << "SHOW LOGIN WINDOW " << _browser;
if (!_browser.isNull()) {
ownCloudGui::raiseDialog(_browser);
return;
-4
Ver Arquivo
@@ -839,10 +839,6 @@ void ownCloudGui::slotHelp()
void ownCloudGui::raiseDialog( QWidget *raiseWidget )
{
qDebug() << "RAISE " << raiseWidget;
if (raiseWidget) qDebug() << raiseWidget->parentWidget() << raiseWidget->isVisible();
if( raiseWidget && raiseWidget->parentWidget() == 0) {
// Qt has a bug which causes parent-less dialogs to pop-under.
raiseWidget->showNormal();
-4
Ver Arquivo
@@ -155,10 +155,6 @@ QNetworkReply *AbstractNetworkJob::deleteRequest(const QUrl &url)
void AbstractNetworkJob::slotFinished()
{
qWarning() << reply()->request().url() << reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute) << _followRedirects << reply()->attribute(QNetworkRequest::RedirectionTargetAttribute) <<
reply()->header(QNetworkRequest::LocationHeader);
_timer.stop();
if( _reply->error() == QNetworkReply::SslHandshakeFailedError ) {
-4
Ver Arquivo
@@ -103,8 +103,6 @@ static bool isEqualExceptProtocol(const QUrl &url1, const QUrl &url2)
bool Account::changed(AccountPtr other, bool ignoreUrlProtocol) const
{
qDebug() << _credentials << other->credentials();
if (!other) {
return false;
}
@@ -127,8 +125,6 @@ AbstractCredentials *Account::credentials() const
void Account::setCredentials(AbstractCredentials *cred)
{
qDebug() << this << cred;
// set active credential manager
QNetworkCookieJar *jar = 0;
if (_am) {
-4
Ver Arquivo
@@ -185,10 +185,6 @@ void ConnectionValidator::slotAuthFailed(QNetworkReply *reply)
{
Status stat = Timeout;
qWarning() << reply->error() << _account->credentials()->stillValid(reply) << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
if( reply->error() == QNetworkReply::AuthenticationRequiredError ||
!_account->credentials()->stillValid(reply)) {
qDebug() << reply->error() << reply->errorString();
+21 -21
Ver Arquivo
@@ -724,7 +724,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Copia de seguretat detectada</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1008"/>
@@ -734,7 +734,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>Manté els fitxers locals com a conflicte</translation>
<translation type="unfinished"/>
</message>
</context>
<context>
@@ -817,7 +817,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderman.cpp" line="1190"/>
<source>The selected path is not a folder!</source>
<translation>La ruta seleccionada no és un directori!</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1194"/>
@@ -904,7 +904,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
<source>Fetching folder list from server...</source>
<translation>Obtenint la llista de carpetes del servidor...</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
@@ -1006,7 +1006,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderwizard.cpp" line="544"/>
<source>Add Sync Connection</source>
<translation>Afegir una connexió de sincronització</translation>
<translation type="unfinished"/>
</message>
</context>
<context>
@@ -1521,7 +1521,7 @@ Els elements que poden ser eliminats s&apos;eliminaran si impedeixen que una car
<message>
<location filename="../src/gui/notificationwidget.cpp" line="50"/>
<source>Created at %1</source>
<translation>Creat el %1</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/notificationwidget.cpp" line="99"/>
@@ -1626,12 +1626,12 @@ privilegis addicionals durant el procés.</translation>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>Sincronitzar el directori &apos;%1&apos;</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Atenció:&lt;/strong&gt; La carpeta local no està buida. Trieu una resolució!&lt;/small&gt;&lt;/p&gt;</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1741,7 +1741,7 @@ No és aconsellada usar-la.</translation>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>S&apos;ha esgotat el temps d&apos;espera mentres es conectava a %1 a les %2.</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
@@ -1931,12 +1931,12 @@ No és aconsellada usar-la.</translation>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="376"/>
<source>The download would reduce free disk space below %1</source>
<translation>La descàrrega reduïrà l&apos;espai lliure al disc per sota de %1</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="381"/>
<source>Free space on disk is less than %1</source>
<translation>L&apos;espai lliure del disc dur es inferior a %1</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="496"/>
@@ -1946,7 +1946,7 @@ No és aconsellada usar-la.</translation>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="545"/>
<source>The file could not be downloaded completely.</source>
<translation>No es pot descarregar el fitxer completament.</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="552"/>
@@ -1954,17 +1954,17 @@ No és aconsellada usar-la.</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>El fitxer ha canviat des de que es va descobrir</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Error en escriure les metadades a la base de dades</translation>
</message>
@@ -2363,7 +2363,7 @@ No és aconsellada usar-la.</translation>
<message>
<location filename="../src/gui/sharedialog.cpp" line="98"/>
<source>%1 Sharing</source>
<translation>Compartint amb %1</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/sharedialog.cpp" line="73"/>
@@ -2378,7 +2378,7 @@ No és aconsellada usar-la.</translation>
<message>
<location filename="../src/gui/sharedialog.cpp" line="101"/>
<source>The server does not allow sharing</source>
<translation>El servidor no permet la compartició de fitxers</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/sharedialog.cpp" line="113"/>
@@ -3048,7 +3048,7 @@ No és aconsellada usar-la.</translation>
<message>
<location filename="../src/gui/synclogdialog.ui" line="14"/>
<source>Synchronisation Log</source>
<translation>Registre de sincronització</translation>
<translation type="unfinished"/>
</message>
</context>
<context>
@@ -3069,7 +3069,7 @@ No és aconsellada usar-la.</translation>
<message>
<location filename="../src/libsync/theme.cpp" line="289"/>
<source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
<translation>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3215,7 +3215,7 @@ No és aconsellada usar-la.</translation>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="296"/>
<source>Account synchronization is disabled</source>
<translation>La sincronització del compte està deshabilitada</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="379"/>
@@ -3642,7 +3642,7 @@ No és aconsellada usar-la.</translation>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation>S&apos;ha baixat la versió del servidor i s&apos;ha renomenat el fitxer local com a fitxer de conflicte</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>
+3 -3
Ver Arquivo
@@ -1956,17 +1956,17 @@ Nedoporučuje se jí používat.</translation>
<translation>Stažený soubor je prázdný, přestože server oznámil, že měl být %1.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Soubor %1 nemohl být uložen z důvodu kolize názvu se souborem v místním systému!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>Soubor se mezitím změnil</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Chyba zápisu metadat do databáze</translation>
</message>
+3 -3
Ver Arquivo
@@ -1954,17 +1954,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>Die heruntergeladene Datei ist leer, obwohl der Server %1 als Größe übermittelt hat.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gespeichert geladen werden!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>Datei ist seit der Entdeckung geändert worden</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
</message>
+3 -3
Ver Arquivo
@@ -1954,17 +1954,17 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
</message>
+3 -3
Ver Arquivo
@@ -1975,17 +1975,17 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"></translation>
</message>
+3 -3
Ver Arquivo
@@ -1955,17 +1955,17 @@ No se recomienda usarla.</translation>
<translation>El archivo descargado está vacio aunque el servidor dice que deberia haber sido %1.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>¡El fichero %1 no puede guardarse debido a un conflicto con el nombre de otro fichero local!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>El archivo ha cambiado desde que fue descubierto</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos en la base de datos</translation>
</message>
+3 -3
Ver Arquivo
@@ -1943,17 +1943,17 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
+3 -3
Ver Arquivo
@@ -1944,17 +1944,17 @@ Selle kasutamine pole soovitatav.</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Faili %1 ei saa salvestada kuna on nime konflikt kohaliku failiga!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>Faili on pärast avastamist muudetud</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
+3 -3
Ver Arquivo
@@ -1950,17 +1950,17 @@ Ez da gomendagarria erabltzea.</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
+3 -3
Ver Arquivo
@@ -1943,17 +1943,17 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
+3 -3
Ver Arquivo
@@ -1951,17 +1951,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>Tiedosto on muuttunut löytymisen jälkeen</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
</message>
+5 -5
Ver Arquivo
@@ -1956,17 +1956,17 @@ Il est déconseillé de l&apos;utiliser.</translation>
<translation>Le fichier téléchargé est vide malgré que le serveur a annoncé qu&apos;il aurait être %1.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Le fichier %1 n&apos;a pas pu être sauvegardé en raison d&apos;un conflit sur le nom du fichier local !</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>Le fichier a changé depuis sa découverte</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Erreur à l&apos;écriture des métadonnées dans la base de données</translation>
</message>
@@ -3071,7 +3071,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
<message>
<location filename="../src/libsync/theme.cpp" line="289"/>
<source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
<translation>&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3296,7 +3296,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
<source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
<translation>&lt;p&gt;Version %2. Pour plus d&apos;informations, consultez &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Par Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz et autres.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Sous licence GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud et le logo ownCloud sont des marques déposées de ownCloud, Inc. aux Etats-Unis, dans d&apos;autres pays, ou dans les deux.&lt;/p&gt;</translation>
<translation type="unfinished"/>
</message>
</context>
<context>
+3 -3
Ver Arquivo
@@ -1950,17 +1950,17 @@ Recomendámoslle que non o use.</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>O ficheiro cambiou após seren atopado</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
+3 -3
Ver Arquivo
@@ -1947,17 +1947,17 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
+3 -3
Ver Arquivo
@@ -1955,17 +1955,17 @@ Non è consigliabile utilizzarlo.</translation>
<translation>Il file scaricato è vuoto nonostante il server indicasse una dimensione di %1.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Il file %1 non può essere salvato a causa di un conflitto con un file locale.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>Il file è stato modificato dal suo rilevamento</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Errore durante la scrittura dei metadati nel database</translation>
</message>
+3 -3
Ver Arquivo
@@ -1954,17 +1954,17 @@ It is not advisable to use it.</source>
<translation> %1 </translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation></translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation></translation>
</message>
+3 -3
Ver Arquivo
@@ -1956,17 +1956,17 @@ Det er ikke tilrådelig å bruke den.</translation>
<translation>Nedlastet fil er tom, selv om serveren annonserte at den skulle være %1.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Fil %1 kan ikke lagres grunn av lokal konflikt med filnavn.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>Filen er endret siden den ble oppdaget</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Feil ved skriving av metadata til databasen</translation>
</message>
+4 -4
Ver Arquivo
@@ -1957,17 +1957,17 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>Het gedownloade bestand is leeg, hoewel de server meldde dat het %1 zou moeten zijn.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>Het bestand is gewijzigd sinds het is gevonden</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Fout bij schrijven van Metadata naar de database</translation>
</message>
@@ -3601,7 +3601,7 @@ We adviseren deze site niet te gebruiken.</translation>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="324"/>
<source>%n second(s)</source>
<translation><numerusform>%n seconde</numerusform><numerusform>%n seconde(n)</numerusform></translation>
<translation><numerusform>%n seconde</numerusform><numerusform>%n seconden</numerusform></translation>
</message>
<message>
<location filename="../src/libsync/utility.cpp" line="348"/>
+16 -16
Ver Arquivo
@@ -631,17 +631,17 @@
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 i %n inny plik został usunięty.</numerusform><numerusform>%1 i %n inne pliki zostały usunięte.</numerusform><numerusform>%1 i %n innych plików zostało usuniętych.</numerusform></translation>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 i %n inny plik został pobrany.</numerusform><numerusform>%1 i %n inne pliki zostały pobrane.</numerusform><numerusform>%1 i %n innych plików zostało pobranych.</numerusform></translation>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 i %n inny plik został zaktualizowany.</numerusform><numerusform>%1 i %n inne pliki zostały zaktualizowane.</numerusform><numerusform>%1 i %n innych plików zostało zaktualizowanych.</numerusform></translation>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="510"/>
@@ -1156,7 +1156,7 @@ Jeśli kontynuujesz synchronizację, pliki zostaną nadpisane przez swój pierwo
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&amp;Launch on System Startup</source>
<translation>&amp;Uruchamiaj podczas startu systemu</translation>
<translation>&amp;Uruchamiaj podczas startu systemu Windows</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
@@ -1933,7 +1933,7 @@ Niezalecane jest jego użycie.</translation>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="376"/>
<source>The download would reduce free disk space below %1</source>
<translation>Pobranie zmniejszy ilość wolnego miejsca poniżej %1.</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="381"/>
@@ -1956,17 +1956,17 @@ Niezalecane jest jego użycie.</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Błąd podczas zapisu metadanych do bazy</translation>
</message>
@@ -3523,12 +3523,12 @@ Kliknij</translation>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="469"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n dzień temu</numerusform><numerusform>%n dni temu</numerusform><numerusform>%n dni temu</numerusform></translation>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="477"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n godzinę temu</numerusform><numerusform>%n godziny temu</numerusform><numerusform>%n godzin temu</numerusform></translation>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<location filename="../src/libsync/utility.cpp" line="482"/>
@@ -3543,7 +3543,7 @@ Kliknij</translation>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="487"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n minutę temu</numerusform><numerusform>%n minuty temu</numerusform><numerusform>%n minut temu</numerusform></translation>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<location filename="../src/libsync/utility.cpp" line="490"/>
@@ -3576,27 +3576,27 @@ Kliknij</translation>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="319"/>
<source>%n year(s)</source>
<translation><numerusform>%n rok</numerusform><numerusform>%n lata</numerusform><numerusform>%n lat</numerusform></translation>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="320"/>
<source>%n month(s)</source>
<translation><numerusform>%n miesiąc</numerusform><numerusform>%n miesiące</numerusform><numerusform>%n miesięcy</numerusform></translation>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="321"/>
<source>%n day(s)</source>
<translation><numerusform>%n dzień</numerusform><numerusform>%n dni</numerusform><numerusform>%n dni</numerusform></translation>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="322"/>
<source>%n hour(s)</source>
<translation><numerusform>%n godzina</numerusform><numerusform>%n godziny</numerusform><numerusform>%n godzin</numerusform></translation>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="323"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuta</numerusform><numerusform>%n minuty</numerusform><numerusform>%n minut</numerusform></translation>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="324"/>
+4 -4
Ver Arquivo
@@ -264,7 +264,7 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="346"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Deseja mesmo parar a sincronização da pasta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; isto &lt;b&gt;não&lt;/b&gt; irá eliminar qualquer ficheiro.&lt;/p&gt;</translation>
<translation>&lt;p&gt;Deseja mesmo parar a sincronização da pasta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; isto &lt;b&gt;não&lt;/b&gt; irá eliminar quaisquer ficheiros.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="488"/>
@@ -1956,17 +1956,17 @@ Não é aconselhada a sua utilização.</translation>
<translation>O ficheiro transferido está vazio, apesar do servidor indicar que este deveria ter %1.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Ficheiro %1 não pode ser guardado devido à existência de um ficheiro local com o mesmo nome.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>O ficheiro alterou-se desde a sua descoberta</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Erro ao escrever a meta-informação par a base de dados</translation>
</message>
+3 -3
Ver Arquivo
@@ -1955,17 +1955,17 @@ It is not advisable to use it.</source>
<translation>O arquivo baixado está vazio apesar do servidor anunciou que deveria ter %1.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>O arquivo %1 não pode ser salvo por causa de um confronto com um nome de arquivo local!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>Arquivo foi alterado desde a descoberta</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
</message>
+5 -5
Ver Arquivo
@@ -1955,17 +1955,17 @@ It is not advisable to use it.</source>
<translation>Скачанный файл пуст, хотя сервер заявил, что он должен быть %1.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Файл %1 не может быть сохранён из-за локального конфликта имен!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>После обнаружения файл был изменен</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Ошибка записи метаданных в базу данных</translation>
</message>
@@ -3070,7 +3070,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/theme.cpp" line="289"/>
<source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
<translation>&lt;p&gt;Все права принадлежат ownCloud GmbH&lt;/p&gt;</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3295,7 +3295,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
<source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
<translation>&lt;p&gt;Версия %2. Дополнительная информация доступна по ссылке &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Авторы: Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz, и другие.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Авторские права принадлежат ownCloud GmbH&lt;/p&gt;&lt;p&gt;Лицензировано под GNU General Public License (GPL) Версии 2.0&lt;br/&gt;ownCloud и логотип ownCloud - зарегистрированные торговые марки ownCloud, Inc. в Соединенных Штатах, и/или других странах&lt;/p&gt;</translation>
<translation type="unfinished"/>
</message>
</context>
<context>
+3 -3
Ver Arquivo
@@ -1950,17 +1950,17 @@ Nie je vhodné ju používať.</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Súbor %1 nie je možné uložiť, pretože jeho názov koliduje s názvom lokálneho súboru!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>Súbor sa medzitým zmenil</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Chyba pri zápise metadát do databázy</translation>
</message>
+5 -5
Ver Arquivo
@@ -1955,17 +1955,17 @@ Uporaba ni priporočljiva.</translation>
<translation>Prejeta datoteka je prazna, čeprav je na strežniku objavljena z %1.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Datoteke %1 ni mogoče shraniti zaradi neskladja z imenom obstoječe datoteke!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>Datoteka je bila po spremenjena po usklajevanju seznama datotek.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
</message>
@@ -2127,7 +2127,7 @@ Uporaba ni priporočljiva.</translation>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>Manjka naslov URL</translation>
<translation>URL za branje manjka</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
@@ -3295,7 +3295,7 @@ Uporaba ni priporočljiva.</translation>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
<source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
<translation>&lt;p&gt;Različica %2. Več podrobnosti je zabeleženih na &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Avtorstvo: Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz in drugi.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Avtorske pravice ownCloud GmbH&lt;/p&gt;&lt;p&gt;Programski paket je objavljen z dovoljenjem GNU General Public License (GPL), različice 2.0.&lt;br/&gt;Znamka in logotip ownCloud sta blagovni znamki družbe ownCloud, Inc, v Združenih državah, drugih državah ali obojih.&lt;/p&gt;</translation>
<translation type="unfinished"/>
</message>
</context>
<context>
+3 -3
Ver Arquivo
@@ -1949,17 +1949,17 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Фајл %1 се не може сачувати јер се судара са називом локалног фајла!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>Фајл је измењен у међувремену</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
+3 -3
Ver Arquivo
@@ -1956,17 +1956,17 @@ Det är inte lämpligt använda den.</translation>
<translation>Den nedladdade filen är tom men servern sa att den skulle vara %1.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Fil %1 kan inte sparas eftersom namnet krockar med en lokal fil!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>Filen har ändrats sedan upptäckten</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Fel vid skrivning av metadata till databasen</translation>
</message>
+13 -13
Ver Arquivo
@@ -666,12 +666,12 @@
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 %n log </numerusform></translation>
<translation><numerusform>%1 %n </numerusform></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 log </translation>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="539"/>
@@ -1309,7 +1309,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/logbrowser.cpp" line="59"/>
<source>Log Output</source>
<translation> log</translation>
<translation></translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="71"/>
@@ -1329,7 +1329,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/logbrowser.cpp" line="98"/>
<source>Clear the log display.</source>
<translation> log </translation>
<translation></translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="104"/>
@@ -1339,7 +1339,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/logbrowser.cpp" line="105"/>
<source>Save the log file to a file on disk for debugging.</source>
<translation> log </translation>
<translation></translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="184"/>
@@ -1354,7 +1354,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/logbrowser.cpp" line="194"/>
<source>Could not write to log file %1</source>
<translation> log %1</translation>
<translation> %1</translation>
</message>
</context>
<context>
@@ -1367,7 +1367,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/libsync/logger.cpp" line="191"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt; &apos;%1&apos;&lt;br/&gt;&lt;br/&gt;&lt;br/&gt; log &lt;b&gt;&lt;/b&gt; !&lt;/nobr&gt;</translation>
<translation>&lt;nobr&gt; &apos;%1&apos;&lt;br/&gt;.&lt;br/&gt;&lt;br/&gt; &lt;b&gt;&lt;/b&gt; !&lt;/nobr&gt;</translation>
</message>
</context>
<context>
@@ -1956,17 +1956,17 @@ It is not advisable to use it.</source>
<translation> %1</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation> %1 !</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation></translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation></translation>
</message>
@@ -3048,7 +3048,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/synclogdialog.ui" line="14"/>
<source>Synchronisation Log</source>
<translation> Log</translation>
<translation></translation>
</message>
</context>
<context>
@@ -3069,7 +3069,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/theme.cpp" line="289"/>
<source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
<translation>&lt;p&gt; ownCloud GmbH&lt;/p&gt;</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3294,7 +3294,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
<source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
<translation>&lt;p&gt; %2 &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt; Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz &lt;/small&gt;&lt;/p&gt;&lt;p&gt; ownCloud GmbH&lt;/p&gt;&lt;p&gt; GNU General Public (GPL) 2.0&lt;br/&gt;ownCloud ownCloud ownCloud, Inc. &lt;/p&gt;</translation>
<translation type="unfinished"/>
</message>
</context>
<context>
+3 -3
Ver Arquivo
@@ -1954,17 +1954,17 @@ Kullanmanız önerilmez.</translation>
<translation>Sunucu boyutunu %1 olarak duyurmasına rağmen indirilen dosya boş.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Yerel bir dosya ismi ile çakıştığından, %1 dosyası kaydedilemedi!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>Dosya, bulunduğundan itibaren değişmiş</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation>Veritabanına üstveri yazma hatası</translation>
</message>
+3 -3
Ver Arquivo
@@ -1944,17 +1944,17 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Файл %1 не збережено через локальний конфлікт назви файлу! </translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation>Файл змінився з моменту знаходження</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
+4 -4
Ver Arquivo
@@ -1954,17 +1954,17 @@ It is not advisable to use it.</source>
<translation> %1</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation> %1 </translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation></translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation></translation>
</message>
@@ -2550,7 +2550,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="91"/>
<source>SSL Chipher Debug View</source>
<translation>SSL加密调试信息</translation>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="99"/>
+3 -3
Ver Arquivo
@@ -1954,17 +1954,17 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="711"/>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation> %1 !</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="759"/>
<location filename="../src/libsync/propagatedownload.cpp" line="742"/>
<source>File has changed since discovery</source>
<translation></translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="809"/>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>