[haiku-commits] r40930 - in haiku/trunk: data/catalogs/apps/deskcalc headers/os/locale src/apps/deskcalc
- From: jonas@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 13 Mar 2011 18:29:11 +0100 (CET)
Author: kirilla
Date: 2011-03-13 18:29:10 +0100 (Sun, 13 Mar 2011)
New Revision: 40930
Changeset: http://dev.haiku-os.org/changeset/40930
Modified:
haiku/trunk/data/catalogs/apps/deskcalc/sv.catkeys
haiku/trunk/headers/os/locale/Catalog.h
haiku/trunk/src/apps/deskcalc/CalcWindow.cpp
haiku/trunk/src/apps/deskcalc/DeskCalc.rdef
Log:
Introducing a catalog app name context, related macros, and making use of this
in DeskCalc.
Modified: haiku/trunk/data/catalogs/apps/deskcalc/sv.catkeys
===================================================================
--- haiku/trunk/data/catalogs/apps/deskcalc/sv.catkeys 2011-03-13 15:48:52 UTC
(rev 40929)
+++ haiku/trunk/data/catalogs/apps/deskcalc/sv.catkeys 2011-03-13 17:29:10 UTC
(rev 40930)
@@ -1,7 +1,7 @@
-1 swedish x-vnd.Haiku-DeskCalc 3960407498
+1 swedish x-vnd.Haiku-DeskCalc 168574347
About DeskCalc… CalcView Om Kalkylatorn...
Audio Feedback CalcView Knappljud
-DeskCalc Window Kalkylatorn
+DeskCalc Application name Kalkylatorn
DeskCalc v2.1.0\n\nwritten by Timothy Wayper,\nStephan Aßmus and Ingo
Weinhold\n\n©1997, 1998 R3 Software Ltd.\n©2006-2009 Haiku, Inc.\n\nAll Rights
Reserved. CalcView Kalkylatorn v2.1.0\n\nskrivet av Timothy
Wayper,\nStephan Aßmus och Ingo Weinhold\n\n©1997, 1998 R3 Software
Ltd.\n©2006-2009 Haiku, Inc.\n\nAll Rights Reserved.
Enable Num Lock on startup CalcView Aktivera Num Lock vid
start
Show keypad CalcView Visa tangenter
Modified: haiku/trunk/headers/os/locale/Catalog.h
===================================================================
--- haiku/trunk/headers/os/locale/Catalog.h 2011-03-13 15:48:52 UTC (rev
40929)
+++ haiku/trunk/headers/os/locale/Catalog.h 2011-03-13 17:29:10 UTC (rev
40930)
@@ -63,6 +63,10 @@
};
+#undef B_TRANSLATE_APP_NAME_CONTEXT
+#define B_TRANSLATE_APP_NAME_CONTEXT "Application name"
+
+
#ifndef B_COLLECTING_CATKEYS
#ifndef B_AVOID_TRANSLATION_MACROS
@@ -96,6 +100,11 @@
BLocaleRoster::Default()->GetCatalog()->GetString((string), \
B_TRANSLATE_CONTEXT)
+#undef B_TRANSLATE_APP_NAME
+#define B_TRANSLATE_APP_NAME(string) \
+ BLocaleRoster::Default()->GetCatalog()->GetString((string), \
+ B_TRANSLATE_APP_NAME_CONTEXT)
+
#undef B_TRANSLATE_WITH_CONTEXT
#define B_TRANSLATE_WITH_CONTEXT(string, context) \
BLocaleRoster::Default()->GetCatalog()->GetString((string), (context))
@@ -153,6 +162,10 @@
#define B_TRANSLATE_MARK_ID(id) \
BCatalogAddOn::MarkForTranslation((id))
+#undef B_TRANSLATE_MARK_APP_NAME
+#define B_TRANSLATE_MARK_APP_NAME(str) \
+ BCatalogAddOn::MarkForTranslation((str), B_TRANSLATE_APP_NAME_CONTEXT,
"")
+
// Translation macros which do not let collectcatkeys try to collect the key
// (useful in combination with the marking macros above):
#undef B_TRANSLATE_NOCOLLECT
@@ -186,6 +199,10 @@
#define B_TRANSLATE(string) \
B_CATKEY((string), B_TRANSLATE_CONTEXT)
+#undef B_TRANSLATE_APP_NAME
+#define B_TRANSLATE_APP_NAME(string) \
+ B_CATKEY((string), B_TRANSLATE_APP_NAME_CONTEXT)
+
#undef B_TRANSLATE_WITH_CONTEXT
#define B_TRANSLATE_WITH_CONTEXT(string, context) \
B_CATKEY((string), (context))
@@ -218,6 +235,10 @@
#define B_TRANSLATE_MARK_ID(id) \
B_CATKEY((id))
+#undef B_TRANSLATE_MARK_APP_NAME
+#define B_TRANSLATE_MARK_APP_NAME(str) \
+ B_CATKEY((str), B_TRANSLATE_APP_NAME_CONTEXT, "")
+
#undef B_TRANSLATE_NOCOLLECT
#define B_TRANSLATE_NOCOLLECT(str) \
(void)
Modified: haiku/trunk/src/apps/deskcalc/CalcWindow.cpp
===================================================================
--- haiku/trunk/src/apps/deskcalc/CalcWindow.cpp 2011-03-13 15:48:52 UTC
(rev 40929)
+++ haiku/trunk/src/apps/deskcalc/CalcWindow.cpp 2011-03-13 17:29:10 UTC
(rev 40930)
@@ -27,7 +27,8 @@
CalcWindow::CalcWindow(BRect frame, BMessage* settings)
- : BWindow(frame, B_TRANSLATE("DeskCalc"), B_TITLED_WINDOW,
B_ASYNCHRONOUS_CONTROLS)
+ : BWindow(frame, B_TRANSLATE_APP_NAME("DeskCalc"), B_TITLED_WINDOW,
+ B_ASYNCHRONOUS_CONTROLS)
{
// create calculator view with calculator description and
// desktop background color
Modified: haiku/trunk/src/apps/deskcalc/DeskCalc.rdef
===================================================================
--- haiku/trunk/src/apps/deskcalc/DeskCalc.rdef 2011-03-13 15:48:52 UTC (rev
40929)
+++ haiku/trunk/src/apps/deskcalc/DeskCalc.rdef 2011-03-13 17:29:10 UTC (rev
40930)
@@ -1,7 +1,7 @@
resource app_signature "application/x-vnd.Haiku-DeskCalc";
-resource app_name_catalog_entry "x-vnd.Haiku-DeskCalc:Window:DeskCalc";
+resource app_name_catalog_entry "x-vnd.Haiku-DeskCalc:Application
name:DeskCalc";
resource app_version {
major = 2,
Other related posts:
- » [haiku-commits] r40930 - in haiku/trunk: data/catalogs/apps/deskcalc headers/os/locale src/apps/deskcalc - jonas
