[mythtv] [patch][i18n] update mythfrontend_ja.ts and more

[Hirobumi Shimada]

Hi

mythfrontend_ja.ts.patch.bz2
	updating japanese translation.


settings.patch
	fix unicode handling.


tv_play.patch
	fix displaing "???" at timestrech (translated character was passed
through tr). and added few "tr".


mythgallery.patch
	File name other than latin1 were accepting.


Thanks

Hiro

-------------- next part --------------
A non-text attachment was scrubbed...
Name: mythfrontend_ja.ts.patch.bz2
Type: application/octet-stream
Size: 3590 bytes
Desc: not available
Url : http://mythtv.org/pipermail/mythtv-dev/attachments/20050129/f1b7b987/mythfrontend_ja.ts.patch.obj
-------------- next part --------------
Index: libs/libmyth/settings.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/settings.cpp,v
retrieving revision 1.86
diff -u -u -r1.86 settings.cpp
--- libs/libmyth/settings.cpp	28 Jan 2005 18:00:52 -0000	1.86
+++ libs/libmyth/settings.cpp	29 Jan 2005 04:10:42 -0000
@@ -1114,7 +1114,7 @@
 QString GlobalSetting::setClause(void)
 {
     return QString("value = '%1', data = '%2', hostname = '%3'")
-                   .arg(getName()).arg(getValue())
+                   .arg(getName()).arg(getValue().utf8())
                    .arg(gContext->GetHostName());
 }
 
@@ -1126,5 +1126,5 @@
 QString BackendSetting::setClause(void)
 {
     return QString("value = '%1', data = '%2'")
-                   .arg(getName()).arg(getValue());
+                   .arg(getName()).arg(getValue().utf8());
 }
-------------- next part --------------
Index: libs/libmythtv/tv_play.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/tv_play.cpp,v
retrieving revision 1.234
diff -u -u -r1.234 tv_play.cpp
--- libs/libmythtv/tv_play.cpp	21 Jan 2005 07:10:16 -0000	1.234
+++ libs/libmythtv/tv_play.cpp	29 Jan 2005 04:10:42 -0000
@@ -3307,7 +3307,7 @@
     if (osd)
     {
         int val = (int)(normal_speed*500);
-        osd->StartPause(val, false, tr("Adjust Time Stretch"), tr(text), 10, 
+        osd->StartPause(val, false, tr("Adjust Time Stretch"), text, 10, 
                         kOSDFunctionalType_TimeStretchAdjust);
         update_osd_pos = false;
     }
@@ -3369,7 +3369,7 @@
                               TRUE);
     }
 
-    text = tr("Sleep ") + " " + tr(sleep_timer_array[sleep_index].dispString);
+    text = tr("Sleep ") + " " + sleep_timer_array[sleep_index].dispString;
 
     // display OSD
     if (osd && !browsemode)
@@ -3686,7 +3686,7 @@
 
     if (osd)
     {
-        char *title = "Adjust Picture";
+        QString title = tr("Adjust Picture");
         QString picName;
 
         AudioOutput *aud = NULL;
@@ -3712,11 +3712,11 @@
                 aud = nvp->getAudioOutput();
                 value = (aud) ? (aud->GetCurrentVolume()) 
                         : 99; 
-                title = "Adjust Volume";
+                title = tr("Adjust Volume");
                 picName = QString("%1 %2 %").arg(tr("Volume")).arg(value);
                 break;
         }
-        osd->StartPause(value*10, true, tr(title), picName, 5, 
+        osd->StartPause(value*10, true, title, picName, 5, 
                         kOSDFunctionalType_PictureAdjust);
         update_osd_pos = false;
     }
@@ -3732,7 +3732,7 @@
    
     if (osd)
     {
-        QString title("Adjust Recording");
+        QString title = tr("Adjust Recording");
         QString recName;
       
         switch (recAdjustment)
@@ -3762,7 +3762,7 @@
                                   .arg(tr("(REC)")).arg(value);
                 break;
         }
-        osd->StartPause(value * 10, true, tr(title), recName, 5,
+        osd->StartPause(value * 10, true, title, recName, 5,
                         kOSDFunctionalType_RecPictureAdjust);
         update_osd_pos = false;
     }
-------------- next part --------------
? diff
Index: mythgallery/iconview.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythgallery/mythgallery/iconview.cpp,v
retrieving revision 1.36
diff -u -r1.36 iconview.cpp
--- mythgallery/iconview.cpp	28 Jan 2005 08:07:38 -0000	1.36
+++ mythgallery/iconview.cpp	29 Jan 2005 04:20:44 -0000
@@ -994,8 +994,10 @@
         } 
         else 
         {
-            cerr << "copying " << fi->absFilePath() << " to " << toDir << "\n";
-            QString cmd = "cp \"" + fi->absFilePath() + "\" \"" + toDir + "\"";
+            cerr << "copying " << fi->absFilePath().local8Bit() 
+                 << " to " << toDir.local8Bit() << "\n";
+            QString cmd = "cp \"" + fi->absFilePath().local8Bit() + "\" \"" 
+                + toDir.local8Bit() + "\"";
             system(cmd);
         }
     }
Index: mythgallery/thumbgenerator.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythgallery/mythgallery/thumbgenerator.cpp,v
retrieving revision 1.5
diff -u -r1.5 thumbgenerator.cpp
--- mythgallery/thumbgenerator.cpp	8 Dec 2004 03:47:31 -0000	1.5
+++ mythgallery/thumbgenerator.cpp	29 Jan 2005 04:20:44 -0000
@@ -48,7 +48,7 @@
 void ThumbGenerator::setDirectory(const QString& directory, bool isGallery)
 {
     m_mutex.lock();
-    m_directory = QString(directory.latin1());
+    m_directory = directory;
     m_isGallery = isGallery;
     m_mutex.unlock();
 }
@@ -58,7 +58,7 @@
     // Add a file to the list of thumbs.
     // Must remember to call start after adding all the files!
     m_mutex.lock();
-    m_fileList.append(QString(filePath.latin1()));
+    m_fileList.append(filePath);
     m_mutex.unlock();
 }
 
@@ -128,8 +128,8 @@
 
                 // deep copies all over
                 ThumbData *td = new ThumbData;
-                td->directory = QString(dir.latin1());
-                td->fileName  = QString(file.latin1());
+                td->directory = dir;
+                td->fileName  = file;
                 td->thumb     = image.copy();
 
                 // inform parent we have thumbnail ready for it