Ticket #7117: datatranslations-localization-update.patch

src/preferences/datatranslations/DataTranslationsWindow.cpp

@@ -223 +223 @@
     _GetTranslatorInfo(id, name, info, version, path);
 
     BString message;
-    message << B_TRANSLATE("Name: %name \nVersion: ");
+    message << B_TRANSLATE("Name: %name \nVersion:") << " ";
     message.ReplaceAll("%name", name);
 
     // Convert the version number into a readable format
-    message << (int)B_TRANSLATION_MAJOR_VERSION(version)
-        << '.' << (int)B_TRANSLATION_MINOR_VERSION(version)
-        << '.' << (int)B_TRANSLATION_REVISION_VERSION(version);
+    message << static_cast<int>B_TRANSLATION_MAJOR_VERSION(version)
+        << '.' << static_cast<int>B_TRANSLATION_MINOR_VERSION(version)
+        << '.' << static_cast<int>B_TRANSLATION_REVISION_VERSION(version);
     message << B_TRANSLATE("\nInfo: %info\n\nPath:\n") << path.Path() << "\n";
     message.ReplaceAll("%info", info);
 
-    BAlert* alert = new BAlert(B_TRANSLATE("info"), message.String(),
+    BAlert* alert = new BAlert("info", message.String(),
         B_TRANSLATE("OK"));
     BTextView *view = alert->TextView();
     BFont font;

src/preferences/datatranslations/DataTranslations.cpp

@@ -51 +51 @@
 void
 DataTranslationsApplication::AboutRequested()
 {
-    BAlert* alert = new BAlert(B_TRANSLATE("about"),
+    BAlert* alert = new BAlert("about",
         B_TRANSLATE("DataTranslations\n\twritten by Oliver Siebenmarck and"
         " others\n\tCopyright 2002-2010, Haiku Inc. All rights reserved.\n"),
         B_TRANSLATE("OK"));
@@ -72 +72 @@
 void
 DataTranslationsApplication::_InstallError(const char* name, status_t status)
 {
-    BString text(B_TRANSLATE("Could not install "));
-    text << name << ":\n" << strerror(status);
+    BString text(B_TRANSLATE("Could not install"));
+    text << " " << name << ":\n" << strerror(status);
     BAlert* alert = new BAlert(B_TRANSLATE("DataTranslations - Error"),
-        text.String(), B_TRANSLATE("Ok"));
+        text.String(), B_TRANSLATE("OK"));
     alert->Go();
 }
 
@@ -102 +102 @@
 void
 DataTranslationsApplication::_NoTranslatorError(const char* name)
 {
-    BString text(B_TRANSLATE("The item '"));
-    text << B_TRANSLATE("%name' does not appear to be a Translator and will"
-        " not be installed.");
+    BString text(
+        B_TRANSLATE("The item '%name' does not appear to be a Translator and "
+        "will not be installed."));
     text.ReplaceAll("%name", name);
     BAlert* alert = new BAlert("", text.String(), B_TRANSLATE("Ok"));
     alert->Go();
@@ -152 +152 @@
         }
 
         if (target.Contains(ref.name)) {
-            BString string(B_TRANSLATE("An item named '"));
-            string << B_TRANSLATE("%name already exists in the "
+            BString string(
+                B_TRANSLATE("An item named '%name' already exists in the "
                 "Translators folder! Shall the existing translator be "
-                "overwritten?");
+                "overwritten?"));
             string.ReplaceAll("%name", ref.name);
 
             BAlert* alert = new BAlert(B_TRANSLATE("DataTranslations - Note"),