Magellan Linux

Contents of /trunk/avidemux/patches/avidemux-2.5.2-i18n.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1012 - (show annotations) (download)
Mon Mar 8 18:32:28 2010 UTC (14 years, 1 month ago) by niro
File size: 1752 byte(s)
-re-diffed against 2.5.2

1 diff -Naur avidemux_2.5.2/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux_2.5.2-magellan/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
2 --- avidemux_2.5.2/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2008-10-01 15:49:39.000000000 +0200
3 +++ avidemux_2.5.2-magellan/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2010-03-08 19:31:42.000000000 +0100
4 @@ -73,7 +73,7 @@
5 #ifdef __APPLE__
6 QString appdir = QCoreApplication::applicationDirPath() + "/../Resources/locale/";
7 #else
8 - QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";
9 + QString appdir = "/usr/share/avidemux/i18n/";
10 #endif
11
12 loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
13 @@ -164,4 +164,4 @@
14 }
15
16 return "Qt";
17 -}
18 \ Kein Zeilenumbruch am Dateiende.
19 +}
20 diff -Naur avidemux_2.5.2/cmake/Ts.cmake avidemux_2.5.2-magellan/cmake/Ts.cmake
21 --- avidemux_2.5.2/cmake/Ts.cmake 2009-08-01 13:11:58.000000000 +0200
22 +++ avidemux_2.5.2-magellan/cmake/Ts.cmake 2010-03-08 19:32:12.000000000 +0100
23 @@ -64,7 +64,7 @@
24
25 SET(qm_files ${qm_files} ${_outXml} ${_out})
26
27 - INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
28 + INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
29 ENDFOREACH(ts_input ${ts_files})
30
31 SET(${_sources} ${${_sources}} ${qm_files})
32 @@ -95,7 +95,7 @@
33
34 SET(qm_files ${qm_files} ${_out})
35
36 - INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
37 + INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
38 ENDFOREACH(ts_input ${ts_files})
39
40 SET(${_sources} ${${_sources}} ${qm_files})