From df4fd9df5f13fb36cea3fd7f63baf668b2384634 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Thu, 3 Apr 2014 11:30:06 -0700 Subject: [PATCH 1/2] Remove translations for now, but use correct translation keys for the only translations we had (days/weeks/etc.) --- interface/CMakeLists.txt | 3 +- interface/interface_en.ts | 210 -------------------------------- interface/src/ui/ChatWindow.cpp | 2 +- 3 files changed, 3 insertions(+), 212 deletions(-) delete mode 100644 interface/interface_en.ts diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index f991212a6e..ed14e164ac 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -81,9 +81,10 @@ qt5_add_resources(QT_RESOURCES "${QT_RESOURCE_FILES}") # add them to the interface source files set(INTERFACE_SRCS ${INTERFACE_SRCS} "${QT_UI_HEADERS}" "${QT_RESOURCES}") +# translation disabled until we strip out the line numbers set(QM ${TARGET_NAME}_en.qm) set(TS ${TARGET_NAME}_en.ts) -qt5_create_translation_custom(${QM} ${INTERFACE_SRCS} ${QT_UI_FILES} ${TS}) +# qt5_create_translation_custom(${QM} ${INTERFACE_SRCS} ${QT_UI_FILES} ${TS}) if (APPLE) # configure CMake to use a custom Info.plist diff --git a/interface/interface_en.ts b/interface/interface_en.ts deleted file mode 100644 index 192f5d4015..0000000000 --- a/interface/interface_en.ts +++ /dev/null @@ -1,210 +0,0 @@ - - - - - Application - - - Export Voxels - - - - - Sparse Voxel Octree Files (*.svo) - - - - - Open Script - - - - - JavaScript Files (*.js) - - - - - ChatWindow - - - - Chat - - - - - - Connecting to XMPP... - - - - - - online now: - - - - - You must be logged in to chat with others. - - - - - day - - %n day - %n days - - - - - hour - - %n hour - %n hours - - - - - minute - - %n minute - %n minutes - - - - - %1 online now: - - - - - Dialog - - - - - - Update Required - - - - - - Download - - - - - - Skip Version - - - - - - Close - - - - - Menu - - - Open .ini config file - - - - - - Text files (*.ini) - - - - - Save .ini config file - - - - - QObject - - - - Import Voxels - - - - - Loading ... - - - - - Place voxels - - - - - <b>Import</b> %1 as voxels - - - - - Cancel - - - - - RunningScriptsWidget - - - - Form - - - - - - <html><head/><body><p><span style=" font-size:18pt;">Running Scripts</span></p></body></html> - - - - - - <html><head/><body><p><span style=" font-weight:600;">Currently running</span></p></body></html> - - - - - - Reload All - - - - - - Stop All - - - - - - <html><head/><body><p><span style=" font-weight:600;">Recently loaded</span></p></body></html> - - - - - - (click a script or use the 1-9 keys to load and run it) - - - - - - There are no scripts currently running. - - - - diff --git a/interface/src/ui/ChatWindow.cpp b/interface/src/ui/ChatWindow.cpp index a667afddae..b079b56584 100644 --- a/interface/src/ui/ChatWindow.cpp +++ b/interface/src/ui/ChatWindow.cpp @@ -136,7 +136,7 @@ QString ChatWindow::getParticipantName(const QString& participant) { void ChatWindow::addTimeStamp() { QTimeSpan timePassed = QDateTime::currentDateTime() - lastMessageStamp; int times[] = { timePassed.daysPart(), timePassed.hoursPart(), timePassed.minutesPart() }; - QString strings[] = { tr("day", 0, times[0]), tr("hour", 0, times[1]), tr("minute", 0, times[2]) }; + QString strings[] = { tr("%n day(s)", 0, times[0]), tr("%n hour(s)", 0, times[1]), tr("%n minute(s)", 0, times[2]) }; QString timeString = ""; for (int i = 0; i < 3; i++) { if (times[i] > 0) { From 840847cf543f9a819af5240c2707150bb3d7a67c Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Thu, 3 Apr 2014 11:42:43 -0700 Subject: [PATCH 2/2] Don't refer to the QM file. --- interface/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index ed14e164ac..55d0a86d87 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -82,8 +82,8 @@ qt5_add_resources(QT_RESOURCES "${QT_RESOURCE_FILES}") set(INTERFACE_SRCS ${INTERFACE_SRCS} "${QT_UI_HEADERS}" "${QT_RESOURCES}") # translation disabled until we strip out the line numbers -set(QM ${TARGET_NAME}_en.qm) -set(TS ${TARGET_NAME}_en.ts) +# set(QM ${TARGET_NAME}_en.qm) +# set(TS ${TARGET_NAME}_en.ts) # qt5_create_translation_custom(${QM} ${INTERFACE_SRCS} ${QT_UI_FILES} ${TS}) if (APPLE)