From cc19c15c174b4885baf26bbc34462eb7dafd61b3 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Wed, 7 Jan 2015 15:55:14 -0800
Subject: [PATCH] remove more references to voxels

---
 interface/interface_en.ts         | 31 ++-----------------------------
 interface/ui/preferencesDialog.ui |  8 ++++----
 2 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/interface/interface_en.ts b/interface/interface_en.ts
index b85628b104..b011f37317 100644
--- a/interface/interface_en.ts
+++ b/interface/interface_en.ts
@@ -3,11 +3,6 @@
 <TS version="2.1" language="en_US">
 <context>
     <name>Application</name>
-    <message>
-        <location filename="src/Application.cpp" line="1481"/>
-        <source>Export Voxels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="src/Application.cpp" line="1482"/>
         <source>Sparse Voxel Octree Files (*.svo)</source>
@@ -226,45 +221,23 @@
     <message>
         <location filename="ui/preferencesDialog.ui" line="1125"/>
         <location filename="../build/interface/ui_preferencesDialog.h" line="636"/>
-        <source>Voxels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="ui/preferencesDialog.ui" line="1157"/>
-        <location filename="../build/interface/ui_preferencesDialog.h" line="637"/>
-        <source>Maximum voxels</source>
+        <source>Octree</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="ui/preferencesDialog.ui" line="1236"/>
         <location filename="../build/interface/ui_preferencesDialog.h" line="638"/>
-        <source>Max voxels sent each second</source>
+        <source>Max packets sent each second</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
-    <message>
-        <location filename="src/ui/VoxelImportDialog.cpp" line="22"/>
-        <location filename="src/ui/VoxelImportDialog.cpp" line="23"/>
-        <source>Import Voxels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="src/ui/VoxelImportDialog.cpp" line="24"/>
         <source>Loading ...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/ui/VoxelImportDialog.cpp" line="25"/>
-        <source>Place voxels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/ui/VoxelImportDialog.cpp" line="26"/>
-        <source>&lt;b&gt;Import&lt;/b&gt; %1 as voxels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="src/ui/VoxelImportDialog.cpp" line="27"/>
         <source>Cancel</source>
diff --git a/interface/ui/preferencesDialog.ui b/interface/ui/preferencesDialog.ui
index 0a20231634..e9b0f43924 100644
--- a/interface/ui/preferencesDialog.ui
+++ b/interface/ui/preferencesDialog.ui
@@ -1273,7 +1273,7 @@
       </layout>
      </item>
      <item>
-      <widget class="QLabel" name="voxelsTitleLabel_2">
+      <widget class="QLabel" name="octreeTitleLabel_2">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -2130,7 +2130,7 @@
       </layout>
      </item>
      <item>
-      <widget class="QLabel" name="voxelsTitleLabel">
+      <widget class="QLabel" name="octreeTitleLabel">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -2155,7 +2155,7 @@
         <string notr="true">color:#29967e</string>
        </property>
        <property name="text">
-        <string>Voxels</string>
+        <string>Octree</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
@@ -2184,7 +2184,7 @@
           </font>
          </property>
          <property name="text">
-          <string>Max voxels sent each second</string>
+          <string>Max packets sent each second</string>
          </property>
          <property name="indent">
           <number>0</number>