[haiku-commits] r40033 - in haiku/trunk/src/preferences: datatranslations mail notifications screen
- From: pulkomandy@xxxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 29 Dec 2010 18:02:33 +0100 (CET)
Author: pulkomandy
Date: 2010-12-29 18:02:32 +0100 (Wed, 29 Dec 2010)
New Revision: 40033
Changeset: http://dev.haiku-os.org/changeset/40033
Modified:
haiku/trunk/src/preferences/datatranslations/DataTranslations.cpp
haiku/trunk/src/preferences/datatranslations/DataTranslationsWindow.cpp
haiku/trunk/src/preferences/mail/AutoConfigWindow.cpp
haiku/trunk/src/preferences/mail/DNSQuery.cpp
haiku/trunk/src/preferences/mail/Jamfile
haiku/trunk/src/preferences/notifications/GeneralView.cpp
haiku/trunk/src/preferences/notifications/NotificationsView.cpp
haiku/trunk/src/preferences/screen/AlertView.cpp
haiku/trunk/src/preferences/screen/ScreenWindow.cpp
Log:
Various build fixes.
Modified: haiku/trunk/src/preferences/datatranslations/DataTranslations.cpp
===================================================================
--- haiku/trunk/src/preferences/datatranslations/DataTranslations.cpp
2010-12-29 15:57:26 UTC (rev 40032)
+++ haiku/trunk/src/preferences/datatranslations/DataTranslations.cpp
2010-12-29 17:02:32 UTC (rev 40033)
@@ -105,7 +105,7 @@
BString text(B_TRANSLATE("The item '"));
text << B_TRANSLATE("%name' does not appear to be a Translator and will"
" not be installed.");
- text.ReplaceAll(%name, name);
+ text.ReplaceAll("%name", name);
BAlert* alert = new BAlert("", text.String(), B_TRANSLATE("Ok"));
alert->Go();
}
@@ -153,10 +153,10 @@
if (target.Contains(ref.name)) {
BString string(B_TRANSLATE("An item named '"));
- string << B_TRANSLATE("%ref.name' already exists in the
"
+ string << B_TRANSLATE("%name already exists in the "
"Translators folder! Shall the existing
translator be "
"overwritten?");
- string.ReplaceAll(%ref.name, ref.name);
+ string.ReplaceAll("%name", ref.name);
BAlert* alert = new
BAlert(B_TRANSLATE("DataTranslations - Note"),
string.String(), B_TRANSLATE("Cancel"),
Modified:
haiku/trunk/src/preferences/datatranslations/DataTranslationsWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/datatranslations/DataTranslationsWindow.cpp
2010-12-29 15:57:26 UTC (rev 40032)
+++ haiku/trunk/src/preferences/datatranslations/DataTranslationsWindow.cpp
2010-12-29 17:02:32 UTC (rev 40033)
@@ -224,14 +224,14 @@
BString message;
message << B_TRANSLATE("Name: %name \nVersion: ");
- message.ReplaceAll(%name, name);
+ 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 << B_TRANSLATE("\nInfo: %info\n\nPath:\n") << path.Path() <<
"\n";
- message.ReplaceAll(%info, info);
+ message.ReplaceAll("%info", info);
BAlert* alert = new BAlert(B_TRANSLATE("info"), message.String(),
B_TRANSLATE("OK"));
Modified: haiku/trunk/src/preferences/mail/AutoConfigWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/mail/AutoConfigWindow.cpp 2010-12-29
15:57:26 UTC (rev 40032)
+++ haiku/trunk/src/preferences/mail/AutoConfigWindow.cpp 2010-12-29
17:02:32 UTC (rev 40033)
@@ -15,6 +15,10 @@
#include <FindDirectory.h>
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "AutoConfigWindow"
+
+
AutoConfigWindow::AutoConfigWindow(BRect rect, BWindow *parent)
: BWindow(rect, B_TRANSLATE("Create new account"),
B_TITLED_WINDOW_LOOK,
B_MODAL_APP_WINDOW_FEEL,
@@ -38,7 +42,7 @@
buttonRect.top = buttonRect.bottom - buttonHeight;
buttonRect.left = buttonRect.right - 2 * buttonWidth - 5;
buttonRect.right = buttonRect.left + buttonWidth;
- fBackButton = new BButton(buttonRect, "back", B_TRANSALATE("Back"),
+ fBackButton = new BButton(buttonRect, "back", B_TRANSLATE("Back"),
new
BMessage(kBackMsg));
fBackButton->SetEnabled(false);
fRootView->AddChild(fBackButton);
Modified: haiku/trunk/src/preferences/mail/DNSQuery.cpp
===================================================================
--- haiku/trunk/src/preferences/mail/DNSQuery.cpp 2010-12-29 15:57:26 UTC
(rev 40032)
+++ haiku/trunk/src/preferences/mail/DNSQuery.cpp 2010-12-29 17:02:32 UTC
(rev 40033)
@@ -341,7 +341,7 @@
_ReadQueryHeader(receiBuffer, &receiHeader);
PRINT(B_TRANSLATE("Package contains :"));
PRINT(B_TRANSLATE("%d Questions, "), receiHeader.q_count);
- PRINT(B_TRANSLATE("%d Answers,) ", receiHeader.ans_count);
+ PRINT(B_TRANSLATE("%d Answers, "), receiHeader.ans_count);
PRINT(B_TRANSLATE("%d Authoritative Servers, "),
receiHeader.auth_count);
PRINT(B_TRANSLATE("%d Additional records\n"), receiHeader.add_count);
Modified: haiku/trunk/src/preferences/mail/Jamfile
===================================================================
--- haiku/trunk/src/preferences/mail/Jamfile 2010-12-29 15:57:26 UTC (rev
40032)
+++ haiku/trunk/src/preferences/mail/Jamfile 2010-12-29 17:02:32 UTC (rev
40033)
@@ -23,8 +23,8 @@
local sources =
Account.cpp
AutoConfig.cpp
+ AutoConfigView.cpp
AutoConfigWindow.cpp
- AutoConfigView.cpp
CenterContainer.cpp
ConfigViews.cpp
ConfigWindow.cpp
@@ -54,7 +54,7 @@
x-vnd.Haiku-Mail
:
Account.cpp
- AutoConfiView.cpp
+ AutoConfigView.cpp
ConfigViews.cpp
ConfigWindow.cpp
DNSQuery.cpp
Modified: haiku/trunk/src/preferences/notifications/GeneralView.cpp
===================================================================
--- haiku/trunk/src/preferences/notifications/GeneralView.cpp 2010-12-29
15:57:26 UTC (rev 40032)
+++ haiku/trunk/src/preferences/notifications/GeneralView.cpp 2010-12-29
17:02:32 UTC (rev 40033)
@@ -79,7 +79,7 @@
fTimeout = new BTextControl(B_TRANSLATE("Hide notifications from screen"
" after"), NULL, new BMessage(kSettingChanged));
BStringView* displayTimeLabel = new BStringView("dt_label",
- B_TRANSLATE("seconds of inactivity");
+ B_TRANSLATE("seconds of inactivity"));
// Default position
// TODO: Here will come a screen representation with the four corners
clickable
@@ -178,7 +178,7 @@
"Notifications"),
B_TRANSLATE("Cannot enable"
" notifications because
the server cannot be "
"found.\nThis means
your InfoPopper installation"
- " was not successfully
completed.")),
+ " was not successfully
completed."),
B_TRANSLATE("OK"),
NULL, NULL, B_WIDTH_AS_USUAL,
B_STOP_ALERT);
(void)alert->Go();
@@ -292,7 +292,7 @@
ret = find_directory(B_USER_BOOT_DIRECTORY, &path, true);
if (ret != B_OK) {
BAlert* alert = new BAlert("",
- B_TRANSLATE"Can't save preferences, you probably don't
have "
+ B_TRANSLATE("Can't save preferences, you probably don't
have "
"write access to the boot settings directory."),
B_TRANSLATE("OK"),
NULL, NULL,
B_WIDTH_AS_USUAL, B_STOP_ALERT);
Modified: haiku/trunk/src/preferences/notifications/NotificationsView.cpp
===================================================================
--- haiku/trunk/src/preferences/notifications/NotificationsView.cpp
2010-12-29 15:57:26 UTC (rev 40032)
+++ haiku/trunk/src/preferences/notifications/NotificationsView.cpp
2010-12-29 17:02:32 UTC (rev 40033)
@@ -81,7 +81,7 @@
fNotifications->SetSelectionMode(B_SINGLE_SELECTION_LIST);
fTitleCol = new BStringColumn(B_TRANSLATE("Title"), 100,
- be_plain_font->StringWidth(B_TRANSLATE"Title")) +
+ be_plain_font->StringWidth(B_TRANSLATE("Title")) +
(kCLVTitlePadding * 2), rect.Width(), B_TRUNCATE_END,
B_ALIGN_LEFT);
fNotifications->AddColumn(fTitleCol, kTitleIndex);
Modified: haiku/trunk/src/preferences/screen/AlertView.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/AlertView.cpp 2010-12-29 15:57:26 UTC
(rev 40032)
+++ haiku/trunk/src/preferences/screen/AlertView.cpp 2010-12-29 17:02:32 UTC
(rev 40033)
@@ -134,8 +134,8 @@
AlertView::UpdateCountdownView()
{
BString string;
- string << B_TRANSLATE("Settings will revert in %fSeconds seconds.");
- string.ReplaceAll(%fSeconds, fSeconds);
+ string = B_TRANSLATE("Settings will revert in %seconds seconds.");
+ string.ReplaceFirst("%seconds", BString() << fSeconds);
fCountdownView->SetText(string.String());
}
Modified: haiku/trunk/src/preferences/screen/ScreenWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenWindow.cpp 2010-12-29 15:57:26 UTC
(rev 40032)
+++ haiku/trunk/src/preferences/screen/ScreenWindow.cpp 2010-12-29 17:02:32 UTC
(rev 40033)
@@ -74,7 +74,7 @@
int32 bits_per_pixel;
const char* label;
} kColorSpaces[] = {
- { B_CMAP8, 8, B_TRANSATE("8 bits/pixel, 256 colors") },
+ { B_CMAP8, 8, B_TRANSLATE("8 bits/pixel, 256 colors") },
{ B_RGB15, 15, B_TRANSLATE("15 bits/pixel, 32768 colors") },
{ B_RGB16, 16, B_TRANSLATE("16 bits/pixel, 65536 colors") },
{ B_RGB24, 24, B_TRANSLATE("24 bits/pixel, 16 Million colors") },
@@ -670,8 +670,8 @@
if (!item->IsMarked())
item->SetMarked(true);
- // "Other…" items only contains a refresh rate when active
- fOtherRefresh->SetLabel(B_TRANSLATE("Other" B_UTF8_ELLIPSIS_);
+ // "Other" items only contains a refresh rate when active
+ fOtherRefresh->SetLabel(B_TRANSLATE("Other" B_UTF8_ELLIPSIS));
return;
}
Other related posts:
