mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 13:25:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

fixing wrong files Revert "fix for https://github.com/owncloud/client/issues/1251"

Browse source 
This reverts commit 4f1feab845.
This commit is contained in:
Jonathan Kawohl 2016-10-24 15:16:06 +02:00
parent e9503664f5
commit 0864d67a9a
3 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
admin/osx/macosx.pkgproj
View file

@ -22,7 +22,7 @@
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>owncloud.app</string>
<string>@APPLICATION_EXECUTABLE@.app</string>
<key>PATH_TYPE</key>
<integer>3</integer>
<key>PERMISSIONS</key>
@ -474,14 +474,14 @@
<key>POSTINSTALL_PATH</key>
<dict>
<key>PATH</key>
<string>/Users/jonathankawohl/github/client/admin/osx/post_install.sh</string>
<string>@CMAKE_CURRENT_BINARY_DIR@/post_install.sh</string>
<key>PATH_TYPE</key>
<integer>0</integer>
</dict>
<key>PREINSTALL_PATH</key>
<dict>
<key>PATH</key>
<string>/Users/jonathankawohl/github/client/admin/osx/pre_install.sh</string>
<string>@CMAKE_CURRENT_BINARY_DIR@/pre_install.sh</string>
<key>PATH_TYPE</key>
<integer>0</integer>
</dict>
@ -495,13 +495,13 @@
<key>CONCLUSION_ACTION</key>
<integer>0</integer>
<key>IDENTIFIER</key>
<string>com.ownCloud.client</string>
<string>@APPLICATION_REV_DOMAIN_INSTALLER@</string>
<key>NAME</key>
<string>ownCloud</string>
<string>@APPLICATION_NAME_XML_ESCAPED@</string>
<key>OVERWRITE_PERMISSIONS</key>
<false/>
<key>VERSION</key>
<string>2.3.0.0</string>
<string>@MIRALL_VERSION_FULL@</string>
</dict>
<key>UUID</key>
<string>7D7219B7-1897-48C3-8533-842BDEC46F71</string>
@ -1029,7 +1029,7 @@
<key>OVERWRITE_PERMISSIONS</key>
<false/>
<key>VERSION</key>
<string>2.3.0.0</string>
<string>@MIRALL_VERSION_FULL@</string>
</dict>
<key>TYPE</key>
<integer>0</integer>
@ -1065,12 +1065,12 @@
<key>BACKGROUND_PATH</key>
<dict>
<key>PATH</key>
<string>/Users/jonathankawohl/github/client/admin/osx/installer-background.png</string>
<string>@MAC_INSTALLER_BACKGROUND_FILE@</string>
<key>PATH_TYPE</key>
<integer>0</integer>
</dict>
<key>CUSTOM</key>
<integer>1</integer>
<integer>@MAC_INSTALLER_DO_CUSTOM_BACKGROUND@</integer>
<key>SCALING</key>
<integer>0</integer>
</dict>
@ -1245,7 +1245,7 @@
<key>LANGUAGE</key>
<string>English</string>
<key>VALUE</key>
<string>ownCloud Client</string>
<string>@APPLICATION_NAME_XML_ESCAPED@ Client</string>
</dict>
</array>
</dict>
@ -1445,9 +1445,9 @@
</dict>
</array>
<key>NAME</key>
<string>ownCloud Installer</string>
<string>@APPLICATION_NAME_XML_ESCAPED@ Installer</string>
<key>REFERENCE_FOLDER_PATH</key>
<string></string>
<string>@CMAKE_INSTALL_DIR@</string>
</dict>
</dict>
<key>SHARED_GLOBAL_DATA</key>

5
src/libsync/owncloudtheme.cpp
View file

@ -45,9 +45,8 @@ QString ownCloudTheme::about() const
{
QString devString;
devString = trUtf8("<p>Version %2. For more information visit <a href=\"%3\">%4</a></p>"
"<p>For known issues and help, please visit: <a href=https://central.owncloud.org/c/help/desktop-file-sync>central.owncloud.org</a></p>"
"<p><small>By Klaas Freitag, Daniel Molkentin,Olivier Goffart, Markus Götz"
", Jan-Christoph Borchardt, and others.</small></p>"
"<p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, "
"Olivier Goffart, Markus Götz and others.</small></p>"
"<p>Copyright ownCloud GmbH</p>"
"<p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>"
"ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH "

7
src/libsync/theme.cpp
View file

@ -285,8 +285,7 @@ QString Theme::gitSHA1() const
const QString gitSha1(QLatin1String(GIT_SHA1));
devString = QCoreApplication::translate("ownCloudTheme::about()",
"<p><small>Built from Git revision <a href=\"%1\">%2</a>"
" on %3, %4 using Qt %5, %6")
" on %3, %4 using Qt %5, %6</small></p>")
.arg(githubPrefix+gitSha1).arg(gitSha1.left(6))
.arg(__DATE__).arg(__TIME__)
.arg(QT_VERSION_STR)
@ -301,11 +300,11 @@ QString Theme::about() const
re = tr("<p>Version %1. For more information please visit <a href='%2'>%3</a>.</p>")
.arg(MIRALL_VERSION_STRING).arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN))
.arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN));
re += tr("<p>Copyright ownCloud GmbH</p>");
re += tr("<p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>"
"%2 and the %2 logo are registered trademarks of %1 in the "
"United States, other countries, or both. <br> ")
"United States, other countries, or both.</p>")
.arg(APPLICATION_VENDOR).arg(APPLICATION_NAME);
re += gitSHA1();