diff --git a/DEPS b/DEPS
index 2799dfd..a56b238 100755
--- a/DEPS
+++ b/DEPS
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,7 @@
   "breakpad_revision": "892",
   "cygwin_in_chromium_revision": "66844",
   "gtest_revision": "484",
-  "gyp_revision": "1034",
+  "gyp_revision": "1167",
   "jsoncpp_revision": "230",
   "memory_watcher_in_chromium_revision": "81926",
   "protobuf_revision": "375",
diff --git a/base/base.gyp b/base/base.gyp
index 09fbd1b..aff587c 100755
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/base/base.h b/base/base.h
index 92a3424..c299ea6 100755
--- a/base/base.h
+++ b/base/base.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/base_test.gyp b/base/base_test.gyp
index 9a2a3da..5d4decb 100755
--- a/base/base_test.gyp
+++ b/base/base_test.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/base/bitarray.h b/base/bitarray.h
index 81b4004..0f2a183 100755
--- a/base/bitarray.h
+++ b/base/bitarray.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/bitarray_test.cc b/base/bitarray_test.cc
index 67f25f6..62a604a 100755
--- a/base/bitarray_test.cc
+++ b/base/bitarray_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/clock_mock.cc b/base/clock_mock.cc
index b320edd..b18e313 100755
--- a/base/clock_mock.cc
+++ b/base/clock_mock.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/clock_mock.h b/base/clock_mock.h
index 7e8577c..1b42063 100755
--- a/base/clock_mock.h
+++ b/base/clock_mock.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/clock_mock_test.cc b/base/clock_mock_test.cc
index 45504e6..5694635 100755
--- a/base/clock_mock_test.cc
+++ b/base/clock_mock_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/config_file_stream.cc b/base/config_file_stream.cc
index 9a42ef5..4dd017b 100755
--- a/base/config_file_stream.cc
+++ b/base/config_file_stream.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/config_file_stream.h b/base/config_file_stream.h
index 0faf76c..367ff4b 100755
--- a/base/config_file_stream.h
+++ b/base/config_file_stream.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/config_file_stream_test.cc b/base/config_file_stream_test.cc
index f3637a0..5e5a8c3 100755
--- a/base/config_file_stream_test.cc
+++ b/base/config_file_stream_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/const.h b/base/const.h
index 67e5b7a..e2ffc94 100755
--- a/base/const.h
+++ b/base/const.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/coordinates.h b/base/coordinates.h
index 188f9fa..9892b15 100755
--- a/base/coordinates.h
+++ b/base/coordinates.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/cpu_stats.cc b/base/cpu_stats.cc
index ef7ee3d..e915b35 100755
--- a/base/cpu_stats.cc
+++ b/base/cpu_stats.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/cpu_stats.h b/base/cpu_stats.h
index ce1920d..1576088 100755
--- a/base/cpu_stats.h
+++ b/base/cpu_stats.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/cpu_stats_main.cc b/base/cpu_stats_main.cc
index 8feab78..5e7c459 100755
--- a/base/cpu_stats_main.cc
+++ b/base/cpu_stats_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/cpu_stats_test.cc b/base/cpu_stats_test.cc
index 091d347..ab7f805 100755
--- a/base/cpu_stats_test.cc
+++ b/base/cpu_stats_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/crash_report_handler.cc b/base/crash_report_handler.cc
index 1fa222c..11da220 100755
--- a/base/crash_report_handler.cc
+++ b/base/crash_report_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/crash_report_handler.h b/base/crash_report_handler.h
index 07e62b8..7946879 100755
--- a/base/crash_report_handler.h
+++ b/base/crash_report_handler.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/crash_report_handler.mm b/base/crash_report_handler.mm
index 85a20af..e2f0e57 100755
--- a/base/crash_report_handler.mm
+++ b/base/crash_report_handler.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/crash_report_util.cc b/base/crash_report_util.cc
index 75436b2..260f455 100755
--- a/base/crash_report_util.cc
+++ b/base/crash_report_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/crash_report_util.h b/base/crash_report_util.h
index 8a4709c..06487e1 100755
--- a/base/crash_report_util.h
+++ b/base/crash_report_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/crash_report_util_test.cc b/base/crash_report_util_test.cc
index 4eddef0..7878ed2 100755
--- a/base/crash_report_util_test.cc
+++ b/base/crash_report_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/encryptor.cc b/base/encryptor.cc
index eaef875..c4fe369 100755
--- a/base/encryptor.cc
+++ b/base/encryptor.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/encryptor.h b/base/encryptor.h
index 07f79b6..9008814 100755
--- a/base/encryptor.h
+++ b/base/encryptor.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/encryptor_main.cc b/base/encryptor_main.cc
index ba644e3..12b41f2 100755
--- a/base/encryptor_main.cc
+++ b/base/encryptor_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/encryptor_test.cc b/base/encryptor_test.cc
index cf2e097..e3d03f9 100755
--- a/base/encryptor_test.cc
+++ b/base/encryptor_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/file_stream.h b/base/file_stream.h
index d007053..c6355c1 100755
--- a/base/file_stream.h
+++ b/base/file_stream.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/flags.cc b/base/flags.cc
index a4ce2e2..ffee7ff 100755
--- a/base/flags.cc
+++ b/base/flags.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/flags.h b/base/flags.h
index 18b9c58..4b2004f 100755
--- a/base/flags.h
+++ b/base/flags.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/flags_test.cc b/base/flags_test.cc
index 16f51bd..14f2324 100755
--- a/base/flags_test.cc
+++ b/base/flags_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/freelist.h b/base/freelist.h
index f75ab24..c1e6454 100755
--- a/base/freelist.h
+++ b/base/freelist.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/gen_character_set.py b/base/gen_character_set.py
index 24ad952..d221e46 100755
--- a/base/gen_character_set.py
+++ b/base/gen_character_set.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/base/gen_config_file_stream_data_main.cc b/base/gen_config_file_stream_data_main.cc
index 1ef7bae..f8defc5 100755
--- a/base/gen_config_file_stream_data_main.cc
+++ b/base/gen_config_file_stream_data_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/hash.cc b/base/hash.cc
index e0b87c0..a062b1d 100755
--- a/base/hash.cc
+++ b/base/hash.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/hash_tables.h b/base/hash_tables.h
index b61da7f..53899d3 100755
--- a/base/hash_tables.h
+++ b/base/hash_tables.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/hash_tables_test.cc b/base/hash_tables_test.cc
index 1e80ee0..0aa7b81 100755
--- a/base/hash_tables_test.cc
+++ b/base/hash_tables_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/iconv.cc b/base/iconv.cc
index 79976b2..ee05938 100755
--- a/base/iconv.cc
+++ b/base/iconv.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/init.cc b/base/init.cc
index 4f0e0d1..733f83b 100755
--- a/base/init.cc
+++ b/base/init.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/init.h b/base/init.h
index f07289c..a194971 100755
--- a/base/init.h
+++ b/base/init.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/init_test.cc b/base/init_test.cc
index 0968880..46cb9b5 100755
--- a/base/init_test.cc
+++ b/base/init_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/japanese_util_rule.h b/base/japanese_util_rule.h
index 7b52c69..9b4b1ea 100755
--- a/base/japanese_util_rule.h
+++ b/base/japanese_util_rule.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/linked_ptr.h b/base/linked_ptr.h
index 8b1ac55..32c3ffc 100755
--- a/base/linked_ptr.h
+++ b/base/linked_ptr.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/logging.cc b/base/logging.cc
index 6acf323..ffeb703 100755
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/logging.h b/base/logging.h
index b60e971..9b93db2 100755
--- a/base/logging.h
+++ b/base/logging.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/logging_test.cc b/base/logging_test.cc
index 6db25be..f26e149 100755
--- a/base/logging_test.cc
+++ b/base/logging_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/mac_process.h b/base/mac_process.h
index 3400cf7..7512dcf 100755
--- a/base/mac_process.h
+++ b/base/mac_process.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/mac_process.mm b/base/mac_process.mm
index 313da4a..c015813 100755
--- a/base/mac_process.mm
+++ b/base/mac_process.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/mac_util.h b/base/mac_util.h
index c42566d..ede68c6 100755
--- a/base/mac_util.h
+++ b/base/mac_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/mac_util.mm b/base/mac_util.mm
index 3f41592..9235066 100755
--- a/base/mac_util.mm
+++ b/base/mac_util.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/mac_util_main.cc b/base/mac_util_main.cc
index 9138563..23cb2b1 100755
--- a/base/mac_util_main.cc
+++ b/base/mac_util_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/mmap.h b/base/mmap.h
index f16d5e5..567b47c 100755
--- a/base/mmap.h
+++ b/base/mmap.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/mmap_test.cc b/base/mmap_test.cc
index 1cf5cae..582e58b 100755
--- a/base/mmap_test.cc
+++ b/base/mmap_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/multifile.h b/base/multifile.h
index 0553abf..666f283 100755
--- a/base/multifile.h
+++ b/base/multifile.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/multifile_test.cc b/base/multifile_test.cc
index 6fe000d..ab1325f 100755
--- a/base/multifile_test.cc
+++ b/base/multifile_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/mutex.cc b/base/mutex.cc
index 433d954..14c110f 100755
--- a/base/mutex.cc
+++ b/base/mutex.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/mutex.h b/base/mutex.h
index 5af82b9..7bbcfb3 100755
--- a/base/mutex.h
+++ b/base/mutex.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/mutex_test.cc b/base/mutex_test.cc
index d499c5d..e3a0ea0 100755
--- a/base/mutex_test.cc
+++ b/base/mutex_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/namespace.h b/base/namespace.h
index 7becd1d..7b6274a 100755
--- a/base/namespace.h
+++ b/base/namespace.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/password_manager.cc b/base/password_manager.cc
index cf0b422..aa8b6b4 100755
--- a/base/password_manager.cc
+++ b/base/password_manager.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/password_manager.h b/base/password_manager.h
index c6c8068..ce37ad6 100755
--- a/base/password_manager.h
+++ b/base/password_manager.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/password_manager_main.cc b/base/password_manager_main.cc
index 740db67..4677e15 100755
--- a/base/password_manager_main.cc
+++ b/base/password_manager_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/password_manager_test.cc b/base/password_manager_test.cc
index ea4f485..87a2b49 100755
--- a/base/password_manager_test.cc
+++ b/base/password_manager_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/port.h b/base/port.h
index 2ddcddb..e15b489 100755
--- a/base/port.h
+++ b/base/port.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/process.cc b/base/process.cc
index c230b31..51eae95 100755
--- a/base/process.cc
+++ b/base/process.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/process.h b/base/process.h
index d7c9880..1de0c83 100755
--- a/base/process.h
+++ b/base/process.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/process_main.cc b/base/process_main.cc
index 032d70a..2161c5d 100755
--- a/base/process_main.cc
+++ b/base/process_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/process_mutex.cc b/base/process_mutex.cc
index 46030a2..ac852db 100755
--- a/base/process_mutex.cc
+++ b/base/process_mutex.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -36,6 +36,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #endif
 
 #include <map>
diff --git a/base/process_mutex.h b/base/process_mutex.h
index 4866925..ea0aa1d 100755
--- a/base/process_mutex.h
+++ b/base/process_mutex.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/process_mutex_main.cc b/base/process_mutex_main.cc
index ff5e5bb..049442c 100755
--- a/base/process_mutex_main.cc
+++ b/base/process_mutex_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/process_mutex_test.cc b/base/process_mutex_test.cc
index 7401808..27628bc 100755
--- a/base/process_mutex_test.cc
+++ b/base/process_mutex_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/protobuf/descriptor.h b/base/protobuf/descriptor.h
index 559f6d2..b6fb478 100755
--- a/base/protobuf/descriptor.h
+++ b/base/protobuf/descriptor.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/protobuf/message.h b/base/protobuf/message.h
index 1cb3b51..8249eef 100755
--- a/base/protobuf/message.h
+++ b/base/protobuf/message.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/protobuf/protobuf.h b/base/protobuf/protobuf.h
index 1c637f8..e890bee 100755
--- a/base/protobuf/protobuf.h
+++ b/base/protobuf/protobuf.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/protobuf/repeated_field.h b/base/protobuf/repeated_field.h
index 33b3a2b..c17f3ed 100755
--- a/base/protobuf/repeated_field.h
+++ b/base/protobuf/repeated_field.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/protobuf/text_format.h b/base/protobuf/text_format.h
index e2a7ca7..f14b630 100755
--- a/base/protobuf/text_format.h
+++ b/base/protobuf/text_format.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/protobuf/zero_copy_stream_impl.h b/base/protobuf/zero_copy_stream_impl.h
index 3eb6fca..3e1a80d 100755
--- a/base/protobuf/zero_copy_stream_impl.h
+++ b/base/protobuf/zero_copy_stream_impl.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/run_level.cc b/base/run_level.cc
index cd7a42b..3523b04 100755
--- a/base/run_level.cc
+++ b/base/run_level.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/run_level.h b/base/run_level.h
index f2309e4..7638873 100755
--- a/base/run_level.h
+++ b/base/run_level.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/run_level_main.cc b/base/run_level_main.cc
index de2c98f..331e392 100755
--- a/base/run_level_main.cc
+++ b/base/run_level_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/scheduler.cc b/base/scheduler.cc
index c9f3f90..295c739 100755
--- a/base/scheduler.cc
+++ b/base/scheduler.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/scheduler.h b/base/scheduler.h
index 27649f5..8df0b2f 100755
--- a/base/scheduler.h
+++ b/base/scheduler.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/scheduler_test.cc b/base/scheduler_test.cc
index 5558314..277d072 100755
--- a/base/scheduler_test.cc
+++ b/base/scheduler_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/scoped_cftyperef.h b/base/scoped_cftyperef.h
index 116ee28..2665f57 100755
--- a/base/scoped_cftyperef.h
+++ b/base/scoped_cftyperef.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/scoped_handle.h b/base/scoped_handle.h
index 88ab6c0..9501cd7 100755
--- a/base/scoped_handle.h
+++ b/base/scoped_handle.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/scoped_nsobject.h b/base/scoped_nsobject.h
index 3b2d0af..f0caf46 100755
--- a/base/scoped_nsobject.h
+++ b/base/scoped_nsobject.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/scoped_ptr.h b/base/scoped_ptr.h
index 0f0ea60..0bf4858 100755
--- a/base/scoped_ptr.h
+++ b/base/scoped_ptr.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/singleton.cc b/base/singleton.cc
index 8804c38..f69ca14 100755
--- a/base/singleton.cc
+++ b/base/singleton.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/singleton.h b/base/singleton.h
index 41486cb..1dc2255 100755
--- a/base/singleton.h
+++ b/base/singleton.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/singleton_test.cc b/base/singleton_test.cc
index 7abe088..ef35981 100755
--- a/base/singleton_test.cc
+++ b/base/singleton_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/stl_util.h b/base/stl_util.h
index 0a8bacc..03c30b1 100755
--- a/base/stl_util.h
+++ b/base/stl_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/stl_util_test.cc b/base/stl_util_test.cc
index 149e569..36b6f3a 100755
--- a/base/stl_util_test.cc
+++ b/base/stl_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/stopwatch.cc b/base/stopwatch.cc
index 15afad3..04edac3 100755
--- a/base/stopwatch.cc
+++ b/base/stopwatch.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/stopwatch.h b/base/stopwatch.h
index 5bc18aa..bd27343 100755
--- a/base/stopwatch.h
+++ b/base/stopwatch.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/stopwatch_main.cc b/base/stopwatch_main.cc
index 854c849..7d10c6d 100755
--- a/base/stopwatch_main.cc
+++ b/base/stopwatch_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/stopwatch_test.cc b/base/stopwatch_test.cc
index 4b8bc6e..c33f4cd 100755
--- a/base/stopwatch_test.cc
+++ b/base/stopwatch_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/svm.cc b/base/svm.cc
index 95122f0..e6c89bd 100755
--- a/base/svm.cc
+++ b/base/svm.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/svm.h b/base/svm.h
index b052262..e56b103 100755
--- a/base/svm.h
+++ b/base/svm.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/svm_test.cc b/base/svm_test.cc
index 2e1f590..b2705c0 100755
--- a/base/svm_test.cc
+++ b/base/svm_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/svmmodel2func.py b/base/svmmodel2func.py
index fe95a10..08f4e11 100755
--- a/base/svmmodel2func.py
+++ b/base/svmmodel2func.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/base/text_converter.cc b/base/text_converter.cc
index 2ab9b21..8da985a 100755
--- a/base/text_converter.cc
+++ b/base/text_converter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/text_converter.h b/base/text_converter.h
index 378fe6e..b6f6374 100755
--- a/base/text_converter.h
+++ b/base/text_converter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/text_converter_compiler.cc b/base/text_converter_compiler.cc
index 8f720f0..bc1324a 100755
--- a/base/text_converter_compiler.cc
+++ b/base/text_converter_compiler.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/text_normalizer.cc b/base/text_normalizer.cc
index f146c85..a178d92 100755
--- a/base/text_normalizer.cc
+++ b/base/text_normalizer.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/text_normalizer.h b/base/text_normalizer.h
index ef2f972..7469fc2 100755
--- a/base/text_normalizer.h
+++ b/base/text_normalizer.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/text_normalizer_test.cc b/base/text_normalizer_test.cc
index 4c5bac2..57fe76f 100755
--- a/base/text_normalizer_test.cc
+++ b/base/text_normalizer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/thread.h b/base/thread.h
index 681c3f6..25417e1 100755
--- a/base/thread.h
+++ b/base/thread.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/thread_test.cc b/base/thread_test.cc
index b1b8d51..fbe51f4 100755
--- a/base/thread_test.cc
+++ b/base/thread_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/timer.cc b/base/timer.cc
index 2c064c5..f76e632 100755
--- a/base/timer.cc
+++ b/base/timer.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/timer.h b/base/timer.h
index 18948f5..c8033c7 100755
--- a/base/timer.h
+++ b/base/timer.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/timer_main.cc b/base/timer_main.cc
index 636df8b..19a372c 100755
--- a/base/timer_main.cc
+++ b/base/timer_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/timer_test.cc b/base/timer_test.cc
index 52f3e27..c51ee56 100755
--- a/base/timer_test.cc
+++ b/base/timer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/unnamed_event.cc b/base/unnamed_event.cc
index 59e8a76..5e7fd80 100755
--- a/base/unnamed_event.cc
+++ b/base/unnamed_event.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/unnamed_event.h b/base/unnamed_event.h
index ef73106..39ef1d8 100755
--- a/base/unnamed_event.h
+++ b/base/unnamed_event.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/unnamed_event_test.cc b/base/unnamed_event_test.cc
index 3046213..240b30d 100755
--- a/base/unnamed_event_test.cc
+++ b/base/unnamed_event_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/update_checker.cc b/base/update_checker.cc
index 50e2f22..dec8088 100755
--- a/base/update_checker.cc
+++ b/base/update_checker.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/update_checker.h b/base/update_checker.h
index 0441cd2..96d1607 100755
--- a/base/update_checker.h
+++ b/base/update_checker.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/update_util.cc b/base/update_util.cc
index aa9c754..87efab2 100755
--- a/base/update_util.cc
+++ b/base/update_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/update_util.h b/base/update_util.h
index 92236c2..b073e39 100755
--- a/base/update_util.h
+++ b/base/update_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/update_util_test.cc b/base/update_util_test.cc
index ee197af..925cc52 100755
--- a/base/update_util_test.cc
+++ b/base/update_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/url.cc b/base/url.cc
index 113927f..be183b4 100755
--- a/base/url.cc
+++ b/base/url.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/url.h b/base/url.h
index e4a9504..ba160e8 100755
--- a/base/url.h
+++ b/base/url.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/url_test.cc b/base/url_test.cc
index 3ba0984..dadf33e 100755
--- a/base/url_test.cc
+++ b/base/url_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/util.cc b/base/util.cc
index cdb5e4b..24a7258 100755
--- a/base/util.cc
+++ b/base/util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/util.h b/base/util.h
index c2eac24..4e09fed 100755
--- a/base/util.h
+++ b/base/util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/util_test.cc b/base/util_test.cc
index 1db5eaa..c375a26 100755
--- a/base/util_test.cc
+++ b/base/util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/version.cc b/base/version.cc
index 2d15cdd..a8e94ad 100755
--- a/base/version.cc
+++ b/base/version.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/version.h b/base/version.h
index 0d6e1f6..7ef91ca 100755
--- a/base/version.h
+++ b/base/version.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/version_def_template.h b/base/version_def_template.h
index 82d7926..03f7cac 100755
--- a/base/version_def_template.h
+++ b/base/version_def_template.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/version_test.cc b/base/version_test.cc
index 4e3d08f..4ec1089 100755
--- a/base/version_test.cc
+++ b/base/version_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/win_sandbox.cc b/base/win_sandbox.cc
index 612ce28..25cabae 100755
--- a/base/win_sandbox.cc
+++ b/base/win_sandbox.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/win_sandbox.h b/base/win_sandbox.h
index 49cc2a0..d7232f8 100755
--- a/base/win_sandbox.h
+++ b/base/win_sandbox.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/win_sandbox_test.cc b/base/win_sandbox_test.cc
index 46c485c..d8c7fa7 100755
--- a/base/win_sandbox_test.cc
+++ b/base/win_sandbox_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/win_util.cc b/base/win_util.cc
index c9a5574..5a17288 100755
--- a/base/win_util.cc
+++ b/base/win_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/win_util.h b/base/win_util.h
index 07e3159..abc0064 100755
--- a/base/win_util.h
+++ b/base/win_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/base/winmain.h b/base/winmain.h
index 6be47e3..2ae650e 100755
--- a/base/winmain.h
+++ b/base/winmain.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/build_mozc.py b/build_mozc.py
index 30903ed..63c75e7 100755
--- a/build_mozc.py
+++ b/build_mozc.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -427,6 +427,17 @@
                     help='Use dynamically linked version of Qt. '
                     'Currently this flag is used only on Windows builds.')
 
+  parser.add_option('--enable_cloud_sync', action='store_true',
+                    dest='enable_cloud_sync')
+  parser.add_option('--disable_cloud_sync', action='store_false',
+                    dest='enable_cloud_sync',
+                    help='Intentionally enable or disable cloud sync feature '
+                    'with the CLOUD_SYNC macro defined in code. '
+                    '--enable_cloud_sync enables it, and --disable_cloud_sync '
+                    'disables it. If both options are not set, enables the '
+                    'cloud sync feature according to the target environment '
+                    'and branding.')
+
   # TODO(yukawa): Remove this option when Zinnia can be built on Windows with
   #               enabling Unicode.
   use_zinnia_default = True
@@ -607,6 +618,17 @@
     options.channel_dev = version.IsDevChannel()
   if options.channel_dev:
     command_line.extend(['-D', 'channel_dev=1'])
+
+  # Check whether --enable_cloud_sync or --disable_cloud_sync are set. If
+  # neither of them are set, enables the cloud sync feature according to the
+  # target platform and branding.
+  if options.enable_cloud_sync is None:
+    if options.branding == 'GoogleJapaneseInput' and (IsWindows() or IsMac()):
+      options.enable_cloud_sync = True
+    else:
+      options.enable_cloud_sync = False
+  command_line.extend(['-D', 'enable_cloud_sync=%s' %
+                       (1 if options.enable_cloud_sync else 0)])
 
   command_line.extend(['-D', 'target_platform=%s' % options.target_platform])
 
diff --git a/build_tools/__init__.py b/build_tools/__init__.py
index bad2197..feea8b6 100755
--- a/build_tools/__init__.py
+++ b/build_tools/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/build_tools/binary_size_checker.py b/build_tools/binary_size_checker.py
index 83b8752..c547466 100755
--- a/build_tools/binary_size_checker.py
+++ b/build_tools/binary_size_checker.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/build_tools/build_diskimage_mac.py b/build_tools/build_diskimage_mac.py
index cb60e02..d13cb79 100755
--- a/build_tools/build_diskimage_mac.py
+++ b/build_tools/build_diskimage_mac.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/build_tools/build_tools.gyp b/build_tools/build_tools.gyp
index 84194a0..0770ba3 100755
--- a/build_tools/build_tools.gyp
+++ b/build_tools/build_tools.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/build_tools/codesign_mac.py b/build_tools/codesign_mac.py
index e712de9..52d237e 100755
--- a/build_tools/codesign_mac.py
+++ b/build_tools/codesign_mac.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/build_tools/copy_file.py b/build_tools/copy_file.py
index 212d174..e914b36 100755
--- a/build_tools/copy_file.py
+++ b/build_tools/copy_file.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/build_tools/gen_win32_resource_header.py b/build_tools/gen_win32_resource_header.py
index 37eb6a7..d21dbf0 100755
--- a/build_tools/gen_win32_resource_header.py
+++ b/build_tools/gen_win32_resource_header.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/build_tools/mozc_version.py b/build_tools/mozc_version.py
index 04d644b..9f49021 100755
--- a/build_tools/mozc_version.py
+++ b/build_tools/mozc_version.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/build_tools/mozc_win32_resource_template.rc b/build_tools/mozc_win32_resource_template.rc
index 6b7286d..72f401f 100755
Binary files a/build_tools/mozc_win32_resource_template.rc and b/build_tools/mozc_win32_resource_template.rc differ
diff --git a/build_tools/primitive_tools/primitive_tools.gyp b/build_tools/primitive_tools/primitive_tools.gyp
index 1146d1c..038596c 100755
--- a/build_tools/primitive_tools/primitive_tools.gyp
+++ b/build_tools/primitive_tools/primitive_tools.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/build_tools/redirect.py b/build_tools/redirect.py
index 65078ad..3333bb5 100755
--- a/build_tools/redirect.py
+++ b/build_tools/redirect.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/build_tools/replace_version.py b/build_tools/replace_version.py
index ced83be..0ff485c 100755
--- a/build_tools/replace_version.py
+++ b/build_tools/replace_version.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/build_tools/run_after_chdir.py b/build_tools/run_after_chdir.py
index ad8450e..94bd0b3 100755
--- a/build_tools/run_after_chdir.py
+++ b/build_tools/run_after_chdir.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/build_tools/tweak_data.py b/build_tools/tweak_data.py
index f059799..eec83b9 100755
--- a/build_tools/tweak_data.py
+++ b/build_tools/tweak_data.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/build_tools/tweak_info_plist.py b/build_tools/tweak_info_plist.py
index 3f889c3..e569ba3 100755
--- a/build_tools/tweak_info_plist.py
+++ b/build_tools/tweak_info_plist.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/build_tools/tweak_info_plist_strings.py b/build_tools/tweak_info_plist_strings.py
index 6ab3246..01809c0 100755
--- a/build_tools/tweak_info_plist_strings.py
+++ b/build_tools/tweak_info_plist_strings.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/build_tools/tweak_macinstaller_script.py b/build_tools/tweak_macinstaller_script.py
index ffa6ed1..a507edf 100755
--- a/build_tools/tweak_macinstaller_script.py
+++ b/build_tools/tweak_macinstaller_script.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/build_tools/tweak_packproj.py b/build_tools/tweak_packproj.py
index a3f567f..67d942e 100755
--- a/build_tools/tweak_packproj.py
+++ b/build_tools/tweak_packproj.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/chrome/build_for_nacl.py b/chrome/build_for_nacl.py
index d1e09ba..1f88a51 100755
--- a/chrome/build_for_nacl.py
+++ b/chrome/build_for_nacl.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/chrome/chromeos/renderer/chromeos_renderer.gyp b/chrome/chromeos/renderer/chromeos_renderer.gyp
index 78c4b08..c5d8706 100755
--- a/chrome/chromeos/renderer/chromeos_renderer.gyp
+++ b/chrome/chromeos/renderer/chromeos_renderer.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/chrome/chromeos/renderer/litify_proto_file.py b/chrome/chromeos/renderer/litify_proto_file.py
index 087dfcd..a28e3f2 100755
--- a/chrome/chromeos/renderer/litify_proto_file.py
+++ b/chrome/chromeos/renderer/litify_proto_file.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/ascii_mode.js b/chrome/skk/ascii_mode.js
index 6d0d103..c51a113 100755
--- a/chrome/skk/ascii_mode.js
+++ b/chrome/skk/ascii_mode.js
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/composer.js b/chrome/skk/composer.js
index 7f5ec85..2ccc241 100755
--- a/chrome/skk/composer.js
+++ b/chrome/skk/composer.js
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/dict.js b/chrome/skk/dict.js
index 638ad5e..d66e1ff 100755
--- a/chrome/skk/dict.js
+++ b/chrome/skk/dict.js
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/history.js b/chrome/skk/history.js
index 201114c..954d3d0 100755
--- a/chrome/skk/history.js
+++ b/chrome/skk/history.js
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/ime.js b/chrome/skk/ime.js
index 15519dc..eda0fc9 100755
--- a/chrome/skk/ime.js
+++ b/chrome/skk/ime.js
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/ime_mode_interface.js b/chrome/skk/ime_mode_interface.js
index 7c6ed30..47e5996 100755
--- a/chrome/skk/ime_mode_interface.js
+++ b/chrome/skk/ime_mode_interface.js
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/kana_mode.js b/chrome/skk/kana_mode.js
index 55f3a94..9b1b69b 100755
--- a/chrome/skk/kana_mode.js
+++ b/chrome/skk/kana_mode.js
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/kanji_mode.js b/chrome/skk/kanji_mode.js
index 42e4c6d..7712572 100755
--- a/chrome/skk/kanji_mode.js
+++ b/chrome/skk/kanji_mode.js
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/manifest.json b/chrome/skk/manifest.json
index 428cb4c..18bec2b 100755
--- a/chrome/skk/manifest.json
+++ b/chrome/skk/manifest.json
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/skk.gyp b/chrome/skk/skk.gyp
index ac6817a..578bb5a 100755
--- a/chrome/skk/skk.gyp
+++ b/chrome/skk/skk.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/skk_dict.cc b/chrome/skk/skk_dict.cc
index 7c15926..f9faf45 100755
--- a/chrome/skk/skk_dict.cc
+++ b/chrome/skk/skk_dict.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/skk_dict.gyp b/chrome/skk/skk_dict.gyp
index b1c330f..bd2367c 100755
--- a/chrome/skk/skk_dict.gyp
+++ b/chrome/skk/skk_dict.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/skk_dict.h b/chrome/skk/skk_dict.h
index f3c7844..02cec8b 100755
--- a/chrome/skk/skk_dict.h
+++ b/chrome/skk/skk_dict.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/skk_dict.nmf b/chrome/skk/skk_dict.nmf
index c92b4cb..4241821 100755
--- a/chrome/skk/skk_dict.nmf
+++ b/chrome/skk/skk_dict.nmf
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/skk_util.cc b/chrome/skk/skk_util.cc
index 1cfb3a9..0316864 100755
--- a/chrome/skk/skk_util.cc
+++ b/chrome/skk/skk_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/skk_util.h b/chrome/skk/skk_util.h
index 5b60d1d..5fb8ebe 100755
--- a/chrome/skk/skk_util.h
+++ b/chrome/skk/skk_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/skk_util_test.cc b/chrome/skk/skk_util_test.cc
index cc6c83f..770cdb5 100755
--- a/chrome/skk/skk_util_test.cc
+++ b/chrome/skk/skk_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/skk_util_test.gyp b/chrome/skk/skk_util_test.gyp
index 18372a2..d8f11e4 100755
--- a/chrome/skk/skk_util_test.gyp
+++ b/chrome/skk/skk_util_test.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/chrome/skk/util.js b/chrome/skk/util.js
index 423e00a..a836448 100755
--- a/chrome/skk/util.js
+++ b/chrome/skk/util.js
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/client/client.cc b/client/client.cc
index bce307e..36a2489 100755
--- a/client/client.cc
+++ b/client/client.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/client/client.gyp b/client/client.gyp
index c87e8c2..52aca65 100755
--- a/client/client.gyp
+++ b/client/client.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/client/client.h b/client/client.h
index 10a1945..17d7f5a 100755
--- a/client/client.h
+++ b/client/client.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/client/client_interface.h b/client/client_interface.h
index 46651b9..05428c3 100755
--- a/client/client_interface.h
+++ b/client/client_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/client/client_mock.cc b/client/client_mock.cc
index db8124c..d5836f6 100755
--- a/client/client_mock.cc
+++ b/client/client_mock.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/client/client_mock.h b/client/client_mock.h
index 574906c..a662d7f 100755
--- a/client/client_mock.h
+++ b/client/client_mock.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/client/client_performance_test_main.cc b/client/client_performance_test_main.cc
index ce11799..b91f2bb 100755
--- a/client/client_performance_test_main.cc
+++ b/client/client_performance_test_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/client/client_quality_test_main.cc b/client/client_quality_test_main.cc
index 03291c7..2e9e32d 100755
--- a/client/client_quality_test_main.cc
+++ b/client/client_quality_test_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/client/client_scenario_test_main.cc b/client/client_scenario_test_main.cc
index 44e0d82..792686f 100755
--- a/client/client_scenario_test_main.cc
+++ b/client/client_scenario_test_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/client/client_stress_test_main.cc b/client/client_stress_test_main.cc
index f0c1880..bb79c10 100755
--- a/client/client_stress_test_main.cc
+++ b/client/client_stress_test_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/client/client_test.cc b/client/client_test.cc
index a976cac..5cfa110 100755
--- a/client/client_test.cc
+++ b/client/client_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/client/client_test.gyp b/client/client_test.gyp
index b00e100..dc8dfb2 100755
--- a/client/client_test.gyp
+++ b/client/client_test.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/client/gen_client_quality_test_data.py b/client/gen_client_quality_test_data.py
index 075453d..c78df0b 100755
--- a/client/gen_client_quality_test_data.py
+++ b/client/gen_client_quality_test_data.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/client/ping_server_main.cc b/client/ping_server_main.cc
index 76656d5..3d378c2 100755
--- a/client/ping_server_main.cc
+++ b/client/ping_server_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/client/server_launcher.cc b/client/server_launcher.cc
index 2c0a0dd..892b9c7 100755
--- a/client/server_launcher.cc
+++ b/client/server_launcher.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/client/server_launcher_main.cc b/client/server_launcher_main.cc
index 46a4863..5d19337 100755
--- a/client/server_launcher_main.cc
+++ b/client/server_launcher_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/composer.cc b/composer/composer.cc
index c9ea58c..5d2a2c4 100755
--- a/composer/composer.cc
+++ b/composer/composer.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/composer.gyp b/composer/composer.gyp
index 6f02d61..20d0877 100755
--- a/composer/composer.gyp
+++ b/composer/composer.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/composer/composer.h b/composer/composer.h
index deb6c5b..7e8e5f0 100755
--- a/composer/composer.h
+++ b/composer/composer.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/composer_main.cc b/composer/composer_main.cc
index baaefdb..ab478d6 100755
--- a/composer/composer_main.cc
+++ b/composer/composer_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/composer_test.cc b/composer/composer_test.cc
index abbb704..535dcce 100755
--- a/composer/composer_test.cc
+++ b/composer/composer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/composition_interface.h b/composer/composition_interface.h
index b4f5c22..1163e42 100755
--- a/composer/composition_interface.h
+++ b/composer/composition_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/char_chunk.cc b/composer/internal/char_chunk.cc
index f9c7fd4..e456b2d 100755
--- a/composer/internal/char_chunk.cc
+++ b/composer/internal/char_chunk.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/char_chunk.h b/composer/internal/char_chunk.h
index c1e5d12..cd2ab3e 100755
--- a/composer/internal/char_chunk.h
+++ b/composer/internal/char_chunk.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/char_chunk_test.cc b/composer/internal/char_chunk_test.cc
index e325889..fc7a8ce 100755
--- a/composer/internal/char_chunk_test.cc
+++ b/composer/internal/char_chunk_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/composition.cc b/composer/internal/composition.cc
index ff08a58..0647820 100755
--- a/composer/internal/composition.cc
+++ b/composer/internal/composition.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/composition.h b/composer/internal/composition.h
index d5224ec..a6c2a08 100755
--- a/composer/internal/composition.h
+++ b/composer/internal/composition.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/composition_input.cc b/composer/internal/composition_input.cc
index bdf4433..1a8ab8c 100755
--- a/composer/internal/composition_input.cc
+++ b/composer/internal/composition_input.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/composition_input.h b/composer/internal/composition_input.h
index f8d002e..184a427 100755
--- a/composer/internal/composition_input.h
+++ b/composer/internal/composition_input.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/composition_input_test.cc b/composer/internal/composition_input_test.cc
index f7f546c..406b594 100755
--- a/composer/internal/composition_input_test.cc
+++ b/composer/internal/composition_input_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/composition_main.cc b/composer/internal/composition_main.cc
index 574f493..d42b588 100755
--- a/composer/internal/composition_main.cc
+++ b/composer/internal/composition_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/composition_test.cc b/composer/internal/composition_test.cc
index 7707e34..5a3abde 100755
--- a/composer/internal/composition_test.cc
+++ b/composer/internal/composition_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/converter.cc b/composer/internal/converter.cc
index 3f96e45..945a87b 100755
--- a/composer/internal/converter.cc
+++ b/composer/internal/converter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/converter.h b/composer/internal/converter.h
index e4d981e..d5ad977 100755
--- a/composer/internal/converter.h
+++ b/composer/internal/converter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/converter_main.cc b/composer/internal/converter_main.cc
index 9ade94a..6762f85 100755
--- a/composer/internal/converter_main.cc
+++ b/composer/internal/converter_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/converter_test.cc b/composer/internal/converter_test.cc
index 3a6d638..b816c11 100755
--- a/composer/internal/converter_test.cc
+++ b/composer/internal/converter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/mode_switching_handler.cc b/composer/internal/mode_switching_handler.cc
index b80f263..5a2a9a1 100755
--- a/composer/internal/mode_switching_handler.cc
+++ b/composer/internal/mode_switching_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/mode_switching_handler.h b/composer/internal/mode_switching_handler.h
index e93baf7..216eeed 100755
--- a/composer/internal/mode_switching_handler.h
+++ b/composer/internal/mode_switching_handler.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/mode_switching_handler_test.cc b/composer/internal/mode_switching_handler_test.cc
index ccd0057..e5e66e3 100755
--- a/composer/internal/mode_switching_handler_test.cc
+++ b/composer/internal/mode_switching_handler_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/transliterator_interface.h b/composer/internal/transliterator_interface.h
index 0c7c896..82ce51b 100755
--- a/composer/internal/transliterator_interface.h
+++ b/composer/internal/transliterator_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/transliterators.cc b/composer/internal/transliterators.cc
index a88f74c..6915d25 100755
--- a/composer/internal/transliterators.cc
+++ b/composer/internal/transliterators.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/transliterators.h b/composer/internal/transliterators.h
index a4c3cd3..b660740 100755
--- a/composer/internal/transliterators.h
+++ b/composer/internal/transliterators.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/transliterators_ja.cc b/composer/internal/transliterators_ja.cc
index 9f62a21..68a999d 100755
--- a/composer/internal/transliterators_ja.cc
+++ b/composer/internal/transliterators_ja.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/transliterators_ja.h b/composer/internal/transliterators_ja.h
index aad4f6b..58d3fee 100755
--- a/composer/internal/transliterators_ja.h
+++ b/composer/internal/transliterators_ja.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/transliterators_ja_test.cc b/composer/internal/transliterators_ja_test.cc
index d7a89a0..fab5be9 100755
--- a/composer/internal/transliterators_ja_test.cc
+++ b/composer/internal/transliterators_ja_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/transliterators_test.cc b/composer/internal/transliterators_test.cc
index e466136..db4331f 100755
--- a/composer/internal/transliterators_test.cc
+++ b/composer/internal/transliterators_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/trie.h b/composer/internal/trie.h
index 9d22ab4..14aacd5 100755
--- a/composer/internal/trie.h
+++ b/composer/internal/trie.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/internal/trie_test.cc b/composer/internal/trie_test.cc
index e72a46b..f1d6897 100755
--- a/composer/internal/trie_test.cc
+++ b/composer/internal/trie_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/table.cc b/composer/table.cc
index a35f319..cae728f 100755
--- a/composer/table.cc
+++ b/composer/table.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/table.h b/composer/table.h
index c32be09..d666c27 100755
--- a/composer/table.h
+++ b/composer/table.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/composer/table_test.cc b/composer/table_test.cc
index b9b689c..2d6fb9d 100755
--- a/composer/table_test.cc
+++ b/composer/table_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/config/config.gyp b/config/config.gyp
index 7538655..4136526 100755
--- a/config/config.gyp
+++ b/config/config.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/config/config.proto b/config/config.proto
index bb60bd8..29d0177 100755
--- a/config/config.proto
+++ b/config/config.proto
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/config/config_handler.cc b/config/config_handler.cc
index 37ee1e8..7e4e6d7 100755
--- a/config/config_handler.cc
+++ b/config/config_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/config/config_handler.h b/config/config_handler.h
index a0f8d0d..e634fa4 100755
--- a/config/config_handler.h
+++ b/config/config_handler.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/config/config_handler_test.cc b/config/config_handler_test.cc
index bb154ec..fdd0b0d 100755
--- a/config/config_handler_test.cc
+++ b/config/config_handler_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/config/config_test.gyp b/config/config_test.gyp
index 8189919..e5abdc5 100755
--- a/config/config_test.gyp
+++ b/config/config_test.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/config/stats_config_util.cc b/config/stats_config_util.cc
index 39ded8f..d7019f0 100755
--- a/config/stats_config_util.cc
+++ b/config/stats_config_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/config/stats_config_util.h b/config/stats_config_util.h
index cd28029..96f68b7 100755
--- a/config/stats_config_util.h
+++ b/config/stats_config_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/config/stats_config_util_test.cc b/config/stats_config_util_test.cc
index a49dd08..c13fdeb 100755
--- a/config/stats_config_util_test.cc
+++ b/config/stats_config_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/boundary_struct.h b/converter/boundary_struct.h
index 9a7b2aa..31ec840 100755
--- a/converter/boundary_struct.h
+++ b/converter/boundary_struct.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/candidate_filter.cc b/converter/candidate_filter.cc
index 540941c..7c2e808 100755
--- a/converter/candidate_filter.cc
+++ b/converter/candidate_filter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/candidate_filter.h b/converter/candidate_filter.h
index 79463fa..5140653 100755
--- a/converter/candidate_filter.h
+++ b/converter/candidate_filter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/candidate_filter_test.cc b/converter/candidate_filter_test.cc
index 87a2521..84af7fb 100755
--- a/converter/candidate_filter_test.cc
+++ b/converter/candidate_filter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/character_form_manager.cc b/converter/character_form_manager.cc
index f4de94c..7589550 100755
--- a/converter/character_form_manager.cc
+++ b/converter/character_form_manager.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/character_form_manager.h b/converter/character_form_manager.h
index 6fe9e90..b81d27e 100755
--- a/converter/character_form_manager.h
+++ b/converter/character_form_manager.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/character_form_manager_test.cc b/converter/character_form_manager_test.cc
index f0e3d4d..ce3068a 100755
--- a/converter/character_form_manager_test.cc
+++ b/converter/character_form_manager_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/connector.cc b/converter/connector.cc
index d14f8f0..7e43a38 100755
--- a/converter/connector.cc
+++ b/converter/connector.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/connector_interface.h b/converter/connector_interface.h
index 71052cc..be756de 100755
--- a/converter/connector_interface.h
+++ b/converter/connector_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/connector_test.cc b/converter/connector_test.cc
index a928907..43261e3 100755
--- a/converter/connector_test.cc
+++ b/converter/connector_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/converter.cc b/converter/converter.cc
index 9043c5a..5aba442 100755
--- a/converter/converter.cc
+++ b/converter/converter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/converter.gyp b/converter/converter.gyp
index c88d6e4..6a9589a 100755
--- a/converter/converter.gyp
+++ b/converter/converter.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/converter/converter.h b/converter/converter.h
index 00cb36c..16ab3b8 100755
--- a/converter/converter.h
+++ b/converter/converter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/converter_base.gyp b/converter/converter_base.gyp
index 4e6d82c..da46a7c 100755
--- a/converter/converter_base.gyp
+++ b/converter/converter_base.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/converter/converter_interface.h b/converter/converter_interface.h
index 2174d1e..92b0a29 100755
--- a/converter/converter_interface.h
+++ b/converter/converter_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/converter_main.cc b/converter/converter_main.cc
index 7abc842..2f9f3af 100755
--- a/converter/converter_main.cc
+++ b/converter/converter_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/converter_mock.cc b/converter/converter_mock.cc
index 7fcaaa6..5d4b65a 100755
--- a/converter/converter_mock.cc
+++ b/converter/converter_mock.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/converter_mock.h b/converter/converter_mock.h
index a1a0f17..54e97ce 100755
--- a/converter/converter_mock.h
+++ b/converter/converter_mock.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/converter_mock_test.cc b/converter/converter_mock_test.cc
index 6f6344f..f3c01e3 100755
--- a/converter/converter_mock_test.cc
+++ b/converter/converter_mock_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/converter_test.cc b/converter/converter_test.cc
index ccc194e..0ba5b17 100755
--- a/converter/converter_test.cc
+++ b/converter/converter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/converter_test.gyp b/converter/converter_test.gyp
index 9f5799a..10ea3b5 100755
--- a/converter/converter_test.gyp
+++ b/converter/converter_test.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/converter/empty_user_data_manager.h b/converter/empty_user_data_manager.h
index dd9720e..7431419 100755
--- a/converter/empty_user_data_manager.h
+++ b/converter/empty_user_data_manager.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/gen_boundary_data.py b/converter/gen_boundary_data.py
index e73d258..8b25b64 100755
--- a/converter/gen_boundary_data.py
+++ b/converter/gen_boundary_data.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/converter/gen_connection_data_main.cc b/converter/gen_connection_data_main.cc
index 755c132..2b1cc39 100755
--- a/converter/gen_connection_data_main.cc
+++ b/converter/gen_connection_data_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/gen_quality_regression_test_data.py b/converter/gen_quality_regression_test_data.py
index 08bfeba..7c16585 100755
--- a/converter/gen_quality_regression_test_data.py
+++ b/converter/gen_quality_regression_test_data.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/converter/gen_segmenter_bitarray.cc b/converter/gen_segmenter_bitarray.cc
index 07d2b97..aa3b813 100755
--- a/converter/gen_segmenter_bitarray.cc
+++ b/converter/gen_segmenter_bitarray.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/gen_segmenter_bitarray.h b/converter/gen_segmenter_bitarray.h
index d4b4c11..d9da0b7 100755
--- a/converter/gen_segmenter_bitarray.h
+++ b/converter/gen_segmenter_bitarray.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/gen_segmenter_bitarray_main.cc b/converter/gen_segmenter_bitarray_main.cc
index a3787d6..99cf611 100755
--- a/converter/gen_segmenter_bitarray_main.cc
+++ b/converter/gen_segmenter_bitarray_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/gen_segmenter_code.py b/converter/gen_segmenter_code.py
index 0a068ac..4a7c945 100755
--- a/converter/gen_segmenter_code.py
+++ b/converter/gen_segmenter_code.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/converter/gen_test_segmenter_bitarray_main.cc b/converter/gen_test_segmenter_bitarray_main.cc
index 460c0c8..40b03fe 100755
--- a/converter/gen_test_segmenter_bitarray_main.cc
+++ b/converter/gen_test_segmenter_bitarray_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/immutable_converter.cc b/converter/immutable_converter.cc
index 522176c..c1432d9 100755
--- a/converter/immutable_converter.cc
+++ b/converter/immutable_converter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/immutable_converter.h b/converter/immutable_converter.h
index bbe1faf..c20b70e 100755
--- a/converter/immutable_converter.h
+++ b/converter/immutable_converter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/immutable_converter_interface.h b/converter/immutable_converter_interface.h
index cb7ada4..5a657ac 100755
--- a/converter/immutable_converter_interface.h
+++ b/converter/immutable_converter_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/immutable_converter_test.cc b/converter/immutable_converter_test.cc
index 7d2eb25..79bb977 100755
--- a/converter/immutable_converter_test.cc
+++ b/converter/immutable_converter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/key_corrector.cc b/converter/key_corrector.cc
index d5be7e4..2de4241 100755
--- a/converter/key_corrector.cc
+++ b/converter/key_corrector.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/key_corrector.h b/converter/key_corrector.h
index 8d02c5b..4bb4b39 100755
--- a/converter/key_corrector.h
+++ b/converter/key_corrector.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/key_corrector_test.cc b/converter/key_corrector_test.cc
index 6cdaf78..17007f1 100755
--- a/converter/key_corrector_test.cc
+++ b/converter/key_corrector_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/lattice.cc b/converter/lattice.cc
index 4dc7678..cc1b6c4 100755
--- a/converter/lattice.cc
+++ b/converter/lattice.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/lattice.h b/converter/lattice.h
index c0d1bae..83fe930 100755
--- a/converter/lattice.h
+++ b/converter/lattice.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/lattice_test.cc b/converter/lattice_test.cc
index 535ad74..eeb454b 100755
--- a/converter/lattice_test.cc
+++ b/converter/lattice_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/nbest_generator.cc b/converter/nbest_generator.cc
index b797f4a..a5fd6ec 100755
--- a/converter/nbest_generator.cc
+++ b/converter/nbest_generator.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/nbest_generator.h b/converter/nbest_generator.h
index 50bd47b..27d2d8c 100755
--- a/converter/nbest_generator.h
+++ b/converter/nbest_generator.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/node.h b/converter/node.h
index c393b2b..3d5cfd4 100755
--- a/converter/node.h
+++ b/converter/node.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/node_allocator.h b/converter/node_allocator.h
index 8d93fac..6f8fed3 100755
--- a/converter/node_allocator.h
+++ b/converter/node_allocator.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/node_test.cc b/converter/node_test.cc
index 10a48c5..8264d5a 100755
--- a/converter/node_test.cc
+++ b/converter/node_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/quality_regression_main.cc b/converter/quality_regression_main.cc
index 052aca2..ee3c731 100755
--- a/converter/quality_regression_main.cc
+++ b/converter/quality_regression_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/quality_regression_test.cc b/converter/quality_regression_test.cc
index 691adb9..775854b 100755
--- a/converter/quality_regression_test.cc
+++ b/converter/quality_regression_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/quality_regression_util.cc b/converter/quality_regression_util.cc
index d102d96..0a9e715 100755
--- a/converter/quality_regression_util.cc
+++ b/converter/quality_regression_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/quality_regression_util.h b/converter/quality_regression_util.h
index cd61165..8c3f5af 100755
--- a/converter/quality_regression_util.h
+++ b/converter/quality_regression_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/segmenter.cc b/converter/segmenter.cc
index 6b7a33d..cafcd3e 100755
--- a/converter/segmenter.cc
+++ b/converter/segmenter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/segmenter.h b/converter/segmenter.h
index 46b1d0e..0e59ba0 100755
--- a/converter/segmenter.h
+++ b/converter/segmenter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/segmenter_base.cc b/converter/segmenter_base.cc
index 9c23796..e1a4751 100755
--- a/converter/segmenter_base.cc
+++ b/converter/segmenter_base.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/segmenter_base.h b/converter/segmenter_base.h
index 66c5c38..6994c9b 100755
--- a/converter/segmenter_base.h
+++ b/converter/segmenter_base.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/segmenter_impl.cc b/converter/segmenter_impl.cc
index f259b4d..188368b 100755
--- a/converter/segmenter_impl.cc
+++ b/converter/segmenter_impl.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/segmenter_impl.h b/converter/segmenter_impl.h
index c700c68..2d5e401 100755
--- a/converter/segmenter_impl.h
+++ b/converter/segmenter_impl.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/segmenter_interface.h b/converter/segmenter_interface.h
index 5a163ca..2048e12 100755
--- a/converter/segmenter_interface.h
+++ b/converter/segmenter_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/segmenter_test.cc b/converter/segmenter_test.cc
index 5f5f30b..9d4a132 100755
--- a/converter/segmenter_test.cc
+++ b/converter/segmenter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/segments.cc b/converter/segments.cc
index 6322680..f218fc0 100755
--- a/converter/segments.cc
+++ b/converter/segments.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/segments.h b/converter/segments.h
index 1251fbf..0e6385c 100755
--- a/converter/segments.h
+++ b/converter/segments.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/segments_test.cc b/converter/segments_test.cc
index eecf4f8..78414ca 100755
--- a/converter/segments_test.cc
+++ b/converter/segments_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/sparse_connector.cc b/converter/sparse_connector.cc
index 10fca86..7d497a4 100755
--- a/converter/sparse_connector.cc
+++ b/converter/sparse_connector.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/sparse_connector.h b/converter/sparse_connector.h
index 05a4112..d9a86b6 100755
--- a/converter/sparse_connector.h
+++ b/converter/sparse_connector.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/sparse_connector_builder.cc b/converter/sparse_connector_builder.cc
index 6066f1d..8d68d7f 100755
--- a/converter/sparse_connector_builder.cc
+++ b/converter/sparse_connector_builder.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/test_segmenter.cc b/converter/test_segmenter.cc
index 97f56d2..f03b831 100755
--- a/converter/test_segmenter.cc
+++ b/converter/test_segmenter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/test_segmenter.h b/converter/test_segmenter.h
index c78e76f..b23fbbd 100755
--- a/converter/test_segmenter.h
+++ b/converter/test_segmenter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/test_segmenter_test.cc b/converter/test_segmenter_test.cc
index 9ae5cb4..c1618c2 100755
--- a/converter/test_segmenter_test.cc
+++ b/converter/test_segmenter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/user_data_manager_interface.h b/converter/user_data_manager_interface.h
index 1ab3338..606aba6 100755
--- a/converter/user_data_manager_interface.h
+++ b/converter/user_data_manager_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/converter/user_data_manager_mock.h b/converter/user_data_manager_mock.h
index 3f4d44c..7d13873 100755
--- a/converter/user_data_manager_mock.h
+++ b/converter/user_data_manager_mock.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/data/test/calculator/gen_test.py b/data/test/calculator/gen_test.py
index 2de9753..0f051d4 100755
--- a/data/test/calculator/gen_test.py
+++ b/data/test/calculator/gen_test.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/data/usage_stats/stats.def b/data/usage_stats/stats.def
index 3f74549..222645e 100755
--- a/data/usage_stats/stats.def
+++ b/data/usage_stats/stats.def
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -236,7 +236,6 @@
 Performed_Conversion_Undo
 Performed_Conversion_SegmentFocusLeft
 Performed_Conversion_SegmentFocusRight
-Performed_Conversion_SegmentFocusRightOrCommit
 Performed_Conversion_SegmentFocusFirst
 Performed_Conversion_SegmentFocusLast
 Performed_Conversion_SegmentWidthExpand
diff --git a/dictionary/dictionary.cc b/dictionary/dictionary.cc
index cf04823..bcfce14 100755
--- a/dictionary/dictionary.cc
+++ b/dictionary/dictionary.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/dictionary.gyp b/dictionary/dictionary.gyp
index 959477b..8bb83ec 100755
--- a/dictionary/dictionary.gyp
+++ b/dictionary/dictionary.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/dictionary_base.gyp b/dictionary/dictionary_base.gyp
index 0d7f9da..32084f9 100755
--- a/dictionary/dictionary_base.gyp
+++ b/dictionary/dictionary_base.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/dictionary_impl.cc b/dictionary/dictionary_impl.cc
index 68dafdb..ccd71dd 100755
--- a/dictionary/dictionary_impl.cc
+++ b/dictionary/dictionary_impl.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/dictionary_impl.h b/dictionary/dictionary_impl.h
index 0bb5150..9d06b3d 100755
--- a/dictionary/dictionary_impl.h
+++ b/dictionary/dictionary_impl.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/dictionary_interface.h b/dictionary/dictionary_interface.h
index ae9019a..99d2707 100755
--- a/dictionary/dictionary_interface.h
+++ b/dictionary/dictionary_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/dictionary_mock.cc b/dictionary/dictionary_mock.cc
index 25f4891..56d947c 100755
--- a/dictionary/dictionary_mock.cc
+++ b/dictionary/dictionary_mock.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/dictionary_mock.h b/dictionary/dictionary_mock.h
index 3236926..effe185 100755
--- a/dictionary/dictionary_mock.h
+++ b/dictionary/dictionary_mock.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/dictionary_mock_test.cc b/dictionary/dictionary_mock_test.cc
index 54b48b4..cb29811 100755
--- a/dictionary/dictionary_mock_test.cc
+++ b/dictionary/dictionary_mock_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/dictionary_test.cc b/dictionary/dictionary_test.cc
index 8b3c062..4e1ad6e 100755
--- a/dictionary/dictionary_test.cc
+++ b/dictionary/dictionary_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/dictionary_test.gyp b/dictionary/dictionary_test.gyp
index cfd7775..83c9cc4 100755
--- a/dictionary/dictionary_test.gyp
+++ b/dictionary/dictionary_test.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/dictionary_token.h b/dictionary/dictionary_token.h
index 120099e..b9d4c50 100755
--- a/dictionary/dictionary_token.h
+++ b/dictionary/dictionary_token.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/file/codec.cc b/dictionary/file/codec.cc
index 85d0518..66dc890 100755
--- a/dictionary/file/codec.cc
+++ b/dictionary/file/codec.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/file/codec.h b/dictionary/file/codec.h
index 8108e93..6e43431 100755
--- a/dictionary/file/codec.h
+++ b/dictionary/file/codec.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/file/codec_interface.h b/dictionary/file/codec_interface.h
index ef9046c..c2b63bd 100755
--- a/dictionary/file/codec_interface.h
+++ b/dictionary/file/codec_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/file/codec_test.cc b/dictionary/file/codec_test.cc
index 6e3616f..d0846b1 100755
--- a/dictionary/file/codec_test.cc
+++ b/dictionary/file/codec_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/file/dictionary_file.cc b/dictionary/file/dictionary_file.cc
index 867e377..e9fa230 100755
--- a/dictionary/file/dictionary_file.cc
+++ b/dictionary/file/dictionary_file.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/file/dictionary_file.gyp b/dictionary/file/dictionary_file.gyp
index f2c46be..670d404 100755
--- a/dictionary/file/dictionary_file.gyp
+++ b/dictionary/file/dictionary_file.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/file/dictionary_file.h b/dictionary/file/dictionary_file.h
index 5bb6dd3..626822f 100755
--- a/dictionary/file/dictionary_file.h
+++ b/dictionary/file/dictionary_file.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/file/dictionary_file_builder.cc b/dictionary/file/dictionary_file_builder.cc
index 168974d..1c39f1c 100755
--- a/dictionary/file/dictionary_file_builder.cc
+++ b/dictionary/file/dictionary_file_builder.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/file/dictionary_file_builder.h b/dictionary/file/dictionary_file_builder.h
index 96eb0a4..8b59a0b 100755
--- a/dictionary/file/dictionary_file_builder.h
+++ b/dictionary/file/dictionary_file_builder.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/file/dictionary_file_test.cc b/dictionary/file/dictionary_file_test.cc
index bce0615..58dafcf 100755
--- a/dictionary/file/dictionary_file_test.cc
+++ b/dictionary/file/dictionary_file_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/file/section.h b/dictionary/file/section.h
index 4896a67..ba135fc 100755
--- a/dictionary/file/section.h
+++ b/dictionary/file/section.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/gen_pos_map.py b/dictionary/gen_pos_map.py
index ab844c7..46a9912 100755
--- a/dictionary/gen_pos_map.py
+++ b/dictionary/gen_pos_map.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/gen_pos_matcher_code.py b/dictionary/gen_pos_matcher_code.py
index 93aa848..3144381 100755
--- a/dictionary/gen_pos_matcher_code.py
+++ b/dictionary/gen_pos_matcher_code.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/gen_pos_rewrite_rule.py b/dictionary/gen_pos_rewrite_rule.py
index 2e99a15..dc5552a 100755
--- a/dictionary/gen_pos_rewrite_rule.py
+++ b/dictionary/gen_pos_rewrite_rule.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/gen_suffix_data.py b/dictionary/gen_suffix_data.py
index f45133a..6cc032b 100755
--- a/dictionary/gen_suffix_data.py
+++ b/dictionary/gen_suffix_data.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/gen_system_dictionary_data_main.cc b/dictionary/gen_system_dictionary_data_main.cc
index 3d4d294..0a1459d 100755
--- a/dictionary/gen_system_dictionary_data_main.cc
+++ b/dictionary/gen_system_dictionary_data_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/gen_user_pos_data_main.cc b/dictionary/gen_user_pos_data_main.cc
index e1e18ef..f6b4976 100755
--- a/dictionary/gen_user_pos_data_main.cc
+++ b/dictionary/gen_user_pos_data_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/gen_zip_code_seed.py b/dictionary/gen_zip_code_seed.py
index b7fdc86..f4bcdf2 100755
--- a/dictionary/gen_zip_code_seed.py
+++ b/dictionary/gen_zip_code_seed.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/rx/rbx_array.cc b/dictionary/rx/rbx_array.cc
index 5279257..cbaca37 100755
--- a/dictionary/rx/rbx_array.cc
+++ b/dictionary/rx/rbx_array.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/rx/rbx_array.h b/dictionary/rx/rbx_array.h
index 1ad717c..f96b3b5 100755
--- a/dictionary/rx/rbx_array.h
+++ b/dictionary/rx/rbx_array.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/rx/rbx_array_builder.cc b/dictionary/rx/rbx_array_builder.cc
index 7ee4c09..84c6883 100755
--- a/dictionary/rx/rbx_array_builder.cc
+++ b/dictionary/rx/rbx_array_builder.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/rx/rbx_array_builder.h b/dictionary/rx/rbx_array_builder.h
index 42050e9..8765be2 100755
--- a/dictionary/rx/rbx_array_builder.h
+++ b/dictionary/rx/rbx_array_builder.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/rx/rbx_array_test.cc b/dictionary/rx/rbx_array_test.cc
index 2cb7c05..d403c45 100755
--- a/dictionary/rx/rbx_array_test.cc
+++ b/dictionary/rx/rbx_array_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/rx/rx_storage.gyp b/dictionary/rx/rx_storage.gyp
index db296d6..4c39c61 100755
--- a/dictionary/rx/rx_storage.gyp
+++ b/dictionary/rx/rx_storage.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/rx/rx_trie.cc b/dictionary/rx/rx_trie.cc
index 8011bcb..9656476 100755
--- a/dictionary/rx/rx_trie.cc
+++ b/dictionary/rx/rx_trie.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/rx/rx_trie.h b/dictionary/rx/rx_trie.h
index a8f0494..c18231e 100755
--- a/dictionary/rx/rx_trie.h
+++ b/dictionary/rx/rx_trie.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/rx/rx_trie_builder.cc b/dictionary/rx/rx_trie_builder.cc
index 8d2fb35..f310f0d 100755
--- a/dictionary/rx/rx_trie_builder.cc
+++ b/dictionary/rx/rx_trie_builder.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/rx/rx_trie_builder.h b/dictionary/rx/rx_trie_builder.h
index b61334b..5d172af 100755
--- a/dictionary/rx/rx_trie_builder.h
+++ b/dictionary/rx/rx_trie_builder.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/rx/rx_trie_builder_test.cc b/dictionary/rx/rx_trie_builder_test.cc
index 199c736..6f218b9 100755
--- a/dictionary/rx/rx_trie_builder_test.cc
+++ b/dictionary/rx/rx_trie_builder_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/rx/rx_trie_test.cc b/dictionary/rx/rx_trie_test.cc
index dd362bf..d381f9a 100755
--- a/dictionary/rx/rx_trie_test.cc
+++ b/dictionary/rx/rx_trie_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/suffix_dictionary.cc b/dictionary/suffix_dictionary.cc
index 57f1ac5..ccbe8ef 100755
--- a/dictionary/suffix_dictionary.cc
+++ b/dictionary/suffix_dictionary.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/suffix_dictionary.h b/dictionary/suffix_dictionary.h
index 5fe1c9e..d7a2ab4 100755
--- a/dictionary/suffix_dictionary.h
+++ b/dictionary/suffix_dictionary.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/suffix_dictionary_test.cc b/dictionary/suffix_dictionary_test.cc
index 37bfe6d..8ef7967 100755
--- a/dictionary/suffix_dictionary_test.cc
+++ b/dictionary/suffix_dictionary_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/suppression_dictionary.cc b/dictionary/suppression_dictionary.cc
index a22d468..30c6556 100755
--- a/dictionary/suppression_dictionary.cc
+++ b/dictionary/suppression_dictionary.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/suppression_dictionary.h b/dictionary/suppression_dictionary.h
index 30a3682..34542fc 100755
--- a/dictionary/suppression_dictionary.h
+++ b/dictionary/suppression_dictionary.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/suppression_dictionary_test.cc b/dictionary/suppression_dictionary_test.cc
index 297edb5..d222dfb 100755
--- a/dictionary/suppression_dictionary_test.cc
+++ b/dictionary/suppression_dictionary_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/system/codec.cc b/dictionary/system/codec.cc
index 771a84c..df18ac4 100755
--- a/dictionary/system/codec.cc
+++ b/dictionary/system/codec.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/system/codec.h b/dictionary/system/codec.h
index 39820e6..6580c10 100755
--- a/dictionary/system/codec.h
+++ b/dictionary/system/codec.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/system/codec_interface.h b/dictionary/system/codec_interface.h
index 9e71276..5af7ba9 100755
--- a/dictionary/system/codec_interface.h
+++ b/dictionary/system/codec_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/system/codec_test.cc b/dictionary/system/codec_test.cc
index 5919002..3992fce 100755
--- a/dictionary/system/codec_test.cc
+++ b/dictionary/system/codec_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/system/system_dictionary.cc b/dictionary/system/system_dictionary.cc
index aabd437..c855b26 100755
--- a/dictionary/system/system_dictionary.cc
+++ b/dictionary/system/system_dictionary.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/system/system_dictionary.gyp b/dictionary/system/system_dictionary.gyp
index 976aed3..2b95db6 100755
--- a/dictionary/system/system_dictionary.gyp
+++ b/dictionary/system/system_dictionary.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/system/system_dictionary.h b/dictionary/system/system_dictionary.h
index 7f8389a..bd4e73f 100755
--- a/dictionary/system/system_dictionary.h
+++ b/dictionary/system/system_dictionary.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/system/system_dictionary_benchmark.cc b/dictionary/system/system_dictionary_benchmark.cc
index 798acb6..9c48012 100755
--- a/dictionary/system/system_dictionary_benchmark.cc
+++ b/dictionary/system/system_dictionary_benchmark.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/system/system_dictionary_builder.cc b/dictionary/system/system_dictionary_builder.cc
index 944df59..be7944d 100755
--- a/dictionary/system/system_dictionary_builder.cc
+++ b/dictionary/system/system_dictionary_builder.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/system/system_dictionary_builder.h b/dictionary/system/system_dictionary_builder.h
index a8f5400..cc68bba 100755
--- a/dictionary/system/system_dictionary_builder.h
+++ b/dictionary/system/system_dictionary_builder.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/system/system_dictionary_builder_test.cc b/dictionary/system/system_dictionary_builder_test.cc
index 7b6066c..5f46e4f 100755
--- a/dictionary/system/system_dictionary_builder_test.cc
+++ b/dictionary/system/system_dictionary_builder_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/system/system_dictionary_test.cc b/dictionary/system/system_dictionary_test.cc
index 4c10421..16bc2e2 100755
--- a/dictionary/system/system_dictionary_test.cc
+++ b/dictionary/system/system_dictionary_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/system/value_dictionary.cc b/dictionary/system/value_dictionary.cc
index d08ef5b..aecb512 100755
--- a/dictionary/system/value_dictionary.cc
+++ b/dictionary/system/value_dictionary.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/system/value_dictionary.h b/dictionary/system/value_dictionary.h
index 30a2294..78d664e 100755
--- a/dictionary/system/value_dictionary.h
+++ b/dictionary/system/value_dictionary.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/system/value_dictionary_test.cc b/dictionary/system/value_dictionary_test.cc
index 132221c..d4e9ee2 100755
--- a/dictionary/system/value_dictionary_test.cc
+++ b/dictionary/system/value_dictionary_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/system/words_info.h b/dictionary/system/words_info.h
index 781fb58..551345f 100755
--- a/dictionary/system/words_info.h
+++ b/dictionary/system/words_info.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/text_dictionary_loader.cc b/dictionary/text_dictionary_loader.cc
index b0e6057..203e2f5 100755
--- a/dictionary/text_dictionary_loader.cc
+++ b/dictionary/text_dictionary_loader.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/text_dictionary_loader.h b/dictionary/text_dictionary_loader.h
index 701ea53..fb05970 100755
--- a/dictionary/text_dictionary_loader.h
+++ b/dictionary/text_dictionary_loader.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/text_dictionary_loader_test.cc b/dictionary/text_dictionary_loader_test.cc
index 34add96..f6e59dd 100755
--- a/dictionary/text_dictionary_loader_test.cc
+++ b/dictionary/text_dictionary_loader_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_dictionary.cc b/dictionary/user_dictionary.cc
index 1f9e36c..53881d3 100755
--- a/dictionary/user_dictionary.cc
+++ b/dictionary/user_dictionary.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_dictionary.h b/dictionary/user_dictionary.h
index 761a32e..1978922 100755
--- a/dictionary/user_dictionary.h
+++ b/dictionary/user_dictionary.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_dictionary_importer.cc b/dictionary/user_dictionary_importer.cc
index 4c3c3b2..0cdb41f 100755
--- a/dictionary/user_dictionary_importer.cc
+++ b/dictionary/user_dictionary_importer.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_dictionary_importer.h b/dictionary/user_dictionary_importer.h
index e7cad6a..3d23735 100755
--- a/dictionary/user_dictionary_importer.h
+++ b/dictionary/user_dictionary_importer.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_dictionary_importer_main.cc b/dictionary/user_dictionary_importer_main.cc
index 18f6e56..5c5c294 100755
--- a/dictionary/user_dictionary_importer_main.cc
+++ b/dictionary/user_dictionary_importer_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_dictionary_importer_test.cc b/dictionary/user_dictionary_importer_test.cc
index 10bc0be..d0bbbe0 100755
--- a/dictionary/user_dictionary_importer_test.cc
+++ b/dictionary/user_dictionary_importer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_dictionary_storage.cc b/dictionary/user_dictionary_storage.cc
index 6d1f384..dad354c 100755
--- a/dictionary/user_dictionary_storage.cc
+++ b/dictionary/user_dictionary_storage.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_dictionary_storage.h b/dictionary/user_dictionary_storage.h
index ff7d866..9dac70c 100755
--- a/dictionary/user_dictionary_storage.h
+++ b/dictionary/user_dictionary_storage.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_dictionary_storage.proto b/dictionary/user_dictionary_storage.proto
index 22536c1..d86238b 100755
--- a/dictionary/user_dictionary_storage.proto
+++ b/dictionary/user_dictionary_storage.proto
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_dictionary_storage_test.cc b/dictionary/user_dictionary_storage_test.cc
index 1721e74..7f62a3a 100755
--- a/dictionary/user_dictionary_storage_test.cc
+++ b/dictionary/user_dictionary_storage_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_dictionary_test.cc b/dictionary/user_dictionary_test.cc
index 4a95143..977c6b4 100755
--- a/dictionary/user_dictionary_test.cc
+++ b/dictionary/user_dictionary_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_dictionary_util.cc b/dictionary/user_dictionary_util.cc
index dd05d60..0da9831 100755
--- a/dictionary/user_dictionary_util.cc
+++ b/dictionary/user_dictionary_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_dictionary_util.h b/dictionary/user_dictionary_util.h
index 85d429a..91a3f22 100755
--- a/dictionary/user_dictionary_util.h
+++ b/dictionary/user_dictionary_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_dictionary_util_test.cc b/dictionary/user_dictionary_util_test.cc
index 611c52f..8558397 100755
--- a/dictionary/user_dictionary_util_test.cc
+++ b/dictionary/user_dictionary_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_pos.cc b/dictionary/user_pos.cc
index e2c10fc..9a8a8b1 100755
--- a/dictionary/user_pos.cc
+++ b/dictionary/user_pos.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_pos.h b/dictionary/user_pos.h
index dc866cf..285f6ea 100755
--- a/dictionary/user_pos.h
+++ b/dictionary/user_pos.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/dictionary/user_pos_test.cc b/dictionary/user_pos_test.cc
index 833f2c5..6af2372 100755
--- a/dictionary/user_pos_test.cc
+++ b/dictionary/user_pos_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/about_dialog/about_dialog.cc b/gui/about_dialog/about_dialog.cc
index 2a7b5e1..32aa426 100755
--- a/gui/about_dialog/about_dialog.cc
+++ b/gui/about_dialog/about_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/about_dialog/about_dialog.h b/gui/about_dialog/about_dialog.h
index 329bf14..e39b62b 100755
--- a/gui/about_dialog/about_dialog.h
+++ b/gui/about_dialog/about_dialog.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/about_dialog/about_dialog.ui b/gui/about_dialog/about_dialog.ui
index e1e693d..778e558 100755
--- a/gui/about_dialog/about_dialog.ui
+++ b/gui/about_dialog/about_dialog.ui
@@ -77,7 +77,7 @@
         </font>
        </property>
        <property name="text">
-        <string>Copyright © 2011 Google Inc. All Rights Reserved.</string>
+        <string>Copyright © 2012 Google Inc. All Rights Reserved.</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
diff --git a/gui/about_dialog/about_dialog_en.ts b/gui/about_dialog/about_dialog_en.ts
index af4b96d..ed41238 100755
--- a/gui/about_dialog/about_dialog_en.ts
+++ b/gui/about_dialog/about_dialog_en.ts
@@ -16,7 +16,7 @@
     </message>
     <message utf8="true">
         <location filename="about_dialog.ui" line="80"/>
-        <source>Copyright © 2011 Google Inc. All Rights Reserved.</source>
+        <source>Copyright © 2012 Google Inc. All Rights Reserved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/gui/about_dialog/about_dialog_ja.ts b/gui/about_dialog/about_dialog_ja.ts
index 88e1883..653ebbd 100755
--- a/gui/about_dialog/about_dialog_ja.ts
+++ b/gui/about_dialog/about_dialog_ja.ts
@@ -15,7 +15,7 @@
     </message>
     <message utf8="true">
         <location filename="about_dialog.ui" line="80"/>
