merged changes

This commit is contained in:
Felix Kauselmann
2014-09-23 21:47:35 +02:00
35 changed files with 182 additions and 111 deletions

View File

@ -70,10 +70,9 @@ DATADIR = $$PREFIX/share
DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\""
#MAKE INSTALL
INSTALLS += bin docs icon desktop translation
INSTALLS += bin docs icon desktop translation #manpage
bin.path = $$BINDIR
isEmpty(DESTDIR) {
@ -82,18 +81,27 @@ isEmpty(DESTDIR) {
bin.files = $$DESTDIR/YACReader
}
docs.path = $$DATADIR/doc/YACReader
docs.files = ../*.txt
docs.path = $$DATADIR/doc/yacreader
icon.path = $$DATADIR/YACReader
#rename docs for better packageability
docs.extra = cp ../CHANGELOG.txt ../changelog; cp ../README.txt ../README
docs.files = ../README ../changelog
icon.path = $$DATADIR/yacreader
icon.files = ../images/icon.png
desktop.path = $$DATADIR/applications
desktop.extra = desktop-file-edit --set-icon=$$DATADIR/YACReader/icon.png $$PWD/../YACReader.desktop
desktop.extra = desktop-file-edit --set-icon=$$DATADIR/yacreader/icon.png $$PWD/../YACReader.desktop
desktop.files = ../YACReader.desktop
#TODO: icons should be located at /usr/share/icons and have the same basename as their application
translation.path = $$DATADIR/YACReader/languages
translation.path = $$DATADIR/yacreader/languages
translation.files = ../release/languages/yacreader_*
manpage.path = $$DATADIR/man/man1
manpage.files = ../YACReader.1
#remove leftover doc files when 'make clean' is invoked
QMAKE_CLEAN += "../changelog" "../README"
}

View File

@ -129,7 +129,7 @@ int main(int argc, char * argv[])
QTranslator translator;
QString sufix = QLocale::system().name();
#if defined Q_OS_UNIX && !defined Q_OS_MAC
translator.load(QString(DATADIR)+"/YACReader/languages/yacreader_"+sufix);
translator.load(QString(DATADIR)+"/yacreader/languages/yacreader_"+sufix);
#else
translator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix);
#endif

View File

@ -924,7 +924,7 @@ void MainWindowViewer::changeFit()
void MainWindowViewer::newVersion()
{
QMessageBox msgBox;
msgBox.setText(tr("There is a new version avaliable"));
msgBox.setText(tr("There is a new version available"));
msgBox.setInformativeText(tr("Do you want to download the new version?"));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Ignore | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::Yes);

View File

@ -404,7 +404,7 @@
</message>
<message>
<location filename="main_window_viewer.cpp" line="927"/>
<source>There is a new version avaliable</source>
<source>There is a new version available</source>
<translation>Hay una nueva versión disponible</translation>
</message>
<message>

View File

@ -393,7 +393,7 @@
</message>
<message>
<location filename="main_window_viewer.cpp" line="927"/>
<source>There is a new version avaliable</source>
<source>There is a new version available</source>
<translation>Une nouvelle version est disponible</translation>
</message>
<message>

View File

@ -393,7 +393,7 @@
</message>
<message>
<location filename="main_window_viewer.cpp" line="927"/>
<source>There is a new version avaliable</source>
<source>There is a new version available</source>
<translation type="unfinished">Er is een nieuwe versie beschikbaar</translation>
</message>
<message>

View File

@ -403,7 +403,7 @@
</message>
<message>
<location filename="main_window_viewer.cpp" line="927"/>
<source>There is a new version avaliable</source>
<source>There is a new version available</source>
<translation> uma nova versão disponível</translation>
</message>
<message>

View File

@ -393,7 +393,7 @@
</message>
<message>
<location filename="main_window_viewer.cpp" line="927"/>
<source>There is a new version avaliable</source>
<source>There is a new version available</source>
<translation>Доступно новое обновление</translation>
</message>
<message>

View File

@ -393,7 +393,7 @@
</message>
<message>
<location filename="main_window_viewer.cpp" line="927"/>
<source>There is a new version avaliable</source>
<source>There is a new version available</source>
<translation type="unfinished"></translation>
</message>
<message>

View File

@ -306,7 +306,7 @@
<translation>Sıradaki çizgi romanı </translation>
</message>
<message>
<source>There is a new version avaliable</source>
<source>There is a new version available</source>
<translation>Yeni versiyon mevcut</translation>
</message>
<message>