diff --git a/po/uk.po b/po/uk.po
index 0e6179f46..f935beb1b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-25 20:45+0200\n"
-"PO-Revision-Date: 2011-02-25 20:51+0300\n"
+"POT-Creation-Date: 2011-03-02 17:36+0200\n"
+"PO-Revision-Date: 2011-03-02 17:37+0300\n"
 "Last-Translator: Korostil Daniel <ted.korostiled@gmail.com>\n"
 "Language-Team: translation@linux.org.ua\n"
 "Language: uk\n"
@@ -193,27 +193,27 @@ msgid "Execution of '%s' failed:"
 msgstr "Не вдалось виконати «%s»:"
 
 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:175
+#: ../js/ui/appDisplay.js:195
 msgid "All"
 msgstr "Всі"
 
-#: ../js/ui/appDisplay.js:262
+#: ../js/ui/appDisplay.js:282
 msgid "APPLICATIONS"
 msgstr "ПРОГРАМИ"
 
-#: ../js/ui/appDisplay.js:292
-msgid "PREFERENCES"
+#: ../js/ui/appDisplay.js:312
+msgid "SETTINGS"
 msgstr "ПАРАМЕТРИ"
 
-#: ../js/ui/appDisplay.js:552
+#: ../js/ui/appDisplay.js:572
 msgid "New Window"
 msgstr "Нове вікно"
 
-#: ../js/ui/appDisplay.js:555
+#: ../js/ui/appDisplay.js:575
 msgid "Remove from Favorites"
 msgstr "Вилучити з улюбленого"
 
-#: ../js/ui/appDisplay.js:556
+#: ../js/ui/appDisplay.js:576
 msgid "Add to Favorites"
 msgstr "Додати до улюбленого"
 
@@ -230,19 +230,19 @@ msgstr "%s вилучено з улюбленого."
 #. Translators: Shown in calendar event list for all day events
 #. * Keep it short, best if you can use less then 10 characters
 #.
-#: ../js/ui/calendar.js:65
+#: ../js/ui/calendar.js:66
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Увесь день"
 
 #. Translators: Shown in calendar event list, if 24h format
-#: ../js/ui/calendar.js:70
+#: ../js/ui/calendar.js:71
 msgctxt "event list time"
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. Transators: Shown in calendar event list, if 12h format
-#: ../js/ui/calendar.js:77
+#: ../js/ui/calendar.js:78
 msgctxt "event list time"
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
@@ -252,43 +252,43 @@ msgstr "%l:%M %p"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #.
-#: ../js/ui/calendar.js:117
+#: ../js/ui/calendar.js:118
 msgctxt "grid sunday"
 msgid "S"
 msgstr "Н"
 
 #. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:119
+#: ../js/ui/calendar.js:120
 msgctxt "grid monday"
 msgid "M"
 msgstr "П"
 
 #. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:121
+#: ../js/ui/calendar.js:122
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "В"
 
 #. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:123
+#: ../js/ui/calendar.js:124
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "С"
 
 #. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:125
+#: ../js/ui/calendar.js:126
 msgctxt "grid thursday"
 msgid "T"
 msgstr "Ч"
 
 #. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:127
+#: ../js/ui/calendar.js:128
 msgctxt "grid friday"
 msgid "F"
 msgstr "П"
 
 #. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:129
+#: ../js/ui/calendar.js:130
 msgctxt "grid saturday"
 msgid "S"
 msgstr "С"
@@ -299,77 +299,77 @@ msgstr "С"
 #. * so they need to be unique (e.g. Tuesday and Thursday cannot
 #. * both be 'T').
 #.
-#: ../js/ui/calendar.js:142
+#: ../js/ui/calendar.js:143
 msgctxt "list sunday"
 msgid "Su"
 msgstr "Нд"
 
 #. Translators: Event list abbreviation for Monday
-#: ../js/ui/calendar.js:144
+#: ../js/ui/calendar.js:145
 msgctxt "list monday"
 msgid "M"
 msgstr "Пн"
 
 #. Translators: Event list abbreviation for Tuesday
-#: ../js/ui/calendar.js:146
+#: ../js/ui/calendar.js:147
 msgctxt "list tuesday"
 msgid "T"
 msgstr "Вт"
 
 #. Translators: Event list abbreviation for Wednesday
-#: ../js/ui/calendar.js:148
+#: ../js/ui/calendar.js:149
 msgctxt "list wednesday"
 msgid "W"
 msgstr "Ср"
 
 #. Translators: Event list abbreviation for Thursday
-#: ../js/ui/calendar.js:150
+#: ../js/ui/calendar.js:151
 msgctxt "list thursday"
 msgid "Th"
 msgstr "Чт"
 
 #. Translators: Event list abbreviation for Friday
-#: ../js/ui/calendar.js:152
+#: ../js/ui/calendar.js:153
 msgctxt "list friday"
 msgid "F"
 msgstr "Пт"
 
 #. Translators: Event list abbreviation for Saturday
-#: ../js/ui/calendar.js:154
+#: ../js/ui/calendar.js:155
 msgctxt "list saturday"
 msgid "S"
 msgstr "Сб"
 
 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:701
+#: ../js/ui/calendar.js:704
 msgid "Nothing Scheduled"
 msgstr "Нічого не заплановано"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:717
+#: ../js/ui/calendar.js:720
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %B %d"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:720
+#: ../js/ui/calendar.js:723
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: ../js/ui/calendar.js:730
+#: ../js/ui/calendar.js:733
 msgid "Today"
 msgstr "Сьогодні"
 
-#: ../js/ui/calendar.js:734
+#: ../js/ui/calendar.js:737
 msgid "Tomorrow"
 msgstr "Завтра"
 
-#: ../js/ui/calendar.js:743
+#: ../js/ui/calendar.js:746
 msgid "This week"
 msgstr "Цей тиждень"
 
-#: ../js/ui/calendar.js:751
+#: ../js/ui/calendar.js:754
 msgid "Next week"
 msgstr "Наступний тиждень"
 
@@ -377,58 +377,58 @@ msgstr "Наступний тиждень"
 msgid "Remove"
 msgstr "Вилучити"
 
-#: ../js/ui/dateMenu.js:93
+#: ../js/ui/dateMenu.js:91
 msgid "Date and Time Settings"
 msgstr "Параметри дати і часу"
 
-#: ../js/ui/dateMenu.js:112
+#: ../js/ui/dateMenu.js:110
 msgid "Open Calendar"
 msgstr "Відкрити календар"
 
 #. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../js/ui/dateMenu.js:151
+#: ../js/ui/dateMenu.js:162
 msgid "%a %b %e, %R:%S"
 msgstr "%a %b %e, %R:%S"
 
-#: ../js/ui/dateMenu.js:152
+#: ../js/ui/dateMenu.js:163
 msgid "%a %b %e, %R"
 msgstr "%a %b %e, %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../js/ui/dateMenu.js:156
+#: ../js/ui/dateMenu.js:167
 msgid "%a %R:%S"
 msgstr "%a %R:%S"
 
-#: ../js/ui/dateMenu.js:157
+#: ../js/ui/dateMenu.js:168
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/dateMenu.js:164
+#: ../js/ui/dateMenu.js:175
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%a %b %e, %l:%M:%S %p"
 
-#: ../js/ui/dateMenu.js:165
+#: ../js/ui/dateMenu.js:176
 msgid "%a %b %e, %l:%M %p"
 msgstr "%a %b %e, %l:%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../js/ui/dateMenu.js:169
+#: ../js/ui/dateMenu.js:180
 msgid "%a %l:%M:%S %p"
 msgstr "%a %l:%M:%S %p"
 
-#: ../js/ui/dateMenu.js:170
+#: ../js/ui/dateMenu.js:181
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #.
-#: ../js/ui/dateMenu.js:196
+#: ../js/ui/dateMenu.js:207
 msgid "%A %B %e, %Y"
 msgstr "%A %B %e, %Y"
 
@@ -553,14 +553,14 @@ msgid "Applications"
 msgstr "Програми"
 
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:537
+#: ../js/ui/panel.js:529
 #, c-format
 msgid "Quit %s"
 msgstr "Вийти з %s"
 
 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:905
+#: ../js/ui/panel.js:897
 msgid "Activities"
 msgstr "Дії"
 
@@ -602,39 +602,39 @@ msgstr "Пошук…"
 msgid "No matching results."
 msgstr "Нема збігів."
 
-#: ../js/ui/statusMenu.js:99 ../js/ui/statusMenu.js:163
+#: ../js/ui/statusMenu.js:102 ../js/ui/statusMenu.js:166
 msgid "Power Off..."
 msgstr "Вимкнення живлення…"
 
-#: ../js/ui/statusMenu.js:101 ../js/ui/statusMenu.js:162
+#: ../js/ui/statusMenu.js:104 ../js/ui/statusMenu.js:165
 msgid "Suspend"
 msgstr "Призупинити"
 
-#: ../js/ui/statusMenu.js:122
+#: ../js/ui/statusMenu.js:125
 msgid "Available"
 msgstr "Доступний"
 
-#: ../js/ui/statusMenu.js:127
+#: ../js/ui/statusMenu.js:130
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: ../js/ui/statusMenu.js:135
+#: ../js/ui/statusMenu.js:138
 msgid "My Account"
 msgstr "Мій обліковий запис"
 
-#: ../js/ui/statusMenu.js:139
+#: ../js/ui/statusMenu.js:142
 msgid "System Settings"
 msgstr "Системні параметри"
 
-#: ../js/ui/statusMenu.js:146
+#: ../js/ui/statusMenu.js:149
 msgid "Lock Screen"
 msgstr "Заблокувати екран"
 
-#: ../js/ui/statusMenu.js:150
+#: ../js/ui/statusMenu.js:153
 msgid "Switch User"
 msgstr "Змінити користувача"
 
-#: ../js/ui/statusMenu.js:155
+#: ../js/ui/statusMenu.js:158
 msgid "Log Out..."
 msgstr "Завершити сеанс…"
 
@@ -807,7 +807,13 @@ msgstr "Параметри локалізації"
 msgid "Power Settings"
 msgstr "Енергетичні параметри"
 
-#: ../js/ui/status/power.js:112
+#. 0 is reported when UPower does not have enough data
+#. to estimate battery life
+#: ../js/ui/status/power.js:110
+msgid "Estimating..."
+msgstr "Оцінювання…"
+
+#: ../js/ui/status/power.js:117
 #, c-format
 msgid "%d hour remaining"
 msgid_plural "%d hours remaining"
@@ -816,26 +822,26 @@ msgstr[1] "Залишилось %d години"
 msgstr[2] "Залишилось %d годин"
 
 #. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
-#: ../js/ui/status/power.js:115
+#: ../js/ui/status/power.js:120
 #, c-format
 msgid "%d %s %d %s remaining"
 msgstr "Залишилось %d %s %d %s"
 
-#: ../js/ui/status/power.js:117
+#: ../js/ui/status/power.js:122
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "година"
 msgstr[1] "години"
 msgstr[2] "годин"
 
-#: ../js/ui/status/power.js:117
+#: ../js/ui/status/power.js:122
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "хвилина"
 msgstr[1] "хвилини"
 msgstr[2] "хвилин"
 
-#: ../js/ui/status/power.js:120
+#: ../js/ui/status/power.js:125
 #, c-format
 msgid "%d minute remaining"
 msgid_plural "%d minutes remaining"
@@ -843,51 +849,51 @@ msgstr[0] "Залишилось %d хвилина"
 msgstr[1] "Залишилось %d хвилини"
 msgstr[2] "Залишилось %d хвилин"
 
-#: ../js/ui/status/power.js:235
+#: ../js/ui/status/power.js:241
 msgid "AC adapter"
 msgstr "Блок живлення"
 
-#: ../js/ui/status/power.js:237
+#: ../js/ui/status/power.js:243
 msgid "Laptop battery"
 msgstr "Батарея ноутбука"
 
-#: ../js/ui/status/power.js:239
+#: ../js/ui/status/power.js:245
 msgid "UPS"
 msgstr "UPS"
 
-#: ../js/ui/status/power.js:241
+#: ../js/ui/status/power.js:247
 msgid "Monitor"
 msgstr "Монітор"
 
-#: ../js/ui/status/power.js:243
+#: ../js/ui/status/power.js:249
 msgid "Mouse"
 msgstr "Миша"
 
-#: ../js/ui/status/power.js:245
+#: ../js/ui/status/power.js:251
 msgid "Keyboard"
 msgstr "Клавіатура"
 
-#: ../js/ui/status/power.js:247
+#: ../js/ui/status/power.js:253
 msgid "PDA"
 msgstr "КПК"
 
-#: ../js/ui/status/power.js:249
+#: ../js/ui/status/power.js:255
 msgid "Cell phone"
 msgstr "Мобільний телефон"
 
-#: ../js/ui/status/power.js:251
+#: ../js/ui/status/power.js:257
 msgid "Media player"
 msgstr "Програвач"
 
-#: ../js/ui/status/power.js:253
+#: ../js/ui/status/power.js:259
 msgid "Tablet"
 msgstr "Планшет"
 
-#: ../js/ui/status/power.js:255
+#: ../js/ui/status/power.js:261
 msgid "Computer"
 msgstr "Комп'ютер"
 
-#: ../js/ui/status/power.js:257 ../src/shell-app-system.c:1013
+#: ../js/ui/status/power.js:263 ../src/shell-app-system.c:1013
 msgid "Unknown"
 msgstr "Невідомо"
 
@@ -969,11 +975,11 @@ msgstr[2] "%u входів"
 msgid "System Sounds"
 msgstr "Системні звуки"
 
-#: ../src/shell-global.c:1363
+#: ../src/shell-global.c:1298
 msgid "Less than a minute ago"
 msgstr "Менше хвилини тому"
 
-#: ../src/shell-global.c:1367
+#: ../src/shell-global.c:1302
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -981,7 +987,7 @@ msgstr[0] "%d хвилина тому"
 msgstr[1] "%d хвилини тому"
 msgstr[2] "%d хвилин тому"
 
-#: ../src/shell-global.c:1372
+#: ../src/shell-global.c:1307
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -989,7 +995,7 @@ msgstr[0] "%d година тому"
 msgstr[1] "%d години тому"
 msgstr[2] "%d годин тому"
 
-#: ../src/shell-global.c:1377
+#: ../src/shell-global.c:1312
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -997,7 +1003,7 @@ msgstr[0] "%d день тому"
 msgstr[1] "%d дні тому"
 msgstr[2] "%d днів тому"
 
-#: ../src/shell-global.c:1382
+#: ../src/shell-global.c:1317
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -1033,6 +1039,9 @@ msgstr "Пошук"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
 
+#~ msgid "PREFERENCES"
+#~ msgstr "ПАРАМЕТРИ"
+
 #~ msgid "Clip the crosshairs at the center"
 #~ msgstr "Обрізати перехрестя в центрі"