-        <source>Copyright © 2011 Google Inc. All Rights Reserved.</source>
+        <source>Copyright © 2012 Google Inc. All Rights Reserved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/gui/about_dialog/about_dialog_libmain.cc b/gui/about_dialog/about_dialog_libmain.cc
index 2178357..7908d25 100755
--- a/gui/about_dialog/about_dialog_libmain.cc
+++ b/gui/about_dialog/about_dialog_libmain.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/about_dialog/about_dialog_main.cc b/gui/about_dialog/about_dialog_main.cc
index 823e300..6ffe5de 100755
--- a/gui/about_dialog/about_dialog_main.cc
+++ b/gui/about_dialog/about_dialog_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/administration_dialog/administration_dialog.cc b/gui/administration_dialog/administration_dialog.cc
index 27f3216..fcb6355 100755
--- a/gui/administration_dialog/administration_dialog.cc
+++ b/gui/administration_dialog/administration_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/administration_dialog/administration_dialog.h b/gui/administration_dialog/administration_dialog.h
index 996aa02..28998f5 100755
--- a/gui/administration_dialog/administration_dialog.h
+++ b/gui/administration_dialog/administration_dialog.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/administration_dialog/administration_dialog_libmain.cc b/gui/administration_dialog/administration_dialog_libmain.cc
index 87512e4..a00dc90 100755
--- a/gui/administration_dialog/administration_dialog_libmain.cc
+++ b/gui/administration_dialog/administration_dialog_libmain.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/administration_dialog/administration_dialog_main.cc b/gui/administration_dialog/administration_dialog_main.cc
index 1d1a014..5d8e195 100755
--- a/gui/administration_dialog/administration_dialog_main.cc
+++ b/gui/administration_dialog/administration_dialog_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/base/debug_util.cc b/gui/base/debug_util.cc
index 3c811b2..af271e2 100755
--- a/gui/base/debug_util.cc
+++ b/gui/base/debug_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/base/debug_util.h b/gui/base/debug_util.h
index a24d406..4d8c8e2 100755
--- a/gui/base/debug_util.h
+++ b/gui/base/debug_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/base/locale_util.cc b/gui/base/locale_util.cc
index 827fd28..8089f8e 100755
--- a/gui/base/locale_util.cc
+++ b/gui/base/locale_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/base/locale_util.h b/gui/base/locale_util.h
index 0bbc963..47ff8d0 100755
--- a/gui/base/locale_util.h
+++ b/gui/base/locale_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/base/setup_util.cc b/gui/base/setup_util.cc
index 5b85456..ce1bed4 100755
--- a/gui/base/setup_util.cc
+++ b/gui/base/setup_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/base/setup_util.h b/gui/base/setup_util.h
index 7514324..eefd37f 100755
--- a/gui/base/setup_util.h
+++ b/gui/base/setup_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/base/singleton_window_helper.cc b/gui/base/singleton_window_helper.cc
index f81e70e..add5c89 100755
--- a/gui/base/singleton_window_helper.cc
+++ b/gui/base/singleton_window_helper.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/base/singleton_window_helper.h b/gui/base/singleton_window_helper.h
index 95c3d9e..a7e5325 100755
--- a/gui/base/singleton_window_helper.h
+++ b/gui/base/singleton_window_helper.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/base/win_util.cc b/gui/base/win_util.cc
index 02943ac..8144cb8 100755
--- a/gui/base/win_util.cc
+++ b/gui/base/win_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/base/win_util.h b/gui/base/win_util.h
index 8f3c322..53421c1 100755
--- a/gui/base/win_util.h
+++ b/gui/base/win_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/base/window_title_modifier.cc b/gui/base/window_title_modifier.cc
index 50defc3..d001960 100755
--- a/gui/base/window_title_modifier.cc
+++ b/gui/base/window_title_modifier.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/base/window_title_modifier.h b/gui/base/window_title_modifier.h
index d60d400..81fb592 100755
--- a/gui/base/window_title_modifier.h
+++ b/gui/base/window_title_modifier.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/character_pad_libmain.cc b/gui/character_pad/character_pad_libmain.cc
index 2ea0780..17d44ad 100755
--- a/gui/character_pad/character_pad_libmain.cc
+++ b/gui/character_pad/character_pad_libmain.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/character_palette.cc b/gui/character_pad/character_palette.cc
index 7546974..d3fe4b5 100755
--- a/gui/character_pad/character_palette.cc
+++ b/gui/character_pad/character_palette.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/character_palette.h b/gui/character_pad/character_palette.h
index 053f90e..bd263bd 100755
--- a/gui/character_pad/character_palette.h
+++ b/gui/character_pad/character_palette.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/character_palette_main.cc b/gui/character_pad/character_palette_main.cc
index 03bac2b..f2e8fdd 100755
--- a/gui/character_pad/character_palette_main.cc
+++ b/gui/character_pad/character_palette_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/character_palette_table_widget.cc b/gui/character_pad/character_palette_table_widget.cc
index 577a17e..8b2bea1 100755
--- a/gui/character_pad/character_palette_table_widget.cc
+++ b/gui/character_pad/character_palette_table_widget.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/character_palette_table_widget.h b/gui/character_pad/character_palette_table_widget.h
index 2987ee9..efbec5a 100755
--- a/gui/character_pad/character_palette_table_widget.h
+++ b/gui/character_pad/character_palette_table_widget.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/data/gen_cp932_map.py b/gui/character_pad/data/gen_cp932_map.py
index 1b5fb06..e5d2496 100755
--- a/gui/character_pad/data/gen_cp932_map.py
+++ b/gui/character_pad/data/gen_cp932_map.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/data/gen_local_character_map.py b/gui/character_pad/data/gen_local_character_map.py
index 026bd73..2a8b54a 100755
--- a/gui/character_pad/data/gen_local_character_map.py
+++ b/gui/character_pad/data/gen_local_character_map.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/data/gen_unicode_blocks.py b/gui/character_pad/data/gen_unicode_blocks.py
index b179528..d86026b 100755
--- a/gui/character_pad/data/gen_unicode_blocks.py
+++ b/gui/character_pad/data/gen_unicode_blocks.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/data/gen_unicode_data.py b/gui/character_pad/data/gen_unicode_data.py
index 57ecc3f..7caf035 100755
--- a/gui/character_pad/data/gen_unicode_data.py
+++ b/gui/character_pad/data/gen_unicode_data.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/data/gen_unihan_data.py b/gui/character_pad/data/gen_unihan_data.py
index 59528f2..42f1ff3 100755
--- a/gui/character_pad/data/gen_unihan_data.py
+++ b/gui/character_pad/data/gen_unihan_data.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/hand_writing.cc b/gui/character_pad/hand_writing.cc
index af083a8..37e8828 100755
--- a/gui/character_pad/hand_writing.cc
+++ b/gui/character_pad/hand_writing.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/hand_writing.h b/gui/character_pad/hand_writing.h
index 93e2cfc..93d14fc 100755
--- a/gui/character_pad/hand_writing.h
+++ b/gui/character_pad/hand_writing.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/hand_writing_canvas.cc b/gui/character_pad/hand_writing_canvas.cc
index 7644dd8..1211231 100755
--- a/gui/character_pad/hand_writing_canvas.cc
+++ b/gui/character_pad/hand_writing_canvas.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/hand_writing_canvas.h b/gui/character_pad/hand_writing_canvas.h
index db4eb0d..6fd3b77 100755
--- a/gui/character_pad/hand_writing_canvas.h
+++ b/gui/character_pad/hand_writing_canvas.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/hand_writing_main.cc b/gui/character_pad/hand_writing_main.cc
index db100ba..8fda3ea 100755
--- a/gui/character_pad/hand_writing_main.cc
+++ b/gui/character_pad/hand_writing_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/hand_writing_thread.cc b/gui/character_pad/hand_writing_thread.cc
index 1b00ac3..532cf99 100755
--- a/gui/character_pad/hand_writing_thread.cc
+++ b/gui/character_pad/hand_writing_thread.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/hand_writing_thread.h b/gui/character_pad/hand_writing_thread.h
index 039ae6d..29611da 100755
--- a/gui/character_pad/hand_writing_thread.h
+++ b/gui/character_pad/hand_writing_thread.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/result_list.cc b/gui/character_pad/result_list.cc
index 03e393b..62fea38 100755
--- a/gui/character_pad/result_list.cc
+++ b/gui/character_pad/result_list.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/result_list.h b/gui/character_pad/result_list.h
index 497c3fd..4976091 100755
--- a/gui/character_pad/result_list.h
+++ b/gui/character_pad/result_list.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/selection_handler.cc b/gui/character_pad/selection_handler.cc
index 4541b9a..604e505 100755
--- a/gui/character_pad/selection_handler.cc
+++ b/gui/character_pad/selection_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/selection_handler.h b/gui/character_pad/selection_handler.h
index 2265fbd..66a775b 100755
--- a/gui/character_pad/selection_handler.h
+++ b/gui/character_pad/selection_handler.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/unicode_util.cc b/gui/character_pad/unicode_util.cc
index f8b1278..3305260 100755
--- a/gui/character_pad/unicode_util.cc
+++ b/gui/character_pad/unicode_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/unicode_util.h b/gui/character_pad/unicode_util.h
index e986d7f..1e5ada1 100755
--- a/gui/character_pad/unicode_util.h
+++ b/gui/character_pad/unicode_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/windows_selection_handler.cc b/gui/character_pad/windows_selection_handler.cc
index 6716baf..dcfe28c 100755
--- a/gui/character_pad/windows_selection_handler.cc
+++ b/gui/character_pad/windows_selection_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/character_pad/windows_selection_handler.h b/gui/character_pad/windows_selection_handler.h
index f6dc01d..d7a260a 100755
--- a/gui/character_pad/windows_selection_handler.h
+++ b/gui/character_pad/windows_selection_handler.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/auth_code_detector.cc b/gui/config_dialog/auth_code_detector.cc
index 3f1d8ea..cb5be85 100755
--- a/gui/config_dialog/auth_code_detector.cc
+++ b/gui/config_dialog/auth_code_detector.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/auth_code_detector.h b/gui/config_dialog/auth_code_detector.h
index 96685a0..5003eb8 100755
--- a/gui/config_dialog/auth_code_detector.h
+++ b/gui/config_dialog/auth_code_detector.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/auth_dialog.cc b/gui/config_dialog/auth_dialog.cc
index 4e4df7a..0a6c946 100755
--- a/gui/config_dialog/auth_dialog.cc
+++ b/gui/config_dialog/auth_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/auth_dialog.h b/gui/config_dialog/auth_dialog.h
index cea6563..6816552 100755
--- a/gui/config_dialog/auth_dialog.h
+++ b/gui/config_dialog/auth_dialog.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/character_form_editor.cc b/gui/config_dialog/character_form_editor.cc
index d7a85b4..5d2e770 100755
--- a/gui/config_dialog/character_form_editor.cc
+++ b/gui/config_dialog/character_form_editor.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/character_form_editor.h b/gui/config_dialog/character_form_editor.h
index b8ab775..685214c 100755
--- a/gui/config_dialog/character_form_editor.h
+++ b/gui/config_dialog/character_form_editor.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/combobox_delegate.cc b/gui/config_dialog/combobox_delegate.cc
index 1a25f64..3708e27 100755
--- a/gui/config_dialog/combobox_delegate.cc
+++ b/gui/config_dialog/combobox_delegate.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/combobox_delegate.h b/gui/config_dialog/combobox_delegate.h
index 0fb3dd2..d438d74 100755
--- a/gui/config_dialog/combobox_delegate.h
+++ b/gui/config_dialog/combobox_delegate.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/config_dialog.cc b/gui/config_dialog/config_dialog.cc
index 0f84159..c3dff57 100755
--- a/gui/config_dialog/config_dialog.cc
+++ b/gui/config_dialog/config_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -290,6 +290,8 @@
 
 #ifdef OS_WINDOWS
   IMEHotKeyDisabledCheckBox->setChecked(WinUtil::GetIMEHotKeyDisabled());
+#else
+  IMEHotKeyDisabledCheckBox->setVisible(false);
 #endif
 
 #ifdef CHANNEL_DEV
diff --git a/gui/config_dialog/config_dialog.h b/gui/config_dialog/config_dialog.h
index d2dff93..067e450 100755
--- a/gui/config_dialog/config_dialog.h
+++ b/gui/config_dialog/config_dialog.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/config_dialog_en.ts b/gui/config_dialog/config_dialog_en.ts
index 16c539f..ba410dc 100755
--- a/gui/config_dialog/config_dialog_en.ts
+++ b/gui/config_dialog/config_dialog_en.ts
@@ -164,33 +164,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1310"/>
+        <location filename="config_dialog.ui" line="1355"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1357"/>
+        <location filename="config_dialog.ui" line="1402"/>
         <source>Logging level (debug only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1386"/>
+        <location filename="config_dialog.ui" line="1431"/>
         <source>Logging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1418"/>
+        <location filename="config_dialog.ui" line="1463"/>
         <source>Administration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="config_dialog.ui" line="1113"/>
-        <location filename="config_dialog.ui" line="1456"/>
+        <location filename="config_dialog.ui" line="1501"/>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1476"/>
+        <location filename="config_dialog.ui" line="1521"/>
         <source>Dictionary preloading and UAC settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -385,22 +385,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1501"/>
+        <location filename="config_dialog.ui" line="1317"/>
+        <source>Allow Using Cloud Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="config_dialog.ui" line="1333"/>
+        <source>Cloud servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="config_dialog.ui" line="1546"/>
         <source>Check if Mozc is the default IME on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1325"/>
+        <location filename="config_dialog.ui" line="1370"/>
         <source>Default IME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1511"/>
+        <location filename="config_dialog.ui" line="1556"/>
         <source>Disable Keyboard layout hotkey (Ctrl+Shift)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1550"/>
+        <location filename="config_dialog.ui" line="1595"/>
         <source>Reset to defaults</source>
         <translation type="unfinished"></translation>
     </message>
@@ -685,13 +695,13 @@
         <location filename="config_dialog.cc" line="365"/>
         <location filename="config_dialog.cc" line="379"/>
         <location filename="config_dialog.cc" line="387"/>
-        <location filename="config_dialog.cc" line="673"/>
-        <location filename="config_dialog.cc" line="687"/>
-        <location filename="config_dialog.cc" line="697"/>
-        <location filename="config_dialog.cc" line="709"/>
-        <location filename="config_dialog.cc" line="719"/>
-        <location filename="config_dialog.cc" line="731"/>
-        <location filename="config_dialog.cc" line="804"/>
+        <location filename="config_dialog.cc" line="675"/>
+        <location filename="config_dialog.cc" line="689"/>
+        <location filename="config_dialog.cc" line="699"/>
+        <location filename="config_dialog.cc" line="711"/>
+        <location filename="config_dialog.cc" line="721"/>
+        <location filename="config_dialog.cc" line="733"/>
+        <location filename="config_dialog.cc" line="806"/>
         <source>Mozc settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -722,38 +732,38 @@
     </message>
     <message>
         <location filename="config_dialog.cc" line="552"/>
-        <location filename="config_dialog.cc" line="983"/>
+        <location filename="config_dialog.cc" line="985"/>
         <source>Sync is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="674"/>
+        <location filename="config_dialog.cc" line="676"/>
         <source>Do you want to clear personalization data? Input history is not reset with this operation. Please open &quot;suggestion&quot; tab to remove input history data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="688"/>
-        <location filename="config_dialog.cc" line="710"/>
+        <location filename="config_dialog.cc" line="690"/>
+        <location filename="config_dialog.cc" line="712"/>
         <source>Mozc Converter is not running. Settings were not saved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="698"/>
+        <location filename="config_dialog.cc" line="700"/>
         <source>Do you want to clear all history data?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="720"/>
+        <location filename="config_dialog.cc" line="722"/>
         <source>Do you want to clear unused history data?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="732"/>
+        <location filename="config_dialog.cc" line="734"/>
         <source>Mozc Converter is not running. Operation was not executed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="805"/>
+        <location filename="config_dialog.cc" line="807"/>
         <source>When you reset Mozc settings, any changes you&apos;ve made will be reverted to the default settings. Do you want to reset settings? The following items are not reset with this operation.
  - Personalization data
  - Input history
@@ -763,48 +773,88 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="833"/>
+        <location filename="config_dialog.cc" line="835"/>
         <source>Stop Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="835"/>
+        <location filename="config_dialog.cc" line="837"/>
         <source>Start Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="851"/>
+        <location filename="config_dialog.cc" line="853"/>
         <source>Stop sync and reset the auth token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="852"/>
+        <location filename="config_dialog.cc" line="854"/>
         <source>You are trying to stop sync and reset the auth token. To restart sync, you will need to get a new auth token.
 Do you really want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="936"/>
+        <location filename="config_dialog.cc" line="938"/>
         <source>Not synced yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="940"/>
+        <location filename="config_dialog.cc" line="942"/>
         <source>Last synced time: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="980"/>
+        <location filename="config_dialog.cc" line="982"/>
         <source>During synchronization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="994"/>
+        <location filename="config_dialog.cc" line="1000"/>
+        <source>Authorization failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="config_dialog.cc" line="1003"/>
+        <source>Cannot save dictionaries because Sync Dictionary exceeds its entry size limit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="config_dialog.cc" line="1007"/>
+        <source>Cannot save dictionaries because Sync Dictionary exceeds its binary size limit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="config_dialog.cc" line="1011"/>
+        <source>Cannot save dictionaries because the number of dictionaries for sync exceeds its limit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="config_dialog.cc" line="1015"/>
+        <source>Unknown error was found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="config_dialog.cc" line="1028"/>
+        <source>Authorization error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="config_dialog.cc" line="1033"/>
+        <source>Dictionary sync error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="config_dialog.cc" line="1036"/>
+        <source>Unknown sync error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="config_dialog.cc" line="1048"/>
         <source>Clear all sync data in Google servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="995"/>
+        <location filename="config_dialog.cc" line="1049"/>
         <source>You are trying to clear all the data in the sync server.
 Do you really want to continue?</source>
         <translation type="unfinished"></translation>
@@ -1048,4 +1098,95 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>mozc::gui::WebServiceInfolistEditorDialog</name>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="99"/>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="101"/>
+        <source>Remove selected entries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="104"/>
+        <source>Import from file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="106"/>
+        <source>Export to file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="109"/>
+        <source>Help...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="111"/>
+        <source>Mozc Web Service Usage Dictionary table editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="123"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="123"/>
+        <source>URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="124"/>
+        <source>Format type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="124"/>
+        <source>Xpath/Jsonpath</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="188"/>
+        <source>Enter name of Web service</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="189"/>
+        <source>Enter URL for of Web service.
+&quot;%s&quot; is expanded to the candidate string.
+&quot;%r&quot; is expanded to the all preedit string.
+
+Example:   http://api.example.com/keyword/%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="193"/>
+        <source>Select format type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="194"/>
+        <source>Enter Xpath or Jsonpath.
+This query is used for extracting the content from URL.
+
+Example of Xpath:   //content/node
+Example of Jsonpath:   $.content.node</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="231"/>
+        <source>Mozc settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="232"/>
+        <source>You can&apos;t have more than %1 entries</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/gui/config_dialog/config_dialog_ja.qm b/gui/config_dialog/config_dialog_ja.qm
index 4f6111c..199494d 100755
Binary files a/gui/config_dialog/config_dialog_ja.qm and b/gui/config_dialog/config_dialog_ja.qm differ
diff --git a/gui/config_dialog/config_dialog_ja.ts b/gui/config_dialog/config_dialog_ja.ts
index 7d4c163..75dead8 100755
--- a/gui/config_dialog/config_dialog_ja.ts
+++ b/gui/config_dialog/config_dialog_ja.ts
@@ -231,8 +231,7 @@
     <message>
         <location filename="config_dialog.ui" line="1272"/>
         <source>Clear all sync data in Google servers. To delete data completely, make sure there is no other machine which is running sync and stop sync on this machine after clearing the data.</source>
-        <translation>同期サーバーにあるデータを全て消去します。データを消去したままにするには、他のコンピュータで実行している同期をあらかじめ解除し、消去の実行後にこのコンピュータの同期も解除してください。
-実行しますか？</translation>
+        <translation>同期サーバーにあるデータを全て消去します。データを消去したままにするには、他のコンピュータで実行している同期をあらかじめ解除し、消去の実行後にこのコンピュータの同期も解除してください。</translation>
     </message>
     <message>
         <location filename="config_dialog.ui" line="57"/>
@@ -540,12 +539,12 @@
         <translation>最終同期時刻</translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1310"/>
+        <location filename="config_dialog.ui" line="1355"/>
         <source>Misc</source>
         <translation>その他</translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1357"/>
+        <location filename="config_dialog.ui" line="1402"/>
         <source>Logging level (debug only)</source>
         <translation>ログレベル（デバッグ）</translation>
     </message>
@@ -554,23 +553,23 @@
         <translation type="obsolete">プロトコル ログを有効にする（デバッグ）</translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1386"/>
+        <location filename="config_dialog.ui" line="1431"/>
         <source>Logging</source>
         <translation>ログ</translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1418"/>
+        <location filename="config_dialog.ui" line="1463"/>
         <source>Administration</source>
         <translation>管理</translation>
     </message>
     <message>
         <location filename="config_dialog.ui" line="1113"/>
-        <location filename="config_dialog.ui" line="1456"/>
+        <location filename="config_dialog.ui" line="1501"/>
         <source>Settings...</source>
         <translation>設定変更...</translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1476"/>
+        <location filename="config_dialog.ui" line="1521"/>
         <source>Dictionary preloading and UAC settings</source>
         <translation>オンメモリ辞書とUACの設定</translation>
     </message>
@@ -600,22 +599,32 @@
         <translation>設定や同期用ユーザー辞書を、異なるコンピュータ間で安全に同期します</translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1501"/>
+        <location filename="config_dialog.ui" line="1317"/>
+        <source>Allow Using Cloud Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="config_dialog.ui" line="1333"/>
+        <source>Cloud servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="config_dialog.ui" line="1546"/>
         <source>Check if Mozc is the default IME on startup</source>
         <translation>起動時に Mozcが既定の IME であるか確認する</translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1511"/>
+        <location filename="config_dialog.ui" line="1556"/>
         <source>Disable Keyboard layout hotkey (Ctrl+Shift)</source>
         <translation>ホットキー(Ctrl+Shift)による IME の切り替えを無効化する</translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1325"/>
+        <location filename="config_dialog.ui" line="1370"/>
         <source>Default IME</source>
         <translation>既定の IME</translation>
     </message>
     <message>
-        <location filename="config_dialog.ui" line="1550"/>
+        <location filename="config_dialog.ui" line="1595"/>
         <source>Reset to defaults</source>
         <translation>初期値に戻す</translation>
     </message>
@@ -1086,18 +1095,18 @@
     </message>
     <message>
         <location filename="config_dialog.cc" line="552"/>
-        <location filename="config_dialog.cc" line="983"/>
+        <location filename="config_dialog.cc" line="985"/>
         <source>Sync is not enabled</source>
         <translation>同期機能：オフ</translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="688"/>
-        <location filename="config_dialog.cc" line="710"/>
+        <location filename="config_dialog.cc" line="690"/>
+        <location filename="config_dialog.cc" line="712"/>
         <source>Mozc Converter is not running. Settings were not saved.</source>
         <translation>変換サーバが反応していません。設定の反映に失敗しました。</translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="805"/>
+        <location filename="config_dialog.cc" line="807"/>
         <source>When you reset Mozc settings, any changes you&apos;ve made will be reverted to the default settings. Do you want to reset settings? The following items are not reset with this operation.
  - Personalization data
  - Input history
@@ -1112,39 +1121,79 @@
  - 管理者用設定</translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="833"/>
+        <location filename="config_dialog.cc" line="835"/>
         <source>Stop Sync</source>
         <translation>同期の解除</translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="835"/>
+        <location filename="config_dialog.cc" line="837"/>
         <source>Start Sync</source>
         <translation>同期する</translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="851"/>
+        <location filename="config_dialog.cc" line="853"/>
         <source>Stop sync and reset the auth token</source>
         <translation>同期の解除と認証コードのクリア</translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="852"/>
+        <location filename="config_dialog.cc" line="854"/>
         <source>You are trying to stop sync and reset the auth token. To restart sync, you will need to get a new auth token.
 Do you really want to continue?</source>
         <translation>同期の解除と認証コードのクリアを行います。同期を再開するには、新しい認証コードを取得する必要があります。
 実行しますか？</translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="936"/>
+        <location filename="config_dialog.cc" line="938"/>
         <source>Not synced yet</source>
         <translation>同期されていません</translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="940"/>
+        <location filename="config_dialog.cc" line="942"/>
         <source>Last synced time: </source>
         <translation>最終同期時刻: </translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="995"/>
+        <location filename="config_dialog.cc" line="1000"/>
+        <source>Authorization failed.</source>
+        <translation>認証に失敗しました。</translation>
+    </message>
+    <message>
+        <location filename="config_dialog.cc" line="1003"/>
+        <source>Cannot save dictionaries because Sync Dictionary exceeds its entry size limit.</source>
+        <translation>単語数の上限を超えたため同期用辞書をセーブできません。</translation>
+    </message>
+    <message>
+        <location filename="config_dialog.cc" line="1007"/>
+        <source>Cannot save dictionaries because Sync Dictionary exceeds its binary size limit.</source>
+        <translation>ファイルサイズの上限を超えたため同期用辞書をセーブできません。</translation>
+    </message>
+    <message>
+        <location filename="config_dialog.cc" line="1011"/>
+        <source>Cannot save dictionaries because the number of dictionaries for sync exceeds its limit.</source>
+        <translation>同期用辞書の数が上限を超えたため辞書をセーブできません。</translation>
+    </message>
+    <message>
+        <location filename="config_dialog.cc" line="1015"/>
+        <source>Unknown error was found.</source>
+        <translation>未知のエラーです。</translation>
+    </message>
+    <message>
+        <location filename="config_dialog.cc" line="1028"/>
+        <source>Authorization error</source>
+        <translation>認証失敗</translation>
+    </message>
+    <message>
+        <location filename="config_dialog.cc" line="1033"/>
+        <source>Dictionary sync error</source>
+        <translation>辞書同期エラー</translation>
+    </message>
+    <message>
+        <location filename="config_dialog.cc" line="1036"/>
+        <source>Unknown sync error</source>
+        <translation>未知の同期エラー</translation>
+    </message>
+    <message>
+        <location filename="config_dialog.cc" line="1049"/>
         <source>You are trying to clear all the data in the sync server.
 Do you really want to continue?</source>
         <translation>Google サーバー上の同期データを全て消去します。
@@ -1159,12 +1208,12 @@
         <translation type="obsolete">同期失敗</translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="980"/>
+        <location filename="config_dialog.cc" line="982"/>
         <source>During synchronization</source>
         <translation>同期中です</translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="994"/>
+        <location filename="config_dialog.cc" line="1048"/>
         <source>Clear all sync data in Google servers</source>
         <translation>Google サーバー上の同期データを全て消去する</translation>
     </message>
@@ -1173,13 +1222,13 @@
         <location filename="config_dialog.cc" line="365"/>
         <location filename="config_dialog.cc" line="379"/>
         <location filename="config_dialog.cc" line="387"/>
-        <location filename="config_dialog.cc" line="673"/>
-        <location filename="config_dialog.cc" line="687"/>
-        <location filename="config_dialog.cc" line="697"/>
-        <location filename="config_dialog.cc" line="709"/>
-        <location filename="config_dialog.cc" line="719"/>
-        <location filename="config_dialog.cc" line="731"/>
-        <location filename="config_dialog.cc" line="804"/>
+        <location filename="config_dialog.cc" line="675"/>
+        <location filename="config_dialog.cc" line="689"/>
+        <location filename="config_dialog.cc" line="699"/>
+        <location filename="config_dialog.cc" line="711"/>
+        <location filename="config_dialog.cc" line="721"/>
+        <location filename="config_dialog.cc" line="733"/>
+        <location filename="config_dialog.cc" line="806"/>
         <source>Mozc settings</source>
         <translation>Mozc プロパティ</translation>
     </message>
@@ -1204,22 +1253,22 @@
         <translation>設定の反映に失敗しました</translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="674"/>
+        <location filename="config_dialog.cc" line="676"/>
         <source>Do you want to clear personalization data? Input history is not reset with this operation. Please open &quot;suggestion&quot; tab to remove input history data.</source>
         <translation>学習結果がリセットされます。実行しますか？ 入力履歴データはリセットされません。入力履歴データのリセットは「サジェスト→全入力履歴の削除」で行えます。</translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="732"/>
+        <location filename="config_dialog.cc" line="734"/>
         <source>Mozc Converter is not running. Operation was not executed.</source>
         <translation>Mozcコンバーターが起動していません。設定の反映に失敗しました。</translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="698"/>
+        <location filename="config_dialog.cc" line="700"/>
         <source>Do you want to clear all history data?</source>
         <translation>すべての入力履歴が削除されます。実行しますか？</translation>
     </message>
     <message>
-        <location filename="config_dialog.cc" line="720"/>
+        <location filename="config_dialog.cc" line="722"/>
         <source>Do you want to clear unused history data?</source>
         <translation>サジェスト経由で入力されなかった履歴が削除されます。実行しますか？</translation>
     </message>
@@ -1466,20 +1515,92 @@
 <context>
     <name>mozc::gui::WebServiceInfolistEditorDialog</name>
     <message>
+        <location filename="webservice_infolist_editor.cc" line="99"/>
         <source>New entry</source>
-        <translation type="obsolete">新しいエントリー</translation>
-    </message>
-    <message>
+        <translation type="unfinished">新しいエントリー</translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="101"/>
         <source>Remove selected entries</source>
-        <translation type="obsolete">選択されたエントリーを削除</translation>
-    </message>
-    <message>
+        <translation type="unfinished">選択されたエントリーを削除</translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="104"/>
         <source>Import from file...</source>
-        <translation type="obsolete">インポート...</translation>
-    </message>
-    <message>
+        <translation type="unfinished">インポート...</translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="106"/>
         <source>Export to file...</source>
-        <translation type="obsolete">エクスポート...</translation>
+        <translation type="unfinished">エクスポート...</translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="109"/>
+        <source>Help...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="111"/>
+        <source>Mozc Web Service Usage Dictionary table editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="123"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="123"/>
+        <source>URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="124"/>
+        <source>Format type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="124"/>
+        <source>Xpath/Jsonpath</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="188"/>
+        <source>Enter name of Web service</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="189"/>
+        <source>Enter URL for of Web service.
+&quot;%s&quot; is expanded to the candidate string.
+&quot;%r&quot; is expanded to the all preedit string.
+
+Example:   http://api.example.com/keyword/%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="193"/>
+        <source>Select format type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="194"/>
+        <source>Enter Xpath or Jsonpath.
+This query is used for extracting the content from URL.
+
+Example of Xpath:   //content/node
+Example of Jsonpath:   $.content.node</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="231"/>
+        <source>Mozc settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webservice_infolist_editor.cc" line="232"/>
+        <source>You can&apos;t have more than %1 entries</source>
+        <translation type="unfinished">%1 個以上のエントリーは登録できません</translation>
     </message>
     <message>
         <source>Do you want to overwrite the current roman table?</source>
diff --git a/gui/config_dialog/config_dialog_libmain.cc b/gui/config_dialog/config_dialog_libmain.cc
index fc2bbba..b83f7a3 100755
--- a/gui/config_dialog/config_dialog_libmain.cc
+++ b/gui/config_dialog/config_dialog_libmain.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/config_dialog_main.cc b/gui/config_dialog/config_dialog_main.cc
index 9495619..646e097 100755
--- a/gui/config_dialog/config_dialog_main.cc
+++ b/gui/config_dialog/config_dialog_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/generic_table_editor.cc b/gui/config_dialog/generic_table_editor.cc
index 908e0e4..f1f9cdf 100755
--- a/gui/config_dialog/generic_table_editor.cc
+++ b/gui/config_dialog/generic_table_editor.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/generic_table_editor.h b/gui/config_dialog/generic_table_editor.h
index 1060089..af543a6 100755
--- a/gui/config_dialog/generic_table_editor.h
+++ b/gui/config_dialog/generic_table_editor.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/keybinding_editor.cc b/gui/config_dialog/keybinding_editor.cc
index c17efc6..a28310a 100755
--- a/gui/config_dialog/keybinding_editor.cc
+++ b/gui/config_dialog/keybinding_editor.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -33,6 +33,9 @@
 #include <windows.h>
 #include <imm.h>
 #include <ime.h>
+#elif OS_LINUX
+#define XK_MISCELLANY
+#include <X11/keysymdef.h>
 #endif
 
 #include <QtCore/QString>
@@ -118,6 +121,20 @@
   { VK_DBE_DBCSCHAR, "Hankaku/Zenkaku" },        // Zenkaku/hankaku
   // { VK_KANJI, "Kanji" },  // Do not support Kanji
 };
+#elif OS_LINUX
+struct LinuxVirtualKeyEntry {
+  uint16 virtual_key;
+  const char *mozc_key_name;
+};
+
+const LinuxVirtualKeyEntry kLinuxVirtualKeyModifierNonRequiredTable[] = {
+  { XK_Muhenkan, "Muhenkan" },
+  { XK_Henkan, "Henkan" },
+  { XK_Hiragana, "Hiragana" },
+  { XK_Katakana, "Katakana" },
+  { XK_Eisu_toggle, "Eisu" },
+  { XK_Zenkaku_Hankaku, "Hankaku/Zenkaku" },
+};
 #endif
 
 // On Windows Hiragana/Eisu keys only emits KEY_DOWN event.
@@ -367,6 +384,18 @@
         virtual_key) {
       modifier_non_required_key_ =
           kWinVirtualKeyModifierNonRequiredTable[i].mozc_key_name;
+      return Encode(result);
+    }
+  }
+#elif OS_LINUX
+  // Handle JP109's Muhenkan/Henkan/katakana-hiragana and Zenkaku/Hankaku
+  const uint16 virtual_key = key_event.nativeVirtualKey();
+  for (size_t i = 0; i < arraysize(kLinuxVirtualKeyModifierNonRequiredTable);
+       ++i) {
+    if (kLinuxVirtualKeyModifierNonRequiredTable[i].virtual_key ==
+        virtual_key) {
+      modifier_non_required_key_ =
+          kLinuxVirtualKeyModifierNonRequiredTable[i].mozc_key_name;
       return Encode(result);
     }
   }
diff --git a/gui/config_dialog/keybinding_editor.h b/gui/config_dialog/keybinding_editor.h
index 4db5853..14bcc49 100755
--- a/gui/config_dialog/keybinding_editor.h
+++ b/gui/config_dialog/keybinding_editor.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/keybinding_editor_delegate.cc b/gui/config_dialog/keybinding_editor_delegate.cc
index 9afd609..7985496 100755
--- a/gui/config_dialog/keybinding_editor_delegate.cc
+++ b/gui/config_dialog/keybinding_editor_delegate.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/keybinding_editor_delegate.h b/gui/config_dialog/keybinding_editor_delegate.h
index 25843ed..7c3961a 100755
--- a/gui/config_dialog/keybinding_editor_delegate.h
+++ b/gui/config_dialog/keybinding_editor_delegate.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/keymap_editor.cc b/gui/config_dialog/keymap_editor.cc
index 5bc096d..33ab590 100755
--- a/gui/config_dialog/keymap_editor.cc
+++ b/gui/config_dialog/keymap_editor.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -94,13 +94,13 @@
     invisible_commands_.insert(kReportBugCommand);
     // Old command name.
     invisible_commands_.insert(kEditInsertCommand);
-#if defined(OS_MACOSX) || defined(OS_LINUX)
-    // On Mac/Linux, we cannot customize keybindings for IME ON/OFF
+#if defined(OS_MACOSX)
+    // On Mac, we cannot customize keybindings for IME ON/OFF
     // So we do not show them.
     // TODO(toshiyuki): remove them after implimenting IME ON/OFF for Mac
     invisible_commands_.insert(kIMEOnCommand);
     invisible_commands_.insert(kIMEOffCommand);
-#endif  // OS_MACOSX || OS_LINUX
+#endif  // OS_MACOSX
 
     invisible_modifiers_.insert(mozc::commands::KeyEvent::KEY_DOWN);
     invisible_modifiers_.insert(mozc::commands::KeyEvent::KEY_UP);
diff --git a/gui/config_dialog/keymap_editor.h b/gui/config_dialog/keymap_editor.h
index ea44ac4..31ac5e6 100755
--- a/gui/config_dialog/keymap_editor.h
+++ b/gui/config_dialog/keymap_editor.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/keymap_en.qm b/gui/config_dialog/keymap_en.qm
index 900400e..17aae0e 100755
Binary files a/gui/config_dialog/keymap_en.qm and b/gui/config_dialog/keymap_en.qm differ
diff --git a/gui/config_dialog/keymap_en.ts b/gui/config_dialog/keymap_en.ts
index a2e7aa3..07c70a7 100755
--- a/gui/config_dialog/keymap_en.ts
+++ b/gui/config_dialog/keymap_en.ts
@@ -244,10 +244,6 @@
         <translation>Undo</translation>
     </message>
     <message>
-        <source>SegmentFocusRightOrCommit</source>
-        <translation>Move segment focus right or commit segment</translation>
-    </message>
-    <message>
         <source>Reconvert</source>
         <translation>Reconvert</translation>
     </message>
diff --git a/gui/config_dialog/keymap_ja.qm b/gui/config_dialog/keymap_ja.qm
index 9997928..f30a832 100755
Binary files a/gui/config_dialog/keymap_ja.qm and b/gui/config_dialog/keymap_ja.qm differ
diff --git a/gui/config_dialog/keymap_ja.ts b/gui/config_dialog/keymap_ja.ts
index 1b1751a..52b183d 100755
--- a/gui/config_dialog/keymap_ja.ts
+++ b/gui/config_dialog/keymap_ja.ts
@@ -244,10 +244,6 @@
         <translation>確定取り消し</translation>
     </message>
     <message>
