Merge branch 'master' into bugfixing-slideshow

This commit is contained in:
Dominique Fuchs 2019-09-12 17:09:26 +02:00 committed by GitHub
commit 9b60573d7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 54 additions and 50 deletions

View file

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

View file

@ -1133,7 +1133,7 @@ Wenn diese Synchronisierung fortgesetzt wird, werden Dateien eventuell von älte
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="256"/>
<source>Synchronized with local folder (%1)</source>
<translation type="unfinished"/>
<translation>Synchronisiert mit lokalem Ordner (%1)</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="303"/>

View file

@ -130,12 +130,12 @@
<message>
<location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/>
<source>Re-open Browser</source>
<translation type="unfinished"/>
<translation>Reabrir navegador</translation>
</message>
<message>
<location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/>
<source>Copy link</source>
<translation type="unfinished"/>
<translation>Copiar enlaces</translation>
</message>
</context>
<context>
@ -158,12 +158,12 @@
<message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/>
<source>Re-open Browser</source>
<translation type="unfinished"/>
<translation>Reabrir navegador</translation>
</message>
<message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/>
<source>Copy link</source>
<translation type="unfinished"/>
<translation>Copiar enlace</translation>
</message>
</context>
<context>
@ -331,7 +331,7 @@
<location filename="../src/gui/accountsettings.cpp" line="618"/>
<location filename="../src/gui/accountsettings.cpp" line="654"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
<translation>Editar archivos ignorados</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="658"/>
@ -1133,7 +1133,7 @@ Si continua con la sincronización todos los archivos serán remplazados por su
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="256"/>
<source>Synchronized with local folder (%1)</source>
<translation type="unfinished"/>
<translation>Sincronizado con carpeta local (%1)</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="303"/>
@ -1572,59 +1572,61 @@ Si continua con la sincronización todos los archivos serán remplazados por su
<message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="14"/>
<source>IgnoreListTableWidget</source>
<translation type="unfinished"/>
<translation>IgnoreListTableWidget</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="33"/>
<source>Pattern</source>
<translation type="unfinished"/>
<translation>Patrón</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="38"/>
<source>Allow Deletion</source>
<translation type="unfinished"/>
<translation>Permitir borrado</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="49"/>
<source>Add</source>
<translation type="unfinished"/>
<translation>Añadir</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="59"/>
<source>Remove</source>
<translation type="unfinished"/>
<translation>Eliminar</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="66"/>
<source>Remove all</source>
<translation type="unfinished"/>
<translation>Eliminar todos</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="24"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
<translation>Los archivos o carpetas que coincidan con un patrón no se sincronizarán.
Los elemntos en los que se permite el borrado se eliminarán si impiden que un directorio se elimine. Esto es útil para los metadatos.</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/>
<source>Could not open file</source>
<translation type="unfinished"/>
<translation>No se ha podido abrir el archivo.</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/>
<source>Cannot write changes to &apos;%1&apos;.</source>
<translation type="unfinished"/>
<translation>No se han podido escribir los cambios a &apos;%1&apos;.</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/>
<source>Add Ignore Pattern</source>
<translation type="unfinished"/>
<translation>Añadir patrón de ignorados</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/>
<source>Add a new ignore pattern:</source>
<translation type="unfinished"/>
<translation>Añadir un nuevo patrón de archivos ignorados:</translation>
</message>
</context>
<context>

View file

@ -1135,7 +1135,7 @@ Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fi
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="256"/>
<source>Synchronized with local folder (%1)</source>
<translation type="unfinished"/>
<translation>Synchronisé avec le dossier local (%1)</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="303"/>
@ -1621,12 +1621,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/>
<source>Add Ignore Pattern</source>
<translation type="unfinished"/>
<translation>Ajouter un motif d&apos;exclusion</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/>
<source>Add a new ignore pattern:</source>
<translation type="unfinished"/>
<translation>Ajouter un nouveau motif d&apos;exclusion :</translation>
</message>
</context>
<context>

View file

@ -1134,7 +1134,7 @@ Continuando a sincronización como normal fará que todos os seus ficheiros sexa
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="256"/>
<source>Synchronized with local folder (%1)</source>
<translation type="unfinished"/>
<translation>Sincronizado co cartafol local (%1)</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="303"/>

View file

@ -1135,7 +1135,7 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="256"/>
<source>Synchronized with local folder (%1)</source>
<translation type="unfinished"/>
<translation>Sincronizzato con la cartella locale (%1)</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="303"/>

View file

