mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 06:55:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into samu-workopen-patch-1

Browse source
This commit is contained in:
Camila Ayres 2019-10-22 14:59:45 +02:00 committed by GitHub
commit ce71673824
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 104 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
.drone.yml
View file

@ -22,11 +22,11 @@ steps:
source /opt/qt57/bin/qt57-env.sh && source /opt/qt57/bin/qt57-env.sh &&
mkdir build && mkdir build &&
cd build && cd build &&
cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ && cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../ &&
make && make &&
useradd -m -s /bin/bash test && useradd -m -s /bin/bash test &&
chown -R test:test . && chown -R test:test . &&
su -c 'ctest --output-on-failure' test" su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test"
trigger: trigger:
branch: branch:
- master - master
@ -59,11 +59,11 @@ steps:
source /opt/qt58/bin/qt58-env.sh && source /opt/qt58/bin/qt58-env.sh &&
mkdir build && mkdir build &&
cd build && cd build &&
cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ && cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../ &&
make && make &&
useradd -m -s /bin/bash test && useradd -m -s /bin/bash test &&
chown -R test:test . && chown -R test:test . &&
su -c 'ctest --output-on-failure' test" su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test"
trigger: trigger:
branch: branch:
- master - master
@ -96,11 +96,11 @@ steps:
source /opt/qt59/bin/qt59-env.sh && source /opt/qt59/bin/qt59-env.sh &&
mkdir build && mkdir build &&
cd build && cd build &&
cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ && cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../ &&
make && make &&
useradd -m -s /bin/bash test && useradd -m -s /bin/bash test &&
chown -R test:test . && chown -R test:test . &&
su -c 'ctest --output-on-failure' test" su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test"
trigger: trigger:
branch: branch:
- master - master
@ -137,11 +137,11 @@ steps:
source /opt/qt510/bin/qt510-env.sh && source /opt/qt510/bin/qt510-env.sh &&
mkdir build && mkdir build &&
cd build && cd build &&
cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ && cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../ &&
make && make &&
useradd -m -s /bin/bash test && useradd -m -s /bin/bash test &&
chown -R test:test . && chown -R test:test . &&
su -c 'ctest --output-on-failure' test" su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test"
trigger: trigger:
branch: branch:
- master - master
@ -178,11 +178,11 @@ steps:
source /opt/qt511/bin/qt511-env.sh && source /opt/qt511/bin/qt511-env.sh &&
mkdir build && mkdir build &&
cd build && cd build &&
cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ && cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../ &&
make && make &&
useradd -m -s /bin/bash test && useradd -m -s /bin/bash test &&
chown -R test:test . && chown -R test:test . &&
su -c 'ctest --output-on-failure' test" su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test"
trigger: trigger:
branch: branch:
- master - master
@ -219,11 +219,11 @@ steps:
source /opt/qt511/bin/qt511-env.sh && source /opt/qt511/bin/qt511-env.sh &&
mkdir build && mkdir build &&
cd build && cd build &&
cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ && cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../ &&
make && make &&
useradd -m -s /bin/bash test && useradd -m -s /bin/bash test &&
chown -R test:test . && chown -R test:test . &&
su -c 'ctest --output-on-failure' test" su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test"
trigger: trigger:
branch: branch:
- master - master
@ -237,7 +237,7 @@ name: qt-5.12
steps: steps:
- name: build and test - name: build and test
image: nextcloudci/client-5.12:client-5.12-2 image: nextcloudci/client-5.12:client-5.12-3
commands: commands:
# Install QtKeyChain # Install QtKeyChain
- /bin/bash -c " - /bin/bash -c "
@ -260,11 +260,11 @@ steps:
source /opt/qt512/bin/qt512-env.sh && source /opt/qt512/bin/qt512-env.sh &&
mkdir build && mkdir build &&
cd build && cd build &&
cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ && cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../ &&
make && make &&
useradd -m -s /bin/bash test && useradd -m -s /bin/bash test &&
chown -R test:test . && chown -R test:test . &&
su -c 'ctest --output-on-failure' test" su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test"
trigger: trigger:
branch: branch:
- master - master
@ -278,7 +278,7 @@ name: qt-5.12-clang
steps: steps:
- name: build and test - name: build and test
image: nextcloudci/client-5.12:client-5.12-2 image: nextcloudci/client-5.12:client-5.12-3
commands: commands:
# Install QtKeyChain # Install QtKeyChain
- /bin/bash -c " - /bin/bash -c "
@ -301,11 +301,11 @@ steps:
source /opt/qt512/bin/qt512-env.sh && source /opt/qt512/bin/qt512-env.sh &&
mkdir build && mkdir build &&
cd build && cd build &&
cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ && cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../ &&
make && make &&
useradd -m -s /bin/bash test && useradd -m -s /bin/bash test &&
chown -R test:test . && chown -R test:test . &&
su -c 'ctest --output-on-failure' test" su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test"
trigger: trigger:
branch: branch:
- master - master
@ -319,7 +319,7 @@ name: AppImage
steps: steps:
- name: build - name: build
image: nextcloudci/client-5.12:client-5.12-2 image: nextcloudci/client-5.12:client-5.12-3
commands: commands:
- /bin/bash -c "./admin/linux/build-appimage.sh" - /bin/bash -c "./admin/linux/build-appimage.sh"
trigger: trigger:

8
.tx/nextcloud.client-desktop/de_translation
View file

@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
# Translations # Translations
Icon[de]=@APPLICATION_ICON_NAME@ Icon[de_DE]=@APPLICATION_ICON_NAME@
Name[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
GenericName[de]=Synchronisationsordner GenericName[de_DE]=Synchronisationsordner

6
CMakeLists.txt
View file

@ -219,6 +219,12 @@ if (APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
endif() endif()
option(SANITIZE_ADDRESS "Enable address sanitizer in tests" OFF)
if (SANITIZE_ADDRESS)
include(SanitizerFlags)
enable_sanitizer()
endif ()
# Handle Translations, pick all client_* files from trans directory. # Handle Translations, pick all client_* files from trans directory.
file( GLOB TRANS_FILES ${CMAKE_SOURCE_DIR}/translations/client_*.ts) file( GLOB TRANS_FILES ${CMAKE_SOURCE_DIR}/translations/client_*.ts)
set(TRANSLATIONS ${TRANS_FILES}) set(TRANSLATIONS ${TRANS_FILES})

1
admin/linux/debian/debian.eoan/control
View file

@ -10,6 +10,7 @@ Build-Depends: cmake,
libkf5kio-dev, libkf5kio-dev,
libcmocka-dev, libcmocka-dev,
libcloudproviders-dev, libcloudproviders-dev,
libdbus-1-dev,
libhttp-dav-perl, libhttp-dav-perl,
libinotify-dev [kfreebsd-any], libinotify-dev [kfreebsd-any],
libqt5svg5-dev, libqt5svg5-dev,

1
admin/linux/debian/debian.stable/control
View file

@ -11,6 +11,7 @@ Build-Depends: cmake,
kio-dev, kio-dev,
libcmocka-dev, libcmocka-dev,
libcloudproviders-dev, libcloudproviders-dev,
libdbus-1-dev,
libhttp-dav-perl, libhttp-dav-perl,
libinotify-dev [kfreebsd-any], libinotify-dev [kfreebsd-any],
libqt5webkit5-dev, libqt5webkit5-dev,

1
admin/linux/debian/debian/control
View file

@ -11,6 +11,7 @@ Build-Depends: cmake,
libkf5kio-dev, libkf5kio-dev,
libcmocka-dev, libcmocka-dev,
libcloudproviders-dev, libcloudproviders-dev,
libdbus-1-dev,
libhttp-dav-perl, libhttp-dav-perl,
libinotify-dev [kfreebsd-any], libinotify-dev [kfreebsd-any],
libqt5svg5-dev, libqt5svg5-dev,

2
binary

@ -1 +1 @@
Subproject commit 3425fab2c66118ffae3e3b16751e636ca71ee450 Subproject commit 09f12de3122ad1acf735d0e85b77bfba1cac2a29

17
cmake/modules/SanitizerFlags.cmake Normal file
View file

@ -0,0 +1,17 @@
# Enable address sanitizer (gcc/clang only)
macro(ENABLE_SANITIZER)
if (NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
message(FATAL_ERROR "Sanitizer supported only for gcc/clang")
endif()
set(SANITIZER_FLAGS "-fsanitize=address -fsanitize=leak -g")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SANITIZER_FLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SANITIZER_FLAGS}")
set(LINKER_FLAGS "-fsanitize=address,undefined -fuse-ld=gold")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LINKER_FLAGS}")
endmacro()

2
src/3rdparty/libcrashreporter-qt vendored

@ -1 +1 @@
Subproject commit 7df66f72aac595295dffcf4dc8a536822008c51d Subproject commit a4409c5c1b39dc208518bd0f2868fc2894bdcb3f

2
src/3rdparty/qtmacgoodies vendored

@ -1 +1 @@
Subproject commit ebc7ec6f681c0ae52c9443dbf63c4d1224bf3aec Subproject commit b59d091b3e6b98e7219cf636f7d21fb267242c27

10
src/CMakeLists.txt
View file

@ -29,12 +29,12 @@ if(NOT MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
endif() endif()
endif()
# Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU
# extension (C++11 §16.3/4 forbids them). Silence clang's warnings. # extension (C++11 §16.3/4 forbids them). Silence clang's warnings.
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
endif()
if(WIN32) if(WIN32)
# Enable DEP & ASLR # Enable DEP & ASLR

4
src/csync/csync_exclude.cpp
View file

@ -288,7 +288,11 @@ void ExcludedFiles::addManualExclude(const QByteArray &expr)
void ExcludedFiles::addManualExclude(const QByteArray &expr, const QByteArray &basePath) void ExcludedFiles::addManualExclude(const QByteArray &expr, const QByteArray &basePath)
{ {
#if defined(Q_OS_WIN)
Q_ASSERT(basePath.size() >= 2 && basePath.at(1) == ':');
#else
Q_ASSERT(basePath.startsWith('/')); Q_ASSERT(basePath.startsWith('/'));
#endif
Q_ASSERT(basePath.endsWith('/')); Q_ASSERT(basePath.endsWith('/'));
auto key = basePath; auto key = basePath;

2
test/testfolderwatcher.cpp
View file

@ -146,7 +146,7 @@ private slots:
mkdir(_rootPath + "/a0/b"); mkdir(_rootPath + "/a0/b");
mkdir(_rootPath + "/a0/b/c"); mkdir(_rootPath + "/a0/b/c");
touch(file); touch(file);
mv(_rootPath + "/a0 ", _rootPath + "/a"); mv(_rootPath + "/a0", _rootPath + "/a");
QVERIFY(waitForPathChanged(_rootPath + "/a/b/c/empty.txt")); QVERIFY(waitForPathChanged(_rootPath + "/a/b/c/empty.txt"));
} }

50
translations/client_fi.ts
View file

@ -107,27 +107,27 @@
<message> <message>
<location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/>
<source>Browser Authentication</source> <source>Browser Authentication</source>
<translation type="unfinished"/> <translation>Selaintunnistautuminen</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/>
<source>Please switch to your browser to proceed.</source> <source>Please switch to your browser to proceed.</source>
<translation type="unfinished"/> <translation>Vaihda selaimeen jatkaaksesi.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/>
<source>An error occurred while connecting. Please try again.</source> <source>An error occurred while connecting. Please try again.</source>
<translation type="unfinished"/> <translation>Yhdistäessä tapahtui virhe. Yritä uudelleen.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/>
<source>Re-open Browser</source> <source>Re-open Browser</source>
<translation type="unfinished"/> <translation>Avaa selain uudelleen</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/flow2authcredspage.ui" line="70"/> <location filename="../src/gui/wizard/flow2authcredspage.ui" line="70"/>
<source>Copy link</source> <source>Copy link</source>
<translation type="unfinished"/> <translation>Kopioi linkki</translation>
</message> </message>
</context> </context>
<context> <context>
@ -135,27 +135,27 @@
<message> <message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/>
<source>Browser Authentication</source> <source>Browser Authentication</source>
<translation type="unfinished"/> <translation>Selaintunnistautuminen</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/>
<source>Please switch to your browser to proceed.</source> <source>Please switch to your browser to proceed.</source>
<translation type="unfinished"/> <translation>Vaihda selaimeen jatkaaksesi.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/>
<source>An error occurred while connecting. Please try again.</source> <source>An error occurred while connecting. Please try again.</source>
<translation type="unfinished"/> <translation>Yhdistäessä tapahtui virhe. Yritä uudelleen.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/>
<source>Re-open Browser</source> <source>Re-open Browser</source>
<translation type="unfinished"/> <translation>Avaa selain uudelleen</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="82"/> <location filename="../src/gui/wizard/flow2authwidget.ui" line="82"/>
<source>Copy link</source> <source>Copy link</source>
<translation type="unfinished"/> <translation>Kopioi linkki</translation>
</message> </message>
</context> </context>
<context> <context>
@ -974,17 +974,17 @@ If this action was unintended you can restore the lost data now.</source>
<message> <message>
<location filename="../src/gui/folder.cpp" line="1091"/> <location filename="../src/gui/folder.cpp" line="1091"/>
<source>Delete all files?</source> <source>Delete all files?</source>
<translation type="unfinished"/> <translation>Poistetaanko kaikki tiedostot?</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/folder.cpp" line="1094"/> <location filename="../src/gui/folder.cpp" line="1094"/>
<source>Delete all files</source> <source>Delete all files</source>
<translation type="unfinished"/> <translation>Poista kaikki tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/folder.cpp" line="1095"/> <location filename="../src/gui/folder.cpp" line="1095"/>
<source>Restore deleted files</source> <source>Restore deleted files</source>
<translation type="unfinished"/> <translation>Palauta poistetut tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/folder.cpp" line="1112"/> <location filename="../src/gui/folder.cpp" line="1112"/>
@ -1569,17 +1569,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message> <message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/>
<source>Add</source> <source>Add</source>
<translation type="unfinished"/> <translation>Lisää</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/>
<source>Remove</source> <source>Remove</source>
<translation type="unfinished"/> <translation>Poista</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/>
<source>Remove all</source> <source>Remove all</source>
<translation type="unfinished"/> <translation>Poista kaikki</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="24"/> <location filename="../src/gui/ignorelisttablewidget.cpp" line="24"/>
@ -1591,7 +1591,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message> <message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/>
<source>Could not open file</source> <source>Could not open file</source>
<translation type="unfinished"/> <translation>Tiedoston avaaminen ei onnistunut</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/>
@ -2777,7 +2777,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<message> <message>
<location filename="../src/gui/sharelinkwidget.cpp" line="224"/> <location filename="../src/gui/sharelinkwidget.cpp" line="224"/>
<source>Add another link</source> <source>Add another link</source>
<translation type="unfinished"/> <translation>Lisää toinen linkki</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/sharelinkwidget.cpp" line="403"/> <location filename="../src/gui/sharelinkwidget.cpp" line="403"/>
@ -2945,12 +2945,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<location filename="../src/gui/socketapi.cpp" line="666"/> <location filename="../src/gui/socketapi.cpp" line="666"/>
<location filename="../src/gui/socketapi.cpp" line="668"/> <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>Copy public link</source> <source>Copy public link</source>
<translation type="unfinished"/> <translation>Kopioi julkinen linkki</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/socketapi.cpp" line="672"/> <location filename="../src/gui/socketapi.cpp" line="672"/>
<source>Copy internal link</source> <source>Copy internal link</source>
<translation type="unfinished"/> <translation>Kopioi sisäinen linkki</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/socketapi.cpp" line="722"/> <location filename="../src/gui/socketapi.cpp" line="722"/>
@ -3060,7 +3060,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<message> <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/> <location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source> <source>Server version: %1</source>
<translation type="unfinished"/> <translation>Palvelimen versio: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/sslbutton.cpp" line="205"/> <location filename="../src/gui/sslbutton.cpp" line="205"/>
@ -3075,7 +3075,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<message> <message>
<location filename="../src/gui/sslbutton.cpp" line="244"/> <location filename="../src/gui/sslbutton.cpp" line="244"/>
<source>The connection is not secure</source> <source>The connection is not secure</source>
<translation type="unfinished"/> <translation>Tämä yhteys ei ole turvallinen</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/sslbutton.cpp" line="177"/> <location filename="../src/gui/sslbutton.cpp" line="177"/>
@ -3140,12 +3140,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<message> <message>
<location filename="../src/gui/sslerrordialog.cpp" line="194"/> <location filename="../src/gui/sslerrordialog.cpp" line="194"/>
<source>Fingerprint (SHA-256): &lt;tt&gt;%1&lt;/tt&gt;</source> <source>Fingerprint (SHA-256): &lt;tt&gt;%1&lt;/tt&gt;</source>
<translation type="unfinished"/> <translation>Sormenjälki (SHA-256): &lt;tt&gt;%1&lt;/tt&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/sslerrordialog.cpp" line="195"/> <location filename="../src/gui/sslerrordialog.cpp" line="195"/>
<source>Fingerprint (SHA-512): &lt;tt&gt;%1&lt;/tt&gt;</source> <source>Fingerprint (SHA-512): &lt;tt&gt;%1&lt;/tt&gt;</source>
<translation type="unfinished"/> <translation>Sormenjälki (SHA-512): &lt;tt&gt;%1&lt;/tt&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/sslerrordialog.cpp" line="197"/> <location filename="../src/gui/sslerrordialog.cpp" line="197"/>
@ -3806,7 +3806,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<message> <message>
<location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/>
<source>Copy link</source> <source>Copy link</source>
<translation type="unfinished"/> <translation>Kopioi linkki</translation>
</message> </message>
</context> </context>
<context> <context>

30
translations/client_ru.ts
View file

@ -107,12 +107,12 @@
<message> <message>
<location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/>
<source>Browser Authentication</source> <source>Browser Authentication</source>
<translation type="unfinished"/> <translation>Аутентификация с использованием браузера</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/>
<source>Please switch to your browser to proceed.</source> <source>Please switch to your browser to proceed.</source>
<translation>Чтобы продолжить, перейдите в ваш браузер.</translation> <translation>Чтобы продолжить, перейдите в браузер.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/>
@ -135,7 +135,7 @@
<message> <message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/>
<source>Browser Authentication</source> <source>Browser Authentication</source>
<translation type="unfinished"/> <translation>Аутентификация с использованием браузера</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/>
@ -145,12 +145,12 @@
<message> <message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/>
<source>An error occurred while connecting. Please try again.</source> <source>An error occurred while connecting. Please try again.</source>
<translation type="unfinished"/> <translation>Ошибка во время установления соединения, попробуйте ещё раз.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/>
<source>Re-open Browser</source> <source>Re-open Browser</source>
<translation type="unfinished"/> <translation>Повторно открыть браузер</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="82"/> <location filename="../src/gui/wizard/flow2authwidget.ui" line="82"/>
@ -313,7 +313,7 @@
<location filename="../src/gui/accountsettings.cpp" line="620"/> <location filename="../src/gui/accountsettings.cpp" line="620"/>
<location filename="../src/gui/accountsettings.cpp" line="656"/> <location filename="../src/gui/accountsettings.cpp" line="656"/>
<source>Edit Ignored Files</source> <source>Edit Ignored Files</source>
<translation type="unfinished"/> <translation>Список исключений синхронизации…</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="660"/> <location filename="../src/gui/accountsettings.cpp" line="660"/>
@ -579,7 +579,7 @@
<message> <message>
<location filename="../src/gui/activitylistmodel.cpp" line="229"/> <location filename="../src/gui/activitylistmodel.cpp" line="229"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source> <source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/> <translation>Из синхронизации исключены символьные ссылки и следующие файлы:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -760,25 +760,25 @@
<location filename="../src/gui/creds/flow2auth.cpp" line="76"/> <location filename="../src/gui/creds/flow2auth.cpp" line="76"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="145"/> <location filename="../src/gui/creds/flow2auth.cpp" line="145"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source> <source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation type="unfinished"/> <translation>Сервер сообщил об ошибке: &lt;em&gt;%1&lt;/em&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="79"/> <location filename="../src/gui/creds/flow2auth.cpp" line="79"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="148"/> <location filename="../src/gui/creds/flow2auth.cpp" line="148"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source> <source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation type="unfinished"/> <translation>При доступе к конечной точке токена произошла ошибка: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="82"/> <location filename="../src/gui/creds/flow2auth.cpp" line="82"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="151"/> <location filename="../src/gui/creds/flow2auth.cpp" line="151"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source> <source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation type="unfinished"/> <translation>Не удалось разобрать ответ сервера в формате JSON: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="85"/> <location filename="../src/gui/creds/flow2auth.cpp" line="85"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="154"/> <location filename="../src/gui/creds/flow2auth.cpp" line="154"/>
<source>The reply from the server did not contain all expected fields</source> <source>The reply from the server did not contain all expected fields</source>
<translation type="unfinished"/> <translation>В ответе сервера содержатся не все ожидаемые поля</translation>
</message> </message>
</context> </context>
<context> <context>
@ -786,17 +786,17 @@
<message> <message>
<location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/>
<source>Connect to %1</source> <source>Connect to %1</source>
<translation type="unfinished"/> <translation>Подключение к %1</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/>
<source>Login in your browser (Login Flow v2)</source> <source>Login in your browser (Login Flow v2)</source>
<translation type="unfinished"/> <translation>Выполнить вход в браузере (процедура входа версии 2)</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/flow2authcredspage.cpp" line="83"/> <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="83"/>
<source>Unable to open the Browser, please copy the link to your Browser.</source> <source>Unable to open the Browser, please copy the link to your Browser.</source>
<translation type="unfinished"/> <translation>Не удалось открыть браузер, скопируйте ссылку и перейдите по ней в своём браузере.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -804,7 +804,7 @@
<message> <message>
<location filename="../src/gui/wizard/flow2authwidget.cpp" line="67"/> <location filename="../src/gui/wizard/flow2authwidget.cpp" line="67"/>
<source>Unable to open the Browser, please copy the link to your Browser.</source> <source>Unable to open the Browser, please copy the link to your Browser.</source>
<translation type="unfinished"/> <translation>Не удалось открыть браузер, скопируйте ссылку и перейдите по ней в своём браузере.</translation>
</message> </message>
</context> </context>
<context> <context>

2
translations/client_sl.ts
View file

@ -2922,7 +2922,7 @@ Uporaba ni priporočljiva.</translation>
<location filename="../src/gui/socketapi.cpp" line="625"/> <location filename="../src/gui/socketapi.cpp" line="625"/>
<location filename="../src/gui/socketapi.cpp" line="655"/> <location filename="../src/gui/socketapi.cpp" line="655"/>
<source>Share options</source> <source>Share options</source>
<translation type="unfinished"/> <translation>Možnosti souporabe</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/socketapi.cpp" line="626"/> <location filename="../src/gui/socketapi.cpp" line="626"/>

2
translations/client_tr.ts
View file

@ -579,7 +579,7 @@
<message> <message>
<location filename="../src/gui/activitylistmodel.cpp" line="229"/> <location filename="../src/gui/activitylistmodel.cpp" line="229"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source> <source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/> <translation>Yok sayma listesindeki dosyalar ve sembolik bağlantılar eşitlenmez. Şunlar bulunur:</translation>
</message> </message>
</context> </context>
<context> <context>