[bluray] localize strings and make them less succinct

diff --git a/language/English/strings.xml b/language/English/strings.xml
index 41f49ec..6a6d825 100644 (file)
--- a/language/English/strings.xml
+++ b/language/English/strings.xml
@@ -2253,6 +2253,11 @@
   <string id="24101">Would you like to download this Add-on?</string>
   <string id="25000">Notifications</string>
   <string id="25001">Hide foreign</string>
+  <string id="25002">Select from all titles ...</string>
+  <string id="25003">Show bluray menus</string>
+  <string id="25004">Play main title: %d</string>
+  <string id="25005">Title: %d</string>
+  <string id="25006">Select playback item</string>
 
   <!-- strings 29800 thru 29998 reserved strings used only in the default Project Mayhem III skin and not c++ code -->
   <string id="29800">Library Mode</string>

diff --git a/xbmc/filesystem/BlurayDirectory.cpp b/xbmc/filesystem/BlurayDirectory.cpp
index 9726a71..dc46710 100644 (file)
--- a/xbmc/filesystem/BlurayDirectory.cpp
+++ b/xbmc/filesystem/BlurayDirectory.cpp
@@ -26,6 +26,7 @@
 #include "DllLibbluray.h"
 #include "FileItem.h"
 #include "video/VideoInfoTag.h"
+#include "guilib/LocalizeStrings.h"
 
 namespace XFILE
 {
@@ -64,7 +65,7 @@ CFileItemPtr CBlurayDirectory::GetTitle(const BLURAY_TITLE_INFO* title, const CS
   item->SetPath(path.Get());
   item->GetVideoInfoTag()->m_strRuntime.Format("%d",title->duration / 90000);
   item->GetVideoInfoTag()->m_iTrack = title->playlist;
-  buf.Format("%s %d", label.c_str(), title->playlist);
+  buf.Format(label.c_str(), title->playlist);
   item->m_strTitle = buf;
   item->SetLabel(buf);
   item->m_dwSize = 0;
@@ -107,7 +108,7 @@ void CBlurayDirectory::GetTitles(bool main, CFileItemList &items)
   {
     if((*it)->duration < duration)
       continue;
-    items.Add(GetTitle(*it, main ? "Main Title" : "Title"));
+    items.Add(GetTitle(*it, main ? g_localizeStrings.Get(25004) /* Main Title */ : g_localizeStrings.Get(25005) /* Title */));
   }
 
 
@@ -126,7 +127,7 @@ void CBlurayDirectory::GetRoot(CFileItemList &items)
     item.reset(new CFileItem());
     item->SetPath(path.Get());
     item->m_bIsFolder = true;
-    item->SetLabel("All Titles");
+    item->SetLabel(g_localizeStrings.Get(25002) /* All titles */);
     item->SetIconImage("DefaultVideoPlaylists.png");
     items.Add(item);
 
@@ -134,7 +135,7 @@ void CBlurayDirectory::GetRoot(CFileItemList &items)
     item.reset(new CFileItem());
     item->SetPath(path.Get());
     item->m_bIsFolder = false;
-    item->SetLabel("Menus");
+    item->SetLabel(g_localizeStrings.Get(25003) /* Menus */);
     item->SetIconImage("DefaultProgram.png");
     items.Add(item);
 }

diff --git a/xbmc/video/windows/GUIWindowVideoBase.cpp b/xbmc/video/windows/GUIWindowVideoBase.cpp
index 2c7de18..4a83529 100644 (file)
--- a/xbmc/video/windows/GUIWindowVideoBase.cpp
+++ b/xbmc/video/windows/GUIWindowVideoBase.cpp
@@ -1090,7 +1090,7 @@ bool CGUIWindowVideoBase::ShowPlaySelection(CFileItemPtr& item, const CStdString
   while(true)
   {
     dialog->Reset();
-    dialog->SetHeading("Select playback item");
+    dialog->SetHeading(25006 /* Select playback item */);
     dialog->SetItems(&items);
     dialog->SetUseDetails(true);
     dialog->DoModal();