[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [simon] /: String fixes
From:       Peter Grasch <grasch () simon-listens ! org>
Date:       2013-02-04 14:37:18
Message-ID: 20130204143718.4C807A6091 () git ! kde ! org
[Download RAW message or body]

Git commit 6d4281b85c76274bd5a5896eeb0671c5e331521f by Peter Grasch.
Committed on 04/02/2013 at 15:36.
Pushed by grasch into branch 'master'.

String fixes

M  +1    -1    plugins/Commands/Akonadi/akonadicommand.cpp
M  +6    -6    plugins/Commands/Dialog/dialogconfigurationdlg.ui
M  +1    -1    sam/src/corpusinformation.ui
M  +6    -6    sam/src/juliustestconfigurationwidget.ui
M  +1    -1    simon/src/simonrecognitioncontrol/synchronisationsettings.cpp
 M  +2    -2    simonlib/simondialogengine/confui/outputconfiguration.ui
M  +1    -1    simonlib/simonscenarios/trainingsettings.ui
M  +1    -1    simonlib/simonsound/deviceconfiguration.ui
M  +13   -12   simonlib/simonsound/postprocessing.ui
M  +1    -1    simonlib/simonsound/singledevicesettings.cpp
M  +2    -2    simonlib/speechmodelcompilation/modelcompilationadaptersphinx.cpp
 M  +1    -1    simonlib/speechmodelcompilation/modelcompilerhtk.cpp
M  +11   -11   simonlib/speechmodelcompilation/modelcompilersphinx.cpp
M  +1    -1    ssc/src/details.ui
M  +1    -1    ssc/src/manageusers.cpp

http://commits.kde.org/simon/6d4281b85c76274bd5a5896eeb0671c5e331521f

diff --git a/plugins/Commands/Akonadi/akonadicommand.cpp \
b/plugins/Commands/Akonadi/akonadicommand.cpp index 06afce5..3eb1ec0 100644
--- a/plugins/Commands/Akonadi/akonadicommand.cpp
+++ b/plugins/Commands/Akonadi/akonadicommand.cpp
@@ -141,7 +141,7 @@ void AkonadiCommand::storeJobFinished(KJob* job)
   Akonadi::ItemCreateJob *createJob= static_cast<Akonadi::ItemCreateJob*>( \
job );  Q_UNUSED(createJob);
   if ( job->error() ) {
-      Logger::log(i18n("Akonadi item create job returned error: %1", \
job->errorString()), Logger::Error); +      Logger::log(i18n("Failed to \
create Akonadi item: %1", job->errorString()), Logger::Error);  kError() << \
job->errorString();  }
 }
diff --git a/plugins/Commands/Dialog/dialogconfigurationdlg.ui \
b/plugins/Commands/Dialog/dialogconfigurationdlg.ui index 3cc4424..818e1b5 \
                100644
--- a/plugins/Commands/Dialog/dialogconfigurationdlg.ui
+++ b/plugins/Commands/Dialog/dialogconfigurationdlg.ui
@@ -165,7 +165,7 @@
                <item>
                 <widget class="QCheckBox" name="cbAnnounceRepeat">
                  <property name="text">
-                  <string>Announce repeat option</string>
+                  <string extracomment="Tells the dialog system to \
announce the option to repeat the text">Announce repeat option</string>  \
</property>  </widget>
                </item>
@@ -279,16 +279,16 @@
    <header>kpushbutton.h</header>
   </customwidget>
   <customwidget>
+   <class>KTextEdit</class>
+   <extends>QTextEdit</extends>
+   <header>ktextedit.h</header>
+  </customwidget>
+  <customwidget>
    <class>KTabWidget</class>
    <extends>QTabWidget</extends>
    <header>ktabwidget.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>KTextEdit</class>
-   <extends>QTextEdit</extends>
-   <header>ktextedit.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections>
diff --git a/sam/src/corpusinformation.ui b/sam/src/corpusinformation.ui
index 78a8474..d415061 100644
--- a/sam/src/corpusinformation.ui
+++ b/sam/src/corpusinformation.ui
@@ -38,7 +38,7 @@
    <item row="2" column="0">
     <widget class="QLabel" name="label_26">
      <property name="text">
-      <string>Speakers:</string>
+      <string extracomment="(People)">Speakers:</string>
      </property>
     </widget>
    </item>
