Merge branch 'master' into master

This commit is contained in:
Ronny 2018-08-05 11:35:53 +02:00 committed by GitHub
commit 7cbca28eb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View file

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

View file

@ -243,7 +243,7 @@
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="656"/> <location filename="../src/gui/accountsettings.cpp" line="656"/>
<source>Server %1 is currently in maintenance mode.</source> <source>Server %1 is currently in maintenance mode.</source>
<translation type="unfinished"/> <translation>Server %1 momenteel in onderhoudsmodus.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="658"/> <location filename="../src/gui/accountsettings.cpp" line="658"/>