merge
authorfturovic <frank.turovich@nokia.com>
Thu, 18 Jun 2009 13:37:35 -0500
changeset 269 70513efbca17
parent 268 d656b0e8e4e1 (diff)
parent 266 c7ecdd0b9f52 (current diff)
child 270 bdbf5913d572
merge
--- a/core/com.nokia.carbide.cpp.doc.user/book.css	Thu Jun 18 12:28:11 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/book.css	Thu Jun 18 13:37:35 2009 -0500
@@ -99,7 +99,7 @@
 	
 /*	20070522-replaced gray with green background to match gradiant color for title	*/
 th	{
-	background-color:#FDDD1F;	/* background-color:#acd79b;
+	background-color:#FDCD2F;	/* background-color:#acd79b;
 	background-color:#999;
 	color:#FFF; */
 	}
--- a/debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/src/com/nokia/carbide/cpp/debug/kernelaware/ui/messages.properties	Thu Jun 18 12:28:11 2009 -0500
+++ b/debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/src/com/nokia/carbide/cpp/debug/kernelaware/ui/messages.properties	Thu Jun 18 13:37:35 2009 -0500
@@ -1,40 +1,40 @@
-SymbianOSView.OverViewToolTip=Hierarchical Overview of Kernel Objects
-SymbianOSView.OverViewLabel=Overview
-SymbianOSView.ProcessesToolTip=Symbian OS Target Processes
-SymbianOSView.ProcessesLabel=Processes
-SymbianOSView.ThreadsToolTip=Symbian OS Target Threads
-SymbianOSView.ThreadsLabel=Threads
-SymbianOSView.ChunksToolTip=Symbian OS Target Thunks
-SymbianOSView.ChunksLabel=Chunks
-SymbianOSView.LibrariesToolTip=Symbian OS Target Libraries
-SymbianOSView.LibrariesLabel=Libraries
-SymbianOSView.RefreshDataTitle=Refresh Symbian OS Data
-SymbianOSView.RefreshActionLabel=Refresh
-SymbianOSView.RefreshActionToolTip=Refresh data in the View.
-SymbianOSView.AutoRefreshActionLabel=AutoRefresh
-SymbianOSView.AutoRefreshActionToolTip=Enable/disable auto-refresh of data in the view.
-SymbianOSView.DebugActionLabel=Debug
-SymbianOSView.DebugActionToolTip=Debug the selected process or thread.
-SymbianOSView.PropertiesActionLabel=Properties
-SymbianOSView.PropertiesActionToolTip=Show properties of the selected item.
-SymbianOSView.SetTimerActionLabel=Set Timer
-SymbianOSView.SetTimerActionToolTip=Set the timer for auto refresh. For run mode debugger only.
-SymbianOSView.CollapseAllActionLabel=Collapse All
-SymbianOSView.CollapseAllActionToolTip=Collapse all tree nodes in Overview tab.
-SymbianOSView.MessageTitle=Carbide.c++
-SymbianOSView.MessagePrefix=Symbian OS Data View:\n
-SymbianOSView.ProcessUnderDebugMsg=The process is already under debug.
-SymbianOSView.ThreadUnderDebugMsg=The thread is already under debug.
-SymbianOSView.DecimalError=Please input a decimal number.
-SymbianOSView.RangeError=Please input a number between 3 and 600.
-SymbianOSView.IntervalMessage=Time interval for auto refreshing data in Symbian OS View (3-600 seconds):
-SymbianOSView.LicenseError=License Manager did not verify
-SymbianOSView.LicenseMsg=FLEXlm error in checking out license for 
-OverviewTab.ProcessesLabel=Processes
-OverviewTab.LibrariesLabel=Libraries
-OverviewTab.ThreadsLabel=Threads
-OverviewTab.ChunksLabel=Chunks
-SymbianOSView.NameFilterLabel=Name Filter (*, ?, or camel case):
-SymbianOSView.NameFilterInitialText=type filter text
-SymbianOSView.NameFilterToolTip=Filter the visible items by name, using prefix, ? = any character, * = any string, or camel case initials
-SymbianOSView.ClearToolTip=Clear
+SymbianOSView.OverViewToolTip=Hierarchical Overview of Kernel Objects
+SymbianOSView.OverViewLabel=Overview
+SymbianOSView.ProcessesToolTip=Symbian OS Target Processes
+SymbianOSView.ProcessesLabel=Processes
+SymbianOSView.ThreadsToolTip=Symbian OS Target Threads
+SymbianOSView.ThreadsLabel=Threads
+SymbianOSView.ChunksToolTip=Symbian OS Target Chunks
+SymbianOSView.ChunksLabel=Chunks
+SymbianOSView.LibrariesToolTip=Symbian OS Target Libraries
+SymbianOSView.LibrariesLabel=Libraries
+SymbianOSView.RefreshDataTitle=Refresh Symbian OS Data
+SymbianOSView.RefreshActionLabel=Refresh
+SymbianOSView.RefreshActionToolTip=Refresh data in the View.
+SymbianOSView.AutoRefreshActionLabel=AutoRefresh
+SymbianOSView.AutoRefreshActionToolTip=Enable/disable auto-refresh of data in the view.
+SymbianOSView.DebugActionLabel=Debug
+SymbianOSView.DebugActionToolTip=Debug the selected process or thread.
+SymbianOSView.PropertiesActionLabel=Properties
+SymbianOSView.PropertiesActionToolTip=Show properties of the selected item.
+SymbianOSView.SetTimerActionLabel=Set Timer
+SymbianOSView.SetTimerActionToolTip=Set the timer for auto refresh. For run mode debugger only.
+SymbianOSView.CollapseAllActionLabel=Collapse All
+SymbianOSView.CollapseAllActionToolTip=Collapse all tree nodes in Overview tab.
+SymbianOSView.MessageTitle=Carbide.c++
+SymbianOSView.MessagePrefix=Symbian OS Data View:\n
+SymbianOSView.ProcessUnderDebugMsg=The process is already under debug.
+SymbianOSView.ThreadUnderDebugMsg=The thread is already under debug.
+SymbianOSView.DecimalError=Please input a decimal number.
+SymbianOSView.RangeError=Please input a number between 3 and 600.
+SymbianOSView.IntervalMessage=Time interval for auto refreshing data in Symbian OS View (3-600 seconds):
+SymbianOSView.LicenseError=License Manager did not verify
+SymbianOSView.LicenseMsg=FLEXlm error in checking out license for 
+OverviewTab.ProcessesLabel=Processes
+OverviewTab.LibrariesLabel=Libraries
+OverviewTab.ThreadsLabel=Threads
+OverviewTab.ChunksLabel=Chunks
+SymbianOSView.NameFilterLabel=Name Filter (*, ?, or camel case):
+SymbianOSView.NameFilterInitialText=type filter text
+SymbianOSView.NameFilterToolTip=Filter the visible items by name, using prefix, ? = any character, * = any string, or camel case initials
+SymbianOSView.ClearToolTip=Clear