diff --git a/sam/src/juliustestconfigurationwidget.ui \
b/sam/src/juliustestconfigurationwidget.ui index caf6e0c..7bbec59 100644
--- a/sam/src/juliustestconfigurationwidget.ui
+++ b/sam/src/juliustestconfigurationwidget.ui
@@ -7,11 +7,11 @@
     <x>0</x>
     <y>0</y>
     <width>512</width>
-    <height>229</height>
+    <height>231</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string />
+   <string/>
   </property>
   <property name="frameShape">
    <enum>QFrame::StyledPanel</enum>
@@ -71,7 +71,7 @@
       <item row="3" column="0">
        <widget class="QLabel" name="lbTiedlist_4">
         <property name="text">
-         <string>Tiedlist:</string>
+         <string notr="true">Tiedlist:</string>
         </property>
         <property name="buddy">
          <cstring>urTiedlist</cstring>
@@ -81,7 +81,7 @@
       <item row="4" column="0">
        <widget class="QLabel" name="lbDict_4">
         <property name="text">
-         <string>Dict:</string>
+         <string notr="true">Dict:</string>
         </property>
         <property name="buddy">
          <cstring>urDict</cstring>
@@ -94,7 +94,7 @@
       <item row="5" column="0">
        <widget class="QLabel" name="lbDFA_4">
         <property name="text">
-         <string>DFA:</string>
+         <string notr="true">DFA:</string>
         </property>
         <property name="buddy">
          <cstring>urDFA</cstring>
@@ -164,7 +164,7 @@
       <item row="2" column="0">
        <widget class="QLabel" name="lbJConf_3">
         <property name="text">
-         <string>JConf:</string>
+         <string notr="true">JConf:</string>
         </property>
         <property name="buddy">
          <cstring>urJConf</cstring>
diff --git a/simon/src/simonrecognitioncontrol/synchronisationsettings.cpp \
b/simon/src/simonrecognitioncontrol/synchronisationsettings.cpp index \
                bcf7466..d796d2d 100644
--- a/simon/src/simonrecognitioncontrol/synchronisationsettings.cpp
+++ b/simon/src/simonrecognitioncontrol/synchronisationsettings.cpp
@@ -146,7 +146,7 @@ void SynchronisationSettings::selectModel()
     return;
   }
 
-  if (KMessageBox::questionYesNoCancel(this, i18n("Do you really want to \
revert all changes made since this Model?")) != KMessageBox::Yes) +  if \
(KMessageBox::questionYesNoCancel(this, i18n("Do you really want to revert \
all changes made after this model?")) != KMessageBox::Yes)  return;
 
   QDateTime modelDate = \
                ui.lwModels->currentItem()->data(Qt::UserRole).toDateTime();
                
diff --git a/simonlib/simondialogengine/confui/outputconfiguration.ui \
b/simonlib/simondialogengine/confui/outputconfiguration.ui index \
                6226a43..27e0a87 100644
--- a/simonlib/simondialogengine/confui/outputconfiguration.ui
+++ b/simonlib/simondialogengine/confui/outputconfiguration.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>531</width>
-    <height>320</height>
+    <height>326</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -106,7 +106,7 @@
       <item row="2" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
-         <string>Announce repeat:</string>
+         <string extracomment="The prompt for the input field where the \
user can provide a custom announcement text for the dialog system to tell \
the user there is the option to hear the text again">Announce \
repeat:</string>  </property>
        </widget>
       </item>
diff --git a/simonlib/simonscenarios/trainingsettings.ui \
b/simonlib/simonscenarios/trainingsettings.ui index 2e9604d..cee87e2 100644
--- a/simonlib/simonscenarios/trainingsettings.ui
+++ b/simonlib/simonscenarios/trainingsettings.ui
@@ -53,7 +53,7 @@
      <item row="1" column="0">
       <widget class="QLabel" name="lbSamplePath">
        <property name="text">
-        <string>Path to the Trainingssamples:</string>
+        <string>Path to the training samples:</string>
        </property>
       </widget>
      </item>
diff --git a/simonlib/simonsound/deviceconfiguration.ui \
b/simonlib/simonsound/deviceconfiguration.ui index b4db8a6..a89b253 100644
--- a/simonlib/simonsound/deviceconfiguration.ui
+++ b/simonlib/simonsound/deviceconfiguration.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Soundsettings</string>
+   <string>Sound settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/simonlib/simonsound/postprocessing.ui \
b/simonlib/simonsound/postprocessing.ui index efd5935..6c233fb 100644
--- a/simonlib/simonsound/postprocessing.ui
+++ b/simonlib/simonsound/postprocessing.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>PostProcessing</class>
- <widget class="QWidget" name="PostProcessing" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PostProcessing">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,27 +10,27 @@
     <height>370</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QCheckBox" name="kcfg_ProcessInternal" >
