1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-04-06 07:34:18 +02:00

Compare commits

...

29 Commits

Author SHA1 Message Date
Nextcloud bot
371001c9ff [tx-robot] updated from transifex 2018-11-11 01:51:25 +00:00
Nextcloud bot
8367dbc67f [tx-robot] updated from transifex 2018-11-10 01:49:34 +00:00
rakekniven
ee96d998e5 Merge pull request #803 from nextcloud/rakekniven-patch-1
l10n. Added space for correct grammar.
2018-11-09 17:06:25 +01:00
rakekniven
a73da99d78 Merge branch 'master' into rakekniven-patch-1 2018-11-09 16:37:43 +01:00
rakekniven
f25ef73772 l10n. Added space for correct grammar.
Signed-off-by: Mark Ziegler <mark.ziegler@rakekniven.de>
2018-11-09 16:37:29 +01:00
Roeland Jago Douma
cf0838643f Merge pull request #800 from nextcloud/fix/open_activities_on_conflict
Actually open the activity view on a click for more info
2018-11-09 16:36:24 +01:00
Roeland Jago Douma
559fd910d8 Merge pull request #801 from nextcloud/fix/generated_avatar_not_black
Use a format that supports alpha channels for avatars
2018-11-09 15:15:46 +01:00
Roeland Jago Douma
3a0c7f64c0 Use a format that supports alpha channels for avatars
If we use the source format it can result in fully black images. As the
basic generated avatar doesn't have an alpha channel.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-09 13:01:28 +01:00
Roeland Jago Douma
7925c6c081 Actually open the activity view on a click for more info
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-09 12:12:25 +01:00
Roeland Jago Douma
9c0e5c2b19 Merge pull request #797 from alexcustos/issue_alternative_log_in
Added default scheme when server returns just a host
2018-11-09 08:52:39 +01:00
Nextcloud bot
c387592e47 [tx-robot] updated from transifex 2018-11-09 01:48:22 +00:00
Camila Ayres
b1d68f311d Merge pull request #798 from alexcustos/issues_openssl_1_1
Removed explicit initialization; Fixed RAND_bytes not found
2018-11-08 10:26:47 +01:00
Aleksandr Borisenko
f5586baee7 Added default scheme when server returns just a host 2018-11-08 11:35:27 +03:00
Aleksandr Borisenko
bb2d31a2bd Removed explicit initialization; Fixed RAND_bytes not found 2018-11-08 11:24:39 +03:00
Nextcloud bot
82cbee3f9d [tx-robot] updated from transifex 2018-11-08 01:48:27 +00:00
Roeland Jago Douma
347f4c8675 Merge pull request #796 from nextcloud/settings-dialog-height
SettingsDialog: disable unnecessary wrapping for the about label
2018-11-07 21:09:27 +01:00
J-P Nurmi
3a6d0ee29c SettingsDialog: disable unnecessary wrapping for the about label
For some reason, QLabel with rich text and word wrapping enabled
calculates quite a bit too large size hint. Luckily, it's rich text
that is already divided to paragraphs so that wrapping makes actually
very little visual difference. For example, on my screen, when the
settings dialog is resized horizontally to the minimum, the only word
that actually wrapped was "2017". After this patch, it naturally won't
wrap anymore, but the General Settings page also doesn't leave a large
gap at the bottom. As a result, the minimum height of the dialog went
down from 581 to 525. The exact values depend on the style and fonts.

Fixes #91.
2018-11-07 20:01:28 +01:00
Roeland Jago Douma
1b6e0c5292 Merge pull request #794 from jpnurmi/activity-text-colors
Fix ActivityWidget palette
2018-11-07 10:13:00 +01:00
Roeland Jago Douma
32cf2f2622 Merge branch 'master' into activity-text-colors 2018-11-07 09:29:15 +01:00
Nextcloud bot
6bd6bd3ed9 [tx-robot] updated from transifex 2018-11-07 01:48:19 +00:00
Roeland Jago Douma
13e1b6a34a Merge pull request #790 from nextcloud/fix/789/osx_installer_background
Update isntaller background for OSX
2018-11-06 11:11:16 +01:00
Roeland Jago Douma
6ada87ed15 Update isntaller background for OSX
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-06 10:39:10 +01:00
Nextcloud bot
da367f17ab [tx-robot] updated from transifex 2018-11-06 01:50:02 +00:00
J-P Nurmi
d01a99e9e5 ActivityWidget: remove a hard-coded white background
Let the system palette provide the appropriate color.

Fixes #742.
2018-11-05 22:13:34 +01:00
J-P Nurmi
b8d97b590f Fix palette usage in ActivityItemDelegate::paint()
Fixes #742.
2018-11-05 20:18:54 +01:00
Roeland Jago Douma
5a1fed8e23 Merge pull request #785 from nextcloud/we_are_nextcloud
Use Nextcloud
2018-11-05 13:57:17 +01:00
Roeland Jago Douma
fe60a2a570 Use Nextcloud
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-05 13:27:30 +01:00
Roeland Jago Douma
aee0363876 Merge pull request #783 from nextcloud/doc/cmake-build
Fix cmake build of documentation
2018-11-05 11:26:36 +01:00
Julius Härtl
abac2c327e Fix cmake build of documentation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-05 10:56:21 +01:00
28 changed files with 1351 additions and 1557 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@@ -1,51 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
enable-background="new 0 0 595.275 311.111"
xml:space="preserve"
height="200"
width="320"
version="1.1"
y="0px"
x="0px"
viewBox="0 0 35 0"
id="svg2"
inkscape:version="0.48.4 r9939"
sodipodi:docname="installer-background.svg"><metadata
id="metadata12"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs10" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1002"
id="namedview8"
showgrid="false"
inkscape:zoom="0.734375"
inkscape:cx="-49.141255"
inkscape:cy="236.17459"
inkscape:window-x="0"
inkscape:window-y="34"
inkscape:window-maximized="1"
inkscape:current-layer="svg2"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" /><path
style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#ffffff;fill-opacity:1;enable-background:accumulate"
d="m 75.63384,28.421489 c -29.36582,0 -53.09172,23.724901 -53.09172,53.091701 0,12.1047 4.03087,23.2455 10.82647,32.1667 14.74225,-17.0631 36.50138,-27.8988 60.79508,-27.8988 11.88546,0 23.15644,2.6467 33.31219,7.2871 0.82221,-3.7185 1.24924,-7.5856 1.24924,-11.555 0,-29.3658 -23.72491,-53.091701 -53.09172,-53.091701 z M 6.30358,52.98809 c -15.29297,0 -27.58645,12.3977 -27.58645,27.6906 0,4.9515 1.27738,9.6301 3.53933,13.6373 9.22826,-5.206 19.89756,-8.2239 31.23002,-8.2239 1.09366,0 2.14708,0.039 3.22713,0.1052 -0.12231,-1.5502 -0.20806,-3.103 -0.20806,-4.6844 0,-8.5178 1.85002,-16.6223 5.10106,-23.9429 -4.37708,-2.9351 -9.62115,-4.5803 -15.30284,-4.5803 z m 130.95716,19.0502 c -1.12983,0 -2.21885,0.1381 -3.33122,0.2078 0.48121,3.0338 0.83274,6.097 0.83274,9.2651 0,4.9298 -0.62692,9.6869 -1.7697,14.2616 13.39754,7.4144 24.52385,18.5084 31.8547,31.9586 7.60342,-3.9586 16.08566,-6.4754 25.08804,-7.0787 -2.32015,-27.2093 -24.86184,-48.6137 -52.67416,-48.6137 z m -43.09675,19.7789 c -41.09117,0 -74.32775,33.2333 -74.32775,74.3278 0,41.0911 33.23329,74.3277 74.32775,74.3277 41.09447,0 74.32775,-33.2366 74.32775,-74.3277 0,-41.0945 -33.23657,-74.3278 -74.32775,-74.3278 z m -80.67652,0.3117 c -31.87937,0 -57.67166,25.792 -57.67166,57.6717 0,18.7668 8.94156,35.3802 22.79774,45.9078 5.84147,-11.2667 17.57406,-18.9461 31.1258,-18.9461 1.63789,0 3.21,0.1986 4.78871,0.4169 -0.49554,-3.6054 -0.72871,-7.2937 -0.72871,-11.0346 0,-17.8847 5.82174,-34.4234 15.71907,-47.7819 -5.92466,-7.4133 -10.1643,-16.321 -11.97162,-26.025 -1.33935,-0.092 -2.69673,-0.2078 -4.05979,-0.2078 z m 180.71831,34.3544 c -9.68,0 -18.74781,2.4714 -26.75364,6.6625 4.54607,10.0696 7.07867,21.2422 7.07867,32.9998 0,22.0146 -8.85114,42.0052 -23.21431,56.5275 10.5516,11.7145 25.861,19.0503 42.88961,19.0503 31.87937,0 57.67165,-25.7916 57.67165,-57.6717 0,-31.8793 -25.79195,-57.5664 -57.67165,-57.5664 z m -244.00885,7.5998 c -29.3701,0 -53.19693,23.6164 -53.19693,52.9832 0,29.3669 23.82815,53.1937 53.19364,53.1937 11.17727,0 21.53161,-3.4825 30.08487,-9.369 -3.5344,-5.492 -5.62151,-12.0581 -5.62151,-19.0503 0,-3.6291 0.53552,-7.1158 1.56148,-10.4099 -16.01267,-11.5721 -26.44131,-30.4034 -26.44131,-51.6319 0,-5.394 0.71083,-10.6098 1.97792,-15.6152 -0.52591,-0.013 -1.03171,-0.1052 -1.56152,-0.1052 z m 312.19495,45.5955 c -1.56661,0 -3.08252,0.1789 -4.58026,0.4169 0.0829,1.3242 0.1039,2.6108 0.1039,3.9559 0,16.9326 -6.68118,32.3015 -17.4889,43.7214 5.31706,6.1831 13.12695,10.0976 21.96526,10.0976 16.09849,0 29.14785,-12.9451 29.14785,-29.0439 0,-16.0985 -13.04936,-29.1479 -29.14785,-29.1479 z m -252.64924,3.1229 c -16.09783,0 -29.04395,12.9461 -29.04395,29.044 0,16.0978 12.94612,29.1478 29.04395,29.1478 12.33919,0 22.81287,-7.6994 27.06599,-18.5298 -10.378,-10.57 -17.83675,-24.0544 -21.13213,-39.0363 -1.92854,-0.3985 -3.88588,-0.6247 -5.93386,-0.6247 z"
id="path6"
inkscape:connector-curvature="0" /></svg>
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xml:space="preserve" height="200" width="320" enable-background="new 0 0 595.275 311.111" y="0px" x="0px" viewBox="0 0 35 0"><path style="color-rendering:auto;text-decoration-color:#000000;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;block-progression:tb;text-decoration-line:none;image-rendering:auto;white-space:normal;text-indent:0;enable-background:accumulate;text-transform:none;text-decoration-style:solid" d="m100.3 47.902c-41.68 0.003-76.667 28.536-87.36 66.923-9.3312-20.531-29.874-35.082-53.741-35.083-32.488 0.003-59.2 26.715-59.203 59.203-0.0058 32.494 26.709 59.213 59.203 59.216 23.869-0.003 44.397-14.562 53.728-35.096 10.691 38.4 45.696 66.94 87.372 66.94 41.446 0.003 76.269-28.226 87.178-66.288 9.4834 20.154 29.709 34.446 53.302 34.45 32.501 0.006 59.221-26.715 59.216-59.216-0.003-32.494-26.722-59.21-59.216-59.203-23.594 0.003-43.832 14.293-53.314 34.45-10.896-38.064-45.712-66.293-87.152-66.29zm0 34.754c31.298-0.002 56.298 24.992 56.301 56.29 0.002 31.301-25 56.304-56.301 56.301-31.296-0.002-56.291-25.003-56.288-56.301 0.003-31.294 24.992-56.286 56.288-56.29zm-141.1 31.84c13.71 0.002 24.448 10.74 24.45 24.45 0.0024 13.713-10.736 24.461-24.45 24.462-13.713-0.002-24.453-10.749-24.45-24.462 0.0016-13.71 10.74-24.448 24.45-24.45zm281.58 0c13.713-0.002 24.461 10.736 24.462 24.45 0.003 13.716-10.745 24.464-24.462 24.462-13.713-0.002-24.453-10.749-24.45-24.462 0.002-13.71 10.74-24.448 24.45-24.45z" fill="#fff"/></svg>

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

View File

@@ -16,6 +16,8 @@ if(SPHINX_FOUND)
install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py" conf.py COPYONLY)
if(WITH_DOC)
add_custom_target(doc ALL DEPENDS doc-html COMMENT "Building documentation...")
else(WITH_DOC)

View File