@ -130,12 +130,12 @@
<message>
<location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/>
<source>Re-open Browser</source>
<translation type="unfinished"/>
<translation>Heropen browser</translation>
</message>
<message>
<location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/>
<source>Copy link</source>
<translation type="unfinished"/>
<translation>Kopiëren link </translation>
</message>
</context>
<context>
@ -158,12 +158,12 @@
<message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/>
<source>Re-open Browser</source>
<translation type="unfinished"/>
<translation>Heropen browser</translation>
</message>
<message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/>
<source>Copy link</source>
<translation type="unfinished"/>
<translation>Kopiëren link </translation>
</message>
</context>
<context>
@ -331,7 +331,7 @@
<location filename="../src/gui/accountsettings.cpp" line="618"/>
<location filename="../src/gui/accountsettings.cpp" line="654"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
<translation>Bewerken genegeerde bestanden</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="658"/>
@ -1132,7 +1132,7 @@ Doorgaan met deze synchronisatie overschrijft al je bestanden door een eerdere v
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="256"/>
<source>Synchronized with local folder (%1)</source>
<translation type="unfinished"/>
<translation>Gesynchroniseerd met lokale map (%1)</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="303"/>
@ -1576,59 +1576,61 @@ Account: %3
<message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="14"/>
<source>IgnoreListTableWidget</source>
<translation type="unfinished"/>
<translation>IgnoreListTableWidget</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="33"/>
<source>Pattern</source>
<translation type="unfinished"/>
<translation>Patroon</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="38"/>
<source>Allow Deletion</source>
<translation type="unfinished"/>
<translation>Toestaan verwijderen </translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="49"/>
<source>Add</source>
<translation type="unfinished"/>
<translation>Toevoegen</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="59"/>
<source>Remove</source>
<translation type="unfinished"/>
<translation>Verwijderen</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="66"/>
<source>Remove all</source>
<translation type="unfinished"/>
<translation>Alles verwijderen</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="24"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
<translation>Bestanden of mappen die overeenkomen met een patroon zullen niet worden gesynchroniseerd.
Onderdelen die gewist mogen worden, worden verwijderd als ze verhinderen dat een map verdwijnt. Dit is nuttig voor metadata.</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/>
<source>Could not open file</source>
<translation type="unfinished"/>
<translation>Kon het bestand niet openen</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/>
<source>Cannot write changes to &apos;%1&apos;.</source>
<translation type="unfinished"/>
<translation>Kan geen wijzigingen wegschrijven naar &apos;%1&apos;.</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/>
<source>Add Ignore Pattern</source>
<translation type="unfinished"/>
<translation>Toevoegen negeerpatroon</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/>
<source>Add a new ignore pattern:</source>
<translation type="unfinished"/>
<translation>Voeg nieuw negeerpatroon toe:</translation>
</message>
</context>
<context>
@ -3166,12 +3168,12 @@ We adviseren deze site niet te gebruiken.</translation>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="194"/>
<source>Fingerprint (SHA-256): &lt;tt&gt;%1&lt;/tt&gt;</source>
<translation type="unfinished"/>
<translation>Fingerprint (SHA-256): &lt;tt&gt;%1&lt;/tt&gt;</translation>
</message>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="195"/>
<source>Fingerprint (SHA-512): &lt;tt&gt;%1&lt;/tt&gt;</source>
<translation type="unfinished"/>
<translation>Fingerprint (SHA-512): &lt;tt&gt;%1&lt;/tt&gt;</translation>
</message>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="197"/>
@ -3837,7 +3839,7 @@ We adviseren deze site niet te gebruiken.</translation>
<message>
<location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/>
<source>Copy link</source>
<translation type="unfinished"/>
<translation>Kopiëren link </translation>
</message>
</context>
<context>

View file

@ -1133,7 +1133,7 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie Twoje pli
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="256"/>
<source>Synchronized with local folder (%1)</source>
<translation type="unfinished"/>
<translation>Synchronizowany z folderem lokalnym (%1)</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="303"/>

View file

@ -1133,7 +1133,7 @@ Continuar a sincronização como normal fará com que todos os seus arquivos sej
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="256"/>
<source>Synchronized with local folder (%1)</source>
<translation type="unfinished"/>
<translation>Sincronizado com a pasta local (%1)</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="303"/>

View file

@ -1133,7 +1133,7 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="256"/>
<source>Synchronized with local folder (%1)</source>
<translation type="unfinished"/>
<translation>Synkroniserad med lokal mapp (%1)</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="303"/>