-     <property name="text" >
+    <widget class="QCheckBox" name="kcfg_ProcessInternal">
+     <property name="text">
       <string>Apply filters to recordings recorded with Simon</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="KEditListBox" name="kcfg_ProcessingFilters" >
-     <property name="title" >
-      <string>Post-Processing Commands</string>
+    <widget class="KEditListBox" name="kcfg_ProcessingFilters">
+     <property name="title">
+      <string extracomment="Commands applied to samples during \
post-processing">Post-Processing Commands</string>  </property>
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="label" >
-     <property name="text" >
+    <widget class="QLabel" name="label">
+     <property name="text">
       <string>Legend: %1........Inputfile, %2........Outputfile</string>
      </property>
     </widget>
diff --git a/simonlib/simonsound/singledevicesettings.cpp \
b/simonlib/simonsound/singledevicesettings.cpp index 1ef52b0..57a5d44 \
                100644
--- a/simonlib/simonsound/singledevicesettings.cpp
+++ b/simonlib/simonsound/singledevicesettings.cpp
@@ -176,7 +176,7 @@ void SingleDeviceSettings::load(const QString& \
deviceName, int channels,  ui->cbSoundDevice->setCurrentIndex(
         ui->cbSoundDevice->findText(defaultDevice));
       hasChanged=true;
-      KMessageBox::information(this, i18n("Please adjust your \
soundconfiguration accordingly.")); +      KMessageBox::information(this, \
i18n("Please adjust your sound configuration accordingly."));  enable();
     } else disable();
 
diff --git a/simonlib/speechmodelcompilation/modelcompilationadaptersphinx.cpp \
b/simonlib/speechmodelcompilation/modelcompilationadaptersphinx.cpp index \
                6e78467..ba21841 100644