@@ -354,7 +354,7 @@ void AccountManager::displayMnemonic(const QString& mnemonic)
Ui_Dialog ui;
ui.setupUi(widget);
widget->setWindowTitle(tr("End to end encryption mnemonic"));
ui.label->setText(tr("To protect your Cryptocraphic Identity, we encrypt it with a mnemonic of 12 dictionary words."
ui.label->setText(tr("To protect your Cryptocraphic Identity, we encrypt it with a mnemonic of 12 dictionary words. "
"Please note these down and keep them safe. "
"They will be needed to add other devices to your account (like your mobile phone or laptop)."));
ui.textEdit->setText(mnemonic);

View File

@@ -625,7 +625,7 @@ void AccountSettings::slotFolderListClicked(const QModelIndex &indx)
return;
}
if (FolderStatusDelegate::errorsListRect(tv->visualRect(indx)).contains(pos)) {
emit showIssuesList(_model->data(indx, FolderStatusDelegate::FolderAliasRole).toString());
emit showIssuesList(_accountState);
return;
}

View File

@@ -61,7 +61,7 @@ public:
signals:
void folderChanged();
void openFolderAlias(const QString &);
void showIssuesList(const QString &folderAlias);
void showIssuesList(AccountState *account);
void requesetMnemonic();
public slots:

View File

@@ -229,14 +229,13 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
// change pen color if use is not online
QPalette p = option.palette;
if(!accountOnline)
painter->setPen(p.color(QPalette::Disabled, QPalette::Text));
p.setCurrentColorGroup(QPalette::Disabled);
// change pen color if the line is selected
QPalette::ColorGroup cg = option.state & (QStyle::State_Enabled | QStyle::State_Active)
? QPalette::Normal
: QPalette::Inactive;
painter->setPen(option.palette.color(cg, QPalette::Text));
if (option.state & QStyle::State_Selected)
painter->setPen(p.color(QPalette::HighlightedText));
else
painter->setPen(p.color(QPalette::Text));
// calculate space for text - use the max possible before using the elipses
int spaceLeftForText = option.rect.width() - (actionIconRect.width() + margin + rightMargin + leftMargin) -
@@ -262,11 +261,10 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
}
// change pen color for the time
painter->setPen(p.color(QPalette::Disabled, QPalette::Text));
// check if line is selected
if (option.state & QStyle::State_Selected)
painter->setPen(option.palette.color(cg, QPalette::HighlightedText));
painter->setPen(p.color(QPalette::Disabled, QPalette::HighlightedText));
else
painter->setPen(p.color(QPalette::Disabled, QPalette::Text));
// draw the time
const QString elidedTime = fm.elidedText(timeStr, Qt::ElideRight, spaceLeftForText);

View File

@@ -10,70 +10,6 @@
<height>556</height>
</rect>
</property>
<property name="palette">
<palette>
<active>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>252</green>
<blue>252</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>252</green>
<blue>252</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
@@ -101,70 +37,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="palette">
<palette>
<active>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>252</green>
<blue>252</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>252</green>
<blue>252</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>252</green>
<blue>252</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>252</green>
<blue>252</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>252</green>
<blue>252</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>252</green>
<blue>252</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>

View File

@@ -191,7 +191,7 @@ Application::Application(int &argc, char **argv)
tr("There was an error while accessing the configuration "
"file at %1.")
.arg(ConfigFile().configFile()),
tr("Quit ownCloud"));
tr("Quit Nextcloud"));
QTimer::singleShot(0, qApp, SLOT(quit()));
return;
}

View File

@@ -57,7 +57,6 @@ GeneralSettings::GeneralSettings(QWidget *parent)
QString about = Theme::instance()->about();
_ui->aboutLabel->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextBrowserInteraction);
_ui->aboutLabel->setText(about);
_ui->aboutLabel->setWordWrap(true);
_ui->aboutLabel->setOpenExternalLinks(true);
// About legal notice

View File

