From 0d351a02b4920370b543a506dfd38f0af7db5631 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Wed, 19 Sep 2012 15:24:42 -0400
Subject: Import upstream version 12.10.3

---
 ChangeLog | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 864babb..59cdff4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,64 @@
 # Generated by Makefile. Do not edit.
 
+2012-09-19  Charles Kerr  <charles.kerr@canonical.com>
+
+	12.10.3
+
+2012-09-19  Charles Kerr  <charles.kerr@canonical.com>
+
+	Don't unconditionally show the user menuitems -- let dbusmenu's code process the menuitem's VISIBLE property. Fixes: https://bugs.launchpad.net/bugs/1049902. Approved by Lars Uebernickel, jenkins.
+
+2012-09-18  Charles Kerr  <charles.kerr@canonical.com>
+
+	don't unconditionally show the user menuitems ... let dbusmenu's code process the menuitem's VISIBLE property
+
+2012-09-18  Charles Kerr  <charles.kerr@canonical.com>
+
+	Use `shut down' instead of `switch off' as the default shutdown text (fixes bug #1029036). Fixes: https://bugs.launchpad.net/bugs/1029036. Approved by Ted Gould, jenkins.
+
+2012-09-18  Charles Kerr  <charles.kerr@canonical.com>
+
+	add AM_V_GEN to the gdbus-codegen invocation for prettier silent-rules invocation
+
+2012-09-18  Charles Kerr  <charles.kerr@canonical.com>
+
+	Still using 'switch off' instead of 'shut down' in the default text in session-menu-mgr.c
+
+2012-09-13  Lars Uebernickel  <lars.uebernickel@canonical.com>
+
+	If the system menu's icon is missing in the current theme, fall back to gtk-missing-icon instead of showing no icon at all.. Fixes: https://bugs.launchpad.net/bugs/1048348. Approved by Charles Kerr, jenkins.
+
+2012-09-13  Lars Uebernickel  <lars.uebernickel@canonical.com>
+
+	Change fallback icon to "gtk-missing-image"
+
+2012-09-13  Xiao-Long Chen  <chillermillerlong@hotmail.com>
+
+	Add fallback to "system-shutdown" icon
+	
+	Thanks Xiao-Long!
+
+2012-09-13  Lars Uebernickel  <lars.uebernickel@canonical.com>
+
+	Make suspend translatable
+
+2012-09-13  Didier Roche  <didier.roche@canonical.com>
+
+	make Suspend translatable
+
+2012-09-12  Steve Langasek  <steve.langasek@canonical.com>
+
+	Fix strings to ensure en_US are used in proper locations. Fixes: https://bugs.launchpad.net/bugs/1029036. Approved by Ted Gould.
+
+2012-09-12  Steve Langasek  <steve.langasek@canonical.com>
+
+	Fix up the commonwealth translations for 'Shut Down' to reflect the consensus.
+
+2012-09-12  Steve Langasek  <steve.langasek@canonical.com>
+
+	Revert en_GB localization to 'Switch Off'; this needs to be done in the
+	translation, with the UI kept in en_US.
+
 2012-08-31  Charles Kerr  <charles.kerr@canonical.com>
 
 	add gtest-dbus-helper.h to test_service_SOURCES s.t. it gets bundled in the tarball
-- 
cgit v1.2.3