Attachment #3441 for bug #19586

View | Details | Raw Unified | Return to bug 19586
Collapse All | Expand All

Lines 63-69 MACRO(COMPILE_AVIDEMUX_TS_FILES ts_subdi Link Here

(-)avidemux_2.4.4/cmake/Ts.cmake~ (-1 / +1 lines)
63		63
64	SET(qm_files ${qm_files} ${_outXml} ${_out})	64	SET(qm_files ${qm_files} ${_outXml} ${_out})
65		65
66	INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")	66	INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/qt4/translations")
67	ENDFOREACH(ts_input ${ts_files})	67	ENDFOREACH(ts_input ${ts_files})
68		68
69	SET(${_sources} ${${_sources}} ${qm_files})	69	SET(${_sources} ${${_sources}} ${qm_files})

Lines 3-8 Link Here

(-)avidemux_2.4.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp~ (-1 / +2 lines)
3	#include <QApplication>	3	#include <QApplication>
4	#include <QtCore>	4	#include <QtCore>
5	#include <QtGui>	5	#include <QtGui>
		6	#include <QLibraryInfo>
6		7
7	#include "default.h"	8	#include "default.h"
8		9
Lines 60-66 void loadTranslator(void) Link Here
60	{	61	{
61	printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData());	62	printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData());
62		63
63	QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";	64	QString appdir = QLibraryInfo::location(QLibraryInfo::TranslationsPath) + QDir::separator();
64		65
65	loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());	66	loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
66	loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name());	67	loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name());

Return to bug 19586