Applied yet another localization patch made by Jorma Karvonen.
Fixes #7005. Thanks. Exclusions: - localization of "usage" field of BPropertyInfo rejected - looks like it is not displayed to user; - localization of Sound Event names discarded. The situation is at least questionable and should be discussed. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40543 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -9,9 +9,17 @@ Server notification_server :
|
|||||||
NotificationServer.cpp
|
NotificationServer.cpp
|
||||||
NotificationView.cpp
|
NotificationView.cpp
|
||||||
NotificationWindow.cpp
|
NotificationWindow.cpp
|
||||||
: be $(TARGET_LIBSTDC++) libicon.a libnotification.a
|
: be $(TARGET_LIBSTDC++) libicon.a libnotification.a $(HAIKU_LOCALE_LIBS)
|
||||||
: notification_server.rdef
|
: notification_server.rdef
|
||||||
;
|
;
|
||||||
|
|
||||||
|
DoCatalogs notification_server :
|
||||||
|
x-vnd.Haiku-notification_server
|
||||||
|
:
|
||||||
|
NotificationServer.cpp
|
||||||
|
NotificationView.cpp
|
||||||
|
NotificationWindow.cpp
|
||||||
|
;
|
||||||
|
|
||||||
Depends notification_server : libicon.a ;
|
Depends notification_server : libicon.a ;
|
||||||
Depends notification_server : libnotification.a ;
|
Depends notification_server : libnotification.a ;
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
#include <Alert.h>
|
#include <Alert.h>
|
||||||
#include <Application.h>
|
#include <Application.h>
|
||||||
|
#include <Catalog.h>
|
||||||
#include <Debug.h>
|
#include <Debug.h>
|
||||||
#include <File.h>
|
#include <File.h>
|
||||||
#include <NodeMonitor.h>
|
#include <NodeMonitor.h>
|
||||||
@@ -27,15 +28,19 @@
|
|||||||
#include "AppUsage.h"
|
#include "AppUsage.h"
|
||||||
#include "BorderView.h"
|
#include "BorderView.h"
|
||||||
|
|
||||||
|
#undef B_TRANSLATE_CONTEXT
|
||||||
|
#define B_TRANSLATE_CONTEXT "NotificationWindow"
|
||||||
|
|
||||||
|
|
||||||
property_info main_prop_list[] = {
|
property_info main_prop_list[] = {
|
||||||
{"message", {B_GET_PROPERTY, 0}, {B_INDEX_SPECIFIER, 0}, "get a message"},
|
{"message", {B_GET_PROPERTY, 0}, {B_INDEX_SPECIFIER, 0},
|
||||||
|
B_TRANSLATE_MARK("get a message")},
|
||||||
{"message", {B_COUNT_PROPERTIES, 0}, {B_DIRECT_SPECIFIER, 0},
|
{"message", {B_COUNT_PROPERTIES, 0}, {B_DIRECT_SPECIFIER, 0},
|
||||||
"count messages"},
|
B_TRANSLATE_MARK("count messages")},
|
||||||
{"message", {B_CREATE_PROPERTY, 0}, {B_DIRECT_SPECIFIER, 0},
|
{"message", {B_CREATE_PROPERTY, 0}, {B_DIRECT_SPECIFIER, 0},
|
||||||
"create a message"},
|
B_TRANSLATE_MARK("create a message")},
|
||||||
{"message", {B_SET_PROPERTY, 0}, {B_INDEX_SPECIFIER, 0},
|
{"message", {B_SET_PROPERTY, 0}, {B_INDEX_SPECIFIER, 0},
|
||||||
"modify a message"},
|
B_TRANSLATE_MARK("modify a message")},
|
||||||
{0}
|
{0}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -46,12 +51,12 @@ const float kPenSize = 1;
|
|||||||
const float kEdgePadding = 5;
|
const float kEdgePadding = 5;
|
||||||
const float kSmallPadding = 2;
|
const float kSmallPadding = 2;
|
||||||
|
|
||||||
|
|
||||||
NotificationWindow::NotificationWindow()
|
NotificationWindow::NotificationWindow()
|
||||||
:
|
:
|
||||||
BWindow(BRect(10, 10, 30, 30), "Notification", B_BORDERED_WINDOW,
|
BWindow(BRect(10, 10, 30, 30), B_TRANSLATE_MARK("Notification"),
|
||||||
B_AVOID_FRONT | B_AVOID_FOCUS | B_NOT_CLOSABLE | B_NOT_ZOOMABLE
|
B_BORDERED_WINDOW, B_AVOID_FRONT | B_AVOID_FOCUS | B_NOT_CLOSABLE
|
||||||
| B_NOT_MINIMIZABLE | B_NOT_RESIZABLE, B_ALL_WORKSPACES)
|
| B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_NOT_RESIZABLE,
|
||||||
|
B_ALL_WORKSPACES)
|
||||||
{
|
{
|
||||||
fBorder = new BorderView(Bounds(), "Notification");
|
fBorder = new BorderView(Bounds(), "Notification");
|
||||||
|
|
||||||
@@ -470,8 +475,9 @@ NotificationWindow::LoadAppFilters(bool startMonitor)
|
|||||||
entry.GetNodeRef(&nref);
|
entry.GetNodeRef(&nref);
|
||||||
|
|
||||||
if (watch_node(&nref, B_WATCH_ALL, BMessenger(this)) != B_OK) {
|
if (watch_node(&nref, B_WATCH_ALL, BMessenger(this)) != B_OK) {
|
||||||
BAlert* alert = new BAlert("", "Couldn't start filter "
|
BAlert* alert = new BAlert(B_TRANSLATE("Warning"),
|
||||||
" monitor. Live filter changes disabled.", "Darn.");
|
B_TRANSLATE("Couldn't start filter monitor."
|
||||||
|
" Live filter changes disabled."), B_TRANSLATE("Darn."));
|
||||||
alert->Go();
|
alert->Go();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -534,8 +540,9 @@ NotificationWindow::_LoadGeneralSettings(bool startMonitor)
|
|||||||
entry.GetNodeRef(&nref);
|
entry.GetNodeRef(&nref);
|
||||||
|
|
||||||
if (watch_node(&nref, B_WATCH_ALL, BMessenger(this)) != B_OK) {
|
if (watch_node(&nref, B_WATCH_ALL, BMessenger(this)) != B_OK) {
|
||||||
BAlert* alert = new BAlert("", "Couldn't start general settings "
|
BAlert* alert = new BAlert(B_TRANSLATE("Warning"),
|
||||||
" monitor.\nLive filter changes disabled.", "OK");
|
B_TRANSLATE("Couldn't start general settings monitor.\n"
|
||||||
|
"Live filter changes disabled."), B_TRANSLATE("OK"));
|
||||||
alert->Go();
|
alert->Go();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -598,8 +605,9 @@ NotificationWindow::_LoadDisplaySettings(bool startMonitor)
|
|||||||
entry.GetNodeRef(&nref);
|
entry.GetNodeRef(&nref);
|
||||||
|
|
||||||
if (watch_node(&nref, B_WATCH_ALL, BMessenger(this)) != B_OK) {
|
if (watch_node(&nref, B_WATCH_ALL, BMessenger(this)) != B_OK) {
|
||||||
BAlert* alert = new BAlert("", "Couldn't start display settings "
|
BAlert* alert = new BAlert(B_TRANSLATE("Warning"),
|
||||||
" monitor.\nLive filter changes disabled.", "OK");
|
B_TRANSLATE("Couldn't start display settings monitor.\n"
|
||||||
|
"Live filter changes disabled."), B_TRANSLATE("OK"));
|
||||||
alert->Go();
|
alert->Go();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user