Merge branch 'master' into master

This commit is contained in:
Joshua Sterner 2019-05-09 23:15:54 -07:00 committed by GitHub
commit 1b36dbc435
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -163,7 +163,7 @@
<message> <message>
<location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/>
<source>TextLabel</source> <source>TextLabel</source>
<translation>TextLabel</translation> <translation>Címke</translation>
</message> </message>
</context> </context>
<context> <context>
@ -550,7 +550,7 @@
<message> <message>
<location filename="../src/gui/activitywidget.ui" line="84"/> <location filename="../src/gui/activitywidget.ui" line="84"/>
<source>TextLabel</source> <source>TextLabel</source>
<translation>TextLabel</translation> <translation>Címke</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/activitywidget.cpp" line="56"/> <location filename="../src/gui/activitywidget.cpp" line="56"/>
@ -1546,7 +1546,7 @@ Ahol a törlés engedélyezett, ott az elemek törölve lesznek, ha megakadályo
<message> <message>
<location filename="../src/gui/legalnotice.ui" line="36"/> <location filename="../src/gui/legalnotice.ui" line="36"/>
<source>TextLabel</source> <source>TextLabel</source>
<translation>TextLabel</translation> <translation>Címke</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/legalnotice.ui" line="58"/> <location filename="../src/gui/legalnotice.ui" line="58"/>
@ -2528,7 +2528,7 @@ Használata nem ajánlott.</translation>
<message> <message>
<location filename="../src/gui/proxyauthdialog.ui" line="74"/> <location filename="../src/gui/proxyauthdialog.ui" line="74"/>
<source>TextLabel</source> <source>TextLabel</source>
<translation>TextLabel</translation> <translation>Címke</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2696,7 +2696,7 @@ Használata nem ajánlott.</translation>
<message> <message>
<location filename="../src/gui/sharelinkwidget.ui" line="236"/> <location filename="../src/gui/sharelinkwidget.ui" line="236"/>
<source>TextLabel</source> <source>TextLabel</source>
<translation>TextLabel</translation> <translation>Címke</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/sharelinkwidget.cpp" line="409"/> <location filename="../src/gui/sharelinkwidget.cpp" line="409"/>
@ -3676,7 +3676,7 @@ Használata nem ajánlott.</translation>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/>
<source>TextLabel</source> <source>TextLabel</source>
<translation>TextLabel</translation> <translation>Címke</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/>
@ -3722,7 +3722,7 @@ Használata nem ajánlott.</translation>
<message> <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
<source>pbSelectLocalFolder</source> <source>pbSelectLocalFolder</source>
<translation>pbSelectLocalFolder</translation> <translation>Helyi mappa kiválasztása gomb</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/>
@ -3792,7 +3792,7 @@ Használata nem ajánlott.</translation>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/>
<source>TextLabel</source> <source>TextLabel</source>
<translation>TextLabel</translation> <translation>Címke</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/>
@ -3835,7 +3835,7 @@ Használata nem ajánlott.</translation>
<message> <message>
<location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/>
<source>TextLabel</source> <source>TextLabel</source>
<translation>TextLabel</translation> <translation>Címke</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/>