[haiku-commits] r35639 - in haiku/trunk: data/catalogs data/catalogs/servers data/catalogs/servers/print src/servers/print
- From: michael.w.pfeiffer@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 27 Feb 2010 20:40:40 +0100 (CET)
Author: laplace
Date: 2010-02-27 20:40:39 +0100 (Sat, 27 Feb 2010)
New Revision: 35639
Changeset: http://dev.haiku-os.org/changeset/35639/haiku
Added:
haiku/trunk/data/catalogs/servers/
haiku/trunk/data/catalogs/servers/print/
haiku/trunk/data/catalogs/servers/print/de.catkeys
Modified:
haiku/trunk/src/servers/print/ConfigWindow.cpp
haiku/trunk/src/servers/print/Jamfile
haiku/trunk/src/servers/print/PrintServerApp.R5.cpp
haiku/trunk/src/servers/print/PrintServerApp.cpp
haiku/trunk/src/servers/print/PrintServerApp.h
Log:
Localized print_server.
Added German translation. Again feel free to improve it.
Updated copyright year in About dialog.
Added: haiku/trunk/data/catalogs/servers/print/de.catkeys
===================================================================
--- haiku/trunk/data/catalogs/servers/print/de.catkeys
(rev 0)
+++ haiku/trunk/data/catalogs/servers/print/de.catkeys 2010-02-27 19:40:39 UTC
(rev 35639)
@@ -0,0 +1,38 @@
+1 german x-vnd.Be-PSRV 2376709688
+Page setup ConfigWindow Seitenkonfiguration
+Print setup ConfigWindow Druckkonfiguration
+Select a printer ConfigWindow Druckerauswahl
+Printer: ConfigWindow Drucker:
+Paper setup: ConfigWindow Papierkonfiguration:
+Page setup: ConfigWindow Seitenkonfiguration:
+Cancel ConfigWindow Abbrechen
+OK ConfigWindow OK
+Undefined ConfigWindow Nicht definiert
+Portrait ConfigWindow Hochformat
+Landscape ConfigWindow Querformat
+Page ConfigWindow Seite
+to ConfigWindow bis
+All pages ConfigWindow Alle Seiten
+copies ConfigWindow Kopien
+Letter ConfigWindow Letter (US)
+Legal ConfigWindow Legal (US)
+Ledger ConfigWindow Ledger (US)
+Tabloid ConfigWindow Tabloid (US)
+A0 ConfigWindow A0
+A1 ConfigWindow A1
+A2 ConfigWindow A2
+A3 ConfigWindow A3
+A4 ConfigWindow A4
+A5 ConfigWindow A5
+A6 ConfigWindow A6
+B5 ConfigWindow B5
+There already exists a printer you are going to create, but it's driver could
not be found! Replace? PrintServerApp Ein Drucker mit diesem Namen
existiert bereits, dessen Treiber konnte jedoch nicht gefunden werden. Soll der
Drucker ersetzt werden?
+There already exists a printer you are going to create, but it's not usable at
all! Replace? PrintServerApp Ein Drucker mit diesem Namen existiert
bereits, ist jedoch nicht verwendbar! Soll der Drucker ersetzt werden?
+OK PrintServerApp OK
+Cancel PrintServerApp Abbrechen
+There are no printers set up. PrintServerApp Es sind keine Drucker
konfiguriert.
+There is no default printer set up. PrintServerApp Es ist kein
standard Drucker definiert.
+Would you like to set one up now? PrintServerApp Möchten Sie
jetzt einen Drucker konfigurieren?
+Would you like to make @ the default printer? PrintServerApp Möchten
Sie @ als standard Drucker verwenden?
+No PrintServerApp Nein
+Yes PrintServerApp Ja
Modified: haiku/trunk/src/servers/print/ConfigWindow.cpp
===================================================================
--- haiku/trunk/src/servers/print/ConfigWindow.cpp 2010-02-27 19:34:48 UTC
(rev 35638)
+++ haiku/trunk/src/servers/print/ConfigWindow.cpp 2010-02-27 19:40:39 UTC
(rev 35639)
@@ -25,10 +25,16 @@
#include <Window.h>
// Haiku
+#include <Catalog.h>
#include <Layout.h>
#include <GroupLayout.h>
#include <GroupLayoutBuilder.h>
+
+#undef TR_CONTEXT
+#define TR_CONTEXT "ConfigWindow"
+
+
static const float a0_width = 2380.0;
static const float a0_height = 3368.0;
static const float a1_width = 1684.0;
@@ -51,29 +57,29 @@
static const float legal_height = 1008.0;
static const float ledger_width = 1224.0;
static const float ledger_height = 792.0;
-static const float p11x17_width = 792.0;
-static const float p11x17_height = 1224.0;
+static const float tabloid_width = 792.0;
+static const float tabloid_height = 1224.0;
static struct PageFormat
{
- char *label;
+ const char *label;
float width;
float height;
} pageFormat[] =
{
- {"Letter", letter_width, letter_height },
- {"Legal", legal_width, legal_height },
- {"Ledger", ledger_width, ledger_height },
- {"p11x17", p11x17_width, p11x17_height },
- {"A0", a0_width, a0_height },
- {"A1", a1_width, a1_height },
- {"A2", a2_width, a2_height },
- {"A3", a3_width, a3_height },
- {"A4", a4_width, a4_height },
- {"A5", a5_width, a5_height },
- {"A6", a6_width, a6_height },
- {"B5", b5_width, b5_height },
+ {TR_MARK("Letter"), letter_width, letter_height },
+ {TR_MARK("Legal"), legal_width, legal_height },
+ {TR_MARK("Ledger"), ledger_width, ledger_height },
+ {TR_MARK("Tabloid"), tabloid_width, tabloid_height },
+ {TR_MARK("A0"), a0_width, a0_height },
+ {TR_MARK("A1"), a1_width, a1_height },
+ {TR_MARK("A2"), a2_width, a2_height },
+ {TR_MARK("A3"), a3_width, a3_height },
+ {TR_MARK("A4"), a4_width, a4_height },
+ {TR_MARK("A5"), a5_width, a5_height },
+ {TR_MARK("A6"), a6_width, a6_height },
+ {TR_MARK("B5"), b5_width, b5_height },
};
@@ -83,11 +89,11 @@
for (uint i = 0; i < sizeof(pageFormat) / sizeof(struct PageFormat); i
++) {
struct PageFormat& pf = pageFormat[i];
if (pf.width == w && pf.height == h || pf.width == h &&
pf.height == w) {
- label = pf.label; return;
+ label = TR(pf.label); return;
}
}
- float unit = 72.0; // currently inc[h]es only
+ float unit = 72.0; // currently inches only
label << (w / unit) << "x" << (h / unit) << " in.";
}
@@ -103,7 +109,7 @@
ConfigWindow::ConfigWindow(config_setup_kind kind, Printer* defaultPrinter,
BMessage* settings, AutoReply* sender)
- : BWindow(ConfigWindow::GetWindowFrame(), "Page setup",
+ : BWindow(ConfigWindow::GetWindowFrame(), TR("Page setup"),
B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE |
B_AUTO_UPDATE_SIZE_LIMITS)
, fKind(kind)
, fDefaultPrinter(defaultPrinter)
@@ -117,7 +123,7 @@
PrinterForMimeType();
if (kind == kJobSetup)
- SetTitle("Print setup");
+ SetTitle(TR("Print setup"));
BView* panel = new BBox(Bounds(), "temporary", B_FOLLOW_ALL,
B_WILL_DRAW);
AddChild(panel);
@@ -125,27 +131,27 @@
BRect dummyRect(0, 0, 1, 1);
// print selection pop up menu
- BPopUpMenu* menu = new BPopUpMenu("Select a printer");
+ BPopUpMenu* menu = new BPopUpMenu(TR("Select a printer"));
SetupPrintersMenu(menu);
- fPrinters = new BMenuField("Printer:", menu, NULL);
+ fPrinters = new BMenuField(TR("Printer:"), menu, NULL);
// page format button
- fPageSetup = AddPictureButton(panel, dummyRect, "Page format",
"PAGE_SETUP_ON",
+ fPageSetup = AddPictureButton(panel, dummyRect, "Paper setup",
"PAGE_SETUP_ON",
"PAGE_SETUP_OFF", MSG_PAGE_SETUP);
// add description to button
- BStringView *pageFormatTitle = new BStringView("pageFormatTitle",
"Paper setup:");
- fPageFormatText = new BStringView("pageFormatText", "");
+ BStringView *pageFormatTitle = new BStringView("paperSetupTitle",
TR("Paper setup:"));
+ fPageFormatText = new BStringView("paperSetupText", "");
// page selection button
fJobSetup = NULL;
BStringView* jobSetupTitle = NULL;
if (kind == kJobSetup) {
- fJobSetup = AddPictureButton(panel, dummyRect, "Page
selection", "JOB_SETUP_ON",
+ fJobSetup = AddPictureButton(panel, dummyRect, "Page setup",
"JOB_SETUP_ON",
"JOB_SETUP_OFF", MSG_JOB_SETUP);
// add description to button
- jobSetupTitle = new BStringView("jobSetupTitle", "Pages to
print:");
+ jobSetupTitle = new BStringView("jobSetupTitle", TR("Page
setup:"));
fJobSetupText = new BStringView("jobSetupText", "");
}
@@ -154,9 +160,9 @@
separator->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, 1));
// Cancel & OK button
- BButton* cancel = new BButton(dummyRect, "Cancel", "Cancel",
+ BButton* cancel = new BButton(dummyRect, "Cancel", TR("Cancel"),
new BMessage(B_QUIT_REQUESTED));
- fOk = new BButton(dummyRect, "OK", "OK", new BMessage(MSG_OK));
+ fOk = new BButton(dummyRect, "OK", TR("OK"), new BMessage(MSG_OK));
RemoveChild(panel);
@@ -270,7 +276,7 @@
static const char*
kAbout =
"Printer server\n"
-"© 2001-2009 Haiku\n"
+"© 2001-2010 Haiku, Inc.\n"
"\n"
"\tIthamar R. Adema\n"
"\tMichael Pfeiffer\n"
@@ -280,7 +286,7 @@
void
ConfigWindow::AboutRequested()
{
- BAlert *about = new BAlert("About printer server", kAbout, "OK");
+ BAlert *about = new BAlert("About printer server", kAbout, TR("OK"));
about->Go();
}
@@ -440,10 +446,10 @@
fPageSetup->SetEnabled(false);
if (fJobSetup) {
fJobSetup->SetEnabled(false);
- fJobSetupText->SetText("Undefined job settings");
+ fJobSetupText->SetText(TR("Undefined"));
}
fOk->SetEnabled(false);
- fPageFormatText->SetText("Undefined paper format");
+ fPageFormatText->SetText(TR("Undefined"));
} else {
fPageSetup->SetEnabled(true);
@@ -462,11 +468,11 @@
int32 orientation = 0;
fPageSettings.FindInt32(PSRV_FIELD_ORIENTATION,
&orientation);
if (orientation == 0)
- pageFormat << ", Portrait";
+ pageFormat << ", " << TR("Portrait");
else
- pageFormat << ", Landscape";
+ pageFormat << ", " << TR("Landscape");
} else {
- pageFormat << "Undefined paper format";
+ pageFormat << TR("Undefined");
}
fPageFormatText->SetText(pageFormat.String());
@@ -477,17 +483,17 @@
if (fJobSettings.FindInt32(PSRV_FIELD_FIRST_PAGE,
&first) == B_OK &&
fJobSettings.FindInt32(PSRV_FIELD_LAST_PAGE,
&last) == B_OK) {
if (first >= 1 && first <= last && last !=
INT_MAX) {
- job << "From page " << first << " to "
<< last;
+ job << TR("Page") << " " << first << "
" << TR("to") << " " << last;
} else {
- job << "All pages";
+ job << TR("All pages");
}
int32 copies;
if (fJobSettings.FindInt32(PSRV_FIELD_COPIES,
&copies)
== B_OK && copies > 1) {
- job << ", " << copies << " copies";
+ job << ", " << copies << " " <<
TR("copies");
}
} else {
- job << "Undefined job settings";
+ job << TR("Undefined");
}
fJobSetupText->SetText(job.String());
}
Modified: haiku/trunk/src/servers/print/Jamfile
===================================================================
--- haiku/trunk/src/servers/print/Jamfile 2010-02-27 19:34:48 UTC (rev
35638)
+++ haiku/trunk/src/servers/print/Jamfile 2010-02-27 19:40:39 UTC (rev
35639)
@@ -24,7 +24,20 @@
be
root
translation
+ liblocale.so
libprint.a
libprintutils.a
$(TARGET_LIBSUPC++)
;
+
+DoCatalogs print_server :
+ x-vnd.Be-PSRV
+ :
+ ConfigWindow.cpp
+ PrintServerApp.cpp
+ PrintServerApp.R5.cpp
+ :
+ en.catalog
+ :
+ de.catkeys
+ ;
\ No newline at end of file
Modified: haiku/trunk/src/servers/print/PrintServerApp.R5.cpp
===================================================================
--- haiku/trunk/src/servers/print/PrintServerApp.R5.cpp 2010-02-27 19:34:48 UTC
(rev 35638)
+++ haiku/trunk/src/servers/print/PrintServerApp.R5.cpp 2010-02-27 19:40:39 UTC
(rev 35639)
@@ -15,8 +15,14 @@
// BeOS API
#include <Alert.h>
#include <Autolock.h>
+#include <Catalog.h>
#include <PrintJob.h>
+
+#undef TR_CONTEXT
+#define TR_CONTEXT "PrintServerApp"
+
+
struct AsyncThreadParams {
PrintServerApp* app;
Printer* printer;
@@ -77,12 +83,14 @@
// If no default printer is set, give
user
// choice of aborting or setting up a
printer
int32 count = Printer::CountPrinters();
- BString alertText("There are no
printers set up. ");
+ BString alertText(TR("There are no
printers set up."));
if (count > 0)
- alertText.SetTo("There is no
default printer set up. ");
+ alertText.SetTo(TR("There is no
default printer set up."));
- BAlert* alert = new BAlert("Info",
alertText.Append("Would "
- "you like to set one up
now?").String(), "No", "Yes");
+ alertText.Append(" ");
+ alertText.Append(TR("Would you like to
set one up now?"));
+ BAlert* alert = new BAlert("Info",
alertText.String(),
+ TR("No"), TR("Yes"));
if (alert->Go() == 1) {
if (count == 0)
run_add_printer_panel();
@@ -122,9 +130,10 @@
driverName.String(),
connection.String(),
transportName.String(),
transportPath.String()) == B_OK) {
// If printer was created ok,
ask if it needs to be the default
- BString text("Would you like to
make @ the default printer?");
+ BString text(TR("Would you like
to make @ the default printer?"));
text.ReplaceFirst("@",
printerName.String());
- BAlert* alert = new BAlert("",
text.String(), "No", "Yes");
+ BAlert* alert = new BAlert("",
text.String(), TR("No"),
+ TR("Yes"));
if (alert->Go() == 1)
p->app->SelectPrinter(printerName.String());
}
Modified: haiku/trunk/src/servers/print/PrintServerApp.cpp
===================================================================
--- haiku/trunk/src/servers/print/PrintServerApp.cpp 2010-02-27 19:34:48 UTC
(rev 35638)
+++ haiku/trunk/src/servers/print/PrintServerApp.cpp 2010-02-27 19:40:39 UTC
(rev 35639)
@@ -16,10 +16,12 @@
// BeOS API
#include <Alert.h>
#include <Autolock.h>
+#include <Catalog.h>
#include <Directory.h>
#include <File.h>
+#include <FindDirectory.h>
#include <image.h>
-#include <FindDirectory.h>
+#include <Locale.h>
#include <Mime.h>
#include <NodeInfo.h>
#include <NodeMonitor.h>
@@ -34,6 +36,11 @@
#include <unistd.h>
// for unlink
+
+#undef TR_CONTEXT
+#define TR_CONTEXT "PrintServerApp"
+
+
BLocker *gLock = NULL;
// ---------------------------------------------------------------
@@ -87,6 +94,7 @@
fUseConfigWindow(true),
fFolder(NULL)
{
+ be_locale->GetAppCatalog(&fCatalog);
fSettings = Settings::GetSettings();
LoadSettings();
@@ -416,16 +424,14 @@
// the printer exists, but no default at all
return B_OK;
} else {
- info.SetTo("There already exists an printer you
are going to"
- " create, but it's driver could not be
found! Replace?");
+ info.SetTo(TR("There already exists a printer
you are going to create, but it's driver could not be found! Replace?"));
}
} else {
- info.SetTo("There already exists an printer you are
going to"
- " create, but it's not usable at all!
Replace?");
+ info.SetTo(TR("There already exists a printer you are
going to create, but it's not usable at all! Replace?"));
}
if (info.Length() != 0) {
- BAlert *alert = new BAlert("Info", info.String(),
"Cancel", "OK");
+ BAlert *alert = new BAlert("Info", info.String(),
TR("Cancel"), TR("OK"));
alert->SetShortcut(0, B_ESCAPE);
if (alert->Go() == 0)
return rc;
Modified: haiku/trunk/src/servers/print/PrintServerApp.h
===================================================================
--- haiku/trunk/src/servers/print/PrintServerApp.h 2010-02-27 19:34:48 UTC
(rev 35638)
+++ haiku/trunk/src/servers/print/PrintServerApp.h 2010-02-27 19:40:39 UTC
(rev 35639)
@@ -11,6 +11,7 @@
#include <Application.h>
#include <Bitmap.h>
+#include <Catalog.h>
#include <OS.h>
#include <String.h>
@@ -94,7 +95,7 @@
Settings *fSettings;
bool fUseConfigWindow;
FolderWatcher *fFolder;
-
+ BCatalog fCatalog;
};
#endif
Other related posts:
- » [haiku-commits] r35639 - in haiku/trunk: data/catalogs data/catalogs/servers data/catalogs/servers/print src/servers/print - michael . w . pfeiffer