-        <source>SegmentFocusRightOrCommit</source>
-        <translation>文節を右に移動または確定</translation>
-    </message>
-    <message>
         <source>Reconvert</source>
         <translation>再変換</translation>
     </message>
diff --git a/gui/config_dialog/roman_table_editor.cc b/gui/config_dialog/roman_table_editor.cc
index a2cacd9..c49cd5c 100755
--- a/gui/config_dialog/roman_table_editor.cc
+++ b/gui/config_dialog/roman_table_editor.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/roman_table_editor.h b/gui/config_dialog/roman_table_editor.h
index 375453f..a96e916 100755
--- a/gui/config_dialog/roman_table_editor.h
+++ b/gui/config_dialog/roman_table_editor.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/sync_customize_dialog.cc b/gui/config_dialog/sync_customize_dialog.cc
index a092873..4a3d47a 100755
--- a/gui/config_dialog/sync_customize_dialog.cc
+++ b/gui/config_dialog/sync_customize_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/config_dialog/sync_customize_dialog.h b/gui/config_dialog/sync_customize_dialog.h
index 4a9e8c8..f010c0d 100755
--- a/gui/config_dialog/sync_customize_dialog.h
+++ b/gui/config_dialog/sync_customize_dialog.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/confirmation_dialog/confirmation_dialog.cc b/gui/confirmation_dialog/confirmation_dialog.cc
index 8df76be..3915648 100755
--- a/gui/confirmation_dialog/confirmation_dialog.cc
+++ b/gui/confirmation_dialog/confirmation_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/confirmation_dialog/confirmation_dialog.h b/gui/confirmation_dialog/confirmation_dialog.h
index 346a748..edd22a6 100755
--- a/gui/confirmation_dialog/confirmation_dialog.h
+++ b/gui/confirmation_dialog/confirmation_dialog.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/confirmation_dialog/confirmation_dialog_libmain.cc b/gui/confirmation_dialog/confirmation_dialog_libmain.cc
index 5e67b40..c9183bf 100755
--- a/gui/confirmation_dialog/confirmation_dialog_libmain.cc
+++ b/gui/confirmation_dialog/confirmation_dialog_libmain.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/confirmation_dialog/confirmation_dialog_main.cc b/gui/confirmation_dialog/confirmation_dialog_main.cc
index 1e53963..a639b82 100755
--- a/gui/confirmation_dialog/confirmation_dialog_main.cc
+++ b/gui/confirmation_dialog/confirmation_dialog_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/dictionary_tool/dictionary_content_table_widget.cc b/gui/dictionary_tool/dictionary_content_table_widget.cc
index 71909d0..00cb5c2 100755
--- a/gui/dictionary_tool/dictionary_content_table_widget.cc
+++ b/gui/dictionary_tool/dictionary_content_table_widget.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/dictionary_tool/dictionary_content_table_widget.h b/gui/dictionary_tool/dictionary_content_table_widget.h
index ea4be0d..d3b0e25 100755
--- a/gui/dictionary_tool/dictionary_content_table_widget.h
+++ b/gui/dictionary_tool/dictionary_content_table_widget.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/dictionary_tool/dictionary_tool.cc b/gui/dictionary_tool/dictionary_tool.cc
index e4eb16b..2f60969 100755
--- a/gui/dictionary_tool/dictionary_tool.cc
+++ b/gui/dictionary_tool/dictionary_tool.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/dictionary_tool/dictionary_tool.h b/gui/dictionary_tool/dictionary_tool.h
index d3a9779..0062ad1 100755
--- a/gui/dictionary_tool/dictionary_tool.h
+++ b/gui/dictionary_tool/dictionary_tool.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/dictionary_tool/dictionary_tool_libmain.cc b/gui/dictionary_tool/dictionary_tool_libmain.cc
index f70a5e6..b918aca 100755
--- a/gui/dictionary_tool/dictionary_tool_libmain.cc
+++ b/gui/dictionary_tool/dictionary_tool_libmain.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/dictionary_tool/dictionary_tool_main.cc b/gui/dictionary_tool/dictionary_tool_main.cc
index 8963e95..31e35ae 100755
--- a/gui/dictionary_tool/dictionary_tool_main.cc
+++ b/gui/dictionary_tool/dictionary_tool_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/dictionary_tool/find_dialog.cc b/gui/dictionary_tool/find_dialog.cc
index 9570350..bbc2f29 100755
--- a/gui/dictionary_tool/find_dialog.cc
+++ b/gui/dictionary_tool/find_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/dictionary_tool/find_dialog.h b/gui/dictionary_tool/find_dialog.h
index 824e00c..30a1766 100755
--- a/gui/dictionary_tool/find_dialog.h
+++ b/gui/dictionary_tool/find_dialog.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/dictionary_tool/import_dialog.cc b/gui/dictionary_tool/import_dialog.cc
index 35539b2..4d825ea 100755
--- a/gui/dictionary_tool/import_dialog.cc
+++ b/gui/dictionary_tool/import_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/dictionary_tool/import_dialog.h b/gui/dictionary_tool/import_dialog.h
index be44469..0a3b658 100755
--- a/gui/dictionary_tool/import_dialog.h
+++ b/gui/dictionary_tool/import_dialog.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/dictionary_tool/zero_width_splitter.cc b/gui/dictionary_tool/zero_width_splitter.cc
index afab701..84e8450 100755
--- a/gui/dictionary_tool/zero_width_splitter.cc
+++ b/gui/dictionary_tool/zero_width_splitter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/dictionary_tool/zero_width_splitter.h b/gui/dictionary_tool/zero_width_splitter.h
index a8039f0..d4aade7 100755
--- a/gui/dictionary_tool/zero_width_splitter.h
+++ b/gui/dictionary_tool/zero_width_splitter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/error_message_dialog/error_message_dialog.cc b/gui/error_message_dialog/error_message_dialog.cc
index b0c23f9..d62d98c 100755
--- a/gui/error_message_dialog/error_message_dialog.cc
+++ b/gui/error_message_dialog/error_message_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/error_message_dialog/error_message_dialog.h b/gui/error_message_dialog/error_message_dialog.h
index 8d6d8b3..4bcca83 100755
--- a/gui/error_message_dialog/error_message_dialog.h
+++ b/gui/error_message_dialog/error_message_dialog.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/error_message_dialog/error_message_dialog_libmain.cc b/gui/error_message_dialog/error_message_dialog_libmain.cc
index e9f116c..a7c6097 100755
--- a/gui/error_message_dialog/error_message_dialog_libmain.cc
+++ b/gui/error_message_dialog/error_message_dialog_libmain.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/error_message_dialog/error_message_dialog_main.cc b/gui/error_message_dialog/error_message_dialog_main.cc
index e9a365c..d319c97 100755
--- a/gui/error_message_dialog/error_message_dialog_main.cc
+++ b/gui/error_message_dialog/error_message_dialog_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/gui.gyp b/gui/gui.gyp
index 01638b5..038d204 100755
--- a/gui/gui.gyp
+++ b/gui/gui.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gui/mac_gui.gypi b/gui/mac_gui.gypi
index 9f40e19..d3731bb 100755
--- a/gui/mac_gui.gypi
+++ b/gui/mac_gui.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gui/post_install_dialog/post_install_dialog.cc b/gui/post_install_dialog/post_install_dialog.cc
index 7e8f2e0..6e7b7a9 100755
--- a/gui/post_install_dialog/post_install_dialog.cc
+++ b/gui/post_install_dialog/post_install_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/post_install_dialog/post_install_dialog.h b/gui/post_install_dialog/post_install_dialog.h
index e2b636b..bfcf2e3 100755
--- a/gui/post_install_dialog/post_install_dialog.h
+++ b/gui/post_install_dialog/post_install_dialog.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/post_install_dialog/post_install_dialog_libmain.cc b/gui/post_install_dialog/post_install_dialog_libmain.cc
index 6576f83..0c8ea9d 100755
--- a/gui/post_install_dialog/post_install_dialog_libmain.cc
+++ b/gui/post_install_dialog/post_install_dialog_libmain.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/post_install_dialog/post_install_dialog_main.cc b/gui/post_install_dialog/post_install_dialog_main.cc
index ecbfd4d..79a9897 100755
--- a/gui/post_install_dialog/post_install_dialog_main.cc
+++ b/gui/post_install_dialog/post_install_dialog_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/qt_libraries.gypi b/gui/qt_libraries.gypi
index b406bc6..ba5bf3e 100755
--- a/gui/qt_libraries.gypi
+++ b/gui/qt_libraries.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gui/qt_moc.gypi b/gui/qt_moc.gypi
index 08a9efd..806f613 100755
--- a/gui/qt_moc.gypi
+++ b/gui/qt_moc.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gui/qt_rcc.gypi b/gui/qt_rcc.gypi
index bdc4580..9542c10 100755
--- a/gui/qt_rcc.gypi
+++ b/gui/qt_rcc.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gui/qt_target_defaults.gypi b/gui/qt_target_defaults.gypi
index 22734f9..30c155c 100755
--- a/gui/qt_target_defaults.gypi
+++ b/gui/qt_target_defaults.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gui/qt_uic.gypi b/gui/qt_uic.gypi
index 3e7b6ea..b4f5d3d 100755
--- a/gui/qt_uic.gypi
+++ b/gui/qt_uic.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gui/qt_vars.gypi b/gui/qt_vars.gypi
index 844b88a..2eaab27 100755
--- a/gui/qt_vars.gypi
+++ b/gui/qt_vars.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gui/set_default_dialog/set_default_dialog.cc b/gui/set_default_dialog/set_default_dialog.cc
index 32eceda..d7868b0 100755
--- a/gui/set_default_dialog/set_default_dialog.cc
+++ b/gui/set_default_dialog/set_default_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/set_default_dialog/set_default_dialog.h b/gui/set_default_dialog/set_default_dialog.h
index 4f5bd24..46b275d 100755
--- a/gui/set_default_dialog/set_default_dialog.h
+++ b/gui/set_default_dialog/set_default_dialog.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/set_default_dialog/set_default_dialog_libmain.cc b/gui/set_default_dialog/set_default_dialog_libmain.cc
index bdf6863..e6d7f77 100755
--- a/gui/set_default_dialog/set_default_dialog_libmain.cc
+++ b/gui/set_default_dialog/set_default_dialog_libmain.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/set_default_dialog/set_default_dialog_main.cc b/gui/set_default_dialog/set_default_dialog_main.cc
index e876dce..353fa60 100755
--- a/gui/set_default_dialog/set_default_dialog_main.cc
+++ b/gui/set_default_dialog/set_default_dialog_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/tool/mozc_tool_libmain.cc b/gui/tool/mozc_tool_libmain.cc
index acc1260..06cf1c1 100755
--- a/gui/tool/mozc_tool_libmain.cc
+++ b/gui/tool/mozc_tool_libmain.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/tool/mozc_tool_libmain.h b/gui/tool/mozc_tool_libmain.h
index 1c94ad8..30c24b8 100755
--- a/gui/tool/mozc_tool_libmain.h
+++ b/gui/tool/mozc_tool_libmain.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/tool/mozc_tool_main.cc b/gui/tool/mozc_tool_main.cc
index 513e43f..fe0a4fb 100755
--- a/gui/tool/mozc_tool_main.cc
+++ b/gui/tool/mozc_tool_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/tool/mozc_tool_main_noqt.cc b/gui/tool/mozc_tool_main_noqt.cc
index 40bd8bf..572cd5c 100755
--- a/gui/tool/mozc_tool_main_noqt.cc
+++ b/gui/tool/mozc_tool_main_noqt.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/update_dialog/update_dialog.cc b/gui/update_dialog/update_dialog.cc
index c67dfa5..917894a 100755
--- a/gui/update_dialog/update_dialog.cc
+++ b/gui/update_dialog/update_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/update_dialog/update_dialog.h b/gui/update_dialog/update_dialog.h
index f9c6220..188ab8f 100755
--- a/gui/update_dialog/update_dialog.h
+++ b/gui/update_dialog/update_dialog.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/update_dialog/update_dialog_libmain.cc b/gui/update_dialog/update_dialog_libmain.cc
index 314ca7e..a71c6c4 100755
--- a/gui/update_dialog/update_dialog_libmain.cc
+++ b/gui/update_dialog/update_dialog_libmain.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/update_dialog/update_dialog_main.cc b/gui/update_dialog/update_dialog_main.cc
index 89b98c0..8f06aa4 100755
--- a/gui/update_dialog/update_dialog_main.cc
+++ b/gui/update_dialog/update_dialog_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/word_register_dialog/word_register_dialog.cc b/gui/word_register_dialog/word_register_dialog.cc
index 16a9504..5e51aa3 100755
--- a/gui/word_register_dialog/word_register_dialog.cc
+++ b/gui/word_register_dialog/word_register_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/word_register_dialog/word_register_dialog.h b/gui/word_register_dialog/word_register_dialog.h
index a438e9c..a80774c 100755
--- a/gui/word_register_dialog/word_register_dialog.h
+++ b/gui/word_register_dialog/word_register_dialog.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/word_register_dialog/word_register_dialog_libmain.cc b/gui/word_register_dialog/word_register_dialog_libmain.cc
index f85ecfe..1fe5ad7 100755
--- a/gui/word_register_dialog/word_register_dialog_libmain.cc
+++ b/gui/word_register_dialog/word_register_dialog_libmain.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/word_register_dialog/word_register_dialog_main.cc b/gui/word_register_dialog/word_register_dialog_main.cc
index 21f7abf..3be226d 100755
--- a/gui/word_register_dialog/word_register_dialog_main.cc
+++ b/gui/word_register_dialog/word_register_dialog_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/gui/zinnia.gyp b/gui/zinnia.gyp
index b4cd01c..e4d323a 100755
--- a/gui/zinnia.gyp
+++ b/gui/zinnia.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gyp/breakpad.gyp b/gyp/breakpad.gyp
index 5f7a907..f626047 100755
--- a/gyp/breakpad.gyp
+++ b/gyp/breakpad.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gyp/breakpad_mac.gypi b/gyp/breakpad_mac.gypi
index 507f456..6563c2d 100755
--- a/gyp/breakpad_mac.gypi
+++ b/gyp/breakpad_mac.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gyp/common.gypi b/gyp/common.gypi
index 0773bdc..3d70455 100755
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -137,6 +137,9 @@
     # (e.g. extra CFLAGS), also creates a new target in the src/chrome
     # project file called "coverage".
     'coverage%': 0,
+
+    # enable_cloud_sync represents if cloud sync feature is enabled or not.
+    'enable_cloud_sync%': 0,
 
     # The pkg-config command to get the cflags/ldflags for Linux
     # builds.  We make it customizable to allow building in a special
@@ -197,6 +200,9 @@
               '<@(linux_ldflags)',
             ],
           }],
+          ['enable_cloud_sync==1', {
+            'defines': ['CLOUD_SYNC'],
+          }],
         ],
       },
       'x86_Base': {
@@ -231,7 +237,24 @@
             'Optimization': '<(win_optimization_debug)',
             'PreprocessorDefinitions': ['_DEBUG'],
             'BasicRuntimeChecks': '3',
-            'RuntimeLibrary': '<(win_debug_static_crt)',
+            'conditions': [
+              ['use_dynamically_linked_qt=="YES"', {
+                # As a quick workaround, use dynamically-linked version of CRT
+                # if 'use_dynamically_linked_qt' is specified.
+                # As for GoogleJapaneseInput branding build, this is not enough
+                # because we cannot completely depend on dynamic CRT as
+                # described in b/2506385. We should use static CRT for the
+                # following binaries.
+                # - GoogleIMEJaCacheService.exe
+                # - GoogleIMEJaInstallerHelper32.dll
+                # - GoogleIMEJaInstallerHelper64.dll
+                # - any artifacts build in 'build_mozc.py build_tools'
+                # TODO(yukawa): Support GoogleJapaneseInput branding build.
+                'RuntimeLibrary': '<(win_debug_dynamic_crt)',
+              }, {  # else
+                'RuntimeLibrary': '<(win_debug_static_crt)',
+              }],
+            ],
           },
           'VCResourceCompilerTool': {
             'PreprocessorDefinitions': ['_DEBUG'],
@@ -273,7 +296,24 @@
             # are built with /O2.  We use the same optimization option between
             # Mozc and Qt just in case warning C4748 is true.
             'Optimization': '<(win_optimization_release)',
-            'RuntimeLibrary': '<(win_release_static_crt)',
+            'conditions': [
+              ['use_dynamically_linked_qt=="YES"', {
+                # As a quick workaround, use dynamically-linked version of CRT
+                # if 'use_dynamically_linked_qt' is specified.
+                # As for GoogleJapaneseInput branding build, this is not enough
+                # because we cannot completely depend on dynamic CRT as
+                # described in b/2506385. We should use static CRT for the
+                # following binaries.
+                # - GoogleIMEJaCacheService.exe
+                # - GoogleIMEJaInstallerHelper32.dll
+                # - GoogleIMEJaInstallerHelper64.dll
+                # - any artifacts build in 'build_mozc.py build_tools'
+                # TODO(yukawa): Support GoogleJapaneseInput branding build.
+                'RuntimeLibrary': '<(win_release_dynamic_crt)',
+              }, {  # else
+                'RuntimeLibrary': '<(win_release_static_crt)',
+              }],
+            ],
           },
         },
         'conditions': [
diff --git a/gyp/gen_win32_resource_header.gypi b/gyp/gen_win32_resource_header.gypi
index f9a8171..43edc0a 100755
--- a/gyp/gen_win32_resource_header.gypi
+++ b/gyp/gen_win32_resource_header.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gyp/install_build_tool.gypi b/gyp/install_build_tool.gypi
index c1ddd6c..908a248 100755
--- a/gyp/install_build_tool.gypi
+++ b/gyp/install_build_tool.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gyp/install_testdata.gypi b/gyp/install_testdata.gypi
index f4419d8..886c38d 100755
--- a/gyp/install_testdata.gypi
+++ b/gyp/install_testdata.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gyp/jsoncpp.gyp b/gyp/jsoncpp.gyp
index d84cd19..f19babe 100755
--- a/gyp/jsoncpp.gyp
+++ b/gyp/jsoncpp.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gyp/postbuilds_mac.gypi b/gyp/postbuilds_mac.gypi
index 571e164..60acc55 100755
--- a/gyp/postbuilds_mac.gypi
+++ b/gyp/postbuilds_mac.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gyp/postbuilds_win.gypi b/gyp/postbuilds_win.gypi
index 4410a71..3992b75 100755
--- a/gyp/postbuilds_win.gypi
+++ b/gyp/postbuilds_win.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gyp/rx.gyp b/gyp/rx.gyp
index d464405..8e5b587 100755
--- a/gyp/rx.gyp
+++ b/gyp/rx.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/gyp/tests.gyp b/gyp/tests.gyp
index 2024b08..4ae94f4 100755
--- a/gyp/tests.gyp
+++ b/gyp/tests.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/handwriting/handwriting.gyp b/handwriting/handwriting.gyp
index 062f018..1009837 100755
--- a/handwriting/handwriting.gyp
+++ b/handwriting/handwriting.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/handwriting/handwriting_manager.cc b/handwriting/handwriting_manager.cc
index be0b331..fbce7cd 100755
--- a/handwriting/handwriting_manager.cc
+++ b/handwriting/handwriting_manager.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/handwriting/handwriting_manager.h b/handwriting/handwriting_manager.h
index dfac252..635e5cd 100755
--- a/handwriting/handwriting_manager.h
+++ b/handwriting/handwriting_manager.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/handwriting/handwriting_manager_test.cc b/handwriting/handwriting_manager_test.cc
index e53ffe2..a9b9490 100755
--- a/handwriting/handwriting_manager_test.cc
+++ b/handwriting/handwriting_manager_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/handwriting/handwriting_test.gyp b/handwriting/handwriting_test.gyp
index 618d411..ff50722 100755
--- a/handwriting/handwriting_test.gyp
+++ b/handwriting/handwriting_test.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/handwriting/zinnia_handwriting.cc b/handwriting/zinnia_handwriting.cc
index 874adda..2ed792a 100755
--- a/handwriting/zinnia_handwriting.cc
+++ b/handwriting/zinnia_handwriting.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/handwriting/zinnia_handwriting.h b/handwriting/zinnia_handwriting.h
index e024f4f..4edea88 100755
--- a/handwriting/zinnia_handwriting.h
+++ b/handwriting/zinnia_handwriting.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/ipc.cc b/ipc/ipc.cc
index 8c779ba..874cfc6 100755
--- a/ipc/ipc.cc
+++ b/ipc/ipc.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index 2a0d4f2..ded3c3b 100755
--- a/ipc/ipc.gyp
+++ b/ipc/ipc.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/ipc/ipc.h b/ipc/ipc.h
index 0c713e1..01fafc5 100755
--- a/ipc/ipc.h
+++ b/ipc/ipc.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/ipc.proto b/ipc/ipc.proto
index eb84c33..10a3fb1 100755
--- a/ipc/ipc.proto
+++ b/ipc/ipc.proto
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/ipc_main.cc b/ipc/ipc_main.cc
index 1444302..fae5a0f 100755
--- a/ipc/ipc_main.cc
+++ b/ipc/ipc_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/ipc_mock.cc b/ipc/ipc_mock.cc
index 22af18f..4f93793 100755
--- a/ipc/ipc_mock.cc
+++ b/ipc/ipc_mock.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/ipc_mock.h b/ipc/ipc_mock.h
index 63bd4a6..0d3a01b 100755
--- a/ipc/ipc_mock.h
+++ b/ipc/ipc_mock.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/ipc_path_manager.cc b/ipc/ipc_path_manager.cc
index db5b5d7..a5a62fb 100755
--- a/ipc/ipc_path_manager.cc
+++ b/ipc/ipc_path_manager.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/ipc_path_manager.h b/ipc/ipc_path_manager.h
index 1e7801b..8328a2d 100755
--- a/ipc/ipc_path_manager.h
+++ b/ipc/ipc_path_manager.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/ipc_path_manager_main.cc b/ipc/ipc_path_manager_main.cc
index 877cc7f..632935b 100755
--- a/ipc/ipc_path_manager_main.cc
+++ b/ipc/ipc_path_manager_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/ipc_path_manager_test.cc b/ipc/ipc_path_manager_test.cc
index 82cea4a..f0b5fcc 100755
--- a/ipc/ipc_path_manager_test.cc
+++ b/ipc/ipc_path_manager_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/ipc_test.cc b/ipc/ipc_test.cc
index 8065e7f..5940926 100755
--- a/ipc/ipc_test.cc
+++ b/ipc/ipc_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/ipc_test_util.cc b/ipc/ipc_test_util.cc
index 722424b..59c4825 100755
--- a/ipc/ipc_test_util.cc
+++ b/ipc/ipc_test_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/ipc_test_util.h b/ipc/ipc_test_util.h
index 7a8415f..6518619 100755
--- a/ipc/ipc_test_util.h
+++ b/ipc/ipc_test_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/mach_ipc.cc b/ipc/mach_ipc.cc
index 1d8fe53..8ab0949 100755
--- a/ipc/mach_ipc.cc
+++ b/ipc/mach_ipc.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/named_event.cc b/ipc/named_event.cc
index eab8a27..dc1c3cb 100755
--- a/ipc/named_event.cc
+++ b/ipc/named_event.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/named_event.h b/ipc/named_event.h
index e3b1fb7..401e6d6 100755
--- a/ipc/named_event.h
+++ b/ipc/named_event.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/named_event_main.cc b/ipc/named_event_main.cc
index bdd2787..1cb350f 100755
--- a/ipc/named_event_main.cc
+++ b/ipc/named_event_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/named_event_test.cc b/ipc/named_event_test.cc
index ba0e674..4c67ba9 100755
--- a/ipc/named_event_test.cc
+++ b/ipc/named_event_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/process_watch_dog.cc b/ipc/process_watch_dog.cc
index 0a2b6a2..fd1c1a7 100755
--- a/ipc/process_watch_dog.cc
+++ b/ipc/process_watch_dog.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/process_watch_dog.h b/ipc/process_watch_dog.h
index b593498..3c5f498 100755
--- a/ipc/process_watch_dog.h
+++ b/ipc/process_watch_dog.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/process_watch_dog_main.cc b/ipc/process_watch_dog_main.cc
index 053aa05..57281f2 100755
--- a/ipc/process_watch_dog_main.cc
+++ b/ipc/process_watch_dog_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/process_watch_dog_test.cc b/ipc/process_watch_dog_test.cc
index 67b8b26..88d8187 100755
--- a/ipc/process_watch_dog_test.cc
+++ b/ipc/process_watch_dog_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/unix_ipc.cc b/ipc/unix_ipc.cc
index 3085320..acdc334 100755
--- a/ipc/unix_ipc.cc
+++ b/ipc/unix_ipc.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/win32_ipc.cc b/ipc/win32_ipc.cc
index 59ae489..0b55584 100755
--- a/ipc/win32_ipc.cc
+++ b/ipc/win32_ipc.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/ipc/window_info.proto b/ipc/window_info.proto
index ac093f0..da36be2 100755
--- a/ipc/window_info.proto
+++ b/ipc/window_info.proto
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/chewing/chewing.gyp b/languages/chewing/chewing.gyp
index 353f240..18fa842 100755
--- a/languages/chewing/chewing.gyp
+++ b/languages/chewing/chewing.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/languages/chewing/chewing_libraries.gypi b/languages/chewing/chewing_libraries.gypi
index 31f7cea..d71002d 100755
--- a/languages/chewing/chewing_libraries.gypi
+++ b/languages/chewing/chewing_libraries.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/languages/chewing/chewing_session_factory.cc b/languages/chewing/chewing_session_factory.cc
index c5bf198..61c2428 100755
--- a/languages/chewing/chewing_session_factory.cc
+++ b/languages/chewing/chewing_session_factory.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/chewing/chewing_session_factory.h b/languages/chewing/chewing_session_factory.h
index 529a37f..18af217 100755
--- a/languages/chewing/chewing_session_factory.h
+++ b/languages/chewing/chewing_session_factory.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/chewing/lang_dep_spec.cc b/languages/chewing/lang_dep_spec.cc
index 2b55cee..62c2f90 100755
--- a/languages/chewing/lang_dep_spec.cc
+++ b/languages/chewing/lang_dep_spec.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/chewing/lang_dep_spec.h b/languages/chewing/lang_dep_spec.h
index 84a9bfe..9de81da 100755
--- a/languages/chewing/lang_dep_spec.h
+++ b/languages/chewing/lang_dep_spec.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/chewing/scoped_chewing_ptr.h b/languages/chewing/scoped_chewing_ptr.h
index 2a33227..c28e344 100755
--- a/languages/chewing/scoped_chewing_ptr.h
+++ b/languages/chewing/scoped_chewing_ptr.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/chewing/server_main.cc b/languages/chewing/server_main.cc
index a4f1084..107a283 100755
--- a/languages/chewing/server_main.cc
+++ b/languages/chewing/server_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/chewing/session.cc b/languages/chewing/session.cc
index a53c3d6..76ade2b 100755
--- a/languages/chewing/session.cc
+++ b/languages/chewing/session.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -351,7 +351,7 @@
   }
   if (new_mode != commands::NUM_OF_COMPOSITIONS) {
     output->mutable_status()->set_mode(new_mode);
-    output->set_mode(new_mode);
+    output->mutable_status()->set_activated(true);
   }
 
   DLOG(INFO) << command->DebugString();
diff --git a/languages/chewing/session.h b/languages/chewing/session.h
index b7dc7ab..1e95f4a 100755
--- a/languages/chewing/session.h
+++ b/languages/chewing/session.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/chewing/unix/ibus/config_updater.cc b/languages/chewing/unix/ibus/config_updater.cc
index 4f83c55..f3907dd 100755
--- a/languages/chewing/unix/ibus/config_updater.cc
+++ b/languages/chewing/unix/ibus/config_updater.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/chewing/unix/ibus/config_updater.h b/languages/chewing/unix/ibus/config_updater.h
index b1296da..b27a2f8 100755
--- a/languages/chewing/unix/ibus/config_updater.h
+++ b/languages/chewing/unix/ibus/config_updater.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/chewing/unix/ibus/main.cc b/languages/chewing/unix/ibus/main.cc
index 7de1c96..c8faec1 100755
--- a/languages/chewing/unix/ibus/main.cc
+++ b/languages/chewing/unix/ibus/main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/chewing/unix/ibus/main.h b/languages/chewing/unix/ibus/main.h
index 953cf20..ef15d37 100755
--- a/languages/chewing/unix/ibus/main.h
+++ b/languages/chewing/unix/ibus/main.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/chewing/unix/ibus/mozc_engine_property.cc b/languages/chewing/unix/ibus/mozc_engine_property.cc
index f09dcdc..b2dd7b9 100755
--- a/languages/chewing/unix/ibus/mozc_engine_property.cc
+++ b/languages/chewing/unix/ibus/mozc_engine_property.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -64,6 +64,8 @@
   },
 };
 
+// The IMEOff state is not available in Chewing.
+const MozcEngineProperty *kMozcEnginePropertyIMEOffState = NULL;
 const size_t kMozcEnginePropertiesSize = arraysize(kMozcEngineProperties);
 
 const commands::CompositionMode kMozcEngineInitialCompositionMode =
diff --git a/languages/global_language_spec.cc b/languages/global_language_spec.cc
index 20533b6..46755f9 100755
--- a/languages/global_language_spec.cc
+++ b/languages/global_language_spec.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/global_language_spec.h b/languages/global_language_spec.h
index d1fac0a..cfcdc4a 100755
--- a/languages/global_language_spec.h
+++ b/languages/global_language_spec.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/hangul/hangul.gyp b/languages/hangul/hangul.gyp
index 452bde8..6a7a9e4 100755
--- a/languages/hangul/hangul.gyp
+++ b/languages/hangul/hangul.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/languages/hangul/hangul_libraries.gypi b/languages/hangul/hangul_libraries.gypi
index 104ec86..e90ca58 100755
--- a/languages/hangul/hangul_libraries.gypi
+++ b/languages/hangul/hangul_libraries.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/languages/hangul/hangul_session_factory.cc b/languages/hangul/hangul_session_factory.cc
index 7c71627..b6c1cd1 100755
--- a/languages/hangul/hangul_session_factory.cc
+++ b/languages/hangul/hangul_session_factory.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/hangul/hangul_session_factory.h b/languages/hangul/hangul_session_factory.h
index 6a3266f..d26e1d2 100755
--- a/languages/hangul/hangul_session_factory.h
+++ b/languages/hangul/hangul_session_factory.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/hangul/lang_dep_spec.cc b/languages/hangul/lang_dep_spec.cc
index e0785a7..7009b63 100755
--- a/languages/hangul/lang_dep_spec.cc
+++ b/languages/hangul/lang_dep_spec.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/hangul/lang_dep_spec.h b/languages/hangul/lang_dep_spec.h
index 67108d7..c8e1117 100755
--- a/languages/hangul/lang_dep_spec.h
+++ b/languages/hangul/lang_dep_spec.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/hangul/server_main.cc b/languages/hangul/server_main.cc
index 0125b6b..511f20c 100755
--- a/languages/hangul/server_main.cc
+++ b/languages/hangul/server_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/hangul/session.cc b/languages/hangul/session.cc
index f8834a8..c52a040 100755
--- a/languages/hangul/session.cc
+++ b/languages/hangul/session.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -393,6 +393,7 @@
 
   candidates->set_focused_index(hanja_index_);
   candidates->set_direction(commands::Candidates::HORIZONTAL);
+  candidates->set_position(0);
 }
 
 // TODO(nona): make backspace key customizable.
@@ -820,6 +821,9 @@
           break;
       }
       hanja_lock_preedit_.clear();
+      // status is never used in hangul, followin value is dummy.
+      command->mutable_output()->mutable_status()->set_mode(commands::HIRAGANA);
+      command->mutable_output()->mutable_status()->set_activated(true);
       break;
     default:
       // do nothing.
diff --git a/languages/hangul/session.h b/languages/hangul/session.h
index 890ccad..72e8f5b 100755
--- a/languages/hangul/session.h
+++ b/languages/hangul/session.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/hangul/session_test.cc b/languages/hangul/session_test.cc
index 6ae762e..4575ed6 100755
--- a/languages/hangul/session_test.cc
+++ b/languages/hangul/session_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/hangul/unix/ibus/config_updater.cc b/languages/hangul/unix/ibus/config_updater.cc
index ccef5ad..18609ac 100755
--- a/languages/hangul/unix/ibus/config_updater.cc
+++ b/languages/hangul/unix/ibus/config_updater.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/hangul/unix/ibus/config_updater.h b/languages/hangul/unix/ibus/config_updater.h
index c06159e..a8f78cd 100755
--- a/languages/hangul/unix/ibus/config_updater.h
+++ b/languages/hangul/unix/ibus/config_updater.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/hangul/unix/ibus/main.cc b/languages/hangul/unix/ibus/main.cc
index f13ca4b..de2aaa6 100755
--- a/languages/hangul/unix/ibus/main.cc
+++ b/languages/hangul/unix/ibus/main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/hangul/unix/ibus/main.h b/languages/hangul/unix/ibus/main.h
index f459ad6..6791bb1 100755
--- a/languages/hangul/unix/ibus/main.h
+++ b/languages/hangul/unix/ibus/main.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/hangul/unix/ibus/mozc_engine_property.cc b/languages/hangul/unix/ibus/mozc_engine_property.cc
index c3b13af..a9fd72b 100755
--- a/languages/hangul/unix/ibus/mozc_engine_property.cc
+++ b/languages/hangul/unix/ibus/mozc_engine_property.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -58,6 +58,8 @@
   },
 };
 
+// The IMEOff state is not available in Hangul
+const MozcEngineProperty *kMozcEnginePropertyIMEOffState = NULL;
 const size_t kMozcEnginePropertiesSize = arraysize(kMozcEngineProperties);
 
 const commands::CompositionMode kMozcEngineInitialCompositionMode =
diff --git a/languages/japanese/japanese.gyp b/languages/japanese/japanese.gyp
index ac16a77..40c1e54 100755
--- a/languages/japanese/japanese.gyp
+++ b/languages/japanese/japanese.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/languages/japanese/lang_dep_spec.cc b/languages/japanese/lang_dep_spec.cc
index 675a8f5..df794a9 100755
--- a/languages/japanese/lang_dep_spec.cc
+++ b/languages/japanese/lang_dep_spec.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/japanese/lang_dep_spec.h b/languages/japanese/lang_dep_spec.h
index 2232d6f..83fa1c8 100755
--- a/languages/japanese/lang_dep_spec.h
+++ b/languages/japanese/lang_dep_spec.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/language_dependent_spec_base.cc b/languages/language_dependent_spec_base.cc
index 2250b77..38a2f21 100755
--- a/languages/language_dependent_spec_base.cc
+++ b/languages/language_dependent_spec_base.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/language_dependent_spec_base.h b/languages/language_dependent_spec_base.h
index 9a9a1a0..396c79f 100755
--- a/languages/language_dependent_spec_base.h
+++ b/languages/language_dependent_spec_base.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/language_dependent_spec_interface.h b/languages/language_dependent_spec_interface.h
index 33d2a90..92355a9 100755
--- a/languages/language_dependent_spec_interface.h
+++ b/languages/language_dependent_spec_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/languages/languages.gyp b/languages/languages.gyp
index b279396..0ba719d 100755
--- a/languages/languages.gyp
+++ b/languages/languages.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/mac/ActivatePane/ActivatePane.h b/mac/ActivatePane/ActivatePane.h
index b9c777f..464d9e6 100755
--- a/mac/ActivatePane/ActivatePane.h
+++ b/mac/ActivatePane/ActivatePane.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/DevConfirmPane/DevConfirmPane.h b/mac/DevConfirmPane/DevConfirmPane.h
index a2927a3..aeda6f7 100755
--- a/mac/DevConfirmPane/DevConfirmPane.h
+++ b/mac/DevConfirmPane/DevConfirmPane.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/GoogleJapaneseInputController.h b/mac/GoogleJapaneseInputController.h
index d652d2a..18573b1 100755
--- a/mac/GoogleJapaneseInputController.h
+++ b/mac/GoogleJapaneseInputController.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/GoogleJapaneseInputController.mm b/mac/GoogleJapaneseInputController.mm
index 2ba24c4..8da8eba 100755
--- a/mac/GoogleJapaneseInputController.mm
+++ b/mac/GoogleJapaneseInputController.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/GoogleJapaneseInputControllerInterface.h b/mac/GoogleJapaneseInputControllerInterface.h
index 302f40d..be9e815 100755
--- a/mac/GoogleJapaneseInputControllerInterface.h
+++ b/mac/GoogleJapaneseInputControllerInterface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/GoogleJapaneseInputController_test.mm b/mac/GoogleJapaneseInputController_test.mm
index 4974718..d1f50ba 100755
--- a/mac/GoogleJapaneseInputController_test.mm
+++ b/mac/GoogleJapaneseInputController_test.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/GoogleJapaneseInputServer.h b/mac/GoogleJapaneseInputServer.h
index 2fa555f..5cd528e 100755
--- a/mac/GoogleJapaneseInputServer.h
+++ b/mac/GoogleJapaneseInputServer.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/GoogleJapaneseInputServer.mm b/mac/GoogleJapaneseInputServer.mm
index e61a2f7..3e93c35 100755
--- a/mac/GoogleJapaneseInputServer.mm
+++ b/mac/GoogleJapaneseInputServer.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/GoogleJapaneseInputServer_test.mm b/mac/GoogleJapaneseInputServer_test.mm
index 3d61ea5..ec3c473 100755
--- a/mac/GoogleJapaneseInputServer_test.mm
+++ b/mac/GoogleJapaneseInputServer_test.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/KeyCodeMap.h b/mac/KeyCodeMap.h
index 385784d..c0f940d 100755
--- a/mac/KeyCodeMap.h
+++ b/mac/KeyCodeMap.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/KeyCodeMap.mm b/mac/KeyCodeMap.mm
index 0b39615..5dbeae6 100755
--- a/mac/KeyCodeMap.mm
+++ b/mac/KeyCodeMap.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/KeyCodeMap_test.mm b/mac/KeyCodeMap_test.mm
index fc451a2..4c1d64f 100755
--- a/mac/KeyCodeMap_test.mm
+++ b/mac/KeyCodeMap_test.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/UserHistoryTransition/DialogsController.h b/mac/UserHistoryTransition/DialogsController.h
index 5d48ca5..19a170b 100755
--- a/mac/UserHistoryTransition/DialogsController.h
+++ b/mac/UserHistoryTransition/DialogsController.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/UserHistoryTransition/DialogsController.mm b/mac/UserHistoryTransition/DialogsController.mm
index d4b8a7c..39e5d8a 100755
--- a/mac/UserHistoryTransition/DialogsController.mm
+++ b/mac/UserHistoryTransition/DialogsController.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/UserHistoryTransition/deprecated_user_storage.cc b/mac/UserHistoryTransition/deprecated_user_storage.cc
index 1cb0291..b91e258 100755
--- a/mac/UserHistoryTransition/deprecated_user_storage.cc
+++ b/mac/UserHistoryTransition/deprecated_user_storage.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/UserHistoryTransition/deprecated_user_storage.h b/mac/UserHistoryTransition/deprecated_user_storage.h
index 6ba59bb..85196fe 100755
--- a/mac/UserHistoryTransition/deprecated_user_storage.h
+++ b/mac/UserHistoryTransition/deprecated_user_storage.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/UserHistoryTransition/user_history_transition.cc b/mac/UserHistoryTransition/user_history_transition.cc
index fb000af..9512cbc 100755
--- a/mac/UserHistoryTransition/user_history_transition.cc
+++ b/mac/UserHistoryTransition/user_history_transition.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/UserHistoryTransition/user_history_transition.h b/mac/UserHistoryTransition/user_history_transition.h
index ab4500d..5a541ea 100755
--- a/mac/UserHistoryTransition/user_history_transition.h
+++ b/mac/UserHistoryTransition/user_history_transition.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/UserHistoryTransition/user_history_transition_gui_main.mm b/mac/UserHistoryTransition/user_history_transition_gui_main.mm
index 9672199..fa86c03 100755
--- a/mac/UserHistoryTransition/user_history_transition_gui_main.mm
+++ b/mac/UserHistoryTransition/user_history_transition_gui_main.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/UserHistoryTransition/user_history_transition_main.cc b/mac/UserHistoryTransition/user_history_transition_main.cc
index cd42471..44af985 100755
--- a/mac/UserHistoryTransition/user_history_transition_main.cc
+++ b/mac/UserHistoryTransition/user_history_transition_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/common.h b/mac/common.h
index 91b7bac..51be2bf 100755
--- a/mac/common.h
+++ b/mac/common.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mac/generate_mapping.py b/mac/generate_mapping.py
index 450a51e..317cc5d 100755
--- a/mac/generate_mapping.py
+++ b/mac/generate_mapping.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/mac/mac.gyp b/mac/mac.gyp
index 4cbfc3b..c9f3104 100755
--- a/mac/mac.gyp
+++ b/mac/mac.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/mac/main.mm b/mac/main.mm
index 1f2a0d8..71e4994 100755
--- a/mac/main.mm
+++ b/mac/main.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/mozc_version_template.txt b/mozc_version_template.txt
index ec3e5dd..4a8546a 100755
--- a/mozc_version_template.txt
+++ b/mozc_version_template.txt
@@ -1,4 +1,4 @@
 MAJOR=1
 MINOR=3
-BUILD=931
+BUILD=975
 REVISION=102
diff --git a/net/http_client.cc b/net/http_client.cc
index 714bc75..ded78e0 100755
--- a/net/http_client.cc
+++ b/net/http_client.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/net/http_client.h b/net/http_client.h
index 08a4595..0fdb573 100755
--- a/net/http_client.h
+++ b/net/http_client.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/net/http_client_common.h b/net/http_client_common.h
index 8dd64f1..b52382f 100755
--- a/net/http_client_common.h
+++ b/net/http_client_common.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/net/http_client_mac.h b/net/http_client_mac.h
index 0423e99..927cebd 100755
--- a/net/http_client_mac.h
+++ b/net/http_client_mac.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/net/http_client_mac.mm b/net/http_client_mac.mm
index a919b10..3080bab 100755
--- a/net/http_client_mac.mm
+++ b/net/http_client_mac.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/net/http_client_main.cc b/net/http_client_main.cc
index a4aafa5..aa29a2c 100755
--- a/net/http_client_main.cc
+++ b/net/http_client_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/net/http_client_mock.cc b/net/http_client_mock.cc
index 7a84e52..4ac6110 100755
--- a/net/http_client_mock.cc
+++ b/net/http_client_mock.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/net/http_client_mock.h b/net/http_client_mock.h
index a475b55..ed431df 100755
--- a/net/http_client_mock.h
+++ b/net/http_client_mock.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/net/http_client_mock_test.cc b/net/http_client_mock_test.cc
index ddcc588..80e1918 100755
--- a/net/http_client_mock_test.cc
+++ b/net/http_client_mock_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/net/jsonpath.cc b/net/jsonpath.cc
index d8b2e0d..b59b7b2 100755
--- a/net/jsonpath.cc
+++ b/net/jsonpath.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/net/jsonpath.h b/net/jsonpath.h
index 53e39a3..eb09c27 100755
--- a/net/jsonpath.h
+++ b/net/jsonpath.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/net/jsonpath_test.cc b/net/jsonpath_test.cc
index 48202b4..46f1b62 100755
--- a/net/jsonpath_test.cc
+++ b/net/jsonpath_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/net/net.gyp b/net/net.gyp
index 16f8211..edb3fa4 100755
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/net/proxy_manager.cc b/net/proxy_manager.cc
index 34952b5..dc439a3 100755
--- a/net/proxy_manager.cc
+++ b/net/proxy_manager.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/net/proxy_manager.h b/net/proxy_manager.h
index f9dfcde..c31f583 100755
--- a/net/proxy_manager.h
+++ b/net/proxy_manager.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/prediction/dictionary_predictor.cc b/prediction/dictionary_predictor.cc
index 7e76f19..789086e 100755
--- a/prediction/dictionary_predictor.cc
+++ b/prediction/dictionary_predictor.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/prediction/dictionary_predictor.h b/prediction/dictionary_predictor.h
index f13e222..5b70e03 100755
--- a/prediction/dictionary_predictor.h
+++ b/prediction/dictionary_predictor.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/prediction/dictionary_predictor_test.cc b/prediction/dictionary_predictor_test.cc
index fa916a1..2e7ba49 100755
--- a/prediction/dictionary_predictor_test.cc
+++ b/prediction/dictionary_predictor_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/prediction/gen_suggestion_filter_main.cc b/prediction/gen_suggestion_filter_main.cc
index ad08a2b..01dd1c3 100755
--- a/prediction/gen_suggestion_filter_main.cc
+++ b/prediction/gen_suggestion_filter_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/prediction/gen_zero_query_number_data.py b/prediction/gen_zero_query_number_data.py
index c34c93a..3dfa37c 100755
--- a/prediction/gen_zero_query_number_data.py
+++ b/prediction/gen_zero_query_number_data.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/prediction/prediction.gyp b/prediction/prediction.gyp
index 83b8a3e..4993254 100755
--- a/prediction/prediction.gyp
+++ b/prediction/prediction.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/prediction/predictor.cc b/prediction/predictor.cc
index f67d655..42ce085 100755
--- a/prediction/predictor.cc
+++ b/prediction/predictor.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/prediction/predictor.h b/prediction/predictor.h
index 955d4d7..2bae73a 100755
--- a/prediction/predictor.h
+++ b/prediction/predictor.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/prediction/predictor_interface.h b/prediction/predictor_interface.h
index 5444c6e..8dea93f 100755
--- a/prediction/predictor_interface.h
+++ b/prediction/predictor_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/prediction/predictor_test.cc b/prediction/predictor_test.cc
index 6bf28d8..bbcfd5f 100755
--- a/prediction/predictor_test.cc
+++ b/prediction/predictor_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/prediction/suggestion_filter.cc b/prediction/suggestion_filter.cc
index 0d43d57..142be41 100755
--- a/prediction/suggestion_filter.cc
+++ b/prediction/suggestion_filter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/prediction/suggestion_filter.h b/prediction/suggestion_filter.h
index 04ad36f..887ee69 100755
--- a/prediction/suggestion_filter.h
+++ b/prediction/suggestion_filter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/prediction/suggestion_filter_test.cc b/prediction/suggestion_filter_test.cc
index 8edcbdb..4ed091b 100755
--- a/prediction/suggestion_filter_test.cc
+++ b/prediction/suggestion_filter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/prediction/user_history_predictor.cc b/prediction/user_history_predictor.cc
index 2b15e27..4927613 100755
--- a/prediction/user_history_predictor.cc
+++ b/prediction/user_history_predictor.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/prediction/user_history_predictor.h b/prediction/user_history_predictor.h
index e882a12..db26f50 100755
--- a/prediction/user_history_predictor.h
+++ b/prediction/user_history_predictor.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/prediction/user_history_predictor.proto b/prediction/user_history_predictor.proto
index d1a47a3..b691b4d 100755
--- a/prediction/user_history_predictor.proto
+++ b/prediction/user_history_predictor.proto
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/prediction/user_history_predictor_test.cc b/prediction/user_history_predictor_test.cc
index 55a58b2..9f67359 100755
--- a/prediction/user_history_predictor_test.cc
+++ b/prediction/user_history_predictor_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protobuf/config.h b/protobuf/config.h
index 7c340c6..d678698 100755
--- a/protobuf/config.h
+++ b/protobuf/config.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protobuf/genproto.gypi b/protobuf/genproto.gypi
index 38d8eef..d197312 100755
--- a/protobuf/genproto.gypi
+++ b/protobuf/genproto.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/protobuf/protobuf.gyp b/protobuf/protobuf.gyp
index 6072864..17de9f5 100755
--- a/protobuf/protobuf.gyp
+++ b/protobuf/protobuf.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/CandidateController.h b/renderer/mac/CandidateController.h
index 515d0bd..841a8db 100755
--- a/renderer/mac/CandidateController.h
+++ b/renderer/mac/CandidateController.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/CandidateController.mm b/renderer/mac/CandidateController.mm
index ec6b894..bc0f21f 100755
--- a/renderer/mac/CandidateController.mm
+++ b/renderer/mac/CandidateController.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/CandidateView.h b/renderer/mac/CandidateView.h
index 5c886f4..5973ab6 100755
--- a/renderer/mac/CandidateView.h
+++ b/renderer/mac/CandidateView.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/CandidateView.mm b/renderer/mac/CandidateView.mm
index 2867fe2..f8b59b4 100755
--- a/renderer/mac/CandidateView.mm
+++ b/renderer/mac/CandidateView.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/CandidateWindow.h b/renderer/mac/CandidateWindow.h
index 4d24ff7..cbf97f9 100755
--- a/renderer/mac/CandidateWindow.h
+++ b/renderer/mac/CandidateWindow.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/CandidateWindow.mm b/renderer/mac/CandidateWindow.mm
index f0ee542..73ae36f 100755
--- a/renderer/mac/CandidateWindow.mm
+++ b/renderer/mac/CandidateWindow.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/InfolistView.h b/renderer/mac/InfolistView.h
index b8c06b6..243848b 100755
--- a/renderer/mac/InfolistView.h
+++ b/renderer/mac/InfolistView.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/InfolistView.mm b/renderer/mac/InfolistView.mm
index 752fb67..b3161af 100755
--- a/renderer/mac/InfolistView.mm
+++ b/renderer/mac/InfolistView.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/InfolistWindow.h b/renderer/mac/InfolistWindow.h
index f4b08cb..1bff7e9 100755
--- a/renderer/mac/InfolistWindow.h
+++ b/renderer/mac/InfolistWindow.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/InfolistWindow.mm b/renderer/mac/InfolistWindow.mm
index badd4c6..852c147 100755
--- a/renderer/mac/InfolistWindow.mm
+++ b/renderer/mac/InfolistWindow.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/RendererBaseWindow.h b/renderer/mac/RendererBaseWindow.h
index 8d72fd1..16b2e1c 100755
--- a/renderer/mac/RendererBaseWindow.h
+++ b/renderer/mac/RendererBaseWindow.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/RendererBaseWindow.mm b/renderer/mac/RendererBaseWindow.mm
index af6a7e7..d74c8c2 100755
--- a/renderer/mac/RendererBaseWindow.mm
+++ b/renderer/mac/RendererBaseWindow.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/mac_server.h b/renderer/mac/mac_server.h
index e962c78..210cfec 100755
--- a/renderer/mac/mac_server.h
+++ b/renderer/mac/mac_server.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/mac_server.mm b/renderer/mac/mac_server.mm
index de62c47..f79475b 100755
--- a/renderer/mac/mac_server.mm
+++ b/renderer/mac/mac_server.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/mac_server_send_command.h b/renderer/mac/mac_server_send_command.h
index 52f399e..79e452c 100755
--- a/renderer/mac/mac_server_send_command.h
+++ b/renderer/mac/mac_server_send_command.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/mac_server_send_command.mm b/renderer/mac/mac_server_send_command.mm
index 1c1c24f..0f3b8e3 100755
--- a/renderer/mac/mac_server_send_command.mm
+++ b/renderer/mac/mac_server_send_command.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/mac_view_util.h b/renderer/mac/mac_view_util.h
index 3597c30..f272ea9 100755
--- a/renderer/mac/mac_view_util.h
+++ b/renderer/mac/mac_view_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mac/mac_view_util.mm b/renderer/mac/mac_view_util.mm
index 9e9c6be..46316d3 100755
--- a/renderer/mac/mac_view_util.mm
+++ b/renderer/mac/mac_view_util.mm
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/mozc_renderer_main.cc b/renderer/mozc_renderer_main.cc
index c2cacbc..5220b87 100755
--- a/renderer/mozc_renderer_main.cc
+++ b/renderer/mozc_renderer_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/renderer.gyp b/renderer/renderer.gyp
index 4f0a414..85d9cf6 100755
--- a/renderer/renderer.gyp
+++ b/renderer/renderer.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/renderer/renderer_client.cc b/renderer/renderer_client.cc
index ad9061a..c96ecdd 100755
--- a/renderer/renderer_client.cc
+++ b/renderer/renderer_client.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/renderer_client.h b/renderer/renderer_client.h
index f710129..754a535 100755
--- a/renderer/renderer_client.h
+++ b/renderer/renderer_client.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/renderer_client_test.cc b/renderer/renderer_client_test.cc
index fd75a75..87b155b 100755
--- a/renderer/renderer_client_test.cc
+++ b/renderer/renderer_client_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/renderer_interface.h b/renderer/renderer_interface.h
index 0a99f7f..b6dcecd 100755
--- a/renderer/renderer_interface.h
+++ b/renderer/renderer_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/renderer_server.cc b/renderer/renderer_server.cc
index e608b26..dafdef3 100755
--- a/renderer/renderer_server.cc
+++ b/renderer/renderer_server.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/renderer_server.h b/renderer/renderer_server.h
index d869f61..f3a0267 100755
--- a/renderer/renderer_server.h
+++ b/renderer/renderer_server.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/renderer_server_test.cc b/renderer/renderer_server_test.cc
index 304e1aa..30ea7e3 100755
--- a/renderer/renderer_server_test.cc
+++ b/renderer/renderer_server_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/renderer_style.proto b/renderer/renderer_style.proto
index 8744d8e..de3b972 100755
--- a/renderer/renderer_style.proto
+++ b/renderer/renderer_style.proto
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/renderer_style_handler.cc b/renderer/renderer_style_handler.cc
index c3ef533..cd9d850 100755
--- a/renderer/renderer_style_handler.cc
+++ b/renderer/renderer_style_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/renderer_style_handler.h b/renderer/renderer_style_handler.h
index 3b3d47e..9e8da27 100755
--- a/renderer/renderer_style_handler.h
+++ b/renderer/renderer_style_handler.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/renderer_style_handler_test.cc b/renderer/renderer_style_handler_test.cc
index 462fd20..6f946fe 100755
--- a/renderer/renderer_style_handler_test.cc
+++ b/renderer/renderer_style_handler_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/table_layout.cc b/renderer/table_layout.cc
index 5901f0c..24c0735 100755
--- a/renderer/table_layout.cc
+++ b/renderer/table_layout.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/table_layout.h b/renderer/table_layout.h
index 7409ea9..08599b3 100755
--- a/renderer/table_layout.h
+++ b/renderer/table_layout.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/table_layout_test.cc b/renderer/table_layout_test.cc
index e0253d4..d1d3b82 100755
--- a/renderer/table_layout_test.cc
+++ b/renderer/table_layout_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/win32/candidate_window.cc b/renderer/win32/candidate_window.cc
index ad9c980..bd8650b 100755
--- a/renderer/win32/candidate_window.cc
+++ b/renderer/win32/candidate_window.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/win32/candidate_window.h b/renderer/win32/candidate_window.h
index 28e4201..90e2186 100755
--- a/renderer/win32/candidate_window.h
+++ b/renderer/win32/candidate_window.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/win32/composition_window.cc b/renderer/win32/composition_window.cc
index cc90d9a..e5d68fe 100755
--- a/renderer/win32/composition_window.cc
+++ b/renderer/win32/composition_window.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/win32/composition_window.h b/renderer/win32/composition_window.h
index 88988e2..387c49a 100755
--- a/renderer/win32/composition_window.h
+++ b/renderer/win32/composition_window.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/win32/infolist_window.cc b/renderer/win32/infolist_window.cc
index e4e237b..32aa902 100755
--- a/renderer/win32/infolist_window.cc
+++ b/renderer/win32/infolist_window.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/win32/infolist_window.h b/renderer/win32/infolist_window.h
index 9e0825c..0504a8b 100755
--- a/renderer/win32/infolist_window.h
+++ b/renderer/win32/infolist_window.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/win32/text_renderer.cc b/renderer/win32/text_renderer.cc
index ec4ff99..60c09d5 100755
--- a/renderer/win32/text_renderer.cc
+++ b/renderer/win32/text_renderer.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/win32/text_renderer.h b/renderer/win32/text_renderer.h
index ede9910..217a6cf 100755
--- a/renderer/win32/text_renderer.h
+++ b/renderer/win32/text_renderer.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/win32/win32_renderer_util.cc b/renderer/win32/win32_renderer_util.cc
index 6f4e50f..f1be99d 100755
--- a/renderer/win32/win32_renderer_util.cc
+++ b/renderer/win32/win32_renderer_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/win32/win32_renderer_util.h b/renderer/win32/win32_renderer_util.h
index 7e2e069..8a914a7 100755
--- a/renderer/win32/win32_renderer_util.h
+++ b/renderer/win32/win32_renderer_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/win32/win32_renderer_util_test.cc b/renderer/win32/win32_renderer_util_test.cc
index e76c014..76cdad3 100755
--- a/renderer/win32/win32_renderer_util_test.cc
+++ b/renderer/win32/win32_renderer_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/win32/win32_server.cc b/renderer/win32/win32_server.cc
index 137279c..3ad6d1d 100755
--- a/renderer/win32/win32_server.cc
+++ b/renderer/win32/win32_server.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/win32/win32_server.h b/renderer/win32/win32_server.h
index 9e2aed5..b41fae8 100755
--- a/renderer/win32/win32_server.h
+++ b/renderer/win32/win32_server.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/win32/window_manager.cc b/renderer/win32/window_manager.cc
index 3076eeb..cf79dc3 100755
--- a/renderer/win32/window_manager.cc
+++ b/renderer/win32/window_manager.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -322,13 +322,13 @@
             working_area);
   }
 
-  DWORD set_windows_pos_flags = SWP_NOACTIVATE | SWP_SHOWWINDOW;
+  const DWORD kSetWindowsPosFlags = SWP_NOACTIVATE | SWP_SHOWWINDOW;
   main_window_->SetWindowPos(HWND_TOPMOST,
                              main_window_rect.Left(),
                              main_window_rect.Top(),
                              main_window_rect.Width(),
                              main_window_rect.Height(),
-                             set_windows_pos_flags);
+                             kSetWindowsPosFlags);
   // This trick ensures that the window is certainly shown as 'inactivated'
   // in terms of visual effect on DWM-enabled desktop.
   main_window_->SendMessageW(WM_NCACTIVATE, FALSE);
@@ -359,13 +359,12 @@
         WindowUtil::GetWindowRectForInfolistWindow(
             infolist_window_->GetLayoutSize(),
             main_window_rect, working_area);
-    infolist_window_->MoveWindow(infolist_rect.Left(),
-                                 infolist_rect.Top(),
-                                 infolist_rect.Width(),
-                                 infolist_rect.Height(),
-                                 TRUE);
-    infolist_window_->SetWindowPos(HWND_TOPMOST, 0, 0, 0, 0,
-        SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+    infolist_window_->SetWindowPos(HWND_TOPMOST,
+                                   infolist_rect.Left(),
+                                   infolist_rect.Top(),
+                                   infolist_rect.Width(),
+                                   infolist_rect.Height(),
+                                   kSetWindowsPosFlags);
     if (candidates.has_focused_index() && candidates.candidate_size() > 0) {
       const int focused_row =
         candidates.focused_index() - candidates.candidate(0).index();
@@ -418,7 +417,7 @@
                                     cascading_window_rect.Top(),
                                     cascading_window_rect.Width(),
                                     cascading_window_rect.Height(),
-                                    set_windows_pos_flags);
+                                    kSetWindowsPosFlags);
     // This trick ensures that the window is certainly shown as 'inactivated'
     // in terms of visual effect on DWM-enabled desktop.
     cascading_window_->SendMessageW(WM_NCACTIVATE, FALSE);
diff --git a/renderer/win32/window_manager.h b/renderer/win32/window_manager.h
index 2faacdd..d61e331 100755
--- a/renderer/win32/window_manager.h
+++ b/renderer/win32/window_manager.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/win_resource.h b/renderer/win_resource.h
index 5d0edcf..30f806d 100755
--- a/renderer/win_resource.h
+++ b/renderer/win_resource.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/window_util.cc b/renderer/window_util.cc
index b17ede3..27f04d1 100755
--- a/renderer/window_util.cc
+++ b/renderer/window_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/window_util.h b/renderer/window_util.h
index de9bdb6..b63af08 100755
--- a/renderer/window_util.h
+++ b/renderer/window_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/renderer/window_util_test.cc b/renderer/window_util_test.cc
index 7df5793..685868b 100755
--- a/renderer/window_util_test.cc
+++ b/renderer/window_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/calculator/calculator.cc b/rewriter/calculator/calculator.cc
index cbc0a04..89bd7a1 100755
--- a/rewriter/calculator/calculator.cc
+++ b/rewriter/calculator/calculator.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/calculator/calculator.gyp b/rewriter/calculator/calculator.gyp
index 756d349..904c5cc 100755
--- a/rewriter/calculator/calculator.gyp
+++ b/rewriter/calculator/calculator.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/calculator/calculator_interface.h b/rewriter/calculator/calculator_interface.h
index d37563b..d837304 100755
--- a/rewriter/calculator/calculator_interface.h
+++ b/rewriter/calculator/calculator_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/calculator/calculator_mock.cc b/rewriter/calculator/calculator_mock.cc
index 91c6da7..485ec77 100755
--- a/rewriter/calculator/calculator_mock.cc
+++ b/rewriter/calculator/calculator_mock.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/calculator/calculator_mock.h b/rewriter/calculator/calculator_mock.h
index 0c20e61..05b1edf 100755
--- a/rewriter/calculator/calculator_mock.h
+++ b/rewriter/calculator/calculator_mock.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/calculator/calculator_test.cc b/rewriter/calculator/calculator_test.cc
index d4321b1..c258091 100755
--- a/rewriter/calculator/calculator_test.cc
+++ b/rewriter/calculator/calculator_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/calculator/parser.c b/rewriter/calculator/parser.c
index a254da2..40dc4a8 100755
--- a/rewriter/calculator/parser.c
+++ b/rewriter/calculator/parser.c
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/calculator_rewriter.cc b/rewriter/calculator_rewriter.cc
index ff6a3cb..bb9ab6c 100755
--- a/rewriter/calculator_rewriter.cc
+++ b/rewriter/calculator_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/calculator_rewriter.h b/rewriter/calculator_rewriter.h
index 5d1e829..1530ce2 100755
--- a/rewriter/calculator_rewriter.h
+++ b/rewriter/calculator_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/calculator_rewriter_test.cc b/rewriter/calculator_rewriter_test.cc
index 02ec5b8..0b6e548 100755
--- a/rewriter/calculator_rewriter_test.cc
+++ b/rewriter/calculator_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/collocation_rewriter.cc b/rewriter/collocation_rewriter.cc
index b9ff2d0..e5fc776 100755
--- a/rewriter/collocation_rewriter.cc
+++ b/rewriter/collocation_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/collocation_rewriter.h b/rewriter/collocation_rewriter.h
index 107c3d8..90427b7 100755
--- a/rewriter/collocation_rewriter.h
+++ b/rewriter/collocation_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/collocation_util.cc b/rewriter/collocation_util.cc
index eaf8a38..0632226 100755
--- a/rewriter/collocation_util.cc
+++ b/rewriter/collocation_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/collocation_util.h b/rewriter/collocation_util.h
index 286f0c3..a2e58dd 100755
--- a/rewriter/collocation_util.h
+++ b/rewriter/collocation_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/collocation_util_test.cc b/rewriter/collocation_util_test.cc
index b71875e..d58e6d5 100755
--- a/rewriter/collocation_util_test.cc
+++ b/rewriter/collocation_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/command_rewriter.cc b/rewriter/command_rewriter.cc
index 0bfb81f..c722097 100755
--- a/rewriter/command_rewriter.cc
+++ b/rewriter/command_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/command_rewriter.h b/rewriter/command_rewriter.h
index 884c0d8..1a82e03 100755
--- a/rewriter/command_rewriter.h
+++ b/rewriter/command_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/command_rewriter_test.cc b/rewriter/command_rewriter_test.cc
index 159485c..ab42df4 100755
--- a/rewriter/command_rewriter_test.cc
+++ b/rewriter/command_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/date_rewriter.cc b/rewriter/date_rewriter.cc
index 69e50d4..5c86b4a 100755
--- a/rewriter/date_rewriter.cc
+++ b/rewriter/date_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/date_rewriter.h b/rewriter/date_rewriter.h
index e057108..4e2b97b 100755
--- a/rewriter/date_rewriter.h
+++ b/rewriter/date_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/date_rewriter_test.cc b/rewriter/date_rewriter_test.cc
index dcfcc3e..81a2e24 100755
--- a/rewriter/date_rewriter_test.cc
+++ b/rewriter/date_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/dice_rewriter.cc b/rewriter/dice_rewriter.cc
index 124f086..11f6502 100755
--- a/rewriter/dice_rewriter.cc
+++ b/rewriter/dice_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/dice_rewriter.h b/rewriter/dice_rewriter.h
index d22537d..22ad966 100755
--- a/rewriter/dice_rewriter.h
+++ b/rewriter/dice_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/dice_rewriter_test.cc b/rewriter/dice_rewriter_test.cc
index b206602..628341d 100755
--- a/rewriter/dice_rewriter_test.cc
+++ b/rewriter/dice_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/dictionary_generator.cc b/rewriter/dictionary_generator.cc
index 3efa275..9d74544 100755
--- a/rewriter/dictionary_generator.cc
+++ b/rewriter/dictionary_generator.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/dictionary_generator.h b/rewriter/dictionary_generator.h
index 49cfb70..e9ba043 100755
--- a/rewriter/dictionary_generator.h
+++ b/rewriter/dictionary_generator.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/dictionary_generator_test.cc b/rewriter/dictionary_generator_test.cc
index 9482a76..3f1709a 100755
--- a/rewriter/dictionary_generator_test.cc
+++ b/rewriter/dictionary_generator_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/embedded_dictionary.cc b/rewriter/embedded_dictionary.cc
index 5f0c246..6e987d7 100755
--- a/rewriter/embedded_dictionary.cc
+++ b/rewriter/embedded_dictionary.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/embedded_dictionary.h b/rewriter/embedded_dictionary.h
index 4334d96..5252267 100755
--- a/rewriter/embedded_dictionary.h
+++ b/rewriter/embedded_dictionary.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/emoticon_rewriter.cc b/rewriter/emoticon_rewriter.cc
index 8c246f8..0352252 100755
--- a/rewriter/emoticon_rewriter.cc
+++ b/rewriter/emoticon_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/emoticon_rewriter.h b/rewriter/emoticon_rewriter.h
index 6d22fdf..0e6adba 100755
--- a/rewriter/emoticon_rewriter.h
+++ b/rewriter/emoticon_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/emoticon_rewriter_test.cc b/rewriter/emoticon_rewriter_test.cc
index 00b38b1..0263068 100755
--- a/rewriter/emoticon_rewriter_test.cc
+++ b/rewriter/emoticon_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/english_variants_rewriter.cc b/rewriter/english_variants_rewriter.cc
index 0329a43..8b36391 100755
--- a/rewriter/english_variants_rewriter.cc
+++ b/rewriter/english_variants_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/english_variants_rewriter.h b/rewriter/english_variants_rewriter.h
index bcaf943..3715e9e 100755
--- a/rewriter/english_variants_rewriter.h
+++ b/rewriter/english_variants_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/english_variants_rewriter_test.cc b/rewriter/english_variants_rewriter_test.cc
index 8e3653a..0fcd427 100755
--- a/rewriter/english_variants_rewriter_test.cc
+++ b/rewriter/english_variants_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/focus_candidate_rewriter.cc b/rewriter/focus_candidate_rewriter.cc
index 8db5796..d6a7de5 100755
--- a/rewriter/focus_candidate_rewriter.cc
+++ b/rewriter/focus_candidate_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/focus_candidate_rewriter.h b/rewriter/focus_candidate_rewriter.h
index b885160..bac7109 100755
--- a/rewriter/focus_candidate_rewriter.h
+++ b/rewriter/focus_candidate_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/focus_candidate_rewriter_test.cc b/rewriter/focus_candidate_rewriter_test.cc
index 01b6ef2..52e3cda 100755
--- a/rewriter/focus_candidate_rewriter_test.cc
+++ b/rewriter/focus_candidate_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/fortune_rewriter.cc b/rewriter/fortune_rewriter.cc
index 80804b7..6c9969c 100755
--- a/rewriter/fortune_rewriter.cc
+++ b/rewriter/fortune_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/fortune_rewriter.h b/rewriter/fortune_rewriter.h
index 2670d2e..dd6c0b4 100755
--- a/rewriter/fortune_rewriter.h
+++ b/rewriter/fortune_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/fortune_rewriter_test.cc b/rewriter/fortune_rewriter_test.cc
index bcc42cf..c458b1b 100755
--- a/rewriter/fortune_rewriter_test.cc
+++ b/rewriter/fortune_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/gen_collocation_data_main.cc b/rewriter/gen_collocation_data_main.cc
index 4c59684..290eefd 100755
--- a/rewriter/gen_collocation_data_main.cc
+++ b/rewriter/gen_collocation_data_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/gen_emoticon_rewriter_dictionary_main.cc b/rewriter/gen_emoticon_rewriter_dictionary_main.cc
index fea7fa1..a067c81 100755
--- a/rewriter/gen_emoticon_rewriter_dictionary_main.cc
+++ b/rewriter/gen_emoticon_rewriter_dictionary_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/gen_single_kanji_rewriter_dictionary_main.cc b/rewriter/gen_single_kanji_rewriter_dictionary_main.cc
index 7aea0c3..2d58c07 100755
--- a/rewriter/gen_single_kanji_rewriter_dictionary_main.cc
+++ b/rewriter/gen_single_kanji_rewriter_dictionary_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/gen_symbol_rewriter_dictionary_main.cc b/rewriter/gen_symbol_rewriter_dictionary_main.cc
index 05dc010..fc04c76 100755
--- a/rewriter/gen_symbol_rewriter_dictionary_main.cc
+++ b/rewriter/gen_symbol_rewriter_dictionary_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/gen_usage_rewriter_dictionary_main.cc b/rewriter/gen_usage_rewriter_dictionary_main.cc
index 139b7e6..4336ae6 100755
--- a/rewriter/gen_usage_rewriter_dictionary_main.cc
+++ b/rewriter/gen_usage_rewriter_dictionary_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/merger_rewriter.h b/rewriter/merger_rewriter.h
index 1a254c8..f320dfc 100755
--- a/rewriter/merger_rewriter.h
+++ b/rewriter/merger_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/merger_rewriter_test.cc b/rewriter/merger_rewriter_test.cc
index a21589f..dc9e17b 100755
--- a/rewriter/merger_rewriter_test.cc
+++ b/rewriter/merger_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/normalization_rewriter.cc b/rewriter/normalization_rewriter.cc
index c3a92e7..b00fc3b 100755
--- a/rewriter/normalization_rewriter.cc
+++ b/rewriter/normalization_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/normalization_rewriter.h b/rewriter/normalization_rewriter.h
index 07a1311..62ea67b 100755
--- a/rewriter/normalization_rewriter.h
+++ b/rewriter/normalization_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/normalization_rewriter_test.cc b/rewriter/normalization_rewriter_test.cc
index b171bfa..139a149 100755
--- a/rewriter/normalization_rewriter_test.cc
+++ b/rewriter/normalization_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/number_rewriter.cc b/rewriter/number_rewriter.cc
index 1b33a4c..07ac32a 100755
--- a/rewriter/number_rewriter.cc
+++ b/rewriter/number_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/number_rewriter.h b/rewriter/number_rewriter.h
index b9df4fa..3106286 100755
--- a/rewriter/number_rewriter.h
+++ b/rewriter/number_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/number_rewriter_test.cc b/rewriter/number_rewriter_test.cc
index 7d85562..c492def 100755
--- a/rewriter/number_rewriter_test.cc
+++ b/rewriter/number_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/remove_redundant_candidate_rewriter.cc b/rewriter/remove_redundant_candidate_rewriter.cc
index 0e0dc74..c983b92 100755
--- a/rewriter/remove_redundant_candidate_rewriter.cc
+++ b/rewriter/remove_redundant_candidate_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/remove_redundant_candidate_rewriter.h b/rewriter/remove_redundant_candidate_rewriter.h
index 557d03e..432d9c8 100755
--- a/rewriter/remove_redundant_candidate_rewriter.h
+++ b/rewriter/remove_redundant_candidate_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/remove_redundant_candidate_rewriter_test.cc b/rewriter/remove_redundant_candidate_rewriter_test.cc
index efdc9e1..19a3b82 100755
--- a/rewriter/remove_redundant_candidate_rewriter_test.cc
+++ b/rewriter/remove_redundant_candidate_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/rewriter.cc b/rewriter/rewriter.cc
index 561812b..87b58b5 100755
--- a/rewriter/rewriter.cc
+++ b/rewriter/rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -86,7 +86,7 @@
   }
   AddRewriter(new DateRewriter);
   AddRewriter(new FortuneRewriter);
-//  AddRewriter(new CommandRewriter);
+  // AddRewriter(new CommandRewriter);
   AddRewriter(new VersionRewriter);
 #if defined(OS_MACOSX) || defined(OS_WINDOWS) || defined(OS_CHROMEOS)
   // TODO(horo): Because infolist renderer window is implimented
diff --git a/rewriter/rewriter.gyp b/rewriter/rewriter.gyp
index d10d4dd..1dc714f 100755
--- a/rewriter/rewriter.gyp
+++ b/rewriter/rewriter.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/rewriter_base.gyp b/rewriter/rewriter_base.gyp
index 1d2d129..a97d18a 100755
--- a/rewriter/rewriter_base.gyp
+++ b/rewriter/rewriter_base.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/rewriter_interface.h b/rewriter/rewriter_interface.h
index 4c92201..a25cd74 100755
--- a/rewriter/rewriter_interface.h
+++ b/rewriter/rewriter_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/rewriter_test.cc b/rewriter/rewriter_test.cc
new file mode 100755
index 0000000..6a96f02
--- /dev/null
+++ b/rewriter/rewriter_test.cc
@@ -0,0 +1,107 @@
+// Copyright 2010-2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <string>
+
+#include "base/util.h"
+#include "converter/segments.h"
+#include "rewriter/rewriter_interface.h"
+#include "testing/base/public/gunit.h"
+#include "config/config_handler.h"
+#include "config/config.pb.h"
+
+DECLARE_string(test_tmpdir);
+
+namespace mozc {
+namespace {
+
+size_t CommandCandidatesSize(const Segment &segment) {
+  size_t result = 0;
+  for (int i = 0; i < segment.candidates_size(); ++i) {
+    if (segment.candidate(i).attributes &
+        Segment::Candidate::COMMAND_CANDIDATE) {
+      result++;
+    }
+  }
+  return result;
+}
+
+}  // namespace
+
+class RewriterTest : public testing::Test {
+ protected:
+  virtual void SetUp() {
+    Util::SetUserProfileDirectory(FLAGS_test_tmpdir);
+    config::Config config;
+    config::ConfigHandler::GetDefaultConfig(&config);
+    config::ConfigHandler::SetConfig(config);
+  }
+
+  virtual void TearDown() {
+    config::Config config;
+    config::ConfigHandler::GetDefaultConfig(&config);
+    config::ConfigHandler::SetConfig(config);
+  }
+
+  const RewriterInterface *GetRewriter() const {
+    return RewriterFactory::GetRewriter();
+  }
+};
+
+TEST_F(RewriterTest, CommandRewriterAvailability) {
+  Segments segments;
+  Segment *seg = segments.push_back_segment();
+
+  {
+    Segment::Candidate *candidate = seg->add_candidate();
+    // seg->set_key("こまんど");
+    // candidate->value = "コマンド";
+    seg->set_key("\xE3\x81\x93\xE3\x81\xBE\xE3\x82\x93\xE3\x81\xA9");
+    candidate->value = "\xE3\x82\xB3\xE3\x83\x9E"
+                       "\xE3\x83\xB3\xE3\x83\x89";
+    EXPECT_TRUE(GetRewriter()->Rewrite(&segments));
+    EXPECT_EQ(2, CommandCandidatesSize(*seg));
+    seg->clear_candidates();
+  }
+
+  {
+    Segment::Candidate *candidate = seg->add_candidate();
+    // seg->set_key("さじぇすと");
+    // candidate->value = "サジェスト";
+    seg->set_key("\xE3\x81\x95\xE3\x81\x98\xE3\x81\x87"
+                 "\xE3\x81\x99\xE3\x81\xA8");
+    candidate->value = "\xE3\x82\xB5\xE3\x82\xB8\xE3\x82\xA7"
+                       "\xE3\x82\xB9\xE3\x83\x88";
+    EXPECT_TRUE(GetRewriter()->Rewrite(&segments));
+    EXPECT_EQ(1, CommandCandidatesSize(*seg));
+    seg->clear_candidates();
+  }
+}
+
+}  // namespace mozc
diff --git a/rewriter/rewriter_test.gyp b/rewriter/rewriter_test.gyp
index db629fc..8a2eb44 100755
--- a/rewriter/rewriter_test.gyp
+++ b/rewriter/rewriter_test.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,7 @@
         'number_rewriter_test.cc',
         'normalization_rewriter_test.cc',
         'remove_redundant_candidate_rewriter_test.cc',
+        # 'rewriter_test.cc',
         'symbol_rewriter_test.cc',
         'transliteration_rewriter_test.cc',
         'unicode_rewriter_test.cc',
diff --git a/rewriter/single_kanji_rewriter.cc b/rewriter/single_kanji_rewriter.cc
index b2898df..09a4707 100755
--- a/rewriter/single_kanji_rewriter.cc
+++ b/rewriter/single_kanji_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/single_kanji_rewriter.h b/rewriter/single_kanji_rewriter.h
index a4c4b9a..741b2f1 100755
--- a/rewriter/single_kanji_rewriter.h
+++ b/rewriter/single_kanji_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/single_kanji_rewriter_test.cc b/rewriter/single_kanji_rewriter_test.cc
index bd9dd2c..978c3b2 100755
--- a/rewriter/single_kanji_rewriter_test.cc
+++ b/rewriter/single_kanji_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/symbol_rewriter.cc b/rewriter/symbol_rewriter.cc
index e4c69da..fa3ae17 100755
--- a/rewriter/symbol_rewriter.cc
+++ b/rewriter/symbol_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/symbol_rewriter.h b/rewriter/symbol_rewriter.h
index 136eb0f..fa0c9b5 100755
--- a/rewriter/symbol_rewriter.h
+++ b/rewriter/symbol_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/symbol_rewriter_test.cc b/rewriter/symbol_rewriter_test.cc
index ccfb238..50a4137 100755
--- a/rewriter/symbol_rewriter_test.cc
+++ b/rewriter/symbol_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/transliteration_rewriter.cc b/rewriter/transliteration_rewriter.cc
index 15d4152..60e7352 100755
--- a/rewriter/transliteration_rewriter.cc
+++ b/rewriter/transliteration_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/transliteration_rewriter.h b/rewriter/transliteration_rewriter.h
index f150476..88064c1 100755
--- a/rewriter/transliteration_rewriter.h
+++ b/rewriter/transliteration_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/transliteration_rewriter_test.cc b/rewriter/transliteration_rewriter_test.cc
index 01d0144..2b449cf 100755
--- a/rewriter/transliteration_rewriter_test.cc
+++ b/rewriter/transliteration_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/unicode_rewriter.cc b/rewriter/unicode_rewriter.cc
index e0b3071..ab8b701 100755
--- a/rewriter/unicode_rewriter.cc
+++ b/rewriter/unicode_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/unicode_rewriter.h b/rewriter/unicode_rewriter.h
index 643dc81..1348d44 100755
--- a/rewriter/unicode_rewriter.h
+++ b/rewriter/unicode_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/unicode_rewriter_test.cc b/rewriter/unicode_rewriter_test.cc
index cece69c..93dab03 100755
--- a/rewriter/unicode_rewriter_test.cc
+++ b/rewriter/unicode_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/usage_rewriter.cc b/rewriter/usage_rewriter.cc
index 130f543..420d894 100755
--- a/rewriter/usage_rewriter.cc
+++ b/rewriter/usage_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/usage_rewriter.h b/rewriter/usage_rewriter.h
index 72170d3..b248da2 100755
--- a/rewriter/usage_rewriter.h
+++ b/rewriter/usage_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/usage_rewriter_test.cc b/rewriter/usage_rewriter_test.cc
index 543347b..cf7226d 100755
--- a/rewriter/usage_rewriter_test.cc
+++ b/rewriter/usage_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/user_boundary_history_rewriter.cc b/rewriter/user_boundary_history_rewriter.cc
index b971688..1caef4a 100755
--- a/rewriter/user_boundary_history_rewriter.cc
+++ b/rewriter/user_boundary_history_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/user_boundary_history_rewriter.h b/rewriter/user_boundary_history_rewriter.h
index b067b4c..216f1dd 100755
--- a/rewriter/user_boundary_history_rewriter.h
+++ b/rewriter/user_boundary_history_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/user_boundary_history_rewriter_test.cc b/rewriter/user_boundary_history_rewriter_test.cc
index cf4b3a8..2b9f732 100755
--- a/rewriter/user_boundary_history_rewriter_test.cc
+++ b/rewriter/user_boundary_history_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/user_segment_history_rewriter.cc b/rewriter/user_segment_history_rewriter.cc
index e6e8614..848e0da 100755
--- a/rewriter/user_segment_history_rewriter.cc
+++ b/rewriter/user_segment_history_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/user_segment_history_rewriter.h b/rewriter/user_segment_history_rewriter.h
index 1fa3dc6..ae082fe 100755
--- a/rewriter/user_segment_history_rewriter.h
+++ b/rewriter/user_segment_history_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/user_segment_history_rewriter_test.cc b/rewriter/user_segment_history_rewriter_test.cc
index afa2e97..04804b8 100755
--- a/rewriter/user_segment_history_rewriter_test.cc
+++ b/rewriter/user_segment_history_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/variants_rewriter.cc b/rewriter/variants_rewriter.cc
index bfa408e..7d6ffee 100755
--- a/rewriter/variants_rewriter.cc
+++ b/rewriter/variants_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/variants_rewriter.h b/rewriter/variants_rewriter.h
index 36cf28c..0117cd0 100755
--- a/rewriter/variants_rewriter.h
+++ b/rewriter/variants_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/variants_rewriter_test.cc b/rewriter/variants_rewriter_test.cc
index 95ae751..794bd5f 100755
--- a/rewriter/variants_rewriter_test.cc
+++ b/rewriter/variants_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/version_rewriter.cc b/rewriter/version_rewriter.cc
index f38880a..518058d 100755
--- a/rewriter/version_rewriter.cc
+++ b/rewriter/version_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/version_rewriter.h b/rewriter/version_rewriter.h
index f1c0c97..e1194a0 100755
--- a/rewriter/version_rewriter.h
+++ b/rewriter/version_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/version_rewriter_test.cc b/rewriter/version_rewriter_test.cc
index a504883..1f6d918 100755
--- a/rewriter/version_rewriter_test.cc
+++ b/rewriter/version_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/zipcode_rewriter.cc b/rewriter/zipcode_rewriter.cc
index 9dc0d64..8be01c1 100755
--- a/rewriter/zipcode_rewriter.cc
+++ b/rewriter/zipcode_rewriter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/zipcode_rewriter.h b/rewriter/zipcode_rewriter.h
index 66047ff..04bb76a 100755
--- a/rewriter/zipcode_rewriter.h
+++ b/rewriter/zipcode_rewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/rewriter/zipcode_rewriter_test.cc b/rewriter/zipcode_rewriter_test.cc
index 4421a79..9abb6fe 100755
--- a/rewriter/zipcode_rewriter_test.cc
+++ b/rewriter/zipcode_rewriter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/server/cache_service_manager.cc b/server/cache_service_manager.cc
index 0dd1313..5b89e23 100755
--- a/server/cache_service_manager.cc
+++ b/server/cache_service_manager.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/server/cache_service_manager.h b/server/cache_service_manager.h
index 9ccd35c..8f6f699 100755
--- a/server/cache_service_manager.h
+++ b/server/cache_service_manager.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/server/mozc_cache_service.cc b/server/mozc_cache_service.cc
index d43f2f1..f6ead1e 100755
--- a/server/mozc_cache_service.cc
+++ b/server/mozc_cache_service.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/server/mozc_cache_service_resource.h b/server/mozc_cache_service_resource.h
index baab834..5707dac 100755
--- a/server/mozc_cache_service_resource.h
+++ b/server/mozc_cache_service_resource.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/server/mozc_rpc_server_main.cc b/server/mozc_rpc_server_main.cc
index 7f04a7e..f6a4657 100755
--- a/server/mozc_rpc_server_main.cc
+++ b/server/mozc_rpc_server_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/server/mozc_server.cc b/server/mozc_server.cc
index 6590450..2a13826 100755
--- a/server/mozc_server.cc
+++ b/server/mozc_server.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/server/mozc_server.h b/server/mozc_server.h
index 2f4b11d..aec327b 100755
--- a/server/mozc_server.h
+++ b/server/mozc_server.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/server/server.gyp b/server/server.gyp
index 08055f8..e591c9c 100755
--- a/server/server.gyp
+++ b/server/server.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/server/server_main.cc b/server/server_main.cc
index 74c33e2..587e92e 100755
--- a/server/server_main.cc
+++ b/server/server_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/server/win32_service_state.proto b/server/win32_service_state.proto
index 3bb6442..1c7624a 100755
--- a/server/win32_service_state.proto
+++ b/server/win32_service_state.proto
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/candidates.proto b/session/candidates.proto
index 8beacb9..2853ed7 100755
--- a/session/candidates.proto
+++ b/session/candidates.proto
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/commands.proto b/session/commands.proto
index ffe4001..d90d858 100755
--- a/session/commands.proto
+++ b/session/commands.proto
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -566,6 +566,39 @@
   optional int32 length = 2;
 };
 
+// TODO(peria): Move this message to a new protobuf file.
+message CloudSyncStatus {
+  enum SyncGlobalStatus {
+    SYNC_SUCCESS = 0;
+    SYNC_FAILURE = 1;
+    INSYNC = 2;
+    NOSYNC = 3;  // no synchronisation is working.
+  };
+  required SyncGlobalStatus global_status = 1;
+
+  // Error types in sync feature.
+  enum ErrorCode {
+    // In case AuthToken is not accepted in OAuth2 authorization.
+    AUTHORIZATION_FAIL = 0;
+    // Any sync dictionaries have more entries than pre-defiend limit.
+    USER_DICTIONARY_NUM_ENTRY_EXCEEDED = 1;
+    // Sizes of any sync dictionaries are larger than pre-defiend limit.
+    USER_DICTIONARY_BYTESIZE_EXCEEDED = 2;
+    // The number of sync dictionaries exceeds pre-defined limit.
+    USER_DICTIONARY_NUM_DICTIONARY_EXCEEDED = 3;
+  };
+  message SyncError {
+    required ErrorCode error_code = 1;
+    optional int64 timestamp = 2 [default = -1];
+  };
+  // Error logs in sync feature.
+  repeated SyncError sync_errors = 2;
+
+  // We have no items numbered 3-5 for a historical reason.
+
+  // Timestamp of the last successful sync.
+  optional uint64 last_synced_timestamp = 6 [default = 0];
+};
 
 message Output {
   optional uint64 id = 1;
diff --git a/session/common.h b/session/common.h
index 9cd25c3..c99e4ee 100755
--- a/session/common.h
+++ b/session/common.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/gen_session_stress_test_data.py b/session/gen_session_stress_test_data.py
index d0611e0..3500878 100755
--- a/session/gen_session_stress_test_data.py
+++ b/session/gen_session_stress_test_data.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/session/ime_switch_util.cc b/session/ime_switch_util.cc
index c121b30..c7878f6 100755
--- a/session/ime_switch_util.cc
+++ b/session/ime_switch_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/ime_switch_util.h b/session/ime_switch_util.h
index 74407d7..20df841 100755
--- a/session/ime_switch_util.h
+++ b/session/ime_switch_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/ime_switch_util_test.cc b/session/ime_switch_util_test.cc
index eb0ceeb..b1709ba 100755
--- a/session/ime_switch_util_test.cc
+++ b/session/ime_switch_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/candidate_list.cc b/session/internal/candidate_list.cc
index 3aba121..0194787 100755
--- a/session/internal/candidate_list.cc
+++ b/session/internal/candidate_list.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/candidate_list.h b/session/internal/candidate_list.h
index 341b498..6f53ec4 100755
--- a/session/internal/candidate_list.h
+++ b/session/internal/candidate_list.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/candidate_list_test.cc b/session/internal/candidate_list_test.cc
index d42a481..0db7d10 100755
--- a/session/internal/candidate_list_test.cc
+++ b/session/internal/candidate_list_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/ime_context.cc b/session/internal/ime_context.cc
index d445103..7125cb7 100755
--- a/session/internal/ime_context.cc
+++ b/session/internal/ime_context.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/ime_context.h b/session/internal/ime_context.h
index 3ba945b..6b7c2cf 100755
--- a/session/internal/ime_context.h
+++ b/session/internal/ime_context.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/ime_context_test.cc b/session/internal/ime_context_test.cc
index 5489c88..7903c6a 100755
--- a/session/internal/ime_context_test.cc
+++ b/session/internal/ime_context_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/keymap-inl.h b/session/internal/keymap-inl.h
index db60155..52cd36d 100755
--- a/session/internal/keymap-inl.h
+++ b/session/internal/keymap-inl.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/keymap.cc b/session/internal/keymap.cc
index c3bcd9a..10f52db 100755
--- a/session/internal/keymap.cc
+++ b/session/internal/keymap.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/keymap.h b/session/internal/keymap.h
index bfa70f5..0a706e0 100755
--- a/session/internal/keymap.h
+++ b/session/internal/keymap.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/keymap_factory.cc b/session/internal/keymap_factory.cc
index 5d8f6c4..718d9a8 100755
--- a/session/internal/keymap_factory.cc
+++ b/session/internal/keymap_factory.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/keymap_factory.h b/session/internal/keymap_factory.h
index 1ab8dca..8b17e67 100755
--- a/session/internal/keymap_factory.h
+++ b/session/internal/keymap_factory.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/keymap_factory_test.cc b/session/internal/keymap_factory_test.cc
index f257be1..d9a35dc 100755
--- a/session/internal/keymap_factory_test.cc
+++ b/session/internal/keymap_factory_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/keymap_interface.h b/session/internal/keymap_interface.h
index 4ec7333..9605566 100755
--- a/session/internal/keymap_interface.h
+++ b/session/internal/keymap_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/keymap_test.cc b/session/internal/keymap_test.cc
index dc59246..4d38366 100755
--- a/session/internal/keymap_test.cc
+++ b/session/internal/keymap_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/session_output.cc b/session/internal/session_output.cc
index 8760033..ccb5b43 100755
--- a/session/internal/session_output.cc
+++ b/session/internal/session_output.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/session_output.h b/session/internal/session_output.h
index 5dbd037..d2d9abd 100755
--- a/session/internal/session_output.h
+++ b/session/internal/session_output.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/internal/session_output_test.cc b/session/internal/session_output_test.cc
index e319539..34d1a1d 100755
--- a/session/internal/session_output_test.cc
+++ b/session/internal/session_output_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/japanese_session_factory.cc b/session/japanese_session_factory.cc
index 085c15e..3bf05db 100755
--- a/session/japanese_session_factory.cc
+++ b/session/japanese_session_factory.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/japanese_session_factory.h b/session/japanese_session_factory.h
index 39aac42..19f4cb1 100755
--- a/session/japanese_session_factory.h
+++ b/session/japanese_session_factory.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/key_event_normalizer.h b/session/key_event_normalizer.h
index 6e3a384..1d734ef 100755
--- a/session/key_event_normalizer.h
+++ b/session/key_event_normalizer.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/key_parser.cc b/session/key_parser.cc
index 86faf14..b399f79 100755
--- a/session/key_parser.cc
+++ b/session/key_parser.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/key_parser.h b/session/key_parser.h
index b9f4b09..bd24014 100755
--- a/session/key_parser.h
+++ b/session/key_parser.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/mock_session_handler.cc b/session/mock_session_handler.cc
index cd1f2dc..b23528b 100755
--- a/session/mock_session_handler.cc
+++ b/session/mock_session_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/mock_session_handler.h b/session/mock_session_handler.h
index 64acba0..4932eea 100755
--- a/session/mock_session_handler.h
+++ b/session/mock_session_handler.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/mock_session_handler_test.cc b/session/mock_session_handler_test.cc
index 06c6ad3..642c4d8 100755
--- a/session/mock_session_handler_test.cc
+++ b/session/mock_session_handler_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/random_keyevents_generator.cc b/session/random_keyevents_generator.cc
index 3009543..94351a5 100755
--- a/session/random_keyevents_generator.cc
+++ b/session/random_keyevents_generator.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/random_keyevents_generator.h b/session/random_keyevents_generator.h
index 792430b..19f7661 100755
--- a/session/random_keyevents_generator.h
+++ b/session/random_keyevents_generator.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/random_keyevents_generator_test.cc b/session/random_keyevents_generator_test.cc
index 603f42c..b4445b5 100755
--- a/session/random_keyevents_generator_test.cc
+++ b/session/random_keyevents_generator_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session.cc b/session/session.cc
index 80fec9b..bc24404 100755
--- a/session/session.cc
+++ b/session/session.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -1118,7 +1118,7 @@
 bool Session::Revert(commands::Command *command) {
   if (context_->state() == ImeContext::PRECOMPOSITION) {
     context_->mutable_converter()->Revert();
-    return EchoBack(command);
+    return EchoBackAndClearUndoContext(command);
   }
 
   if (!(context_->state() & (ImeContext::COMPOSITION |
diff --git a/session/session.gyp b/session/session.gyp
index 21e4cce..3daf27b 100755
--- a/session/session.gyp
+++ b/session/session.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/session/session.h b/session/session.h
index 81b2d18..be98e58 100755
--- a/session/session.h
+++ b/session/session.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_base.gyp b/session/session_base.gyp
index 7710ff1..4e7123b 100755
--- a/session/session_base.gyp
+++ b/session/session_base.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/session/session_client_main.cc b/session/session_client_main.cc
index 2104ea3..b0d2166 100755
--- a/session/session_client_main.cc
+++ b/session/session_client_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_converter.cc b/session/session_converter.cc
index 64ae607..aa0ea41 100755
--- a/session/session_converter.cc
+++ b/session/session_converter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -640,7 +640,8 @@
 
   const size_t result_length = Util::CharsLen(result_.key());
   const size_t preedit_length = Util::CharsLen(preedit);
-  if (result_length < preedit_length) {
+  bool use_partial_suggestion = false;
+  if (use_partial_suggestion && (result_length < preedit_length)) {
     // A candidate was chosen from partial suggestion.
     converter_->CommitPartialSuggestionSegmentValue(
         segments_.get(),
diff --git a/session/session_converter.h b/session/session_converter.h
index 8447c3d..4a0dd65 100755
--- a/session/session_converter.h
+++ b/session/session_converter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_converter_interface.h b/session/session_converter_interface.h
index be5bf45..f410edd 100755
--- a/session/session_converter_interface.h
+++ b/session/session_converter_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_converter_stress_test.cc b/session/session_converter_stress_test.cc
index 3c7e3ad..e962793 100755
--- a/session/session_converter_stress_test.cc
+++ b/session/session_converter_stress_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_converter_test.cc b/session/session_converter_test.cc
index fd36500..3a176a3 100755
--- a/session/session_converter_test.cc
+++ b/session/session_converter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_factory_manager.cc b/session/session_factory_manager.cc
index 37b87f9..707347e 100755
--- a/session/session_factory_manager.cc
+++ b/session/session_factory_manager.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_factory_manager.h b/session/session_factory_manager.h
index 96de00e..561be76 100755
--- a/session/session_factory_manager.h
+++ b/session/session_factory_manager.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_handler.cc b/session/session_handler.cc
index c7ee0e7..13df819 100755
--- a/session/session_handler.cc
+++ b/session/session_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_handler.h b/session/session_handler.h
index 1e2f52b..d19d6f3 100755
--- a/session/session_handler.h
+++ b/session/session_handler.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_handler_interface.h b/session/session_handler_interface.h
index cc175b3..a31760c 100755
--- a/session/session_handler_interface.h
+++ b/session/session_handler_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_handler_stress_test.cc b/session/session_handler_stress_test.cc
index 49b969d..2473bb9 100755
--- a/session/session_handler_stress_test.cc
+++ b/session/session_handler_stress_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_handler_stress_test_main.cc b/session/session_handler_stress_test_main.cc
index fb813ef..00dfe52 100755
--- a/session/session_handler_stress_test_main.cc
+++ b/session/session_handler_stress_test_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_handler_test.cc b/session/session_handler_test.cc
index 7f88cf9..84a8368 100755
--- a/session/session_handler_test.cc
+++ b/session/session_handler_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_interface.h b/session/session_interface.h
index e833608..1975a69 100755
--- a/session/session_interface.h
+++ b/session/session_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_observer_handler.cc b/session/session_observer_handler.cc
index 6efc528..5a7f6b4 100755
--- a/session/session_observer_handler.cc
+++ b/session/session_observer_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_observer_handler.h b/session/session_observer_handler.h
index 096d795..ae92e61 100755
--- a/session/session_observer_handler.h
+++ b/session/session_observer_handler.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_observer_handler_test.cc b/session/session_observer_handler_test.cc
index 09d4860..adcae13 100755
--- a/session/session_observer_handler_test.cc
+++ b/session/session_observer_handler_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_observer_interface.h b/session/session_observer_interface.h
index 263544e..47cf1f7 100755
--- a/session/session_observer_interface.h
+++ b/session/session_observer_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_regression_test.cc b/session/session_regression_test.cc
index 5467ef4..b755f6b 100755
--- a/session/session_regression_test.cc
+++ b/session/session_regression_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_server.cc b/session/session_server.cc
index 673ccb6..7fc8138 100755
--- a/session/session_server.cc
+++ b/session/session_server.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_server.h b/session/session_server.h
index a886ffc..234e3be 100755
--- a/session/session_server.h
+++ b/session/session_server.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_server_main.cc b/session/session_server_main.cc
index f75e70e..0a2ab6e 100755
--- a/session/session_server_main.cc
+++ b/session/session_server_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_server_test.cc b/session/session_server_test.cc
index 8fa4af1..02b9c66 100755
--- a/session/session_server_test.cc
+++ b/session/session_server_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_test.cc b/session/session_test.cc
index 5a85ebf..195e4ba 100755
--- a/session/session_test.cc
+++ b/session/session_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -2137,48 +2137,6 @@
   }
 }
 
-TEST_F(SessionTest, UndoForComposition) {
-  scoped_ptr<Session> session(new Session);
-  InitSessionToPrecomposition(session.get());
-
-  // Undo requires capability DELETE_PRECEDING_TEXT.
-  commands::Capability capability;
-  capability.set_text_deletion(commands::Capability::DELETE_PRECEDING_TEXT);
-  session->set_client_capability(capability);
-
-  commands::Command command;
-  Segments segments;
-
-  {  // Undo for CommitFirstSuggestion
-    SetAiueo(&segments);
-    convertermock_->SetStartSuggestionWithComposer(&segments, true);
-    InsertCharacterChars("ai", session.get(), &command);
-    SetComposer(session.get(), &segments);
-    // "あい"
-    EXPECT_EQ("\xE3\x81\x82\xE3\x81\x84", GetComposition(command));
-
-    command.Clear();
-    session->CommitFirstSuggestion(&command);
-    EXPECT_TRUE(command.output().has_result());
-    EXPECT_FALSE(command.output().has_preedit());
-    // "あいうえお"
-    EXPECT_EQ("\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A",
-              command.output().result().value());
-    EXPECT_EQ(ImeContext::PRECOMPOSITION, session->context().state());
-
-    command.Clear();
-    session->Undo(&command);
-    EXPECT_FALSE(command.output().has_result());
-    EXPECT_TRUE(command.output().has_deletion_range());
-    EXPECT_EQ(-5, command.output().deletion_range().offset());
-    EXPECT_EQ(5, command.output().deletion_range().length());
-    EXPECT_TRUE(command.output().has_preedit());
-    // "あい"
-    EXPECT_EQ("\xE3\x81\x82\xE3\x81\x84", GetComposition(command));
-    EXPECT_EQ(2, command.output().candidates().size());
-    EXPECT_EQ(ImeContext::COMPOSITION, session->context().state());
-  }
-}
 
 TEST_F(SessionTest, RequestUndo) {
   scoped_ptr<Session> session(new Session);
@@ -5285,6 +5243,36 @@
   EXPECT_TRUE(convertermock->revert_conversion_called());
 }
 
+// Revert command must clear the undo context.
+TEST_F(SessionTest, Issue5742293) {
+  scoped_ptr<Session> session(new Session);
+  InitSessionToPrecomposition(session.get());
+
+  // Undo requires capability DELETE_PRECEDING_TEXT.
+  commands::Capability capability;
+  capability.set_text_deletion(commands::Capability::DELETE_PRECEDING_TEXT);
+  session->set_client_capability(capability);
+
+  config::Config config;
+  config.set_session_keymap(config::Config::MSIME);
+  SetConfig(config);
+
+  SetUndoContext(session.get());
+
+  commands::Command command;
+
+  // BackSpace key event issues Revert command, which should clear the undo
+  // context.
+  command.Clear();
+  EXPECT_TRUE(SendKey("Backspace", session.get(), &command));
+
+  // Ctrl+BS should be consumed as UNDO.
+  command.Clear();
+  EXPECT_TRUE(TestSendKey("Ctrl Backspace", session.get(), &command));
+
+  EXPECT_FALSE(command.output().consumed());
+}
+
 TEST_F(SessionTest, AutoConversion) {
   Segments segments;
   SetAiueo(&segments);
diff --git a/session/session_test.gyp b/session/session_test.gyp
index 22ceabb..82e4e55 100755
--- a/session/session_test.gyp
+++ b/session/session_test.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/session/session_usage_observer.cc b/session/session_usage_observer.cc
index 2c777ac..17ef2ba 100755
--- a/session/session_usage_observer.cc
+++ b/session/session_usage_observer.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_usage_observer.h b/session/session_usage_observer.h
index 082755f..7cdfa2e 100755
--- a/session/session_usage_observer.h
+++ b/session/session_usage_observer.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_usage_observer_test.cc b/session/session_usage_observer_test.cc
index 24523e7..6109932 100755
--- a/session/session_usage_observer_test.cc
+++ b/session/session_usage_observer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_watch_dog.cc b/session/session_watch_dog.cc
index e01edb9..7912912 100755
--- a/session/session_watch_dog.cc
+++ b/session/session_watch_dog.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_watch_dog.h b/session/session_watch_dog.h
index 8fcc3a3..da232df 100755
--- a/session/session_watch_dog.h
+++ b/session/session_watch_dog.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/session_watch_dog_test.cc b/session/session_watch_dog_test.cc
index 69fc7dc..5dbf934 100755
--- a/session/session_watch_dog_test.cc
+++ b/session/session_watch_dog_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/session/state.proto b/session/state.proto
index 14e6a6d..f5e969b 100755
--- a/session/state.proto
+++ b/session/state.proto
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/existence_filter.cc b/storage/existence_filter.cc
index ca96b2b..4efe9f7 100755
--- a/storage/existence_filter.cc
+++ b/storage/existence_filter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/existence_filter.h b/storage/existence_filter.h
index 6fb9555..4f44152 100755
--- a/storage/existence_filter.h
+++ b/storage/existence_filter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/existence_filter_main.cc b/storage/existence_filter_main.cc
index 827feda..43ba21b 100755
--- a/storage/existence_filter_main.cc
+++ b/storage/existence_filter_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/existence_filter_test.cc b/storage/existence_filter_test.cc
index dcc0cb9..6d045e3 100755
--- a/storage/existence_filter_test.cc
+++ b/storage/existence_filter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/lru_cache.h b/storage/lru_cache.h
index 20d971d..71f04fa 100755
--- a/storage/lru_cache.h
+++ b/storage/lru_cache.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/lru_cache_main.cc b/storage/lru_cache_main.cc
index 2672c3a..7d9ae99 100755
--- a/storage/lru_cache_main.cc
+++ b/storage/lru_cache_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/lru_storage.cc b/storage/lru_storage.cc
index 45c94d0..5a6d47e 100755
--- a/storage/lru_storage.cc
+++ b/storage/lru_storage.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/lru_storage.h b/storage/lru_storage.h
index e009e15..4e955b1 100755
--- a/storage/lru_storage.h
+++ b/storage/lru_storage.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/lru_storage_main.cc b/storage/lru_storage_main.cc
index 17664e4..6a1af9f 100755
--- a/storage/lru_storage_main.cc
+++ b/storage/lru_storage_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/lru_storage_test.cc b/storage/lru_storage_test.cc
index d1110a8..f985622 100755
--- a/storage/lru_storage_test.cc
+++ b/storage/lru_storage_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/registry.cc b/storage/registry.cc
index 8e2e44d..b646b25 100755
--- a/storage/registry.cc
+++ b/storage/registry.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/registry.h b/storage/registry.h
index 5735664..5522846 100755
--- a/storage/registry.h
+++ b/storage/registry.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/registry_test.cc b/storage/registry_test.cc
index a977ed5..8ba88e3 100755
--- a/storage/registry_test.cc
+++ b/storage/registry_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/sparse_array_image.cc b/storage/sparse_array_image.cc
index 2e49d9f..78d04dc 100755
--- a/storage/sparse_array_image.cc
+++ b/storage/sparse_array_image.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/sparse_array_image.h b/storage/sparse_array_image.h
index d2915f5..173db4b 100755
--- a/storage/sparse_array_image.h
+++ b/storage/sparse_array_image.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/sparse_array_image_test.cc b/storage/sparse_array_image_test.cc
index 573b1d8..203c5e2 100755
--- a/storage/sparse_array_image_test.cc
+++ b/storage/sparse_array_image_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/storage.gyp b/storage/storage.gyp
index aa57d7f..6124814 100755
--- a/storage/storage.gyp
+++ b/storage/storage.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/storage/tiny_storage.cc b/storage/tiny_storage.cc
index 5668b47..6349958 100755
--- a/storage/tiny_storage.cc
+++ b/storage/tiny_storage.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/tiny_storage.h b/storage/tiny_storage.h
index 47bb357..615c926 100755
--- a/storage/tiny_storage.h
+++ b/storage/tiny_storage.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/storage/tiny_storage_test.cc b/storage/tiny_storage_test.cc
index 4c78d5f..595dcd2 100755
--- a/storage/tiny_storage_test.cc
+++ b/storage/tiny_storage_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/adapter_interface.h b/sync/adapter_interface.h
index ecf05f3..2232aba 100755
--- a/sync/adapter_interface.h
+++ b/sync/adapter_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/config_adapter.cc b/sync/config_adapter.cc
index 547eed2..420b4ba 100755
--- a/sync/config_adapter.cc
+++ b/sync/config_adapter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/config_adapter.h b/sync/config_adapter.h
index cd14d20..8b5e962 100755
--- a/sync/config_adapter.h
+++ b/sync/config_adapter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/config_adapter_test.cc b/sync/config_adapter_test.cc
index c30015a..b75e7a0 100755
--- a/sync/config_adapter_test.cc
+++ b/sync/config_adapter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/contact_list_util.cc b/sync/contact_list_util.cc
index 9a59a7f..e517846 100755
--- a/sync/contact_list_util.cc
+++ b/sync/contact_list_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/contact_list_util.h b/sync/contact_list_util.h
index 25ae698..60616d9 100755
--- a/sync/contact_list_util.h
+++ b/sync/contact_list_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/contact_syncer.cc b/sync/contact_syncer.cc
index d5c650b..9ef96e1 100755
--- a/sync/contact_syncer.cc
+++ b/sync/contact_syncer.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/contact_syncer.h b/sync/contact_syncer.h
index 3501c68..5a72c08 100755
--- a/sync/contact_syncer.h
+++ b/sync/contact_syncer.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/contact_syncer_test.cc b/sync/contact_syncer_test.cc
index c47a965..8c6c1b0 100755
--- a/sync/contact_syncer_test.cc
+++ b/sync/contact_syncer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/inprocess_service.cc b/sync/inprocess_service.cc
index bd99ea9..19883d4 100755
--- a/sync/inprocess_service.cc
+++ b/sync/inprocess_service.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/inprocess_service.h b/sync/inprocess_service.h
index 42ea0ab..14b2d14 100755
--- a/sync/inprocess_service.h
+++ b/sync/inprocess_service.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/inprocess_service_test.cc b/sync/inprocess_service_test.cc
index 336e2f6..b467b7b 100755
--- a/sync/inprocess_service_test.cc
+++ b/sync/inprocess_service_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/learning_preference_adapter.cc b/sync/learning_preference_adapter.cc
index 59cd973..001ba14 100755
--- a/sync/learning_preference_adapter.cc
+++ b/sync/learning_preference_adapter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/learning_preference_adapter.h b/sync/learning_preference_adapter.h
index 91a8c54..e8568b9 100755
--- a/sync/learning_preference_adapter.h
+++ b/sync/learning_preference_adapter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/learning_preference_adapter_test.cc b/sync/learning_preference_adapter_test.cc
index e450882..1f1f38b 100755
--- a/sync/learning_preference_adapter_test.cc
+++ b/sync/learning_preference_adapter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/learning_preference_sync_util.cc b/sync/learning_preference_sync_util.cc
index 93ce50a..05aea27 100755
--- a/sync/learning_preference_sync_util.cc
+++ b/sync/learning_preference_sync_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/learning_preference_sync_util.h b/sync/learning_preference_sync_util.h
index 7fa4d9a..c3124a0 100755
--- a/sync/learning_preference_sync_util.h
+++ b/sync/learning_preference_sync_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/learning_preference_sync_util_test.cc b/sync/learning_preference_sync_util_test.cc
index b27f240..43f7654 100755
--- a/sync/learning_preference_sync_util_test.cc
+++ b/sync/learning_preference_sync_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/mock_syncer.cc b/sync/mock_syncer.cc
index 5b61914..4981c81 100755
--- a/sync/mock_syncer.cc
+++ b/sync/mock_syncer.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/mock_syncer.h b/sync/mock_syncer.h
index 4545cda..64833ed 100755
--- a/sync/mock_syncer.h
+++ b/sync/mock_syncer.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/oauth2.cc b/sync/oauth2.cc
index faaf984..0b640f1 100755
--- a/sync/oauth2.cc
+++ b/sync/oauth2.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/oauth2.h b/sync/oauth2.h
index a28bc91..b174600 100755
--- a/sync/oauth2.h
+++ b/sync/oauth2.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/oauth2_client.h b/sync/oauth2_client.h
index 318bc3c..1d8de8e 100755
--- a/sync/oauth2_client.h
+++ b/sync/oauth2_client.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/oauth2_client_template.cc b/sync/oauth2_client_template.cc
index 92e1fd7..5fa9388 100755
--- a/sync/oauth2_client_template.cc
+++ b/sync/oauth2_client_template.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/oauth2_main.cc b/sync/oauth2_main.cc
index e8dbcad..481f481 100755
--- a/sync/oauth2_main.cc
+++ b/sync/oauth2_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/oauth2_test.cc b/sync/oauth2_test.cc
index 78e4c05..2fb7051 100755
--- a/sync/oauth2_test.cc
+++ b/sync/oauth2_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/oauth2_token_util.cc b/sync/oauth2_token_util.cc
index 04b28d3..868aeb0 100755
--- a/sync/oauth2_token_util.cc
+++ b/sync/oauth2_token_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/oauth2_token_util.h b/sync/oauth2_token_util.h
index 241203d..f1d13e9 100755
--- a/sync/oauth2_token_util.h
+++ b/sync/oauth2_token_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/oauth2_token_util_test.cc b/sync/oauth2_token_util_test.cc
index 5c1dd93..bd19cd7 100755
--- a/sync/oauth2_token_util_test.cc
+++ b/sync/oauth2_token_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/oauth2_util.cc b/sync/oauth2_util.cc
index e8184f8..e41009c 100755
--- a/sync/oauth2_util.cc
+++ b/sync/oauth2_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/oauth2_util.h b/sync/oauth2_util.h
index c1260ab..05e834b 100755
--- a/sync/oauth2_util.h
+++ b/sync/oauth2_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/oauth2_util_test.cc b/sync/oauth2_util_test.cc
index 4f9a597..7be8bdc 100755
--- a/sync/oauth2_util_test.cc
+++ b/sync/oauth2_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/service_interface.h b/sync/service_interface.h
index 2aaa1c4..2af4370 100755
--- a/sync/service_interface.h
+++ b/sync/service_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 1d45d46..da5417a 100755
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,9 +44,10 @@
         'inprocess_service.cc',
         'learning_preference_adapter.cc',
         'learning_preference_sync_util.cc',
+        'mock_syncer.cc',
         'sync_handler.cc',
+        'sync_status_manager.cc',
         'sync_util.cc',
-        'mock_syncer.cc',
         'syncer.cc',
         'user_dictionary_adapter.cc',
         'user_dictionary_sync_util.cc',
@@ -158,6 +159,7 @@
          'oauth2_util_test.cc',
          'oauth2_token_util_test.cc',
          'sync_handler_test.cc',
+         'sync_status_manager_test.cc',
          'sync_util_test.cc',
          'syncer_test.cc',
          'user_dictionary_adapter_test.cc',
diff --git a/sync/sync.proto b/sync/sync.proto
index 14ec391..926410b 100755
--- a/sync/sync.proto
+++ b/sync/sync.proto
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/sync_handler.cc b/sync/sync_handler.cc
index 23d9a8e..97fb123 100755
--- a/sync/sync_handler.cc
+++ b/sync/sync_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -38,9 +38,9 @@
 #include "base/util.h"
 #include "config/config_handler.h"
 #include "ipc/named_event.h"
-#include "storage/registry.h"
 #include "sync/oauth2_client.h"
 #include "sync/oauth2_util.h"
+#include "sync/sync_status_manager.h"
 #include "sync/syncer_interface.h"
 #include "client/client_interface.h"
 
@@ -52,7 +52,6 @@
 
 // TODO(taku) move it to base/const.h
 const char kEventName[] = "sync";
-const char kLastSyncedDataKey[] = "sync.last_synced_data";
 
 bool SyncFromScheduler(void *) {
   const config::Config &config = config::ConfigHandler::GetConfig();
@@ -122,34 +121,16 @@
   client->Reload();
 }
 
-void GetLastSyncedData(commands::CloudSyncStatus *cloud_sync_status) {
-  DCHECK(cloud_sync_status);
-  string value;
-  if (!mozc::storage::Registry::Lookup(kLastSyncedDataKey, &value)) {
-    LOG(WARNING) << "cannot read: " << kLastSyncedDataKey;
-    cloud_sync_status->Clear();
-    cloud_sync_status->set_global_status(commands::CloudSyncStatus::NOSYNC);
-    return;
-  }
-  cloud_sync_status->ParseFromArray(value.data(), value.size());
-}
-
-void SetLastSyncedData(const commands::CloudSyncStatus &cloud_sync_status) {
-  VLOG(1) << "setting last synced data";
-  if (!mozc::storage::Registry::Insert(
-          kLastSyncedDataKey, cloud_sync_status.SerializeAsString())) {
-    LOG(ERROR) << "cannot save: "<< kLastSyncedDataKey;
-  }
-  mozc::storage::Registry::Sync();
-}
-
 class SyncerThread: public Thread {
  public:
   SyncerThread()
       : oauth2_util_(OAuth2Client::GetDefaultClient()),
         last_sync_timestamp_(0) {
     SyncerFactory::SetOAuth2(&oauth2_util_);
-    GetLastSyncedData(&last_status_);
+
+    // Singleton of SyncStatusManager is also used in each sync_adapter and
+    // each sync_util.
+    sync_status_manager_ = Singleton<SyncStatusManager>::get();
   }
 
   virtual ~SyncerThread() {
@@ -173,10 +154,14 @@
     // existing token may be valid.
     oauth2_util_.RefreshAccessToken();
 
+    // Clear sync errors before stacking new errors in syncers' works.
+    sync_status_manager_->NewSyncStatusSession();
+
     switch (command_type_) {
       case SYNC:
         {
-          UpdateSyncStatusAtomically(commands::CloudSyncStatus::INSYNC);
+          sync_status_manager_->SetSyncGlobalStatus(
+              commands::CloudSyncStatus::INSYNC);
 
           bool reload_required = false;
           bool sync_succeed = true;
@@ -192,14 +177,12 @@
 
           {
             scoped_lock lock(&status_mutex_);
-            last_status_.set_global_status(
+            sync_status_manager_->SetSyncGlobalStatus(
                 sync_succeed ? commands::CloudSyncStatus::SYNC_SUCCESS :
                 commands::CloudSyncStatus::SYNC_FAILURE);
             if (sync_succeed) {
-              last_status_.set_last_synced_timestamp(current_timestamp);
+              sync_status_manager_->SetLastSyncedTimestamp(current_timestamp);
             }
-            DLOG(INFO) << last_status_.DebugString();
-            SetLastSyncedData(last_status_);
           }
           // Update last_sync_timestamp_
           last_sync_timestamp_ = current_timestamp;
@@ -211,7 +194,8 @@
           // Invokes the clear command later in case of failure.
           // AddJob just ignores if there's already the same job.
           Scheduler::AddJob(kClearSyncJobSetting);
-          UpdateSyncStatusAtomically(commands::CloudSyncStatus::SYNC_FAILURE);
+          sync_status_manager_->SetSyncGlobalStatus(
+              commands::CloudSyncStatus::SYNC_FAILURE);
 
           // Set the command type to SYNC to allow the next Clear() method.
           command_type_ = SYNC;
@@ -225,7 +209,8 @@
           commands::Input::AuthorizationInfo dummy_auth;
           SetAuthorization(dummy_auth);
         }
-        UpdateSyncStatusAtomically(commands::CloudSyncStatus::NOSYNC);
+        sync_status_manager_->SetSyncGlobalStatus(
+            commands::CloudSyncStatus::NOSYNC);
         Scheduler::RemoveJob(kClearSyncName);
         // Update last_sync_timestamp_
         last_sync_timestamp_ = current_timestamp;
@@ -235,6 +220,9 @@
         break;
     }
 
+    // Save the final sync status in registry
+    sync_status_manager_->SaveSyncStatus();
+
     // Emit a notification event to the caller of Sync|Clear method.
     NotifyEvent();
   }
@@ -256,7 +244,8 @@
 
     if (!SyncerFactory::GetSyncer()->Start()) {
       LOG(ERROR) << "SyncerInterface::Start() failed";
-      UpdateSyncStatusAtomically(commands::CloudSyncStatus::SYNC_FAILURE);
+      sync_status_manager_->SetSyncGlobalStatus(
+          commands::CloudSyncStatus::SYNC_FAILURE);
       NotifyEvent();
       return false;
     }
@@ -303,16 +292,11 @@
 
   void GetCloudSyncStatus(commands::CloudSyncStatus *cloud_sync_status) {
     DCHECK(cloud_sync_status);
-    cloud_sync_status->Clear();
     if (IsRunning()) {
-      cloud_sync_status->set_global_status(commands::CloudSyncStatus::INSYNC);
-      return;
-    }
-
-    {
-      scoped_lock lock(&status_mutex_);
-      cloud_sync_status->CopyFrom(last_status_);
-    }
+      sync_status_manager_->SetSyncGlobalStatus(
+          commands::CloudSyncStatus::INSYNC);
+    }
+    sync_status_manager_->GetLastSyncStatus(cloud_sync_status);
   }
 
   void SetAuthorization(
@@ -321,25 +305,21 @@
         !authorization_info.auth_code().empty()) {
       LOG(INFO) << authorization_info.DebugString();
       oauth2_util_.RequestAccessToken(authorization_info.auth_code());
-      UpdateSyncStatusAtomically(commands::CloudSyncStatus::INSYNC);
+      sync_status_manager_->SetSyncGlobalStatus(
+          commands::CloudSyncStatus::INSYNC);
     } else {
       oauth2_util_.Clear();
-      UpdateSyncStatusAtomically(commands::CloudSyncStatus::NOSYNC);
+      sync_status_manager_->SetSyncGlobalStatus(
+          commands::CloudSyncStatus::NOSYNC);
     }
   }
 
  private:
   CommandType command_type_;
-  commands::CloudSyncStatus last_status_;
   Mutex status_mutex_;
   OAuth2Util oauth2_util_;
   uint64 last_sync_timestamp_;
-
-  void UpdateSyncStatusAtomically(
-      commands::CloudSyncStatus::SyncGlobalStatus new_status) {
-    scoped_lock lock(&status_mutex_);
-    last_status_.set_global_status(new_status);
-  }
+  SyncStatusManagerInterface *sync_status_manager_;
 };
 }  // namespace
 
diff --git a/sync/sync_handler.h b/sync/sync_handler.h
index 5c7aa82..d705b27 100755
--- a/sync/sync_handler.h
+++ b/sync/sync_handler.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/sync_handler_main.cc b/sync/sync_handler_main.cc
index 15425be..fe9192f 100755
--- a/sync/sync_handler_main.cc
+++ b/sync/sync_handler_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/sync_handler_test.cc b/sync/sync_handler_test.cc
index 01e66a4..cf40585 100755
--- a/sync/sync_handler_test.cc
+++ b/sync/sync_handler_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/sync_status_manager.cc b/sync/sync_status_manager.cc
new file mode 100755
index 0000000..83b2fad
--- /dev/null
+++ b/sync/sync_status_manager.cc
@@ -0,0 +1,112 @@
+// Copyright 2010-2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "sync/sync_status_manager.h"
+
+#include <string>
+#include "base/base.h"
+#include "base/util.h"
+#include "base/mutex.h"
+#include "base/process_mutex.h"
+#include "storage/registry.h"
+
+namespace mozc {
+namespace sync {
+
+namespace {
+const char kLastSyncedDataKey[] = "sync.last_synced_data";
+}  // namespace
+
+SyncStatusManager::SyncStatusManager() {
+  scoped_lock lock(&mutex_);
+
+  // Read the last status from registry or set default status.
+  string value;
+  if (storage::Registry::Lookup(kLastSyncedDataKey, &value)) {
+    sync_status_.ParseFromArray(value.data(), value.size());
+  } else {
+    LOG(WARNING) << "cannot read: " << kLastSyncedDataKey;
+    sync_status_.Clear();
+    sync_status_.set_global_status(commands::CloudSyncStatus::NOSYNC);
+  }
+}
+
+SyncStatusManager::~SyncStatusManager() {
+  SaveSyncStatus();
+}
+
+void SyncStatusManager::GetLastSyncStatus(
+    commands::CloudSyncStatus *sync_status) {
+  DCHECK(sync_status);
+  scoped_lock lock(&mutex_);
+  sync_status->CopyFrom(sync_status_);
+}
+
+void SyncStatusManager::SetLastSyncStatus(
+    const commands::CloudSyncStatus &sync_status) {
+  scoped_lock lock(&mutex_);
+  sync_status_.CopyFrom(sync_status);
+}
+
+void SyncStatusManager::SaveSyncStatus() {
+  scoped_lock lock(&mutex_);
+
+  if (!storage::Registry::Insert(
+          kLastSyncedDataKey, sync_status_.SerializeAsString())) {
+    LOG(ERROR) << "cannot save: "<< kLastSyncedDataKey;
+  }
+  storage::Registry::Sync();
+}
+
+void SyncStatusManager::SetLastSyncedTimestamp(const int64 timestamp) {
+  scoped_lock lock(&mutex_);
+  sync_status_.set_last_synced_timestamp(timestamp);
+}
+
+void SyncStatusManager::SetSyncGlobalStatus(
+    const commands::CloudSyncStatus::SyncGlobalStatus global_status) {
+  scoped_lock lock(&mutex_);
+  sync_status_.set_global_status(global_status);
+}
+
+void SyncStatusManager::AddSyncError(
+    const commands::CloudSyncStatus::ErrorCode error_code) {
+  scoped_lock lock(&mutex_);
+  commands::CloudSyncStatus::SyncError *error = sync_status_.add_sync_errors();
+  error->set_error_code(error_code);
+  error->set_timestamp(Util::GetTime());
+}
+
+void SyncStatusManager::NewSyncStatusSession() {
+  scoped_lock lock(&mutex_);
+  sync_status_.mutable_sync_errors()->Clear();
+}
+
+}  // namespace sync
+}  // namespace mozc
diff --git a/sync/sync_status_manager.h b/sync/sync_status_manager.h
new file mode 100755
index 0000000..fe3006d
--- /dev/null
+++ b/sync/sync_status_manager.h
@@ -0,0 +1,83 @@
+// Copyright 2010-2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Functions defined in sync_status_manager.(h|cc) manage the status of sync
+// feature, mainly stocking errors occured in the last sync.
+// Public methods are thread-safe, so you can call them without caring threads,
+// and notify about race condition to edit these methods.
+
+#ifndef MOZC_SYNC_SYNC_STATUS_MANAGER_H_
+#define MOZC_SYNC_SYNC_STATUS_MANAGER_H_
+
+#include "base/mutex.h"
+#include "sync/sync_status_manager_interface.h"
+
+namespace mozc {
+namespace sync {
+
+class SyncStatusManager : public SyncStatusManagerInterface {
+ public:
+  SyncStatusManager();
+  virtual ~SyncStatusManager();
+
+  virtual void GetLastSyncStatus(commands::CloudSyncStatus *sync_status);
+  virtual void SetLastSyncStatus(const commands::CloudSyncStatus &sync_status);
+
+  // Save current sync status in registry obviously.
+  virtual void SaveSyncStatus();
+
+  // Each method below updates a part of sync status.
+  // Set in |last_synced_timestamp|.
+  virtual void SetLastSyncedTimestamp(const int64 timestamp);
+
+  // Set in |sync_global_status|.
+  virtual void SetSyncGlobalStatus(
+      const commands::CloudSyncStatus::SyncGlobalStatus global_status);
+
+  // Add a |sync_error| item, with error_code and a timestamp.
+  virtual void AddSyncError(
+      const commands::CloudSyncStatus::ErrorCode error_code);
+
+  // Clear everything other than |sync_global_status| and
+  // |last_synced_timestamp|.
+  // TODO(peria): Stack whole status before clearing.
+  virtual void NewSyncStatusSession();
+
+  // TODO(peria): Stack sync_status for few syncs, and make methods to access
+  // or to operate with old statuses.
+
+ private:
+  commands::CloudSyncStatus sync_status_;
+  Mutex mutex_;
+};
+
+}  // namespace sync
+}  // namespace mozc
+
+#endif  // MOZC_SYNC_SYNC_STATUS_MANGER_H_
diff --git a/sync/sync_status_manager_interface.h b/sync/sync_status_manager_interface.h
new file mode 100755
index 0000000..61fca2b
--- /dev/null
+++ b/sync/sync_status_manager_interface.h
@@ -0,0 +1,78 @@
+// Copyright 2010-2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef MOZC_SYNC_SYNC_STATUS_MANAGER_INTERFACE_H_
+#define MOZC_SYNC_SYNC_STATUS_MANAGER_INTERFACE_H_
+
+#include "session/commands.pb.h"
+
+namespace mozc {
+namespace sync {
+
+class SyncStatusManagerInterface {
+ public:
+  virtual ~SyncStatusManagerInterface() {}
+
+  virtual void GetLastSyncStatus(commands::CloudSyncStatus *sync_status) = 0;
+
+  // Updates the sync status as the one in the argument.
+  virtual void SetLastSyncStatus(
+      const commands::CloudSyncStatus &sync_status) = 0;
+
+  // Save on-memory status into registry.
+  virtual void SaveSyncStatus() = 0;
+
+  // Each method below updates a part of sync status.
+  // Set in |last_synced_timestamp|.
+  virtual void SetLastSyncedTimestamp(const int64 timestamp) = 0;
+
+  // Set in |sync_global_status|.
+  virtual void SetSyncGlobalStatus(
+      const commands::CloudSyncStatus::SyncGlobalStatus global_status) = 0;
+
+  // Add a |sync_error| item, with error_code and a timestamp.
+  virtual void AddSyncError(
+      const commands::CloudSyncStatus::ErrorCode error_code) = 0;
+
+  // Clear everything other than |sync_global_status| and
+  // |last_synced_timestamp|.
+  // TODO(peria): Stack whole status before clearing.
+  virtual void NewSyncStatusSession() = 0;
+
+  // TODO(peria): Stack sync_status for few syncs, and make methods to access
+  // or to operate with old statuses.
+
+ protected:
+  SyncStatusManagerInterface() {}
+};
+
+}  // namespace sync
+}  // namespace mozc
+
+#endif  // MOZC_SYNC_SYNC_STATUS_MANAGER_INTERFACE_H_
diff --git a/sync/sync_status_manager_test.cc b/sync/sync_status_manager_test.cc
new file mode 100755
index 0000000..9d7c2be
--- /dev/null
+++ b/sync/sync_status_manager_test.cc
@@ -0,0 +1,119 @@
+// Copyright 2010-2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "sync/sync_status_manager.h"
+
+#include "base/base.h"
+#include "base/util.h"
+#include "storage/registry.h"
+#include "session/commands.pb.h"
+#include "testing/base/public/gunit.h"
+
+DECLARE_string(test_tmpdir);
+
+namespace mozc {
+namespace sync {
+namespace {
+const int kNumSyncGlobalStatus = 4;
+const int kNumSyncError = 4;
+}  // namespace
+
+class SyncStatusManagerTest : public testing::Test {
+ protected:
+  virtual void SetUp() {
+    manager_.reset(new SyncStatusManager());
+  }
+
+  scoped_ptr<SyncStatusManager> manager_;
+};
+
+TEST_F(SyncStatusManagerTest, GetSetLastSyncStatus) {
+  // Set up test environment.
+  Util::SetUserProfileDirectory(FLAGS_test_tmpdir);
+
+  for (int i = 0; i < 10; ++i) {
+    commands::CloudSyncStatus status_org;
+    const uint64 t = Util::Random(1 << 30);
+    status_org.set_global_status(commands::CloudSyncStatus::SYNC_SUCCESS);
+    status_org.set_last_synced_timestamp(t);
+    manager_->SetLastSyncStatus(status_org);
+
+    commands::CloudSyncStatus status_new;
+    status_new.set_global_status(commands::CloudSyncStatus::INSYNC);
+    EXPECT_NE(t, status_new.last_synced_timestamp());
+    EXPECT_NE(commands::CloudSyncStatus::SYNC_SUCCESS,
+              status_new.global_status());
+
+    manager_->GetLastSyncStatus(&status_new);
+    EXPECT_EQ(t, status_new.last_synced_timestamp());
+    EXPECT_EQ(commands::CloudSyncStatus::SYNC_SUCCESS,
+              status_new.global_status());
+  }
+}
+
+TEST_F(SyncStatusManagerTest, UpdateSyncStatus) {
+  // Set up test environment.
+  Util::SetUserProfileDirectory(FLAGS_test_tmpdir);
+
+  for (int i = 0; i < 10; ++i) {
+    commands::CloudSyncStatus status;
+    commands::CloudSyncStatus::SyncGlobalStatus global =
+        static_cast<commands::CloudSyncStatus::SyncGlobalStatus>(
+            Util::Random(kNumSyncGlobalStatus));
+    manager_->SetSyncGlobalStatus(global);
+    manager_->GetLastSyncStatus(&status);
+    EXPECT_EQ(global, status.global_status());
+  }
+}
+
+TEST_F(SyncStatusManagerTest, StackOfSyncErrors) {
+  // Set up test environment.
+  Util::SetUserProfileDirectory(FLAGS_test_tmpdir);
+
+  commands::CloudSyncStatus status;
+  // global_status has no mean in this test, but it is required.
+  status.set_global_status(commands::CloudSyncStatus::INSYNC);
+  for (size_t i = 0; i < 10; ++i) {
+    commands::CloudSyncStatus::ErrorCode error =
+        static_cast<commands::CloudSyncStatus::ErrorCode>(
+            Util::Random(kNumSyncError));
+    manager_->AddSyncError(error);
+    manager_->GetLastSyncStatus(&status);
+    EXPECT_EQ(i + 1, status.sync_errors_size());
+    EXPECT_EQ(error, status.sync_errors(i).error_code());
+  }
+
+  // Clean up sync_errors.
+  manager_->NewSyncStatusSession();
+  manager_->GetLastSyncStatus(&status);
+  EXPECT_EQ(0, status.sync_errors_size());
+}
+
+}  // namespace sync
+}  // namespace mozc
diff --git a/sync/sync_util.cc b/sync/sync_util.cc
index 988efcf..adad65b 100755
--- a/sync/sync_util.cc
+++ b/sync/sync_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/sync_util.h b/sync/sync_util.h
index b897695..fc848fc 100755
--- a/sync/sync_util.h
+++ b/sync/sync_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/sync_util_test.cc b/sync/sync_util_test.cc
index f4ad881..9901378 100755
--- a/sync/sync_util_test.cc
+++ b/sync/sync_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/syncer.cc b/sync/syncer.cc
index c8e6b1a..39e8d48 100755
--- a/sync/syncer.cc
+++ b/sync/syncer.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/syncer.h b/sync/syncer.h
index 47ca779..990a9e1 100755
--- a/sync/syncer.h
+++ b/sync/syncer.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/syncer_interface.h b/sync/syncer_interface.h
index 4497b44..825c02b 100755
--- a/sync/syncer_interface.h
+++ b/sync/syncer_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/syncer_test.cc b/sync/syncer_test.cc
index 6f0fb18..86fb866 100755
--- a/sync/syncer_test.cc
+++ b/sync/syncer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/user_dictionary_adapter.cc b/sync/user_dictionary_adapter.cc
index 42ca556..0d7a0c1 100755
--- a/sync/user_dictionary_adapter.cc
+++ b/sync/user_dictionary_adapter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/user_dictionary_adapter.h b/sync/user_dictionary_adapter.h
index a1b2b86..16990b5 100755
--- a/sync/user_dictionary_adapter.h
+++ b/sync/user_dictionary_adapter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/user_dictionary_adapter_test.cc b/sync/user_dictionary_adapter_test.cc
index 6baebac..37d7187 100755
--- a/sync/user_dictionary_adapter_test.cc
+++ b/sync/user_dictionary_adapter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/user_dictionary_sync_util.cc b/sync/user_dictionary_sync_util.cc
index 3fd2d0d..4bc55c7 100755
--- a/sync/user_dictionary_sync_util.cc
+++ b/sync/user_dictionary_sync_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,9 @@
 #include "base/base.h"
 #include "base/mmap.h"
 #include "base/mutex.h"
+#include "base/singleton.h"
 #include "dictionary/user_dictionary_storage.h"
+#include "sync/sync_status_manager.h"
 #include "sync/sync_util.h"
 
 namespace mozc {
@@ -403,6 +405,21 @@
 bool UserDictionarySyncUtil::LockAndSaveStorage(
     UserDictionaryStorage *storage) {
   DCHECK(storage);
+
+  // Check dictionary storage condition.
+  for (int i = 0; i < storage->dictionaries_size(); ++i) {
+    const UserDictionary &dict = storage->dictionaries(i);
+    if (dict.syncable() &&
+        dict.entries_size() > UserDictionaryStorage::max_sync_entry_size()) {
+      // This singleton is also used in sync_handler.cc.
+      Singleton<SyncStatusManager>::get()->AddSyncError(
+          commands::CloudSyncStatus::USER_DICTIONARY_NUM_ENTRY_EXCEEDED);
+      LOG(ERROR) << "a sync dictionary has " << dict.entries_size()
+                 << " entries which exceeds the limit.";
+      return false;
+    }
+  }
+
   if (!storage->Lock()) {
     LOG(ERROR) << "cannot lock the storage: " << storage->filename();
     return false;
@@ -416,5 +433,5 @@
   return true;
 }
 
-}  // sync
-}  // mozc
+}  // namespace sync
+}  // namespace mozc
diff --git a/sync/user_dictionary_sync_util.h b/sync/user_dictionary_sync_util.h
index cee5898..0b6952b 100755
--- a/sync/user_dictionary_sync_util.h
+++ b/sync/user_dictionary_sync_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/user_dictionary_sync_util_test.cc b/sync/user_dictionary_sync_util_test.cc
index 5a1a298..ee44e79 100755
--- a/sync/user_dictionary_sync_util_test.cc
+++ b/sync/user_dictionary_sync_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -31,12 +31,17 @@
 
 #include <string>
 #include "base/base.h"
+#include "base/clock_mock.h"
 #include "base/file_stream.h"
 #include "base/freelist.h"
+#include "base/singleton.h"
 #include "base/util.h"
 #include "dictionary/user_dictionary_storage.h"
+#include "sync/sync_status_manager.h"
 #include "sync/sync_util.h"
 #include "testing/base/public/gunit.h"
+
+DECLARE_string(test_tmpdir);
 
 namespace mozc {
 namespace sync {
@@ -188,6 +193,58 @@
   CHECK_GT(storage->dictionaries_size(), 0);
 }
 }  // namespace
+
+TEST(UserDictionarySyncUtilTest, NumEntryExceedsTest) {
+  const int kMaxNumEntry = UserDictionaryStorage::max_sync_entry_size();
+  const uint64 kSecond = 123;
+  const uint32 kMicroSecond = 456789;
+  scoped_ptr<Util::ClockInterface>
+      mock_clock(new ClockMock(kSecond, kMicroSecond));
+  Util::SetClockHandler(mock_clock.get());
+  SyncStatusManagerInterface *manager = Singleton<SyncStatusManager>::get();
+
+  // Set up test environment.
+  Util::SetUserProfileDirectory(FLAGS_test_tmpdir);
+
+  // Actual test.
+  UserDictionaryStorage storage(Util::JoinPath(FLAGS_test_tmpdir, "test.db"));
+  EXPECT_TRUE(storage.EnsureSyncDictionaryExists());
+  UserDictionarySyncUtil::UserDictionary *dic = storage.mutable_dictionaries(0);
+  EXPECT_TRUE(dic->syncable());
+  EXPECT_EQ(0, dic->entries_size());
+  for (int i = 0; i < kMaxNumEntry; ++i) {
+    UserDictionarySyncUtil::UserDictionaryEntry *entry = dic->add_entries();
+    entry->set_key("key" + Util::SimpleItoa(i));
+    entry->set_value("value" + Util::SimpleItoa(i));
+  }
+
+  commands::CloudSyncStatus status;
+  manager->GetLastSyncStatus(&status);
+  EXPECT_EQ(0, status.sync_errors_size());
+  EXPECT_TRUE(UserDictionarySyncUtil::LockAndSaveStorage(&storage));
+
+  // Check error log
+  manager->GetLastSyncStatus(&status);
+  EXPECT_EQ(0, status.sync_errors_size());
+
+  // Newly add a few etnries, to exceed maximum number of entry.
+  for (int i = 0; i < 10; ++i) {
+    UserDictionarySyncUtil::UserDictionaryEntry *entry = dic->add_entries();
+    entry->set_key("key" + Util::SimpleItoa(i + kMaxNumEntry));
+    entry->set_value("value" + Util::SimpleItoa(i + kMaxNumEntry));
+  }
+  EXPECT_FALSE(UserDictionarySyncUtil::LockAndSaveStorage(&storage));
+
+  // Check error log
+  manager->GetLastSyncStatus(&status);
+  EXPECT_EQ(1, status.sync_errors_size());
+  EXPECT_EQ(commands::CloudSyncStatus::USER_DICTIONARY_NUM_ENTRY_EXCEEDED,
+            status.sync_errors(0).error_code());
+  EXPECT_EQ(kSecond, status.sync_errors(0).timestamp());
+
+  // Unset clock handler
+  Util::SetClockHandler(NULL);
+}
 
 TEST(UserDictionarySyncUtilTest, CreateAndMergeTest) {
   UserDictionaryStorage storage_orig("");
diff --git a/sync/user_history_adapter.cc b/sync/user_history_adapter.cc
index 0d29ea1..734449a 100755
--- a/sync/user_history_adapter.cc
+++ b/sync/user_history_adapter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/user_history_adapter.h b/sync/user_history_adapter.h
index 7742940..7861e4a 100755
--- a/sync/user_history_adapter.h
+++ b/sync/user_history_adapter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/user_history_adapter_test.cc b/sync/user_history_adapter_test.cc
index e6dc53b..54a43cc 100755
--- a/sync/user_history_adapter_test.cc
+++ b/sync/user_history_adapter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/user_history_sync_util.cc b/sync/user_history_sync_util.cc
index 8bc671b..f5dbf51 100755
--- a/sync/user_history_sync_util.cc
+++ b/sync/user_history_sync_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/user_history_sync_util.h b/sync/user_history_sync_util.h
index e55dbbe..1fdee08 100755
--- a/sync/user_history_sync_util.h
+++ b/sync/user_history_sync_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sync/user_history_sync_util_test.cc b/sync/user_history_sync_util_test.cc
index d156033..9525d7e 100755
--- a/sync/user_history_sync_util_test.cc
+++ b/sync/user_history_sync_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/testing/base/internal/googletest.cc b/testing/base/internal/googletest.cc
index 30acb52..92b1a1b 100755
--- a/testing/base/internal/googletest.cc
+++ b/testing/base/internal/googletest.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/testing/base/internal/gtest_main.cc b/testing/base/internal/gtest_main.cc
index bd22b09..be9abea 100755
--- a/testing/base/internal/gtest_main.cc
+++ b/testing/base/internal/gtest_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/testing/base/public/googletest.h b/testing/base/public/googletest.h
index 3b202b1..8388ffb 100755
--- a/testing/base/public/googletest.h
+++ b/testing/base/public/googletest.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/testing/base/public/gunit.h b/testing/base/public/gunit.h
index bcc7f52..552a0b7 100755
--- a/testing/base/public/gunit.h
+++ b/testing/base/public/gunit.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/testing/base/public/gunit_prod.h b/testing/base/public/gunit_prod.h
index fb17007..0562381 100755
--- a/testing/base/public/gunit_prod.h
+++ b/testing/base/public/gunit_prod.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/testing/sidestep/sidestep.gyp b/testing/sidestep/sidestep.gyp
index bb9cc0c..387d7c0 100755
--- a/testing/sidestep/sidestep.gyp
+++ b/testing/sidestep/sidestep.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/testing/sidestep/sidestep_helper.cc b/testing/sidestep/sidestep_helper.cc
index ef75395..afc0ca1 100755
--- a/testing/sidestep/sidestep_helper.cc
+++ b/testing/sidestep/sidestep_helper.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/testing/testing.gyp b/testing/testing.gyp
index 58d1cf3..f43dd30 100755
--- a/testing/testing.gyp
+++ b/testing/testing.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/transliteration/transliteration.cc b/transliteration/transliteration.cc
index d15f8f0..6b8e93f 100755
--- a/transliteration/transliteration.cc
+++ b/transliteration/transliteration.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/transliteration/transliteration.gyp b/transliteration/transliteration.gyp
index 73466e3..7a8873a 100755
--- a/transliteration/transliteration.gyp
+++ b/transliteration/transliteration.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/transliteration/transliteration.h b/transliteration/transliteration.h
index 7a19365..58d32e2 100755
--- a/transliteration/transliteration.h
+++ b/transliteration/transliteration.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/transliteration/transliteration_test.cc b/transliteration/transliteration_test.cc
index e315d62..62b1c5c 100755
--- a/transliteration/transliteration_test.cc
+++ b/transliteration/transliteration_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/emacs/client_pool.cc b/unix/emacs/client_pool.cc
index 4ffbec5..0d46417 100755
--- a/unix/emacs/client_pool.cc
+++ b/unix/emacs/client_pool.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/emacs/client_pool.h b/unix/emacs/client_pool.h
index 0f8c485..ebc53d8 100755
--- a/unix/emacs/client_pool.h
+++ b/unix/emacs/client_pool.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/emacs/emacs.gyp b/unix/emacs/emacs.gyp
index 57ea678..43b76f0 100755
--- a/unix/emacs/emacs.gyp
+++ b/unix/emacs/emacs.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/unix/emacs/mozc.el b/unix/emacs/mozc.el
index 4c41dac..20e782a 100755
--- a/unix/emacs/mozc.el
+++ b/unix/emacs/mozc.el
@@ -1,4 +1,4 @@
-;; Copyright 2010-2011, Google Inc.
+;; Copyright 2010-2012, Google Inc.
 ;; All rights reserved.
 ;;
 ;; Redistribution and use in source and binary forms, with or without
diff --git a/unix/emacs/mozc_emacs_helper.cc b/unix/emacs/mozc_emacs_helper.cc
index 77746a7..753bfbf 100755
--- a/unix/emacs/mozc_emacs_helper.cc
+++ b/unix/emacs/mozc_emacs_helper.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/emacs/mozc_emacs_helper_lib.cc b/unix/emacs/mozc_emacs_helper_lib.cc
index cb09cfd..763b7d3 100755
--- a/unix/emacs/mozc_emacs_helper_lib.cc
+++ b/unix/emacs/mozc_emacs_helper_lib.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/emacs/mozc_emacs_helper_lib.h b/unix/emacs/mozc_emacs_helper_lib.h
index 0eedb3b..6fbcc1a 100755
--- a/unix/emacs/mozc_emacs_helper_lib.h
+++ b/unix/emacs/mozc_emacs_helper_lib.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/emacs/mozc_emacs_helper_lib_test.cc b/unix/emacs/mozc_emacs_helper_lib_test.cc
index fcb4f0e..9960e32 100755
--- a/unix/emacs/mozc_emacs_helper_lib_test.cc
+++ b/unix/emacs/mozc_emacs_helper_lib_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/client.cc b/unix/ibus/client.cc
index 7236d27..4579c72 100755
--- a/unix/ibus/client.cc
+++ b/unix/ibus/client.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/client.h b/unix/ibus/client.h
index 0e8d915..b74ecee 100755
--- a/unix/ibus/client.h
+++ b/unix/ibus/client.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/client_test.cc b/unix/ibus/client_test.cc
index c8a17ee..a0d44fd 100755
--- a/unix/ibus/client_test.cc
+++ b/unix/ibus/client_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/config_util.cc b/unix/ibus/config_util.cc
index 5808e63..13018fb 100755
--- a/unix/ibus/config_util.cc
+++ b/unix/ibus/config_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/config_util.h b/unix/ibus/config_util.h
index ef38067..d5ed178 100755
--- a/unix/ibus/config_util.h
+++ b/unix/ibus/config_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/config_util_test.cc b/unix/ibus/config_util_test.cc
index da6a901..d52cec1 100755
--- a/unix/ibus/config_util_test.cc
+++ b/unix/ibus/config_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/engine_interface.h b/unix/ibus/engine_interface.h
index 0ab3347..1e78fd3 100755
--- a/unix/ibus/engine_interface.h
+++ b/unix/ibus/engine_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/engine_registrar.cc b/unix/ibus/engine_registrar.cc
index e446194..5a60eec 100755
--- a/unix/ibus/engine_registrar.cc
+++ b/unix/ibus/engine_registrar.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/engine_registrar.h b/unix/ibus/engine_registrar.h
index aacd540..b958983 100755
--- a/unix/ibus/engine_registrar.h
+++ b/unix/ibus/engine_registrar.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/gen_mozc_xml.py b/unix/ibus/gen_mozc_xml.py
index 57f48c3..c33a79d 100755
--- a/unix/ibus/gen_mozc_xml.py
+++ b/unix/ibus/gen_mozc_xml.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/ibus.gyp b/unix/ibus/ibus.gyp
index f6d866a..09d4eab 100755
--- a/unix/ibus/ibus.gyp
+++ b/unix/ibus/ibus.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/ibus_libraries.gypi b/unix/ibus/ibus_libraries.gypi
index 556e944..4907bbb 100755
--- a/unix/ibus/ibus_libraries.gypi
+++ b/unix/ibus/ibus_libraries.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/ibus_randomkey_test.py b/unix/ibus/ibus_randomkey_test.py
index 1c30025..9f26559 100755
--- a/unix/ibus/ibus_randomkey_test.py
+++ b/unix/ibus/ibus_randomkey_test.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/key_translator.cc b/unix/ibus/key_translator.cc
index 677b32b..1fc9b80 100755
--- a/unix/ibus/key_translator.cc
+++ b/unix/ibus/key_translator.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/key_translator.h b/unix/ibus/key_translator.h
index 9223a4b..860d2c8 100755
--- a/unix/ibus/key_translator.h
+++ b/unix/ibus/key_translator.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/key_translator_test.cc b/unix/ibus/key_translator_test.cc
index f3c0b71..ed86a29 100755
--- a/unix/ibus/key_translator_test.cc
+++ b/unix/ibus/key_translator_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/main.cc b/unix/ibus/main.cc
index b5360ea..62c042c 100755
--- a/unix/ibus/main.cc
+++ b/unix/ibus/main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/mozc_engine.cc b/unix/ibus/mozc_engine.cc
index fbef203..46ce132 100755
--- a/unix/ibus/mozc_engine.cc
+++ b/unix/ibus/mozc_engine.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -305,7 +305,8 @@
       prop_root_(NULL),
       prop_composition_mode_(NULL),
       prop_mozc_tool_(NULL),
-      current_composition_mode_(kMozcEngineInitialCompositionMode),
+      original_composition_mode_(kMozcEngineInitialCompositionMode),
+      is_activated_(true),
       preedit_method_(config::Config::ROMAN),
       ignore_reset_for_deletion_range_workaround_(false) {
   // |sub_prop_list| is a radio menu which is shown when a button in the
@@ -560,14 +561,13 @@
   }
 
   VLOG(2) << key.DebugString();
-  if ((current_composition_mode_ == commands::DIRECT) &&
+  if (!is_activated_ && !config::ImeSwitchUtil::IsTurnOnInDirectMode(key)) {
       // We DO consume keys that enable Mozc such as Henkan even when in the
       // DIRECT mode.
-      !config::ImeSwitchUtil::IsTurnOnInDirectMode(key)) {
     return FALSE;
   }
 
-  key.set_mode(current_composition_mode_);
+  key.set_mode(original_composition_mode_);
 
   commands::Output output;
   if (!client_->SendKey(key, &output)) {
@@ -587,18 +587,28 @@
     IBusEngine *engine, commands::CompositionMode composition_mode) {
   commands::SessionCommand command;
   commands::Output output;
-  if (composition_mode == commands::DIRECT) {
-    // Commit a preedit string.
-    command.set_type(commands::SessionCommand::SUBMIT);
-    client_->SendCommand(command, &output);
+
+  // In the case of Mozc, there are two state values of IME, IMEOn/IMEOff and
+  // composition_mode. However in IBus we can only control composition mode, not
+  // IMEOn/IMEOff. So we use one composition state as IMEOff and the others as
+  // IMEOn. This setting can be configured with setting
+  // kMozcEnginePropertyIMEOffState. If kMozcEnginePropertyIMEOffState is NULL,
+  // it means current IME should not be off.
+  if (kMozcEnginePropertyIMEOffState
+      && is_activated_
+      && composition_mode == kMozcEnginePropertyIMEOffState->composition_mode) {
+    commands::KeyEvent key;
+    key.set_special_key(mozc::commands::KeyEvent::OFF);
+    client_->SendKey(key, &output);
   } else {
     command.set_type(commands::SessionCommand::SWITCH_INPUT_MODE);
     command.set_composition_mode(composition_mode);
     client_->SendCommand(command, &output);
-    // To esacpe infinity loop, remove mode entry.
-    output.clear_mode();
-  }
-  current_composition_mode_ = composition_mode;
+  }
+  DCHECK(output.has_status());
+  original_composition_mode_ = output.status().mode();
+  is_activated_ = output.status().activated();
+
   UpdateAll(engine, output);
 }
 
@@ -635,22 +645,11 @@
       const MozcEngineProperty *entry =
           reinterpret_cast<const MozcEngineProperty*>(
               g_object_get_data(G_OBJECT(prop), kGObjectDataKey));
-      DCHECK(entry);
-      if (entry) {
-        // Update Mozc state.
-        SetCompositionMode(engine, entry->composition_mode);
-        // Update the language panel.
-        ibus_property_set_icon(prop_composition_mode_,
-                               GetIconPath(entry->icon).c_str());
-      }
-      // Update the radio menu item.
-      ibus_property_set_state(prop, PROP_STATE_CHECKED);
-    } else {
-      ibus_property_set_state(prop, PROP_STATE_UNCHECKED);
-    }
-    // No need to call unref since ibus_prop_list_get does not add ref.
-  }
-  ibus_engine_update_property(engine, prop_composition_mode_);
+      SetCompositionMode(engine, entry->composition_mode);
+      UpdateCompositionModeIcon(engine, entry->composition_mode);
+      break;
+    }
+  }
 }
 
 void MozcEngine::PropertyHide(IBusEngine *engine,
@@ -845,8 +844,19 @@
   UpdateResult(engine, output);
   UpdatePreedit(engine, output);
   UpdateCandidates(engine, output);
-  if (output.has_mode()) {
-    UpdateCompositionMode(engine, output.mode());
+
+  if (output.has_status() &&
+      (output.status().activated() != is_activated_ ||
+       output.status().mode() != original_composition_mode_)) {
+    if (output.status().activated()) {
+      UpdateCompositionModeIcon(engine, output.status().mode());
+    } else {
+      DCHECK(kMozcEnginePropertyIMEOffState);
+      UpdateCompositionModeIcon(
+          engine, kMozcEnginePropertyIMEOffState->composition_mode);
+    }
+    is_activated_ = output.status().activated();
+    original_composition_mode_ = output.status().mode();
   }
   LaunchTool(output);
   ExecuteCallback(engine, output);
@@ -1072,17 +1082,33 @@
 }
 #endif  // OS_CHROMEOS
 
-void MozcEngine::UpdateCompositionMode(
+void MozcEngine::UpdateCompositionModeIcon(
     IBusEngine *engine, const commands::CompositionMode new_composition_mode) {
-  if (current_composition_mode_ == new_composition_mode) {
-    return;
-  }
+
+  const MozcEngineProperty *entry = NULL;
   for (size_t i = 0; i < kMozcEnginePropertiesSize; ++i) {
-    const MozcEngineProperty &entry = kMozcEngineProperties[i];
-    if (entry.composition_mode == new_composition_mode) {
-      PropertyActivate(engine, entry.key, PROP_STATE_CHECKED);
-    }
-  }
+    if (kMozcEngineProperties[i].composition_mode == new_composition_mode) {
+      entry = &(kMozcEngineProperties[i]);
+      break;
+    }
+  }
+  DCHECK(entry);
+
+  size_t i = 0;
+  IBusProperty *prop = NULL;
+  while ((prop = ibus_prop_list_get(prop_composition_mode_->sub_props, i++))) {
+    if (!g_strcmp0(entry->key, prop->key)) {
+      // Update the language panel.
+      ibus_property_set_icon(prop_composition_mode_,
+                             GetIconPath(entry->icon).c_str());
+      // Update the radio menu item.
+      ibus_property_set_state(prop, PROP_STATE_CHECKED);
+    } else {
+      ibus_property_set_state(prop, PROP_STATE_UNCHECKED);
+    }
+    // No need to call unref since ibus_prop_list_get does not add ref.
+  }
+  ibus_engine_update_property(engine, prop_composition_mode_);
 }
 
 void MozcEngine::UpdatePreeditMethod() {
@@ -1120,9 +1146,6 @@
 }
 
 void MozcEngine::RevertSession(IBusEngine *engine) {
-  const commands::CompositionMode original_composition_mode =
-      current_composition_mode_;
-
   commands::SessionCommand command;
   command.set_type(commands::SessionCommand::REVERT);
   commands::Output output;
@@ -1130,12 +1153,7 @@
     LOG(ERROR) << "RevertSession() failed";
     return;
   }
-  UpdateAll(engine, output);  // may update |current_composition_mode_|.
-
-  // If the original composition mode is DIRECT, we should resume the setting.
-  if (original_composition_mode == commands::DIRECT) {
-    UpdateCompositionMode(engine, original_composition_mode);
-  }
+  UpdateAll(engine, output);
 }
 
 bool MozcEngine::ExecuteCallback(IBusEngine *engine,
diff --git a/unix/ibus/mozc_engine.h b/unix/ibus/mozc_engine.h
index ec79f47..776e8e6 100755
--- a/unix/ibus/mozc_engine.h
+++ b/unix/ibus/mozc_engine.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -158,7 +158,7 @@
   bool LaunchTool(const commands::Output &output) const;
 
   // Updates the composition mode based on the content of |output|.
-  void UpdateCompositionMode(
+  void UpdateCompositionModeIcon(
       IBusEngine *engine, const commands::CompositionMode new_composition_mode);
   // Updates internal preedit_method (Roman/Kana) state
   void UpdatePreeditMethod();
@@ -184,7 +184,8 @@
   IBusPropList *prop_root_;
   IBusProperty *prop_composition_mode_;
   IBusProperty *prop_mozc_tool_;
-  commands::CompositionMode current_composition_mode_;
+  commands::CompositionMode original_composition_mode_;
+  bool is_activated_;
   config::Config::PreeditMethod preedit_method_;
 
   // Unique IDs of candidates that are currently shown.
diff --git a/unix/ibus/mozc_engine_property.cc b/unix/ibus/mozc_engine_property.cc
index 63bb411..6673d22 100755
--- a/unix/ibus/mozc_engine_property.cc
+++ b/unix/ibus/mozc_engine_property.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -83,6 +83,8 @@
   },
 };
 
+const MozcEngineProperty *kMozcEnginePropertyIMEOffState
+    = &kMozcEngineProperties[0];
 const size_t kMozcEnginePropertiesSize = arraysize(kMozcEngineProperties);
 COMPILE_ASSERT(commands::NUM_OF_COMPOSITIONS == kMozcEnginePropertiesSize,
                bad_number_of_props);
diff --git a/unix/ibus/mozc_engine_property.h b/unix/ibus/mozc_engine_property.h
index 8e7839f..0df11c0 100755
--- a/unix/ibus/mozc_engine_property.h
+++ b/unix/ibus/mozc_engine_property.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,10 @@
 extern const MozcEngineProperty kMozcEngineProperties[];
 extern const size_t kMozcEnginePropertiesSize;
 
+// If kMozcEnginePropertiesIMEOffState is NULL, it means IME should be always
+// On.
+extern const MozcEngineProperty *kMozcEnginePropertyIMEOffState;
+
 extern const commands::CompositionMode kMozcEngineInitialCompositionMode;
 
 struct MozcEngineToolProperty {
diff --git a/unix/ibus/mozc_engine_test.cc b/unix/ibus/mozc_engine_test.cc
index 26e2ee8..9e763d2 100755
--- a/unix/ibus/mozc_engine_test.cc
+++ b/unix/ibus/mozc_engine_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/path_util.cc b/unix/ibus/path_util.cc
index ff1b0ff..8d4fa3e 100755
--- a/unix/ibus/path_util.cc
+++ b/unix/ibus/path_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/path_util.h b/unix/ibus/path_util.h
index 99a34a8..765b426 100755
--- a/unix/ibus/path_util.h
+++ b/unix/ibus/path_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/ibus/path_util_test.cc b/unix/ibus/path_util_test.cc
index a858b8a..d1bfd84 100755
--- a/unix/ibus/path_util_test.cc
+++ b/unix/ibus/path_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/imengine_factory.cc b/unix/scim/imengine_factory.cc
index b815383..4dd4e58 100755
--- a/unix/scim/imengine_factory.cc
+++ b/unix/scim/imengine_factory.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/imengine_factory.h b/unix/scim/imengine_factory.h
index 257f420..89a9a8f 100755
--- a/unix/scim/imengine_factory.h
+++ b/unix/scim/imengine_factory.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/mozc_connection.cc b/unix/scim/mozc_connection.cc
index d733541..6f6fd20 100755
--- a/unix/scim/mozc_connection.cc
+++ b/unix/scim/mozc_connection.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/mozc_connection.h b/unix/scim/mozc_connection.h
index 32c69aa..9359a65 100755
--- a/unix/scim/mozc_connection.h
+++ b/unix/scim/mozc_connection.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/mozc_lookup_table.cc b/unix/scim/mozc_lookup_table.cc
index 668e82c..bec1351 100755
--- a/unix/scim/mozc_lookup_table.cc
+++ b/unix/scim/mozc_lookup_table.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/mozc_lookup_table.h b/unix/scim/mozc_lookup_table.h
index 1afe23e..e485d47 100755
--- a/unix/scim/mozc_lookup_table.h
+++ b/unix/scim/mozc_lookup_table.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/mozc_response_parser.cc b/unix/scim/mozc_response_parser.cc
index 801e254..7060044 100755
--- a/unix/scim/mozc_response_parser.cc
+++ b/unix/scim/mozc_response_parser.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/mozc_response_parser.h b/unix/scim/mozc_response_parser.h
index ac7e876..8184874 100755
--- a/unix/scim/mozc_response_parser.h
+++ b/unix/scim/mozc_response_parser.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/mozc_response_parser_test.cc b/unix/scim/mozc_response_parser_test.cc
index edede41..8a6cdbb 100755
--- a/unix/scim/mozc_response_parser_test.cc
+++ b/unix/scim/mozc_response_parser_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/mozc_so_link_test.cc b/unix/scim/mozc_so_link_test.cc
index 4b8dc86..195607d 100755
--- a/unix/scim/mozc_so_link_test.cc
+++ b/unix/scim/mozc_so_link_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/scim.gyp b/unix/scim/scim.gyp
index db7b299..a9280c9 100755
--- a/unix/scim/scim.gyp
+++ b/unix/scim/scim.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/scim_key_translator.cc b/unix/scim/scim_key_translator.cc
index b1b195a..eb25f2d 100755
--- a/unix/scim/scim_key_translator.cc
+++ b/unix/scim/scim_key_translator.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/scim_key_translator.h b/unix/scim/scim_key_translator.h
index 6f17c33..0bc2373 100755
--- a/unix/scim/scim_key_translator.h
+++ b/unix/scim/scim_key_translator.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/scim_key_translator_test.cc b/unix/scim/scim_key_translator_test.cc
index 48cbbbe..c518998 100755
--- a/unix/scim/scim_key_translator_test.cc
+++ b/unix/scim/scim_key_translator_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/scim_mozc.cc b/unix/scim/scim_mozc.cc
index 5d4175b..391a6f1 100755
--- a/unix/scim/scim_mozc.cc
+++ b/unix/scim/scim_mozc.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/scim_mozc.h b/unix/scim/scim_mozc.h
index 67b8702..276da6c 100755
--- a/unix/scim/scim_mozc.h
+++ b/unix/scim/scim_mozc.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/scim_mozc_entry.cc b/unix/scim/scim_mozc_entry.cc
index d925e93..1c16d6a 100755
--- a/unix/scim/scim_mozc_entry.cc
+++ b/unix/scim/scim_mozc_entry.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/unix/scim/scim_mozc_setup.cc b/unix/scim/scim_mozc_setup.cc
index eda3aae..2eb9437 100755
--- a/unix/scim/scim_mozc_setup.cc
+++ b/unix/scim/scim_mozc_setup.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/upstream-debian/changelog b/upstream-debian/changelog
index 15c99f0..8b0b8cf 100755
--- a/upstream-debian/changelog
+++ b/upstream-debian/changelog
@@ -1,3 +1,12 @@
+mozc (1.3.975.102) lucid; urgency=low
+
+  * Ver. 1.3.975.102 on 2012-01-24
+  * Fixed IME On/Off state change related issue.(Issue 113, Issue 114)
+  * Support Japanese misc keys on GUI keybinding editor dialog.
+  * Fixed the crash bug triggered by CommitFirstSuggestion command.
+
+ -- Seigo Nonaka <nona>  Tue, 24 Jan 2012 20:34:28 +0900
+
 mozc (1.3.931.102) lucid; urgency=low
 
   * Ver. 1.3.931.102 on 2011-12-21
diff --git a/usage_stats/gen_stats_list.py b/usage_stats/gen_stats_list.py
index 2e0dedf..f1315f9 100755
--- a/usage_stats/gen_stats_list.py
+++ b/usage_stats/gen_stats_list.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/usage_stats/upload_util.cc b/usage_stats/upload_util.cc
index b2f1e70..d770eef 100755
--- a/usage_stats/upload_util.cc
+++ b/usage_stats/upload_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/usage_stats/upload_util.h b/usage_stats/upload_util.h
index 41e28a4..87bb75b 100755
--- a/usage_stats/upload_util.h
+++ b/usage_stats/upload_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/usage_stats/upload_util_test.cc b/usage_stats/upload_util_test.cc
index 673cfe5..c2b4308 100755
--- a/usage_stats/upload_util_test.cc
+++ b/usage_stats/upload_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/usage_stats/usage_stats.cc b/usage_stats/usage_stats.cc
index 25fc73c..a2c26bb 100755
--- a/usage_stats/usage_stats.cc
+++ b/usage_stats/usage_stats.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/usage_stats/usage_stats.gyp b/usage_stats/usage_stats.gyp
index 8519824..d2516d8 100755
--- a/usage_stats/usage_stats.gyp
+++ b/usage_stats/usage_stats.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/usage_stats/usage_stats.h b/usage_stats/usage_stats.h
index 150d1c7..6b867f2 100755
--- a/usage_stats/usage_stats.h
+++ b/usage_stats/usage_stats.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/usage_stats/usage_stats.proto b/usage_stats/usage_stats.proto
index 6008ba7..0507745 100755
--- a/usage_stats/usage_stats.proto
+++ b/usage_stats/usage_stats.proto
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/usage_stats/usage_stats_test.cc b/usage_stats/usage_stats_test.cc
index 37c94fa..71bd390 100755
--- a/usage_stats/usage_stats_test.cc
+++ b/usage_stats/usage_stats_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/atl_wrapper/atlbase_mozc.h b/win32/atl_wrapper/atlbase_mozc.h
index ef06a9a..85c6428 100755
--- a/win32/atl_wrapper/atlbase_mozc.h
+++ b/win32/atl_wrapper/atlbase_mozc.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/conversion_mode_util.cc b/win32/base/conversion_mode_util.cc
index 5da94dd..43f8227 100755
--- a/win32/base/conversion_mode_util.cc
+++ b/win32/base/conversion_mode_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/conversion_mode_util.h b/win32/base/conversion_mode_util.h
index e8105bd..70c92c9 100755
--- a/win32/base/conversion_mode_util.h
+++ b/win32/base/conversion_mode_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/conversion_mode_util_test.cc b/win32/base/conversion_mode_util_test.cc
index 2c04911..4f98f91 100755
--- a/win32/base/conversion_mode_util_test.cc
+++ b/win32/base/conversion_mode_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/display_name_resource.h b/win32/base/display_name_resource.h
index 81a40f2..e4a2a8b 100755
--- a/win32/base/display_name_resource.h
+++ b/win32/base/display_name_resource.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/font_util.cc b/win32/base/font_util.cc
index ca36334..32d5501 100755
--- a/win32/base/font_util.cc
+++ b/win32/base/font_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/font_util.h b/win32/base/font_util.h
index dfda097..02579ef 100755
--- a/win32/base/font_util.h
+++ b/win32/base/font_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/font_util_test.cc b/win32/base/font_util_test.cc
index 3cc1416..88cf94c 100755
--- a/win32/base/font_util_test.cc
+++ b/win32/base/font_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/imm_registrar.cc b/win32/base/imm_registrar.cc
index 2c76375..1ee6092 100755
--- a/win32/base/imm_registrar.cc
+++ b/win32/base/imm_registrar.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/imm_registrar.h b/win32/base/imm_registrar.h
index d69c041..874b4b0 100755
--- a/win32/base/imm_registrar.h
+++ b/win32/base/imm_registrar.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/imm_util.cc b/win32/base/imm_util.cc
index b929f5e..e58213b 100755
--- a/win32/base/imm_util.cc
+++ b/win32/base/imm_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/imm_util.h b/win32/base/imm_util.h
index c75b117..a3f9e88 100755
--- a/win32/base/imm_util.h
+++ b/win32/base/imm_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/immdev.h b/win32/base/immdev.h
index 40d556e..eb15bee 100755
--- a/win32/base/immdev.h
+++ b/win32/base/immdev.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/input_dll.cc b/win32/base/input_dll.cc
index 4a5a3ff..08c27b2 100755
--- a/win32/base/input_dll.cc
+++ b/win32/base/input_dll.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/input_dll.h b/win32/base/input_dll.h
index 251fec8..65a9719 100755
--- a/win32/base/input_dll.h
+++ b/win32/base/input_dll.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/input_dll_test.cc b/win32/base/input_dll_test.cc
index bae9ffd..28d16f8 100755
--- a/win32/base/input_dll_test.cc
+++ b/win32/base/input_dll_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/keyboard_layout_id.cc b/win32/base/keyboard_layout_id.cc
index 6ec3623..c6bc296 100755
--- a/win32/base/keyboard_layout_id.cc
+++ b/win32/base/keyboard_layout_id.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/keyboard_layout_id.h b/win32/base/keyboard_layout_id.h
index 964142d..fa5462a 100755
--- a/win32/base/keyboard_layout_id.h
+++ b/win32/base/keyboard_layout_id.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/keyboard_layout_id_test.cc b/win32/base/keyboard_layout_id_test.cc
index 85a274b..b4b5f54 100755
--- a/win32/base/keyboard_layout_id_test.cc
+++ b/win32/base/keyboard_layout_id_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/migration_util.cc b/win32/base/migration_util.cc
index db1102b..cef69cf 100755
--- a/win32/base/migration_util.cc
+++ b/win32/base/migration_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/migration_util.h b/win32/base/migration_util.h
index 69e2f7c..b96511d 100755
--- a/win32/base/migration_util.h
+++ b/win32/base/migration_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/omaha_util.cc b/win32/base/omaha_util.cc
index 46f6638..743f910 100755
--- a/win32/base/omaha_util.cc
+++ b/win32/base/omaha_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/omaha_util.h b/win32/base/omaha_util.h
index 514971b..6ff8ede 100755
--- a/win32/base/omaha_util.h
+++ b/win32/base/omaha_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/omaha_util_test.cc b/win32/base/omaha_util_test.cc
index 280a48b..a725dba 100755
--- a/win32/base/omaha_util_test.cc
+++ b/win32/base/omaha_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/string_util.cc b/win32/base/string_util.cc
index 2f4b537..bdd123f 100755
--- a/win32/base/string_util.cc
+++ b/win32/base/string_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/string_util.h b/win32/base/string_util.h
index f5e8410..d25e063 100755
--- a/win32/base/string_util.h
+++ b/win32/base/string_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/string_util_test.cc b/win32/base/string_util_test.cc
index 88a50c9..3e49f04 100755
--- a/win32/base/string_util_test.cc
+++ b/win32/base/string_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/uninstall_helper.cc b/win32/base/uninstall_helper.cc
index 2a34061..362c013 100755
--- a/win32/base/uninstall_helper.cc
+++ b/win32/base/uninstall_helper.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/uninstall_helper.h b/win32/base/uninstall_helper.h
index 212c08b..2a1b85d 100755
--- a/win32/base/uninstall_helper.h
+++ b/win32/base/uninstall_helper.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/uninstall_helper_test.cc b/win32/base/uninstall_helper_test.cc
index 8a007b6..67c49b9 100755
--- a/win32/base/uninstall_helper_test.cc
+++ b/win32/base/uninstall_helper_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/base/win32_base.gyp b/win32/base/win32_base.gyp
index f60a4c4..682ae3a 100755
--- a/win32/base/win32_base.gyp
+++ b/win32/base/win32_base.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/win32/broker/broker.gyp b/win32/broker/broker.gyp
index b37f09c..073ae9f 100755
--- a/win32/broker/broker.gyp
+++ b/win32/broker/broker.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/win32/broker/ime_switcher.cc b/win32/broker/ime_switcher.cc
index d8bb638..460ff51 100755
--- a/win32/broker/ime_switcher.cc
+++ b/win32/broker/ime_switcher.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/broker/mozc_broker.gypi b/win32/broker/mozc_broker.gypi
index e9e549a..dc4b905 100755
--- a/win32/broker/mozc_broker.gypi
+++ b/win32/broker/mozc_broker.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/win32/broker/mozc_broker_main.cc b/win32/broker/mozc_broker_main.cc
index 37bf70c..4a47939 100755
--- a/win32/broker/mozc_broker_main.cc
+++ b/win32/broker/mozc_broker_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/broker/register_ime.cc b/win32/broker/register_ime.cc
index 3096517..1c47adb 100755
--- a/win32/broker/register_ime.cc
+++ b/win32/broker/register_ime.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/build32/build32.gyp b/win32/build32/build32.gyp
index fac855f..d7f6080 100755
--- a/win32/build32/build32.gyp
+++ b/win32/build32/build32.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/win32/build64/build64.gyp b/win32/build64/build64.gyp
index 4a96ed7..687f9f2 100755
--- a/win32/build64/build64.gyp
+++ b/win32/build64/build64.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/win32/custom_action/custom_action.cc b/win32/custom_action/custom_action.cc
index 1f8e02f..cca7d1a 100755
--- a/win32/custom_action/custom_action.cc
+++ b/win32/custom_action/custom_action.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/custom_action/custom_action.gyp b/win32/custom_action/custom_action.gyp
index 1471e8e..2bc521d 100755
--- a/win32/custom_action/custom_action.gyp
+++ b/win32/custom_action/custom_action.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/win32/custom_action/custom_action.gypi b/win32/custom_action/custom_action.gypi
index ff06a6b..9887906 100755
--- a/win32/custom_action/custom_action.gypi
+++ b/win32/custom_action/custom_action.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/win32/custom_action/custom_action.h b/win32/custom_action/custom_action.h
index 52c5629..6308b16 100755
--- a/win32/custom_action/custom_action.h
+++ b/win32/custom_action/custom_action.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/custom_action/resource.h b/win32/custom_action/resource.h
index 81fa6f4..e90a9aa 100755
--- a/win32/custom_action/resource.h
+++ b/win32/custom_action/resource.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime.gyp b/win32/ime/ime.gyp
index 78bedd7..9663192 100755
--- a/win32/ime/ime.gyp
+++ b/win32/ime/ime.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_candidate_info.cc b/win32/ime/ime_candidate_info.cc
index a2dae0f..692ae98 100755
--- a/win32/ime/ime_candidate_info.cc
+++ b/win32/ime/ime_candidate_info.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_candidate_info.h b/win32/ime/ime_candidate_info.h
index 9909ecd..c0d446a 100755
--- a/win32/ime/ime_candidate_info.h
+++ b/win32/ime/ime_candidate_info.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_candidate_info_test.cc b/win32/ime/ime_candidate_info_test.cc
index 89081bd..d0c24f4 100755
--- a/win32/ime/ime_candidate_info_test.cc
+++ b/win32/ime/ime_candidate_info_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_composition_string.cc b/win32/ime/ime_composition_string.cc
index 898de8f..b2b302d 100755
--- a/win32/ime/ime_composition_string.cc
+++ b/win32/ime/ime_composition_string.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_composition_string.h b/win32/ime/ime_composition_string.h
index a6baf80..dcd7511 100755
--- a/win32/ime/ime_composition_string.h
+++ b/win32/ime/ime_composition_string.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_composition_string_test.cc b/win32/ime/ime_composition_string_test.cc
index 8451b90..3d40a9f 100755
--- a/win32/ime/ime_composition_string_test.cc
+++ b/win32/ime/ime_composition_string_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_core.cc b/win32/ime/ime_core.cc
index 8e62287..5ee47bb 100755
--- a/win32/ime/ime_core.cc
+++ b/win32/ime/ime_core.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_core.h b/win32/ime/ime_core.h
index 367743f..22ef2f1 100755
--- a/win32/ime/ime_core.h
+++ b/win32/ime/ime_core.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_core_test.cc b/win32/ime/ime_core_test.cc
index 9f36390..23751bf 100755
--- a/win32/ime/ime_core_test.cc
+++ b/win32/ime/ime_core_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_deleter.cc b/win32/ime/ime_deleter.cc
index aea0777..c2372e8 100755
--- a/win32/ime/ime_deleter.cc
+++ b/win32/ime/ime_deleter.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_deleter.h b/win32/ime/ime_deleter.h
index 1a45a72..320c2e9 100755
--- a/win32/ime/ime_deleter.h
+++ b/win32/ime/ime_deleter.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_deleter_test.cc b/win32/ime/ime_deleter_test.cc
index d3902e4..e32f2f5 100755
--- a/win32/ime/ime_deleter_test.cc
+++ b/win32/ime/ime_deleter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_impl_imm.cc b/win32/ime/ime_impl_imm.cc
index adfa529..d372c3c 100755
--- a/win32/ime/ime_impl_imm.cc
+++ b/win32/ime/ime_impl_imm.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_impl_imm.h b/win32/ime/ime_impl_imm.h
index 39b98e7..2c70988 100755
--- a/win32/ime/ime_impl_imm.h
+++ b/win32/ime/ime_impl_imm.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_input_context.cc b/win32/ime/ime_input_context.cc
index 719d4d9..6eb939e 100755
--- a/win32/ime/ime_input_context.cc
+++ b/win32/ime/ime_input_context.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_input_context.h b/win32/ime/ime_input_context.h
index f6362c2..9410cf0 100755
--- a/win32/ime/ime_input_context.h
+++ b/win32/ime/ime_input_context.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_input_context_test.cc b/win32/ime/ime_input_context_test.cc
index 2c1b546..61b8eb7 100755
--- a/win32/ime/ime_input_context_test.cc
+++ b/win32/ime/ime_input_context_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_keyboard.cc b/win32/ime/ime_keyboard.cc
index 5b29ff6..e22249a 100755
--- a/win32/ime/ime_keyboard.cc
+++ b/win32/ime/ime_keyboard.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_keyboard.h b/win32/ime/ime_keyboard.h
index 487b084..bfb5294 100755
--- a/win32/ime/ime_keyboard.h
+++ b/win32/ime/ime_keyboard.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_keyboard_test.cc b/win32/ime/ime_keyboard_test.cc
index b1b499c..35e931b 100755
--- a/win32/ime/ime_keyboard_test.cc
+++ b/win32/ime/ime_keyboard_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_keyevent_handler.cc b/win32/ime/ime_keyevent_handler.cc
index f8e5fa8..a5bef1d 100755
--- a/win32/ime/ime_keyevent_handler.cc
+++ b/win32/ime/ime_keyevent_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_keyevent_handler.h b/win32/ime/ime_keyevent_handler.h
index 7050ba9..c2d5115 100755
--- a/win32/ime/ime_keyevent_handler.h
+++ b/win32/ime/ime_keyevent_handler.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_keyevent_handler_test.cc b/win32/ime/ime_keyevent_handler_test.cc
index 8b025d7..f519103 100755
--- a/win32/ime/ime_keyevent_handler_test.cc
+++ b/win32/ime/ime_keyevent_handler_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_language_bar.cc b/win32/ime/ime_language_bar.cc
index b323c50..0924113 100755
--- a/win32/ime/ime_language_bar.cc
+++ b/win32/ime/ime_language_bar.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_language_bar.h b/win32/ime/ime_language_bar.h
index b573eab..c26fd5e 100755
--- a/win32/ime/ime_language_bar.h
+++ b/win32/ime/ime_language_bar.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_language_bar_menu.cc b/win32/ime/ime_language_bar_menu.cc
index c79b81d..95ab556 100755
--- a/win32/ime/ime_language_bar_menu.cc
+++ b/win32/ime/ime_language_bar_menu.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_language_bar_menu.h b/win32/ime/ime_language_bar_menu.h
index 7578503..e0f026f 100755
--- a/win32/ime/ime_language_bar_menu.h
+++ b/win32/ime/ime_language_bar_menu.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_message_queue.cc b/win32/ime/ime_message_queue.cc
index 92b461e..2ca606f 100755
--- a/win32/ime/ime_message_queue.cc
+++ b/win32/ime/ime_message_queue.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_message_queue.h b/win32/ime/ime_message_queue.h
index 9e6bf74..1def2ba 100755
--- a/win32/ime/ime_message_queue.h
+++ b/win32/ime/ime_message_queue.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_module.cc b/win32/ime/ime_module.cc
index f4635a8..5274f3f 100755
--- a/win32/ime/ime_module.cc
+++ b/win32/ime/ime_module.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_mouse_tracker.cc b/win32/ime/ime_mouse_tracker.cc
index f760ef0..4d7f383 100755
--- a/win32/ime/ime_mouse_tracker.cc
+++ b/win32/ime/ime_mouse_tracker.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_mouse_tracker.h b/win32/ime/ime_mouse_tracker.h
index 85a064f..ef21a8c 100755
--- a/win32/ime/ime_mouse_tracker.h
+++ b/win32/ime/ime_mouse_tracker.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_mouse_tracker_test.cc b/win32/ime/ime_mouse_tracker_test.cc
index 58e8a39..04b157d 100755
--- a/win32/ime/ime_mouse_tracker_test.cc
+++ b/win32/ime/ime_mouse_tracker_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_private_context.cc b/win32/ime/ime_private_context.cc
index b5941b1..5b23e75 100755
--- a/win32/ime/ime_private_context.cc
+++ b/win32/ime/ime_private_context.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_private_context.h b/win32/ime/ime_private_context.h
index 78c2232..ae717e4 100755
--- a/win32/ime/ime_private_context.h
+++ b/win32/ime/ime_private_context.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_reconvert_string.cc b/win32/ime/ime_reconvert_string.cc
index 9396ca4..2103fe7 100755
--- a/win32/ime/ime_reconvert_string.cc
+++ b/win32/ime/ime_reconvert_string.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_reconvert_string.h b/win32/ime/ime_reconvert_string.h
index 9321990..991975f 100755
--- a/win32/ime/ime_reconvert_string.h
+++ b/win32/ime/ime_reconvert_string.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_reconvert_string_test.cc b/win32/ime/ime_reconvert_string_test.cc
index a944426..a9329cd 100755
--- a/win32/ime/ime_reconvert_string_test.cc
+++ b/win32/ime/ime_reconvert_string_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_resource.h b/win32/ime/ime_resource.h
index fd7ae1a..a380ab8 100755
--- a/win32/ime/ime_resource.h
+++ b/win32/ime/ime_resource.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_scoped_context.h b/win32/ime/ime_scoped_context.h
index 7014244..3dd25e2 100755
--- a/win32/ime/ime_scoped_context.h
+++ b/win32/ime/ime_scoped_context.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_surrogate_pair_observer.cc b/win32/ime/ime_surrogate_pair_observer.cc
index f33e46f..29cc3ca 100755
--- a/win32/ime/ime_surrogate_pair_observer.cc
+++ b/win32/ime/ime_surrogate_pair_observer.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_surrogate_pair_observer.h b/win32/ime/ime_surrogate_pair_observer.h
index 111a9e7..6e1ab45 100755
--- a/win32/ime/ime_surrogate_pair_observer.h
+++ b/win32/ime/ime_surrogate_pair_observer.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_surrogate_pair_observer_test.cc b/win32/ime/ime_surrogate_pair_observer_test.cc
index 05c1330..c76d1bc 100755
--- a/win32/ime/ime_surrogate_pair_observer_test.cc
+++ b/win32/ime/ime_surrogate_pair_observer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_trace.cc b/win32/ime/ime_trace.cc
index afb2b8d..cb2a220 100755
--- a/win32/ime/ime_trace.cc
+++ b/win32/ime/ime_trace.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_trace.h b/win32/ime/ime_trace.h
index 1bd95f0..2d17f1a 100755
--- a/win32/ime/ime_trace.h
+++ b/win32/ime/ime_trace.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_types.cc b/win32/ime/ime_types.cc
index 9201986..55cbb12 100755
--- a/win32/ime/ime_types.cc
+++ b/win32/ime/ime_types.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_types.h b/win32/ime/ime_types.h
index 0328f18..ffa4198 100755
--- a/win32/ime/ime_types.h
+++ b/win32/ime/ime_types.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_ui_context.cc b/win32/ime/ime_ui_context.cc
index b085d98..a0cfd64 100755
--- a/win32/ime/ime_ui_context.cc
+++ b/win32/ime/ime_ui_context.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_ui_context.h b/win32/ime/ime_ui_context.h
index 59d3076..c245b80 100755
--- a/win32/ime/ime_ui_context.h
+++ b/win32/ime/ime_ui_context.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_ui_visibility_tracker.cc b/win32/ime/ime_ui_visibility_tracker.cc
index 3be9b84..d3b09d1 100755
--- a/win32/ime/ime_ui_visibility_tracker.cc
+++ b/win32/ime/ime_ui_visibility_tracker.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_ui_visibility_tracker.h b/win32/ime/ime_ui_visibility_tracker.h
index 6d7aa9b..50fe43c 100755
--- a/win32/ime/ime_ui_visibility_tracker.h
+++ b/win32/ime/ime_ui_visibility_tracker.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_ui_visibility_tracker_test.cc b/win32/ime/ime_ui_visibility_tracker_test.cc
index 52280b5..c7a97b0 100755
--- a/win32/ime/ime_ui_visibility_tracker_test.cc
+++ b/win32/ime/ime_ui_visibility_tracker_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_ui_window.cc b/win32/ime/ime_ui_window.cc
index 398d991..f06f5d6 100755
--- a/win32/ime/ime_ui_window.cc
+++ b/win32/ime/ime_ui_window.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/ime_ui_window.h b/win32/ime/ime_ui_window.h
index 85d9e05..1c483c6 100755
--- a/win32/ime/ime_ui_window.h
+++ b/win32/ime/ime_ui_window.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/output_util.cc b/win32/ime/output_util.cc
index 00984d0..63fc925 100755
--- a/win32/ime/output_util.cc
+++ b/win32/ime/output_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/output_util.h b/win32/ime/output_util.h
index 7f7abee..61272c1 100755
--- a/win32/ime/output_util.h
+++ b/win32/ime/output_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/ime/output_util_test.cc b/win32/ime/output_util_test.cc
index b601afd..269b91d 100755
--- a/win32/ime/output_util_test.cc
+++ b/win32/ime/output_util_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2011, Google Inc.
+// Copyright 2010-2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/win32/installer/installer.gyp b/win32/installer/installer.gyp
index 04a5381..4f24be6 100755
--- a/win32/installer/installer.gyp
+++ b/win32/installer/installer.gyp
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/win32/installer/wix.gypi b/win32/installer/wix.gypi
index 19e9581..e5da756 100755
--- a/win32/installer/wix.gypi
+++ b/win32/installer/wix.gypi
@@ -1,4 +1,4 @@
-# Copyright 2010-2011, Google Inc.
+# Copyright 2010-2012, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without