Merge branch 'master' into msvc-warn-audit

This commit is contained in:
Dominique Fuchs 2019-09-09 20:16:52 +02:00 committed by GitHub
commit e89ff9ae61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 21 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

@ -130,12 +130,12 @@
<message>
<location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/>
<source>Re-open Browser</source>
<translation type="unfinished"/>
<translation>Ponownie otwórz przeglądarkę</translation>
</message>
<message>
<location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/>
<source>Copy link</source>
<translation type="unfinished"/>
<translation>Kopiuj 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>Ponownie otwórz przeglądarkę</translation>
</message>
<message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/>
<source>Copy link</source>
<translation type="unfinished"/>
<translation>Kopiuj 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>Edytuj Pliki Ignorowane</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="658"/>
@ -1572,59 +1572,61 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie Twoje pli
<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>Wzór</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="38"/>
<source>Allow Deletion</source>
<translation type="unfinished"/>
<translation>Pozwól na usuwanie</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="49"/>
<source>Add</source>
<translation type="unfinished"/>
<translation>Dodaj</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="59"/>
<source>Remove</source>
<translation type="unfinished"/>
<translation>Usuń</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.ui" line="66"/>
<source>Remove all</source>
<translation type="unfinished"/>
<translation>Usuń wszystko</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>Pliki lub foldery pasujące do szablonu nie będą zsynchronizowane.
Elementy, dla których usuwanie jest dozwolone zostaną usunięte, jeżeli uprawnienia folderu dopuszczają usuwanie. Jest to przydatne dla metadanych.</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/>
<source>Could not open file</source>
<translation type="unfinished"/>
<translation>Nie można otworzyć pliku</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/>
<source>Cannot write changes to &apos;%1&apos;.</source>
<translation type="unfinished"/>
<translation>Nie można zapisać zmian w &apos;%1&apos;.</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/>
<source>Add Ignore Pattern</source>
<translation type="unfinished"/>
<translation>Dodaj Wzór Ignorowania</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/>
<source>Add a new ignore pattern:</source>
<translation type="unfinished"/>
<translation>Dodaj nowy wzór ignorowania:</translation>
</message>
</context>
<context>
@ -3833,7 +3835,7 @@ Niezalecane jest jego użycie.</translation>
<message>
<location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/>
<source>Copy link</source>
<translation type="unfinished"/>
<translation>Kopiuj link</translation>
</message>
</context>
<context>