mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 09:30:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into fix-ldap-display-name

Browse source
This commit is contained in:
Camila Ayres 2019-10-01 12:34:39 +02:00 committed by GitHub
commit 7f19d5669b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/csync/csync_exclude.cpp
View file

@ -322,7 +322,11 @@ bool ExcludedFiles::loadExcludeFile(const QByteArray & basePath, const QString &
csync_exclude_expand_escapes(line);
_allExcludes[basePath].append(line);
}
prepare(basePath);
// nothing to prepare if the user decided to not exclude anything
if(_allExcludes.size())
prepare(basePath);
return true;
}

2
src/gui/settingsdialogcommon.cpp
View file

@ -2,7 +2,7 @@ namespace SettingsDialogCommon
{
/** display name with two lines that is displayed in the settings
* If width is bigger than 0, the string will be ellided so it does not exceed that width
* If width is bigger than 0, the string will be elided so it does not exceed that width
*/
QString shortDisplayNameForSettings(Account* account, int width)
{

14
translations/client_ca.ts
View file

@ -913,12 +913,12 @@ Consulteu el registre per obtenir més informació.</numerusform></translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="422"/>
<source>%1 and %n other file(s) are currently locked.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>%1 i %n altre/s fitxer/s ara estan bloquejats.</numerusform><numerusform>%1 i %n altres fitxers ara estan bloquejats.</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="424"/>
<source>%1 is currently locked.</source>
<translation type="unfinished"/>
<translation>%1 ara està bloquejat.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="432"/>
@ -990,17 +990,17 @@ If this action was unintended you can restore the lost data now.</source>
<message>
<location filename="../src/gui/folder.cpp" line="1091"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
<translation>Voleu suprimir tots els fitxers?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1094"/>
<source>Delete all files</source>
<translation type="unfinished"/>
<translation>Suprimeix tots els fitxers</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1095"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
<translation>Restaura els fitxers suprimits</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1112"/>
@ -2974,7 +2974,7 @@ No és aconsellable fer-la servir.</translation>
<message>
<location filename="../src/gui/socketapi.cpp" line="626"/>
<source>Share via </source>
<translation type="unfinished"/>
<translation>Comparteix per</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="627"/>
@ -3884,7 +3884,7 @@ No és aconsellable fer-la servir.</translation>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="417"/>
<source>&lt;a href=&quot;https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#7a7a7a;&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/15/admin_manual/installation/index.html#installation&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#7a7a7a;&quot;&gt;Allotgeu el vostre servidor&lt;/span&gt;&lt;/a&gt;</translation>
</message>
</context>
<context>

8
translations/client_fr.ts
View file

@ -1231,12 +1231,12 @@ Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fi
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Vérification des modification dans &apos;%1&apos; distant</translation>
<translation>Vérification des modifications dans &apos;%1&apos; distant</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Vérification des modification dans &apos;%1&apos; local</translation>
<translation>Vérification des modifications dans &apos;%1&apos; local</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
@ -3722,12 +3722,12 @@ Il est déconseillé de l&apos;utiliser.</translation>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="920"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Vérification des modification dans &apos;%1&apos; distant</translation>
<translation>Vérification des modifications dans &apos;%1&apos; distant</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="923"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Vérification des modification dans &apos;%1&apos; local</translation>
<translation>Vérification des modifications dans &apos;%1&apos; local</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="938"/>