@@ -21,9 +21,6 @@
#include <sys/resource.h>
#endif
#include <openssl/conf.h>
#include <openssl/err.h>
#include "application.h"
#include "theme.h"
#include "common/utility.h"
@@ -51,10 +48,7 @@ int main(int argc, char **argv)
{
Q_INIT_RESOURCE(client);
/* Initialise the library */
ERR_load_crypto_strings();
OpenSSL_add_all_algorithms();
OPENSSL_config(NULL);
// OpenSSL 1.1.0: No explicit initialisation or de-initialisation is necessary.
#ifdef Q_OS_WIN
// If the font size ratio is set on Windows, we need to

View File

@@ -505,7 +505,7 @@ void OwncloudSetupWizard::slotRemoteFolderExists(QNetworkReply *reply)
void OwncloudSetupWizard::createRemoteFolder()
{
_ocWizard->appendToConfigurationLog(tr("creating folder on ownCloud: %1").arg(_remoteFolder));
_ocWizard->appendToConfigurationLog(tr("creating folder on Nextcloud: %1").arg(_remoteFolder));
MkColJob *job = new MkColJob(_ocWizard->account(), _remoteFolder, this);
connect(job, SIGNAL(finished(QNetworkReply::NetworkError)), SLOT(slotCreateRemoteFolderFinished(QNetworkReply::NetworkError)));

View File

@@ -88,6 +88,7 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
connect(AccountManager::instance(), &AccountManager::accountRemoved,
this, &SettingsDialog::accountRemoved);
_actionGroup = new QActionGroup(this);
_actionGroup->setExclusive(true);
connect(_actionGroup, &QActionGroup::triggered, this, &SettingsDialog::slotSwitchPage);
@@ -188,6 +189,15 @@ void SettingsDialog::showActivityPage()
}
}
void SettingsDialog::showIssuesList(AccountState *account) {
for (auto it = _actionGroupWidgets.begin(); it != _actionGroupWidgets.end(); ++it) {
if (it.value() == _activitySettings[account]) {
it.key()->activate(QAction::ActionEvent::Trigger);
break;
}
}
}
void SettingsDialog::activityAdded(AccountState *s){
_ui->stack->addWidget(_activitySettings[s]);
connect(_activitySettings[s], &ActivitySettings::guiLog, _gui,
@@ -246,6 +256,7 @@ void SettingsDialog::accountAdded(AccountState *s)
connect(accountSettings, &AccountSettings::folderChanged, _gui, &ownCloudGui::slotFoldersChanged);
connect(accountSettings, &AccountSettings::openFolderAlias,
_gui, &ownCloudGui::slotFolderOpenAction);
connect(accountSettings, &AccountSettings::showIssuesList, this, &SettingsDialog::showIssuesList);
connect(s->account().data(), &Account::accountChangedAvatar, this, &SettingsDialog::slotAccountAvatarChanged);
connect(s->account().data(), &Account::accountChangedDisplayName, this, &SettingsDialog::slotAccountDisplayNameChanged);

View File

@@ -56,7 +56,7 @@ public:
public slots:
void showFirstPage();
void showActivityPage();
// void showIssuesList(const QString &folderAlias);
void showIssuesList(AccountState *account);
void slotSwitchPage(QAction *action);
void slotRefreshActivity(AccountState *accountState);
void slotRefreshActivityAccountStateSender();

View File

@@ -454,7 +454,7 @@ void SocketApi::command_VERSION(const QString &, SocketListener *listener)
void SocketApi::command_SHARE_MENU_TITLE(const QString &, SocketListener *listener)
{
listener->sendMessage(QLatin1String("SHARE_MENU_TITLE:") + tr("Share with %1", "parameter is ownCloud").arg(Theme::instance()->appNameGUI()));
listener->sendMessage(QLatin1String("SHARE_MENU_TITLE:") + tr("Share with %1", "parameter is Nextcloud").arg(Theme::instance()->appNameGUI()));
}
// don't pull the share manager into socketapi unittests

View File

@@ -137,7 +137,9 @@ void WebViewPageUrlSchemeHandler::requestStarted(QWebEngineUrlRequestJob *reques
password = part.mid(9);
}
}
if (!server.startsWith("http://") && !server.startsWith("https://")) {
server = "https://" + server;
}
qCInfo(lcWizardWebiew()) << "Got user: " << user << ", server: " << server;
emit urlCatched(user, password, server);

View File

@@ -3,6 +3,7 @@
#include <openssl/pem.h>
#include <openssl/err.h>
#include <openssl/engine.h>
#include <openssl/rand.h>
#include "clientsideencryption.h"

View File

@@ -649,7 +649,7 @@ QImage AvatarJob::makeCircularAvatar(const QImage &baseAvatar)
{
int dim = baseAvatar.width();
QImage avatar(dim, dim, baseAvatar.format());
QImage avatar(dim, dim, QImage::Format_ARGB32);
avatar.fill(Qt::transparent);
QPainter painter(&avatar);

View File

@@ -153,7 +153,7 @@
<message>
<location filename="../src/gui/accountmanager.cpp" line="343"/>
<source>To protect your Cryptocraphic Identity, we encrypt it with a mnemonic of 12 dictionary words.Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation>Um Ihre kryptografische Identität zu schützen, verschlüsseln wir sie mit einer Mnemonik von 12 Wörterbuchwörtern. Bitte notieren Sie sich diese und bewahren Sie sie auf. Sie werden benötigt, um Ihrem Konto weitere Geräte hinzuzufügen (z. B. Ihr Mobiltelefon oder Laptop).</translation>
<translation>Um Ihre kryptografische Identität zu schützen, verschlüsseln wir sie mit einer Gedächtnisstütze von 12 Wörterbuchwörtern. Bitte notieren Sie sich diese und bewahren Sie sie auf. Sie werden benötigt, um Ihrem Konto weitere Geräte hinzuzufügen (z. B. Ihr Mobiltelefon oder Laptop).</translation>
</message>
</context>
<context>

View File

@@ -818,9 +818,11 @@
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
%1</source>
<translation>No se han podido rastrear los cambios en las carpetas sincronizadas de forma fiable.
<translation>Los cambios en las carpetas sincronizadas no se han podido rastrear de forma fiable.
Esto significa que el cliente de sincronización podría no subir los cambios locales inmediatamente y en su lugar solo buscará los cambios locales y los subirá de forma ocasional (cada dos horas por defecto).</translation>
Esto significa que el cliente de sincronización podría no subir los cambios locales inmediatamente, y en lugar de eso solo escanea buscando cambios locales y los subirá ocasionalmente (cada dos horas por defecto).
%1</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1071"/>

View File

@@ -4,37 +4,37 @@
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="107"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
<translation>%1 (%2, %3)</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="124"/>
<source>Checking for changes in &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Athuga með breytingar í &apos;%1&apos;</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="129"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
<translation>Samstilli %1 af %2 (%3 eftir)</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="134"/>
<source>Syncing %1 of %2</source>
<translation type="unfinished"/>
<translation>Samstilli %1 af %2</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="141"/>
<source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
<translation>Samstilli %1 (%2 eftir)</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="144"/>
<source>Syncing %1</source>
<translation type="unfinished"/>
<translation>Samstilli %1</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="186"/>
<source>Sync paused</source>
<translation type="unfinished"/>
<translation>Hlé á samstillingu</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="189"/>

View File

@@ -153,7 +153,7 @@
<message>
<location filename="../src/gui/accountmanager.cpp" line="343"/>
<source>To protect your Cryptocraphic Identity, we encrypt it with a mnemonic of 12 dictionary words.Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
<translation>Per proteggere la tua identità crittografica, la cifriamo con codice mnemonico di 12 parole di dizionario. Annotale e tienile al sicuro. Saranno necessarie per aggiungere altri dispositivi al tuo account (come il tuo smartphone o il portatile).</translation>
</message>
</context>
<context>
@@ -624,7 +624,7 @@
<message>
<location filename="../src/libsync/clientsideencryption.cpp" line="992"/>
<source>Please enter your end to end encryption passphrase:&lt;br&gt;&lt;br&gt;User: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
<translation type="unfinished"/>
<translation>Digita la tua frase segreta di cifratura end-to-end: &lt;br&gt;&lt;br&gt;Utente: %2&lt;br&gt;Account: %3&lt;br&gt;</translation>
</message>
<message>
<location filename="../src/libsync/clientsideencryption.cpp" line="1000"/>
@@ -805,12 +805,12 @@
<message>
<location filename="../src/gui/folder.cpp" line="1012"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
<translation>La cartella %1 è stata creata, ma è stata esclusa dalla sincronizzazione in precedenza. I dati al suo interno non saranno sincronizzati.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1015"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
<translation>Il file %1 è stato creato, ma è stato escluso dalla sincronizzazione in precedenza. Non sarà sincronizzato.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1026"/>
@@ -819,7 +819,11 @@
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
%1</source>
<translation type="unfinished"/>
<translation>Le modifiche nelle cartelle sincronizzate non possono essere tracciate in modo affidabile.
Questo significa che il client di sincronizzazione potrebbe non caricare le modifiche locali immediatamente e, invece, eseguirà solo la scansione delle modifiche locali e le caricherà occasionalmente (ogni due ore, in modo predefinito).
%1</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1071"/>
@@ -827,7 +831,10 @@ This means that the synchronization client might not upload local changes immedi
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
<translation type="unfinished"/>
<translation>Tutti i file nella cartella di sincronizzazione &apos;%1&apos; sono stati eliminati sul server.
L&apos;eliminazione sarà sincronizzata con la tua cartella locale, rendendo tali file indisponibili, a meno che tu abbia il permesso per ripristinarli.
Se decidi di tenere i file, saranno sincronizzati nuovamente con il server, se hai i diritti per farlo.
Se decidi di eliminare i file, non saranno più disponibili, a meno che tu sia il proprietario.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1080"/>
@@ -934,7 +941,7 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
<message>
<location filename="../src/gui/folderman.cpp" line="1312"/>
<source>The local folder %1 contains a symbolic link. The link target contains an already synced folder. Please pick another one!</source>
<translation type="unfinished"/>
<translation>La cartella locale %1 contiene un collegamento simbolico. La destinazione del collegamento contiene una cartella già sincronizzata. Selezionane un&apos;altra!</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1228"/>
@@ -1093,12 +1100,12 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Controllo delle modifiche in &apos;%1&apos; remoto</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="923"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Controllo delle modifiche in &apos;%1&apos; locale</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1000"/>
@@ -1160,7 +1167,7 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
<message>
<location filename="../src/gui/folderwatcher_linux.cpp" line="87"/>
<source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source>
<translation type="unfinished"/>
<translation>Questo problema si verifica di solito quando i controlli di inotify sono esauriti. Leggi le FAQ per i dettagli.</translation>
</message>
</context>
<context>
@@ -1344,7 +1351,7 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
<message>
<location filename="../src/gui/generalsettings.ui" line="250"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
<translation>Mostra le cartelle di sincronizzazione nel pannello di navigazione di &amp;Explorer</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="267"/>
@@ -1370,7 +1377,7 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
<message>
<location filename="../src/gui/generalsettings.cpp" line="49"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
<translation>Notifiche del server che richiedono attenzione.</translation>
</message>
</context>
<context>
@@ -1553,14 +1560,16 @@ Gli elementi per i quali è consentita l&apos;eliminazione, saranno eliminati se
<message>
<location filename="../src/gui/logbrowser.cpp" line="101"/>
<source>Permanently save logs</source>
<translation type="unfinished"/>
<translation>Salva log in modo permanente</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="103"/>
<source>When this option is enabled and no other logging is configured, logs will be written to a temporary folder and expire after a few hours. This setting persists across client restarts.
Logs will be written to %1</source>
<translation type="unfinished"/>
<translation>Se questa opzione è abilitata e non è configurato un altro sistema di scrittura dei log, i log saranno scritti in una cartella temporanea e scadranno dopo poche ore. Questa impostazione viene conservata in caso di riavvio del client.
I log saranno scritti in %1</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="115"/>
@@ -2204,7 +2213,7 @@ Non è consigliabile utilizzarlo.</translation>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="364"/>
<source>File %1 can not be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
<translation>Il file %1 non può essere scaricato per la mancanza di informazioni di cifratura.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="434"/>
@@ -2381,7 +2390,7 @@ Non è consigliabile utilizzarlo.</translation>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="334"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
<translation>File rimosso (avvio caricamento) %1</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="684"/>
@@ -2633,7 +2642,7 @@ Non è consigliabile utilizzarlo.</translation>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="122"/>
<source>&amp;Share link</source>
<translation type="unfinished"/>
<translation>Condi&amp;vidi collegamento</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="145"/>
@@ -2678,7 +2687,7 @@ Non è consigliabile utilizzarlo.</translation>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="208"/>
<source>File Drop (Upload Only)</source>
<translation type="unfinished"/>
<translation>Rilascia file (solo caricamento)</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="215"/>
@@ -2834,7 +2843,7 @@ Non è consigliabile utilizzarlo.</translation>
<message>
<location filename="../src/gui/socketapi.cpp" line="491"/>
<source>Context menu share</source>
<translation type="unfinished"/>
<translation>Condivisione da menu contestuale</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="612"/>
@@ -2861,7 +2870,7 @@ Non è consigliabile utilizzarlo.</translation>
<message>
<location filename="../src/gui/socketapi.cpp" line="653"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
<translation>La ri-condivisione di questo file non è consentita</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="666"/>
@@ -3166,12 +3175,12 @@ Non è consigliabile utilizzarlo.</translation>
<message>
<location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>Failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
<translation>Caricamento o a creazione del file journal non riuscito. Assicurati di avere i permessi di lettura e scrittura nella cartella di sincronizzazione locale.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>Discovery step failed.</source>
<translation type="unfinished"/>
<translation>La fase di rilevazione non è riuscita.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="136"/>
@@ -3370,7 +3379,7 @@ Non è consigliabile utilizzarlo.</translation>
<message>
<location filename="../src/gui/creds/webflowcredentials.cpp" line="122"/>
<source>You have been logged out of %1 as user %2. Please login again</source>
<translation type="unfinished"/>
<translation>Sei stato disconnesso da %1 come utente %2. Accedi nuovamente</translation>
</message>
<message>
<location filename="../src/gui/creds/webflowcredentials.cpp" line="139"/>
@@ -3575,12 +3584,12 @@ Non è consigliabile utilizzarlo.</translation>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="920"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Controllo delle modifiche in &apos;%1&apos; remoto</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="923"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Controllo delle modifiche in &apos;%1&apos; locale</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="938"/>
@@ -3765,7 +3774,7 @@ Non è consigliabile utilizzarlo.</translation>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="241"/>
<source>SlideshowLabel</source>
<translation type="unfinished"/>
<translation>SlideshowLabel</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="316"/>
@@ -3934,12 +3943,12 @@ Non è consigliabile utilizzarlo.</translation>
<message>
<location filename="../src/common/checksums.cpp" line="248"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>L&apos;intestazione di controllo conteneva un tipo di codice di controllo &apos;%1&apos; sconosciuto</translation>
</message>
<message>
<location filename="../src/common/checksums.cpp" line="252"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"/>
<translation>Il file scaricato non verifica il codice di controllo, sarà ripristinato.</translation>
</message>
</context>
<context>

File diff suppressed because it is too large Load Diff

View File

@@ -9,7 +9,7 @@
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="124"/>
<source>Checking for changes in &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Controleren op wijzigingen in &apos;%1&apos;</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="129"/>
@@ -60,7 +60,7 @@
<message>
<location filename="../src/common/filesystembase.cpp" line="445"/>
<source>Could not make directories in trash</source>
<translation type="unfinished"/>
<translation>Kon geen directories maken in de prullenbak</translation>
</message>
<message>
<location filename="../src/common/filesystembase.cpp" line="459"/>
@@ -71,7 +71,7 @@
<message>
<location filename="../src/common/filesystembase.cpp" line="502"/>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
<translation>Verplaatsen naar de prullenbak wordt niet ondersteund op dit platform</translation>
</message>
</context>
<context>
@@ -148,7 +148,7 @@
<message>
<location filename="../src/gui/accountmanager.cpp" line="342"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
<translation>Begin-tot-eind versleutelingsmnemonic</translation>
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="343"/>
@@ -826,7 +826,10 @@ This means that the synchronization client might not upload local changes immedi
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
<translation type="unfinished"/>
<translation>Alle bestanden in de syncmap &apos;%1&apos; werden verwijderd van de server.
Deze verwijderingen worden gesynchroniseerd naar uw lokale syncmap, waardoor deze bestanden niet meer beschikbaar zijn, tenzij u het recht hebt om ze te herstellen.
Als u de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de server als u die autorisatie hebt.
Als u de bestanden wilt verwijderen, worden ze niet beschikbaar, tenzij u de eigenaar bent.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1080"/>
@@ -1973,12 +1976,12 @@ vragen om extra autorisaties tijdens installatie.</translation>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="85"/>
<source>Easy-to-use web mail, calendaring &amp; contacts</source>
<translation type="unfinished"/>
<translation>Eenvoudig te gebruiken webmail, agenda &amp; contacten</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="86"/>
<source>Screensharing, online meetings &amp; web conferences</source>
<translation type="unfinished"/>
<translation>Schermdelen, online afspraken &amp; web conferenties</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="198"/>

View File

@@ -39,7 +39,7 @@
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="189"/>
<source>Syncing</source>
<translation type="unfinished"/>
<translation>Synchronizacja</translation>
</message>
</context>
<context>
@@ -52,7 +52,7 @@
<message>
<location filename="../src/gui/mnemonicdialog.ui" line="58"/>
<source>Label</source>
<translation type="unfinished"/>
<translation>Etykieta</translation>
</message>
</context>
<context>

File diff suppressed because it is too large Load Diff

View File

@@ -4,42 +4,42 @@
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="107"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
<translation>%1 (%2, %3)</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="124"/>
<source>Checking for changes in &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Söker efter ändringar i &apos;%1&apos;</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="129"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
<translation>Synkroniserar %1 av %2 (%3 kvar)</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="134"/>
<source>Syncing %1 of %2</source>
<translation type="unfinished"/>
<translation>Synkroniserar %1 av %2</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="141"/>
<source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
<translation>Synkroniserar %1 (%2 kvar)</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="144"/>
<source>Syncing %1</source>
<translation type="unfinished"/>
<translation>Synkroniserar %1</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="186"/>
<source>Sync paused</source>
<translation type="unfinished"/>
<translation>Synkroniseringen pausad</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="189"/>
<source>Syncing</source>
<translation type="unfinished"/>
<translation>Synkroniserar</translation>
</message>
</context>
<context>
@@ -47,12 +47,12 @@
<message>
<location filename="../src/gui/mnemonicdialog.ui" line="23"/>
<source>Dialog</source>
<translation type="unfinished"/>
<translation>Dialog</translation>
</message>
<message>
<location filename="../src/gui/mnemonicdialog.ui" line="58"/>
<source>Label</source>
<translation type="unfinished"/>
<translation>Etikett</translation>
</message>
</context>
<context>
@@ -60,18 +60,18 @@
<message>
<location filename="../src/common/filesystembase.cpp" line="445"/>
<source>Could not make directories in trash</source>
<translation type="unfinished"/>
<translation>Kunde inte skapa mappar i papperskorgen</translation>
</message>
<message>
<location filename="../src/common/filesystembase.cpp" line="459"/>
<location filename="../src/common/filesystembase.cpp" line="465"/>
<source>Could not move &apos;%1&apos; to &apos;%2&apos;</source>
<translation type="unfinished"/>
<translation>Kunde inte flytta &apos;%1&apos; till &apos;%2&apos;</translation>
</message>
<message>
<location filename="../src/common/filesystembase.cpp" line="502"/>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
<translation>Att flytta till papperskorgen är inte implementerat denna plattform</translation>
</message>
</context>
<context>
@@ -148,12 +148,12 @@
<message>
<location filename="../src/gui/accountmanager.cpp" line="342"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
<translation>End to end krypteringsord</translation>
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="343"/>
<source>To protect your Cryptocraphic Identity, we encrypt it with a mnemonic of 12 dictionary words.Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
<translation>För att skydda din krypteringsidentitet, krypterar vi den med en mnemoteknisk av 12 ord. Notera dessa krypteringsord och håll dem säkra. De kommer behövas för att lägga till andra enheter till ditt konto (t.ex. mobiltelefon eller dator).</translation>
</message>
</context>
<context>
@@ -233,12 +233,12 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Show E2E mnemonic</source>
<translation type="unfinished"/>
<translation>Visa E2E krypteringsord</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="542"/>
<source>Encrypt</source>
<translation type="unfinished"/>
<translation>Kryptera</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="583"/>
@@ -476,27 +476,27 @@
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="131"/>
<source>%1</source>
<translation type="unfinished"/>
<translation>%1</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="179"/>
<source>More information</source>
<translation type="unfinished"/>
<translation>Mer information</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="180"/>
<source>Accept</source>
<translation type="unfinished"/>
<translation>Acceptera</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="181"/>
<source>Join</source>
<translation type="unfinished"/>
<translation> med</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="198"/>
<source>Open Browser</source>
<translation type="unfinished"/>
<translation>Öppna webbläsare</translation>
</message>
</context>
<context>
@@ -514,17 +514,17 @@
<message>
<location filename="../src/gui/activitywidget.cpp" line="56"/>
<source>Accept</source>
<translation type="unfinished"/>
<translation>Acceptera</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="182"/>
<source>Synced </source>
<translation type="unfinished"/>
<translation>Synkroniserad</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="217"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
<translation>Försök ladda upp igen</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="332"/>
@@ -624,12 +624,12 @@
<message>
<location filename="../src/libsync/clientsideencryption.cpp" line="992"/>
<source>Please enter your end to end encryption passphrase:&lt;br&gt;&lt;br&gt;User: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
<translation type="unfinished"/>
<translation>Ange dina end to end krypteringsord:&lt;br&gt;&lt;br&gt;Användare: %2&lt;br&gt;Konto: %3&lt;br&gt;</translation>
</message>
<message>
<location filename="../src/libsync/clientsideencryption.cpp" line="1000"/>
<source>Enter E2E passphrase</source>
<translation type="unfinished"/>
<translation>Ange E2E krypteringsord</translation>
</message>
</context>
<context>
@@ -804,12 +804,12 @@
<message>
<location filename="../src/gui/folder.cpp" line="1012"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
<translation>Mappen %1 skapades men var tidigare exkluderad från synkronisering. Data i denna mapp kommer inte att synkroniseras.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1015"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
<translation>Filen %1 skapades men var tidigare exkluderad från synkronisering. Den kommer inte att synkroniseras.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1026"/>
@@ -818,7 +818,11 @@
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
%1</source>
<translation type="unfinished"/>
<translation>Ändringar i synkroniserade mappar kunde inte spåras ett tillförlitligt sätt.
Det betyder att synkroniseringsklienten inte kan ladda upp lokala ändringar omedelbart och kommer istället bara att söka efter lokala ändringar och ladda upp dem ibland (varannan timme som standard).
%1</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1071"/>
@@ -826,22 +830,25 @@ This means that the synchronization client might not upload local changes immedi
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
<translation type="unfinished"/>
<translation>Alla filer i den synkade mappen &apos;%1&apos; raderades servern.
Dessa raderingar kommer att synkroniseras till din lokalt synkade mapp och göra filerna otillgängliga, om du inte har möjlighet att återställa.
Om du vill behålla dessa filer kommer dom att synkroniseras till servern nytt, om du har rättighet att göra det.
Om du raderar filerna kommer dom att vara otillgängliga för dig, om du inte är ägaren.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1080"/>
<source>Download new files?</source>
<translation type="unfinished"/>
<translation>Ladda ner nya filer?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1083"/>
<source>Download new files</source>
<translation type="unfinished"/>
<translation>Ladda ner nya filer</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1084"/>
<source>Keep local files</source>
<translation type="unfinished"/>
<translation>Behåll lokala filer</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1076"/>
@@ -922,7 +929,7 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre
<message>
<location filename="../src/gui/folderman.cpp" line="1220"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
<translation>Synkroniseringen lyckades men olösta konflikter.</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1222"/>
@@ -932,7 +939,7 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre
<message>
<location filename="../src/gui/folderman.cpp" line="1312"/>
<source>The local folder %1 contains a symbolic link. The link target contains an already synced folder. Please pick another one!</source>
<translation type="unfinished"/>
<translation>Den lokala mappen %1 innehåller en symbolisk länk. Länkens mål innehåller en redan synkroniserad mapp. Välj en annan mapp!</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1228"/>
@@ -1000,7 +1007,7 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="249"/>
<source>Synchronized with local folder</source>
<translation type="unfinished"/>
<translation>Synkroniserad med lokal mapp</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="296"/>
@@ -1091,22 +1098,22 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Söker efter ändringar i fjärrmappen &apos;%1&apos;</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="923"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Söker efter ändringar i lokal mapp &apos;%1&apos;</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1000"/>
<source> %1/s</source>
<translation type="unfinished"/>
<translation> %1/s</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source> %1/s</source>
<translation type="unfinished"/>
<translation> %1/s</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
@@ -1158,7 +1165,7 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre
<message>
<location filename="../src/gui/folderwatcher_linux.cpp" line="87"/>
<source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source>
<translation type="unfinished"/>
<translation>Detta problem händer oftast vid problem med inotify. Se FAQ för mer information.</translation>
</message>
</context>
<context>
@@ -1286,7 +1293,7 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre
<message>
<location filename="../src/gui/generalsettings.ui" line="41"/>
<source>Legal notice</source>
<translation type="unfinished"/>
<translation>Rättsligt meddelande</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="66"/>
@@ -1301,7 +1308,7 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre
<message>
<location filename="../src/gui/generalsettings.ui" line="89"/>
<source>Show Server &amp;Notifications</source>
<translation type="unfinished"/>
<translation>Visa server&amp;notifieringar</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="163"/>
@@ -1342,7 +1349,7 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre
<message>
<location filename="../src/gui/generalsettings.ui" line="250"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
<translation>Visa synkroniseringsmappar i &amp;utforskarens navigeringsfönster</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="267"/>
@@ -1368,7 +1375,7 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre
<message>
<location filename="../src/gui/generalsettings.cpp" line="49"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
<translation>Servernotifieringar som kräver uppmärksamhet.</translation>
</message>
</context>
<context>
@@ -1376,14 +1383,16 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre
<message>
<location filename="../src/gui/socketapi.cpp" line="520"/>
<source>Sharing error</source>
<translation type="unfinished"/>
<translation>Fel vid delning</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="521"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
<translation type="unfinished"/>
<translation>Kunde inte hämta eller skapa den offentliga länkdelningen. Fel:
%1</translation>
</message>
</context>
<context>
@@ -1439,7 +1448,7 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="126"/>
<source>Remove all</source>
<translation type="unfinished"/>
<translation>Ta bort alla</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="93"/>
@@ -1496,32 +1505,32 @@ Objekt som tillåter radering kommer tas bort om de förhindrar en mapp att tas
<message>
<location filename="../src/gui/legalnotice.ui" line="14"/>
<source>Dialog</source>
<translation type="unfinished"/>
<translation>Dialog</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.ui" line="26"/>
<source>Legal notice</source>
<translation type="unfinished"/>
<translation>Rättsligt meddelande</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.ui" line="36"/>
<source>TextLabel</source>
<translation type="unfinished"/>
<translation>Textetikett</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.ui" line="58"/>
<source>Close</source>
<translation type="unfinished"/>
<translation>Stäng</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.cpp" line="27"/>
<source>&lt;p&gt;Copyright 2017-2018 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2018 ownCloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;Copyright 2017-2018 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2018 ownCloud GmbH&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.cpp" line="30"/>
<source>&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0 or any later version.&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;Licenserad under GNU General Public License (GPL) Version 2.0 eller annan senare version.&lt;/p&gt;</translation>
</message>
</context>
<context>
@@ -1549,14 +1558,16 @@ Objekt som tillåter radering kommer tas bort om de förhindrar en mapp att tas
<message>
<location filename="../src/gui/logbrowser.cpp" line="101"/>
<source>Permanently save logs</source>
<translation type="unfinished"/>
<translation>Spara loggar permanent</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="103"/>
<source>When this option is enabled and no other logging is configured, logs will be written to a temporary folder and expire after a few hours. This setting persists across client restarts.
Logs will be written to %1</source>
<translation type="unfinished"/>
<translation>När det här alternativet är aktiverat och ingen annan loggning har konfigurerats kommer loggarna att skrivas till en tillfällig mapp och ut efter några timmar. Inställningen gäller även vid omstart av klienten.
Loggar kommer att skrivas till %1</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="115"/>
@@ -1959,22 +1970,22 @@ ytterligare rättigheter under processen.</translation>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="83"/>
<source>Keep your data secure and under your control</source>
<translation type="unfinished"/>
<translation>Håll din data säker och under din kontroll</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="84"/>
<source>Secure collaboration &amp; file exchange</source>
<translation type="unfinished"/>
<translation>Säkert samarbete och filutbyte</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="85"/>
<source>Easy-to-use web mail, calendaring &amp; contacts</source>
<translation type="unfinished"/>
<translation>Lättanvänd webmail, kalender och kontakter</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="86"/>
<source>Screensharing, online meetings &amp; web conferences</source>
<translation type="unfinished"/>
<translation>Skärmdelning, onlinemöten och webbkonferenser</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="198"/>
@@ -1996,7 +2007,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="414"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation type="unfinished"/>
<translation>Kunde inte ladda certifikatet. Felaktigt lösenord?</translation>
</message>
</context>
<context>
@@ -2201,7 +2212,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="364"/>
<source>File %1 can not be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
<translation>Fil %1 kan inte laddas ner eftersom krypteringsinformation fattas.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="434"/>
@@ -2378,7 +2389,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="334"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
<translation>Filen borttagen (starta uppladdning) %1</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="684"/>
@@ -2597,7 +2608,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/sharedialog.ui" line="162"/>
<source>Icon</source>
<translation type="unfinished"/>
<translation>Ikon</translation>
</message>
<message>
<location filename="../src/gui/sharedialog.cpp" line="101"/>
@@ -2630,22 +2641,22 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="122"/>
<source>&amp;Share link</source>
<translation type="unfinished"/>
<translation>&amp;Dela länk</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="145"/>
<source>Enable</source>
<translation type="unfinished"/>
<translation>Aktivera</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="259"/>
<source>Password:</source>
<translation type="unfinished"/>
<translation>Lösenord:</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="383"/>
<source>Expiration date:</source>
<translation type="unfinished"/>
<translation>Utgångsdatum:</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="508"/>
@@ -2660,42 +2671,42 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="189"/>
<source>Allow Editing</source>
<translation type="unfinished"/>
<translation>Tillåt redigering</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="195"/>
<source>Read only</source>
<translation type="unfinished"/>
<translation>Läsbehörighet</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
<source>Allow Upload &amp;&amp; Editing</source>
<translation type="unfinished"/>
<translation>Tillåt uppladdning &amp;&amp; redigering</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="208"/>
<source>File Drop (Upload Only)</source>
<translation type="unfinished"/>
<translation>Göm fillista (endast uppladdning)</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="215"/>
<source>Copy link</source>
<translation type="unfinished"/>
<translation>Kopiera länk</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="228"/>
<source>Password Protect</source>
<translation type="unfinished"/>
<translation>Lösenordsskydda</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="245"/>
<source>Expiration Date</source>
<translation type="unfinished"/>
<translation>Utgångsdatum</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="265"/>
<source>Unshare</source>
<translation type="unfinished"/>
<translation>Sluta dela</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
@@ -2733,7 +2744,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="248"/>
<source>Copy link</source>
<translation type="unfinished"/>
<translation>Kopiera länk</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="258"/>
@@ -2756,7 +2767,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/shareuserline.ui" line="114"/>
<source>User name</source>
<translation type="unfinished"/>
<translation>Användarnamn</translation>
</message>
<message>
<location filename="../src/gui/shareuserline.ui" line="155"/>
@@ -2766,22 +2777,22 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="388"/>
<source>Can reshare</source>
<translation type="unfinished"/>
<translation>Kan dela vidare</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="398"/>
<source>Can create</source>
<translation type="unfinished"/>
<translation>Kan skapa</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="404"/>
<source>Can change</source>
<translation type="unfinished"/>
<translation>Kan ändra</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
<source>Can delete</source>
<translation type="unfinished"/>
<translation>Kan radera</translation>
</message>
</context>
<context>
@@ -2831,7 +2842,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/socketapi.cpp" line="491"/>
<source>Context menu share</source>
<translation type="unfinished"/>
<translation>Delningsmeny</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="612"/>
@@ -2858,18 +2869,18 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/socketapi.cpp" line="653"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
<translation>Dela vidare denna fil är inte tillåtet</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="666"/>
<location filename="../src/gui/socketapi.cpp" line="668"/>
<source>Copy public link to clipboard</source>
<translation type="unfinished"/>
<translation>Kopiera publik länk till urklipp</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="722"/>
<source>Open in browser</source>
<translation type="unfinished"/>
<translation>Öppna i webbläsare</translation>
</message>
</context>
<context>
@@ -3163,7 +3174,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>Failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
<translation>Misslyckades med att ladda eller skapa journalfilen. Säkerställ att du har rättigheter att läsa och skriva i den lokala synkmappen.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="127"/>
@@ -3173,22 +3184,22 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>Permission denied.</source>
<translation type="unfinished"/>
<translation>Åtkomst nekad.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>File or directory not found:</source>
<translation type="unfinished"/>
<translation>Fil eller mapp kunde inte hittas:</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>Tried to create a folder that already exists.</source>
<translation type="unfinished"/>
<translation>Försökte skapa en mapp som redan existerar.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>No space on %1 server available.</source>
<translation type="unfinished"/>
<translation>Inget tillgängligt utrymme server %1 .</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="154"/>
@@ -3359,7 +3370,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/libsync/theme.cpp" line="341"/>
<source>&lt;p&gt;This release was supplied by the Nextcloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;Denna release levererades av Nextcloud GmbH&lt;/p&gt;</translation>
</message>
</context>
<context>
@@ -3367,12 +3378,12 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/creds/webflowcredentials.cpp" line="122"/>
<source>You have been logged out of %1 as user %2. Please login again</source>
<translation type="unfinished"/>
<translation>Du har loggats ut från %1 som användare %2. Logga in igen</translation>
</message>
<message>
<location filename="../src/gui/creds/webflowcredentials.cpp" line="139"/>
<source>Please login with the user: %1</source>
<translation type="unfinished"/>
<translation>Logga in som: %1</translation>
</message>
</context>
<context>
@@ -3506,7 +3517,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="356"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
<translation>Olösta konflikter.</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="363"/>
@@ -3562,7 +3573,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="841"/>
<source>Apps</source>
<translation type="unfinished"/>
<translation>Appar</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="898"/>
@@ -3572,12 +3583,12 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="920"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Söker efter ändringar i fjärrmappen &apos;%1&apos;</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="923"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Söker efter ändringar i lokal mapp &apos;%1&apos;</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="938"/>
@@ -3723,7 +3734,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/>
<source>An error occurred while connecting. Please try again.</source>
<translation type="unfinished"/>
<translation>Ett fel inträffade vid anslutning. Försök igen.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/>
@@ -3747,17 +3758,17 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/>
<source>&lt;a href=&quot;https://docs.nextcloud.com/server/13/admin_manual/installation/index.html#installation&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Host your own server&lt;/span&gt;&lt;/a&gt;</source>
<translation type="unfinished"/>
<translation>&lt;a href=&quot;https://docs.nextcloud.com/server/13/admin_manual/installation/index.html#installation&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Använd din egen server&lt;/span&gt;&lt;/a&gt;</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="143"/>
<source>Register with a provider</source>
<translation type="unfinished"/>
<translation>Registrera hos en leverantör</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="165"/>
<source>Log in</source>
<translation type="unfinished"/>
<translation>Logga in</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="241"/>
@@ -3926,17 +3937,17 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/common/checksums.cpp" line="233"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"/>
<translation>Kontrollsummans header är felformaterad.</translation>
</message>
<message>
<location filename="../src/common/checksums.cpp" line="248"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Kontrollsummans header innehåller en okänd kontrollsumma av typ &apos;%1&apos;</translation>
</message>
<message>
<location filename="../src/common/checksums.cpp" line="252"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"/>
<translation>Den nedladdade filen stämmer inte med kontrollsumman, den kommer laddas om.</translation>
</message>
</context>
<context>
@@ -3944,7 +3955,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/wizard/webview.ui" line="26"/>
<source>Form</source>
<translation type="unfinished"/>
<translation>Formulär</translation>
</message>
</context>
<context>
@@ -3965,7 +3976,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/libsync/theme.cpp" line="320"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;&lt;small&gt;Byggd från Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; den %3, %4 med Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
</context>
<context>