--- a/simonlib/speechmodelcompilation/modelcompilationadaptersphinx.cpp
+++ b/simonlib/speechmodelcompilation/modelcompilationadaptersphinx.cpp
@@ -130,7 +130,7 @@ bool \
ModelCompilationAdapterSPHINX::storeModel(AdaptionType adaptionType, const  \
kDebug()<<"Store filler";  if(!storeFiller(adaptionType, fetc+".filler"))
   {
-    emit error(i18n("Failed to store filler"));
+    emit error(i18nc("Please keep \"filler\" in English as it refers to a \
file that is usually named that", "Failed to store filler"));  return \
false;  }
 
@@ -232,7 +232,7 @@ bool \
ModelCompilationAdapterSPHINX::storeFiller(AdaptionType adaptionType, const \
QFile fillerFile(fillerPathOut);  if \
(!fillerFile.open(QIODevice::WriteOnly))  {
-    emit error(i18n("Failed to write filler to \"%1\"", fillerPathOut));
+    emit error(i18nc("Please keep \"filler\" in English as it refers to a \
file that is usually named that", "Failed to write filler to \"%1\"", \
fillerPathOut));  return false;
   }
 
diff --git a/simonlib/speechmodelcompilation/modelcompilerhtk.cpp \
b/simonlib/speechmodelcompilation/modelcompilerhtk.cpp index \
                534fb3e..59ce5fd 100644
--- a/simonlib/speechmodelcompilation/modelcompilerhtk.cpp
+++ b/simonlib/speechmodelcompilation/modelcompilerhtk.cpp
@@ -1042,7 +1042,7 @@ bool ModelCompilerHTK::increaseMixtures()
 
     if (!succ)
     {
-      analyseError(i18n("Could not generate increase mixtures according to \
this config: %1.\n\n" +      analyseError(i18n("Could not increase mixtures \
                according to this config: %1.\n\n"
             "Please check the path to HHEd (%2), HERest (%3) and the \
content of the config file.", config, hHEd, hERest));  return false;
     }
diff --git a/simonlib/speechmodelcompilation/modelcompilersphinx.cpp \
b/simonlib/speechmodelcompilation/modelcompilersphinx.cpp index \
                d07ea35..fe782cf 100644
--- a/simonlib/speechmodelcompilation/modelcompilersphinx.cpp
+++ b/simonlib/speechmodelcompilation/modelcompilersphinx.cpp
@@ -126,14 +126,14 @@ bool ModelCompilerSPHINX::CompileLanguageModel()
 {
   kDebug() << "Compiling language model";
 
-  emit  status(i18n("Packing new language model to existing static \
acoustic model..."), 0, 100); +  emit  status(i18nc("'Packing' in the sense \
of archiving", "Packing new language model to existing static acoustic \
model..."), 0, 100);  
   //don't need to copy model to working dir, becouse we can just copy it \
to destination  kDebug() << "Deploying model to destination";
 
   if(!pack(m_ModelDestination, m_ModelName))
   {
-    analyseError(i18n("Cannot copy model to destination"));
+    analyseError(i18n("Could not copy model to destination"));
     return false;
   }
 
@@ -166,7 +166,7 @@ bool ModelCompilerSPHINX::AdaptBaseModel()
 
   if(!generateAcousticFeatureFiles())
   {
-    analyseError(i18n("Cannot generate acoustic feature files"));
+    analyseError(i18n("Could not generate acoustic features"));
     return false;
   }
 
@@ -175,7 +175,7 @@ bool ModelCompilerSPHINX::AdaptBaseModel()
 
   if(!convertMdef())
   {
-    analyseError(i18n("Cannot convert mdef"));
+    analyseError(i18n("Could not convert mdef"));
     return false;
   }
 
@@ -184,7 +184,7 @@ bool ModelCompilerSPHINX::AdaptBaseModel()
 
   if(!getStatistics())
   {
-    analyseError(i18n("Cannot collect statistics from the adaptation \
data")); +    analyseError(i18n("Could not collect statistics from the \
adaptation data"));  return false;
   }
 
@@ -193,7 +193,7 @@ bool ModelCompilerSPHINX::AdaptBaseModel()
 
   if(!mapUpdate())
   {
-    analyseError(i18n("Cannot performing adaption with map method"));
+    analyseError(i18n("Could not perform adaption with \"map\" method"));
     return false;
   }
 
@@ -202,7 +202,7 @@ bool ModelCompilerSPHINX::AdaptBaseModel()
   kDebug() << "Š”opying model to destination";
   if(!pack(m_ModelDestination, m_ModelName))
   {
-    analyseError(i18n("Cannot copy model to destination"));
+    analyseError(i18n("Could not copy model to destination"));
     return false;
   }
 
@@ -229,7 +229,7 @@ bool ModelCompilerSPHINX::CompileWholeModel()
 
   if(!setupModel(m_ModelDir, m_ModelName))
   {
-    analyseError(i18n("Cannot setup model"));
+    analyseError(i18n("Could not setup model"));
     return false;
   }
 
@@ -253,7 +253,7 @@ bool ModelCompilerSPHINX::CompileWholeModel()
 
   if(!modifyConfig(m_ConfigPath, params))
   {
-    analyseError(i18n("Cannot modify config at \"%1\"",m_ConfigPath));
+    analyseError(i18n("Could not modify config at \"%1\"",m_ConfigPath));
     return false;
   }
   if (!keepGoing) return false;
@@ -263,7 +263,7 @@ bool ModelCompilerSPHINX::CompileWholeModel()
 
   if(!compileModel(m_ModelDir, m_ModelName))
   {
-    analyseError(i18n("Cannot compile model"));
+    analyseError(i18n("Could not compile model"));
     return false;
   }
   if (!keepGoing) return false;
@@ -273,7 +273,7 @@ bool ModelCompilerSPHINX::CompileWholeModel()
 
   if(!pack(m_ModelDestination, m_ModelName))
   {
-    analyseError(i18n("Cannot copy model to destination"));
+    analyseError(i18n("Could not copy model to destination"));
     return false;
   }
 
diff --git a/ssc/src/details.ui b/ssc/src/details.ui
index dc1fbe7..f927f72 100644
--- a/ssc/src/details.ui
+++ b/ssc/src/details.ui
@@ -181,7 +181,7 @@
        </column>
        <column>
         <property name="text">
-         <string>ReferenceId</string>
+         <string>Reference Id</string>
         </property>
        </column>
       </widget>
diff --git a/ssc/src/manageusers.cpp b/ssc/src/manageusers.cpp
index fab53c1..130c45d 100644
--- a/ssc/src/manageusers.cpp
+++ b/ssc/src/manageusers.cpp
@@ -161,7 +161,7 @@ void ManageUsers::updateList()
 
   qint32 institutionId = ui.cbInstitutionId->currentText().toInt(&ok);
   if (!ok && !ui.cbInstitutionId->currentText().isEmpty()) {
-    KMessageBox::information(this, i18n("InstitutionID is invalid"));
+    KMessageBox::information(this, i18n("Institution id is invalid"));
     return;
   }
   QString referenceId = ui.leReferenceId->text();


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic