diff -Nru language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/empathy.po language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/empathy.po
--- language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/empathy.po	2012-03-23 07:44:14.000000000 +0000
+++ language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/empathy.po	2012-04-18 09:08:42.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-22 08:26+0000\n"
+"POT-Creation-Date: 2012-04-11 00:47+0000\n"
 "PO-Revision-Date: 2011-05-02 04:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swahili <sw@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:50+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 02:31+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy"
@@ -48,7 +48,7 @@
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2512
+#: ../src/empathy-accounts-dialog.c:2552
 msgid "Messaging and VoIP Accounts"
 msgstr ""
 
@@ -92,418 +92,419 @@
 msgid "The default folder to save file transfers in."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid ""
 "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
 "should be executed or not. Users should not change this key manually."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Show offline contacts"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Show avatars"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Show protocols"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Show Balance in contact list"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Whether to show account balances in the contact list."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Compact contact list"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Whether to show the contact list in compact mode."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Hide main window"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Hide the main window."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Default directory to select an avatar image from"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "The last directory that an avatar image was chosen from."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Open new chats in separate windows"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Always open a separate chat window for new chats."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Display incoming events in the status area"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "The position for the chat window side pane"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Show contact groups"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Whether to show groups in the contact list."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Contact list sort criterion"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's state with the value \"state\". A value of \"name\" will sort "
 "the contact list by name."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Use notification sounds"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Whether to play a sound to notify of events."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Disable sounds when away"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for incoming messages"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound for outgoing messages"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound for new conversations"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Whether to play a sound to notify of new conversations."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Play a sound when a contact logs in"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid ""
 "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Play a sound when a contact logs out"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Play a sound when we log in"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Whether to play a sound when logging into a network."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Play a sound when we log out"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Whether to play a sound when logging out of a network."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Enable popup notifications for new messages"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Disable popup notifications when away"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "Pop up notifications if the chat isn't focused"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "Pop up notifications when a contact logs in"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Pop up notifications when a contact logs out"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Show contact list in rooms"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether to show the contact list in chat rooms."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Chat window theme"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Chat window theme variant"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Path of the Adium theme to use"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid "Enable WebKit Developer Tools"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Inform other users when you are typing to them"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to send the 'composing' or 'paused' chat states. Does not currently "
 "affect the 'gone' state."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Use theme for chat rooms"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to use the theme for chat rooms."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Spell checking languages"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Enable spell checker"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Nick completed character"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Last account selected in Join Room dialog"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Camera device"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Camera position"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Position the camera preview should be during a call."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Echo cancellation support"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Show hint about closing the main window"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Empathy can publish the user's location"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Empathy can use the network to guess the location"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid "Empathy can use the GPS to guess the location"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 msgid "Empathy should reduce the location's accuracy"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:107
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
@@ -552,18 +553,18 @@
 msgid "The selected file is empty"
 msgstr ""
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
+#: ../libempathy/empathy-message.c:407 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr ""
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:419
+#: ../libempathy/empathy-message.c:411
 #, c-format
 msgid "Called %s"
 msgstr ""
 
-#: ../libempathy/empathy-message.c:422
+#: ../libempathy/empathy-message.c:414
 #, c-format
 msgid "Call from %s"
 msgstr ""
@@ -793,7 +794,7 @@
 msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:336
+#: ../src/empathy-import-widget.c:323
 msgid "Account"
 msgstr ""
 
@@ -818,7 +819,7 @@
 msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget.c:1398
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
 msgid "Username:"
 msgstr ""
 
@@ -911,7 +912,7 @@
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
@@ -977,36 +978,32 @@
 msgid "What is your ICQ password?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:206
-#: ../libempathy-gtk/empathy-account-widget-sip.c:239
+#: ../libempathy-gtk/empathy-account-widget-sip.c:205
+#: ../libempathy-gtk/empathy-account-widget-sip.c:238
 msgid "Auto"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:209
+#: ../libempathy-gtk/empathy-account-widget-sip.c:208
 msgid "UDP"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:212
+#: ../libempathy-gtk/empathy-account-widget-sip.c:211
 msgid "TCP"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:215
+#: ../libempathy-gtk/empathy-account-widget-sip.c:214
 msgid "TLS"
 msgstr ""
 
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:244
+#: ../libempathy-gtk/empathy-account-widget-sip.c:243
 msgid "Register"
 msgstr ""
 
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:249
+#: ../libempathy-gtk/empathy-account-widget-sip.c:248
 msgid "Options"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:252
+#: ../libempathy-gtk/empathy-account-widget-sip.c:251
 msgid "None"
 msgstr ""
 
@@ -1035,45 +1032,47 @@
 msgid "Remove"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Up"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Down"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "Nickname:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Password:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
 msgid "Quit message:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
 msgid "Real name:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
 msgid "Which IRC network?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:19
 msgid "What is your IRC nickname?"
 msgstr ""
 
@@ -1349,198 +1348,198 @@
 msgid "You don't have enough credit in order to place this call"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:729
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:787
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:793
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:992
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1096
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1107
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1113
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1124
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1314
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
-#: ../libempathy-gtk/empathy-chat.c:1646
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
-#: ../libempathy-gtk/empathy-chat.c:1650
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr ""
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1577
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1617
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1624
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1627
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1630
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1633
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1640
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:955
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:955
 msgid "Topic:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1722
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1724
+#: ../libempathy-gtk/empathy-chat.c:1723
 #, c-format
 msgid "Topic set by %s to: %s"
 msgstr ""
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1729
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2245
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr ""
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2313
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr ""
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2350
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2420
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr ""
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-chat.c:2437
 #: ../libempathy-gtk/empathy-ui-utils.c:1883
 msgid "_Send"
 msgstr ""
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2495
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2584
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2723
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr ""
@@ -1548,12 +1547,12 @@
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #. 
-#: ../libempathy-gtk/empathy-chat.c:2730
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2733
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr ""
@@ -1561,17 +1560,17 @@
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #. 
-#: ../libempathy-gtk/empathy-chat.c:2741
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2744
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2748
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr ""
@@ -1581,17 +1580,17 @@
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #. 
-#: ../libempathy-gtk/empathy-chat.c:2757
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2782
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2807
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr ""
@@ -1599,55 +1598,55 @@
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../libempathy-gtk/empathy-chat.c:2993
 #: ../src/empathy-streamed-media-window.c:1888
-#: ../src/empathy-event-manager.c:1360 ../src/empathy-call-window.c:1502
-#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2590
+#: ../src/empathy-event-manager.c:1360 ../src/empathy-call-window.c:1466
+#: ../src/empathy-call-window.c:1516 ../src/empathy-call-window.c:2562
 msgid "Disconnected"
 msgstr ""
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3658
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:3674
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:3722
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr ""
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:3879
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1381
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1381
 msgid "Connected"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:4126
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr ""
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4131
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr ""
@@ -1678,7 +1677,7 @@
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:503
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 #: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:2
@@ -1750,27 +1749,27 @@
 msgstr ""
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:496
 msgid "Search contacts"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:526
 msgid "Search: "
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:584
 msgid "_Add Contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
 msgid "No contacts found"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:618
 msgid "Your message introducing yourself:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:626
 msgid "Please let me see when you're online. Thanks!"
 msgstr ""
 
@@ -1929,11 +1928,11 @@
 msgid "Unable to save avatar"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1444
+#: ../libempathy-gtk/empathy-contact-widget.c:1455
 msgid "Personal Details"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1447
+#: ../libempathy-gtk/empathy-contact-widget.c:1458
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
@@ -2042,26 +2041,26 @@
 msgid "Client:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-groups-widget.c:331
+#: ../libempathy-gtk/empathy-groups-widget.c:327
 msgid "Groups"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-groups-widget.c:343
+#: ../libempathy-gtk/empathy-groups-widget.c:339
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-groups-widget.c:362
+#: ../libempathy-gtk/empathy-groups-widget.c:358
 msgid "_Add Group"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-groups-widget.c:393
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../libempathy-gtk/empathy-groups-widget.c:403
 #: ../src/empathy-roster-window.c:1973
 msgid "Group"
 msgstr ""
@@ -2271,135 +2270,135 @@
 msgid "SSL"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:620
+#: ../libempathy-gtk/empathy-log-window.c:617
 msgid "History"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:675
+#: ../libempathy-gtk/empathy-log-window.c:672
 msgid "Show"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:697
+#: ../libempathy-gtk/empathy-log-window.c:694
 msgid "Search"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1148
+#: ../libempathy-gtk/empathy-log-window.c:1145
 #, c-format
 msgid "Chat in %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1147
 #, c-format
 msgid "Chat with %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1200
-#: ../libempathy-gtk/empathy-log-window.c:1347
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../libempathy-gtk/empathy-log-window.c:1341
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr ""
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1289
+#: ../libempathy-gtk/empathy-log-window.c:1284
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr ""
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1295
+#: ../libempathy-gtk/empathy-log-window.c:1290
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1371
+#: ../libempathy-gtk/empathy-log-window.c:1365
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1378
+#: ../libempathy-gtk/empathy-log-window.c:1372
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1386
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1711
 msgid "Today"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1724
+#: ../libempathy-gtk/empathy-log-window.c:1715
 msgid "Yesterday"
 msgstr ""
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1739
+#: ../libempathy-gtk/empathy-log-window.c:1730
 msgid "%e %B %Y"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1827
-#: ../libempathy-gtk/empathy-log-window.c:3487
+#: ../libempathy-gtk/empathy-log-window.c:1834
+#: ../libempathy-gtk/empathy-log-window.c:3457
 msgid "Anytime"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2400
+#: ../libempathy-gtk/empathy-log-window.c:1933
+#: ../libempathy-gtk/empathy-log-window.c:2392
 msgid "Anyone"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:2713
+#: ../libempathy-gtk/empathy-log-window.c:2705
 msgid "Who"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:2922
+#: ../libempathy-gtk/empathy-log-window.c:2914
 msgid "When"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3032
 msgid "Anything"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3034
 msgid "Text chats"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3035
 #: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3047
+#: ../libempathy-gtk/empathy-log-window.c:3039
 msgid "Incoming calls"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3048
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Outgoing calls"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3041
 msgid "Missed calls"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3061
 msgid "What"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3780
+#: ../libempathy-gtk/empathy-log-window.c:3750
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3784
+#: ../libempathy-gtk/empathy-log-window.c:3754
 msgid "Clear All"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3791
+#: ../libempathy-gtk/empathy-log-window.c:3761
 msgid "Delete from:"
 msgstr ""
 
@@ -2928,11 +2927,11 @@
 msgid "_Select"
 msgstr ""
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:201
 msgid "No error message"
 msgstr ""
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:274
 msgid "Instant Message (Empathy)"
 msgstr ""
 
@@ -3007,90 +3006,90 @@
 msgid "Your new account has not been saved yet."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:381
+#: ../src/empathy-accounts-dialog.c:404
 #: ../src/empathy-streamed-media-window.c:759
-#: ../src/empathy-call-window.c:1289
+#: ../src/empathy-call-window.c:1267
 msgid "Connecting…"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:422
+#: ../src/empathy-accounts-dialog.c:445
 #, c-format
 msgid "Offline — %s"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:434
+#: ../src/empathy-accounts-dialog.c:457
 #, c-format
 msgid "Disconnected — %s"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — No Network Connection"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:452
+#: ../src/empathy-accounts-dialog.c:475
 msgid "Unknown Status"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:469
+#: ../src/empathy-accounts-dialog.c:492
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
 "the account."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:479
+#: ../src/empathy-accounts-dialog.c:502
 msgid "Offline — Account Disabled"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:585
+#: ../src/empathy-accounts-dialog.c:608
 msgid "Edit Connection Parameters"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:750
+#: ../src/empathy-accounts-dialog.c:773
 msgid "Failed to retrieve your personal information from the server."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:756
+#: ../src/empathy-accounts-dialog.c:779
 msgid "Go online to edit your personal information."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:843
+#: ../src/empathy-accounts-dialog.c:866
 msgid "_Edit Connection Parameters..."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:1339
+#: ../src/empathy-accounts-dialog.c:1362
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:1343
+#: ../src/empathy-accounts-dialog.c:1366
 msgid "This will not remove your account on the server."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:1579
+#: ../src/empathy-accounts-dialog.c:1602
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1755
+#: ../src/empathy-accounts-dialog.c:1779
 msgid "_Enable"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:1756
+#: ../src/empathy-accounts-dialog.c:1780
 msgid "_Disable"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:2184
+#: ../src/empathy-accounts-dialog.c:2221
 msgid "_Skip"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:2188
+#: ../src/empathy-accounts-dialog.c:2225
 msgid "_Connect"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:2365
+#: ../src/empathy-accounts-dialog.c:2404
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3169,33 +3168,33 @@
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1211
-#: ../src/empathy-call-window.c:1889
+#: ../src/empathy-call-window.c:1861
 #, c-format
 msgid "Call with %s"
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2133
+#: ../src/empathy-call-window.c:2105
 msgid "The IP address as seen by the machine"
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2135
+#: ../src/empathy-call-window.c:2107
 msgid "The IP address as seen by a server on the Internet"
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2137
+#: ../src/empathy-call-window.c:2109
 msgid "The IP address of the peer as seen by the other side"
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2139
+#: ../src/empathy-call-window.c:2111
 msgid "The IP address of a relay server"
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:1452
-#: ../src/empathy-call-window.c:2141
+#: ../src/empathy-call-window.c:2113
 msgid "The IP address of the multicast group"
 msgstr ""
 
@@ -3214,12 +3213,12 @@
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:2199
-#: ../src/empathy-call-window.c:2992
+#: ../src/empathy-call-window.c:2964
 msgid "Technical Details"
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:2237
-#: ../src/empathy-call-window.c:3031
+#: ../src/empathy-call-window.c:3003
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3227,7 +3226,7 @@
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:2242
-#: ../src/empathy-call-window.c:3036
+#: ../src/empathy-call-window.c:3008
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3235,7 +3234,7 @@
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3014
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3243,24 +3242,24 @@
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:3048
+#: ../src/empathy-call-window.c:3020
 msgid "There was a failure on the network"
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:2258
-#: ../src/empathy-call-window.c:3052
+#: ../src/empathy-call-window.c:3024
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:2261
-#: ../src/empathy-call-window.c:3055
+#: ../src/empathy-call-window.c:3027
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:2271
-#: ../src/empathy-call-window.c:3067
+#: ../src/empathy-call-window.c:3039
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a "
@@ -3269,22 +3268,22 @@
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:2279
-#: ../src/empathy-call-window.c:3076
+#: ../src/empathy-call-window.c:3048
 msgid "There was a failure in the call engine"
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:2282
-#: ../src/empathy-call-window.c:3079
+#: ../src/empathy-call-window.c:3051
 msgid "The end of the stream was reached"
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:3119
+#: ../src/empathy-call-window.c:3091
 msgid "Can't establish audio stream"
 msgstr ""
 
 #: ../src/empathy-streamed-media-window.c:2332
-#: ../src/empathy-call-window.c:3129
+#: ../src/empathy-call-window.c:3101
 msgid "Can't establish video stream"
 msgstr ""
 
@@ -3397,8 +3396,8 @@
 
 #: ../src/empathy-call-window.ui.h:28
 #: ../src/empathy-streamed-media-window.ui.h:21
-#: ../src/empathy-call-window.c:2542 ../src/empathy-call-window.c:2543
-#: ../src/empathy-call-window.c:2544 ../src/empathy-call-window.c:2545
+#: ../src/empathy-call-window.c:2514 ../src/empathy-call-window.c:2515
+#: ../src/empathy-call-window.c:2516 ../src/empathy-call-window.c:2517
 msgid "Unknown"
 msgstr ""
 
@@ -3601,13 +3600,13 @@
 msgstr ""
 
 #: ../src/empathy-event-manager.c:605 ../src/empathy-event-manager.c:812
-#: ../src/empathy-event-manager.c:845 ../src/empathy-call-window.c:1525
+#: ../src/empathy-event-manager.c:845 ../src/empathy-call-window.c:1489
 #, c-format
 msgid "Incoming video call from %s"
 msgstr ""
 
 #: ../src/empathy-event-manager.c:605 ../src/empathy-event-manager.c:812
-#: ../src/empathy-event-manager.c:845 ../src/empathy-call-window.c:1525
+#: ../src/empathy-event-manager.c:845 ../src/empathy-call-window.c:1489
 #, c-format
 msgid "Incoming call from %s"
 msgstr ""
@@ -3805,15 +3804,15 @@
 msgstr ""
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:316
+#: ../src/empathy-import-widget.c:303
 msgid "Import"
 msgstr ""
 
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:312
 msgid "Protocol"
 msgstr ""
 
-#: ../src/empathy-import-widget.c:349
+#: ../src/empathy-import-widget.c:336
 msgid "Source"
 msgstr ""
 
@@ -3988,7 +3987,7 @@
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:637
+#: ../src/empathy-new-chatroom-dialog.c:636
 #, c-format
 msgid ""
 "%s\n"
@@ -3997,21 +3996,21 @@
 "Members: %s"
 msgstr ""
 
+#: ../src/empathy-new-chatroom-dialog.c:638
 #: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "Yes"
 msgstr ""
 
+#: ../src/empathy-new-chatroom-dialog.c:638
 #: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr ""
 
-#: ../src/empathy-new-chatroom-dialog.c:668
+#: ../src/empathy-new-chatroom-dialog.c:666
 msgid "Could not start room listing"
 msgstr ""
 
-#: ../src/empathy-new-chatroom-dialog.c:678
+#: ../src/empathy-new-chatroom-dialog.c:676
 msgid "Could not stop room listing"
 msgstr ""
 
@@ -4075,46 +4074,46 @@
 msgstr ""
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:726
+#: ../src/empathy-preferences.c:724
 msgid "Juliet"
 msgstr ""
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:733
+#: ../src/empathy-preferences.c:731
 msgid "Romeo"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:739
+#: ../src/empathy-preferences.c:737
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:743
+#: ../src/empathy-preferences.c:741
 msgid "Deny thy father and refuse thy name;"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:746
+#: ../src/empathy-preferences.c:744
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:749
+#: ../src/empathy-preferences.c:747
 msgid "And I'll no longer be a Capulet."
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:752
+#: ../src/empathy-preferences.c:750
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:755
+#: ../src/empathy-preferences.c:753
 msgid "Juliet has disconnected"
 msgstr ""
 
-#: ../src/empathy-preferences.c:1159
+#: ../src/empathy-preferences.c:1157
 msgid "Preferences"
 msgstr ""
 
@@ -4348,11 +4347,6 @@
 msgid "Pastebin response"
 msgstr ""
 
-#: ../src/empathy-debug-window.c:1680
-#, c-format
-msgid "%s"
-msgstr ""
-
 #: ../src/empathy-debug-window.c:1683
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr ""
@@ -4474,39 +4468,39 @@
 msgid "- Empathy Chat Client"
 msgstr ""
 
-#: ../src/empathy-notifications-approver.c:189
+#: ../src/empathy-notifications-approver.c:190
 msgid "Respond"
 msgstr ""
 
-#: ../src/empathy-notifications-approver.c:203
-#: ../src/empathy-call-window.c:1529
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1493
 msgid "Reject"
 msgstr ""
 
-#: ../src/empathy-notifications-approver.c:208
-#: ../src/empathy-notifications-approver.c:213
-#: ../src/empathy-call-window.c:1530
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1494
 msgid "Answer"
 msgstr ""
 
-#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:214
 msgid "Answer with video"
 msgstr ""
 
-#: ../src/empathy-notifications-approver.c:221
-#: ../src/empathy-notifications-approver.c:231
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
 msgid "Decline"
 msgstr ""
 
-#: ../src/empathy-notifications-approver.c:225
-#: ../src/empathy-notifications-approver.c:236
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
 msgid "Accept"
 msgstr ""
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:246
+#: ../src/empathy-notifications-approver.c:247
 msgid "Provide"
 msgstr ""
 
@@ -4517,42 +4511,42 @@
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
+#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
 msgid "i"
 msgstr ""
 
-#: ../src/empathy-call-window.c:1519
+#: ../src/empathy-call-window.c:1483
 msgid "Incoming call"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2888
+#: ../src/empathy-call-window.c:2860
 msgid "On hold"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2891
+#: ../src/empathy-call-window.c:2863
 msgid "Mute"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2893
+#: ../src/empathy-call-window.c:2865
 msgid "Duration"
 msgstr ""
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2896
+#: ../src/empathy-call-window.c:2868
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr ""
 
-#: ../src/empathy-call-window.c:3166
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid "Your current balance is %s."
 msgstr ""
 
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-call-window.c:3142
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr ""
 
-#: ../src/empathy-call-window.c:3172
+#: ../src/empathy-call-window.c:3144
 msgid "Top Up"
 msgstr ""
 
diff -Nru language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/gedit.po language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/gedit.po
--- language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/gedit.po	2012-03-23 07:44:13.000000000 +0000
+++ language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/gedit.po	2012-04-18 09:08:41.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gedit\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-21 03:24+0000\n"
+"POT-Creation-Date: 2012-03-27 03:25+0000\n"
 "PO-Revision-Date: 2012-02-07 18:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swahili <sw@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-03-22 17:41+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 22:44+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: ../data/gedit.desktop.in.in.h:1
 msgid "gedit"
diff -Nru language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/gnome-desktop-2.0.po language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/gnome-desktop-2.0.po
--- language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/gnome-desktop-2.0.po	2012-03-23 07:44:13.000000000 +0000
+++ language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/gnome-desktop-2.0.po	2012-04-18 09:08:41.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 17:48+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 22:53+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: ../gnome-about/gnome-about.desktop.in.in.h:1
 #: ../gnome-about/gnome-about.in:60
diff -Nru language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/gnome-icon-theme.po language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/gnome-icon-theme.po
--- language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/gnome-icon-theme.po	2012-03-23 07:44:13.000000000 +0000
+++ language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/gnome-icon-theme.po	2012-04-18 09:08:41.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: gnome-icon-theme\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-06 09:02+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0000\n"
 "PO-Revision-Date: 2011-07-06 04:31+0000\n"
 "Last-Translator: omundu <Unknown>\n"
 "Language-Team: Swahili <sw@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 17:49+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 22:56+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: ../index.theme.in.in.h:1
 msgid "GNOME"
diff -Nru language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/gnome-menus-3.0.po language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/gnome-menus-3.0.po
--- language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/gnome-menus-3.0.po	2012-03-23 07:44:13.000000000 +0000
+++ language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/gnome-menus-3.0.po	2012-04-18 09:08:41.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: gnome-menus\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-02 13:26+0000\n"
-"PO-Revision-Date: 2012-03-02 10:58+0000\n"
+"POT-Creation-Date: 2012-03-28 03:25+0000\n"
+"PO-Revision-Date: 2012-03-28 06:13+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Swahili <sw@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 17:50+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 22:57+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: ../desktop-directories/AudioVideo.directory.in.h:1
 msgid "Sound & Video"
diff -Nru language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/libgnomeui-2.0.po language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/libgnomeui-2.0.po
--- language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/libgnomeui-2.0.po	2012-03-23 07:44:13.000000000 +0000
+++ language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/libgnomeui-2.0.po	2012-04-18 09:08:41.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:05+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 23:17+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: ../demos/mdi_demo.c:128
 msgid "Child Item 1"
diff -Nru language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/shotwell.po language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/shotwell.po
--- language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/shotwell.po	2012-03-23 07:44:14.000000000 +0000
+++ language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/shotwell.po	2012-04-18 09:08:42.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shotwell\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-03 18:23-0700\n"
+"POT-Creation-Date: 2012-03-30 15:35-0700\n"
 "PO-Revision-Date: 2012-03-13 15:51+0000\n"
 "Last-Translator: Damas <Unknown>\n"
 "Language-Team: Swahili <sw@li.org>\n"
@@ -15,3330 +15,3472 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-03-22 21:59+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 03:26+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: src/AppWindow.vala:665 plugins/common/Resources.vala:28
+#: src/AppWindow.vala:680 plugins/common/Resources.vala:28
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Damas https://launchpad.net/~mlabwa"
 
-msgid "Shotwell Photo Manager"
-msgstr ""
-
 #: src/Resources.vala:15
 msgid "Photo Manager"
 msgstr ""
 
-msgid "Organize your photos"
-msgstr ""
-
-msgid "Shotwell Photo Viewer"
+msgid "Shotwell Photo Manager"
 msgstr ""
 
 #: src/Resources.vala:16
 msgid "Photo Viewer"
 msgstr ""
 
-#: src/library/ImportQueuePage.vala:8
-msgid "Importing..."
+msgid "Organize your photos"
 msgstr ""
 
-#: src/library/ImportQueuePage.vala:56 src/library/OfflinePage.vala:59
-#: src/library/TrashPage.vala:54 src/PhotoPage.vala:2267
-#: src/camera/ImportPage.vala:835 src/direct/DirectPhotoPage.vala:48
-#: src/MediaPage.vala:273 src/events/EventsDirectoryPage.vala:106
-msgid "_File"
+msgid "Shotwell Photo Viewer"
 msgstr ""
 
-#: src/library/ImportQueuePage.vala:61
-msgid "_Stop Import"
+#: src/Dimensions.vala:17
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1229
+msgid "Original size"
 msgstr ""
 
-#: src/library/ImportQueuePage.vala:62
-msgid "Stop importing photos"
-msgstr "Simamisha kuingiza picha"
+#: src/Dimensions.vala:20
+msgid "Width or height"
+msgstr ""
 
-#: src/library/ImportQueuePage.vala:66 src/library/OfflinePage.vala:73
-#: src/library/TrashPage.vala:74 src/PhotoPage.vala:2301
-#: src/camera/ImportPage.vala:855 src/direct/DirectPhotoPage.vala:161
-#: src/MediaPage.vala:398 src/events/EventsDirectoryPage.vala:110
-msgid "_View"
+#: src/Dimensions.vala:23
+msgid "Width"
 msgstr ""
 
-#: src/library/ImportQueuePage.vala:70 src/library/OfflinePage.vala:77
-#: src/library/TrashPage.vala:78 src/PhotoPage.vala:2460
-#: src/camera/ImportPage.vala:859 src/direct/DirectPhotoPage.vala:165
-#: src/MediaPage.vala:410 src/events/EventsDirectoryPage.vala:114
-msgid "_Help"
+#: src/Dimensions.vala:26
+msgid "Height"
 msgstr ""
 
-#: src/library/ImportQueuePage.vala:126
-msgid "Preparing to import..."
+#: src/util/misc.vala:237 src/util/misc.vala:242 src/util/misc.vala:243
+#: src/util/misc.vala:251
+msgid "%a %b %d, %Y"
 msgstr ""
 
-#: src/library/ImportQueuePage.vala:149
+#: src/db/DatabaseTable.vala:37
 #, c-format
-msgid "Imported %s"
+msgid "Unable to open/create photo database %s: error code %d"
 msgstr ""
 
-#: src/library/OfflinePage.vala:8
-msgid "Missing Files"
+#: src/db/DatabaseTable.vala:46
+#, c-format
+msgid ""
+"Unable to write to photo database file:\n"
+" %s"
 msgstr ""
 
-#: src/library/OfflinePage.vala:63 src/library/TrashPage.vala:58
-#: src/PhotoPage.vala:2287 src/camera/ImportPage.vala:851
-#: src/MediaPage.vala:287 src/events/EventsDirectoryPage.vala:118
-msgid "_Edit"
+#: src/db/DatabaseTable.vala:48
+#, c-format
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
 msgstr ""
 
-#: src/library/OfflinePage.vala:122
-msgid "Deleting..."
+#: src/MediaMonitor.vala:400
+#, c-format
+msgid "Unable to process monitoring updates: %s"
 msgstr ""
 
-#: src/library/TrashPage.vala:8
-msgid "Trash"
+#: src/DesktopIntegration.vala:118
+#, c-format
+msgid "Unable to launch Nautilus Send-To: %s"
 msgstr ""
 
-#: src/library/TrashPage.vala:124
-msgid "Trash is empty"
+#: src/DesktopIntegration.vala:126
+msgid "Send To"
 msgstr ""
 
-#: src/library/TrashPage.vala:128
-msgid "Delete"
+#: src/DesktopIntegration.vala:171
+#, c-format
+msgid "Unable to export background to %s: %s"
 msgstr ""
 
-#: src/library/TrashPage.vala:129
-msgid "Deleting Photos"
+#: src/DesktopIntegration.vala:299
+#, c-format
+msgid "Unable to prepare desktop slideshow: %s"
 msgstr ""
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:635
-#: src/SearchFilter.vala:636 src/SearchFilter.vala:933
-msgid "Flagged"
+#: src/Printing.vala:255
+msgid "Fill the entire page"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:304
-msgid "_Import From Folder..."
+#: src/Printing.vala:256
+msgid "2 images per page"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:305
-msgid "Import photos from disk to library"
+#: src/Printing.vala:257
+msgid "4 images per page"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:315
-msgid "Sort _Events"
+#: src/Printing.vala:258
+msgid "6 images per page"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:325
-msgid "Empty T_rash"
+#: src/Printing.vala:259
+msgid "8 images per page"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:326
-msgid "Delete all photos in the trash"
+#: src/Printing.vala:260
+msgid "16 images per page"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:331
-msgid "View Eve_nt for Photo"
+#: src/Printing.vala:261
+msgid "32 images per page"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:336
-msgid "_Find"
+#: src/Printing.vala:299
+msgid "Printed Image Size"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:337
-msgid "Find photos and videos by search criteria"
+#: src/Printing.vala:311
+msgid "Use a _standard size:"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:348 src/sidebar/Tree.vala:157
-#: src/searches/Branch.vala:77
-msgid "Ne_w Search..."
+#: src/Printing.vala:315
+msgid "Use a c_ustom size:"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:359
-msgid "_Basic Information"
+#: src/Printing.vala:319
+msgid "_Autosize:"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:360
-msgid "Display basic information for the selection"
+#: src/Printing.vala:388
+msgid "in."
 msgstr ""
 
-#: src/library/LibraryWindow.vala:365
-msgid "E_xtended Information"
+#: src/Printing.vala:389
+msgid "cm"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:366
-msgid "Display extended information for the selection"
+#: src/Printing.vala:405
+msgid "_Match photo aspect ratio"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:371
-msgid "_Search Bar"
+#: src/Printing.vala:411
+msgid "Titles"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:372
-msgid "Display the search bar"
+#: src/Printing.vala:418
+msgid "Print image _title"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:384 src/MediaPage.vala:495
-msgid "_Ascending"
+#: src/Printing.vala:430
+msgid "Pixel Resolution"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:385 src/MediaPage.vala:496
-msgid "Sort photos in an ascending order"
+#: src/Printing.vala:436
+msgid "_Output photo at:"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:391 src/MediaPage.vala:501
-msgid "D_escending"
+#: src/Printing.vala:451
+msgid "pixels per inch"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:392 src/MediaPage.vala:502
-msgid "Sort photos in a descending order"
+#: src/Printing.vala:922 src/editing_tools/EditingTools.vala:729
+msgid "Wallet (2 x 3 in.)"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:633
-msgid "Import From Folder"
+#: src/Printing.vala:925 src/editing_tools/EditingTools.vala:730
+msgid "Notecard (3 x 5 in.)"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:696
-msgid "Empty Trash"
+#: src/Printing.vala:928 src/editing_tools/EditingTools.vala:731
+msgid "4 x 6 in."
 msgstr ""
 
-#: src/library/LibraryWindow.vala:696
-msgid "Emptying Trash..."
+#: src/Printing.vala:931 src/editing_tools/EditingTools.vala:732
+msgid "5 x 7 in."
 msgstr ""
 
-#: src/library/LibraryWindow.vala:839
-msgid "Shotwell is configured to import photos to your home directory.\n"
+#: src/Printing.vala:934 src/editing_tools/EditingTools.vala:733
+msgid "8 x 10 in."
 msgstr ""
 
-#: src/library/LibraryWindow.vala:842
-msgid "_Import"
+#: src/Printing.vala:937 src/editing_tools/EditingTools.vala:734
+msgid "11 x 14 in."
 msgstr ""
 
-#: src/library/LibraryWindow.vala:842
-msgid "Library Location"
+#: src/Printing.vala:940 src/editing_tools/EditingTools.vala:735
+msgid "16 x 20 in."
 msgstr ""
 
-#: src/library/LibraryWindow.vala:855
-msgid "Photos cannot be imported from this directory."
+#: src/Printing.vala:946 src/editing_tools/EditingTools.vala:737
+msgid "Metric Wallet (9 x 13 cm)"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1180
-#, c-format
-msgid "%s (%d%%)"
+#: src/Printing.vala:949 src/editing_tools/EditingTools.vala:738
+msgid "Postcard (10 x 15 cm)"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1213 src/library/LibraryWindow.vala:1221
-msgid "Updating library..."
+#: src/Printing.vala:952 src/editing_tools/EditingTools.vala:739
+msgid "13 x 18 cm"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1226
-msgid "Preparing to auto-import photos..."
+#: src/Printing.vala:955 src/editing_tools/EditingTools.vala:740
+msgid "18 x 24 cm"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1231
-msgid "Auto-importing photos..."
+#: src/Printing.vala:958 src/editing_tools/EditingTools.vala:741
+msgid "20 x 30 cm"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1236
-msgid "Writing metadata to files..."
+#: src/Printing.vala:961 src/editing_tools/EditingTools.vala:742
+msgid "24 x 40 cm"
 msgstr ""
 
-#: src/library/LastImportPage.vala:8
-msgid "Last Import"
+#: src/Printing.vala:964 src/editing_tools/EditingTools.vala:743
+msgid "30 x 40 cm"
 msgstr ""
 
-#: src/library/Branch.vala:37
-msgid "Library"
+#: src/Printing.vala:980
+msgid "Image Settings"
 msgstr ""
 
-#: src/VideoSupport.vala:455
-msgid "Export Videos"
+#: src/Printing.vala:993
+msgid "Printing..."
 msgstr ""
 
-#: src/main.vala:84
+#: src/Printing.vala:1013 src/Printing.vala:1216
 #, c-format
 msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please use the latest version of Shotwell."
+"Unable to print photo:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: src/main.vala:89
-#, c-format
-msgid ""
-"Shotwell was unable to upgrade your photo library from version %s (schema "
-"%d) to %s (schema %d).  For more information please check the Shotwell Wiki "
-"at %s"
+#: src/MediaPage.vala:143
+msgid "Adjust the size of the thumbnails"
 msgstr ""
 
-#: src/main.vala:95
-#, c-format
-msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please clear your library by deleting %s and re-import your "
-"photos."
+#: src/MediaPage.vala:309 src/PhotoPage.vala:2520
+#: src/direct/DirectPhotoPage.vala:174
+msgid "Zoom _In"
 msgstr ""
 
-#: src/main.vala:101
-#, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
+#: src/MediaPage.vala:310
+msgid "Increase the magnification of the thumbnails"
 msgstr ""
 
-#: src/main.vala:136
-msgid "Loading Shotwell"
+#: src/MediaPage.vala:315 src/PhotoPage.vala:2526
+#: src/direct/DirectPhotoPage.vala:180
+msgid "Zoom _Out"
 msgstr ""
 
-#: src/main.vala:368
-msgid "[FILE]"
+#: src/MediaPage.vala:316
+msgid "Decrease the magnification of the thumbnails"
 msgstr ""
 
-#: src/main.vala:372
-#, c-format
-msgid ""
-"Run '%s --help' to see a full list of available command line options.\n"
+#: src/MediaPage.vala:378
+msgid "Sort _Photos"
 msgstr ""
 
-#: src/BatchImport.vala:25
-msgid "Success"
+#: src/MediaPage.vala:387
+msgid "_Play Video"
 msgstr ""
 
-#: src/BatchImport.vala:28
-msgid "File error"
+#: src/MediaPage.vala:388
+msgid "Open the selected videos in the system video player"
 msgstr ""
 
-#: src/BatchImport.vala:31
-msgid "Unable to decode file"
+#: src/MediaPage.vala:392 src/PhotoPage.vala:2565
+msgid "_Developer"
 msgstr ""
 
-#: src/BatchImport.vala:34
-msgid "Database error"
+#: src/MediaPage.vala:399 src/photos/RawSupport.vala:297
+msgid "Shotwell"
 msgstr ""
 
-#: src/BatchImport.vala:37
-msgid "User aborted import"
+#: src/MediaPage.vala:404 src/camera/ImportPage.vala:676
+#: src/camera/ImportPage.vala:692 src/camera/Branch.vala:101
+#: src/photos/RawSupport.vala:300
+msgid "Camera"
 msgstr ""
 
-#: src/BatchImport.vala:40
-msgid "Not a file"
+#: src/MediaPage.vala:415 src/camera/ImportPage.vala:837
+msgid "_Titles"
 msgstr ""
 
-#: src/BatchImport.vala:43
-msgid "File already exists in database"
+#: src/MediaPage.vala:416 src/camera/ImportPage.vala:838
+msgid "Display the title of each photo"
 msgstr ""
 
-#: src/BatchImport.vala:46
-msgid "Unsupported file format"
+#: src/MediaPage.vala:427 src/library/LibraryWindow.vala:385
+msgid "Ta_gs"
 msgstr ""
 
-#: src/BatchImport.vala:49
-msgid "Not an image file"
+#: src/MediaPage.vala:428
+msgid "Display each photo's tags"
 msgstr ""
 
-#: src/BatchImport.vala:52
-msgid "Disk failure"
+#: src/MediaPage.vala:444
+msgid "By _Title"
 msgstr ""
 
-#: src/BatchImport.vala:55
-msgid "Disk full"
+#: src/MediaPage.vala:445
+msgid "Sort photos by title"
 msgstr ""
 
-#: src/BatchImport.vala:58
-msgid "Camera error"
+#: src/MediaPage.vala:450
+msgid "By Exposure _Date"
 msgstr ""
 
-#: src/BatchImport.vala:61
-msgid "File write error"
+#: src/MediaPage.vala:451
+msgid "Sort photos by exposure date"
 msgstr ""
 
-#: src/BatchImport.vala:64
-#, c-format
-msgid "Imported failed (%d)"
+#: src/MediaPage.vala:456
+msgid "By _Rating"
 msgstr ""
 
-#: src/PhotoPage.vala:525
-msgid "Previous photo"
+#: src/MediaPage.vala:457
+msgid "Sort photos by rating"
 msgstr ""
 
-#: src/PhotoPage.vala:530
-msgid "Next photo"
+#: src/MediaPage.vala:467 src/library/LibraryWindow.vala:425
+msgid "_Ascending"
 msgstr ""
 
-#: src/PhotoPage.vala:1773
-#, c-format
-msgid "Photo source file missing: %s"
+#: src/MediaPage.vala:468 src/library/LibraryWindow.vala:426
+msgid "Sort photos in an ascending order"
 msgstr ""
 
-#: src/PhotoPage.vala:2305 src/direct/DirectPhotoPage.vala:79
-msgid "_Photo"
+#: src/MediaPage.vala:473 src/library/LibraryWindow.vala:432
+msgid "D_escending"
 msgstr ""
 
-#: src/PhotoPage.vala:2309 src/direct/DirectPhotoPage.vala:83
-msgid "_Tools"
+#: src/MediaPage.vala:474 src/library/LibraryWindow.vala:433
+msgid "Sort photos in a descending order"
 msgstr ""
 
-#: src/PhotoPage.vala:2314 src/direct/DirectPhotoPage.vala:88
-msgid "_Previous Photo"
+#: src/MediaPage.vala:674
+#, c-format
+msgid ""
+"Shotwell was unable to play the selected video:\n"
+"%s"
 msgstr ""
 
-#: src/PhotoPage.vala:2315 src/direct/DirectPhotoPage.vala:89
-msgid "Previous Photo"
+#: src/camera/ImportPage.vala:308 src/Properties.vala:193
+#, c-format
+msgid "RAW+JPEG"
 msgstr ""
 
-#: src/PhotoPage.vala:2320 src/direct/DirectPhotoPage.vala:94
-msgid "_Next Photo"
+#: src/camera/ImportPage.vala:433
+msgid ""
+"Unable to unmount camera.  Try unmounting the camera from the file manager."
 msgstr ""
 
-#: src/PhotoPage.vala:2321 src/direct/DirectPhotoPage.vala:95
-msgid "Next Photo"
+#: src/camera/ImportPage.vala:741
+msgid "Hide photos already imported"
 msgstr ""
 
-#: src/PhotoPage.vala:2465 src/direct/DirectPhotoPage.vala:170
-#: src/MediaPage.vala:329
-msgid "Zoom _In"
+#: src/camera/ImportPage.vala:742
+msgid "Only display photos that have not been imported"
 msgstr ""
 
-#: src/PhotoPage.vala:2466 src/direct/DirectPhotoPage.vala:171
-msgid "Increase the magnification of the photo"
+#: src/camera/ImportPage.vala:810
+msgid "Starting import, please wait..."
 msgstr ""
 
-#: src/PhotoPage.vala:2471 src/direct/DirectPhotoPage.vala:176
-#: src/MediaPage.vala:335
-msgid "Zoom _Out"
+#: src/camera/ImportPage.vala:849
+msgid "Import _Selected"
 msgstr ""
 
-#: src/PhotoPage.vala:2472 src/direct/DirectPhotoPage.vala:177
-msgid "Decrease the magnification of the photo"
+#: src/camera/ImportPage.vala:850
+msgid "Import the selected photos into your library"
 msgstr ""
 
-#: src/PhotoPage.vala:2477 src/direct/DirectPhotoPage.vala:182
-msgid "Fit to _Page"
-msgstr ""
-
-#: src/PhotoPage.vala:2478 src/direct/DirectPhotoPage.vala:183
-msgid "Zoom the photo to fit on the screen"
-msgstr ""
-
-#: src/PhotoPage.vala:2483 src/direct/DirectPhotoPage.vala:188
-#, no-c-format
-msgid "Zoom _100%"
+#: src/camera/ImportPage.vala:855
+msgid "Import _All"
 msgstr ""
 
-#: src/PhotoPage.vala:2484 src/direct/DirectPhotoPage.vala:189
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
+#: src/camera/ImportPage.vala:856
+msgid "Import all the photos into your library"
 msgstr ""
 
-#: src/PhotoPage.vala:2489 src/direct/DirectPhotoPage.vala:194
-#, no-c-format
-msgid "Zoom _200%"
+#: src/camera/ImportPage.vala:975
+msgid ""
+"Shotwell needs to unmount the camera from the filesystem in order to access "
+"it.  Continue?"
 msgstr ""
 
-#: src/PhotoPage.vala:2490 src/direct/DirectPhotoPage.vala:195
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
+#: src/camera/ImportPage.vala:981
+msgid "_Unmount"
 msgstr ""
 
-#: src/PhotoPage.vala:2494 src/MediaPage.vala:309 src/MediaPage.vala:455
-msgid "Ta_gs"
+#: src/camera/ImportPage.vala:986
+msgid "Please unmount the camera."
 msgstr ""
 
-#: src/PhotoPage.vala:2509 src/CollectionPage.vala:207
-msgid "S_lideshow"
+#: src/camera/ImportPage.vala:991
+msgid ""
+"The camera is locked by another application.  Shotwell can only access the "
+"camera when it's unlocked.  Please close any other application using the "
+"camera and try again."
 msgstr ""
 
-#: src/PhotoPage.vala:2510 src/CollectionPage.vala:208
-msgid "Play a slideshow"
+#: src/camera/ImportPage.vala:1001
+msgid "Please close any other application using the camera."
 msgstr ""
 
-#: src/PhotoPage.vala:2514 src/MediaPage.vala:420
-msgid "Developer"
+#: src/camera/ImportPage.vala:1006
+#, c-format
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
 msgstr ""
 
-#: src/PhotoPage.vala:2930 src/Dialogs.vala:2176
-msgid "Remove From Library"
+#: src/camera/ImportPage.vala:1023
+msgid "Unmounting..."
 msgstr ""
 
-#: src/PhotoPage.vala:2930 src/Dialogs.vala:2177
-msgid "Removing Photo From Library"
+#: src/camera/ImportPage.vala:1129
+msgid "Fetching photo information"
 msgstr ""
 
-#: src/PhotoPage.vala:3037 src/CollectionPage.vala:430 src/Dialogs.vala:51
-msgid "Export Photo"
+#: src/camera/ImportPage.vala:1434
+#, c-format
+msgid "Fetching preview for %s"
 msgstr ""
 
-#: src/PhotoPage.vala:3057
+#: src/camera/ImportPage.vala:1551
 #, c-format
-msgid "Unable to export %s: %s"
+msgid "Unable to lock camera: %s"
 msgstr ""
 
-#: src/DesktopIntegration.vala:118
+#: src/camera/ImportPage.vala:1634
 #, c-format
-msgid "Unable to launch Nautilus Send-To: %s"
-msgstr ""
+msgid "Delete this photo from camera?"
+msgid_plural "Delete these %d photos from camera?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/DesktopIntegration.vala:126
-msgid "Send To"
-msgstr ""
+#: src/camera/ImportPage.vala:1637
+#, c-format
+msgid "Delete this video from camera?"
+msgid_plural "Delete these %d videos from camera?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/DesktopIntegration.vala:169
+#: src/camera/ImportPage.vala:1640
 #, c-format
-msgid "Unable to export background to %s: %s"
-msgstr ""
+msgid "Delete this photo/video from camera?"
+msgid_plural "Delete these %d photos/videos from camera?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/DesktopIntegration.vala:294
+#: src/camera/ImportPage.vala:1643
 #, c-format
-msgid "Unable to prepare desktop slideshow: %s"
-msgstr ""
+msgid "Delete these files from camera?"
+msgid_plural "Delete these %d files from camera?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/tags/Branch.vala:112
-msgid "Tags"
+#: src/camera/ImportPage.vala:1651 src/Dialogs.vala:1011
+msgid "_Keep"
 msgstr ""
 
-#: src/SlideshowPage.vala:41 src/SlideshowPage.vala:221
-msgid "Settings"
+#: src/camera/ImportPage.vala:1670
+msgid "Removing photos/videos from camera"
 msgstr ""
 
-#: src/SlideshowPage.vala:43
-msgid "_Delay:"
-msgstr ""
+#: src/camera/ImportPage.vala:1674
+#, c-format
+msgid "Unable to delete %d photo/video from the camera due to errors."
+msgid_plural ""
+"Unable to delete %d photos/videos from the camera due to errors."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/SlideshowPage.vala:45 src/SlideshowPage.vala:47
-msgid "seconds"
+#: src/camera/Branch.vala:87
+msgid "Cameras"
 msgstr ""
 
-#: src/SlideshowPage.vala:63
-msgid "_Transition effect:"
+#: src/PhotoPage.vala:536
+msgid "Previous photo"
 msgstr ""
 
-#: src/SlideshowPage.vala:90
-msgid "Transition d_elay:"
+#: src/PhotoPage.vala:541
+msgid "Next photo"
 msgstr ""
 
-#: src/SlideshowPage.vala:187
-msgid "Slideshow"
+#: src/PhotoPage.vala:1822
+#, c-format
+msgid "Photo source file missing: %s"
 msgstr ""
 
-#: src/SlideshowPage.vala:200
-msgid "Back"
+#: src/PhotoPage.vala:2358 src/library/LibraryWindow.vala:369
+#: src/direct/DirectPhotoPage.vala:165
+msgid "_View"
 msgstr ""
 
-#: src/SlideshowPage.vala:201
-msgid "Go to the previous photo"
+#: src/PhotoPage.vala:2362 src/direct/DirectPhotoPage.vala:81
+msgid "T_ools"
 msgstr ""
 
-#: src/SlideshowPage.vala:207 src/SlideshowPage.vala:312
-msgid "Pause"
+#: src/PhotoPage.vala:2367 src/direct/DirectPhotoPage.vala:86
+msgid "_Previous Photo"
 msgstr ""
 
-#: src/SlideshowPage.vala:208 src/SlideshowPage.vala:313
-msgid "Pause the slideshow"
+#: src/PhotoPage.vala:2368 src/direct/DirectPhotoPage.vala:87
+msgid "Previous Photo"
 msgstr ""
 
-#: src/SlideshowPage.vala:214
-msgid "Next"
+#: src/PhotoPage.vala:2373 src/direct/DirectPhotoPage.vala:92
+msgid "_Next Photo"
 msgstr ""
 
-#: src/SlideshowPage.vala:215
-msgid "Go to the next photo"
+#: src/PhotoPage.vala:2374 src/direct/DirectPhotoPage.vala:93
+msgid "Next Photo"
 msgstr ""
 
-#: src/SlideshowPage.vala:222
-msgid "Change slideshow settings"
+#: src/PhotoPage.vala:2521 src/direct/DirectPhotoPage.vala:175
+msgid "Increase the magnification of the photo"
 msgstr ""
 
-#: src/SlideshowPage.vala:276
-msgid "All photo source files are missing."
+#: src/PhotoPage.vala:2527 src/direct/DirectPhotoPage.vala:181
+msgid "Decrease the magnification of the photo"
 msgstr ""
 
-#: src/SlideshowPage.vala:308
-msgid "Play"
+#: src/PhotoPage.vala:2532 src/direct/DirectPhotoPage.vala:186
+msgid "Fit to _Page"
 msgstr ""
 
-#: src/SlideshowPage.vala:309
-msgid "Continue the slideshow"
+#: src/PhotoPage.vala:2533 src/direct/DirectPhotoPage.vala:187
+msgid "Zoom the photo to fit on the screen"
 msgstr ""
 
-#: src/photos/JfifSupport.vala:85
-msgid "JPEG"
+#: src/PhotoPage.vala:2538 src/direct/DirectPhotoPage.vala:192
+#, no-c-format
+msgid "Zoom _100%"
 msgstr ""
 
-#: src/photos/JfifSupport.vala:180
-#, c-format
-msgid "Low (%d%%)"
+#: src/PhotoPage.vala:2539 src/direct/DirectPhotoPage.vala:193
+#, no-c-format
+msgid "Zoom the photo to 100% magnification"
 msgstr ""
 
-#: src/photos/JfifSupport.vala:183
-#, c-format
-msgid "Medium (%d%%)"
+#: src/PhotoPage.vala:2544 src/direct/DirectPhotoPage.vala:198
+#, no-c-format
+msgid "Zoom _200%"
 msgstr ""
 
-#: src/photos/JfifSupport.vala:186
-#, c-format
-msgid "High (%d%%)"
+#: src/PhotoPage.vala:2545 src/direct/DirectPhotoPage.vala:199
+#, no-c-format
+msgid "Zoom the photo to 200% magnification"
 msgstr ""
 
-#: src/photos/JfifSupport.vala:189
-#, c-format
-msgid "Maximum (%d%%)"
+#: src/PhotoPage.vala:2560 src/CollectionPage.vala:215
+msgid "S_lideshow"
 msgstr ""
 
-#: src/photos/BmpSupport.vala:33
-msgid "BMP"
+#: src/PhotoPage.vala:2561 src/CollectionPage.vala:216
+msgid "Play a slideshow"
 msgstr ""
 
-#: src/photos/PngSupport.vala:31
-msgid "PNG"
+#: src/PhotoPage.vala:2999 src/Dialogs.vala:2271
+msgid "Remove From Library"
 msgstr ""
 
-#: src/photos/RawSupport.vala:135
-msgid "RAW"
+#: src/PhotoPage.vala:2999 src/Dialogs.vala:2272
+msgid "Removing Photo From Library"
 msgstr ""
 
-#: src/photos/RawSupport.vala:298 src/MediaPage.vala:427
-msgid "Shotwell"
+#: src/PhotoPage.vala:3120 src/CollectionPage.vala:438 src/Dialogs.vala:57
+msgid "Export Photo"
 msgstr ""
 
-#: src/photos/RawSupport.vala:301 src/camera/ImportPage.vala:671
-#: src/camera/ImportPage.vala:687 src/camera/Branch.vala:101
-#: src/MediaPage.vala:432
-msgid "Camera"
+#: src/PhotoPage.vala:3140
+#, c-format
+msgid "Unable to export %s: %s"
 msgstr ""
 
-#: src/photos/TiffSupport.vala:87
-msgid "TIFF"
+#: src/Commands.vala:670
+msgid "Reverting"
 msgstr ""
 
-#: src/camera/ImportPage.vala:301
-msgid "RAW + JPEG"
+#: src/Commands.vala:670
+msgid "Undoing Revert"
 msgstr ""
 
-#: src/camera/ImportPage.vala:430
-msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
+#: src/Commands.vala:714
+msgid "Enhancing"
 msgstr ""
 
-#: src/camera/ImportPage.vala:729
-msgid "Hide photos already imported"
+#: src/Commands.vala:714
+msgid "Undoing Enhance"
 msgstr ""
 
-#: src/camera/ImportPage.vala:730
-msgid "Only display photos that have not been imported"
+#: src/Commands.vala:897
+msgid "Creating New Event"
 msgstr ""
 
-#: src/camera/ImportPage.vala:824 src/MediaPage.vala:443
-msgid "_Titles"
+#: src/Commands.vala:898
+msgid "Removing Event"
 msgstr ""
 
-#: src/camera/ImportPage.vala:825 src/MediaPage.vala:444
-msgid "Display the title of each photo"
+#: src/Commands.vala:907
+msgid "Moving Photos to New Event"
 msgstr ""
 
-#: src/camera/ImportPage.vala:840
-msgid "Import _Selected"
+#: src/Commands.vala:908
+msgid "Setting Photos to Previous Event"
 msgstr ""
 
-#: src/camera/ImportPage.vala:841
-msgid "Import the selected photos into your library"
+#: src/Commands.vala:938
+msgid "Merging"
 msgstr ""
 
-#: src/camera/ImportPage.vala:846
-msgid "Import _All"
+#: src/Commands.vala:939
+msgid "Unmerging"
 msgstr ""
 
-#: src/camera/ImportPage.vala:847
-msgid "Import all the photos into your library"
+#: src/Commands.vala:948
+msgid "Duplicating photos"
 msgstr ""
 
-#: src/camera/ImportPage.vala:972
-msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
+#: src/Commands.vala:948
+msgid "Removing duplicated photos"
 msgstr ""
 
-#: src/camera/ImportPage.vala:978
-msgid "_Unmount"
-msgstr ""
+#: src/Commands.vala:971
+#, c-format
+msgid "Unable to duplicate one photo due to a file error"
+msgid_plural "Unable to duplicate %d photos due to file errors"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/camera/ImportPage.vala:983
-msgid "Please unmount the camera."
+#: src/Commands.vala:1058
+msgid "Restoring previous rating"
 msgstr ""
 
-#: src/camera/ImportPage.vala:988
-msgid ""
-"The camera is locked by another application.  Shotwell can only access the "
-"camera when it's unlocked.  Please close any other application using the "
-"camera and try again."
+#: src/Commands.vala:1068 src/Commands.vala:1069
+msgid "Increasing ratings"
 msgstr ""
 
-#: src/camera/ImportPage.vala:998
-msgid "Please close any other application using the camera."
+#: src/Commands.vala:1068 src/Commands.vala:1069
+msgid "Decreasing ratings"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1003
-#, c-format
-msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
+#: src/Commands.vala:1119
+msgid "Setting RAW developer"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1020
-msgid "Unmounting..."
+#: src/Commands.vala:1119
+msgid "Restoring previous RAW developer"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1089
-msgid "Fetching photo information"
+#: src/Commands.vala:1120
+msgid "Set Developer"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1376
-#, c-format
-msgid "Fetching preview for %s"
+#: src/Commands.vala:1195
+msgid "Original photo could not be adjusted."
 msgstr ""
 
-#: src/camera/ImportPage.vala:1488
-#, c-format
-msgid "Unable to lock camera: %s"
+#: src/Commands.vala:1215
+msgid "Adjusting Date and Time"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1571
-#, c-format
-msgid "Delete this photo from camera?"
-msgid_plural "Delete these %d photos from camera?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/camera/ImportPage.vala:1574
-#, c-format
-msgid "Delete this video from camera?"
-msgid_plural "Delete these %d videos from camera?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/camera/ImportPage.vala:1577
-#, c-format
-msgid "Delete this photo/video from camera?"
-msgid_plural "Delete these %d photos/videos from camera?"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Commands.vala:1215
+msgid "Undoing Date and Time Adjustment"
+msgstr ""
 
-#: src/camera/ImportPage.vala:1580
-#, c-format
-msgid "Delete these files from camera?"
-msgid_plural "Delete these %d files from camera?"
+#: src/Commands.vala:1242
+msgid "One original photo could not be adjusted."
+msgid_plural "The following original photos could not be adjusted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/camera/ImportPage.vala:1588 src/Dialogs.vala:991
-msgid "_Keep"
-msgstr ""
-
-#: src/camera/ImportPage.vala:1607
-msgid "Removing photos/videos from camera"
+#: src/Commands.vala:1244 src/Commands.vala:1256
+msgid "Time Adjustment Error"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1611
-#, c-format
-msgid "Unable to delete %d photo/video from the camera due to errors."
+#: src/Commands.vala:1254
+msgid "Time adjustments could not be undone on the following photo file."
 msgid_plural ""
-"Unable to delete %d photos/videos from the camera due to errors."
+"Time adjustments could not be undone on the following photo files."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/camera/Branch.vala:87
-msgid "Cameras"
+#: src/Commands.vala:1456 src/Commands.vala:1479
+msgid "Create Tag"
 msgstr ""
 
-#: src/AppDirs.vala:48
+#: src/Commands.vala:1514
 #, c-format
-msgid "Unable to create data directory %s: %s"
+msgid "Move Tag \"%s\""
 msgstr ""
 
-#: src/AppDirs.vala:84
-msgid "Pictures"
+#: src/Commands.vala:2166
+msgid "Move Photos to Trash"
 msgstr ""
 
-#: src/AppDirs.vala:124
-#, c-format
-msgid "Unable to create temporary directory %s: %s"
+#: src/Commands.vala:2166
+msgid "Restore Photos from Trash"
 msgstr ""
 
-#: src/AppDirs.vala:140
-#, c-format
-msgid "Unable to create data subdirectory %s: %s"
+#: src/Commands.vala:2167
+msgid "Move the photos to the Shotwell trash"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:53 src/direct/DirectPhotoPage.vala:373
-msgid "_Save"
+#: src/Commands.vala:2167
+msgid "Restore the photos back to the Shotwell library"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:54
-msgid "Save photo"
+#: src/Commands.vala:2186
+msgid "Moving Photos to Trash"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:59
-msgid "Save _As..."
+#: src/Commands.vala:2186
+msgid "Restoring Photos From Trash"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:60
-msgid "Save photo with a different name"
+#: src/Commands.vala:2275
+msgid "Flag"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:71
-msgid "Print the photo to a printer connected to your computer"
+#: src/Commands.vala:2275
+msgid "Unflag"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:75
-msgid "Edit"
+#: src/Commands.vala:2276
+msgid "Flag selected photos"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:219
-#, c-format
-msgid "%s does not exist."
+#: src/Commands.vala:2276
+msgid "Unflag selected photos"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:221
-#, c-format
-msgid "%s is not a file."
+#: src/Photo.vala:3446
+msgid "modified"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:223
-#, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
+#: src/slideshow/Slideshow.vala:15
+msgid "Slideshow Transitions"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:373
-msgid "_Save a Copy"
+#: src/slideshow/TransitionEffects.vala:96
+msgid "(None)"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:376
-#, c-format
-msgid "Lose changes to %s?"
+#: src/slideshow/TransitionEffects.vala:285
+msgid "None"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:377
-msgid "Close _without Saving"
+#: src/SearchFilter.vala:648 src/SearchFilter.vala:649
+#: src/SearchFilter.vala:1045 src/library/FlaggedPage.vala:8
+msgid "Flagged"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:410
-#, c-format
-msgid "Error while saving to %s: %s"
+#: src/SearchFilter.vala:654 src/SearchFilter.vala:655
+msgid "Photos"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:433 src/direct/DirectPhotoPage.vala:454
-msgid "Save As"
+#: src/SearchFilter.vala:660 src/SearchFilter.vala:661
+msgid "Videos"
 msgstr ""
 
-#: src/AppWindow.vala:57
-msgid "Pin Toolbar"
+#: src/SearchFilter.vala:666
+msgid "RAW Photos"
 msgstr ""
 
-#: src/AppWindow.vala:58
-msgid "Pin the toolbar open"
+#: src/SearchFilter.vala:667
+msgid "RAW photos"
 msgstr ""
 
-#: src/AppWindow.vala:61 src/AppWindow.vala:139
-msgid "Leave fullscreen"
+#: src/SearchFilter.vala:1007
+#, c-format
+msgid "Error loading UI file %s: %s"
 msgstr ""
 
-#: src/AppWindow.vala:138
-msgid "Leave _Fullscreen"
+#: src/SearchFilter.vala:1024
+msgid "Type"
 msgstr ""
 
-#: src/AppWindow.vala:479
-msgid "_Quit"
+#: src/SearchFilter.vala:1058 src/searches/SearchBoolean.vala:180
+msgid "Rating"
 msgstr ""
 
-#: src/AppWindow.vala:484
-msgid "_About"
+#: src/SlideshowPage.vala:41 src/SlideshowPage.vala:221
+msgid "Settings"
 msgstr ""
 
-#: src/AppWindow.vala:489
-msgid "Fulls_creen"
+#: src/SlideshowPage.vala:43
+msgid "_Delay:"
 msgstr ""
 
-#: src/AppWindow.vala:494
-msgid "_Contents"
+#: src/SlideshowPage.vala:45 src/SlideshowPage.vala:47
+msgid "seconds"
 msgstr ""
 
-#: src/AppWindow.vala:499
-msgid "_Frequently Asked Questions"
+#: src/SlideshowPage.vala:63
+msgid "_Transition effect:"
 msgstr ""
 
-#: src/AppWindow.vala:597 src/AppWindow.vala:615 src/AppWindow.vala:632
-#: src/Dialogs.vala:18 src/Dialogs.vala:26 src/Dialogs.vala:37
-#: src/Dialogs.vala:1024 src/Dialogs.vala:1047
-#: src/publishing/PublishingUI.vala:480
-msgid "_Cancel"
+#: src/SlideshowPage.vala:90
+msgid "Transition d_elay:"
 msgstr ""
 
-#: src/AppWindow.vala:642
-#, c-format
-msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
-"continue.\n"
-"\n"
-"%s"
+#: src/SlideshowPage.vala:187
+msgid "Slideshow"
 msgstr ""
 
-#: src/AppWindow.vala:662 plugins/common/Resources.vala:9
-msgid "Visit the Yorba web site"
+#: src/SlideshowPage.vala:200
+msgid "Back"
 msgstr ""
 
-#: src/AppWindow.vala:674
-#, c-format
-msgid "Unable to display help: %s"
+#: src/SlideshowPage.vala:201
+msgid "Go to the previous photo"
 msgstr ""
 
-#: src/AppWindow.vala:682
-#, c-format
-msgid "Unable to display FAQ: %s"
+#: src/SlideshowPage.vala:207 src/SlideshowPage.vala:312
+msgid "Pause"
 msgstr ""
 
-#: src/Printing.vala:255
-msgid "Fill the entire page"
+#: src/SlideshowPage.vala:208 src/SlideshowPage.vala:313
+msgid "Pause the slideshow"
 msgstr ""
 
-#: src/Printing.vala:256
-msgid "2 images per page"
+#: src/SlideshowPage.vala:214
+msgid "Next"
 msgstr ""
 
-#: src/Printing.vala:257
-msgid "4 images per page"
+#: src/SlideshowPage.vala:215
+msgid "Go to the next photo"
 msgstr ""
 
-#: src/Printing.vala:258
-msgid "6 images per page"
+#: src/SlideshowPage.vala:222
+msgid "Change slideshow settings"
 msgstr ""
 
-#: src/Printing.vala:259
-msgid "8 images per page"
+#: src/SlideshowPage.vala:276
+msgid "All photo source files are missing."
 msgstr ""
 
-#: src/Printing.vala:260
-msgid "16 images per page"
+#: src/SlideshowPage.vala:308
+msgid "Play"
 msgstr ""
 
-#: src/Printing.vala:261
-msgid "32 images per page"
+#: src/SlideshowPage.vala:309
+msgid "Continue the slideshow"
 msgstr ""
 
-#: src/Printing.vala:298
-msgid "Printed Image Size"
+#: src/publishing/PublishingUI.vala:70
+#: plugins/shotwell-publishing/PicasaPublishing.vala:909
+#: plugins/shotwell-publishing/YouTubePublishing.vala:840
+msgid "_Login"
 msgstr ""
 
-#: src/Printing.vala:310
-msgid "Use a _standard size:"
+#: src/publishing/PublishingUI.vala:135
+msgid "The selected photos/videos were successfully published."
 msgstr ""
 
-#: src/Printing.vala:314
-msgid "Use a c_ustom size:"
+#: src/publishing/PublishingUI.vala:137
+msgid "The selected videos were successfully published."
 msgstr ""
 
-#: src/Printing.vala:318
-msgid "_Autosize:"
+#: src/publishing/PublishingUI.vala:139
+msgid "The selected photos were successfully published."
 msgstr ""
 
-#: src/Printing.vala:387
-msgid "in."
+#: src/publishing/PublishingUI.vala:142
+msgid "The selected video was successfully published."
 msgstr ""
 
-#: src/Printing.vala:388
-msgid "cm"
+#: src/publishing/PublishingUI.vala:144
+msgid "The selected photo was successfully published."
 msgstr ""
 
-#: src/Printing.vala:407
-msgid "_Match photo aspect ratio"
+#: src/publishing/PublishingUI.vala:152
+msgid "Fetching account information..."
 msgstr ""
 
-#: src/Printing.vala:413
-msgid "Titles"
+#: src/publishing/PublishingUI.vala:158
+msgid "Logging in..."
 msgstr ""
 
-#: src/Printing.vala:420
-msgid "Print image _title"
+#: src/publishing/PublishingUI.vala:211
+msgid "Publish Photos"
 msgstr ""
 
-#: src/Printing.vala:432
-msgid "Pixel Resolution"
+#: src/publishing/PublishingUI.vala:212
+msgid "Publish photos _to:"
 msgstr ""
 
-#: src/Printing.vala:438
-msgid "_Output photo at:"
+#: src/publishing/PublishingUI.vala:214
+msgid "Publish Videos"
 msgstr ""
 
-#: src/Printing.vala:453
-msgid "pixels per inch"
+#: src/publishing/PublishingUI.vala:215
+msgid "Publish videos _to"
 msgstr ""
 
-#: src/Printing.vala:931 src/EditingTools.vala:660
-msgid "Wallet (2 x 3 in.)"
+#: src/publishing/PublishingUI.vala:217
+msgid "Publish Photos and Videos"
 msgstr ""
 
-#: src/Printing.vala:934 src/EditingTools.vala:661
-msgid "Notecard (3 x 5 in.)"
+#: src/publishing/PublishingUI.vala:218
+msgid "Publish photos and videos _to"
 msgstr ""
 
-#: src/Printing.vala:937 src/EditingTools.vala:662
-msgid "4 x 6 in."
+#: src/publishing/PublishingUI.vala:384
+msgid "Unable to publish"
 msgstr ""
 
-#: src/Printing.vala:940 src/EditingTools.vala:663
-msgid "5 x 7 in."
+#: src/publishing/PublishingUI.vala:385
+#, c-format
+msgid ""
+"Shotwell cannot publish the selected items because you do not have a "
+"compatible publishing plugin enabled. To correct this, choose <b>Edit %s "
+"Preferences</b> and enable one or more of the publishing plugins on the "
+"<b>Plugins</b> tab."
 msgstr ""
 
-#: src/Printing.vala:943 src/EditingTools.vala:664
-msgid "8 x 10 in."
+#: src/publishing/PublishingUI.vala:478
+#: src/data_imports/DataImportsUI.vala:394
+msgid "_Close"
 msgstr ""
 
-#: src/Printing.vala:946 src/EditingTools.vala:665
-msgid "11 x 14 in."
+#: src/publishing/PublishingUI.vala:483 src/AppWindow.vala:612
+#: src/AppWindow.vala:630 src/AppWindow.vala:647 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:41 src/Dialogs.vala:1044
+#: src/Dialogs.vala:1067 src/data_imports/DataImportsUI.vala:399
+msgid "_Cancel"
 msgstr ""
 
-#: src/Printing.vala:949 src/EditingTools.vala:666
-msgid "16 x 20 in."
+#: src/publishing/Publishing.vala:16
+msgid "Publishing"
 msgstr ""
 
-#: src/Printing.vala:955 src/EditingTools.vala:668
-msgid "Metric Wallet (9 x 13 cm)"
+#: src/publishing/PublishingPluginHost.vala:11
+msgid "Preparing for upload"
 msgstr ""
 
-#: src/Printing.vala:958 src/EditingTools.vala:669
-msgid "Postcard (10 x 15 cm)"
+#: src/publishing/PublishingPluginHost.vala:12
+#, c-format
+msgid "Uploading %d of %d"
 msgstr ""
 
-#: src/Printing.vala:961 src/EditingTools.vala:670
-msgid "13 x 18 cm"
+#: src/publishing/PublishingPluginHost.vala:81
+#, c-format
+msgid "Publishing to %s can't continue because an error occurred:"
 msgstr ""
 
-#: src/Printing.vala:964 src/EditingTools.vala:671
-msgid "18 x 24 cm"
+#: src/publishing/PublishingPluginHost.vala:84
+msgid "To try publishing to another service, select one from the above menu."
 msgstr ""
 
-#: src/Printing.vala:967 src/EditingTools.vala:672
-msgid "20 x 30 cm"
-msgstr ""
+#: src/events/EventDirectoryItem.vala:74
+#, c-format
+msgid "%d Photo/Video"
+msgid_plural "%d Photos/Videos"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Printing.vala:970 src/EditingTools.vala:673
-msgid "24 x 40 cm"
-msgstr ""
+#: src/events/EventDirectoryItem.vala:76 src/Properties.vala:321
+#, c-format
+msgid "%d Video"
+msgid_plural "%d Videos"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Printing.vala:973 src/EditingTools.vala:674
-msgid "30 x 40 cm"
+#: src/events/EventDirectoryItem.vala:78 src/Properties.vala:319
+#, c-format
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/events/EventPage.vala:86
+msgid "No Event"
 msgstr ""
 
-#: src/Printing.vala:989
-msgid "Image Settings"
+#: src/events/EventsDirectoryPage.vala:134
+msgid "No events"
 msgstr ""
 
-#: src/Printing.vala:1002
-msgid "Printing..."
+#: src/events/EventsDirectoryPage.vala:138
+msgid "No events found"
 msgstr ""
 
-#: src/Printing.vala:1022 src/Printing.vala:1225
-#, c-format
-msgid ""
-"Unable to print photo:\n"
-"\n"
-"%s"
+#: src/events/EventsDirectoryPage.vala:185
+msgid "Events"
 msgstr ""
 
-#: src/faces/FacePage.vala:47
-msgid "F_aces"
+#: src/events/EventsDirectoryPage.vala:199
+msgid "Undated"
 msgstr ""
 
-#: src/faces/Branch.vala:87 src/Resources.vala:278 src/Resources.vala:279
-msgid "Faces"
+#: src/events/EventsDirectoryPage.vala:200
+msgid "%Y"
 msgstr ""
 
-#: src/Resources.vala:18
-#: plugins/shotwell-publishing/FacebookPublishing.vala:32
-#: plugins/shotwell-publishing/YouTubePublishing.vala:32
-#: plugins/shotwell-publishing/FlickrPublishing.vala:32
-#: plugins/shotwell-publishing/PicasaPublishing.vala:32
-msgid "Copyright 2009-2012 Yorba Foundation"
+#: src/events/EventsDirectoryPage.vala:201
+msgid "%B"
 msgstr ""
 
-#: src/Resources.vala:133
-msgid "Rotate _Right"
+#: src/VideoSupport.vala:440
+msgid "Export Videos"
 msgstr ""
 
-#: src/Resources.vala:134 src/Resources.vala:139
-msgid "Rotate"
+#: src/main.vala:84
+#, c-format
+msgid ""
+"Your photo library is not compatible with this version of Shotwell.  It "
+"appears it was created by Shotwell %s (schema %d).  This version is %s "
+"(schema %d).  Please use the latest version of Shotwell."
 msgstr ""
 
-#: src/Resources.vala:135
-msgid "Rotate Right"
+#: src/main.vala:89
+#, c-format
+msgid ""
+"Shotwell was unable to upgrade your photo library from version %s (schema "
+"%d) to %s (schema %d).  For more information please check the Shotwell Wiki "
+"at %s"
 msgstr ""
 
-#: src/Resources.vala:136
-msgid "Rotate the photos right (press Ctrl to rotate left)"
+#: src/main.vala:95
+#, c-format
+msgid ""
+"Your photo library is not compatible with this version of Shotwell.  It "
+"appears it was created by Shotwell %s (schema %d).  This version is %s "
+"(schema %d).  Please clear your library by deleting %s and re-import your "
+"photos."
 msgstr ""
 
-#: src/Resources.vala:138
-msgid "Rotate _Left"
+#: src/main.vala:101
+#, c-format
+msgid "Unknown error attempting to verify Shotwell's database: %s"
 msgstr ""
 
-#: src/Resources.vala:140
-msgid "Rotate Left"
+#: src/main.vala:138
+msgid "Loading Shotwell"
 msgstr ""
 
-#: src/Resources.vala:141
-msgid "Rotate the photos left"
+#: src/main.vala:381
+msgid "[FILE]"
 msgstr ""
 
-#: src/Resources.vala:143
-msgid "Flip Hori_zontally"
+#: src/main.vala:385
+#, c-format
+msgid ""
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: src/Resources.vala:144
-msgid "Flip Horizontally"
+#: src/AppWindow.vala:54
+msgid "Pin Toolbar"
 msgstr ""
 
-#: src/Resources.vala:146
-msgid "Flip Verti_cally"
+#: src/AppWindow.vala:55
+msgid "Pin the toolbar open"
 msgstr ""
 
-#: src/Resources.vala:147
-msgid "Flip Vertically"
+#: src/AppWindow.vala:58 src/AppWindow.vala:136
+msgid "Leave fullscreen"
 msgstr ""
 
-#: src/Resources.vala:149
-msgid "_Enhance"
+#: src/AppWindow.vala:135
+msgid "Leave _Fullscreen"
 msgstr ""
 
-#: src/Resources.vala:150
-msgid "Enhance"
+#: src/AppWindow.vala:493
+msgid "_Quit"
 msgstr ""
 
-#: src/Resources.vala:151
-msgid "Automatically improve the photo's appearance"
+#: src/AppWindow.vala:498
+msgid "_About"
 msgstr ""
 
-#: src/Resources.vala:153
-msgid "_Crop"
+#: src/AppWindow.vala:503
+msgid "Fulls_creen"
 msgstr ""
 
-#: src/Resources.vala:154
-msgid "Crop"
+#: src/AppWindow.vala:508
+msgid "_Contents"
 msgstr ""
 
-#: src/Resources.vala:155
-msgid "Crop the photo's size"
+#: src/AppWindow.vala:513
+msgid "_Frequently Asked Questions"
 msgstr ""
 
-#: src/Resources.vala:157
-msgid "_Straighten"
+#: src/AppWindow.vala:657
+#, c-format
+msgid ""
+"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
+"continue.\n"
+"\n"
+"%s"
 msgstr ""
 
-#: src/Resources.vala:158
-msgid "Straighten"
+#: src/AppWindow.vala:677 plugins/common/Resources.vala:9
+msgid "Visit the Yorba web site"
 msgstr ""
 
-#: src/Resources.vala:159
-msgid "Straightens the photo"
+#: src/AppWindow.vala:689
+#, c-format
+msgid "Unable to display help: %s"
 msgstr ""
 
-#: src/Resources.vala:161
-msgid "_Red-eye"
+#: src/AppWindow.vala:697
+#, c-format
+msgid "Unable to display FAQ: %s"
 msgstr ""
 
-#: src/Resources.vala:162
-msgid "Red-eye"
+#: src/Properties.vala:38
+msgid "%I:%M %p"
 msgstr ""
 
-#: src/Resources.vala:163
-msgid "Reduce or eliminate any red-eye effects in the photo"
+#: src/Properties.vala:50
+msgid "Today"
 msgstr ""
 
-#: src/Resources.vala:165
-msgid "_Adjust"
+#: src/Properties.vala:52
+msgid "Yesterday"
 msgstr ""
 
-#: src/Resources.vala:166
-msgid "Adjust"
+#: src/Properties.vala:306 src/Dialogs.vala:971
+msgid "Title:"
 msgstr ""
 
-#: src/Resources.vala:167
-msgid "Adjust the photo's color and tone"
+#: src/Properties.vala:309
+msgid "Items:"
 msgstr ""
 
-#: src/Resources.vala:169
-msgid "Re_vert to Original"
-msgstr ""
+#: src/Properties.vala:312
+#, c-format
+msgid "%d Event"
+msgid_plural "%d Events"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:170
-msgid "Revert to Original"
+#: src/Properties.vala:343
+msgid "Date:"
 msgstr ""
 
-#: src/Resources.vala:172
-msgid "Revert External E_dits"
+#: src/Properties.vala:347
+msgid "Time:"
 msgstr ""
 
-#: src/Resources.vala:173
-msgid "Revert to the master photo"
+#: src/Properties.vala:350 src/Properties.vala:355
+msgid "From:"
 msgstr ""
 
-#: src/Resources.vala:175
-msgid "Set as _Desktop Background"
+#: src/Properties.vala:351 src/Properties.vala:356
+msgid "To:"
 msgstr ""
 
-#: src/Resources.vala:176
-msgid "Set selected image to be the new desktop background"
+#: src/Properties.vala:361 src/editing_tools/EditingTools.vala:2461
+msgid "Size:"
 msgstr ""
 
-#: src/Resources.vala:177
-msgid "Set as _Desktop Slideshow..."
+#: src/Properties.vala:370
+msgid "Duration:"
 msgstr ""
 
-#: src/Resources.vala:179
-msgid "_Undo"
+#: src/Properties.vala:370
+#, c-format
+msgid "%.1f seconds"
 msgstr ""
 
-#: src/Resources.vala:180
-msgid "Undo"
+#: src/Properties.vala:374
+msgid "Developer:"
 msgstr ""
 
-#: src/Resources.vala:182
-msgid "_Redo"
+#: src/Properties.vala:402 src/Properties.vala:406 src/Properties.vala:413
+#: src/editing_tools/EditingTools.vala:2819
+msgid "Exposure:"
 msgstr ""
 
-#: src/Resources.vala:183
-msgid "Redo"
+#: src/Properties.vala:500
+msgid "Location:"
 msgstr ""
 
-#: src/Resources.vala:185
-msgid "Re_name Event..."
+#: src/Properties.vala:503
+msgid "File size:"
 msgstr ""
 
-#: src/Resources.vala:186 src/Dialogs.vala:941
-msgid "Rename Event"
+#: src/Properties.vala:506
+msgid "Original dimensions:"
 msgstr ""
 
-#: src/Resources.vala:188
-msgid "Make _Key Photo for Event"
+#: src/Properties.vala:509
+msgid "Camera make:"
 msgstr ""
 
-#: src/Resources.vala:189
-msgid "Make Key Photo for Event"
+#: src/Properties.vala:512
+msgid "Camera model:"
 msgstr ""
 
-#: src/Resources.vala:191
-msgid "_New Event"
+#: src/Properties.vala:515
+msgid "Flash:"
 msgstr ""
 
-#: src/Resources.vala:192
-msgid "New Event"
+#: src/Properties.vala:517
+msgid "Focal length:"
 msgstr ""
 
-#: src/Resources.vala:194
-msgid "Move Photos"
+#: src/Properties.vala:520
+msgid "Exposure bias:"
 msgstr ""
 
-#: src/Resources.vala:195
-msgid "Move photos to an event"
+#: src/Properties.vala:522
+msgid "GPS latitude:"
 msgstr ""
 
-#: src/Resources.vala:197
-msgid "_Merge Events"
+#: src/Properties.vala:525
+msgid "GPS longitude:"
 msgstr ""
 
-#: src/Resources.vala:198
-msgid "Merge"
+#: src/Properties.vala:528
+msgid "Artist:"
 msgstr ""
 
-#: src/Resources.vala:200
-msgid "_Set Rating"
+#: src/Properties.vala:530
+msgid "Copyright:"
 msgstr ""
 
-#: src/Resources.vala:201
-msgid "Set Rating"
+#: src/Properties.vala:532
+msgid "Software:"
 msgstr ""
 
-#: src/Resources.vala:202
-msgid "Change the rating of your photo"
+#: src/Properties.vala:541
+msgid "Extended Information"
 msgstr ""
 
-#: src/Resources.vala:204
-msgid "_Increase"
+#: src/Tag.vala:790
+msgid "untitled"
 msgstr ""
 
-#: src/Resources.vala:205
-msgid "Increase Rating"
+#: src/Event.vala:712
+#, c-format
+msgid "Event %s"
 msgstr ""
 
-#: src/Resources.vala:207
-msgid "_Decrease"
+#: src/faces/FacePage.vala:49
+msgid "F_aces"
 msgstr ""
 
-#: src/Resources.vala:208
-msgid "Decrease Rating"
+#: src/faces/Branch.vala:90 src/Resources.vala:280 src/Resources.vala:281
+msgid "Faces"
 msgstr ""
 
-#: src/Resources.vala:210
-msgid "_Unrated"
+#: src/CollectionPage.vala:436
+msgid "Export Photo/Video"
 msgstr ""
 
-#: src/Resources.vala:211
-msgid "Unrated"
+#: src/CollectionPage.vala:436
+msgid "Export Photos/Videos"
 msgstr ""
 
-#: src/Resources.vala:212
-msgid "Rate Unrated"
+#: src/CollectionPage.vala:438 src/Dialogs.vala:86
+msgid "Export Photos"
 msgstr ""
 
-#: src/Resources.vala:213
-msgid "Setting as unrated"
+#: src/CollectionPage.vala:525 src/CollectionPage.vala:541
+msgid "Rotating"
 msgstr ""
 
-#: src/Resources.vala:214
-msgid "Remove any ratings"
+#: src/CollectionPage.vala:525 src/CollectionPage.vala:541
+msgid "Undoing Rotate"
 msgstr ""
 
-#: src/Resources.vala:216
-msgid "_Rejected"
+#: src/CollectionPage.vala:550
+msgid "Flipping Horizontally"
 msgstr ""
 
-#: src/Resources.vala:217
-msgid "Rejected"
+#: src/CollectionPage.vala:551
+msgid "Undoing Flip Horizontally"
 msgstr ""
 
-#: src/Resources.vala:218
-msgid "Rate Rejected"
+#: src/CollectionPage.vala:560
+msgid "Flipping Vertically"
 msgstr ""
 
-#: src/Resources.vala:219
-msgid "Setting as rejected"
+#: src/CollectionPage.vala:561
+msgid "Undoing Flip Vertically"
 msgstr ""
 
-#: src/Resources.vala:220
-msgid "Set rating to rejected"
+#: src/BatchImport.vala:25
+msgid "Success"
 msgstr ""
 
-#: src/Resources.vala:222
-msgid "Rejected _Only"
+#: src/BatchImport.vala:28
+msgid "File error"
 msgstr ""
 
-#: src/Resources.vala:223
-msgid "Rejected Only"
+#: src/BatchImport.vala:31
+msgid "Unable to decode file"
 msgstr ""
 
-#: src/Resources.vala:224
-msgid "Show only rejected photos"
+#: src/BatchImport.vala:34
+msgid "Database error"
 msgstr ""
 
-#: src/Resources.vala:226
-msgid "All + _Rejected"
+#: src/BatchImport.vala:37
+msgid "User aborted import"
 msgstr ""
 
-#: src/Resources.vala:227 src/Resources.vala:228
-msgid "Show all photos, including rejected"
+#: src/BatchImport.vala:40
+msgid "Not a file"
 msgstr ""
 
-#: src/Resources.vala:230
-msgid "_All Photos"
+#: src/BatchImport.vala:43
+msgid "File already exists in database"
 msgstr ""
 
-#: src/Resources.vala:231 src/Resources.vala:232
-msgid "Show all photos"
+#: src/BatchImport.vala:46
+msgid "Unsupported file format"
 msgstr ""
 
-#: src/Resources.vala:234
-msgid "_Ratings"
+#: src/BatchImport.vala:49
+msgid "Not an image file"
 msgstr ""
 
-#: src/Resources.vala:235
-msgid "Display each photo's rating"
+#: src/BatchImport.vala:52
+msgid "Disk failure"
 msgstr ""
 
-#: src/Resources.vala:237
-msgid "_Filter Photos"
+#: src/BatchImport.vala:55
+msgid "Disk full"
 msgstr ""
 
-#: src/Resources.vala:238
-msgid "Filter Photos"
+#: src/BatchImport.vala:58
+msgid "Camera error"
 msgstr ""
 
-#: src/Resources.vala:239
-msgid "Limit the number of photos displayed based on a filter"
+#: src/BatchImport.vala:61
+msgid "File write error"
 msgstr ""
 
-#: src/Resources.vala:241
-msgid "_Duplicate"
+#: src/BatchImport.vala:64
+#, c-format
+msgid "Imported failed (%d)"
 msgstr ""
 
-#: src/Resources.vala:242
-msgid "Duplicate"
-msgstr ""
+#: src/Dialogs.vala:16
+#, c-format
+msgid "This will remove the tag \"%s\" from one photo.  Continue?"
+msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:243
-msgid "Make a duplicate of the photo"
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:41
+#: src/Dialogs.vala:1012 src/Resources.vala:285 src/Resources.vala:313
+#: src/Resources.vala:361 src/Resources.vala:655
+msgid "_Delete"
 msgstr ""
 
-#: src/Resources.vala:245
-msgid "_Export..."
+#: src/Dialogs.vala:25
+#, c-format
+msgid "This will remove the saved search \"%s\".  Continue?"
 msgstr ""
 
-#: src/Resources.vala:247
-msgid "_Print..."
-msgstr ""
+#: src/Dialogs.vala:37
+#, c-format
+msgid "This will remove the face \"%s\" from one photo.  Continue?"
+msgid_plural "This will remove the face \"%s\" from %d photos.  Continue?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:249
-msgid "Pu_blish..."
+#: src/Dialogs.vala:57
+msgid "Export Video"
 msgstr ""
 
-#: src/Resources.vala:250
-msgid "Publish"
-msgstr ""
-
-#: src/Resources.vala:251
-msgid "Publish to various websites"
-msgstr ""
-
-#: src/Resources.vala:253
-msgid "E_dit Title..."
-msgstr ""
-
-#: src/Resources.vala:254 src/Dialogs.vala:951
-msgid "Edit Title"
+#: src/Dialogs.vala:114
+#, c-format
+msgid ""
+"Shotwell couldn't create a file for editing this photo because you do not "
+"have permission to write to %s."
 msgstr ""
 
-#: src/Resources.vala:256
-msgid "_Adjust Date and Time..."
+#: src/Dialogs.vala:123
+msgid ""
+"Unable to export the following photo due to a file error.\n"
+"\n"
 msgstr ""
 
-#: src/Resources.vala:257
-msgid "Adjust Date and Time"
+#: src/Dialogs.vala:129
+msgid ""
+"\n"
+"\n"
+"Would you like to continue exporting?"
 msgstr ""
 
-#: src/Resources.vala:259
-msgid "Add _Tags..."
+#: src/Dialogs.vala:130 plugins/shotwell-publishing/FlickrPublishing.vala:703
+msgid "Con_tinue"
 msgstr ""
 
-#: src/Resources.vala:260 src/Resources.vala:296
-msgid "Add Tags"
+#: src/Dialogs.vala:146
+msgid "Unmodified"
 msgstr ""
 
-#: src/Resources.vala:262
-msgid "_Preferences"
+#: src/Dialogs.vala:147
+msgid "Current"
 msgstr ""
 
-#: src/Resources.vala:264
-msgid "_Open With External Editor"
+#: src/Dialogs.vala:211
+msgid "_Format:"
 msgstr ""
 
-#: src/Resources.vala:266
-msgid "Open With RA_W Editor"
+#: src/Dialogs.vala:214
+msgid "_Quality:"
 msgstr ""
 
-#: src/Resources.vala:268
-msgid "Send _To..."
+#: src/Dialogs.vala:217
+msgid "_Scaling constraint:"
 msgstr ""
 
-#: src/Resources.vala:270
-msgid "_Find..."
+#: src/Dialogs.vala:220
+msgid " _pixels"
 msgstr ""
 
-#: src/Resources.vala:271
-msgid "Find"
+#: src/Dialogs.vala:228
+msgid "Export metadata"
 msgstr ""
 
-#: src/Resources.vala:272
-msgid "Find an image by typing text that appears in its name or tags"
+#: src/Dialogs.vala:471
+#, c-format
+msgid "(and %d more)\n"
 msgstr ""
 
-#: src/Resources.vala:274
-msgid "_Flag"
-msgstr ""
+#: src/Dialogs.vala:527
+#, c-format
+msgid "1 duplicate photo was not imported:\n"
+msgid_plural "%d duplicate photos were not imported:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:276
-msgid "Un_flag"
-msgstr ""
+#: src/Dialogs.vala:530
+#, c-format
+msgid "1 duplicate video was not imported:\n"
+msgid_plural "%d duplicate videos were not imported:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:280
-msgid "Mark faces of people in the photo"
-msgstr ""
+#: src/Dialogs.vala:533
+#, c-format
+msgid "1 duplicate photo/video was not imported:\n"
+msgid_plural "%d duplicate photos/videos were not imported:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:281
-msgid "Modify Faces"
-msgstr ""
+#: src/Dialogs.vala:547
+#, c-format
+msgid "1 photo failed to import due to a file or hardware error:\n"
+msgid_plural "%d photos failed to import due to a file or hardware error:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:282
-msgid "Delete Face"
-msgstr ""
+#: src/Dialogs.vala:550
+#, c-format
+msgid "1 video failed to import due to a file or hardware error:\n"
+msgid_plural "%d videos failed to import due to a file or hardware error:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:283 src/Resources.vala:308 src/Resources.vala:356
-#: src/Resources.vala:650 src/Dialogs.vala:18 src/Dialogs.vala:26
-#: src/Dialogs.vala:37 src/Dialogs.vala:992
-msgid "_Delete"
-msgstr ""
+#: src/Dialogs.vala:553
+#, c-format
+msgid "1 photo/video failed to import due to a file or hardware error:\n"
+msgid_plural ""
+"%d photos/videos failed to import due to a file or hardware error:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:284 src/Resources.vala:320
-msgid "_Rename..."
-msgstr ""
+#: src/Dialogs.vala:556
+#, c-format
+msgid "1 file failed to import due to a file or hardware error:\n"
+msgid_plural "%d files failed to import due to a file or hardware error:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:287
+#: src/Dialogs.vala:570
 #, c-format
-msgid "Unable to launch editor: %s"
-msgstr ""
+msgid ""
+"1 photo failed to import because the photo library folder was not writable:\n"
+msgid_plural ""
+"%d photos failed to import because the photo library folder was not "
+"writable:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:292
+#: src/Dialogs.vala:573
 #, c-format
-msgid "Add Tag \"%s\""
-msgstr ""
+msgid ""
+"1 video failed to import because the photo library folder was not writable:\n"
+msgid_plural ""
+"%d videos failed to import because the photo library folder was not "
+"writable:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:294
+#: src/Dialogs.vala:576
 #, c-format
-msgid "Add Tags \"%s\" and \"%s\""
-msgstr ""
+msgid ""
+"1 photo/video failed to import because the photo library folder was not "
+"writable:\n"
+msgid_plural ""
+"%d photos/videos failed to import because the photo library folder was not "
+"writable:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:300
+#: src/Dialogs.vala:579
 #, c-format
-msgid "_Delete Tag \"%s\""
-msgstr ""
+msgid ""
+"1 file failed to import because the photo library folder was not writable:\n"
+msgid_plural ""
+"%d files failed to import because the photo library folder was not "
+"writable:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:304
+#: src/Dialogs.vala:593
 #, c-format
-msgid "Delete Tag \"%s\""
-msgstr ""
+msgid "1 photo failed to import due to a camera error:\n"
+msgid_plural "%d photos failed to import due to a camera error:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:307
-msgid "Delete Tag"
-msgstr ""
+#: src/Dialogs.vala:596
+#, c-format
+msgid "1 video failed to import due to a camera error:\n"
+msgid_plural "%d videos failed to import due to a camera error:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:310
-msgid "_New"
-msgstr ""
+#: src/Dialogs.vala:599
+#, c-format
+msgid "1 photo/video failed to import due to a camera error:\n"
+msgid_plural "%d photos/videos failed to import due to a camera error:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:313
+#: src/Dialogs.vala:602
 #, c-format
-msgid "Re_name Tag \"%s\"..."
-msgstr ""
+msgid "1 file failed to import due to a camera error:\n"
+msgid_plural "%d files failed to import due to a camera error:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:317
+#: src/Dialogs.vala:619
 #, c-format
-msgid "Rename Tag \"%s\" to \"%s\""
-msgstr ""
+msgid "1 unsupported photo skipped:\n"
+msgid_plural "%d unsupported photos skipped:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:322
-msgid "Modif_y Tags..."
-msgstr ""
+#: src/Dialogs.vala:634
+#, c-format
+msgid "1 non-image file skipped.\n"
+msgid_plural "%d non-image files skipped.\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:323
-msgid "Modify Tags"
-msgstr ""
+#: src/Dialogs.vala:645
+#, c-format
+msgid "1 photo skipped due to user cancel:\n"
+msgid_plural "%d photos skipped due to user cancel:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:326
+#: src/Dialogs.vala:648
 #, c-format
-msgid "Tag Photo as \"%s\""
-msgstr ""
+msgid "1 video skipped due to user cancel:\n"
+msgid_plural "%d videos skipped due to user cancel:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:326
+#: src/Dialogs.vala:651
 #, c-format
-msgid "Tag Photos as \"%s\""
-msgstr ""
+msgid "1 photo/video skipped due to user cancel:\n"
+msgid_plural "%d photos/videos skipped due to user cancel:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:330
+#: src/Dialogs.vala:654
 #, c-format
-msgid "Tag the selected photo as \"%s\""
-msgstr ""
+msgid "1 file skipped due to user cancel:\n"
+msgid_plural "%d file skipped due to user cancel:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:331
+#: src/Dialogs.vala:668
 #, c-format
-msgid "Tag the selected photos as \"%s\""
-msgstr ""
+msgid "1 photo successfully imported.\n"
+msgid_plural "%d photos successfully imported.\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:335
+#: src/Dialogs.vala:671
 #, c-format
-msgid "Remove Tag \"%s\" From _Photo"
-msgstr ""
+msgid "1 video successfully imported.\n"
+msgid_plural "%d videos successfully imported.\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:336
+#: src/Dialogs.vala:674
 #, c-format
-msgid "Remove Tag \"%s\" From _Photos"
+msgid "1 photo/video successfully imported.\n"
+msgid_plural "%d photos/videos successfully imported.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Dialogs.vala:690
+msgid "No photos or videos imported.\n"
 msgstr ""
 
-#: src/Resources.vala:340
-#, c-format
-msgid "Remove Tag \"%s\" From Photo"
+#: src/Dialogs.vala:705
+msgid "Import Complete"
 msgstr ""
 
-#: src/Resources.vala:341
+#: src/Dialogs.vala:872
 #, c-format
-msgid "Remove Tag \"%s\" From Photos"
-msgstr ""
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:345
+#: src/Dialogs.vala:875
 #, c-format
-msgid "Unable to rename tag to \"%s\" because the tag already exists."
-msgstr ""
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:349
+#: src/Dialogs.vala:879
 #, c-format
-msgid "Unable to rename search to \"%s\" because the search already exists."
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Dialogs.vala:882
+msgid "1 day"
 msgstr ""
 
-#: src/Resources.vala:352
-msgid "Saved Search"
+#: src/Dialogs.vala:961 src/Resources.vala:186
+msgid "Rename Event"
 msgstr ""
 
-#: src/Resources.vala:354
-msgid "Delete Search"
+#: src/Dialogs.vala:961
+msgid "Name:"
 msgstr ""
 
-#: src/Resources.vala:357
-msgid "_Edit..."
+#: src/Dialogs.vala:971 src/Resources.vala:255
+msgid "Edit Title"
 msgstr ""
 
-#: src/Resources.vala:358
-msgid "Re_name..."
+#: src/util/misc.vala:231 src/util/misc.vala:236
+msgid "%a %b %d"
 msgstr ""
 
-#: src/Resources.vala:361
-#, c-format
-msgid "Rename Search \"%s\" to \"%s\""
+#: src/util/misc.vala:232
+msgid "%d, %Y"
 msgstr ""
 
-#: src/Resources.vala:365
-#, c-format
-msgid "Delete Search \"%s\""
-msgstr ""
+#: src/Dialogs.vala:987
+msgid "_Trash File"
+msgid_plural "_Trash Files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:369
-#, c-format
-msgid "Unable to rename face to \"%s\" because the face already exists."
+#: src/Dialogs.vala:991
+msgid "Only _Remove"
 msgstr ""
 
-#: src/Resources.vala:373
-#, c-format
-msgid "Remove Face \"%s\" From _Photo"
+#: src/Dialogs.vala:1034
+msgid "Revert External Edit?"
 msgstr ""
 
-#: src/Resources.vala:374
-#, c-format
-msgid "Remove Face \"%s\" From _Photos"
+#: src/Dialogs.vala:1034
+msgid "Revert External Edits?"
 msgstr ""
 
-#: src/Resources.vala:378
+#: src/Dialogs.vala:1036
 #, c-format
-msgid "Remove Face \"%s\" From Photo"
-msgstr ""
+msgid "This will destroy all changes made to the external file.  Continue?"
+msgid_plural ""
+"This will destroy all changes made to %d external files.  Continue?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:379
-#, c-format
-msgid "Remove Face \"%s\" From Photos"
+#: src/Dialogs.vala:1040
+msgid "Re_vert External Edit"
 msgstr ""
 
-#: src/Resources.vala:383
-#, c-format
-msgid "Re_name Face \"%s\"..."
+#: src/Dialogs.vala:1040
+msgid "Re_vert External Edits"
 msgstr ""
 
-#: src/Resources.vala:387
+#: src/Dialogs.vala:1061
 #, c-format
-msgid "Rename Face \"%s\" to \"%s\""
-msgstr ""
+msgid "This will remove the photo from the library.  Continue?"
+msgid_plural "This will remove %d photos from the library.  Continue?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:391
-#, c-format
-msgid "_Delete Face \"%s\""
+#: src/Dialogs.vala:1068
+msgid "_Remove"
 msgstr ""
 
-#: src/Resources.vala:395
-#, c-format
-msgid "Delete Face \"%s\""
+#: src/Dialogs.vala:1069
+msgid "Remove Photo From Library"
 msgstr ""
 
-#: src/Resources.vala:552
-#, c-format
-msgid "Rate %s"
+#: src/Dialogs.vala:1069
+msgid "Remove Photos From Library"
 msgstr ""
 
-#: src/Resources.vala:553
+#: src/Dialogs.vala:1163
 #, c-format
-msgid "Set rating to %s"
+msgid "%d%%"
 msgstr ""
 
-#: src/Resources.vala:554
-#, c-format
-msgid "Setting rating to %s"
+#: src/Dialogs.vala:1307
+msgid "AM"
 msgstr ""
 
-#: src/Resources.vala:556
-#, c-format
-msgid "Display %s"
+#: src/Dialogs.vala:1308
+msgid "PM"
 msgstr ""
 
-#: src/Resources.vala:557
-#, c-format
-msgid "Only show photos with a rating of %s"
+#: src/Dialogs.vala:1309
+msgid "24 Hr"
 msgstr ""
 
-#: src/Resources.vala:558
-#, c-format
-msgid "%s or Better"
+#: src/Dialogs.vala:1324
+msgid "_Shift photos/videos by the same amount"
 msgstr ""
 
-#: src/Resources.vala:559
-#, c-format
-msgid "Display %s or Better"
+#: src/Dialogs.vala:1329
+msgid "Set _all photos/videos to this time"
 msgstr ""
 
-#: src/Resources.vala:560
-#, c-format
-msgid "Only show photos with a rating of %s or better"
+#: src/Dialogs.vala:1335
+msgid "_Modify original file"
 msgstr ""
 
-#: src/Resources.vala:651
-msgid "Remove the selected photos from the trash"
+#: src/Dialogs.vala:1335
+msgid "_Modify original files"
 msgstr ""
 
-#: src/Resources.vala:652
-msgid "Remove the selected photos from the library"
+#: src/Dialogs.vala:1418
+msgid "Original: "
 msgstr ""
 
-#: src/Resources.vala:654
-msgid "_Restore"
+#: src/Dialogs.vala:1373
+msgid "%m/%d/%Y, %H:%M:%S"
 msgstr ""
 
-#: src/Resources.vala:655
-msgid "Move the selected photos back into the library"
+#: src/Dialogs.vala:1374
+msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr ""
 
-#: src/Resources.vala:657
-msgid "Show in File Mana_ger"
+#: src/Dialogs.vala:1509
+#, c-format
+msgid ""
+"Exposure time will be shifted forward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
 msgstr ""
 
-#: src/Resources.vala:658
-msgid "Open the selected photo's directory in the file manager"
+#: src/Dialogs.vala:1510
+#, c-format
+msgid ""
+"Exposure time will be shifted backward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
 msgstr ""
 
-#: src/Resources.vala:661
+#: src/Dialogs.vala:1512
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Dialogs.vala:1513
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Dialogs.vala:1514
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Dialogs.vala:1515
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Dialogs.vala:1559
 #, c-format
-msgid "Unable to open in file manager: %s"
-msgstr ""
+msgid ""
+"\n"
+"\n"
+"And %d other."
+msgid_plural ""
+"\n"
+"\n"
+"And %d others."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:664
-msgid "R_emove From Library"
+#: src/Dialogs.vala:1581 src/Dialogs.vala:1608
+msgid "Tags (separated by commas):"
 msgstr ""
 
-#: src/Resources.vala:666
-msgid "_Move to Trash"
+#: src/Dialogs.vala:1687
+msgid "Welcome!"
 msgstr ""
 
-#: src/Resources.vala:668
-msgid "Select _All"
+#: src/Dialogs.vala:1694
+#, c-format
+msgid "Welcome to Shotwell!"
 msgstr ""
 
-#: src/Resources.vala:669
-msgid "Select all items"
+#: src/Dialogs.vala:1698
+#, c-format
+msgid "To get started, import photos in any of these ways:"
 msgstr ""
 
-#: src/CollectionPage.vala:428
-msgid "Export Photo/Video"
+#: src/Dialogs.vala:1714
+#, c-format
+msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr ""
 
-#: src/CollectionPage.vala:428
-msgid "Export Photos/Videos"
+#: src/Dialogs.vala:1715
+msgid "Drag and drop photos onto the Shotwell window"
 msgstr ""
 
-#: src/CollectionPage.vala:430 src/Dialogs.vala:77
-msgid "Export Photos"
+#: src/Dialogs.vala:1716
+msgid "Connect a camera to your computer and import"
 msgstr ""
 
-#: src/CollectionPage.vala:518 src/CollectionPage.vala:534
-msgid "Rotating"
+#: src/Dialogs.vala:1726
+#, c-format
+msgid "_Import photos from your %s folder"
 msgstr ""
 
-#: src/CollectionPage.vala:518 src/CollectionPage.vala:534
-msgid "Undoing Rotate"
+#: src/Dialogs.vala:1733
+msgid "You can also import photos in any of these ways:"
 msgstr ""
 
-#: src/CollectionPage.vala:543
-msgid "Flipping Horizontally"
+#: src/Dialogs.vala:1743
+msgid "_Don't show this message again"
 msgstr ""
 
-#: src/CollectionPage.vala:544
-msgid "Undoing Flip Horizontally"
+#: src/Dialogs.vala:1778
+#, c-format
+msgid "Import photos from your %s library"
 msgstr ""
 
-#: src/CollectionPage.vala:553
-msgid "Flipping Vertically"
+#: src/Dialogs.vala:1896 src/Dialogs.vala:1900
+msgid "(Help)"
 msgstr ""
 
-#: src/CollectionPage.vala:554
-msgid "Undoing Flip Vertically"
+#: src/Dialogs.vala:1909
+#, c-format
+msgid "Year%sMonth%sDay"
 msgstr ""
 
-#: src/util/misc.vala:231 src/util/misc.vala:236
-msgid "%a %b %d"
+#: src/Dialogs.vala:1911
+#, c-format
+msgid "Year%sMonth"
 msgstr ""
 
-#: src/util/misc.vala:232
-msgid "%d, %Y"
+#: src/Dialogs.vala:1913
+#, c-format
+msgid "Year%sMonth-Day"
 msgstr ""
 
-#: src/util/misc.vala:237 src/util/misc.vala:242 src/util/misc.vala:243
-#: src/util/misc.vala:251
-msgid "%a %b %d, %Y"
+#: src/Dialogs.vala:1915
+msgid "Year-Month-Day"
 msgstr ""
 
-#: src/MediaPage.vala:141
-msgid "Adjust the size of the thumbnails"
+#: src/Dialogs.vala:1916 src/editing_tools/EditingTools.vala:745
+msgid "Custom"
 msgstr ""
 
-#: src/MediaPage.vala:301
-msgid "_Photos"
+#: src/Dialogs.vala:2151
+msgid "Invalid pattern"
 msgstr ""
 
-#: src/MediaPage.vala:305 src/events/EventsDirectoryPage.vala:122
-msgid "Even_ts"
+#: src/Dialogs.vala:2254
+msgid ""
+"Shotwell can copy the photos into your library folder or it can import them "
+"without copying."
 msgstr ""
 
-#: src/MediaPage.vala:330
-msgid "Increase the magnification of the thumbnails"
+#: src/Dialogs.vala:2259
+msgid "Co_py Photos"
 msgstr ""
 
-#: src/MediaPage.vala:336
-msgid "Decrease the magnification of the thumbnails"
+#: src/Dialogs.vala:2260
+msgid "_Import in Place"
 msgstr ""
 
-#: src/MediaPage.vala:402
-msgid "Sort _Photos"
+#: src/Dialogs.vala:2261
+msgid "Import to Library"
 msgstr ""
 
-#: src/MediaPage.vala:415
-msgid "_Play Video"
+#: src/Dialogs.vala:2272
+msgid "Removing Photos From Library"
 msgstr ""
 
-#: src/MediaPage.vala:416
-msgid "Open the selected videos in the system video player"
-msgstr ""
+#: src/Dialogs.vala:2286
+#, c-format
+msgid ""
+"This will remove the photo/video from your Shotwell library.  Would you also "
+"like to move the file to your desktop trash?\n"
+"\n"
+"This action cannot be undone."
+msgid_plural ""
+"This will remove %d photos/videos from your Shotwell library.  Would you "
+"also like to move the files to your desktop trash?\n"
+"\n"
+"This action cannot be undone."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/MediaPage.vala:456
-msgid "Display each photo's tags"
-msgstr ""
+#: src/Dialogs.vala:2290
+#, c-format
+msgid ""
+"This will remove the video from your Shotwell library.  Would you also like "
+"to move the file to your desktop trash?\n"
+"\n"
+"This action cannot be undone."
+msgid_plural ""
+"This will remove %d videos from your Shotwell library.  Would you also like "
+"to move the files to your desktop trash?\n"
+"\n"
+"This action cannot be undone."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/MediaPage.vala:472
-msgid "By _Title"
-msgstr ""
+#: src/Dialogs.vala:2294
+#, c-format
+msgid ""
+"This will remove the photo from your Shotwell library.  Would you also like "
+"to move the file to your desktop trash?\n"
+"\n"
+"This action cannot be undone."
+msgid_plural ""
+"This will remove %d photos from your Shotwell library.  Would you also like "
+"to move the files to your desktop trash?\n"
+"\n"
+"This action cannot be undone."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/MediaPage.vala:473
-msgid "Sort photos by title"
-msgstr ""
+#: src/Dialogs.vala:2326
+#, c-format
+msgid ""
+"The photo or video cannot be moved to your desktop trash.  Delete this file?"
+msgid_plural ""
+"%d photos/videos cannot be moved to your desktop trash.  Delete these files?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/MediaPage.vala:478
-msgid "By Exposure _Date"
-msgstr ""
+#: src/Dialogs.vala:2343
+#, c-format
+msgid "The photo or video cannot be deleted."
+msgid_plural "%d photos/videos cannot be deleted."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/MediaPage.vala:479
-msgid "Sort photos by exposure date"
+#: src/library/LibraryWindow.vala:310
+msgid "_Import From Folder..."
 msgstr ""
 
-#: src/MediaPage.vala:484
-msgid "By _Rating"
+#: src/library/LibraryWindow.vala:311
+msgid "Import photos from disk to library"
 msgstr ""
 
-#: src/MediaPage.vala:485
-msgid "Sort photos by rating"
+#: src/library/LibraryWindow.vala:318
+msgid "Import From _Application..."
 msgstr ""
 
-#: src/MediaPage.vala:713
-#, c-format
-msgid ""
-"Shotwell was unable to play the selected video:\n"
-"%s"
+#: src/library/LibraryWindow.vala:322
+msgid "Sort _Events"
 msgstr ""
 
-#: src/EditingTools.vala:567
-msgid "Return to current photo dimensions"
+#: src/library/LibraryWindow.vala:332
+msgid "Empty T_rash"
 msgstr ""
 
-#: src/EditingTools.vala:570
-msgid "Set the crop for this photo"
+#: src/library/LibraryWindow.vala:333
+msgid "Delete all photos in the trash"
 msgstr ""
 
-#: src/EditingTools.vala:582
-msgid "Pivot the crop rectangle between portrait and landscape orientations"
+#: src/library/LibraryWindow.vala:338
+msgid "View Eve_nt for Photo"
 msgstr ""
 
-#: src/EditingTools.vala:652
-msgid "Unconstrained"
+#: src/library/LibraryWindow.vala:343
+msgid "_Find"
 msgstr ""
 
-#: src/EditingTools.vala:653
-msgid "Square"
+#: src/library/LibraryWindow.vala:344
+msgid "Find photos and videos by search criteria"
 msgstr ""
 
-#: src/EditingTools.vala:654
-msgid "Screen"
+#: src/library/LibraryWindow.vala:355
+msgid "Ne_w Saved Search..."
 msgstr ""
 
-#: src/EditingTools.vala:655
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1250
-msgid "Original Size"
+#: src/library/LibraryWindow.vala:361 src/direct/DirectPhotoPage.vala:46
+msgid "_File"
 msgstr ""
 
-#: src/EditingTools.vala:656 src/EditingTools.vala:659
-#: src/EditingTools.vala:667 src/EditingTools.vala:675
-msgid "-"
+#: src/library/LibraryWindow.vala:365
+msgid "_Edit"
 msgstr ""
 
-#: src/EditingTools.vala:657
-msgid "SD Video (4 : 3)"
+#: src/library/LibraryWindow.vala:373 src/direct/DirectPhotoPage.vala:77
+msgid "_Photo"
 msgstr ""
 
-#: src/EditingTools.vala:658
-msgid "HD Video (16 : 9)"
+#: src/library/LibraryWindow.vala:377
+msgid "_Photos"
 msgstr ""
 
-#: src/EditingTools.vala:676 src/Dialogs.vala:1829
-msgid "Custom"
+#: src/library/LibraryWindow.vala:381
+msgid "Even_ts"
 msgstr ""
 
-#: src/EditingTools.vala:1838
-msgid "Close the Faces tool without saving changes"
+#: src/library/LibraryWindow.vala:389 src/direct/DirectPhotoPage.vala:169
+msgid "_Help"
 msgstr ""
 
-#: src/EditingTools.vala:1841
-msgid "Save changes and close the Faces tool"
+#: src/library/LibraryWindow.vala:400
+msgid "_Basic Information"
 msgstr ""
 
-#: src/EditingTools.vala:1846 src/EditingTools.vala:1871
-msgid "Click and drag to tag a face"
+#: src/library/LibraryWindow.vala:401
+msgid "Display basic information for the selection"
 msgstr ""
 
-#: src/EditingTools.vala:1866
-#, c-format
-msgid "Click to edit face <i>%s</i>"
+#: src/library/LibraryWindow.vala:406
+msgid "E_xtended Information"
 msgstr ""
 
-#: src/EditingTools.vala:1875
-msgid "Stop dragging to add your face and name it."
+#: src/library/LibraryWindow.vala:407
+msgid "Display extended information for the selection"
 msgstr ""
 
-#: src/EditingTools.vala:1879
-msgid "Type a name for this face, then press Enter"
+#: src/library/LibraryWindow.vala:412
+msgid "_Search Bar"
 msgstr ""
 
-#: src/EditingTools.vala:1883
-msgid "Move or modify the face shape or name and press Enter"
+#: src/library/LibraryWindow.vala:413
+msgid "Display the search bar"
 msgstr ""
 
-#: src/EditingTools.vala:2394 src/Properties.vala:344
-msgid "Size:"
+#: src/library/LibraryWindow.vala:673
+msgid "Import From Folder"
 msgstr ""
 
-#: src/EditingTools.vala:2409
-msgid "Close the red-eye tool"
+#: src/library/LibraryWindow.vala:742
+msgid "Empty Trash"
 msgstr ""
 
-#: src/EditingTools.vala:2412
-msgid "Remove any red-eye effects in the selected region"
+#: src/library/LibraryWindow.vala:742
+msgid "Emptying Trash..."
 msgstr ""
 
-#: src/EditingTools.vala:2726
-msgid "_Reset"
+#: src/library/LibraryWindow.vala:885
+msgid "Shotwell is configured to import photos to your home directory.\n"
 msgstr ""
 
-#: src/EditingTools.vala:2737 src/Properties.vala:381 src/Properties.vala:385
-#: src/Properties.vala:392
-msgid "Exposure:"
+#: src/library/LibraryWindow.vala:888 src/data_imports/DataImportsUI.vala:112
+msgid "_Import"
 msgstr ""
 
-#: src/EditingTools.vala:2745
-msgid "Saturation:"
+#: src/library/LibraryWindow.vala:888
+msgid "Library Location"
 msgstr ""
 
-#: src/EditingTools.vala:2753
-msgid "Tint:"
+#: src/library/LibraryWindow.vala:901
+msgid "Photos cannot be imported from this directory."
 msgstr ""
 
-#: src/EditingTools.vala:2762
-msgid "Temperature:"
+#: src/library/LibraryWindow.vala:1188
+#, c-format
+msgid "%s (%d%%)"
 msgstr ""
 
-#: src/EditingTools.vala:2770
-msgid "Shadows:"
+#: src/library/LibraryWindow.vala:1232 src/library/LibraryWindow.vala:1240
+msgid "Updating library..."
 msgstr ""
 
-#: src/EditingTools.vala:2824
-msgid "Reset Colors"
+#: src/library/LibraryWindow.vala:1245
+msgid "Preparing to auto-import photos..."
 msgstr ""
 
-#: src/EditingTools.vala:2824
-msgid "Reset all color adjustments to original"
+#: src/library/LibraryWindow.vala:1250
+msgid "Auto-importing photos..."
 msgstr ""
 
-#: src/EditingTools.vala:3153
-msgid "Temperature"
+#: src/library/LibraryWindow.vala:1255
+msgid "Writing metadata to files..."
 msgstr ""
 
-#: src/EditingTools.vala:3159
-msgid "Tint"
+#: src/library/OfflinePage.vala:8
+msgid "Missing Files"
 msgstr ""
 
-#: src/EditingTools.vala:3165
-msgid "Saturation"
+#: src/library/OfflinePage.vala:106
+msgid "Deleting..."
 msgstr ""
 
-#: src/EditingTools.vala:3171
-msgid "Exposure"
+#: src/library/ImportQueuePage.vala:8
+msgid "Importing..."
 msgstr ""
 
-#: src/EditingTools.vala:3177
-msgid "Shadows"
+#: src/library/ImportQueuePage.vala:66
+msgid "_Stop Import"
 msgstr ""
 
-#: src/EditingTools.vala:3187
-msgid "Contrast Expansion"
+#: src/library/ImportQueuePage.vala:67
+msgid "Stop importing photos"
+msgstr "Simamisha kuingiza picha"
+
+#: src/library/ImportQueuePage.vala:123
+msgid "Preparing to import..."
 msgstr ""
 
-#: src/MediaMonitor.vala:400
+#: src/library/ImportQueuePage.vala:150
 #, c-format
-msgid "Unable to process monitoring updates: %s"
+msgid "Imported %s"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:154
-msgid "No events"
+#: src/library/LastImportPage.vala:8
+msgid "Last Import"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:158
-msgid "No events found"
+#: src/library/TrashPage.vala:8
+msgid "Trash"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:205
-msgid "Events"
+#: src/library/TrashPage.vala:108
+msgid "Trash is empty"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:219
-msgid "Undated"
+#: src/library/TrashPage.vala:112
+msgid "Delete"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:220
-msgid "%Y"
+#: src/library/TrashPage.vala:113
+msgid "Deleting Photos"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:221
-msgid "%B"
+#: src/library/Branch.vala:37
+msgid "Library"
 msgstr ""
 
-#: src/events/EventDirectoryItem.vala:74
-#, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] ""
-msgstr[1] ""
+#: src/photos/TiffSupport.vala:86
+msgid "TIFF"
+msgstr ""
 
-#: src/events/EventDirectoryItem.vala:76 src/Properties.vala:304
-#, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] ""
-msgstr[1] ""
+#: src/photos/PngSupport.vala:30
+msgid "PNG"
+msgstr ""
 
-#: src/events/EventDirectoryItem.vala:78 src/Properties.vala:302
-#, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] ""
-msgstr[1] ""
+#: src/photos/JfifSupport.vala:84
+msgid "JPEG"
+msgstr ""
 
-#: src/events/EventPage.vala:86
-msgid "No Event"
+#: src/photos/JfifSupport.vala:182
+#, c-format
+msgid "Low (%d%%)"
 msgstr ""
 
-#: src/Exporter.vala:250
+#: src/photos/JfifSupport.vala:185
 #, c-format
-msgid "Unable to generate a temporary file for %s: %s"
+msgid "Medium (%d%%)"
 msgstr ""
 
-#: src/Exporter.vala:317
-msgid "Exporting"
+#: src/photos/JfifSupport.vala:188
+#, c-format
+msgid "High (%d%%)"
 msgstr ""
 
-#: src/Exporter.vala:334
+#: src/photos/JfifSupport.vala:191
 #, c-format
-msgid "File %s already exists.  Replace?"
+msgid "Maximum (%d%%)"
 msgstr ""
 
-#: src/Exporter.vala:336
-msgid "_Skip"
+#: src/photos/RawSupport.vala:134
+msgid "RAW"
 msgstr ""
 
-#: src/Exporter.vala:336
-msgid "_Replace"
+#: src/photos/BmpSupport.vala:32
+msgid "BMP"
 msgstr ""
 
-#: src/Exporter.vala:336
-msgid "Replace _All"
+#: src/searches/SavedSearchDialog.vala:167
+msgid "contains"
 msgstr ""
 
-#: src/Exporter.vala:336
-msgid "Export"
+#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:433
+msgid "is exactly"
 msgstr ""
 
-#: src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
+#: src/searches/SavedSearchDialog.vala:169
+msgid "starts with"
 msgstr ""
 
-#: src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
+#: src/searches/SavedSearchDialog.vala:170
+msgid "ends with"
 msgstr ""
 
-#: src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
+#: src/searches/SavedSearchDialog.vala:171
+msgid "does not contain"
 msgstr ""
 
-#: src/Dialogs.vala:14
-#, c-format
-msgid "This will remove the tag \"%s\" from one photo.  Continue?"
-msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
-msgstr[0] ""
-msgstr[1] ""
+#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:437
+msgid "is not set"
+msgstr ""
 
-#: src/Dialogs.vala:23
-#, c-format
-msgid "This will remove the saved search \"%s\".  Continue?"
+#: src/searches/SavedSearchDialog.vala:243
+#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:377
+msgid "is"
 msgstr ""
 
-#: src/Dialogs.vala:33
-#, c-format
-msgid "This will remove the face \"%s\" from one photo.  Continue?"
-msgid_plural "This will remove the face \"%s\" from %d photos.  Continue?"
-msgstr[0] ""
-msgstr[1] ""
+#: src/searches/SavedSearchDialog.vala:244
+msgid "is not"
+msgstr ""
 
-#: src/Dialogs.vala:51
-msgid "Export Video"
+#: src/searches/SavedSearchDialog.vala:250
+msgid "any photo"
 msgstr ""
 
-#: src/Dialogs.vala:105
-#, c-format
-msgid ""
-"Shotwell couldn't create a file for editing this photo because you do not "
-"have permission to write to %s."
+#: src/searches/SavedSearchDialog.vala:251
+msgid "a raw photo"
 msgstr ""
 
-#: src/Dialogs.vala:114
-msgid ""
-"Unable to export the following photo due to a file error.\n"
-"\n"
+#: src/searches/SavedSearchDialog.vala:252
+msgid "a video"
 msgstr ""
 
-#: src/Dialogs.vala:120
-msgid ""
-"\n"
-"\n"
-"Would you like to continue exporting?"
+#: src/searches/SavedSearchDialog.vala:306
+msgid "flagged"
 msgstr ""
 
-#: src/Dialogs.vala:121
-msgid "Con_tinue"
+#: src/searches/SavedSearchDialog.vala:307
+msgid "not flagged"
 msgstr ""
 
-#: src/Dialogs.vala:137
-msgid "Unmodified"
+#: src/searches/SavedSearchDialog.vala:370
+msgid "and higher"
 msgstr ""
 
-#: src/Dialogs.vala:138
-msgid "Current"
+#: src/searches/SavedSearchDialog.vala:371
+msgid "only"
 msgstr ""
 
-#: src/Dialogs.vala:203
-msgid "_Format:"
+#: src/searches/SavedSearchDialog.vala:372
+msgid "and lower"
 msgstr ""
 
-#: src/Dialogs.vala:206
-msgid "_Quality:"
+#: src/searches/SavedSearchDialog.vala:434
+msgid "is after"
 msgstr ""
 
-#: src/Dialogs.vala:209
-msgid "_Scaling constraint:"
+#: src/searches/SavedSearchDialog.vala:435
+msgid "is before"
 msgstr ""
 
-#: src/Dialogs.vala:212
-msgid " _pixels"
+#: src/searches/SavedSearchDialog.vala:436
+msgid "is between"
 msgstr ""
 
-#: src/Dialogs.vala:220
-msgid "Export metadata"
+#: src/searches/SavedSearchDialog.vala:449
+msgid "and"
 msgstr ""
 
-#: src/Dialogs.vala:459
-#, c-format
-msgid "(and %d more)\n"
+#: src/searches/SavedSearchDialog.vala:656
+msgid "any"
 msgstr ""
 
-#: src/Dialogs.vala:515
-#, c-format
-msgid "1 duplicate photo was not imported:\n"
-msgid_plural "%d duplicate photos were not imported:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/searches/SavedSearchDialog.vala:657
+msgid "all"
+msgstr ""
 
-#: src/Dialogs.vala:518
-#, c-format
-msgid "1 duplicate video was not imported:\n"
-msgid_plural "%d duplicate videos were not imported:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/searches/SavedSearchDialog.vala:658
+msgid "none"
+msgstr ""
 
-#: src/Dialogs.vala:521
-#, c-format
-msgid "1 duplicate photo/video was not imported:\n"
-msgid_plural "%d duplicate photos/videos were not imported:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/searches/SearchBoolean.vala:156
+msgid "Any text"
+msgstr ""
 
-#: src/Dialogs.vala:535
-#, c-format
-msgid "1 photo failed to import due to a file or hardware error:\n"
-msgid_plural "%d photos failed to import due to a file or hardware error:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/searches/SearchBoolean.vala:159
+msgid "Title"
+msgstr ""
 
-#: src/Dialogs.vala:538
-#, c-format
-msgid "1 video failed to import due to a file or hardware error:\n"
-msgid_plural "%d videos failed to import due to a file or hardware error:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/searches/SearchBoolean.vala:162
+msgid "Tag"
+msgstr ""
 
-#: src/Dialogs.vala:541
-#, c-format
-msgid "1 photo/video failed to import due to a file or hardware error:\n"
-msgid_plural ""
-"%d photos/videos failed to import due to a file or hardware error:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/searches/SearchBoolean.vala:165
+msgid "Event name"
+msgstr ""
 
-#: src/Dialogs.vala:544
-#, c-format
-msgid "1 file failed to import due to a file or hardware error:\n"
-msgid_plural "%d files failed to import due to a file or hardware error:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/searches/SearchBoolean.vala:168
+msgid "File name"
+msgstr ""
 
-#: src/Dialogs.vala:558
-#, c-format
-msgid ""
-"1 photo failed to import because the photo library folder was not writable:\n"
-msgid_plural ""
-"%d photos failed to import because the photo library folder was not "
-"writable:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/searches/SearchBoolean.vala:171
+msgid "Face"
+msgstr ""
 
-#: src/Dialogs.vala:561
-#, c-format
-msgid ""
-"1 video failed to import because the photo library folder was not writable:\n"
-msgid_plural ""
-"%d videos failed to import because the photo library folder was not "
-"writable:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/searches/SearchBoolean.vala:174
+msgid "Media type"
+msgstr ""
 
-#: src/Dialogs.vala:564
-#, c-format
-msgid ""
-"1 photo/video failed to import because the photo library folder was not "
-"writable:\n"
-msgid_plural ""
-"%d photos/videos failed to import because the photo library folder was not "
-"writable:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/searches/SearchBoolean.vala:177
+msgid "Flag state"
+msgstr ""
 
-#: src/Dialogs.vala:567
-#, c-format
-msgid ""
-"1 file failed to import because the photo library folder was not writable:\n"
-msgid_plural ""
-"%d files failed to import because the photo library folder was not "
-"writable:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/searches/SearchBoolean.vala:183
+msgid "Date"
+msgstr ""
 
-#: src/Dialogs.vala:581
-#, c-format
-msgid "1 photo failed to import due to a camera error:\n"
-msgid_plural "%d photos failed to import due to a camera error:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/searches/Branch.vala:68
+msgid "Saved Searches"
+msgstr ""
 
-#: src/Dialogs.vala:584
-#, c-format
-msgid "1 video failed to import due to a camera error:\n"
-msgid_plural "%d videos failed to import due to a camera error:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/searches/Branch.vala:77 src/sidebar/Tree.vala:195
+msgid "Ne_w Search..."
+msgstr ""
 
-#: src/Dialogs.vala:587
-#, c-format
-msgid "1 photo/video failed to import due to a camera error:\n"
-msgid_plural "%d photos/videos failed to import due to a camera error:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/sidebar/Tree.vala:199
+msgid "New _Tag..."
+msgstr ""
 
-#: src/Dialogs.vala:590
+#: src/AppDirs.vala:49
 #, c-format
-msgid "1 file failed to import due to a camera error:\n"
-msgid_plural "%d files failed to import due to a camera error:\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Unable to create data directory %s: %s"
+msgstr ""
 
-#: src/Dialogs.vala:607
-#, c-format
-msgid "1 unsupported photo skipped:\n"
-msgid_plural "%d unsupported photos skipped:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/AppDirs.vala:85
+msgid "Pictures"
+msgstr ""
 
-#: src/Dialogs.vala:622
+#: src/AppDirs.vala:123
 #, c-format
-msgid "1 non-image file skipped.\n"
-msgid_plural "%d non-image files skipped.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Unable to create temporary directory %s: %s"
+msgstr ""
 
-#: src/Dialogs.vala:633
+#: src/AppDirs.vala:140
 #, c-format
-msgid "1 photo skipped due to user cancel:\n"
-msgid_plural "%d photos skipped due to user cancel:\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Unable to create data subdirectory %s: %s"
+msgstr ""
 
-#: src/Dialogs.vala:636
-#, c-format
-msgid "1 video skipped due to user cancel:\n"
-msgid_plural "%d videos skipped due to user cancel:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:18 plugins/shotwell-publishing/FlickrPublishing.vala:34
+#: plugins/shotwell-publishing/FacebookPublishing.vala:32
+#: plugins/shotwell-publishing/PicasaPublishing.vala:32
+#: plugins/shotwell-publishing/YouTubePublishing.vala:32
+#: plugins/shotwell-data-imports/FSpotImporter.vala:34
+msgid "Copyright 2009-2012 Yorba Foundation"
+msgstr ""
 
-#: src/Dialogs.vala:639
-#, c-format
-msgid "1 photo/video skipped due to user cancel:\n"
-msgid_plural "%d photos/videos skipped due to user cancel:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:133
+msgid "Rotate _Right"
+msgstr ""
 
-#: src/Dialogs.vala:642
-#, c-format
-msgid "1 file skipped due to user cancel:\n"
-msgid_plural "%d file skipped due to user cancel:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:134 src/Resources.vala:139
+msgid "Rotate"
+msgstr ""
 
-#: src/Dialogs.vala:656
-#, c-format
-msgid "1 photo successfully imported.\n"
-msgid_plural "%d photos successfully imported.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:135
+msgid "Rotate Right"
+msgstr ""
 
-#: src/Dialogs.vala:659
-#, c-format
-msgid "1 video successfully imported.\n"
-msgid_plural "%d videos successfully imported.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:136
+msgid "Rotate the photos right (press Ctrl to rotate left)"
+msgstr ""
 
-#: src/Dialogs.vala:662
-#, c-format
-msgid "1 photo/video successfully imported.\n"
-msgid_plural "%d photos/videos successfully imported.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:138
+msgid "Rotate _Left"
+msgstr ""
 
-#: src/Dialogs.vala:678
-msgid "No photos or videos imported.\n"
+#: src/Resources.vala:140
+msgid "Rotate Left"
 msgstr ""
 
-#: src/Dialogs.vala:693
-msgid "Import Complete"
+#: src/Resources.vala:141
+msgid "Rotate the photos left"
 msgstr ""
 
-#: src/Dialogs.vala:854
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:143
+msgid "Flip Hori_zontally"
+msgstr ""
 
-#: src/Dialogs.vala:857
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:144
+msgid "Flip Horizontally"
+msgstr ""
 
-#: src/Dialogs.vala:861
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:146
+msgid "Flip Verti_cally"
+msgstr ""
 
-#: src/Dialogs.vala:864
-msgid "1 day"
+#: src/Resources.vala:147
+msgid "Flip Vertically"
 msgstr ""
 
-#: src/Dialogs.vala:941
-msgid "Name:"
+#: src/Resources.vala:149
+msgid "_Enhance"
 msgstr ""
 
-#: src/Dialogs.vala:951 src/Properties.vala:289
-msgid "Title:"
+#: src/Resources.vala:150
+msgid "Enhance"
 msgstr ""
 
-#: src/Dialogs.vala:967
-msgid "_Trash File"
-msgid_plural "_Trash Files"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:151
+msgid "Automatically improve the photo's appearance"
+msgstr ""
 
-#: src/Dialogs.vala:971
-msgid "Only _Remove"
+#: src/Resources.vala:153
+msgid "_Crop"
 msgstr ""
 
-#: src/Dialogs.vala:1014
-msgid "Revert External Edit?"
+#: src/Resources.vala:154
+msgid "Crop"
 msgstr ""
 
-#: src/Dialogs.vala:1014
-msgid "Revert External Edits?"
+#: src/Resources.vala:155
+msgid "Crop the photo's size"
 msgstr ""
 
-#: src/Dialogs.vala:1016
-#, c-format
-msgid "This will destroy all changes made to the external file.  Continue?"
-msgid_plural ""
-"This will destroy all changes made to %d external files.  Continue?"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:157
+msgid "_Straighten"
+msgstr ""
 
-#: src/Dialogs.vala:1020
-msgid "Re_vert External Edit"
+#: src/Resources.vala:158
+msgid "Straighten"
 msgstr ""
 
-#: src/Dialogs.vala:1020
-msgid "Re_vert External Edits"
+#: src/Resources.vala:159
+msgid "Straighten the photo"
 msgstr ""
 
-#: src/Dialogs.vala:1041
-#, c-format
-msgid "This will remove the photo from the library.  Continue?"
-msgid_plural "This will remove %d photos from the library.  Continue?"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:161
+msgid "_Red-eye"
+msgstr ""
 
-#: src/Dialogs.vala:1048
-msgid "_Remove"
+#: src/Resources.vala:162
+msgid "Red-eye"
 msgstr ""
 
-#: src/Dialogs.vala:1049
-msgid "Remove Photo From Library"
+#: src/Resources.vala:163
+msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr ""
 
-#: src/Dialogs.vala:1049
-msgid "Remove Photos From Library"
+#: src/Resources.vala:165
+msgid "_Adjust"
 msgstr ""
 
-#: src/Dialogs.vala:1138
-#, c-format
-msgid "%d%%"
+#: src/Resources.vala:166
+msgid "Adjust"
 msgstr ""
 
-#: src/Dialogs.vala:1261
-msgid "AM"
+#: src/Resources.vala:167
+msgid "Adjust the photo's color and tone"
 msgstr ""
 
-#: src/Dialogs.vala:1262
-msgid "PM"
+#: src/Resources.vala:169
+msgid "Re_vert to Original"
 msgstr ""
 
-#: src/Dialogs.vala:1263
-msgid "24 Hr"
+#: src/Resources.vala:170
+msgid "Revert to Original"
 msgstr ""
 
-#: src/Dialogs.vala:1278
-msgid "_Shift photos/videos by the same amount"
+#: src/Resources.vala:172
+msgid "Revert External E_dits"
 msgstr ""
 
-#: src/Dialogs.vala:1283
-msgid "Set _all photos/videos to this time"
+#: src/Resources.vala:173
+msgid "Revert to the master photo"
 msgstr ""
 
-#: src/Dialogs.vala:1289
-msgid "_Modify original file"
+#: src/Resources.vala:175
+msgid "Set as _Desktop Background"
 msgstr ""
 
-#: src/Dialogs.vala:1289
-msgid "_Modify original files"
+#: src/Resources.vala:176
+msgid "Set selected image to be the new desktop background"
 msgstr ""
 
-#: src/Dialogs.vala:1372
-msgid "Original: "
+#: src/Resources.vala:177
+msgid "Set as _Desktop Slideshow..."
 msgstr ""
 
-#: src/Dialogs.vala:1373
-msgid "%m/%d/%Y, %H:%M:%S"
+#: src/Resources.vala:179
+msgid "_Undo"
 msgstr ""
 
-#: src/Dialogs.vala:1374
-msgid "%m/%d/%Y, %I:%M:%S %p"
+#: src/Resources.vala:180
+msgid "Undo"
 msgstr ""
 
-#: src/Dialogs.vala:1459
-#, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
+#: src/Resources.vala:182
+msgid "_Redo"
 msgstr ""
 
-#: src/Dialogs.vala:1460
-#, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
+#: src/Resources.vala:183
+msgid "Redo"
 msgstr ""
 
-#: src/Dialogs.vala:1462
-msgid "day"
-msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:185
+msgid "Re_name Event..."
+msgstr ""
 
-#: src/Dialogs.vala:1463
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:188
+msgid "Make _Key Photo for Event"
+msgstr ""
 
-#: src/Dialogs.vala:1464
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:189
+msgid "Make Key Photo for Event"
+msgstr ""
 
-#: src/Dialogs.vala:1465
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:191
+msgid "_New Event"
+msgstr ""
 
-#: src/Dialogs.vala:1509
-#, c-format
-msgid ""
-"\n"
-"\n"
-"And %d other."
-msgid_plural ""
-"\n"
-"\n"
-"And %d others."
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:192
+msgid "New Event"
+msgstr ""
+
+#: src/Resources.vala:194
+msgid "Move Photos"
+msgstr ""
+
+#: src/Resources.vala:195
+msgid "Move photos to an event"
+msgstr ""
+
+#: src/Resources.vala:197
+msgid "_Merge Events"
+msgstr ""
+
+#: src/Resources.vala:198
+msgid "Merge"
+msgstr ""
+
+#: src/Resources.vala:199
+msgid "Combine events into a single event"
+msgstr ""
+
+#: src/Resources.vala:201
+msgid "_Set Rating"
+msgstr ""
+
+#: src/Resources.vala:202
+msgid "Set Rating"
+msgstr ""
+
+#: src/Resources.vala:203
+msgid "Change the rating of your photo"
+msgstr ""
+
+#: src/Resources.vala:205
+msgid "_Increase"
+msgstr ""
+
+#: src/Resources.vala:206
+msgid "Increase Rating"
+msgstr ""
+
+#: src/Resources.vala:208
+msgid "_Decrease"
+msgstr ""
+
+#: src/Resources.vala:209
+msgid "Decrease Rating"
+msgstr ""
+
+#: src/Resources.vala:211
+msgid "_Unrated"
+msgstr ""
+
+#: src/Resources.vala:212
+msgid "Unrated"
+msgstr ""
+
+#: src/Resources.vala:213
+msgid "Rate Unrated"
+msgstr ""
+
+#: src/Resources.vala:214
+msgid "Setting as unrated"
+msgstr ""
+
+#: src/Resources.vala:215
+msgid "Remove any ratings"
+msgstr ""
+
+#: src/Resources.vala:217
+msgid "_Rejected"
+msgstr ""
+
+#: src/Resources.vala:218
+msgid "Rejected"
+msgstr ""
+
+#: src/Resources.vala:219
+msgid "Rate Rejected"
+msgstr ""
+
+#: src/Resources.vala:220
+msgid "Setting as rejected"
+msgstr ""
+
+#: src/Resources.vala:221
+msgid "Set rating to rejected"
+msgstr ""
+
+#: src/Resources.vala:223
+msgid "Rejected _Only"
+msgstr ""
+
+#: src/Resources.vala:224
+msgid "Rejected Only"
+msgstr ""
+
+#: src/Resources.vala:225
+msgid "Show only rejected photos"
+msgstr ""
+
+#: src/Resources.vala:227
+msgid "All + _Rejected"
+msgstr ""
+
+#: src/Resources.vala:228 src/Resources.vala:229
+msgid "Show all photos, including rejected"
+msgstr ""
+
+#: src/Resources.vala:231
+msgid "_All Photos"
+msgstr ""
+
+#: src/Resources.vala:232 src/Resources.vala:233
+msgid "Show all photos"
+msgstr ""
+
+#: src/Resources.vala:235
+msgid "_Ratings"
+msgstr ""
 
-#: src/Dialogs.vala:1530 src/Dialogs.vala:1554
-msgid "Tags (separated by commas):"
+#: src/Resources.vala:236
+msgid "Display each photo's rating"
 msgstr ""
 
-#: src/Dialogs.vala:1612
-msgid "Welcome!"
+#: src/Resources.vala:238
+msgid "_Filter Photos"
 msgstr ""
 
-#: src/Dialogs.vala:1620
-#, c-format
-msgid "Welcome to Shotwell!"
+#: src/Resources.vala:239
+msgid "Filter Photos"
 msgstr ""
 
-#: src/Dialogs.vala:1625
-#, c-format
-msgid "To get started, import photos in any of these ways:"
+#: src/Resources.vala:240
+msgid "Limit the number of photos displayed based on a filter"
 msgstr ""
 
-#: src/Dialogs.vala:1648
-#, c-format
-msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
+#: src/Resources.vala:242
+msgid "_Duplicate"
 msgstr ""
 
-#: src/Dialogs.vala:1649
-msgid "Drag and drop photos onto the Shotwell window"
+#: src/Resources.vala:243
+msgid "Duplicate"
 msgstr ""
 
-#: src/Dialogs.vala:1650
-msgid "Connect a camera to your computer and import"
+#: src/Resources.vala:244
+msgid "Make a duplicate of the photo"
 msgstr ""
 
-#: src/Dialogs.vala:1659
-msgid "Import photos from your _F-Spot library"
+#: src/Resources.vala:246
+msgid "_Export..."
 msgstr ""
 
-#: src/Dialogs.vala:1666
-#, c-format
-msgid "_Import photos from your %s folder"
+#: src/Resources.vala:248
+msgid "_Print..."
 msgstr ""
 
-#: src/Dialogs.vala:1676
-msgid "You can also import photos in any of these ways:"
+#: src/Resources.vala:250
+msgid "Pu_blish..."
 msgstr ""
 
-#: src/Dialogs.vala:1688
-msgid "_Don't show this message again"
+#: src/Resources.vala:251
+msgid "Publish"
 msgstr ""
 
-#: src/Dialogs.vala:1809 src/Dialogs.vala:1813
-msgid "(Help)"
+#: src/Resources.vala:252
+msgid "Publish to various websites"
 msgstr ""
 
-#: src/Dialogs.vala:1822
-#, c-format
-msgid "Year%sMonth%sDay"
+#: src/Resources.vala:254
+msgid "Edit _Title..."
 msgstr ""
 
-#: src/Dialogs.vala:1824
-#, c-format
-msgid "Year%sMonth"
+#: src/Resources.vala:257
+msgid "_Adjust Date and Time..."
 msgstr ""
 
-#: src/Dialogs.vala:1826
-#, c-format
-msgid "Year%sMonth-Day"
+#: src/Resources.vala:258
+msgid "Adjust Date and Time"
 msgstr ""
 
-#: src/Dialogs.vala:1828
-msgid "Year-Month-Day"
+#: src/Resources.vala:260
+msgid "Add _Tags..."
 msgstr ""
 
-#: src/Dialogs.vala:2062
-msgid "Invalid pattern"
+#: src/Resources.vala:261 src/Resources.vala:301
+msgid "Add Tags"
 msgstr ""
 
-#: src/Dialogs.vala:2159
-msgid ""
-"Shotwell can copy the photos into your library folder or it can import them "
-"without copying."
+#: src/Resources.vala:263
+msgid "_Preferences"
 msgstr ""
 
-#: src/Dialogs.vala:2164
-msgid "Co_py Photos"
+#: src/Resources.vala:265
+msgid "Open With E_xternal Editor"
 msgstr ""
 
-#: src/Dialogs.vala:2165
-msgid "_Import in Place"
+#: src/Resources.vala:267
+msgid "Open With RA_W Editor"
 msgstr ""
 
-#: src/Dialogs.vala:2166
-msgid "Import to Library"
+#: src/Resources.vala:269
+msgid "Send _To..."
 msgstr ""
 
-#: src/Dialogs.vala:2177
-msgid "Removing Photos From Library"
+#: src/Resources.vala:271
+msgid "_Find..."
 msgstr ""
 
-#: src/Dialogs.vala:2191
-#, c-format
-msgid ""
-"This will remove the photo/video from your Shotwell library.  Would you also "
-"like to move the file to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgid_plural ""
-"This will remove %d photos/videos from your Shotwell library.  Would you "
-"also like to move the files to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:272
+msgid "Find"
+msgstr ""
 
-#: src/Dialogs.vala:2195
-#, c-format
-msgid ""
-"This will remove the video from your Shotwell library.  Would you also like "
-"to move the file to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgid_plural ""
-"This will remove %d videos from your Shotwell library.  Would you also like "
-"to move the files to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:273
+msgid "Find an image by typing text that appears in its name or tags"
+msgstr ""
 
-#: src/Dialogs.vala:2199
-#, c-format
-msgid ""
-"This will remove the photo from your Shotwell library.  Would you also like "
-"to move the file to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgid_plural ""
-"This will remove %d photos from your Shotwell library.  Would you also like "
-"to move the files to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:275
+msgid "_Flag"
+msgstr ""
 
-#: src/Dialogs.vala:2231
-#, c-format
-msgid ""
-"The photo or video cannot be moved to your desktop trash.  Delete this file?"
-msgid_plural ""
-"%d photos/videos cannot be moved to your desktop trash.  Delete these files?"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:277
+msgid "Un_flag"
+msgstr ""
 
-#: src/Dialogs.vala:2248
-#, c-format
-msgid "The photo or video cannot be deleted."
-msgid_plural "%d photos/videos cannot be deleted."
-msgstr[0] ""
-msgstr[1] ""
+#: src/Resources.vala:282
+msgid "Mark faces of people in the photo"
+msgstr ""
 
-#: src/alien_db/AlienDatabaseImportDialog.vala:51
-#, c-format
-msgid "Import from default %1$s library (%2$s)"
+#: src/Resources.vala:283
+msgid "Modify Faces"
+msgstr ""
+
+#: src/Resources.vala:284
+msgid "Delete Face"
 msgstr ""
 
-#: src/alien_db/AlienDatabaseImportDialog.vala:59
+#: src/Resources.vala:286 src/Resources.vala:325
+msgid "_Rename..."
+msgstr ""
+
+#: src/Resources.vala:290
 #, c-format
-msgid "Import from another %s database file:"
+msgid "Unable to launch editor: %s"
 msgstr ""
 
-#: src/alien_db/AlienDatabaseImportDialog.vala:63
+#: src/Resources.vala:295
 #, c-format
-msgid "Import from a %s database file:"
+msgid "Add Tag \"%s\""
 msgstr ""
 
-#: src/alien_db/AlienDatabaseImportDialog.vala:97
-msgid "No database selected"
+#: src/Resources.vala:297
+#, c-format
+msgid "Add Tags \"%s\" and \"%s\""
 msgstr ""
 
-#: src/alien_db/AlienDatabaseImportDialog.vala:135
+#: src/Resources.vala:305
 #, c-format
-msgid "%s Database"
+msgid "_Delete Tag \"%s\""
 msgstr ""
 
-#: src/alien_db/AlienDatabaseImportDialog.vala:155
-msgid "Shotwell failed to load the database file"
+#: src/Resources.vala:309
+#, c-format
+msgid "Delete Tag \"%s\""
 msgstr ""
 
-#: src/alien_db/f_spot/FSpotDatabaseDriver.vala:220
-msgid "Import From _F-Spot..."
+#: src/Resources.vala:312
+msgid "Delete Tag"
 msgstr ""
 
-#: src/alien_db/f_spot/FSpotDatabaseDriver.vala:221
-msgid "Import the content of an external F-Spot database"
+#: src/Resources.vala:315
+msgid "_New"
 msgstr ""
 
-#: src/alien_db/f_spot/FSpotDatabaseDriver.vala:239
-msgid "Import From F-Spot"
+#: src/Resources.vala:318
+#, c-format
+msgid "Re_name Tag \"%s\"..."
 msgstr ""
 
-#: src/alien_db/f_spot/FSpotDatabase.vala:57
-msgid "F-Spot"
+#: src/Resources.vala:322
+#, c-format
+msgid "Rename Tag \"%s\" to \"%s\""
 msgstr ""
 
-#: src/Page.vala:1225
-msgid "No photos/videos"
+#: src/Resources.vala:327
+msgid "Modif_y Tags..."
 msgstr ""
 
-#: src/Page.vala:1229
-msgid "No photos/videos found"
+#: src/Resources.vala:328
+msgid "Modify Tags"
 msgstr ""
 
-#: src/Page.vala:2510
-msgid "Photos cannot be exported to this directory."
+#: src/Resources.vala:331
+#, c-format
+msgid "Tag Photo as \"%s\""
 msgstr ""
 
-#: src/Tag.vala:707
-msgid "untitled"
+#: src/Resources.vala:331
+#, c-format
+msgid "Tag Photos as \"%s\""
 msgstr ""
 
-#: src/Commands.vala:647
-msgid "Reverting"
+#: src/Resources.vala:335
+#, c-format
+msgid "Tag the selected photo as \"%s\""
 msgstr ""
 
-#: src/Commands.vala:647
-msgid "Undoing Revert"
+#: src/Resources.vala:336
+#, c-format
+msgid "Tag the selected photos as \"%s\""
 msgstr ""
 
-#: src/Commands.vala:691
-msgid "Enhancing"
+#: src/Resources.vala:340
+#, c-format
+msgid "Remove Tag \"%s\" From _Photo"
 msgstr ""
 
-#: src/Commands.vala:691
-msgid "Undoing Enhance"
+#: src/Resources.vala:341
+#, c-format
+msgid "Remove Tag \"%s\" From _Photos"
 msgstr ""
 
-#: src/Commands.vala:871
-msgid "Creating New Event"
+#: src/Resources.vala:345
+#, c-format
+msgid "Remove Tag \"%s\" From Photo"
 msgstr ""
 
-#: src/Commands.vala:872
-msgid "Removing Event"
+#: src/Resources.vala:346
+#, c-format
+msgid "Remove Tag \"%s\" From Photos"
 msgstr ""
 
-#: src/Commands.vala:881
-msgid "Moving Photos to New Event"
+#: src/Resources.vala:350
+#, c-format
+msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr ""
 
-#: src/Commands.vala:882
-msgid "Setting Photos to Previous Event"
+#: src/Resources.vala:354
+#, c-format
+msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr ""
 
-#: src/Commands.vala:912
-msgid "Merging"
+#: src/Resources.vala:357
+msgid "Saved Search"
 msgstr ""
 
-#: src/Commands.vala:913
-msgid "Unmerging"
+#: src/Resources.vala:359
+msgid "Delete Search"
 msgstr ""
 
-#: src/Commands.vala:922
-msgid "Duplicating photos"
+#: src/Resources.vala:362
+msgid "_Edit..."
 msgstr ""
 
-#: src/Commands.vala:922
-msgid "Removing duplicated photos"
+#: src/Resources.vala:363
+msgid "Re_name..."
 msgstr ""
 
-#: src/Commands.vala:945
+#: src/Resources.vala:366
 #, c-format
-msgid "Unable to duplicate one photo due to a file error"
-msgid_plural "Unable to duplicate %d photos due to file errors"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Commands.vala:1032
-msgid "Restoring previous rating"
+msgid "Rename Search \"%s\" to \"%s\""
 msgstr ""
 
-#: src/Commands.vala:1042 src/Commands.vala:1043
-msgid "Increasing ratings"
+#: src/Resources.vala:370
+#, c-format
+msgid "Delete Search \"%s\""
 msgstr ""
 
-#: src/Commands.vala:1042 src/Commands.vala:1043
-msgid "Decreasing ratings"
+#: src/Resources.vala:374
+#, c-format
+msgid "Unable to rename face to \"%s\" because the face already exists."
 msgstr ""
 
-#: src/Commands.vala:1092
-msgid "Setting RAW developer"
+#: src/Resources.vala:378
+#, c-format
+msgid "Remove Face \"%s\" From _Photo"
 msgstr ""
 
-#: src/Commands.vala:1092
-msgid "Restoring previous RAW developer"
+#: src/Resources.vala:379
+#, c-format
+msgid "Remove Face \"%s\" From _Photos"
 msgstr ""
 
-#: src/Commands.vala:1163
-msgid "Original photo could not be adjusted."
+#: src/Resources.vala:383
+#, c-format
+msgid "Remove Face \"%s\" From Photo"
 msgstr ""
 
-#: src/Commands.vala:1183
-msgid "Adjusting Date and Time"
+#: src/Resources.vala:384
+#, c-format
+msgid "Remove Face \"%s\" From Photos"
 msgstr ""
 
-#: src/Commands.vala:1183
-msgid "Undoing Date and Time Adjustment"
+#: src/Resources.vala:388
+#, c-format
+msgid "Re_name Face \"%s\"..."
 msgstr ""
 
-#: src/Commands.vala:1210
-msgid "One original photo could not be adjusted."
-msgid_plural "The following original photos could not be adjusted."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Commands.vala:1212 src/Commands.vala:1224
-msgid "Time Adjustment Error"
+#: src/Resources.vala:392
+#, c-format
+msgid "Rename Face \"%s\" to \"%s\""
 msgstr ""
 
-#: src/Commands.vala:1222
-msgid "Time adjustments could not be undone on the following photo file."
-msgid_plural ""
-"Time adjustments could not be undone on the following photo files."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Commands.vala:1411
-msgid "Create Tag"
+#: src/Resources.vala:396
+#, c-format
+msgid "_Delete Face \"%s\""
 msgstr ""
 
-#: src/Commands.vala:1583
-msgid "Move Photos to Trash"
+#: src/Resources.vala:400
+#, c-format
+msgid "Delete Face \"%s\""
 msgstr ""
 
-#: src/Commands.vala:1583
-msgid "Restore Photos from Trash"
+#: src/Resources.vala:557
+#, c-format
+msgid "Rate %s"
 msgstr ""
 
-#: src/Commands.vala:1584
-msgid "Move the photos to the Shotwell trash"
+#: src/Resources.vala:558
+#, c-format
+msgid "Set rating to %s"
 msgstr ""
 
-#: src/Commands.vala:1584
-msgid "Restore the photos back to the Shotwell library"
+#: src/Resources.vala:559
+#, c-format
+msgid "Setting rating to %s"
 msgstr ""
 
-#: src/Commands.vala:1603
-msgid "Moving Photos to Trash"
+#: src/Resources.vala:561
+#, c-format
+msgid "Display %s"
 msgstr ""
 
-#: src/Commands.vala:1603
-msgid "Restoring Photos From Trash"
+#: src/Resources.vala:562
+#, c-format
+msgid "Only show photos with a rating of %s"
 msgstr ""
 
-#: src/Commands.vala:1692
-msgid "Flag"
+#: src/Resources.vala:563
+#, c-format
+msgid "%s or Better"
 msgstr ""
 
-#: src/Commands.vala:1692
-msgid "Unflag"
+#: src/Resources.vala:564
+#, c-format
+msgid "Display %s or Better"
 msgstr ""
 
-#: src/Commands.vala:1693
-msgid "Flag selected photos"
+#: src/Resources.vala:565
+#, c-format
+msgid "Only show photos with a rating of %s or better"
 msgstr ""
 
-#: src/Commands.vala:1693
-msgid "Unflag selected photos"
+#: src/Resources.vala:656
+msgid "Remove the selected photos from the trash"
 msgstr ""
 
-#: src/slideshow/Slideshow.vala:15
-msgid "Slideshow Transitions"
+#: src/Resources.vala:657
+msgid "Remove the selected photos from the library"
 msgstr ""
 
-#: src/slideshow/TransitionEffects.vala:96
-msgid "(None)"
+#: src/Resources.vala:659
+msgid "_Restore"
 msgstr ""
 
-#: src/slideshow/TransitionEffects.vala:292
-msgid "None"
+#: src/Resources.vala:660
+msgid "Move the selected photos back into the library"
 msgstr ""
 
-#: src/publishing/Publishing.vala:16
-msgid "Publishing"
+#: src/Resources.vala:662
+msgid "Show in File Mana_ger"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:69
-#: plugins/shotwell-publishing/YouTubePublishing.vala:851
-#: plugins/shotwell-publishing/PicasaPublishing.vala:920
-msgid "_Login"
+#: src/Resources.vala:663
+msgid "Open the selected photo's directory in the file manager"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:144
-msgid "The selected photos/videos were successfully published."
+#: src/Resources.vala:666
+#, c-format
+msgid "Unable to open in file manager: %s"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:146
-msgid "The selected videos were successfully published."
+#: src/Resources.vala:669
+msgid "R_emove From Library"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:148
-msgid "The selected photos were successfully published."
+#: src/Resources.vala:671
+msgid "_Move to Trash"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:151
-msgid "The selected video was successfully published."
+#: src/Resources.vala:673
+msgid "Select _All"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:153
-msgid "The selected photo was successfully published."
+#: src/Resources.vala:674
+msgid "Select all items"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:161
-msgid "Fetching account information..."
+#: src/DirectoryMonitor.vala:885
+#, c-format
+msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:167
-msgid "Logging in..."
+#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:413
+msgid "_Save"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:218
-msgid "Publish Photos"
+#: src/direct/DirectPhotoPage.vala:52
+msgid "Save photo"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:219
-msgid "Publish photos _to:"
+#: src/direct/DirectPhotoPage.vala:57
+msgid "Save _As..."
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:221
-msgid "Publish Videos"
+#: src/direct/DirectPhotoPage.vala:58
+msgid "Save photo with a different name"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:222
-msgid "Publish videos _to"
+#: src/direct/DirectPhotoPage.vala:69
+msgid "Print the photo to a printer connected to your computer"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:224
-msgid "Publish Photos and Videos"
+#: src/direct/DirectPhotoPage.vala:73
+msgid "Edit"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:225
-msgid "Publish photos and videos _to"
+#: src/direct/DirectPhotoPage.vala:223
+#, c-format
+msgid "%s does not exist."
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:390
-msgid "Unable to publish"
+#: src/direct/DirectPhotoPage.vala:225
+#, c-format
+msgid "%s is not a file."
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:391
+#: src/direct/DirectPhotoPage.vala:227
 #, c-format
 msgid ""
-"Shotwell cannot publish the selected items because you do not have a "
-"compatible publishing plugin enabled. To correct this, choose <b>Edit %s "
-"Preferences</b> and enable one or more of the publishing plugins on the "
-"<b>Plugin</b> tab."
+"%s does not support the file format of\n"
+"%s."
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:475
-msgid "_Close"
+#: src/direct/DirectPhotoPage.vala:413
+msgid "_Save a Copy"
 msgstr ""
 
-#: src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
+#: src/direct/DirectPhotoPage.vala:416
+#, c-format
+msgid "Lose changes to %s?"
 msgstr ""
 
-#: src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
+#: src/direct/DirectPhotoPage.vala:417
+msgid "Close _without Saving"
 msgstr ""
 
-#: src/publishing/PublishingPluginHost.vala:81
+#: src/direct/DirectPhotoPage.vala:450
 #, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
+msgid "Error while saving to %s: %s"
 msgstr ""
 
-#: src/publishing/PublishingPluginHost.vala:84
-msgid "To try publishing to another service, select one from the above menu."
+#: src/direct/DirectPhotoPage.vala:478 src/direct/DirectPhotoPage.vala:499
+msgid "Save As"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:165
-msgid "contains"
+#: src/tags/Branch.vala:133
+msgid "Tags"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:166
-#: src/searches/SavedSearchDialog.vala:431
-msgid "is exactly"
+#: src/editing_tools/EditingTools.vala:635
+msgid "Return to current photo dimensions"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:167
-msgid "starts with"
+#: src/editing_tools/EditingTools.vala:638
+msgid "Set the crop for this photo"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:168
-msgid "ends with"
+#: src/editing_tools/EditingTools.vala:650
+msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:169
-msgid "does not contain"
+#: src/editing_tools/EditingTools.vala:721
+msgid "Unconstrained"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:170
-#: src/searches/SavedSearchDialog.vala:435
-msgid "is not set"
+#: src/editing_tools/EditingTools.vala:722
+msgid "Square"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:241
-#: src/searches/SavedSearchDialog.vala:310
-#: src/searches/SavedSearchDialog.vala:375
-msgid "is"
+#: src/editing_tools/EditingTools.vala:723
+msgid "Screen"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:242
-msgid "is not"
+#: src/editing_tools/EditingTools.vala:724
+#: plugins/shotwell-publishing/PicasaPublishing.vala:1215
+msgid "Original Size"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:248
-msgid "any photo"
+#: src/editing_tools/EditingTools.vala:725
+#: src/editing_tools/EditingTools.vala:728
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:744
+msgid "-"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:249
-msgid "a raw photo"
+#: src/editing_tools/EditingTools.vala:726
+msgid "SD Video (4 : 3)"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:250
-msgid "a video"
+#: src/editing_tools/EditingTools.vala:727
+msgid "HD Video (16 : 9)"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:304
-msgid "flagged"
+#: src/editing_tools/EditingTools.vala:1900
+msgid "Close the Faces tool without saving changes"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:305
-msgid "not flagged"
+#: src/editing_tools/EditingTools.vala:1903
+msgid "Save changes and close the Faces tool"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:368
-msgid "and higher"
+#: src/editing_tools/EditingTools.vala:1908
+#: src/editing_tools/EditingTools.vala:1933
+msgid "Click and drag to tag a face"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:369
-msgid "only"
+#: src/editing_tools/EditingTools.vala:1928
+#, c-format
+msgid "Click to edit face <i>%s</i>"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:370
-msgid "and lower"
+#: src/editing_tools/EditingTools.vala:1937
+msgid "Stop dragging to add your face and name it."
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:432
-msgid "is after"
+#: src/editing_tools/EditingTools.vala:1941
+msgid "Type a name for this face, then press Enter"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:433
-msgid "is before"
+#: src/editing_tools/EditingTools.vala:1945
+msgid "Move or modify the face shape or name and press Enter"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:434
-msgid "is between"
+#: src/editing_tools/EditingTools.vala:2476
+msgid "Close the red-eye tool"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:447
-msgid "and"
+#: src/editing_tools/EditingTools.vala:2479
+msgid "Remove any red-eye effects in the selected region"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:655
-msgid "any"
+#: src/editing_tools/EditingTools.vala:2808
+#: src/editing_tools/StraightenTool.vala:31
+msgid "_Reset"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:656
-msgid "all"
+#: src/editing_tools/EditingTools.vala:2826
+msgid "Saturation:"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:657
-msgid "none"
+#: src/editing_tools/EditingTools.vala:2833
+msgid "Tint:"
 msgstr ""
 
-#: src/searches/SearchBoolean.vala:150
-msgid "Any text"
+#: src/editing_tools/EditingTools.vala:2841
+msgid "Temperature:"
 msgstr ""
 
-#: src/searches/SearchBoolean.vala:153
-msgid "Title"
+#: src/editing_tools/EditingTools.vala:2848
+msgid "Shadows:"
 msgstr ""
 
-#: src/searches/SearchBoolean.vala:156
-msgid "Tag"
+#: src/editing_tools/EditingTools.vala:2901
+msgid "Reset Colors"
 msgstr ""
 
-#: src/searches/SearchBoolean.vala:159
-msgid "Event name"
+#: src/editing_tools/EditingTools.vala:2901
+msgid "Reset all color adjustments to original"
 msgstr ""
 
-#: src/searches/SearchBoolean.vala:162
-msgid "File name"
+#: src/editing_tools/EditingTools.vala:3245
+msgid "Temperature"
 msgstr ""
 
-#: src/searches/SearchBoolean.vala:165
-msgid "Face"
+#: src/editing_tools/EditingTools.vala:3258
+msgid "Tint"
 msgstr ""
 
-#: src/searches/SearchBoolean.vala:168
-msgid "Media type"
+#: src/editing_tools/EditingTools.vala:3271
+msgid "Saturation"
 msgstr ""
 
-#: src/searches/SearchBoolean.vala:171
-msgid "Flag state"
+#: src/editing_tools/EditingTools.vala:3284
+msgid "Exposure"
 msgstr ""
 
-#: src/searches/SearchBoolean.vala:174 src/SearchFilter.vala:944
-msgid "Rating"
+#: src/editing_tools/EditingTools.vala:3297
+msgid "Shadows"
 msgstr ""
 
-#: src/searches/SearchBoolean.vala:177
-msgid "Date"
+#: src/editing_tools/EditingTools.vala:3307
+msgid "Contrast Expansion"
 msgstr ""
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
+#: src/editing_tools/StraightenTool.vala:28
+msgid "Angle:"
 msgstr ""
 
-#: src/Photo.vala:3081
-msgid "modified"
+#: src/Page.vala:1262
+msgid "No photos/videos"
 msgstr ""
 
-#: src/SearchFilter.vala:641 src/SearchFilter.vala:642
-msgid "Photos"
+#: src/Page.vala:1266
+msgid "No photos/videos found"
 msgstr ""
 
-#: src/SearchFilter.vala:647 src/SearchFilter.vala:648
-msgid "Videos"
+#: src/Page.vala:2552
+msgid "Photos cannot be exported to this directory."
 msgstr ""
 
-#: src/SearchFilter.vala:653
-msgid "RAW Photos"
+#: src/Exporter.vala:232
+#, c-format
+msgid "Unable to generate a temporary file for %s: %s"
 msgstr ""
 
-#: src/SearchFilter.vala:654
-msgid "RAW photos"
+#: src/Exporter.vala:299
+msgid "Exporting"
 msgstr ""
 
-#: src/SearchFilter.vala:900
+#: src/Exporter.vala:317
 #, c-format
-msgid "Error loading UI file %s: %s"
+msgid "File %s already exists.  Replace?"
 msgstr ""
 
-#: src/SearchFilter.vala:917
-msgid "Type"
+#: src/Exporter.vala:319
+msgid "_Skip"
 msgstr ""
 
-#: src/Event.vala:708
-#, c-format
-msgid "Event %s"
+#: src/Exporter.vala:319
+msgid "_Replace"
 msgstr ""
 
-#: src/DirectoryMonitor.vala:879
-#, c-format
-msgid "Unable to monitor %s: Not a directory (%s)"
+#: src/Exporter.vala:319
+msgid "Replace _All"
 msgstr ""
 
-#: src/Properties.vala:38
-msgid "%I:%M %p"
+#: src/Exporter.vala:319
+msgid "Export"
 msgstr ""
 
-#: src/Properties.vala:50
-msgid "Today"
+#: src/data_imports/DataImportsUI.vala:10
+msgid ""
+"You do not have any data imports plugins enabled.\n"
+"\n"
+"In order to use the Import From Application functionality, you need to have "
+"at least one data imports plugin enabled. Plugins can be enabled in the "
+"Preferences dialog."
 msgstr ""
 
-#: src/Properties.vala:52
-msgid "Yesterday"
+#: src/data_imports/DataImportsUI.vala:100
+msgid "Database file:"
 msgstr ""
 
-#: src/Properties.vala:292
-msgid "Items:"
+#: src/data_imports/DataImportsUI.vala:216
+msgid "Import From Application"
+msgstr ""
+
+#: src/data_imports/DataImportsUI.vala:217
+msgid "Import media _from:"
 msgstr ""
 
-#: src/Properties.vala:295
+#: src/data_imports/DataImportsPluginHost.vala:65
+#: src/data_imports/DataImportsPluginHost.vala:78
 #, c-format
-msgid "%d Event"
-msgid_plural "%d Events"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%s Database"
+msgstr ""
 
-#: src/Properties.vala:326
-msgid "Date:"
+#: src/data_imports/DataImportsPluginHost.vala:148
+#: src/data_imports/DataImportsPluginHost.vala:294
+#, c-format
+msgid "Importing from %s can't continue because an error occurred:"
 msgstr ""
 
-#: src/Properties.vala:330
-msgid "Time:"
+#: src/data_imports/DataImportsPluginHost.vala:151
+msgid ""
+"To try importing from another service, select one from the above menu."
 msgstr ""
 
-#: src/Properties.vala:333 src/Properties.vala:338
-msgid "From:"
+#: src/data_imports/DataImports.vala:22
+msgid "Data Imports"
 msgstr ""
 
-#: src/Properties.vala:334 src/Properties.vala:339
-msgid "To:"
+#: plugins/common/RESTSupport.vala:427
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1263
+msgid "A temporary file needed for publishing is unavailable"
 msgstr ""
 
-#: src/Properties.vala:353
-msgid "Duration:"
+#: plugins/shotwell-publishing/shotwell-publishing.vala:25
+msgid "Core Publishing Services"
 msgstr ""
 
-#: src/Properties.vala:353
-#, c-format
-msgid "%.1f seconds"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:61
+msgid ""
+"You are not currently logged into Flickr.\n"
+"\n"
+"Click Login to log into Flickr in your Web browser.  You will have to "
+"authorize Shotwell Connect to link to your Flickr account."
 msgstr ""
 
-#: src/Properties.vala:357
-msgid "Developer:"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:63
+msgid ""
+"You have already logged in and out of Flickr during this Shotwell session.\n"
+"To continue publishing to Flickr, quit and restart Shotwell, then try "
+"publishing again."
 msgstr ""
 
-#: src/Properties.vala:480
-msgid "Location:"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:367
+msgid "Preparing for login..."
 msgstr ""
 
-#: src/Properties.vala:482
-msgid "File size:"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:437
+msgid "Verifying authorization..."
 msgstr ""
 
-#: src/Properties.vala:485
-msgid "Original dimensions:"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+msgid ""
+"Enter the confirmation number which appears after you log into Flickr in "
+"your Web browser."
 msgstr ""
 
-#: src/Properties.vala:488
-msgid "Camera make:"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:690
+msgid "Authorization _Number:"
 msgstr ""
 
-#: src/Properties.vala:491
-msgid "Camera model:"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1109
+#, c-format
+msgid ""
+"You are logged into Flickr as %s.\n"
+"\n"
+msgstr ""
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1111
+#, c-format
+msgid ""
+"Your free Flickr account limits how much data you can upload per month.\n"
+"This month, you have %d megabytes remaining in your upload quota."
 msgstr ""
 
-#: src/Properties.vala:494
-msgid "Flash:"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1113
+msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr ""
 
-#: src/Properties.vala:496
-msgid "Focal length:"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1126
+msgid "Photos _visible to:"
 msgstr ""
 
-#: src/Properties.vala:499
-msgid "Exposure bias:"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1128
+msgid "Videos _visible to:"
 msgstr ""
 
-#: src/Properties.vala:501
-msgid "GPS latitude:"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1131
+msgid "Photos and videos _visible to:"
 msgstr ""
 
-#: src/Properties.vala:504
-msgid "GPS longitude:"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1134
+msgid "Photo _size:"
 msgstr ""
 
-#: src/Properties.vala:507
-msgid "Artist:"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1652
+#: plugins/shotwell-publishing/PicasaPublishing.vala:1134
+#: plugins/shotwell-publishing/YouTubePublishing.vala:1000
+msgid "_Logout"
 msgstr ""
 
-#: src/Properties.vala:509
-msgid "Copyright:"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1168
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1650
+#: plugins/shotwell-publishing/PicasaPublishing.vala:1141
+#: plugins/shotwell-publishing/YouTubePublishing.vala:1007
+msgid "_Publish"
 msgstr ""
 
-#: src/Properties.vala:511
-msgid "Software:"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1201
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1810
+msgid "Everyone"
 msgstr ""
 
-#: src/Properties.vala:520
-msgid "Extended Information"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1202
+msgid "Friends & family only"
 msgstr ""
 
-#: src/Dimensions.vala:17
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1137
-msgid "Original size"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1203
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1807
+msgid "Just me"
 msgstr ""
 
-#: src/Dimensions.vala:20
-msgid "Width or height"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1225
+msgid "500 x 375 pixels"
 msgstr ""
 
-#: src/Dimensions.vala:23
-msgid "Width"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1226
+msgid "1024 x 768 pixels"
 msgstr ""
 
-#: src/Dimensions.vala:26
-msgid "Height"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1227
+msgid "2048 x 1536 pixels"
 msgstr ""
 
-#: plugins/common/RESTSupport.vala:423
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1349
-msgid "A temporary file needed for publishing is unavailable"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1228
+msgid "4096 x 3072 pixels"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:64
+#: plugins/shotwell-publishing/FacebookPublishing.vala:63
 #: plugins/shotwell-publishing/PicasaPublishing.vala:59
 msgid "Shotwell Connect"
 msgstr ""
@@ -3361,370 +3503,343 @@
 "publishing again."
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:135
+#: plugins/shotwell-publishing/FacebookPublishing.vala:134
 msgid "Standard (720 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:138
+#: plugins/shotwell-publishing/FacebookPublishing.vala:137
 msgid "Large (2048 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:272
+#: plugins/shotwell-publishing/FacebookPublishing.vala:260
 msgid "Testing connection to Facebook..."
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:465
+#: plugins/shotwell-publishing/FacebookPublishing.vala:453
 #: plugins/shotwell-publishing/PicasaPublishing.vala:512
 msgid "Creating album..."
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1619
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1545
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
 "\n"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1620
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1546
 msgid "Where would you like to publish the selected photos?"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1621
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1547
 msgid "Upload _size:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1690
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1608
 msgid "Publish to an e_xisting album:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1693
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1611
 msgid "Create a _new album named:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1709
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1635
 msgid "Videos and new photo albums _visible to:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1724
-#: plugins/shotwell-publishing/YouTubePublishing.vala:1036
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1071
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1173
-msgid "_Publish"
-msgstr ""
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1726
-#: plugins/shotwell-publishing/YouTubePublishing.vala:1026
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1067
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1163
-msgid "_Logout"
-msgstr ""
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1890
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1111
-msgid "Just me"
-msgstr ""
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1891
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1808
 msgid "All friends"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1892
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1809
 msgid "Friends of friends"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1893
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1109
-msgid "Everyone"
-msgstr ""
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:57
+#: plugins/shotwell-publishing/PicasaPublishing.vala:58
 msgid ""
-"You are not currently logged into YouTube.\n"
+"You are not currently logged into Picasa Web Albums.\n"
 "\n"
 "You must have already signed up for a Google account and set it up for use "
-"with YouTube to continue. You can set up most accounts by using your browser "
-"to log into the YouTube site at least once."
+"with Picasa to continue. You can set up most accounts by using your browser "
+"to log into the Picasa Web Albums site at least once."
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:758
+#: plugins/shotwell-publishing/PicasaPublishing.vala:826
 msgid ""
-"Enter the email address and password associated with your YouTube account."
+"Enter the email address and password associated with your Picasa Web Albums "
+"account."
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:759
+#: plugins/shotwell-publishing/PicasaPublishing.vala:827
 msgid ""
-"YouTube didn't recognize the email address and password you entered. To try "
-"again, re-enter your email address and password below."
+"Picasa Web Albums didn't recognize the email address and password you "
+"entered. To try again, re-enter your email address and password below."
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:760
+#: plugins/shotwell-publishing/PicasaPublishing.vala:828
 msgid ""
 "The email address and password you entered correspond to a Google account "
-"that isn't set up for use with YouTube. You can set up most accounts by "
-"using your browser to log into the YouTube site at least once. To try again, "
-"re-enter your email address and password below."
+"that isn't set up for use with Picasa Web Albums. You can set up most "
+"accounts by using your browser to log into the Picasa Web Albums site at "
+"least once. To try again, re-enter your email address and password below."
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:761
+#: plugins/shotwell-publishing/PicasaPublishing.vala:829
 msgid ""
 "The email address and password you entered correspond to a Google account "
 "that has been tagged as requiring additional security. You can clear this "
-"tag by using your browser to log into YouTube. To try again, re-enter your "
-"email address and password below."
+"tag by using your browser to log into Picasa Web Albums. To try again, re-"
+"enter your email address and password below."
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:800
-#: plugins/shotwell-publishing/PicasaPublishing.vala:869
+#: plugins/shotwell-publishing/PicasaPublishing.vala:864
+#: plugins/shotwell-publishing/YouTubePublishing.vala:795
 #, c-format
 msgid "Unrecognized User"
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:804
-#: plugins/shotwell-publishing/PicasaPublishing.vala:873
+#: plugins/shotwell-publishing/PicasaPublishing.vala:868
 #, c-format
 msgid "Account Not Ready"
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:813
-#: plugins/shotwell-publishing/PicasaPublishing.vala:882
+#: plugins/shotwell-publishing/PicasaPublishing.vala:874
 #, c-format
 msgid "Additional Security Required"
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:824
-#: plugins/shotwell-publishing/PicasaPublishing.vala:893
+#: plugins/shotwell-publishing/PicasaPublishing.vala:882
+#: plugins/shotwell-publishing/YouTubePublishing.vala:813
 msgid "_Email address:"
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:826
-#: plugins/shotwell-publishing/PicasaPublishing.vala:895
+#: plugins/shotwell-publishing/PicasaPublishing.vala:884
+#: plugins/shotwell-publishing/YouTubePublishing.vala:815
 msgid "_Password:"
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:846
-#: plugins/shotwell-publishing/PicasaPublishing.vala:915
+#: plugins/shotwell-publishing/PicasaPublishing.vala:904
+#: plugins/shotwell-publishing/YouTubePublishing.vala:835
 msgid "Go _Back"
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:971
+#: plugins/shotwell-publishing/PicasaPublishing.vala:1035
 #, c-format
-msgid "You are logged into YouTube as %s."
+msgid "You are logged into Picasa Web Albums as %s."
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:976
-#, c-format
-msgid "Videos will appear in '%s'"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:1051
+msgid "Videos will appear in:"
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:999
-msgid "Video privacy _setting:"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:1053
+msgid "Photos will appear in:"
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:1076
-msgid "Public listed"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:1064
+msgid "An _existing album:"
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:1077
-msgid "Public unlisted"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:1078
+msgid "A _new album named:"
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:1078
-msgid "Private"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:1090
+msgid "L_ist album in public gallery"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:59
-msgid ""
-"You are not currently logged into Flickr.\n"
-"\n"
-"You must have already signed up for a Flickr account to complete the login "
-"process. During login you will have to specifically authorize Shotwell "
-"Connect to link to your Flickr account."
+#: plugins/shotwell-publishing/PicasaPublishing.vala:1105
+msgid "Photo _size preset:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:61
-msgid ""
-"You have already logged in and out of Flickr during this Shotwell session.\n"
-"To continue publishing to Flickr, quit and restart Shotwell, then try "
-"publishing again."
+#: plugins/shotwell-publishing/PicasaPublishing.vala:1212
+msgid "Small (640 x 480 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:350
-msgid "Preparing to login..."
+#: plugins/shotwell-publishing/PicasaPublishing.vala:1213
+msgid "Medium (1024 x 768 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:998
-#, c-format
-msgid ""
-"You are logged into Flickr as %s.\n"
-"\n"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:1214
+msgid "Recommended (1600 x 1200 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1000
-#, c-format
+#: plugins/shotwell-publishing/YouTubePublishing.vala:57
 msgid ""
-"Your free Flickr account limits how much data you can upload per month.\n"
-"This month, you have %d megabytes remaining in your upload quota."
-msgstr ""
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1002
-msgid "Your Flickr Pro account entitles you to unlimited uploads."
-msgstr ""
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1027
-msgid "Photos _visible to:"
-msgstr ""
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1029
-msgid "Videos _visible to:"
-msgstr ""
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1031
-msgid "Photos and videos _visible to:"
+"You are not currently logged into YouTube.\n"
+"\n"
+"You must have already signed up for a Google account and set it up for use "
+"with YouTube to continue. You can set up most accounts by using your browser "
+"to log into the YouTube site at least once."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1034
-msgid "Photo _size:"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:758
+msgid ""
+"Enter the email address and password associated with your YouTube account."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1110
-msgid "Friends & family only"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:759
+msgid ""
+"YouTube didn't recognize the email address and password you entered. To try "
+"again, re-enter your email address and password below."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1133
-msgid "500 x 375 pixels"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:760
+msgid ""
+"The email address and password you entered correspond to a Google account "
+"that isn't set up for use with YouTube. You can set up most accounts by "
+"using your browser to log into the YouTube site at least once. To try again, "
+"re-enter your email address and password below."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1134
-msgid "1024 x 768 pixels"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:761
+#: plugins/shotwell-publishing/YouTubePublishing.vala:805
+#, c-format
+msgid ""
+"The email address and password you entered correspond to a Google account "
+"that has been tagged as requiring additional security. You can clear this "
+"tag by using your browser to log into YouTube. To try again, re-enter your "
+"email address and password below."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1135
-msgid "2048 x 1536 pixels"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:799
+#, c-format
+msgid ""
+"The email address and password you entered correspond to a Google account "
+"that isn't set up for use with YouTube. You can set up most accounts by "
+"using your browser to log into YouTube and then uploading any video. To try "
+"again, re-enter your email address and password below."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1136
-msgid "4096 x 3072 pixels"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:956
+#, c-format
+msgid "You are logged into YouTube as %s."
 msgstr ""
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:25
-msgid "Core Publishing Services"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:961
+#, c-format
+msgid "Videos will appear in '%s'"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:58
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"You must have already signed up for a Google account and set it up for use "
-"with Picasa to continue. You can set up most accounts by using your browser "
-"to log into the Picasa Web Albums site at least once."
+#: plugins/shotwell-publishing/YouTubePublishing.vala:975
+msgid "Video privacy _setting:"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:826
-msgid ""
-"Enter the email address and password associated with your Picasa Web Albums "
-"account."
+#: plugins/shotwell-publishing/YouTubePublishing.vala:1043
+msgid "Public listed"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:827
-msgid ""
-"Picasa Web Albums didn't recognize the email address and password you "
-"entered. To try again, re-enter your email address and password below."
+#: plugins/shotwell-publishing/YouTubePublishing.vala:1044
+msgid "Public unlisted"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:828
-msgid ""
-"The email address and password you entered correspond to a Google account "
-"that isn't set up for use with Picasa Web Albums. You can set up most "
-"accounts by using your browser to log into the Picasa Web Albums site at "
-"least once. To try again, re-enter your email address and password below."
+#: plugins/shotwell-publishing/YouTubePublishing.vala:1045
+msgid "Private"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:829
-msgid ""
-"The email address and password you entered correspond to a Google account "
-"that has been tagged as requiring additional security. You can clear this "
-"tag by using your browser to log into Picasa Web Albums. To try again, re-"
-"enter your email address and password below."
+#: plugins/shotwell-transitions/SlideEffect.vala:20
+msgid "Slide"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1050
-#, c-format
-msgid "You are logged into Picasa Web Albums as %s."
+#: plugins/shotwell-transitions/shotwell-transitions.vala:21
+msgid "Core Slideshow Transitions"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1072
-msgid "Videos will appear in:"
+#: plugins/shotwell-transitions/shotwell-transitions.vala:68
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2012 Yorba Foundation"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1074
-msgid "Photos will appear in:"
+#: plugins/shotwell-transitions/CrumbleEffect.vala:20
+msgid "Crumble"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1088
-msgid "An _existing album:"
+#: plugins/shotwell-transitions/FadeEffect.vala:20
+msgid "Fade"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1102
-msgid "A _new album named:"
+#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
+msgid "Core Data Import Services"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1114
-msgid "L_ist album in public gallery"
+#: plugins/shotwell-data-imports/FSpotImporter.vala:56
+msgid ""
+"Welcome to the F-Spot library import service.\n"
+"\n"
+"Please select a library to import, either by selecting one of the existing "
+"libraries found by Shotwell or by selecting an alternative F-Spot database "
+"file."
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1132
-msgid "Photo _size preset:"
+#: plugins/shotwell-data-imports/FSpotImporter.vala:58
+msgid ""
+"Welcome to the F-Spot library import service.\n"
+"\n"
+"Please select an F-Spot database file."
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1247
-msgid "Small (640 x 480 pixels)"
+#: plugins/shotwell-data-imports/FSpotImporter.vala:60
+msgid "Manually select an F-Spot database file to import:"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1248
-msgid "Medium (1024 x 768 pixels)"
+#: plugins/shotwell-data-imports/FSpotImporter.vala:62
+msgid ""
+"Cannot open the selected F-Spot database file: the file does not exist or is "
+"not an F-Spot database"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1249
-msgid "Recommended (1600 x 1200 pixels)"
+#: plugins/shotwell-data-imports/FSpotImporter.vala:64
+msgid ""
+"Cannot open the selected F-Spot database file: this version of the F-Spot "
+"database is not supported by Shotwell"
 msgstr ""
 
-#: plugins/shotwell-transitions/shotwell-transitions.vala:21
-msgid "Core Slideshow Transitions"
+#: plugins/shotwell-data-imports/FSpotImporter.vala:66
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading tags table"
 msgstr ""
 
-#: plugins/shotwell-transitions/shotwell-transitions.vala:68
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2012 Yorba Foundation"
+#: plugins/shotwell-data-imports/FSpotImporter.vala:68
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading photos "
+"table"
 msgstr ""
 
-#: plugins/shotwell-transitions/SlideEffect.vala:20
-msgid "Slide"
+#: plugins/shotwell-data-imports/FSpotImporter.vala:70
+#, c-format
+msgid ""
+"Shotwell has found %d photos in the F-Spot library and is currently "
+"importing them. Duplicates will be automatically detected and removed.\n"
+"\n"
+"You can close this dialog and start using Shotwell while the import is "
+"taking place in the background."
 msgstr ""
 
-#: plugins/shotwell-transitions/FadeEffect.vala:20
-msgid "Fade"
+#: plugins/shotwell-data-imports/FSpotImporter.vala:84
+#, c-format
+msgid "F-Spot library: %s"
 msgstr ""
 
-#: plugins/shotwell-transitions/CrumbleEffect.vala:20
-msgid "Crumble"
+#: plugins/shotwell-data-imports/FSpotImporter.vala:416
+msgid "Preparation to import"
 msgstr ""
 
-#: ui/set_background_dialog.glade:8
+#: ui/set_background_dialog.glade:14
 msgid "Set as Desktop Slideshow"
 msgstr ""
 
-#: ui/set_background_dialog.glade:23
+#: ui/set_background_dialog.glade:29
 msgid "Show each photo for"
 msgstr ""
 
-#: ui/set_background_dialog.glade:33
+#: ui/set_background_dialog.glade:39
 msgid "period of time"
 msgstr ""
 
-#: ui/set_background_dialog.glade:52
+#: ui/set_background_dialog.glade:58
 msgid "How long each photo is shown on the desktop background"
 msgstr ""
 
-#: ui/set_background_dialog.glade:88
+#: ui/set_background_dialog.glade:94
 msgid "Generate desktop background slideshow"
 msgstr ""
 
@@ -3744,90 +3859,82 @@
 msgid "of the following:"
 msgstr ""
 
-#: ui/shotwell.glade:289
-msgid "Preparing pictures for import..."
-msgstr ""
-
-#: ui/shotwell.glade:326
-msgid "error"
-msgstr ""
-
-#: ui/shotwell.glade:480
+#: ui/shotwell.glade:269
 msgid "Shotwell Preferences"
 msgstr ""
 
-#: ui/shotwell.glade:557
+#: ui/shotwell.glade:346
 msgid "white"
 msgstr ""
 
-#: ui/shotwell.glade:584
+#: ui/shotwell.glade:373
 msgid "black"
 msgstr ""
 
-#: ui/shotwell.glade:632
+#: ui/shotwell.glade:421
 msgid "_Watch library directory for new files"
 msgstr ""
 
-#: ui/shotwell.glade:661
+#: ui/shotwell.glade:450
 msgid "Metadata"
 msgstr ""
 
-#: ui/shotwell.glade:681
+#: ui/shotwell.glade:470
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr ""
 
-#: ui/shotwell.glade:707
+#: ui/shotwell.glade:496
 msgid "Display"
 msgstr ""
 
-#: ui/shotwell.glade:728
+#: ui/shotwell.glade:517
 msgid "_Import photos to:"
 msgstr ""
 
-#: ui/shotwell.glade:751
+#: ui/shotwell.glade:540
 msgid "_Background:"
 msgstr ""
 
-#: ui/shotwell.glade:774
+#: ui/shotwell.glade:563
 msgid "Importing"
 msgstr ""
 
-#: ui/shotwell.glade:797
+#: ui/shotwell.glade:586
 msgid "_Directory structure:"
 msgstr ""
 
-#: ui/shotwell.glade:837
+#: ui/shotwell.glade:627
 msgid "_Pattern:"
 msgstr ""
 
-#: ui/shotwell.glade:920
+#: ui/shotwell.glade:710
 msgid "Example:"
 msgstr ""
 
-#: ui/shotwell.glade:937
+#: ui/shotwell.glade:727
 msgid "R_ename imported files to lowercase"
 msgstr ""
 
-#: ui/shotwell.glade:966
+#: ui/shotwell.glade:756
 msgid "RAW Developer"
 msgstr ""
 
-#: ui/shotwell.glade:1001
-msgid "_Default:"
+#: ui/shotwell.glade:791
+msgid "De_fault:"
 msgstr ""
 
-#: ui/shotwell.glade:1054
+#: ui/shotwell.glade:844
 msgid "E_xternal photo editor:"
 msgstr ""
 
-#: ui/shotwell.glade:1070
+#: ui/shotwell.glade:860
 msgid "External _RAW editor:"
 msgstr ""
 
-#: ui/shotwell.glade:1134
+#: ui/shotwell.glade:924
 msgid "External Editors"
 msgstr ""
 
-#: ui/shotwell.glade:1161
+#: ui/shotwell.glade:951
 msgid "Plugins"
 msgstr ""
diff -Nru language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/simple-scan.po language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/simple-scan.po
--- language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/simple-scan.po	2012-03-23 07:44:14.000000000 +0000
+++ language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/simple-scan.po	2012-04-18 09:08:42.000000000 +0000
@@ -7,411 +7,411 @@
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-03 11:34+0000\n"
+"POT-Creation-Date: 2012-04-12 15:39+0000\n"
 "PO-Revision-Date: 2010-07-09 17:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swahili <sw@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:08+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 03:33+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Simple Scan"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Waraka"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr ""
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Kurasa _Moja"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr ""
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Nyuma"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
+msgid "_Stop Scan"
 msgstr ""
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Punguza kurasa iliyochaguliwa"
+msgid "Text"
+msgstr "Maandiko"
 
-#. Combo box label for scanning the front side of a page
+#. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Mbele"
+msgid "Photo"
+msgstr "Picha"
 
-#. Combo box label for scanning both sides of a page
+#. Label on email menu item
 #: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Mbele na Nyuma"
+msgid "_Email"
+msgstr "_Barua Pepe"
 
-#. Radio button for cropping to page to US legal size
+#. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr ""
+msgid "_Page"
+msgstr "_Kurasa"
 
-#. Menu item to move the selected page to the left
+#. Menu item to rotate page to left (anti-clockwise)
 #: ../data/simple-scan.ui.h:22
-msgid "Move Left"
-msgstr ""
+msgid "Rotate _Left"
+msgstr "Zungusha Ku_shoto"
 
-#. Menu item to move the selected page to the right
+#. Menu item to rotate page to right (clockwise)
 #: ../data/simple-scan.ui.h:24
-msgid "Move Right"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:25
-msgid "New"
-msgstr "Mpya"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:27
-msgid "Page Size:"
-msgstr "Kipimo cha Kurasa"
+msgid "Rotate _Right"
+msgstr "Zungusha Ku_lia"
 
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:29
-msgid "Photo"
-msgstr "Picha"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Punguza"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:31
-msgid "Preferences"
-msgstr "Mapendekezo"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Hakuna"
 
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:33
-msgid "Rotate Left"
-msgstr "Zungusha Kushoto"
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:35
-msgid "Rotate Right"
-msgstr "Zungusha Kulia"
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
 
-#. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate _Left"
-msgstr "Zungusha Ku_shoto"
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
 
-#. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate _Right"
-msgstr "Zungusha Ku_lia"
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Barua"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:41
-msgid "Rotate the page to the left (counter-clockwise)"
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
 msgstr ""
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:43
-msgid "Rotate the page to the right (clockwise)"
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
 msgstr ""
 
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Save"
-msgstr "Hifadhi"
+msgid "_Rotate Crop"
+msgstr "_Zungusha Sehemu ya Kupunguzwa"
 
-#. Tooltip for save toolbar button
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Save document to a file"
-msgstr "Hifadhi waraka hii kwa faili"
+msgid "Move Left"
+msgstr ""
 
-#. Scan menu item
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Sc_an"
+msgid "Move Right"
 msgstr ""
 
-#. Label on scan toolbar item
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan"
-msgstr ""
+msgid "_Help"
+msgstr "_Usaidizi"
 
-#. Label beside scan source combo box
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan S_ource:"
-msgstr ""
+msgid "_Contents"
+msgstr "_Yaliomo"
 
-#. Label beside scan side combo box
+#. Tooltip for new document button
 #: ../data/simple-scan.ui.h:54
-msgid "Scan Side:"
-msgstr ""
+msgid "Start a new document"
+msgstr "Anzisha waraka mpya"
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Mpya"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:57
 msgid "Scan a single page from the scanner"
 msgstr ""
 
-#. Title of scan window
-#: ../data/simple-scan.ui.h:58 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Simple Scan"
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr ""
 
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:60
-msgid "Single _Page"
-msgstr "Kurasa _Moja"
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Hifadhi waraka hii kwa faili"
 
-#. Tooltip for new document button
 #: ../data/simple-scan.ui.h:62
-msgid "Start a new document"
-msgstr "Anzisha waraka mpya"
-
-#: ../data/simple-scan.ui.h:63
-msgid "Stop"
-msgstr "Simamisha"
+msgid "Save"
+msgstr "Hifadhi"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Simamisha hii uchuji"
 
-#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr "Simamisha"
+
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "Text"
-msgstr "Maandiko"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr ""
 
-#. Button to submit authorization dialog
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Authorize"
-msgstr ""
+msgid "Rotate Left"
+msgstr "Zungusha Kushoto"
 
-#. Help|Contents menu
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Contents"
-msgstr "_Yaliomo"
+msgid "Rotate the page to the right (clockwise)"
+msgstr ""
 
-#. Label for page crop submenu
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Crop"
-msgstr "_Punguza"
+msgid "Rotate Right"
+msgstr "Zungusha Kulia"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Punguza kurasa iliyochaguliwa"
 
-#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:75
-msgid "_Custom"
+msgid "Crop"
 msgstr ""
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Document"
-msgstr "_Waraka"
+msgid "_Username for resource:"
+msgstr ""
 
-#. Label on email menu item
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Email"
-msgstr "_Barua Pepe"
+msgid "_Password:"
+msgstr "_Nywila:"
 
-#. Label on help menu
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_Help"
-msgstr "_Usaidizi"
+msgid "_Authorize"
+msgstr ""
 
-#. Radio button for cropping page to US letter size
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Letter"
-msgstr "_Barua"
+msgid "Preferences"
+msgstr "Mapendekezo"
 
-#. Radio button for no crop
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_None"
-msgstr "_Hakuna"
+msgid "Scan S_ource:"
+msgstr ""
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Page"
-msgstr "_Kurasa"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:89
-msgid "_Password:"
-msgstr "_Nywila:"
+msgid "_Text Resolution:"
+msgstr "ya _Maandishi"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:89
 msgid "_Photo Resolution:"
 msgstr "Rezolusheni ya _Picha"
 
-#. Menu item to rotate the crop area
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr ""
+
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Rotate Crop"
-msgstr "_Zungusha Sehemu ya Kupunguzwa"
+msgid "Page Size:"
+msgstr "Kipimo cha Kurasa"
 
-#. Menu entry to stop current scan
+#. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:95
-msgid "_Stop Scan"
-msgstr ""
+msgid "Front and Back"
+msgstr "Mbele na Nyuma"
 
-#. Label beside scan source combo box
+#. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:97
-msgid "_Text Resolution:"
-msgstr "ya _Maandishi"
+msgid "Front"
+msgstr "Mbele"
 
-#. Label beside username entry
+#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:99
-msgid "_Username for resource:"
-msgstr ""
+msgid "Back"
+msgstr "Nyuma"
 
-#: ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
+msgid "Window width in pixels"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Direction of scan"
+msgid "Window height in pixels"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Directory to save files to"
-msgstr "Mahala pa kuhifadhi waraka"
+msgid "TRUE if the application window is maximized"
+msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid "Height of paper in tenths of a mm"
+msgid "Device to scan from"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr ""
+msgid "SANE device to acquire images from."
+msgstr "Chombo cha SANE ambacho utatumia kupata picha"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid "Page side to scan"
-msgstr ""
+msgid "Type of document being scanned"
+msgstr "Aina ya waraka inayochujwa"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Resolution for photo scans"
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Resolution for text scans"
+msgid "Direction of scan"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Rezolusheni ya picha iliyochujwa mwisho"
+msgid "The direction of the scanner across the scanned page."
+msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "SANE device to acquire images from."
-msgstr "Chombo cha SANE ambacho utatumia kupata picha"
+msgid "Width of scanned image in pixels"
+msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "TRUE if the application window is maximized"
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The direction of the scanner across the scanned page."
+msgid "Height of scanned image in pixels"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
+msgid "Width of paper in tenths of a mm"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The page side to scan."
+msgid "Height of paper in tenths of a mm"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "The resolution in dots-per-inch of the previously scanned image."
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
+msgid "Resolution of last scanned image"
+msgstr "Rezolusheni ya picha iliyochujwa mwisho"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "The resolution in dots-per-inch to use when scanning text."
+msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
+msgid "Resolution for text scans"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Type of document being scanned"
-msgstr "Aina ya waraka inayochujwa"
+msgid "Resolution for photo scans"
+msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
-msgid "Width of paper in tenths of a mm"
+msgid "Page side to scan"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
-msgid "Width of scanned image in pixels"
+msgid "The page side to scan."
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
-msgid "Window height in pixels"
-msgstr ""
+msgid "Directory to save files to"
+msgstr "Mahala pa kuhifadhi waraka"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
-msgid "Window width in pixels"
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:773
+#: ../src/scanner.vala:776
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:802
+#: ../src/scanner.vala:805
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1101
+#: ../src/scanner.vala:1104
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1114 ../src/scanner.vala:1214
+#: ../src/scanner.vala:1117 ../src/scanner.vala:1217
 msgid "Error communicating with scanner"
 msgstr ""
 
@@ -526,22 +526,22 @@
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:809
+#: ../src/ui.vala:810
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:821
+#: ../src/ui.vala:822
 msgid "Unable to open image preview application"
 msgstr "Siwezi kuanzisha programu ya kuonyesha picha"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1058
+#: ../src/ui.vala:1059
 msgid "Unable to open help file"
 msgstr "Siwezi  kufunguaf faili ya msaada"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1069
+#: ../src/ui.vala:1070
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -558,69 +558,69 @@
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1072
+#: ../src/ui.vala:1073
 msgid "About Simple Scan"
 msgstr "Kuhusu Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1075
+#: ../src/ui.vala:1076
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1084
+#: ../src/ui.vala:1085
 msgid "translator-credits"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1095
+#: ../src/ui.vala:1096
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1097
+#: ../src/ui.vala:1098
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1219
+#: ../src/ui.vala:1220
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (kawaida)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1223
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rezolushen rasimu)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1226
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (rezolushen ya hali ya juu)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1229
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1263
+#: ../src/ui.vala:1264
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1265
+#: ../src/ui.vala:1266
 msgid "Please check your installation"
 msgstr "Tafadhali kagua usakinishaji yako"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1327
+#: ../src/ui.vala:1328
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1334
 msgid "Automatic"
 msgstr ""
diff -Nru language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/software-center.po language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/software-center.po
--- language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/software-center.po	2012-03-23 07:44:14.000000000 +0000
+++ language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/software-center.po	2012-04-18 09:08:42.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: software-center\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-20 19:36+0000\n"
+"POT-Creation-Date: 2012-04-13 18:18+0000\n"
 "PO-Revision-Date: 2012-03-10 18:34+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Swahili <sw@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:03+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 03:29+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: ../data/ubuntu-software-center.desktop.in.h:1
 #: ../softwarecenter/distro/Ubuntu.py:74
@@ -34,6 +34,11 @@
 msgid "Lets you choose from thousands of applications available for Ubuntu"
 msgstr ""
 
+#: ../data/ubuntu-software-center.desktop.in.h:4
+#: ../data/unbranded-software-center.desktop.in.h:3
+msgid "Sources;PPA;Install;Uninstall;Remove;Purchase;Catalogue;Store;"
+msgstr ""
+
 #: ../data/unbranded-software-center.desktop.in.h:2
 msgid ""
 "Lets you choose from thousands of applications available for your system "
@@ -273,7 +278,7 @@
 msgstr ""
 
 #: ../data/software-center.menu.in.h:57
-#: ../softwarecenter/ui/gtk3/models/appstore2.py:260
+#: ../softwarecenter/ui/gtk3/models/appstore2.py:267
 msgid "System"
 msgstr ""
 
@@ -293,7 +298,7 @@
 #: ../softwarecenter/distro/Ubuntu.py:126
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:1480
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:1484
-#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:2030
+#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:2033
 msgid "Unknown"
 msgstr ""
 
@@ -316,7 +321,7 @@
 msgstr ""
 
 #: ../softwarecenter/backend/channel.py:322
-#: ../softwarecenter/ui/gtk3/panes/availablepane.py:314
+#: ../softwarecenter/ui/gtk3/panes/availablepane.py:325
 #: ../softwarecenter/ui/gtk3/panes/viewswitcher.py:81
 msgid "All Software"
 msgstr ""
@@ -349,44 +354,45 @@
 "No-one else will be able to see what you have installed."
 msgstr ""
 
-#: ../softwarecenter/backend/installbackend_impl/aptd.py:781
+#: ../softwarecenter/backend/installbackend_impl/aptd.py:791
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:427
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:434
 msgid "Error"
 msgstr ""
 
-#: ../softwarecenter/backend/installbackend_impl/aptd.py:825
+#: ../softwarecenter/backend/installbackend_impl/aptd.py:835
 msgid "_Ignore and install"
 msgstr ""
 
-#: ../softwarecenter/backend/installbackend_impl/aptd.py:838
+#: ../softwarecenter/backend/installbackend_impl/aptd.py:849
+#: ../softwarecenter/backend/installbackend_impl/aptd.py:865
 #: ../data/ui/gtk3/dialogs.ui.h:2
 msgid "Repair"
 msgstr ""
 
 #: ../softwarecenter/db/application.py:227
 #: ../softwarecenter/db/application.py:349
-#: ../softwarecenter/db/application.py:502
-#: ../softwarecenter/db/application.py:536 ../softwarecenter/db/debfile.py:64
+#: ../softwarecenter/db/application.py:504
+#: ../softwarecenter/db/application.py:538 ../softwarecenter/db/debfile.py:64
 #: ../softwarecenter/db/debfile.py:70
 msgid "Not found"
 msgstr ""
 
 #: ../softwarecenter/db/application.py:229
 #: ../softwarecenter/db/application.py:351
-#: ../softwarecenter/db/application.py:504
-#: ../softwarecenter/db/application.py:538
+#: ../softwarecenter/db/application.py:506
+#: ../softwarecenter/db/application.py:540
 #, python-format
 msgid ""
 "There isn’t a software package called “%s” in your current software sources."
 msgstr ""
 
-#: ../softwarecenter/db/application.py:793
+#: ../softwarecenter/db/application.py:795
 #, python-format
 msgid "Version %s or later not available."
 msgstr ""
 
-#: ../softwarecenter/db/application.py:806
+#: ../softwarecenter/db/application.py:808
 #, python-format
 msgid "Available from the \"%s\" source."
 msgstr ""
@@ -394,16 +400,16 @@
 #. Translators: the visible string is constructed
 #. concatenating the following 3 strings like this:
 #. Available from the following sources: %s, ... %s, %s.
-#: ../softwarecenter/db/application.py:812
+#: ../softwarecenter/db/application.py:814
 msgid "Available from the following sources: "
 msgstr ""
 
-#: ../softwarecenter/db/application.py:815
+#: ../softwarecenter/db/application.py:817
 #, python-format
 msgid "\"%s\", "
 msgstr ""
 
-#: ../softwarecenter/db/application.py:816
+#: ../softwarecenter/db/application.py:818
 #, python-format
 msgid "\"%s\"."
 msgstr ""
@@ -415,12 +421,12 @@
 msgstr ""
 
 #: ../softwarecenter/db/categories.py:157
-#: ../softwarecenter/ui/gtk3/widgets/recommendations.py:149
+#: ../softwarecenter/ui/gtk3/widgets/recommendations.py:150
 msgid "Recommended For You"
 msgstr ""
 
 #: ../softwarecenter/db/categories.py:206
-#: ../softwarecenter/ui/gtk3/widgets/recommendations.py:247
+#: ../softwarecenter/ui/gtk3/widgets/recommendations.py:257
 msgid "People Also Installed"
 msgstr ""
 
@@ -507,37 +513,37 @@
 "modification."
 msgstr ""
 
-#: ../softwarecenter/distro/Debian.py:132
+#: ../softwarecenter/distro/Debian.py:130
 msgid "Debian does not provide critical updates."
 msgstr ""
 
-#: ../softwarecenter/distro/Debian.py:134
+#: ../softwarecenter/distro/Debian.py:132
 #, python-format
 msgid ""
 "Debian does not provide critical updates. Some updates may be provided by "
 "the developers of %s and redistributed by Debian."
 msgstr ""
 
-#: ../softwarecenter/distro/Debian.py:139
+#: ../softwarecenter/distro/Debian.py:137
 #, python-format
 msgid "Debian provides critical updates for %s."
 msgstr ""
 
-#: ../softwarecenter/distro/Debian.py:141
+#: ../softwarecenter/distro/Debian.py:139
 #, python-format
 msgid ""
 "Debian only provides updates for %s during a transition phase. Please "
 "consider upgrading to a later stable release of Debian."
 msgstr ""
 
-#: ../softwarecenter/distro/Debian.py:146
+#: ../softwarecenter/distro/Debian.py:144
 #, python-format
 msgid ""
 "Debian provides critical updates for %s. But updates could be delayed or "
 "skipped."
 msgstr ""
 
-#: ../softwarecenter/distro/Debian.py:149
+#: ../softwarecenter/distro/Debian.py:147
 #, python-format
 msgid "Debian does not provide critical updates for %s"
 msgstr ""
@@ -688,17 +694,17 @@
 "the Ubuntu community."
 msgstr ""
 
-#: ../softwarecenter/enums.py:29 ../softwarecenter/ui/gtk3/app.py:768
+#: ../softwarecenter/enums.py:29 ../softwarecenter/ui/gtk3/app.py:753
 msgid ""
 "To reinstall previous purchases, sign in to the Ubuntu Single Sign-On "
 "account you used to pay for them."
 msgstr ""
 
-#: ../softwarecenter/enums.py:129
+#: ../softwarecenter/enums.py:132
 msgid "Most helpful first"
 msgstr ""
 
-#: ../softwarecenter/enums.py:129
+#: ../softwarecenter/enums.py:132
 msgid "Newest first"
 msgstr ""
 
@@ -878,12 +884,12 @@
 msgstr[1] ""
 
 #. TRANSLATORS: this is a generic list delimit char, e.g. "foo, bar"
-#: ../softwarecenter/utils.py:772
+#: ../softwarecenter/utils.py:789
 msgid ", "
 msgstr ""
 
 #. TRANSLATORS: this is the last part of a list, e.g. "foo, bar and baz"
-#: ../softwarecenter/utils.py:774
+#: ../softwarecenter/utils.py:791
 #, python-format
 msgid "%s and %s"
 msgstr ""
@@ -958,7 +964,7 @@
 msgid "_New Applications in Launcher"
 msgstr ""
 
-#: ../data/ui/gtk3/SoftwareCenter.ui.h:18 ../softwarecenter/ui/gtk3/app.py:536
+#: ../data/ui/gtk3/SoftwareCenter.ui.h:18 ../softwarecenter/ui/gtk3/app.py:499
 msgid "Turn On Recommendations…"
 msgstr ""
 
@@ -971,7 +977,8 @@
 msgstr ""
 
 #: ../data/ui/gtk3/SoftwareCenter.ui.h:21
-msgid "Terms of Service"
+#: ../softwarecenter/ui/gtk3/dialogs/dialog_tos.py:38
+msgid "Terms of Use"
 msgstr ""
 
 #: ../data/ui/gtk3/SoftwareCenter.ui.h:22
@@ -1002,7 +1009,7 @@
 
 #: ../data/ui/gtk3/dialogs.ui.h:7
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:368
-#: ../softwarecenter/ui/gtk3/widgets/apptreeview.py:85
+#: ../softwarecenter/ui/gtk3/widgets/apptreeview.py:89
 msgid "Remove"
 msgstr ""
 
@@ -1112,18 +1119,18 @@
 msgid "The file “%s” could not be opened."
 msgstr ""
 
-#: ../softwarecenter/db/debfile.py:184
+#: ../softwarecenter/db/debfile.py:185
 msgid "Only install this file if you trust the origin."
 msgstr ""
 
-#: ../softwarecenter/db/debfile.py:189 ../softwarecenter/db/debfile.py:193
+#: ../softwarecenter/db/debfile.py:190 ../softwarecenter/db/debfile.py:194
 #, python-format
 msgid ""
 "Please install \"%s\" via your normal software channels. Only install this "
 "file if you trust the origin."
 msgstr ""
 
-#: ../softwarecenter/db/debfile.py:197
+#: ../softwarecenter/db/debfile.py:198
 #, python-format
 msgid ""
 "An older version of \"%s\" is available in your normal software channels. "
@@ -1138,24 +1145,24 @@
 msgid "Provided by openSUSE"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/app.py:243
+#: ../softwarecenter/ui/gtk3/app.py:215
 #: ../softwarecenter/ui/gtk3/dialogs/deauthorize_dialog.py:129
 msgid "Sorry, can not open the software database"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/app.py:244
+#: ../softwarecenter/ui/gtk3/app.py:216
 #: ../softwarecenter/ui/gtk3/dialogs/deauthorize_dialog.py:130
 msgid "Please re-install the 'software-center' package."
 msgstr ""
 
 #. TRANSLATORS: this is the help menuitem label,
 #. e.g. Ubuntu Software Center _Help
-#: ../softwarecenter/ui/gtk3/app.py:337
+#: ../softwarecenter/ui/gtk3/app.py:314
 #, python-format
 msgid "%s _Help"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/app.py:533
+#: ../softwarecenter/ui/gtk3/app.py:496
 msgid "Turn Off Recommendations"
 msgstr ""
 
@@ -1364,26 +1371,22 @@
 msgid "Deleting review…"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/dialogs/dialog_tos.py:37
-msgid "Terms of Use"
-msgstr ""
-
 #. buttons
-#: ../softwarecenter/ui/gtk3/dialogs/dialog_tos.py:39
+#: ../softwarecenter/ui/gtk3/dialogs/dialog_tos.py:40
 msgid "Decline"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/dialogs/dialog_tos.py:40
-#: ../softwarecenter/ui/gtk3/dialogs/dialog_tos.py:50
+#: ../softwarecenter/ui/gtk3/dialogs/dialog_tos.py:41
+#: ../softwarecenter/ui/gtk3/dialogs/dialog_tos.py:51
 msgid "Accept"
 msgstr ""
 
 #. label
-#: ../softwarecenter/ui/gtk3/dialogs/dialog_tos.py:42
+#: ../softwarecenter/ui/gtk3/dialogs/dialog_tos.py:43
 msgid "One moment, please…"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/dialogs/dialog_tos.py:78
+#: ../softwarecenter/ui/gtk3/dialogs/dialog_tos.py:79
 msgid "Do you accept these terms?"
 msgstr ""
 
@@ -1392,7 +1395,7 @@
 msgid "Dependency"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/models/appstore2.py:71
+#: ../softwarecenter/ui/gtk3/models/appstore2.py:75
 msgid "Uncategorized"
 msgstr ""
 
@@ -1410,22 +1413,22 @@
 msgid "Get Software"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/panes/availablepane.py:256
+#: ../softwarecenter/ui/gtk3/panes/availablepane.py:258
 msgid "Failure in the purchase process."
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/panes/availablepane.py:257
+#: ../softwarecenter/ui/gtk3/panes/availablepane.py:259
 msgid "Sorry, something went wrong. Your payment has been cancelled."
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/panes/availablepane.py:456
+#: ../softwarecenter/ui/gtk3/panes/availablepane.py:467
 #, python-format
 msgid "Install %(amount)s Item"
 msgid_plural "Install %(amount)s Items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../softwarecenter/ui/gtk3/panes/availablepane.py:657
+#: ../softwarecenter/ui/gtk3/panes/availablepane.py:675
 msgid "Previous Purchases"
 msgstr ""
 
@@ -1514,14 +1517,14 @@
 msgid "Stop Syncing “%s”"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/panes/installedpane.py:473
+#: ../softwarecenter/ui/gtk3/panes/installedpane.py:518
 #, python-format
 msgid "%(amount)s item on “%(machine)s” not on this computer"
 msgid_plural "%(amount)s items on “%(machine)s” not on this computer"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../softwarecenter/ui/gtk3/panes/installedpane.py:497
+#: ../softwarecenter/ui/gtk3/panes/installedpane.py:542
 #, python-format
 msgid "%(amount)s item on this computer not on “%(machine)s”"
 msgid_plural "%(amount)s items on this computer not on “%(machine)s”"
@@ -1535,14 +1538,14 @@
 
 #. TRANSLATORS: the text inbetween the underscores acts as a link
 #. In most/all languages you will want the whole string as a link
-#: ../softwarecenter/ui/gtk3/panes/softwarepane.py:368
+#: ../softwarecenter/ui/gtk3/panes/softwarepane.py:359
 #, python-format
 msgid "_Hide %(amount)i technical item_"
 msgid_plural "_Hide %(amount)i technical items_"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../softwarecenter/ui/gtk3/panes/softwarepane.py:374
+#: ../softwarecenter/ui/gtk3/panes/softwarepane.py:365
 #, python-format
 msgid "_Show %(amount)i technical item_"
 msgid_plural "_Show %(amount)i technical items_"
@@ -1604,7 +1607,7 @@
 msgstr ""
 
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:380
-#: ../softwarecenter/ui/gtk3/widgets/apptreeview.py:86
+#: ../softwarecenter/ui/gtk3/widgets/apptreeview.py:90
 msgid "Buy…"
 msgstr ""
 
@@ -1618,7 +1621,7 @@
 
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:397
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:416
-#: ../softwarecenter/ui/gtk3/widgets/apptreeview.py:84
+#: ../softwarecenter/ui/gtk3/widgets/apptreeview.py:88
 msgid "Install"
 msgstr ""
 
@@ -1752,43 +1755,43 @@
 msgid "Find it in the menu: "
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:1757
+#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:1760
 msgid "Version unknown"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:1758
+#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:1761
 msgid ""
 "The version of the application can not be detected. Entering a review is not "
 "possible."
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:1770
+#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:1773
 msgid "Origin unknown"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:1771
+#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:1774
 msgid ""
 "The origin of the application can not be detected. Entering a review is not "
 "possible."
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:2014
+#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:2017
 #, python-format
 msgid "%s to download, "
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:2017
+#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:2020
 #, python-format
 msgid "%s when installed"
 msgstr ""
 
 #. FIXME: this is not really a good indication of the size on disk
-#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:2025
+#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:2028
 #, python-format
 msgid "%s on disk"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:2028
+#: ../softwarecenter/ui/gtk3/views/appdetailsview.py:2031
 #, python-format
 msgid "%s to be freed"
 msgstr ""
@@ -1851,7 +1854,7 @@
 msgid "Connecting to payment service..."
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/widgets/apptreeview.py:78
+#: ../softwarecenter/ui/gtk3/widgets/apptreeview.py:82
 msgid "More Info"
 msgstr ""
 
@@ -2179,39 +2182,39 @@
 msgid "Search"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/widgets/stars.py:414
+#: ../softwarecenter/ui/gtk3/widgets/stars.py:416
 #, python-format
 msgid "%(nr_ratings)i rating"
 msgid_plural "%(nr_ratings)i ratings"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../softwarecenter/ui/gtk3/widgets/stars.py:509
+#: ../softwarecenter/ui/gtk3/widgets/stars.py:511
 msgid "Hint: Click a star to rate this app"
 msgstr ""
 
 #. unrated
-#: ../softwarecenter/ui/gtk3/widgets/stars.py:510
+#: ../softwarecenter/ui/gtk3/widgets/stars.py:512
 msgid "Awful"
 msgstr ""
 
 #. 1 star rating
-#: ../softwarecenter/ui/gtk3/widgets/stars.py:511
+#: ../softwarecenter/ui/gtk3/widgets/stars.py:513
 msgid "Poor"
 msgstr ""
 
 #. 2 star rating
-#: ../softwarecenter/ui/gtk3/widgets/stars.py:512
+#: ../softwarecenter/ui/gtk3/widgets/stars.py:514
 msgid "Adequate"
 msgstr ""
 
 #. 3 star rating
-#: ../softwarecenter/ui/gtk3/widgets/stars.py:513
+#: ../softwarecenter/ui/gtk3/widgets/stars.py:515
 msgid "Good"
 msgstr ""
 
 #. 4 star rating
-#: ../softwarecenter/ui/gtk3/widgets/stars.py:514
+#: ../softwarecenter/ui/gtk3/widgets/stars.py:516
 msgid "Excellent"
 msgstr ""
 
@@ -2241,21 +2244,21 @@
 msgstr ""
 
 #: ../softwarecenter/ui/gtk3/widgets/recommendations.py:95
-#: ../softwarecenter/ui/gtk3/widgets/recommendations.py:258
+#: ../softwarecenter/ui/gtk3/widgets/recommendations.py:268
 msgid "Receiving recommendations…"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/widgets/recommendations.py:140
+#: ../softwarecenter/ui/gtk3/widgets/recommendations.py:141
 msgid "Turn On Recommendations"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/widgets/recommendations.py:141
+#: ../softwarecenter/ui/gtk3/widgets/recommendations.py:142
 msgid ""
 "To make recommendations, Ubuntu Software Center will occasionally send to "
 "Canonical an anonymous list of software currently installed."
 msgstr ""
 
-#: ../softwarecenter/ui/gtk3/widgets/recommendations.py:218
+#: ../softwarecenter/ui/gtk3/widgets/recommendations.py:213
 msgid "Submitting inventory…"
 msgstr ""
 
diff -Nru language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/unity.po language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/unity.po
--- language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/unity.po	2012-03-23 07:44:14.000000000 +0000
+++ language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/unity.po	2012-04-18 09:08:42.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: unity\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-15 15:52+0100\n"
+"POT-Creation-Date: 2012-04-16 08:50+0000\n"
 "PO-Revision-Date: 2012-03-14 13:45+0000\n"
 "Last-Translator: Damas <Unknown>\n"
 "Language-Team: Swahili <sw@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:04+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 03:30+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: ../plugins/gtkloader/gtkloader.xml.in.h:1
 msgid "GTK Loader"
@@ -107,25 +107,22 @@
 msgid "How long the fade should last"
 msgstr ""
 
-#: ../plugins/unityshell/src/BamfLauncherIcon.cpp:834
-#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:96
+#: ../plugins/unityshell/src/BamfLauncherIcon.cpp:845
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:97
 msgid "Lock to Launcher"
 msgstr ""
 
-#: ../plugins/unityshell/src/BamfLauncherIcon.cpp:834
-#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:96
+#: ../plugins/unityshell/src/BamfLauncherIcon.cpp:845
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:97
 msgid "Unlock from Launcher"
 msgstr ""
 
-#: ../plugins/unityshell/src/BamfLauncherIcon.cpp:843
+#: ../plugins/unityshell/src/BamfLauncherIcon.cpp:854
 msgid "Quit"
 msgstr "Aga"
 
-#: ../plugins/unityshell/src/BFBLauncherIcon.cpp:39
-msgid "Dash home"
-msgstr ""
-
-#: ../plugins/unityshell/src/BFBLauncherIcon.cpp:86
+#: ../plugins/unityshell/src/BFBLauncherIcon.cpp:40
+#: ../plugins/unityshell/src/BFBLauncherIcon.cpp:118
 msgid "Dash Home"
 msgstr ""
 
@@ -145,36 +142,36 @@
 msgid "Show Desktop"
 msgstr ""
 
-#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:109
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:110
 msgid "Open"
 msgstr "Fungua"
 
 #. TRANSLATORS: This refers to the action of formatting a device
-#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:124
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:125
 msgid "Format..."
 msgstr ""
 
-#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:143
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:144
 msgid "Eject"
 msgstr "Chomoa"
 
-#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:145
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:146
 msgid "Eject parent drive"
 msgstr ""
 
-#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:168
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:169
 msgid "Safely remove"
 msgstr ""
 
-#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:170
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:171
 msgid "Safely remove parent drive"
 msgstr ""
 
-#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:193
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:194
 msgid "Unmount"
 msgstr ""
 
-#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:299
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:294
 msgid "The drive has been successfully ejected"
 msgstr ""
 
@@ -186,35 +183,40 @@
 msgid "Categories"
 msgstr ""
 
-#: ../plugins/unityshell/src/FilterMultiRangeWidget.cpp:49
+#: ../plugins/unityshell/src/FilterMultiRangeWidget.cpp:41
 msgid "Multi-range"
 msgstr ""
 
-#: ../plugins/unityshell/src/FilterRatingsWidget.cpp:48
+#: ../plugins/unityshell/src/FilterRatingsWidget.cpp:47
 msgid "Rating"
 msgstr ""
 
-#: ../plugins/unityshell/src/HudView.cpp:51
+#: ../plugins/unityshell/src/HudView.cpp:173
+#: ../plugins/unityshell/src/HudView.cpp:363
+#: ../plugins/unityshell/src/HudView.cpp:387
+#: ../plugins/unityshell/src/HudView.cpp:504
+#: ../plugins/unityshell/src/HudView.cpp:574
+#: ../plugins/unityshell/src/HudView.cpp:580
 msgid "Type your command"
 msgstr ""
 
-#: ../plugins/unityshell/src/LauncherController.cpp:608
+#: ../plugins/unityshell/src/LauncherController.cpp:681
 msgid "Workspace Switcher"
 msgstr ""
 
-#: ../plugins/unityshell/src/LensView.cpp:390
+#: ../plugins/unityshell/src/LensView.cpp:408
 msgid "Sorry, there is nothing that matches your search."
 msgstr ""
 
-#: ../plugins/unityshell/src/PanelMenuView.cpp:685
+#: ../plugins/unityshell/src/PanelMenuView.cpp:78
 msgid "Ubuntu Desktop"
 msgstr ""
 
-#: ../plugins/unityshell/src/PlacesGroup.cpp:295
+#: ../plugins/unityshell/src/PlacesGroup.cpp:336
 msgid "See fewer results"
 msgstr "Tazama matokeo machache"
 
-#: ../plugins/unityshell/src/PlacesGroup.cpp:300
+#: ../plugins/unityshell/src/PlacesGroup.cpp:342
 #, c-format
 msgid "See one more result"
 msgid_plural "See %d more results"
@@ -230,27 +232,27 @@
 msgid "min"
 msgstr ""
 
-#: ../plugins/unityshell/src/SearchBar.cpp:220
+#: ../plugins/unityshell/src/SearchBar.cpp:196
 msgid "Filter results"
 msgstr ""
 
-#: ../plugins/unityshell/src/ShortcutHintPrivate.cpp:58
+#: ../plugins/unityshell/src/ShortcutHintPrivate.cpp:85
 msgid "Left Mouse"
 msgstr ""
 
-#: ../plugins/unityshell/src/ShortcutHintPrivate.cpp:59
+#: ../plugins/unityshell/src/ShortcutHintPrivate.cpp:86
 msgid "Middle Mouse"
 msgstr ""
 
-#: ../plugins/unityshell/src/ShortcutHintPrivate.cpp:60
+#: ../plugins/unityshell/src/ShortcutHintPrivate.cpp:87
 msgid "Right Mouse"
 msgstr ""
 
-#: ../plugins/unityshell/src/ShortcutView.cpp:54
+#: ../plugins/unityshell/src/ShortcutView.cpp:79
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: ../plugins/unityshell/src/SoftwareCenterLauncherIcon.cpp:48
+#: ../plugins/unityshell/src/SoftwareCenterLauncherIcon.cpp:61
 msgid "Waiting to install"
 msgstr ""
 
@@ -258,24 +260,24 @@
 msgid "Drop To Add Application"
 msgstr ""
 
-#: ../plugins/unityshell/src/TrashLauncherIcon.cpp:39
+#: ../plugins/unityshell/src/TrashLauncherIcon.cpp:45
 msgid "Trash"
 msgstr ""
 
-#: ../plugins/unityshell/src/TrashLauncherIcon.cpp:77
+#: ../plugins/unityshell/src/TrashLauncherIcon.cpp:91
 msgid "Empty Trash..."
 msgstr ""
 
 #. Dash...
 #: ../plugins/unityshell/src/unity-dash-view-accessible.cpp:100
-#: ../plugins/unityshell/src/unityshell.cpp:2769
+#: ../plugins/unityshell/src/unityshell.cpp:2869
 msgid "Dash"
 msgstr ""
 
 #. TODO move category text into a vector...
 #. Launcher...
 #: ../plugins/unityshell/src/unity-launcher-accessible.cpp:137
-#: ../plugins/unityshell/src/unityshell.cpp:2759
+#: ../plugins/unityshell/src/unityshell.cpp:2859
 msgid "Launcher"
 msgstr ""
 
@@ -283,207 +285,209 @@
 msgid "Quicklist"
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2761
+#: ../plugins/unityshell/src/unityshell.cpp:2861
+#: ../plugins/unityshell/src/unityshell.cpp:2883
 msgid " (Press)"
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2761
+#: ../plugins/unityshell/src/unityshell.cpp:2861
 msgid "Open Launcher, displays shortcuts."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2762
+#: ../plugins/unityshell/src/unityshell.cpp:2862
 msgid "Open Launcher keyboard navigation mode."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2763
+#: ../plugins/unityshell/src/unityshell.cpp:2863
 msgid "Switch applications via Launcher."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2764
+#: ../plugins/unityshell/src/unityshell.cpp:2864
 msgid " + 1 to 9"
 msgstr " +1 hadi 9"
 
-#: ../plugins/unityshell/src/unityshell.cpp:2764
+#: ../plugins/unityshell/src/unityshell.cpp:2864
 msgid "Same as clicking on a Launcher icon."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2765
+#: ../plugins/unityshell/src/unityshell.cpp:2865
 msgid " + Shift + 1 to 9"
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2765
+#: ../plugins/unityshell/src/unityshell.cpp:2865
 msgid "Open new window of the app."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2766
+#: ../plugins/unityshell/src/unityshell.cpp:2866
 msgid "Open the Trash."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2771
+#: ../plugins/unityshell/src/unityshell.cpp:2871
+#: ../plugins/unityshell/src/unityshell.cpp:2882
 msgid " (Tap)"
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2771
+#: ../plugins/unityshell/src/unityshell.cpp:2871
 msgid "Open the Dash Home."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2772
+#: ../plugins/unityshell/src/unityshell.cpp:2872
 msgid "Open the Dash App Lens."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2773
+#: ../plugins/unityshell/src/unityshell.cpp:2873
 msgid "Open the Dash Files Lens."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2774
+#: ../plugins/unityshell/src/unityshell.cpp:2874
 msgid "Open the Dash Music Lens."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2775
+#: ../plugins/unityshell/src/unityshell.cpp:2875
 msgid "Switches between Lenses."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2775
+#: ../plugins/unityshell/src/unityshell.cpp:2875
 msgid "Ctrl + Tab"
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2776
-#: ../plugins/unityshell/src/unityshell.cpp:2792
+#: ../plugins/unityshell/src/unityshell.cpp:2876
+#: ../plugins/unityshell/src/unityshell.cpp:2892
 msgid "Moves the focus."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2776
+#: ../plugins/unityshell/src/unityshell.cpp:2876
 msgid "Cursor Keys"
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2777
+#: ../plugins/unityshell/src/unityshell.cpp:2877
 msgid "Open currently focused item."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2777
+#: ../plugins/unityshell/src/unityshell.cpp:2877
 msgid "Enter & Return"
 msgstr ""
 
 #. Menu Bar
-#: ../plugins/unityshell/src/unityshell.cpp:2780
+#: ../plugins/unityshell/src/unityshell.cpp:2880
 msgid "HUD & Menu Bar"
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2782
+#: ../plugins/unityshell/src/unityshell.cpp:2882
 msgid "Open the HUD."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2783
+#: ../plugins/unityshell/src/unityshell.cpp:2883
 msgid "Reveals application menu."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2784
+#: ../plugins/unityshell/src/unityshell.cpp:2884
 msgid "Opens the indicator menu."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2785
+#: ../plugins/unityshell/src/unityshell.cpp:2885
 msgid "Moves focus between indicators."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2785
-#: ../plugins/unityshell/src/unityshell.cpp:2792
+#: ../plugins/unityshell/src/unityshell.cpp:2885
+#: ../plugins/unityshell/src/unityshell.cpp:2892
 msgid "Cursor Left or Right"
 msgstr ""
 
 #. Switching
-#: ../plugins/unityshell/src/unityshell.cpp:2788
+#: ../plugins/unityshell/src/unityshell.cpp:2888
 msgid "Switching"
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2790
+#: ../plugins/unityshell/src/unityshell.cpp:2890
 msgid "Switch between applications."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2791
+#: ../plugins/unityshell/src/unityshell.cpp:2891
 msgid "Switch windows of current application."
 msgstr ""
 
 #. Workspaces
-#: ../plugins/unityshell/src/unityshell.cpp:2795
+#: ../plugins/unityshell/src/unityshell.cpp:2895
 msgid "Workspaces"
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2797
+#: ../plugins/unityshell/src/unityshell.cpp:2897
 msgid "Spread workspaces."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2798
-#: ../plugins/unityshell/src/unityshell.cpp:2799
+#: ../plugins/unityshell/src/unityshell.cpp:2898
+#: ../plugins/unityshell/src/unityshell.cpp:2899
 msgid " + Cursor Keys"
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2798
+#: ../plugins/unityshell/src/unityshell.cpp:2898
 msgid "Switch workspaces."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2799
+#: ../plugins/unityshell/src/unityshell.cpp:2899
 msgid "Move focused window to different workspace."
 msgstr ""
 
 #. Windows
-#: ../plugins/unityshell/src/unityshell.cpp:2802
+#: ../plugins/unityshell/src/unityshell.cpp:2902
 msgid "Windows"
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2803
+#: ../plugins/unityshell/src/unityshell.cpp:2903
 msgid "Spreads all windows in the current workspace."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2804
+#: ../plugins/unityshell/src/unityshell.cpp:2904
 msgid "Minimises all windows."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2805
+#: ../plugins/unityshell/src/unityshell.cpp:2905
 msgid "Maximises the current window."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2806
+#: ../plugins/unityshell/src/unityshell.cpp:2906
 msgid "Restores or minimises current window."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2807
+#: ../plugins/unityshell/src/unityshell.cpp:2907
 msgid " or Right"
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2807
+#: ../plugins/unityshell/src/unityshell.cpp:2907
 msgid "Semi-maximises current window."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2808
+#: ../plugins/unityshell/src/unityshell.cpp:2908
 msgid "Closes current window."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2809
+#: ../plugins/unityshell/src/unityshell.cpp:2909
 msgid "Opens window accessibility menu."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2809
+#: ../plugins/unityshell/src/unityshell.cpp:2909
 msgid "Alt + Space"
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2810
+#: ../plugins/unityshell/src/unityshell.cpp:2910
 msgid "Places window in corresponding positions."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2810
+#: ../plugins/unityshell/src/unityshell.cpp:2910
 msgid "Ctrl + Alt + Num"
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2811
-#: ../plugins/unityshell/src/unityshell.cpp:2812
+#: ../plugins/unityshell/src/unityshell.cpp:2911
+#: ../plugins/unityshell/src/unityshell.cpp:2912
 msgid " Drag"
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2811
+#: ../plugins/unityshell/src/unityshell.cpp:2911
 msgid "Move window."
 msgstr ""
 
-#: ../plugins/unityshell/src/unityshell.cpp:2812
+#: ../plugins/unityshell/src/unityshell.cpp:2912
 msgid "Resize window."
 msgstr ""
 
@@ -934,7 +938,7 @@
 msgstr ""
 
 #: ../plugins/unityshell/unityshell.xml.in.h:108
-msgid "Enable/Disable \"Show Dekstop icon\" in the launcher."
+msgid "Enable/Disable \"Show Desktop Icon\" in the launcher."
 msgstr ""
 
 #: ../plugins/unityshell/unityshell.xml.in.h:109
diff -Nru language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/xdg-user-dirs.po language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/xdg-user-dirs.po
--- language-pack-gnome-sw-base-12.04+20120322/data/sw/LC_MESSAGES/xdg-user-dirs.po	2012-03-23 07:44:14.000000000 +0000
+++ language-pack-gnome-sw-base-12.04+20120417/data/sw/LC_MESSAGES/xdg-user-dirs.po	2012-04-18 09:08:42.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:51+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 02:32+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: translate.c:2
 msgid "Applications"
diff -Nru language-pack-gnome-sw-base-12.04+20120322/debian/changelog language-pack-gnome-sw-base-12.04+20120417/debian/changelog
--- language-pack-gnome-sw-base-12.04+20120322/debian/changelog	2012-03-23 07:44:13.000000000 +0000
+++ language-pack-gnome-sw-base-12.04+20120417/debian/changelog	2012-04-18 09:08:41.000000000 +0000
@@ -1,6 +1,6 @@
-language-pack-gnome-sw-base (1:12.04+20120322) precise; urgency=low
+language-pack-gnome-sw-base (1:12.04+20120417) precise; urgency=low
 
   * Initial Release.
 
- -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Fri, 23 Mar 2012 07:44:13 +0000
+ -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Wed, 18 Apr 2012 09:08:41 +0000