Imported Upstream version 0.22.0upstream/0.22.0

259 files changed, 41949 insertions, 27028 deletions

diff --git a/INSTALL b/INSTALL
index 8c80631..2d14f42 100644
--- a/INSTALL
+++ b/INSTALL
@@ -23,5 +23,5 @@
     menu under Graphics or Photography.
 
 
-    Copyright 2009-2014 Yorba Foundation
+    Copyright 2009-2015 Yorba Foundation
 
diff --git a/Makefile b/Makefile
index 15268fc..fe354a7 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ PROGRAM = shotwell
 PROGRAM_THUMBNAILER = shotwell-video-thumbnailer
 PROGRAM_MIGRATOR = shotwell-settings-migrator
 
-VERSION = 0.20.2
+VERSION = 0.22.0
 GITVER := $(shell git log -n 1 2>/dev/null | head -n 1 | awk '{print $$2}')
 GETTEXT_PACKAGE = $(PROGRAM)
 BUILD_ROOT = 1
@@ -61,6 +61,7 @@ UNUNITIZED_SRC_FILES = \
 	main.vala \
 	AppWindow.vala \
 	CollectionPage.vala \
+	NaturalCollate.vala \
 	Thumbnail.vala \
 	ThumbnailCache.vala \
 	CheckerboardLayout.vala \
@@ -187,7 +188,6 @@ ICON_FILES = \
 	crop-pivot-reticle.png \
 	crop.svg \
 	drag_nub.png \
-	enhance.png \
 	five-star-filter.svg \
 	five-stars.svg \
 	flag-page.png \
@@ -216,6 +216,7 @@ ICON_FILES = \
 	shotwell.ico \
 	shotwell-street.jpg \
 	shotwell.svg \
+	shotwell-auto-enhance.png \
 	sprocket.png \
 	straighten.svg \
 	three-star-filter-plus.svg \
@@ -293,7 +294,7 @@ EXT_PKG_VERSIONS = \
 	gstreamer-base-1.0 >= 1.0.0 \
 	gstreamer-plugins-base-1.0 >= 1.0.0 \
 	gstreamer-pbutils-1.0 >= 1.0.0 \
-	gtk+-3.0 >= 3.6.0 \
+	gtk+-3.0 >= 3.12.2 \
 	gudev-1.0 >= 145 \
 	libexif >= 0.6.16 \
 	libgphoto2 >= 2.4.2 \
@@ -492,9 +493,8 @@ endif
 misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head $(EXPANDED_CORE_PO_FILES)
 	cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop
 	$(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
-		LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APP_FULL_NAME)` \
-		echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
-		--domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/shotwell-viewer.desktop ; \
+		LANGUAGE=$(lang) gettext --domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` \
+		>> misc/shotwell-viewer.desktop ; \
 		echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
 		--domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/shotwell-viewer.desktop ;)
 ifndef DISABLE_DESKTOP_VALIDATE
diff --git a/NEWS b/NEWS
index 773aee3..be90e00 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+Shotwell 0.22.0 - 23 March 2015
+-------------------------------
+
+  * Improved metadata support for Facebook upload (#742163)
+  * Saved search now properly supports text is-set, not-set (#743924, #743923)
+  * Import title, exposure time when available
+  * User interface improvements (#744291, #719284, more)
+  * Sort photos by filename (#717878)
+  * Updated translations
+
+
+Shotwell 0.21.0 - 2 February 2015
+---------------------------------
+
+  * User interface refresh (#742326, #742443)
+  * Fix Shotwell Viewer .desktop file (#743799)
+  * Natural sorting of photo titles (#717960)
+  * Improved video thumbnailer (#739396, #741821)
+  * Updated translations
+
+
 Shotwell 0.20.2 - 31 October 2014
 ---------------------------------
 
diff --git a/README b/README
index 6fd9c1b..3b25438 100644
--- a/README
+++ b/README
@@ -57,5 +57,5 @@
     
     
     
-    Copyright 2009-2014 Yorba Foundation
+    Copyright 2009-2015 Yorba Foundation
 
diff --git a/THANKS b/THANKS
index c731700..6ea1b40 100644
--- a/THANKS
+++ b/THANKS
@@ -8,6 +8,7 @@ Patrick Tierney <patrick@yorba.org>
 Simon Adda-Reyss <simon.addareyss@libertysurf.fr>
 Mihhail Afanasjev <mihhail.afanasjev@gmail.com>
 Joeny Ang <ang.joeny@gmail.com>
+Eduardo Arnold <eduardoarnoldh@gmail.com>
 Jeroen Arnoldus <b.j.arnoldus@bja-electronics.nl>
 Michael Axiak <mike@axiak.net>
 Eser Aygün <eser.aygun@gmail.com>
@@ -29,6 +30,7 @@ Fryderyk Dziarmagowski <fdziarmagowski@gmail.com>
 Josh Freeman <josh@twilightedge.com>
 Mike Gorse <mgorse@suse.com>
 guillaumev <guillaume@viguierjust.com>
+Raphaël Halimi <raphael.halimi@gmail.com>
 Chris Hemsing <c.hemsing@gmx.net>
 Petr Heynch <petr.heynch@gmail.com>
 Tomáš Hnyk <tomashnyk@gmail.com>
@@ -51,6 +53,7 @@ Trevor Mehard <mehardtj@g.cofc.edu>
 mnemo <mnemo@minimum.se>
 Rafael Monica <monraaf@gmail.com>
 Thomas Moschny <thomas.moschny@gmx.de>
+Trinh Anh Ngoc <atw1990@gmail.com>
 Paul Novak <pnovak@alumni.caltech.edu>
 Joseph Nuzman <jnuzman@gmail.com>
 Carlos Penichet <cperezpenichet@gmail.com>
@@ -74,6 +77,7 @@ Ville Skyttä <ville.skytta@iki.fi>
 Wolfgang Steitz <wolfer7@web.de>
 Marcel Stimberg <stimberg@users.sourceforge.net>
 Vincent Untz <vuntz@gnome.org>
+Tim Waugh <twaugh@redhat.com>
 Timo Westkämper <timo.westkamper@gmail.com>
 Alexander Wilms <alexander.wilms@zoho.com>
 Timo Witte <timo.witte@googlemail.com>
diff --git a/chkver b/chkver
index 01028fc..89e3500 100755
--- a/chkver
+++ b/chkver
@@ -1,6 +1,6 @@
 #! /bin/bash
 #
-# Copyright 2009-2014 Yorba Foundation
+# Copyright 2009-2015 Yorba Foundation
 #
 # This software is licensed under the GNU LGPL (version 2.1 or later).
 # See the COPYING file in this distribution.
diff --git a/configure b/configure
index 5db2bf0..93f092c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2009-2014 Yorba Foundation
+# Copyright 2009-2015 Yorba Foundation
 #
 # This software is licensed under the GNU LGPL (version 2.1 or later).
 # See the COPYING file in this distribution.
diff --git a/help/Makefile.am b/help/Makefile.am
index 23a3888..7c0ed67 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -50,4 +50,4 @@ DOC_PAGES = \
 	view-information.page \
 	view-sidebar.page
 
-DOC_LINGUAS = el es hu
+DOC_LINGUAS = cs de el es hu
diff --git a/help/cs/cs.po b/help/cs/cs.po
new file mode 100644
index 0000000..2229d91
--- /dev/null
+++ b/help/cs/cs.po
@@ -0,0 +1,2852 @@
+# Czech translation for shotwell.
+# Copyright (C) 2014 shotwell's COPYRIGHT HOLDER
+# This file is distributed under the same license as the shotwell package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Marek Černocký <marek@manet.cz>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: shotwell master\n"
+"POT-Creation-Date: 2014-11-15 20:31+0000\n"
+"PO-Revision-Date: 2014-11-15 22:39+0100\n"
+"Last-Translator: Marek Černocký <marek@manet.cz>\n"
+"Language-Team: Czech <gnome-cs-list@gnome.org>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Gtranslator 2.91.6\n"
+
+#: C/view-sidebar.page:7(desc)
+msgid ""
+"The sidebar on the left of the window lists various views of your library."
+msgstr ""
+"Postranní panel na levé straně okna vypisuje různá zobrazení vaší knihovny."
+
+#: C/view-sidebar.page:21(title)
+msgid "The sidebar"
+msgstr "Postranní panel"
+
+#: C/view-sidebar.page:23(p)
+msgid ""
+"The sidebar on the left side of the Shotwell window lists various views of "
+"your library. Although you may see the same photo in multiple views, it's "
+"only stored once on your hard drive."
+msgstr ""
+"Postranní panel na levé straně okna Shotwell vypisuje různá zobrazení vaší "
+"knihovny. Ačkoliv můžete vidět tu samou fotografii ve více zobrazeních, na "
+"disku je uchována jen v jedné kopii."
+
+#: C/view-sidebar.page:25(p)
+msgid ""
+"The <gui>Last Import</gui> view lists your last imported photos no matter if "
+"they are imported from F-Spot, your camera, a memory card or the hard disk."
+msgstr ""
+"V zobrazení <gui>Poslední import</gui> jsou uvedeny fotografie, které byly "
+"naimportovány jako poslední, bez ohledu na to, zda z aplikace F-Spot, z "
+"fotoaparátu, z paměťové karty nebo z pevného disku."
+
+#: C/view-sidebar.page:27(p)
+msgid "The <gui>Flagged</gui> lists all photos you had previous flagged."
+msgstr ""
+"V <gui>Označeno</gui> jsou uvedeny všechny fotografie, které jste již dříve "
+"označili."
+
+#: C/view-sidebar.page:29(p)
+msgid ""
+"The <gui>Saved Search</gui> allows you to sort your library by many criteria."
+msgstr ""
+"<gui>Uložená hledání</gui> umožňují třídit vaši knihovnu podle řady kritérií."
+
+#: C/view-sidebar.page:31(p)
+msgid ""
+"The <gui>Events</gui> folder lists all events in your library. An event is a "
+"group of photos that were taken at approximately the same time."
+msgstr ""
+"Ve složce <gui>Události</gui> jsou uvedeny všechny události z vaší knihovny. "
+"Událost je skupina fotografií, které byly pořízeny přibližně ve stejnou dobu."
+
+#: C/view-sidebar.page:33(p)
+msgid ""
+"The <gui>Tags</gui> folder lists all tags you've assigned to photos. Photos "
+"can have multiple tags attached to them. When you click on the name of a tag "
+"in the sidebar, you will see all the photos associated with that tag."
+msgstr ""
+"Ve složce <gui>Štítky</gui> jsou uvedeny všechny štítky, které jste "
+"fotografiím přiřadili. Každá fotografie může mít přiřazeno více štítků. Když "
+"kliknete na název štítku v postranním panelu, uvidíte všechny fotografie, "
+"které mají takovýto štítek přiřazený."
+
+#: C/view-information.page:7(desc)
+msgid ""
+"View more detailed information about photos, like the exposure mode used by "
+"the camera."
+msgstr ""
+"Jak zobrazit více podrobných informací o fotografiích, jako je třeba režim "
+"expozice použitý ve fotoaparátu."
+
+#: C/view-information.page:12(title)
+msgid "Basic and extended information"
+msgstr "Základní a rozšiřující informace"
+
+#: C/view-information.page:14(p)
+msgid ""
+"The Basic Information pane appears at the bottom of the sidebar, and "
+"displays a brief summary of the photos you've selected. If no photos are "
+"selected, it displays a summary of the entire collection. You can toggle the "
+"display of this pane using the <guiseq><gui>View</gui><gui>Basic "
+"Information</gui></guiseq> command."
+msgstr ""
+"Panel Základní informace se objevuje ve spodní části postranního panelu a "
+"zobrazuje stručný přehled o vybrané fotografii. Pokud není vybrána žádná "
+"fotografie, zobrazuje přehled o celé sbírce. Jestli má být tento panel "
+"zobrazen, můžete přepínat příkazem <guiseq><gui>Zobrazit</gui><gui>Základní "
+"informace</gui></guiseq>."
+
+#: C/view-information.page:16(p)
+msgid ""
+"The floating Extended Information window displays more information about the "
+"selected photo. The <guiseq><gui>View</gui><gui>Extended Information</gui></"
+"guiseq> command or <keyseq><key>Ctrl</key><key>Shift</key><key>X</key></"
+"keyseq> toggles the display of this window."
+msgstr ""
+"Plovoucí okno Doplňující informace zobrazuje o vybrané fotografii více "
+"informací. K přepnutí zobrazení tohoto okna použijte příkaz "
+"<guiseq><gui>Zobrazit</gui><gui>Doplňující informace</gui></guiseq> nebo "
+"klávesovou zkratku <keyseq><key>Ctrl</key><key>Shift</key><key>X</key></"
+"keyseq>."
+
+#: C/view-displaying.page:7(desc)
+msgid ""
+"Learn about different ways of viewing your photos: in a grid, filling the "
+"main window, or filling the whole screen."
+msgstr ""
+"Zjistěte si, jakými různými způsoby si můžete své fotografie zobrazit: v "
+"mřížce, přes celé hlavní okno nebo přes celou obrazovku."
+
+#: C/view-displaying.page:12(title)
+msgid "Photo views"
+msgstr "Způsoby zobrazení fotografií"
+
+#: C/view-displaying.page:14(p)
+msgid ""
+"When you select any collection in the sidebar, Shotwell displays all photos "
+"in the collection in the main window area. At the bottom right is a slider "
+"which adjusts the viewing size of the thumbnails. You may also adjust the "
+"thumbnail size using the plus and minus keys (<key>+</key> and <key>-</key>) "
+"or by pressing <key>Ctrl</key> while moving your mouse scroll wheel."
+msgstr ""
+"Když v postranním panelu vyberete sbírku, Shotwell zobrazí všechny její "
+"fotografie v hlavní části okna. V pravém dolním rohu je posuvník, kterým si "
+"můžete upravit velikost náhledů. Případně k tomu můžete použít klávesy plus "
+"a mínus (<key>+</key> a <key>-</key>) nebo držet zmáčknutý <key>Ctrl</key> a "
+"použít kolečko myši."
+
+#: C/view-displaying.page:16(p)
+msgid ""
+"You can view a photo full-window by double-clicking on it. From there you "
+"may move to other photos in the collection with the Back and Forward "
+"buttons. To return to the collection, double-click on the photo or press "
+"<key>Esc</key>."
+msgstr ""
+"Dvojitým kliknutím na fotografii si ji zobrazíte v plné velikosti. Na další "
+"fotografie ve sbírce pak můžete přecházet pomocí tlačítek Zpět a Vpřed. Pro "
+"návrat do sbírky na fotografii opět dvojitě klikněte nebo zmáčkněte "
+"<key>Esc</key>."
+
+#: C/view-displaying.page:18(p)
+msgid ""
+"When viewing a photo in full-window mode, the slider on the toolbar controls "
+"zoom. You can pan around by grabbing and dragging anywhere on the photo. You "
+"can also zoom using your scroll wheel or by pressing the following keyboard "
+"shortcuts: <keyseq><key>Ctrl</key>0</keyseq> for the full image, "
+"<keyseq><key>Ctrl</key>1</keyseq> for 100% (1 photo pixel = 1 screen pixel), "
+"and <keyseq><key>Ctrl</key>2</keyseq> for 200% (1 photo pixel = 2x2 screen "
+"pixels)."
+msgstr ""
+"Když prohlížíte fotografii v režimu celého okna, posuvník na nástrojové "
+"liště řídí přiblížení. Fotografii můžete posouvat jejím chycením v "
+"kterékoliv části a tažením. Přibližovat můžete také pomocí kolečka myši nebo "
+"pomocí následujících klávesových zkratek: <keyseq><key>Ctrl</key>0</keyseq> "
+"pro obrázek v plné velikosti, <keyseq><key>Ctrl</key>1</keyseq> pro 100% (1 "
+"pixel fotografie = 1 pixel obrazovky) a <keyseq><key>Ctrl</key>2</keyseq> "
+"pro 200% (1 pixel obrazovky = 2×2 pixely obrazovky)."
+
+#: C/view-displaying.page:20(p)
+msgid ""
+"Shotwell offers a fullscreen mode to display photos. Choose "
+"<guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> or press <key>F11</"
+"key>. To see the fullscreen toolbar, move your mouse to the bottom of the "
+"screen. The toolbar offers buttons to move through the collection, to pin "
+"the toolbar down (so it isn't hidden when you move the mouse away), and to "
+"leave fullscreen view."
+msgstr ""
+"Shotwell také nabízí k prohlížení fotografií režim celé obrazovky. Zvolte "
+"<guiseq><gui>Zobrazit</gui> <gui>Celá obrazovka</gui></guiseq> nebo "
+"zmáčkněte <key>F11</key>. Abyste v režimu celé obrazovky viděli nástrojovou "
+"lištu, musíte najet myší do spodní části obrazovky. Nástrojová lišta nabízí "
+"tlačítka pro pohyb ve sbírce, pro přišpendlení nástrojové lišty (aby se "
+"neskrývala, když myší odjedete) a k opuštění režimu celé obrazovky."
+
+#: C/view-displaying.page:23(title)
+msgid "Viewing videos"
+msgstr "Zobrazování videí"
+
+#: C/view-displaying.page:24(p)
+msgid ""
+"When you double-click a video, Shotwell will launch an external video player "
+"to play the video. It's not currently possible to display a video in full-"
+"window mode in Shotwell or to play the video within Shotwell itself."
+msgstr ""
+"Když dvojitě kliknete na video, Shotwell spustí externí videopřehrávač, aby "
+"video přehrál. V současnosti není možné přehrát video v režimu celé "
+"obrazovky aplikace Shotwell nebo jinak přímo v rámci Shotwellu."
+
+#: C/share-upload.page:7(desc)
+msgid "Publish photos to Facebook, Flickr, Picasa Web Albums, or other sites."
+msgstr ""
+"Jak fotografie zveřejnit na Facebook, Flickr, Picasa Web Albums a jiné "
+"servery."
+
+#: C/share-upload.page:12(title)
+msgid "Publishing to the Web"
+msgstr "Publikování na web"
+
+#: C/share-upload.page:14(p)
+msgid ""
+"Through the use of <link xref=\"other-plugins\">plugins</link>, Shotwell can "
+"publish photos and videos to the following services, each of which requires "
+"an account:"
+msgstr ""
+"Za pomoci <link xref=\"other-plugins\">zásuvných modulů</link> umí Shotwell "
+"zveřejňovat fotografie a videa na následujících službách (na každé musíte "
+"mít zřízen účet):"
+
+#: C/share-upload.page:18(link)
+msgid "Facebook"
+msgstr "Facebook"
+
+#: C/share-upload.page:19(link)
+msgid "Flickr"
+msgstr "Flickr"
+
+#: C/share-upload.page:20(p)
+msgid ""
+"<link href=\"http://picasaweb.google.com\">Picasa Web Albums</link> and "
+"<link href=\"http://plus.google.com\">Google+</link>"
+msgstr ""
+"<link href=\"http://picasaweb.google.com\">Picasa Web Albums</link> a <link "
+"href=\"http://plus.google.com\">Google+</link>"
+
+#: C/share-upload.page:21(p)
+msgid "<link href=\"http://youtube.com\">YouTube</link> (videos only)"
+msgstr "<link href=\"http://youtube.com\">YouTube</link> (jen videa)"
+
+#: C/share-upload.page:22(p)
+msgid ""
+"<link href=\"http://fotki.yandex.ru\">Yandex.Fotki</link>, a photo site "
+"popular in Russia (photos only)"
+msgstr ""
+"<link href=\"http://fotki.yandex.ru\">Yandex.Fotki</link>, fotoserver "
+"populární v Rusku (jen fotografie)"
+
+#: C/share-upload.page:23(p)
+msgid ""
+"Any site running the <link href=\"http://piwigo.org\">Piwigo</link> photo "
+"gallery software (photos only)"
+msgstr ""
+"Libovolný server, na kterém běží software pro fotogralerie <link href="
+"\"http://piwigo.org\">Piwigo</link> (jen fotky)"
+
+#: C/share-upload.page:26(p)
+msgid ""
+"To publish selected photos in a collection, choose <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui></guiseq> and click on the <gui>Plugins</gui> tab "
+"to enable the plugin for the service you want to publish to. Next, choose, "
+"<guiseq><gui>File</gui><gui>Publish</gui></guiseq>, press the <gui>Publish</"
+"gui> toolbar button or use <keyseq><key>Ctrl</key><key>P</key></keyseq>. You "
+"will see a dialog that lets you select a publishing service. You will then "
+"need to log in or create an account."
+msgstr ""
+"Když chcete zveřejnit vybrané fotografie ze sbírky, zvolte "
+"<guiseq><gui>Upravit</gui> <gui>Předvolby</gui></guiseq> a klikněte na kartu "
+"<gui>Zásuvné moduly</gui>, abyste povolili zásuvný modul pro službu, kterou "
+"chcete ke zveřejnění použít. Následně zvolte <guiseq><gui>Soubor</gui> "
+"<gui>Zveřejnit</gui></guiseq> nebo zmáčkněte tlačítko <gui>Zveřejnit</gui> "
+"na nástrojové liště nebo použijte klávesovou zkratku <keyseq><key>Ctrl</"
+"key><key>P</key></keyseq>. Uvidíte dialogové okno, ve kterém si můžete "
+"vybrat požadovanou službu. Následně se k ní musíte přihlásit, připadně si "
+"vytvořit účet."
+
+#: C/share-upload.page:31(p)
+msgid ""
+"Publishing to Facebook requires you to grant certain permissions to the "
+"Shotwell Connect Facebook application. You only need to grant these "
+"permissions once, when you first associate Shotwell Connect with your "
+"Facebook account."
+msgstr ""
+"Zveřejnění na Facebooku vyžaduje udělení určitých oprávnění aplikaci "
+"Shotwell Connect Facebook. Tato oprávnění stačí přidělit jednou, když "
+"napoprvé přiřazujete Shotwell Connect k účtu na Facebooku."
+
+#: C/share-upload.page:35(p)
+msgid ""
+"Similarly, publishing to Flickr requires you to log in and permit Shotwell "
+"Connect to access your account."
+msgstr ""
+"Podobně zveřejnění na Flickru vyžaduje přihlášení a oprávnění aplikaci "
+"Shotwell Connect k přístupu k vašemu účtu."
+
+#: C/share-upload.page:37(p)
+msgid ""
+"If you have a Google account, but have not yet used Picasa Web Albums, you "
+"will need to log in to Picasa using a browser once before you can publish to "
+"this service."
+msgstr ""
+"Pokud máte účet Google, ale zatím jste nepoužili Picasa Web Albums, musíte "
+"se jednou pomocí prolížeče přihlásit ke službě Picasa, abyste na ní mohli "
+"zveřejňovat."
+
+#: C/share-slideshow.page:7(desc)
+msgid "Watch a slideshow of your photos."
+msgstr "Jak sledovat promítání svých fotografií."
+
+#: C/share-slideshow.page:12(title)
+msgid "Slideshows"
+msgstr "Promítání"
+
+#: C/share-slideshow.page:14(p)
+msgid ""
+"To see a sideshow of any collection in Shotwell, navigate to that collection "
+"and select <guiseq><gui>View</gui><gui>Slideshow</gui></guiseq> or press "
+"<key>F5</key>."
+msgstr ""
+"Abyste se mohli dívat na promítání sbírky fotografií v aplikaci Shotwell, "
+"přejděte na danou sbírku a vyberte <guiseq><gui>View</gui><gui>Slideshow</"
+"gui></guiseq> nebo zmáčkněte <key>F5</key>."
+
+#: C/share-slideshow.page:16(p)
+msgid "You can change some settings in a running slideshow:"
+msgstr "V běžícím promítání můžete měnit některá nastavení:"
+
+#: C/share-slideshow.page:19(p)
+msgid "The duration how long an image should be shown: 1 - 30 seconds"
+msgstr "Dobu, po kterou má být obrázek zobrazen: 1 až 30 vteřin"
+
+#: C/share-slideshow.page:20(p)
+msgid "You can select different transition effects."
+msgstr "Můžete vybírat z různých přechodových efektů"
+
+#: C/share-slideshow.page:21(p)
+msgid "The time for each transition effect: 0.1 - 1.0 seconds"
+msgstr "Dobu trvání přechodového efektu: 0,1 až 1,0 vteřiny"
+
+#: C/share-send.page:7(desc)
+msgid "Send photos via email, instant messaging or in other ways."
+msgstr ""
+"Jak odeslat fotografie přes e-mail, rychlou komunikaci a dalšími způsoby."
+
+#: C/share-send.page:12(title)
+msgid "Sending photos"
+msgstr "Odesílání fotografií"
+
+#: C/share-send.page:14(p)
+msgid ""
+"Shotwell can send photos using the GNOME desktop's Send To mechanism, which "
+"lets you send photos via email, instant messaging or in other ways."
+msgstr ""
+"Shotwell může odesílat fotografie pomocí mechanizmu Odeslat do v pracovním "
+"prostředí GNOME. Ten umožňuje odesílat přes e-mail, rychlou komunikaci a "
+"dalšími způsoby."
+
+#: C/share-send.page:16(p)
+msgid ""
+"To send photos, select them in Shotwell and choose <guiseq><gui>File</"
+"gui><gui>Send To...</gui></guiseq>, or right-click the photos and choose "
+"<gui>Send To...</gui> from the context menu. A <gui>Send To</gui> dialog box "
+"will appear which lets you choose a mechanism for sending the files (such as "
+"email or instant messaging) and a destination. You can optionally choose to "
+"send the files in a compressed format."
+msgstr ""
+"Když chcete fotografie odeslat, vyberte je v aplikaci Shotwell a zvolte "
+"<guiseq><gui>Soubor</gui> <gui>Odeslat…</gui></guiseq> nebo klikněte na "
+"fotografie pravým tlačítkem a zvolte <gui>Odeslat…</gui> v kontextové "
+"nabídce. Objeví se dialogové okno <gui>Odeslání</gui>, ve kterém si můžete "
+"zvolit způsob odeslání souborů (jako je e-mail nebo rychlá komunikace) a "
+"cíl. Volitelně si můžete vybrat, jestli chcete soubory v komprimovaném "
+"formátu."
+
+#: C/share-print.page:7(desc)
+msgid ""
+"Click <guiseq><gui>File</gui><gui>Print</gui></guiseq>. For more printing "
+"options, select the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog."
+msgstr ""
+"Klikněte na <guiseq><gui>Soubor</gui><gui>Tisk</gui></guiseq>. Další volby "
+"tisku najdete na kartě <gui>Nastavení stránky</gui> v dialogovém okně "
+"<gui>Tisk</gui>."
+
+#: C/share-print.page:12(title)
+msgid "Printing"
+msgstr "Tisk"
+
+#: C/share-print.page:14(p)
+msgid ""
+"To print a photo, select it and choose <guiseq><gui>File</gui><gui>Print</"
+"gui></guiseq>."
+msgstr ""
+"Když chcete fotografii vytisknout, vyberte ji a zvolte <guiseq><gui>Soubor</"
+"gui><gui>Tisk</gui></guiseq>."
+
+#: C/share-print.page:16(p)
+msgid ""
+"Shotwell can also print multiple images in one page; to do this, select "
+"multiple images, choose <guiseq><gui>File</gui><gui>Print</gui></guiseq>, "
+"and in the <gui>Print</gui> dialog, choose the <gui>Image Settings</gui> "
+"tab. In <gui>Image Settings</gui>, choose one of the multiple-image-per-page "
+"options under <gui>Autosize</gui>."
+msgstr ""
+"Shotwell umí také tisknout více obrázků na jednu stránku. Udělá se to tak, "
+"že se vybere více obrázků, zvolí <guiseq><gui>Soubor</gui> <gui>Tisk</gui></"
+"guiseq> a v dialogovém okně <gui>Tisk</gui> se vybere karta <gui>Nastavení "
+"obrázku</gui>. Tam ve volbě <gui>Automatická velikost</gui> vyberte jednu z "
+"možností „X obrázků na stránku“."
+
+#: C/share-print.page:23(p)
+msgid ""
+"If you would like to set formatting, paper size, and orientation options, "
+"choose the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog prior to "
+"printing."
+msgstr ""
+"Pokud potřebujete nastavit formátování, velikost papíru a jeho otočení, "
+"vyberte v dialogovém okně <gui>Tisk</gui> kartu <gui>Vzhled stránky</gui>."
+
+#: C/share-export.page:7(desc)
+msgid "Copy photos out of Shotwell so you can put them somewhere else."
+msgstr ""
+"Jak zkopírovat fotografie mimo Shotwell, abyste je mohli umístit někam jinam."
+
+#: C/share-export.page:12(title)
+msgid "Exporting photos"
+msgstr "Export fotografií"
+
+#: C/share-export.page:14(p)
+msgid ""
+"To export photos from Shotwell via drag and drop, drag the photos from "
+"Shotwell onto a file manager window or your desktop. The new files will be "
+"full-sized copies of the photos in your library."
+msgstr ""
+"Pro export fotografií z aplikace Shotweel pomocí táhni a upusť, přetáhněte "
+"fotografie do okna správce souborů nebo na pracovní plochu. Nové soubory "
+"budou kopie fotografií v plné velikosti z vaší knihovny."
+
+#: C/share-export.page:18(p)
+msgid ""
+"Alternatively, select a set of photos and choose the <guiseq><gui>File</"
+"gui><gui>Export</gui></guiseq> command or press <keyseq><key>Shift</"
+"key><key>Ctrl</key><key>E</key></keyseq>, which exports photos while letting "
+"you fine-tune the size and dimensions of your photo files. A window will "
+"appear allowing you to make several choices:"
+msgstr ""
+"Jinou možností exportu je vybrat sadu fotografií a zvolit "
+"<guiseq><gui>Soubor</gui> <gui>Export</gui></guiseq> nebo zmáčknout "
+"<keyseq><key>Shift</key><key>Ctrl</key><key>E</key></keyseq>, čímž se "
+"fotografie exportují s poskytnutím volby jejich velikosti a rozměrů. Objeví "
+"se okno, ve kterém můžete provést tyto volby:"
+
+#: C/share-export.page:24(p)
+msgid "A format for export."
+msgstr "Formát exportu."
+
+#: C/share-export.page:27(p)
+msgid ""
+"Choose <gui>Unmodified</gui> to export photos in their original format "
+"without any edits made in Shotwell. RAW photos will be exported in their "
+"original RAW format."
+msgstr ""
+"Zvolte <gui>Beze změny</gui>, aby se fotografie exportovaly v původním "
+"formátu bez jakýchkoliv úprav provedených v rámci aplikace Shotwell. "
+"Fotografie RAW budou vyexportovány v původním formátu RAW."
+
+#: C/share-export.page:29(p)
+msgid ""
+"Choose <gui>Current</gui> to export photos including edits made in Shotwell. "
+"RAW photos will be exported in JPEG format if you have edited them in "
+"Shotwell, and otherwise in their original RAW format."
+msgstr ""
+"Zvolte <gui>Stávající</gui>, aby se fotografie vyexportovaly včetně změn "
+"provedených v rámci aplikace Shotwell. Fotografie RAW budou vyexportovány ve "
+"formátu JPEG v případě, že u nich byly provedeny nějaké změny, v opačném "
+"případě v jejich původním formátu RAW."
+
+#: C/share-export.page:31(p)
+msgid ""
+"Or you can choose a particular image format (JPEG, PNG, TIFF, BMP) to be "
+"used for exporting. Any edits made in Shotwell will be included, and "
+"Shotwell will convert photos to the destination format."
+msgstr ""
+"Nebo můžete zvolit konkrétní formát obrázku (JPEG, PNG, TIFF, BMP), který se "
+"má k exportu použít. Případné úpravy provedené v rámci aplikace Shotwell "
+"budou jeho součástí a Shotwell provede převod do cílového formátu."
+
+#: C/share-export.page:37(p)
+msgid "The image quality for exporting (Low, Medium, High, or Maximum)."
+msgstr "Kvalita exportovaného obrázku (nízká, střední, vysoká nebo maximální)."
+
+#: C/share-export.page:38(p)
+msgid ""
+"A scaling constraint (which means how Shotwell will decide to scale the "
+"photos down), and the desired pixel size."
+msgstr ""
+"Pravidlo pro škálování (což znamená, jak se má Shotwell chovat při škálování "
+"fotografií na menší rozměr) a požadovaná velikost v pixelech."
+
+#: C/share-export.page:39(p)
+msgid ""
+"The option whether you like to export metadatas such as tags or ratings. "
+"This can help to save your privacy if you have geolocation tags or tags "
+"which shouldn't be seen by anyone."
+msgstr ""
+"Volba, jestli chcete exportovat i metadata, jako jsou štítky nebo hodnocení. "
+"To vám může pomoci v ochraně soukromí, pokud máte štítky s geolokačními "
+"údaji nebo jiné štítky, které nechcete, aby viděl někdo jiný."
+
+#: C/share-export.page:42(p)
+msgid ""
+"If selected, Shotwell will write tags, titles, and other metadata to the new "
+"files."
+msgstr ""
+"Pokud je vybráno, bude Shotwell do nových souborů zapisovat štítky, názvy a "
+"ostatní metadata."
+
+#: C/share-background.page:7(desc)
+msgid ""
+"Set your desktop background to a single photo or to a slideshow of photos."
+msgstr ""
+"Jak nastavit pozadí své pracovní plochy na konkrétní fotografii nebo "
+"promítání více fotografií."
+
+#: C/share-background.page:12(title)
+msgid "Set a desktop background or slideshow"
+msgstr "Nastavení obrázku nebo promítání na pozadí plochy"
+
+#: C/share-background.page:14(p)
+msgid ""
+"To set a single photo as your desktop background, select the photo and "
+"choose <guiseq><gui>File</gui><gui>Set as Desktop Background</gui></guiseq>."
+msgstr ""
+"Pokud si chcete nastavit jednu nějakou fotografii jak pozadí své pracovní "
+"plochy, vyberte ji a zvolte <guiseq><gui>Soubor</gui><gui>Nastavit jako "
+"pozadí plochy</gui></guiseq>."
+
+#: C/share-background.page:16(p)
+msgid ""
+"You can also set your background to a slideshow of photos. To do this, "
+"select the photos for the slideshow and choose <guiseq><gui>File</"
+"gui><gui>Set as Desktop Slideshow</gui></guiseq>. Shotwell will prompt you "
+"for a slideshow delay, which can be any interval up to one day in length. "
+"The background slideshow will proceed even when Shotwell is not running."
+msgstr ""
+"Pozadí své pracovní plochy můžete nastavit také na promítání fotografií. "
+"Stačí fotografie, které chcete promítat, vybrat a zvolit "
+"<guiseq><gui>Soubor</gui><gui>Nastavit jako prezentaci na ploše</gui></"
+"guiseq>. Shotwell se vás dotáže na dobu zobrazení snímků, což může být "
+"libovolný čas až jeden den dlouhý. Promítání na pozadí bude probíhat, i když "
+"nebude Shotwell spuštěný."
+
+#: C/running.page:7(desc)
+msgid ""
+"Find Shotwell in the Applications menu, or have it start automatically when "
+"you plug in a camera."
+msgstr ""
+"Jak najít Shotwell v nabídce aplikací nebo jak jej spouštět automaticky při "
+"zapojení fotoaparátu."
+
+#: C/running.page:14(title)
+msgid "Running Shotwell"
+msgstr "Spuštění aplikace Shotwell"
+
+#: C/running.page:16(p)
+msgid ""
+"Once installed, Shotwell is available in your <gui>Applications</gui> menu "
+"under <gui>Graphics</gui> or <gui>Photography</gui>."
+msgstr ""
+"Jakmile je Shotwell nainstalován, je k nalezení v nabídce <gui>Aplikace</"
+"gui> v oddíle <gui>Grafika</gui> nebo <gui>Fotografie</gui>."
+
+#: C/running.page:18(p)
+msgid ""
+"Shotwell may also be executed automatically when a camera is plugged in to "
+"your computer. To check that your system is set up to run Shotwell when a "
+"camera is detected, go to <guiseq><gui>Edit</gui><gui>Preferences</gui></"
+"guiseq> in any Nautilus (file browser) window and choose the <gui>Media</"
+"gui> tab.  You'll see a dropdown box entitled <gui>Photos:</gui> which lets "
+"you choose Shotwell as your photo handling application."
+msgstr ""
+"Shotwell se může také spouštět automaticky po té, co je k počítači připojen "
+"fotoaparát. Pokud si chcete zkontrolovat, jestli je váš systém nastaven, aby "
+"spustil Shotwell, když zjistí přitomnost fotoaparátu, jděte do "
+"<guiseq><gui>Upravit</gui> <gui>Předvolby</gui></guiseq> v okně aplikace "
+"Nautilus (správce souborů) a zvolte kartu <gui>Média</gui>. Uvidíte "
+"rozbalovací pole s popisem <gui>Fotografie:</gui>, ve kterém si můžete "
+"vybrat Shotwell jako aplikaci starající se o fotografie."
+
+#: C/running.page:25(p)
+msgid ""
+"Shotwell may also be executed directly from its build directory, although "
+"this is only recommended for testing out Shotwell or for developers."
+msgstr ""
+"Shotwell je možné spusti i přímo ze složky, ve které byl sestaven, ale to má "
+"význam jen pro ty, kteří Shotwell testují nebo vyvíjí."
+
+#: C/raw.page:7(desc)
+msgid "More about RAW support in Shotwell."
+msgstr "Více o podpoře RAW v aplikaci Shotwell."
+
+#: C/raw.page:12(title)
+msgid "RAW support in Shotwell"
+msgstr "Podpora RAW v aplikaci Shotwell"
+
+#: C/raw.page:13(p)
+msgid ""
+"Some cameras have the ability to store data directly off the sensor and into "
+"a file that contains extra color information; this is commonly referred to "
+"as 'RAW' or 'camera RAW', and Shotwell supports these files as well."
+msgstr ""
+"Některé fotoaparáty umí uložit data přímo ze snímače a to do souboru, který "
+"obsahuje dodatečné informace o barvě. Obecně jsou tyto soubory nazývány "
+"„RAW“ nebo „surové fotografie“ a Shotwell s nimi dokáže pracovat."
+
+#: C/raw.page:18(p)
+msgid ""
+"Since RAW photographs normally cannot be displayed directly, but must be "
+"first developed - that is, have their extra information interpreted and "
+"readied for displaying - most cameras will either embed a JPEG inside a RAW-"
+"format file, or produce a JPEG alongside the RAW file at the time the "
+"snapshot is taken. The latter is referred to throughout this document as RAW"
+"+JPEG. If you import a RAW+JPEG pair, Shotwell will keep them paired and "
+"treat them as one item in your library."
+msgstr ""
+"Protože fotografie RAW nelze normálně zobrazit přímo, ale musí být nejprve "
+"vyvolány – tj. jejich dodatečné informace interpretovány a připraveny pro "
+"zobrazení – většina fotoaparátů při pořízení snímku buď do souboru ve "
+"formátu RAW vloží navíc JPEG nebo uloží JPEG zvlášť zvlášť vedle souboru "
+"RAW. Druhý způsob bude v tomto textu nadále označován jako RAW+JPEG. Když "
+"importujete pár RAW+JPEG, Shotwell je uchová spárované a v knihovně s nimi "
+"zachází jako s jedinou položkou."
+
+#: C/raw.page:27(p)
+msgid ""
+"When you import a RAW file, you can choose to either use the camera's "
+"internally-developed JPEG or Shotwell's by selecting <guiseq><gui>Photos</"
+"gui><gui>Developer</gui></guiseq> in the menus."
+msgstr ""
+"Když importujete soubor RAW, můžete si zvolit mezi interním kamerou "
+"vyvolaným formátem JPEG nebo jej nechat vyvolat aplikací Shotwell pomocí "
+"<guiseq><gui>Fotografie</gui> <gui>Vývojka</gui></guiseq> v nabídce."
+
+#: C/raw.page:33(p)
+msgid ""
+"Changing between developers will cause all edits made to a photograph to be "
+"discarded."
+msgstr ""
+"Změna vývojky může způsobit, že všechny úpravy provedené ve fotografii budou "
+"zahozeny."
+
+#: C/raw.page:39(p)
+msgid ""
+"In order to publish or use a RAW photograph in most other software, it has "
+"to be exported first. Shotwell can export your RAW photos in JPEG, PNG, TIFF "
+"or BMP format, and, when publishing, will internally export a JPEG version "
+"for you and publish that."
+msgstr ""
+"Aby šla fotografie RAW zveřejnit nebo používat v jiném softwaru, musí být "
+"nejprve exportována. Shotwell umí vaše fotografie RAW exportovat do formátů "
+"JPEG, PNG, TIFF nebo BMP a když je publikujete, interně vám je exportuje do "
+"verze JPEG a tak je i zveřejní."
+
+#: C/other-plugins.page:7(desc)
+msgid "Extend Shotwell's functionality dynamically."
+msgstr "Jak dynamicky rozšířit funkcionalitu aplikace Shotwell."
+
+#: C/other-plugins.page:12(title)
+msgid "Plugins"
+msgstr "Zásuvné moduly"
+
+#: C/other-plugins.page:13(p)
+msgid ""
+"Shotwell can be used with <em>plugins</em>, which are companion shared "
+"libraries that can add support for new publishing destinations or new "
+"slideshow transitions."
+msgstr ""
+"Shotwell umí používat <em>zásuvné moduly</em>, což jsou přidružené sdílené "
+"knihovny, které přidávají podporu pro nová místa pro zveřejňování nebo nové "
+"přechody pro promítání."
+
+#: C/other-plugins.page:18(p)
+msgid ""
+"To see a list of installed plugins, choose <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui></guiseq>, and in the <gui>Preferences</gui> "
+"window, click on the <gui>Plugins</gui> tab. You'll see a list of currently-"
+"installed plugins, each with a checkbox by it, and you may enable or disable "
+"each by selecting or deselecting the checkbox by its name."
+msgstr ""
+"Abyste viděli seznam nainstalovaných zásuvných modulů, zvolte "
+"<guiseq><gui>Upravit</gui> <gui>Předvolby</gui></guiseq> a v okně předvoleb "
+"klikněte na kartu <gui>Zásuvné moduly</gui>. Zobrazí se vám seznam aktuálně "
+"nainstalovaných zásuvných modulů. Vedle každého je zaškrtávací políčko, "
+"pomocí kterého jej můžete povolit nebo zakázat."
+
+#: C/other-plugins.page:25(p)
+msgid ""
+"Full documentation on how to develop new plugins is available at <link href="
+"\"http://redmine.yorba.org/projects/shotwell/wiki/ShotwellArchWritingPlugins"
+"\">http://redmine.yorba.org/projects/shotwell/wiki/"
+"ShotwellArchWritingPlugins</link>"
+msgstr ""
+"Kompletní dokumentace k tomu, jak vyvíjet nové zásuvné moduly je k dispozici "
+"na <link href=\"http://redmine.yorba.org/projects/shotwell/wiki/"
+"ShotwellArchWritingPlugins\">http://redmine.yorba.org/projects/shotwell/wiki/"
+"ShotwellArchWritingPlugins</link> (odkazovaný text je v angličtině)."
+
+#: C/other-multiple.page:7(desc)
+msgid ""
+"You can open Shotwell with a different photo library by using the command "
+"line."
+msgstr ""
+"Jak otevřít Shotwell s jinou knihovnou fotografií pomocí příkazového řádku."
+
+#: C/other-multiple.page:12(title)
+msgid "Multiple libraries"
+msgstr "Více knihoven"
+
+#: C/other-multiple.page:14(p)
+msgid ""
+"Shotwell normally stores its database and photo thumbnails in the directory "
+"<file>~/.shotwell</file> . This directory does not hold photos, but the "
+"database in this directory contains a list of all the photos in the Shotwell "
+"library."
+msgstr ""
+"Normálně Shotwell uchovává svoji databázi a náhledy fotografií ve složce "
+"<file>~/.shotwell</file>. V této složce se nenachází přímo fotografie, ale "
+"databáze v této složce obsahuje seznam všech fotografií v knihovně Shotwell."
+
+#: C/other-multiple.page:16(p)
+msgid ""
+"As an advanced feature, it's possible for you to have multiple Shotwell "
+"libraries, each of which has its own set of photos. Each library needs its "
+"own database directory. To launch Shotwell with an alternate library, "
+"specify an alternate database directory on the command line as follows:"
+msgstr ""
+"Jak pokročilá funkce je k dispozici možnost mít více knihoven Shotwell, "
+"každou s vlastní sadou fotografií. Každá knihovna potřebuje svoji vlastní "
+"složku pro databázi. Abyste spustili Shotwell s alternativní knihovnou, "
+"zadejte alternativní složku s databází na příkazovém řádku tímto způsobem:"
+
+#: C/other-multiple.page:18(screen)
+#, no-wrap
+msgid ""
+"\n"
+"shotwell -d [library-directory]\n"
+msgstr ""
+"\n"
+"shotwell -d [složka-knihovny]\n"
+
+#: C/other-missing.page:7(desc)
+msgid "If Shotwell can't find a photo in your library, it marks it as missing."
+msgstr ""
+"Když Shotwell nemůže fotografii najít v knihovně, označí ji za chybějící."
+
+#: C/other-missing.page:12(title)
+msgid "Missing photos"
+msgstr "Chybějící fotografie"
+
+#: C/other-missing.page:14(p)
+msgid ""
+"Each time Shotwell starts up, it scans your photo library to verify that all "
+"photo files still exist on your hard drive. If Shotwell finds that any photo "
+"files are missing, it will not display them in the normal Photos, Events and "
+"Tags views, but will instead show them in a separate Missing Files view "
+"which will appear in the sidebar."
+msgstr ""
+"Pokaždé, když je Shotwell spuštěn, prochází vaši knihovnu fotografií a "
+"ověřuje, jestli se všechny fotografie stále nachází na pevném disku. Pokud "
+"zjistí, že některé soubory s fotografiemi schází, nezobrazí je běžně v "
+"Fotografie, Události a Štítky, ale místo toho se objeví v zobrazení "
+"Chybějící soubory, které přibude v postranním panelu."
+
+#: C/other-missing.page:16(p)
+msgid ""
+"If you no longer want the missing files to be part of your Shotwell "
+"collection (perhaps because you deleted them), go to the Missing Files view, "
+"select the photos and then click <gui>Remove From Library</gui>."
+msgstr ""
+"Jestli již nechcete, aby takovéto chybějící soubory byly součástí vaší "
+"sbírky v aplikaci Shotwell (nejspíše proto, že jste je smazali), přejděte do "
+"zobrazení Chybějící soubory, fotografie vyberte a klikněte na <gui>Odstranit "
+"z knihovny</gui>."
+
+#: C/other-missing.page:18(p)
+msgid ""
+"If you have photos on a removable disk, such as a CD or USB flash drive, and "
+"<link xref=\"index#import\">import</link> them into Shotwell <em>without</"
+"em> copying the photos to your computer, they will show up as missing files "
+"if you then disconnect the removable disk. See <link xref=\"import-file\"/> "
+"to learn how to copy files from removable disks onto your computer."
+msgstr ""
+"V případě, že máte fotografie na výměnném disku, jako je CD nebo USB "
+"Flashdisk a <link xref=\"index#import\">naimportujete</link> je do aplikace "
+"Shotwell <em>bez</em> kopírování fotografií do svého počítače, objeví se "
+"jako chybějící soubory po té, co výměnný disk vyjmete. Viz <link xref="
+"\"import-file\"/> na téma, jak zkopírovat soubory z výměnného disku do "
+"vašeho počítače."
+
+#: C/other-missing.page:20(p)
+msgid ""
+"If any missing photo files become available again, Shotwell will notice this "
+"the next time it starts. The photos will once again appear in the Photos, "
+"Events and Tags views."
+msgstr ""
+"Pokud se některé chybějící soubory opět zpřístupní, Shotwell si toho při "
+"následujícím spuštění všimne. Fotografie se pak znovu objeví ve "
+"Fotografiích, Událostech a Štítcích."
+
+#: C/other-files.page:7(desc)
+msgid "Keep the Shotwell library in sync with photo files on disk."
+msgstr ""
+"Jak zachovat knihovnu Shotwell synchronizovanou se soubory s fotografiemi na "
+"disku."
+
+#: C/other-files.page:12(title)
+msgid "Photo files"
+msgstr "Soubory s fotografiemi"
+
+#: C/other-files.page:14(p)
+msgid ""
+"Every photo in the Shotwell library corresponds to a file stored on your "
+"hard disk. Shotwell has several features which help you keep the Shotwell "
+"library and files on disk in sync."
+msgstr ""
+"Každá fotografie v knihovně Shotwell odpovídá souboru uloženému na vašem "
+"pevném disku. Shotwell má několik funkcí, které pomáhají udržet jeho "
+"knihovnu a soubory na disku synchronizované."
+
+#: C/other-files.page:21(title)
+msgid "Using a custom directory pattern"
+msgstr "Používání vlastního vzoru složky"
+
+#: C/other-files.page:22(p)
+msgid ""
+"Shotwell allows you to specify how it names directories in your library. You "
+"can do this by changing the <gui>Directory Structure</gui> and <gui>Pattern</"
+"gui> settings in the <gui>Preferences</gui> dialog. You may use a "
+"preselected pattern, or choose <gui>Custom</gui> and type in your own."
+msgstr ""
+"Shotwell umožňuje určit, jak má pojmenovávat složky ve vaší knihovně. Můžete "
+"tak učinit změnou nastavení <gui>Struktury složek</gui> a <gui>Vzoru</gui> v "
+"dialogovém okně <gui>Předvolby</gui>. K dispozici jsou předdefinované vzory "
+"nebo zvolte <gui>Vlastní</gui> a zapište svůj vlastní."
+
+#: C/other-files.page:29(p)
+msgid ""
+"The available symbols for the directory pattern begin with a % (percent "
+"sign). The values these symbols produce are locale-dependent, so what you "
+"see on your computer may vary from the examples below."
+msgstr ""
+"Všechny symboly pro vzor složek začínají znakem % (procenta). Hodnoty těchto "
+"symbolů se vytváří na základě národního prostředí, takže to co uvidíte ve "
+"svém počítač se může lišit od příkladů níže."
+
+#: C/other-files.page:38(em)
+msgid "Symbol"
+msgstr "symbol"
+
+#: C/other-files.page:38(em)
+msgid "Meaning"
+msgstr "význam"
+
+#: C/other-files.page:38(em)
+msgid "Example"
+msgstr "příklad"
+
+#: C/other-files.page:43(p)
+msgid "%Y"
+msgstr "%Y"
+
+#: C/other-files.page:43(p)
+msgid "Year: full"
+msgstr "rok: úplný"
+
+#: C/other-files.page:43(p)
+msgid "2011"
+msgstr "2011"
+
+#: C/other-files.page:46(p)
+msgid "%y"
+msgstr "%y"
+
+#: C/other-files.page:46(p)
+msgid "Year: two digit"
+msgstr "rok: dvě číslice"
+
+#: C/other-files.page:46(p)
+msgid "11"
+msgstr "11"
+
+#: C/other-files.page:49(p)
+msgid "%d"
+msgstr "%d"
+
+#: C/other-files.page:49(p)
+msgid "Day of the month with leading zero"
+msgstr "den v měsíci dvojmístný s úvodní nulou"
+
+#: C/other-files.page:49(p)
+msgid "03"
+msgstr "03"
+
+#: C/other-files.page:52(p)
+msgid "%A"
+msgstr "%A"
+
+#: C/other-files.page:52(p)
+msgid "Day name: full"
+msgstr "název dne: úplný"
+
+#: C/other-files.page:52(p)
+msgid "Wednesday"
+msgstr "Středa"
+
+#: C/other-files.page:55(p)
+msgid "%a"
+msgstr "%a"
+
+#: C/other-files.page:55(p)
+msgid "Day name: abbreviated"
+msgstr "název dne: zkratka"
+
+#: C/other-files.page:55(p)
+msgid "Wed"
+msgstr "St"
+
+#: C/other-files.page:58(p)
+msgid "%m"
+msgstr "%m"
+
+#: C/other-files.page:58(p)
+msgid "Month number with leading zero"
+msgstr "číslo měsíce dvojmístné s úvodní nulou"
+
+#: C/other-files.page:58(p)
+msgid "02"
+msgstr "02"
+
+#: C/other-files.page:60(p)
+msgid "%b"
+msgstr "%b"
+
+#: C/other-files.page:60(p)
+msgid "Month name: abbreviated"
+msgstr "název měsíce: zkratka"
+
+#: C/other-files.page:60(p)
+msgid "Feb"
+msgstr "bře"
+
+#: C/other-files.page:62(p)
+msgid "%B"
+msgstr "%B"
+
+#: C/other-files.page:62(p)
+msgid "Month name: full"
+msgstr "název měsíce: úplný"
+
+#: C/other-files.page:62(p)
+msgid "February"
+msgstr "březen"
+
+#: C/other-files.page:63(p)
+msgid "%I"
+msgstr "%I"
+
+#: C/other-files.page:63(p)
+msgid "Hour: 12 hour format"
+msgstr "hodiny: 12hodinový formát"
+
+#: C/other-files.page:63(p)
+msgid "05"
+msgstr "05"
+
+#: C/other-files.page:64(p)
+msgid "%H"
+msgstr "%H"
+
+#: C/other-files.page:64(p)
+msgid "Hour: 24 hour format"
+msgstr "hodiny: 24hodinový formát"
+
+#: C/other-files.page:64(p)
+msgid "17"
+msgstr "17"
+
+#: C/other-files.page:66(p)
+msgid "%M"
+msgstr "%M"
+
+#: C/other-files.page:66(p)
+msgid "Minute"
+msgstr "minuty"
+
+#: C/other-files.page:66(p)
+msgid "16"
+msgstr "16"
+
+#: C/other-files.page:67(p)
+msgid "%S"
+msgstr "%S"
+
+#: C/other-files.page:67(p)
+msgid "Second"
+msgstr "sekundy"
+
+#: C/other-files.page:67(p)
+msgid "30"
+msgstr "30"
+
+#: C/other-files.page:68(p)
+msgid "%p"
+msgstr "%p"
+
+#: C/other-files.page:68(p)
+msgid "AM or PM"
+msgstr "odp. nebo dop."
+
+#: C/other-files.page:68(p)
+msgid "PM"
+msgstr "odp."
+
+#: C/other-files.page:72(p)
+msgid ""
+"There are other symbols available; please check the manual for strftime by "
+"running the command <cmd>man strftime</cmd> if you need one that isn't "
+"listed here."
+msgstr ""
+"Existují ještě další symboly, které zde uvedené nejsou. Jestli vás zajímají, "
+"podívejte se do příručky k funkci strftime, stačí použít příkaz <cmd>man "
+"strftime</cmd>."
+
+#: C/other-files.page:79(title)
+msgid "Automatically importing photos"
+msgstr "Automatický import fotografií"
+
+#: C/other-files.page:81(p)
+msgid ""
+"Shotwell can automatically import new photos which appear in the library "
+"directory. (The library directory is usually the <file>Pictures</file> "
+"directory in your home directory; you can change its location in in the "
+"<gui>Preferences</gui> window.)"
+msgstr ""
+"Shotwell může automaticky importovat nové fotografie, které se objeví ve "
+"složce knihovny. (Složkou knihovny je obvykle složka <file>Obrázky</file> ve "
+"vaší domovské složce. Toto umístění můžete změnit v okně <gui>Předvolby</"
+"gui>.)"
+
+#: C/other-files.page:86(p)
+msgid ""
+"To enable auto-import, check the box <gui>Watch library directory for new "
+"files</gui> in the <gui>Preferences</gui> window."
+msgstr ""
+"Pro zapnutí automatického importu zaškrtněte políčko <gui>Sledovat, jestli "
+"nejsou do knihovny přidány nové soubory</gui> v okně <gui>Předvolby</gui>."
+
+#: C/other-files.page:90(p)
+msgid ""
+"Shotwell can also follow symbolic links inside automatically-imported "
+"directories."
+msgstr ""
+"Shotwell také umí automaticky následovat symbolické odkazy v automaticky "
+"importovaných složkách."
+
+#: C/other-files.page:95(title)
+msgid "Automatically renaming imported photos to lowercase"
+msgstr "Automatické přejmenování importovaných fotografií na malá písmena"
+
+#: C/other-files.page:97(p)
+msgid ""
+"Shotwell can automatically change the filenames of imported photos to "
+"lowercase. To enable this, choose <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui></guiseq>, and in the <gui>Preferences</gui> window, check the "
+"<gui>Rename imported files to lowercase</gui> box."
+msgstr ""
+"Shotwell může automaticky měnit názvy souborů importovaných fotografií na "
+"malá písmena. Pokud tomu tak chcete, zvolte <guiseq><gui>Upravit</gui> "
+"<gui>Předvolby</gui></guiseq> a v okně, které se objeví, zaškrtněte políčko "
+"<gui>Převádět názvy importovaných souborů na malá písmena</gui>."
+
+#: C/other-files.page:107(title)
+msgid "Writing metadata on the fly"
+msgstr "Zápis metadat za běhu"
+
+#: C/other-files.page:109(p)
+msgid ""
+"By default, Shotwell does not modify photo files, even when you edit photos "
+"or change their tags or titles. Shotwell records these changes in its own "
+"database only."
+msgstr ""
+"Standardně Shotwell nemění soubory s fotografiemi, i když fotografii "
+"upravíte nebo změníte její štítky nebo název. Tyto změny pouze zaznamená do "
+"své vlastní databáze."
+
+#: C/other-files.page:112(p)
+msgid ""
+"To change this behavior, you can enable the checkbox <gui>Write tags, titles "
+"and other metadata to photo files</gui> in the <gui>Preferences</gui> "
+"dialog. When this option is enabled, Shotwell will write the following "
+"metadata to most photo files whenever you change it in Shotwell:"
+msgstr ""
+"Pokud chcete toto chování změnit, zaškrtněte políčko <gui>Zapisovat štítky, "
+"názvy a další metadata do souborů s fotografiemi</gui> v dialogovém okně "
+"<gui>Předvolby</gui>. Jakmile je tato volba zapnutá, Shotwell bude zapisovat "
+"následující metadata do většiny souborů s fotografiemi, kdykoliv provedete "
+"změnu:"
+
+#: C/other-files.page:118(p)
+msgid "titles"
+msgstr "název"
+
+#: C/other-files.page:119(p)
+msgid "tags"
+msgstr "štítky"
+
+#: C/other-files.page:120(p)
+msgid "ratings"
+msgstr "hodnocení"
+
+#: C/other-files.page:121(p)
+msgid "rotation information"
+msgstr "informace o otočení"
+
+#: C/other-files.page:122(p)
+msgid "time/date"
+msgstr "datum/čas"
+
+#: C/other-files.page:125(p)
+msgid ""
+"Shotwell stores this information in photo files in EXIF, IPTC and/or XMP "
+"format. Note that Shotwell can write only to photo files in JPEG, PNG and "
+"TIFF format, not to BMP photos, RAW photos or to video files."
+msgstr ""
+"Shotwell ukládá tyto informace do souborů s fotografiemi pomocí formátů "
+"EXIF, IPTC a/nebo XMP. Upozorňujeme, že je umí zapisovat pouze do souborů ve "
+"formátu JPEG, PNG a TIFF, nikoliv do fotografií BMP a RAW a do videosouborů."
+
+#: C/other-files.page:133(title)
+msgid "Runtime monitoring"
+msgstr "Sledování běhu"
+
+#: C/other-files.page:135(p)
+msgid ""
+"While Shotwell is running, it notices changes made to any photo file "
+"externally. When a photo file changes, Shotwell rereads the file and updates "
+"your view of the photo and metadata."
+msgstr ""
+"Když Shotwell běží, přijímá upozornění o externích změnách v souborech s "
+"fotografiemi. Když se takovýto soubor změní, Shotwell jej znovu načte a "
+"aktualizuje zobrazení fotografie a metadata."
+
+#: C/other-files.page:139(p)
+msgid ""
+"Note that Shotwell checks all photo files for changes at startup, but only "
+"photo files contained in the library directory are monitored in real time "
+"after startup. We hope to remove this limitation in a further release."
+msgstr ""
+"Je třeba si uvědomit, že Shotwell při spuštění kontroluje všechny soubory s "
+"fotografiemi, ale jen soubory nacházející se ve složce knihovny jsou "
+"sledovány v reálném čase po spuštění. Autoři doufají, že v příštích vydáních "
+"bude toto omezení překonáno."
+
+#: C/organize-title.page:7(desc)
+msgid "Give titles to your photos."
+msgstr "Jak přidělit svým fotografiím názvy."
+
+#: C/organize-title.page:12(title)
+msgid "Titles"
+msgstr "Názvy"
+
+#: C/organize-title.page:14(p)
+msgid ""
+"The <guiseq><gui>View</gui><gui>Titles</gui></guiseq> checkbox toggles the "
+"display of titles beneath each photo. By default, a photo's title is its "
+"filename."
+msgstr ""
+"Zaškrtávací položka nabídky <guiseq><gui>Zobrazit</gui> <gui>Názvy</gui></"
+"guiseq> přepíná zobrazení názvů pod každou fotografií. Jako výchozí název "
+"fotografie se používá název jejího souboru."
+
+#: C/organize-title.page:17(p)
+msgid ""
+"To change a photo's title, select the photo and click <guiseq><gui>Photos</"
+"gui><gui>Edit Title</gui></guiseq>, or press <key>F2</key>."
+msgstr ""
+"Název můžete změnit tak, že fotografii vyberete a kliknete na "
+"<guiseq><gui>Fotografie</gui> <gui>Změnit název</gui></guiseq> nebo "
+"zmáčknete <key>F2</key>."
+
+#: C/organize-tag.page:7(desc)
+msgid "Organize photos by labelling them."
+msgstr "Jak roztřídit fotografie pomocí štítků."
+
+#: C/organize-tag.page:14(title)
+msgid "Tagging photos"
+msgstr "Přiřazení štítků fotografiím"
+
+#: C/organize-tag.page:16(p)
+msgid ""
+"You can assign one or more tags to selected photos. A tag can be one or more "
+"words that you want to associate with those photos."
+msgstr ""
+"Vybraným fotografiím můžete přiřadit jeden nebo více štítků. Štítkem může "
+"být jedno nebo i více slov, která přibližují obsah fotografie."
+
+#: C/organize-tag.page:22(p)
+msgid ""
+"To add new tags to photos, select the photos you would like to tag, then do "
+"any of the following:"
+msgstr ""
+"Když chcete fotografii přidat nový štítek, vyberte ji a proveďte něco z "
+"následujícího:"
+
+#: C/organize-tag.page:28(p)
+msgid "Choose <guiseq><gui>Tags</gui><gui>Add Tags</gui></guiseq>."
+msgstr "Zvolte <guiseq><gui>Štítky</gui> <gui>Přídat štítky</gui></guiseq>."
+
+#: C/organize-tag.page:29(p)
+msgid "Type <keyseq><key>Ctrl</key><key>T</key></keyseq>."
+msgstr "Zmáčkněte <keyseq><key>Ctrl</key><key>T</key></keyseq>."
+
+#: C/organize-tag.page:30(p)
+msgid "Drag the selected photos and drop them on the desired tag."
+msgstr "Přetáhněte fotografii na požadovaný štítek v postranním panelu."
+
+#: C/organize-tag.page:33(p)
+msgid ""
+"When you use <keyseq><key>Ctrl</key><key>T</key></keyseq> or "
+"<guiseq><gui>Tags</gui><gui>Add Tags</gui></guiseq> you can type in the "
+"names of one or more tags, separated by commas. Once you have created a tag, "
+"you can rename it by selecting that tag in the sidebar and choosing "
+"<guiseq><gui>Tags</gui><gui>Rename Tag \"[name]\"</gui></guiseq>, by "
+"rightclicking on it and choose <gui>Rename...</gui> or double-click on the "
+"tag in the sidebar."
+msgstr ""
+"Když použijete <keyseq><key>Ctrl</key> <key>T</key></keyseq> nebo "
+"<guiseq><gui>Štítky</gui> <gui>Přidat štítky</gui></guiseq>, můžete napsat "
+"název jednoho nebo i více štítků oddělených čárkami. Jakmile máte štítek "
+"jednou vytvořený, můžete jej přejmenovat tak, že jej vyberete v postranním "
+"panelu a zvolíte <guiseq><gui>Štítky</gui> <gui>Přejmenovat štítek "
+"„[název]“</gui></guiseq> nebo pomocí pravého tlačítka a volbou "
+"<gui>Přejmenovat…</gui> nebo dvojitým kliknutím na něj v postranním panelu."
+
+#: C/organize-tag.page:44(p)
+msgid ""
+"To change which tags are associated with a particular photo, select that "
+"photo, choose <guiseq><gui>Tags</gui><gui>Modify Tags</gui></guiseq> or "
+"right-click on a photo and select <gui>Modify Tags</gui> and edit the comma "
+"separated list. To remove a tag from one or more photos, first select that "
+"tag in the sidebar, then select the photos you would like to remove, and "
+"choose <guiseq><gui>Tags</gui><gui>Remove Tag \"[name]\" from Photos</gui></"
+"guiseq> or right-click on the photos an select <gui>Remove Tag \"[name]\" "
+"from Photos</gui>."
+msgstr ""
+"V případě, že chcete změnit přidružení štítku k některé fotografii, vyberte "
+"danou fotografii, zvolte <guiseq><gui>Štítky</gui> <gui>Změnit štítky…</"
+"gui></guiseq> nebo použijte pravé tlačítko a zvolte <gui>Změnit štítky…</"
+"gui> a po té upravte seznam štítků oddělených čárkami. Pokud chcete štítek z "
+"jedné nebo více fotografií odstranit, nejprve štítek v postranním panelu "
+"vyberte, pak vyberte fotografii, ze které jej chcete odstranit a zvolte "
+"<guiseq><gui>Štítky</gui> <gui>Odstranit z fotky štítek „[název]“</gui></"
+"guiseq> nebo na ni klikněte pravým tlačítkem a zvolte <gui>Odstranit z fotky "
+"štítek „[název]“</gui>."
+
+#: C/organize-tag.page:58(p)
+msgid ""
+"To delete a tag entirely, select that tag in the sidebar and choose "
+"<guiseq><gui>Tags</gui><gui>Delete Tag \"[name]\"</gui></guiseq> or by right-"
+"click and select <gui>Delete Tag \"[name]\"</gui>."
+msgstr ""
+"Jestli chcete smazat štítek kompletně, vyberte jej v postranním panelu a "
+"zvolte <guiseq><gui>Štítky</gui> <gui>Smazat štítek „[název]“</gui></guiseq> "
+"nebo na něj klikněte pravým tlačítkem o zvolte <gui>Smazat štítek „[název]“</"
+"gui>."
+
+#: C/organize-tag.page:64(p)
+msgid ""
+"When you create a tag, it will appear in the sidebar under the Tags item, "
+"which is hidden if there are no tags. Photos can have multiple tags attached "
+"to them, and when you click on the name of a given tag in the sidebar, you "
+"will see all the photos associated with that tag."
+msgstr ""
+"Jakmile vytvoříte štítek, objeví se v postranním panelu pod položkou Štítky, "
+"která je skrytá v případě, že žádné štítky neexistují. Ke každé fotografii "
+"může být přiřazeno i více štítků a když kliknete na název štítku v "
+"postranním panelu, uvidíte všechny fotografie, které mají štítek přiřazený."
+
+#: C/organize-tag.page:73(title)
+msgid "Hierarchical Tags"
+msgstr "Hierarchické štítky"
+
+#: C/organize-tag.page:74(p)
+msgid ""
+"Shotwell supports also hierarchial tags. You can rearrange your tags by drag "
+"and drop a tag onto another. To create a new subtag right-click on a tag and "
+"select <gui>New</gui>."
+msgstr ""
+"Shotwell rovněž podporuje hierarchické štítky. Pomocí přetažení štítku na "
+"jiný štítek můžete měnit uspořádání. Když chcete vytvořit nový podřízený "
+"štítek, klikněte pravým tlačítkem a zvolte <gui>Nový</gui>."
+
+#: C/organize-tag.page:81(p)
+msgid ""
+"Hierarchial tags can help you to sort your tag list in ways that better "
+"match how you work or think; for example, you can store location tags like "
+"\"Mountains\" or \"Beach\" under a parent tag \"Places\", which itself can "
+"be placed under the tag \"Summer Holidays\"."
+msgstr ""
+"Díky hierarchickým štítkům můžete svůj seznam štítků roztřídit způsobem, "
+"který lépe odpovídá vaší práci nebo myšlení. Například může uchovávat štítky "
+"jako „hory“ nebo „u moře“ pod společným štítkem „místa“, který sám může být "
+"umístěn pod štítkem „dovolené“."
+
+#: C/organize-tag.page:89(p)
+msgid "Note that deleting a parent tag will also delete its child tags."
+msgstr ""
+"Vezměte na vědomí, že když smažete rodičovský štítek, smažou se i všichni "
+"jeho potomci."
+
+#: C/organize-search.page:7(desc)
+msgid "Find photos and videos in your collection by a variety of criteria."
+msgstr "Jak najít podle různých kritérií fotografie a videa ve své sbírce."
+
+#: C/organize-search.page:12(title)
+msgid "Searching"
+msgstr "Hledání"
+
+#: C/organize-search.page:14(p)
+msgid ""
+"There are two ways to search in Shotwell: the filter toolbar, and with a "
+"saved search. The search bar allows you to quickly search the current view "
+"for certain criteria. Saved Searches feature more complex search criteria "
+"and persist in the sidebar between sessions."
+msgstr ""
+"V aplikaci Shotwell existují dva způsoby jak vyhledávat: filtrovací "
+"nástrojová lišta a uložená hledání. Na vyhledávací liště můžete rychle "
+"hledat v aktuálním zobrazení podle konkrétního kritéria. Uložená hledání "
+"jsou mnohem komplexnější v zadávání kritérií a nacházejí se v postranním "
+"panelu."
+
+#: C/organize-search.page:21(title)
+msgid "Search bar"
+msgstr "Vyhledávací lišta"
+
+#: C/organize-search.page:22(p)
+msgid ""
+"The <guiseq><gui>View</gui><gui>Search Bar</gui></guiseq> checkbox toggles "
+"the display of the search bar. You can also hit <keyseq><key>Ctrl</"
+"key><key>F</key></keyseq> or <key>F8</key> to bring up the search bar. From "
+"this bar, you can find, show and hide photos and videos based on title, tag, "
+"rating or other options."
+msgstr ""
+"Zaškrtávací položka <guiseq><gui>Zobrazit</gui> <gui>Vyhledávací lišta</"
+"gui></guiseq> přepíná zobrazení vyhledávací lišty. Pro její zobrazení rovněž "
+"můžete zmáčknout <keyseq><key>Ctrl</key><key>F</key></keyseq> nebo <key>F8</"
+"key>. Pomocí této lišty můžete hledat, zobrazovat a skrývat fotografie a "
+"videa podle názvu, štítku, hodnocení a další věcí."
+
+#: C/organize-search.page:29(p)
+msgid ""
+"To begin searching, simply enter a search keyword in the text box, or click "
+"on <gui>Flagged</gui>, <gui>Rating</gui> or <gui>Type</gui>. The text search "
+"matches your keywords across tag names, photo or video titles and photos' "
+"original filenames. The <gui>Flagged</gui>, <gui>Rating</gui> and <gui>Type</"
+"gui> buttons allow you to filter your collection by whether photos are "
+"flagged, their current number of stars, and whether the items shown are "
+"images, videos, or raw camera files, respectively."
+msgstr ""
+"Hledat začnete jednoduše tak, že napíšete hledané slovo do textového pole "
+"nebo kliknete na <gui>Označeno</gui>, <gui>Hodnocení</gui> nebo <gui>Typ</"
+"gui>. U textu se hledají shody v názvech štítků, názvech fotografií a videí "
+"a původních názvech souborů. Tlačítka <gui>Označeno</gui>, <gui>Hodnocení</"
+"gui> a <gui>Typ</gui> umožňují sbírku filtrovat podle toho, jeslti jsou "
+"fotografie označeny, kolik mají aktuálně hvězdiček a podle toho, jestli to "
+"jsou obrázky, videa nebo případně surové fotografie RAW."
+
+#: C/organize-search.page:38(p)
+msgid ""
+"Disabling the search bar or exiting Shotwell automatically resets the search "
+"bar."
+msgstr ""
+"Vypnutí vyhledávací lišty nebo ukončení aplikace Shotwell výsledky hledání "
+"automaticky zruší."
+
+#: C/organize-search.page:44(title)
+msgid "Saved search"
+msgstr "Uložené hledání"
+
+#: C/organize-search.page:45(p)
+msgid ""
+"A saved search persists across Shotwell sessions, and is updated as photos "
+"and videos are added and removed from your Shotwell library."
+msgstr ""
+"Uložená hledání se uchovávají po všechna spuštění aplikace Shotwell a jsou "
+"aktualizována při přidání nebo odebrání fotografií a videí do nebo z "
+"knihovny Shotwell."
+
+#: C/organize-search.page:50(p)
+msgid ""
+"Create a new saved search with <guiseq><gui>Edit</gui><gui>New Search</gui></"
+"guiseq> or by hitting <keyseq><key>Ctrl</key><key>S</key></keyseq>. The "
+"dialog box allows you to enter a name for the search and select whether you "
+"want to meet Any, All, or None of the criteria in the following rows."
+msgstr ""
+"Nové uložené hledání vytvoříte pomocí <guiseq><gui>Upravit</gui> <gui>Nové "
+"uložené hledání</gui></guiseq> nebo zmáčknutím <keyseq><key>Ctrl</"
+"key><key>S</key></keyseq>. V dialogovém okně můžete zadat název hledání a "
+"vybrat, jestli se kritéria v následujících řádcích mají platit pro cokoliv, "
+"vše nebo nic."
+
+#: C/organize-search.page:56(p)
+msgid ""
+"Each row represents a search criterion. Use the + button to add more rows, "
+"and the - button to remove a specific row. The combo box on the left of each "
+"row selects the type of criteria. Criteria must be entered correctly before "
+"the OK button becomes available."
+msgstr ""
+"Každý řádek představuje jedno vyhledávací kritérium. Pro přidání dalších "
+"řádků použijte tlačítko +, pro odebrání konkrétního řádku tlačítko -. V "
+"rozbalovací nabídce po levé stráně každého řádku jsou typy kritérií. Aby "
+"bylo přístupné tlačítko Budiž, musí být kritéria zadána správně."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/organize-remove.page:15(None)
+msgid ""
+"@@image: 'figures/trash_process.png'; md5=ed596bda34c2f4a79a310fbc8bb51fd2"
+msgstr ""
+"@@image: 'figures/trash_process.png'; md5=ed596bda34c2f4a79a310fbc8bb51fd2"
+
+#: C/organize-remove.page:7(desc)
+msgid ""
+"Remove photos from the library, or delete them from your computer entirely."
+msgstr "Jak odebrat fotografie z knihovny nebo jak je zcela smazat z počítače."
+
+#: C/organize-remove.page:12(title)
+msgid "Removing and deleting photos"
+msgstr "Odstraňování a mazání fotografií"
+
+#: C/organize-remove.page:14(p)
+msgid ""
+"You may remove photos from your library and you may additionally delete them "
+"entirely from your hard disk."
+msgstr ""
+"Fotografie můžete odebrat z knihovny a navíc i úplně smazat z pevného disku."
+
+#: C/organize-remove.page:15(media)
+msgid "Delete process"
+msgstr "Postup mazání"
+
+#: C/organize-remove.page:16(p)
+msgid ""
+"This diagram shows how a photo, when deleted, is first put into Shotwell's "
+"trash. If you delete it from Shotwell's trash, it is put into your "
+"computer's trash. If you delete it from your computer's trash the photo is "
+"finally and irretrievably deleted from your computer."
+msgstr ""
+"Toto schéma ukazuje, jak je fotografie po smazání nejprve vložena do koše "
+"aplikace Shotwell. Po té, co ji smažete z koše v Shotwellu, je přesunuta do "
+"koše vašeho pracovního prostředí. Po smazání z tohoto koše je fotografie "
+"konečně a nevratně vymazána z vašeho počítače."
+
+#: C/organize-remove.page:18(title)
+msgid "Removing photos from the library"
+msgstr "Odebírání fotografií z knihovny"
+
+#: C/organize-remove.page:19(p)
+msgid ""
+"Select the photos to remove and choose <guiseq><gui>Edit</gui><gui>Move to "
+"Trash</gui></guiseq>. (You can also press the <key>Delete</key> key.) The "
+"photos will be moved from your library to Shotwell's Trash."
+msgstr ""
+"Vyberte fotografie, které chcete odebrat a zvolte <guiseq><gui>Upravit</gui> "
+"<gui>Přesunout do koše</gui></guiseq> (můžete také zmáčknout klávesu "
+"<key>Delete</key>). Fotografie se přesunou z knihovny do koše aplikace "
+"Shotwell."
+
+#: C/organize-remove.page:22(p)
+msgid ""
+"If you want to remove photos from Shotwell without having them pass through "
+"the trash, simply select the photos to be removed and choose "
+"<guiseq><gui>Edit</gui><gui>Remove From Library</gui></guiseq>. The photo "
+"files will be left in place on disk."
+msgstr ""
+"Pokud chcete fotografie odebrat z aplikace Shotwel bez mezikroku s košem, "
+"tak po jejich vybrání zvolte <guiseq><gui>Upravit</gui> <gui>Odstranit z "
+"knihovny</gui></guiseq>. Na disku zůstanou fotografie ponechány."
+
+#: C/organize-remove.page:26(title)
+msgid "Emptying or restoring the trash folder"
+msgstr "Vyprázdnění koše nebo obnovení jeho obsahu"
+
+#: C/organize-remove.page:27(p)
+msgid ""
+"Select the Trash entry in the Sidebar and Shotwell will display all photos "
+"that have been marked for removal or deletion. In the Trash view, the "
+"following commands are available:"
+msgstr ""
+"V postranním panelu vyberte Koš a Shotwell zobrazí všechny fotografie, které "
+"jsou připravené k odebrání nebo smazání. Když je koš zobrazen, jsou k "
+"dispozici následující příkazy:"
+
+#: C/organize-remove.page:29(title)
+msgid "Delete"
+msgstr "Smazat"
+
+#: C/organize-remove.page:29(p)
+msgid "Delete the selected photos from the trash folder."
+msgstr "Smaže vybrané fotografie ze složky koše."
+
+#: C/organize-remove.page:30(title)
+msgid "Restore"
+msgstr "Obnovit"
+
+#: C/organize-remove.page:30(p)
+msgid "Restore the selected photos into Shotwell."
+msgstr "Obnoví vybrané fotografie do knihovny Shotwell."
+
+#: C/organize-remove.page:31(title)
+msgid "Empty trash"
+msgstr "Vyprázdnit koš"
+
+#: C/organize-remove.page:31(p)
+msgid "Delete all photos from the trash folder."
+msgstr "Smaže ze složky koše všechny fotografie."
+
+#: C/organize-remove.page:36(title)
+msgid "Deleting or emptying Trash"
+msgstr "Mazání a vyprazdňování koše"
+
+#: C/organize-remove.page:37(p)
+msgid ""
+"When you delete files from the Trash folder or empty the Trash folder, you "
+"will be given the following choices:"
+msgstr ""
+"Když ze složky koše mažete soubory, případně složku koše úplně "
+"vyprazdňujete, dostanete na výběr následující možnosti:"
+
+#: C/organize-remove.page:39(title)
+msgid "Only Remove"
+msgstr "Jen odstranit"
+
+#: C/organize-remove.page:39(p)
+msgid ""
+"Remove photos from the library but leave the photos in their location on the "
+"computer."
+msgstr ""
+"Odebere fotografie z knihovny, ale ponechá je na jejich místech v počítači."
+
+#: C/organize-remove.page:40(title)
+msgid "Trash file"
+msgstr "Přesunout do koše"
+
+#: C/organize-remove.page:40(p)
+msgid "Remove photos from the library and delete them from the computer."
+msgstr "Odebere fotografie z knihovny a rovněž je smaže z počítače."
+
+#: C/organize-remove.page:41(title)
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: C/organize-remove.page:41(p)
+msgid "Do nothing."
+msgstr "Neprovede se nic."
+
+#: C/organize-rating.page:7(desc)
+msgid ""
+"Give photos a rating between 1 and 5 stars. You can reject bad photos, "
+"hiding them from view."
+msgstr ""
+"Jak svým fotografiím přidělit hodnocení v rozsahu 1 až 5 hvězdiček. Můžete "
+"odmítnou špatné fotografie tak, že je skryjete ze zobrazení."
+
+#: C/organize-rating.page:12(title)
+msgid "Ratings"
+msgstr "Hodnocení"
+
+#: C/organize-rating.page:13(p)
+msgid ""
+"You can assign each photo a rating from 1-5 stars, or may alternatively rate "
+"it as Rejected, in which case Shotwell will hide the photo by default."
+msgstr ""
+"Každé z fotografií můžete přiřadit hodnocení od 1 do 5 hvězdiček, případně "
+"ji ohodnotit jako zamítnutou. Zamítnuté fotografie Shotwell při výchozím "
+"nastavení skrývá."
+
+#: C/organize-rating.page:15(p)
+msgid "You can rate a photo or a set of photos in any of these ways:"
+msgstr "Fotografii nebo sadu fotografií můžete hodnotit následujícími způsoby:"
+
+#: C/organize-rating.page:18(p)
+msgid ""
+"Select the photo(s), then choose a rating from the top-level "
+"<guiseq><gui>Photos</gui><gui>Set Rating</gui></guiseq> menu."
+msgstr ""
+"Vyberte fotografii či fotografie a zvolte hodnocení v nabídce "
+"<guiseq><gui>Fotografie</gui> <gui>Hodnotit</gui></guiseq>."
+
+#: C/organize-rating.page:19(p)
+msgid ""
+"Right-click on the photo(s), then choose a rating from the Set Rating "
+"context menu."
+msgstr ""
+"Klikněte na fotografii či fotografie pravým tlačítkem a zvolte hodnocení v "
+"kontextové nabídce <gui>Hodnotit</gui>."
+
+#: C/organize-rating.page:20(p)
+msgid ""
+"Select the photo(s), then press any of the shortcut keys <key>1</key>, "
+"<key>2</key>, <key>3</key>, <key>4</key> or <key>5</key> to assign a rating. "
+"Or press <key>9</key> to mark the photo(s) as rejected or <key>0</key> to "
+"clear the rating(s)."
+msgstr ""
+"Vyberte fotografii či více fotografií a následně zmáčkněte klávesu <key>1</"
+"key>, <key>2</key>, <key>3</key>, <key>4</key> nebo <key>5</key> "
+"odpovídající hodnocení. Zmáčknutím <key>9</key> fotografii zamítnete, "
+"klávesou <key>0</key> hodnocení zrušíte."
+
+#: C/organize-rating.page:23(p)
+msgid ""
+"Normally Shotwell displays all photos except rejected photos. You can set a "
+"different rating filter using the <guiseq><gui>View</gui><gui>Filter Photos</"
+"gui></guiseq> menu - for example, you can display only photos rated with 3 "
+"stars or higher, or you can display all photos including those marked "
+"rejected. The Shotwell icon on the toolbar displays the current rating "
+"filter and can also be used to set the filter."
+msgstr ""
+"Normálně Shotwell zobrazuje všechny fotografie vyjma zamítnutých. Pomocí "
+"nabídky <guiseq><gui>Zobrazit</gui> <gui>Filtrovat fotografie</gui></guiseq> "
+"můžete nastavit jiný filtr hodnocení. Například si můžete zobrazit jen "
+"fotografie hodnocené 3 hvězdičkami a lépe nebo si můžete  zobrazit úplně "
+"všechny fotografie včetně zamítnutých. Ikona Shotwell na nástrojové liště "
+"zobrazuje aktuální filtr hodnocení a lze ji použít k nastavení filtru."
+
+#: C/organize-rating.page:26(p)
+msgid ""
+"Shotwell normally displays each photo's rating in its lower left-hand "
+"corner. You can turn off the display of ratings using the <guiseq><gui>View</"
+"gui><gui>Ratings</gui></guiseq> menu item."
+msgstr ""
+"Normálně Shotwell zobrazuje hodnocení každé fotografie v jejím levém dolním "
+"rohu. Zobrazení hodnocení můžete vypnout pomocí položky nabídky "
+"<guiseq><gui>Zobrazit</gui><gui>Hodnocení</gui></guiseq>."
+
+#: C/organize-rating.page:28(p)
+msgid ""
+"You can increase or decrease a photo's rating using the <guiseq><gui>Set "
+"Rating</gui><gui>Increase</gui></guiseq> and <guiseq><gui>Set Rating</"
+"gui><gui>Decrease</gui></guiseq> commands, or the keyboard shortcuts "
+"<key>&lt;</key> and <key>&gt;</key>."
+msgstr ""
+"Zvýšit, případně snížit, hodnocení fotografie můžete pomocí "
+"<guiseq><gui>Hodnotit</gui><gui>Zvýšit</gui></guiseq>, respektive "
+"<guiseq><gui>Hodnotit</gui><gui>Snížit</gui></guiseq>, nebo klávesovými "
+"zkratkami <key>&lt;</key> a <key>&gt;</key>."
+
+#: C/organize-flag.page:7(desc)
+msgid "Flag photos to mark them as special or to work with them as a set."
+msgstr ""
+"Jak můžete fotografie označit, že jsou významné nebo abyste s nimi mohli "
+"pracovat jako se sadou."
+
+#: C/organize-flag.page:12(title)
+msgid "Flagging photos"
+msgstr "Označování fotografií"
+
+#: C/organize-flag.page:14(p)
+msgid ""
+"Shotwell lets you <em>flag</em> photos. When a photo is flagged, a small "
+"flag icon appears in its upper right corner. You can select the "
+"<gui>Flagged</gui> item in the sidebar to see all photos which have been "
+"flagged."
+msgstr ""
+"Shotwell vám umožňuje <em>označit si</em> důležité fotografie. U fotografie, "
+"která je označená, se pravém horním rohu objeví malá vlaječka. V postranním "
+"panelu pak můžete vybrat položku <gui>Označeno</gui>, aby se vám zobrazily "
+"všechny označeném fotografie."
+
+#: C/organize-flag.page:18(p)
+msgid ""
+"Flagging a photo marks it as special. You can interpret this in any way you "
+"like. For example, you might flag all photos which need visual adjustment, "
+"or all photos which you want to share with a friend."
+msgstr ""
+"Vlaječkou si označte fotografie, které jsou něčím význačné. Záleží čistě na "
+"vás, k jakému účelu si to vyložíte. Například si můžete označit všechny "
+"fotografie, které budou potřebovat ručně doladit nebo všechny fotografie, "
+"které budete chtít poslat přátelům."
+
+#: C/organize-flag.page:22(p)
+msgid ""
+"Flagging is also useful because you can operate on all flagged photos as a "
+"set. For example, you can select the <gui>Flagged</gui> view and then upload "
+"all flagged photos to a publishing service."
+msgstr ""
+"U označování je užitečné, že s označenými fotografiemi můžete pracovat se "
+"všemi naráz jako sadou. Například můžete vybrat zobrazení <gui>Označeno</"
+"gui> a následně všechny označené fotografie odeslat na sdílecí server."
+
+#: C/organize-flag.page:27(title)
+msgid "To flag or unflag a photo"
+msgstr "Označení nebo zrušení označení fotografie"
+
+#: C/organize-flag.page:28(p)
+msgid ""
+"To flag or unflag a photo, right-click the photo and choose <gui>Flag</gui> "
+"or <gui>Unflag</gui> from the context menu. Or use the <keyseq><key>Ctrl</"
+"key><key>G</key></keyseq> or <key>/</key> shortcut keys."
+msgstr ""
+"Když chcete fotografii označit nebo zrušit její označení, klikněte na ni "
+"pravým tlačítkem a zvolte <gui>Označit</gui> nebo <gui>Zrušit označení</gui> "
+"v kontextové nabídce. Nebo můžete použít klávesovou zkratku "
+"<keyseq><key>Ctrl</key><key>G</key></keyseq> nebo <key>/</key>."
+
+#: C/organize-event.page:7(desc)
+msgid ""
+"Group photos together that were taken at the same time. Learn how to rename, "
+"merge, and sort events."
+msgstr ""
+"Jak seskupit dohromady fotografie, které byly pořízeny ve stejný čas. "
+"Zjistěte si jak přejmenovat, sloučit a třídit události."
+
+#: C/organize-event.page:12(title)
+msgid "Events"
+msgstr "Události"
+
+#: C/organize-event.page:14(p)
+msgid ""
+"An event is a group of photos that were taken at approximately the same "
+"time. When you import photos, Shotwell checks when each photo was taken. It "
+"then groups the photos into events."
+msgstr ""
+"Událost je skupina fotografií, které byly pořízeny v přibližně stejnou dobu. "
+"Během importu fotografií Shotwell u každé fotografie kontroluje, kdy byla "
+"pořízena. Podle toho je pak seskupuje do událostí."
+
+#: C/organize-event.page:16(p)
+msgid ""
+"Choose <gui>Events</gui> from the sidebar to see your photos organized by "
+"date. If you select a month or year from the sidebar, a list of events will "
+"be displayed in the main window. Double-click an event to see all the photos "
+"that were taken around that time."
+msgstr ""
+"Abyste viděli své fotografie roztříděné podle data, zvolte v postranním "
+"panelu <gui>Události</gui>. Když v postranním panelu vyberete měsíc nebo "
+"rok, zobrazí se v hlavním okně seznam událostí. Dvojitým kliknutím na "
+"událost si zobrazítek všechny fotografie, které byly pořízeny v rámci oné "
+"události."
+
+#: C/organize-event.page:18(p)
+msgid ""
+"If a photo has no embedded date/time information, then Shotwell can't "
+"automatically place it in any event. In this case the photo will appear in "
+"the <gui>No Event</gui> view accessible from the sidebar. You can still move "
+"the photo to any event you like as described below."
+msgstr ""
+"V případě, že fotografie nemá vložené informace o datu/času, nemůže ji "
+"Shotwell automaticky umístit do některé z událostí. Takováto fotografie se "
+"pak objeví v zobrazení <gui>Žádná událost</gui> přístupném v postranním "
+"panelu. Fotografii si pak můžete podle postupu uvedeného dále přesunou do "
+"libovolné události."
+
+#: C/organize-event.page:25(title)
+msgid "Renaming events"
+msgstr "Přejmenování události"
+
+#: C/organize-event.page:27(p)
+msgid ""
+"To give an event a name rather than referring to it by its date, select the "
+"event, click <guiseq><gui>Edit</gui><gui>Rename Event</gui></guiseq> and "
+"enter a new name. Another way of renaming an event is to double-click its "
+"name in the sidebar; type a new name and then press <key>Enter</key>."
+msgstr ""
+"Pokud si nějakou událost chcete raději pojmenovat namísto toho, aby byla "
+"označena datem, vyberte ji, klikněte na <guiseq><gui>Události</"
+"gui><gui>Přejmenovat událost</gui></guiseq> a zadejte nový název. Jiný možný "
+"postup je dvojitě kliknout na název události v postranním panelu, napsat "
+"nový název a zmáčknout <key>Enter</key>."
+
+#: C/organize-event.page:31(title)
+msgid "Moving photos between events"
+msgstr "Přesouvání fotografií mezi událostmi"
+
+#: C/organize-event.page:33(p)
+msgid ""
+"Even though photos are initially grouped into events by their date, you can "
+"move photos between events. To do this, drag any photo to the sidebar and "
+"drop it on an event."
+msgstr ""
+"Ačkoliv jsou fotografie na začátku seskupeny do událostí podle data, můžete "
+"si je mezi událostmi libovolně přesouvat. Uděláte to jednoduše přetažením "
+"fotografie do postranního panelu a upuštěním na požadovanou událost."
+
+#: C/organize-event.page:37(title)
+msgid "Creating and merging events"
+msgstr "Vytváření a slučování událostí"
+
+#: C/organize-event.page:38(p)
+msgid ""
+"To create a new event, select the photos you would like in the new event and "
+"click <guiseq><gui>Events</gui><gui>New Event</gui></guiseq>."
+msgstr ""
+"Pokud chcete vytvořit novou událost, vyberte fotografie, které do ní chcete "
+"zahrnout a klikněte na <guiseq><gui>Události</gui><gui>Nová událost</gui></"
+"guiseq>."
+
+#: C/organize-event.page:39(p)
+msgid ""
+"To merge events, select <guiseq><gui>Events</gui></guiseq> from the sidebar, "
+"then, while holding down <key>Ctrl</key> click on the events you want to "
+"merge in the main window area. Finally, click <guiseq><gui>Events</"
+"gui><gui>Merge Events</gui></guiseq>."
+msgstr ""
+"Když chcete události sloučit, vyberte v postranním panelu "
+"<guiseq><gui>Události</gui></guiseq> a pak za současného držení klávesy "
+"<key>Ctrl</key> klikejte v hlavní části okna na události, které chcete "
+"sloučit. Nakonec zvolte <guiseq><gui>Události</gui><gui>Sloučit události</"
+"gui></guiseq>."
+
+#: C/organize-event.page:43(title)
+msgid "Sorting events"
+msgstr "Řazení událostí"
+
+#: C/organize-event.page:45(p)
+msgid ""
+"Events are displayed in a tree in the sidebar, organized by the year and "
+"month of the earliest photo in the event. To change the event sort order, "
+"click <guiseq><gui>View</gui><gui>Sort Events</gui></guiseq> and select "
+"either ascending or descending."
+msgstr ""
+"Události se zobrazují ve stromové struktuře v postranním panelu, roztříděné "
+"podle roku a měsíce nejstarší fotografie v události. Pokud chcete změnit "
+"pořadí řazení, klikněte na <guiseq><gui>Zbrazit</gui><gui>Seřadit události</"
+"gui></guiseq> a vyberte, jestli vzestupně nebo sestupně."
+
+#: C/organize-event.page:51(title)
+msgid "Change the photo used to represent each event"
+msgstr "Změna fotografie, která událost reprezentuje"
+
+#: C/organize-event.page:53(p)
+msgid ""
+"If you select the Events item in the sidebar, you'll see a single photo "
+"which represents each event. This is called the key photo."
+msgstr ""
+"Když v postranním panelu vyberete Události, uvidíte jednotlivé fotografie "
+"reprezentující jednotlivé události. Tyto fotografie se nazývají klíčové."
+
+#: C/organize-event.page:55(p)
+msgid ""
+"By default, Shotwell uses the first photo in each event as its key photo. To "
+"use a different key photo, select the photo and choose <guiseq><gui>Photos</"
+"gui><gui>Make Key Photo for Event</gui></guiseq>."
+msgstr ""
+"Jako výchozí klíčovou fotografii použije Shotwell u každé události první "
+"fotografii. Když chcete použít jinou, vyberte ji a zvolte "
+"<guiseq><gui>Fotografie</gui><gui>Použít jako klíčovou fotku pro událost</"
+"gui></guiseq>."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/index.page:23(None)
+msgid ""
+"@@image: 'figures/shotwell_logo.png'; md5=59de2b2c4fa64ea1497c98452c509dbd"
+msgstr ""
+"@@image: 'figures/shotwell_logo.png'; md5=59de2b2c4fa64ea1497c98452c509dbd"
+
+#: C/index.page:6(title) C/index.page:7(title)
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#: C/index.page:9(name)
+msgid "Jim Nelson"
+msgstr "Jim Nelson"
+
+#: C/index.page:10(email)
+msgid "jim@yorba.org"
+msgstr "jim@yorba.org"
+
+#: C/index.page:11(name)
+msgid "Allison Barlow"
+msgstr "Allison Barlow"
+
+#: C/index.page:12(email)
+msgid "allison@yorba.org"
+msgstr "allison@yorba.org"
+
+#: C/index.page:13(name)
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#: C/index.page:14(email)
+msgid "robert.ancell@canonical.com"
+msgstr "robert.ancell@canonical.com"
+
+#: C/index.page:15(name)
+msgid "Peter Smith"
+msgstr "Peter Smith"
+
+#: C/index.page:16(email)
+msgid "pdo.smith@gmail.com"
+msgstr "pdo.smith@gmail.com"
+
+#: C/index.page:17(name)
+msgid "Phil Bull"
+msgstr "Phil Bull"
+
+#: C/index.page:18(email)
+msgid "philbull@gmail.com"
+msgstr "philbull@gmail.com"
+
+#: C/index.page:23(title)
+msgid ""
+"<media type=\"image\" src=\"figures/shotwell_logo.png\"/>Shotwell Photo "
+"Manager"
+msgstr ""
+"<media type=\"image\" src=\"figures/shotwell_logo.png\"/>Správce fotografií "
+"Shotwell"
+
+#: C/index.page:26(title)
+msgid "Importing Photos"
+msgstr "Import fotografií"
+
+#: C/index.page:30(title)
+msgid "Viewing Photos"
+msgstr "Zobrazení fotografií"
+
+#: C/index.page:34(title)
+msgid "Organizing Photos"
+msgstr "Třídění fotografií"
+
+#: C/index.page:38(title)
+msgid "Editing Photos"
+msgstr "Úprava fotografií"
+
+#: C/index.page:42(title)
+msgid "Sharing Photos"
+msgstr "Sdílení fotografií"
+
+#: C/index.page:46(title)
+msgid "Other Features"
+msgstr "Ostatní funkce"
+
+#: C/import-memorycard.page:7(desc)
+msgid "Import photos from a digital camera's memory card."
+msgstr "Jak importovat fotografie z paměťové karty z digitálního fotoaparátu."
+
+#: C/import-memorycard.page:12(title)
+msgid "Importing from a memory card"
+msgstr "Import z paměťové karty"
+
+#: C/import-memorycard.page:14(p)
+msgid "To import photos from a camera memory card:"
+msgstr "Abyste naimportovali fotografie z paměťové karty fotoaparátu:"
+
+#: C/import-memorycard.page:18(p)
+msgid ""
+"Put the card into your card reader. Make sure the card reader is plugged in "
+"to the computer and switched on."
+msgstr ""
+"Vložte kartu do čtečky karet. Ujistěte se, že je čtečka připojena k počítači "
+"a zapnutá."
+
+#: C/import-memorycard.page:21(p)
+msgid "The card reader and card should be detected automatically."
+msgstr "Čtečka karet a karta by měly být detekovány počítačem automaticky."
+
+#: C/import-memorycard.page:24(p)
+msgid ""
+"Follow the instructions for <link xref=\"import-file\">importing photos from "
+"your hard disk</link>. If you click <guiseq><gui>File</gui><gui>Import From "
+"Folder</gui></guiseq>, the memory card should be visible as a folder in the "
+"side bar of the file selection window."
+msgstr ""
+"Postupujte podle instrukcí pro <link xref=\"import-file\">import fotografií "
+"z pevného disku</link>. Když kliknete na <guiseq><gui>Soubor</gui> "
+"<gui>Importovat ze složky</gui></guiseq>, měla by být paměťová karta vidět "
+"mezi složkami v postranním panelu okna pro výběr souboru."
+
+#: C/import-memorycard.page:28(p)
+msgid ""
+"Shotwell can import photos from any memory card that is compatible with your "
+"card reader."
+msgstr ""
+"Shotwell může importovat fotografie z libovolné paměťové karty, která je "
+"kompatibilní s vaší čtečkou karet."
+
+#: C/import-memorycard.page:30(p)
+msgid ""
+"If the card is not detected automatically, your card reader may not have "
+"been recognized. Try unplugging it and then plugging it in again. If that "
+"doesn't work, you should still be able to import photos by <link xref="
+"\"import-camera\">connecting your camera directly to the computer</link>, "
+"though."
+msgstr ""
+"V případě, že se paměťová karta sama nedetekuje, možná nerozpoznal operační "
+"systém správně čtečku karet. Zkuste ji odpojit a znovu připojit. Pokud i "
+"přesto nebude fungovat, stále vám zůstává možnost importovat fotografie "
+"<link xref=\"import-camera\">přímo připojením svého fotoaparátu k počítači</"
+"link>."
+
+#: C/import-f-spot.page:7(desc)
+msgid ""
+"Shotwell can import all your photos and tags from the F-Spot photo manager."
+msgstr ""
+"Shotwell umí naimportovat všechny fotografie a štítky ze správce fotografií "
+"F-Spot."
+
+#: C/import-f-spot.page:12(title)
+msgid "Importing from F-Spot"
+msgstr "Import z aplikace F-Spot"
+
+#: C/import-f-spot.page:14(p)
+msgid "To import an existing photo collection from F-Spot:"
+msgstr "Když chcete importovat stávající sbírku fotografií z aplikace F-Spot:"
+
+#: C/import-f-spot.page:16(p)
+msgid "Select <guiseq><gui>File</gui><gui>Import From F-Spot</gui></guiseq>."
+msgstr ""
+"Vyberte <guiseq><gui>Soubor</gui><gui>Importovat z aplikace</gui></guiseq>."
+
+#: C/import-f-spot.page:17(p)
+msgid ""
+"Now choose either the default F-Spot library or another F-Spot database. If "
+"importing from another F-Spot database, select a directory and file from the "
+"chooser dialog box."
+msgstr ""
+"Nyní zvolte buď výchozí knihovnu F-Spot nebo jinou databázi F-Spot. V "
+"případě, že importujete z jiné databáze F-Sport, vyberte složku a soubor v "
+"dialogovém okně, které se objeví."
+
+#: C/import-f-spot.page:20(p)
+msgid ""
+"Shotwell will import your photos, together with their tags and other "
+"information. Once the import is complete, you can select <gui>Last Import</"
+"gui> in the sidebar to see all photos successfully imported. The Events list "
+"will also show new entries for the dates corresponding to the imported "
+"photos."
+msgstr ""
+"Shotwell naimportuje vaše fotografie, spolu s jejich štítky a dalšími "
+"informacemi. Jakmile je import dokončen, můžete v postranním panelu vybrat "
+"<gui>Poslední import</gui>, abyste viděli všechny naimportované fotografie. "
+"Rovněž v seznamu událostí se objeví nové položky s daty odpovídajícími "
+"importovaným fotografiím."
+
+#: C/import-file.page:7(desc)
+msgid "Import photos that are already saved on your computer."
+msgstr "Jak importovat fotografie, které jsou již uloženy ve vašem počítači."
+
+#: C/import-file.page:12(title)
+msgid "Importing from your hard disk"
+msgstr "Import z pevného disku"
+
+#: C/import-file.page:14(p)
+msgid ""
+"To import photo files from your hard disk into Shotwell, just drag them from "
+"your file browser into the Shotwell window."
+msgstr ""
+"Pro naimportování souborů z pevného disku do aplikace Shotwell stačí soubory "
+"přetáhnout ze správce souborů do okna Shotwell."
+
+#: C/import-file.page:16(p)
+msgid ""
+"Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder</gui></"
+"guiseq> and select the folder containing the photos you want to import."
+msgstr ""
+"Případně můžete kliknout na <guiseq><gui>Soubor</gui> <gui>Importovat ze "
+"složky</gui></guiseq> a vyberte složku obsahující fotografie, které chcete "
+"importovat."
+
+#: C/import-file.page:18(p)
+msgid ""
+"Shotwell will ask whether you want to copy the photo files to your library "
+"folder (usually this is the <file>Pictures</file> folder in your home "
+"directory) or to import them in place without copying the files."
+msgstr ""
+"Shotwell se vás dotáže, jestli chcete soubory s fotografiemi zkopírovat do "
+"složky knihovny (což je obvykle složka <file>Obrázky</file> ve vaší domovské "
+"složce) nebo je naimportovat s odkazem na stávající umístění, bez kopírování "
+"souborů."
+
+#: C/import-file.page:20(p)
+msgid ""
+"If you hold down <key>Ctrl</key> while dragging photos in, Shotwell will "
+"copy the photos into your library folder without prompting. Similarly, if "
+"you hold down <keyseq><key>Ctrl</key><key>Shift</key></keyseq> while "
+"dragging photos in, Shotwell will import the photos without copying them."
+msgstr ""
+"Pokud během přetahování fotografií držíte zmáčknutý <key>Ctrl</key>, "
+"Shotwell zkopíruje fotografie do vaší knihovny bez ptaní. Obdobně, pokud "
+"budete během přetahování držet zmáčknuté <keyseq><key>Ctrl</key><key>Shift</"
+"key></keyseq>, Shotwell bude importovat fotografie bez kopírování."
+
+#: C/import-file.page:22(p)
+msgid ""
+"Once the import is complete, you can select <gui>Last Import</gui> in the "
+"sidebar to see all photos successfully imported. The Events list will also "
+"show new entries for the dates corresponding to the imported photos."
+msgstr ""
+"Po dokončení importu můžete v postranním panelu vybrat <gui>Poslední import</"
+"gui>, abyste viděli všechny fotografie, které se úspěšně naimportovaly. "
+"Rovněž v seznamu Události se objeví nové položky s daty odpovídajícími "
+"importovaným fotografiím."
+
+#: C/import-camera.page:7(desc)
+msgid "Copy photos from a digital camera."
+msgstr "Jak zkopírovat fotografie z digitálního fotoaparátu."
+
+#: C/import-camera.page:12(title)
+msgid "Importing from a camera"
+msgstr "Import z fotoaparátu"
+
+#: C/import-camera.page:14(p)
+msgid "To import photos from a digital camera:"
+msgstr "Když chcete importovat fotografie z digitálního fotoaparátu:"
+
+#: C/import-camera.page:18(p)
+msgid ""
+"Connect the camera to your computer and switch it on. Shotwell will detect "
+"it and list it in the sidebar."
+msgstr ""
+"Připojte fotoaparát ke svému počítači a zapněte jej. Shotwell jej detekuje a "
+"zobrazí jej v postranním panelu."
+
+#: C/import-camera.page:22(p)
+msgid ""
+"Select the camera in the sidebar. Previews of each photo on the camera will "
+"be displayed."
+msgstr ""
+"Vyberte fotoaparát v postranním panelu. Zobrazí se náhledy všech fotografií "
+"v něm uložených."
+
+#: C/import-camera.page:25(p)
+msgid ""
+"If you like, you can choose a set of specific photos to import. To do this, "
+"hold down the <key>Ctrl</key> key and click to select individual photos. You "
+"can hold down <key>Shift</key> and click to select a range of photos too."
+msgstr ""
+"Jestli chcete, můžete si k importu vybrat jen některé konkrétní fotografie. "
+"Stačí držet zmáčknutou klávesu <key>Ctrl</key> a na požadované fotografie "
+"klikat. Můžete také držet zmáčknutý <key>Shift</key> a kliknutím vybrat celý "
+"blok fotografií."
+
+#: C/import-camera.page:28(p)
+msgid ""
+"Click either <gui>Import Selected</gui> or <gui>Import All</gui>. The photos "
+"will be copied from the camera and saved on your computer."
+msgstr ""
+"Klikněte buď na <gui>Importovat vybrané</gui> nebo <gui>Importovat vše</"
+"gui>. Fotografie se z fotoaparátu zkopírují a uloží do vašeho počítače."
+
+#: C/import-camera.page:32(p)
+msgid ""
+"Once the import is complete, you can open the <gui>Last Import</gui> view "
+"(in the sidebar) to see all photos that were imported. The Events list (also "
+"in the sidebar) will also show the new photos, organized by date."
+msgstr ""
+"Jakmile je import dokončen, můžete otevřít zobrazení <gui>Poslední import</"
+"gui> (v postranním panelu), abyste viděli všechny fotografie, které byly "
+"naimportovány. Seznam událostí (také v postranním panelu) rovněž zobrazí "
+"nové fotografie a to podle data."
+
+#: C/formats.page:7(desc)
+msgid ""
+"Shotwell supports JPEG, PNG, TIFF, BMP and RAW photo files as well as video "
+"files."
+msgstr ""
+"Shotwell podporuje soubory s formáty fotografií JPEG, PNG, TIFF, BMP a RAW a "
+"některé videosoubory."
+
+#: C/formats.page:12(title)
+msgid "Supported photo and video formats"
+msgstr "Podporované formáty fotografií a videí"
+
+# Poznámky:
+# Přidat poznámku
+#: C/formats.page:14(p)
+msgid ""
+"Shotwell supports JPEG, PNG, TIFF, BMP and <link type=\"guide\" xref=\"other-"
+"raw\">RAW</link> photo files. Shotwell does not yet support other graphics "
+"format such as GIF."
+msgstr ""
+"Shotwell podporuje soubory s fotografiemi ve formátech JPEG, PNG, TIFF, BMP "
+"a <link type=\"guide\" xref=\"other-raw\">RAW</link>. Zatím nepodporuje "
+"další formáty, jako je třeba GIF."
+
+#: C/formats.page:16(p)
+msgid ""
+"Shotwell's RAW format support is currently limited. When you view a RAW "
+"photo, you are actually viewing a JPEG derived from the RAW photo, not the "
+"RAW image itself. Additionally, the RAW editing pipeline is not fully 16-bit "
+"- you can only export edited photos as 8-bit files. All supported formats "
+"can be used for export (JPEG, PNG, TIFF, BMP)."
+msgstr ""
+"Podpora RAW je v aplikaci Shotwell prozatím omezená. Když si zobrazíte "
+"surovou fotografii RAW, zobrazí se vám ve skutečnosti JPEG odvozený z RAW, "
+"ne přímo RAW. Navíc, propojovací roura k editoru není plně 16bitová – "
+"upravované fotografie můžete exportovat jen jako 8bitové soubory. K exportu "
+"mohou být použity všechny podporované formáty (JPEG, PNG, TIFF, BMP)."
+
+#: C/formats.page:18(p)
+msgid ""
+"For more information about RAW-format photos in Shotwell, please see the "
+"<link type=\"guide\" xref=\"other-raw\">RAW</link> section."
+msgstr ""
+"Více informací o formátu fotografií RAW v aplikaci Shotwell najdete v oddíle "
+"<link type=\"guide\" xref=\"other-raw\">RAW</link>."
+
+#: C/formats.page:22(p)
+msgid ""
+"Shotwell also supports video files in any format supported by the GStreamer "
+"media library on the system where Shotwell is running. This typically "
+"includes the following formats among others:"
+msgstr ""
+"Shotwell podporuje také videosoubory v libovolném formátu, který podporuje "
+"multimediální knihovna GStreamer na systému, ve kterém Shotwell běží. "
+"Typicky to představuje mimo jiné následující formáty:"
+
+#: C/formats.page:25(p)
+msgid "Container formats: Ogg, QuickTime, MP4, AVI."
+msgstr "Formáty kontejnerů: Ogg, QuickTime, MP4, AVI."
+
+#: C/formats.page:26(p)
+msgid ""
+"Codecs: Theora, Quicktime, MPEG-4, Motion JPEG. <em>Note that some operating "
+"systems may not include all codecs listed here due to legal or licensing "
+"restrictions.</em>"
+msgstr ""
+"Kodeky: Theora, Quicktime, MPEG-4, Motion JPEG. <em>Upozorňujeme, že některé "
+"operační systémy nemusí obsahovat všechny uvedené kodeky z důvodů právních "
+"nebo licenčních omezení.</em>"
+
+#: C/formats.page:30(p)
+msgid ""
+"Shotwell supports both photos and videos, but for simplicity, this "
+"documentation uses just the term \"photos\" in most places. Many operations "
+"in Shotwell apply to both photos and videos, however. In particular, events, "
+"flagging, rating, tagging, and publishing work both for photos and for "
+"videos."
+msgstr ""
+"Shotwell podporuje jak fotografie, tak videa, ale pro zjednodušení s v tomto "
+"dokumentu na většině míst používá jen výraz „fotografie“. Ale většina "
+"operací se v aplikaci Shotwell dá použít jak u fotografií, tak u videí. "
+"Například události, označování, hodnocení, štítky a zveřejňování fungují u "
+"fotografií i videí."
+
+#: C/edit-undo.page:7(desc)
+msgid "Return a photo to its original, unedited form."
+msgstr "Jak vrátit fotografii do původní neupravené podoby."
+
+#: C/edit-undo.page:14(title)
+msgid "Undoing changes"
+msgstr "Vracení změn"
+
+#: C/edit-undo.page:16(p)
+msgid ""
+"Because Shotwell is a non-destructive photo editor, you can undo any "
+"alterations you make to a photograph."
+msgstr ""
+"Díky tomu, že Shotwell je nedestruktivní editor, můžete změny provedené ve "
+"fotografiích vracet zpět."
+
+#: C/edit-undo.page:18(p) C/edit-nondestructive.page:16(p)
+msgid ""
+"If you want to see what a photo looked like before your modifications, press "
+"the <key>Shift</key> key. The original photo will be displayed as long as "
+"you hold the key down."
+msgstr ""
+"Pokud chcete vidět, jak fotografie vypadala před provedením změn, zmáčkněte "
+"klávesu <key>Shift</key>. Dokud ji budete držet, bude zobrazena originální "
+"fotografie."
+
+#: C/edit-undo.page:20(p)
+msgid ""
+"To completely undo all the changes you've made to a photo, click "
+"<guiseq><gui>Photos</gui><gui>Revert to Original</gui></guiseq>. The only "
+"exception is that time and date adjustments will not be reverted."
+msgstr ""
+"Abyste vrátily nazpět úplně všechny změny provedené u fotografie, klikněte "
+"na <guiseq><gui>Fotografie</gui> <gui>Vráti zpět na původní</gui></guiseq>. "
+"Jedinou výjimkou je změna data a času, které vráceny nebudou."
+
+#: C/edit-time-date.page:7(desc)
+msgid "Change the time and date of photos if those details are incorrect."
+msgstr "Jak změnit datum a čas fotografií, když je tento údaj špatně."
+
+#: C/edit-time-date.page:12(title)
+msgid "Adjust the time and date of photos"
+msgstr "Úprava data a času fotografií"
+
+#: C/edit-time-date.page:14(p)
+msgid ""
+"To adjust the time and date of photos, select the photos you would like to "
+"adjust, choose <guiseq><gui>Photos</gui><gui>Adjust Time and Date</gui></"
+"guiseq> and select a new time and date."
+msgstr ""
+"Když chcete upravit čas a datum fotografie, vyberte ji a zvolte "
+"<guiseq><gui>Fotografie</gui> <gui>Nastavit datum a čas</gui></guiseq> a "
+"vyberte nové datum a čas."
+
+#: C/edit-time-date.page:16(p)
+msgid ""
+"If you are changing the date and time of multiple photos at once, you can "
+"choose to shift all the photos by the same amount of time or to set all the "
+"photos to the same time."
+msgstr ""
+"Pokud měníte datum a čas u více fotografií naráz, můžete si zvolit stejný "
+"posun času u všech fotografií vůči stávajícímu nebo u všech nastavit ten "
+"samý čas."
+
+#: C/edit-time-date.page:18(p)
+msgid ""
+"By default, the time and date are only changed inside Shotwell. You can also "
+"choose to modify the time and date in the original file, but this cannot be "
+"undone once you exit Shotwell."
+msgstr ""
+"Standardně se mění datum a čas jen v rámci aplikace Shotwell. Můžete zadat, "
+"aby se změnily i v originálním souboru, ale po ukončení aplikace Shotwell to "
+"již není možné vrátit zpět."
+
+#: C/edit-straighten.page:7(desc)
+msgid "Straighten a photo so that its horizon appears level."
+msgstr "Jak vyrovnat fotografii, která je nakřivo."
+
+#: C/edit-straighten.page:12(title)
+msgid "Straighten photos"
+msgstr "Vyrovnání fotografií"
+
+#: C/edit-straighten.page:14(p)
+msgid ""
+"The straighten tools allows photos to be leveled and straightened. The "
+"straighten tool is only available in full-window or fullscreen mode."
+msgstr ""
+"Nástroj pro vyrovnání umožňuje srovnat pootočenou fotografii do roviny. "
+"Dostupný je pouze v režimu celého okna."
+
+#: C/edit-straighten.page:18(p)
+msgid ""
+"Click <gui>Straighten</gui>. The straighten slider will appear. "
+"Alternatively, use the keyboard shortcut <keyseq><key>Ctrl</key><key>A</"
+"key></keyseq>."
+msgstr ""
+"Klikněte na <gui>Vyrovnat</gui> a objeví se posuvník pro určení úhlu. "
+"Případně můžete použít klávesovou zkratku <keyseq><key>Ctrl</key><key>A</"
+"key></keyseq>."
+
+#: C/edit-straighten.page:21(p)
+msgid "Drag the slider to achieve the desired degree of straightening."
+msgstr "Posuňte táhlo tak, abyste dosáhli požadovaného narovnání."
+
+#: C/edit-straighten.page:24(p)
+msgid "Press <gui>OK</gui> when finished."
+msgstr "Až máte fotografii narovnanou, zmáčkněte <gui>Budiž</gui>."
+
+#: C/edit-rotate.page:7(desc)
+msgid ""
+"Click the <gui>Rotate</gui> button, or choose one of the commands in the "
+"<gui>Photo</gui> menu."
+msgstr ""
+"Klikněte na tlačítko <gui>Otočit</gui> nebo zvolte jeden z příkazů v nabídce "
+"<gui>Fotografie</gui>."
+
+#: C/edit-rotate.page:12(title)
+msgid "Rotate or flip a photo"
+msgstr "Otáčení a překlápění fotografií"
+
+#: C/edit-rotate.page:14(p)
+msgid ""
+"You can rotate your photos left and right (clockwise and counterclockwise) "
+"with the <gui>Rotate</gui> button on the toolbar of most views. You can also "
+"make a mirror image of any photo."
+msgstr ""
+"Fotografii můžete otočit doleva a doprava (tj. proti směru a po směru "
+"hodinových ručiček) pomocí tlačítka <gui>Otočit</gui> na nástrojové liště u "
+"většiny zobrazení. Mimo to můžete fotografii zrcadlit."
+
+#: C/edit-rotate.page:16(p)
+msgid ""
+"To rotate right, click on the <gui>Rotate</gui> button. To rotate left, "
+"press and hold the <key>Ctrl</key> key and then click the button. Both "
+"commands are available in the <gui>Photos</gui> menu too. Alternatively, use "
+"the following keyboard shortcuts:"
+msgstr ""
+"Otočení doprava provedete kliknutím na tlačítko <gui>Otočit</gui>. Pokud "
+"chcete otáčet doleva, zmáčkněte a držte klávesu <key>Ctrl</key> a teprve "
+"potom na tlačítko klikněte. Obě funkce jsou přístupné v nabídce "
+"<gui>Fotografie</gui>. Případně můžete použít následující klávesové zkratky:"
+
+#: C/edit-rotate.page:18(p)
+msgid ""
+"rotate left: <keyseq><key>Shift</key><key>Ctrl</key><key>R</key></keyseq> or "
+"<key>[</key>"
+msgstr ""
+"otočení vlevo: <keyseq><key>Shift</key><key>Ctrl</key><key>R</key></keyseq> "
+"nebo <key>[</key>"
+
+#: C/edit-rotate.page:19(p)
+msgid ""
+"rotate right: <keyseq><key>Ctrl</key><key>R</key></keyseq> or <key>]</key>"
+msgstr ""
+"otočení vpravo: <keyseq><key>Ctrl</key><key>R</key></keyseq> nebo <key>]</"
+"key>"
+
+#: C/edit-rotate.page:21(p)
+msgid ""
+"To create a mirror image of a photo, use the <gui>Flip Horizontally</gui> "
+"command in the <gui>Photos</gui> menu. To flip an image vertically, use the "
+"<gui>Flip Vertically</gui> command in the same menu."
+msgstr ""
+"Pro zrcadlení fotografie použijte příkaz <gui>Překlopit vodorovně</gui> v "
+"nabídce <gui>Fotografie</gui>. Pro zrcadlení ve svislém směru použijte "
+"<gui>Překlopit svisle</gui> tamtéž."
+
+#: C/edit-rotate.page:24(p)
+msgid ""
+"If you select more than one image, you can rotate all of them at the same "
+"time."
+msgstr "Když vyberete více než jeden obrázek, můžete je otočit všechny naráz."
+
+#: C/edit-redeye.page:7(desc)
+msgid ""
+"Correct photos where people have red eyes because of the camera's flash."
+msgstr ""
+"Jak spravit fotografie, na kterých mají lidé kvůli blesku fotoaparátu "
+"červené oči."
+
+#: C/edit-redeye.page:12(title)
+msgid "Removing red-eye"
+msgstr "Odstraňování červených očí"
+
+#: C/edit-redeye.page:14(p)
+msgid ""
+"Red-eye occurs when the camera's flash reflects off the pupil of someone's "
+"eye. To eliminate this in a photo, use the Red-eye tool."
+msgstr ""
+"Efekt červených očí se objeví, když blesk fotoaparátu osvítí něčí oční "
+"zorničku. Pro odstranění tohoto neduhu slouží nástroj Červené oči."
+
+#: C/edit-redeye.page:17(p)
+msgid "Click <gui>Red-eye</gui>. A circle will appear on the photo."
+msgstr "Klikněte na <gui>Červené oči</gui>. Na fotografii se objeví kroužek."
+
+#: C/edit-redeye.page:20(p)
+msgid ""
+"Drag the circle over the affected pupil, adjust its size with the slider "
+"control, and press <gui>Apply</gui>. The redness will be removed."
+msgstr ""
+"Přetáhněte kroužek na červenou zorničku, upravte pomocí posuvníku její "
+"velikost a zmáčkněte <gui>Použít</gui>. Červená zmizí."
+
+#: C/edit-redeye.page:23(p)
+msgid ""
+"Repeat this process for all red pupils in your photo. Press <gui>Close</gui> "
+"when finished."
+msgstr ""
+"Tento postup zopakujte pro všechny červené oči ve fotografii. Po dokončení "
+"zmáčkněte <gui>Zavřít</gui>."
+
+#: C/edit-nondestructive.page:7(desc)
+msgid ""
+"Shotwell is a non-destructive photo editor - it does not modify your "
+"original photos."
+msgstr "Shotwell je nedestruktivní fotoeditor – nemění originální fotografie."
+
+#: C/edit-nondestructive.page:12(title)
+msgid "What happens to the original when I edit a photo?"
+msgstr "Co se stane s originálem, když fotografii upravím?"
+
+#: C/edit-nondestructive.page:14(p)
+msgid ""
+"Shotwell is a non-destructive photo editor. It does not modify your original "
+"photographs. That is to say, if you crop a photo or adjust its colors, the "
+"photo file on disc remains untouched. Shotwell stores your edits in a "
+"database and applies them on the fly as necessary. This means you can undo "
+"any alterations you make to a photograph."
+msgstr ""
+"Shotwell je nedestruktivní editor fotografií. Neprovádí žádné změny v "
+"originálních fotografiích. Když, řekněme, fotografii oříznete nebo upravíte "
+"její barvy, soubor s fotografií na disku zůstane nedotčen. Shotwell si uloží "
+"vaše změny do databáze a aplikuje je na obrázek za běhu podle potřeby. To "
+"znamená, že můžete vracet zpět změny, které jste ve fotografii provedli."
+
+#: C/edit-nondestructive.page:18(p)
+msgid ""
+"Note that Shotwell can optionally write metadata (such as tags and titles) "
+"to photo files. For more information, see the section <link xref=\"other-"
+"files\">Photo files</link>."
+msgstr ""
+"Upozorňujeme ale, že volitelně může Shotwell do originálních souborů s "
+"fotografiemi zapisovat metadata (jako jsou štítky nebo názvy). Více "
+"informací najdete v oddíle <link xref=\"other-files\">Soubory s "
+"fotografiemi</link>."
+
+#: C/edit-external.page:7(desc)
+msgid "Use a different program to edit a photo."
+msgstr "Jak použít k úpravě fotografií jiný program."
+
+#: C/edit-external.page:12(title)
+msgid "Edit photos with an external program"
+msgstr "Úprava fotografií v externím programu"
+
+#: C/edit-external.page:16(p)
+msgid ""
+"You might want to use an external editor to do additional work on a photo. "
+"If installed, GIMP and UFRaw are the default external editors for photo and "
+"RAW editing, respectively. If these programs are not installed, you must "
+"select your preferred editors by choosing <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui></guiseq> and selecting editors from drop-down "
+"menus of installed applications."
+msgstr ""
+"K dodatečným úpravám fotografie můžete chtít použít externí editor. Pokud "
+"máte nainstalovány GIMP a UFRaw, jsou zvoleny jako výchozí externí editory "
+"pro úpravy fotografií respektive surových fotografií. Pokud nainstalovány "
+"nejsou, musíte si upřednostňované editory zvolit pomocí "
+"<guiseq><gui>Upravit</gui> <gui>Předvolby</gui></guiseq> a výběrem v "
+"rozbalovacím seznamu nainstalovaných aplikací."
+
+#: C/edit-external.page:24(p)
+msgid ""
+"Once your editors have been set, select a photo and choose "
+"<guiseq><gui>Photos</gui><gui>Open With External Editor</gui></guiseq> to "
+"open the photo with the external editor. Likewise, if the original photo is "
+"a RAW file, select <guiseq><gui>Photos</gui><gui>Open With RAW Editor</gui></"
+"guiseq> to edit the RAW file directly with the set RAW editor."
+msgstr ""
+"Když máte editor nastavený, vyberte fotografii a zvolte "
+"<guiseq><gui>Fotografie</gui> <gui>Otevřít v externím editoru</gui></guiseq> "
+"a fotografie se otevře v nastaveném editoru. Obdobně, pokud se jedná o "
+"surovou fotografii RAW, vyberte <guiseq><gui>Fotografie</gui> <gui>Otevřít v "
+"editoru RAW</gui></guiseq> pro otevření v nastaveném editoru RAW."
+
+#: C/edit-external.page:31(p)
+msgid ""
+"When you complete your edits and save the file, Shotwell will detect the "
+"changes and update the photo. When external edits have been made, press and "
+"hold the <key>Shift</key> key in full-window view to show the original photo "
+"rather than the externally-edited one."
+msgstr ""
+"Až dokončíte své úpravy a soubor uložíte, Shotwell si změn povšimne a "
+"fotografii aktualizuje. Pokud je fotografie externě upravená, můžete se "
+"zmáčknutím a podržením klávesy <key>Shift</key> při zobrazení v celém okně "
+"podívat na původní verzi fotografie místo té upravené."
+
+#: C/edit-external.page:38(p)
+msgid "Reverting to original will erase any external edits."
+msgstr "Návrat k originálu smaže všechny externí úpravy."
+
+#: C/edit-external.page:43(p)
+msgid ""
+"If you externally edit a RAW photo and save the result to another image, "
+"such as a JPEG or PNG, Shotwell cannot automatically determine that the "
+"original RAW and the new image should be paired."
+msgstr ""
+"Pokud provedete externí úpravu surové fotografie RAW a výsledek uložíte do "
+"jiného obrázku, jako je JPGE nebo PNG, nemůže Shotwell automaticky zjistit, "
+"že se mají původní RAW a nový obrázek spárovat."
+
+#: C/edit-external.page:49(p)
+msgid ""
+"If you want to work within the resulting image within Shotwell, you'll need "
+"to import it yourself."
+msgstr ""
+"Jestli chcete s výsledným obrázkem pracovat v aplikaci Shotwell, musíte si "
+"jej sami naimportovat."
+
+#: C/edit-enhance.page:7(desc)
+msgid ""
+"Let Shotwell improve the brightness and contrast of a photo automatically."
+msgstr "Jak nechat Shotwell automaticky zdokonalit jas a kontrast fotografií."
+
+#: C/edit-enhance.page:14(title)
+msgid "Auto-enhance"
+msgstr "Automatické vylepšení"
+
+#: C/edit-enhance.page:16(p)
+msgid ""
+"Clicking on the <gui>Enhance</gui> button is a quick way to automatically "
+"adjust the brightness and contrast of your photo. It will often give you a "
+"photo that is correctly exposed. You can also use it as a starting point and "
+"then improve the adjustments by clicking on the <gui>Adjust</gui> button."
+msgstr ""
+"Kliknutí na tlačítko <gui>Vylepšit</gui> je nejrychlejší způsob, jak "
+"automaticky upravit jas a kontrast vaší fotografie. Často tím získáte "
+"fotografii, které vypadá správně exponovaná. Můžete to využít i jen jako "
+"počáteční krok a další zdokonalení provést ručně po kliknutí na tlačítko "
+"<gui>Upravit</gui>."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/edit-crop.page:42(None)
+msgid ""
+"@@image: 'figures/crop_thirds.jpg'; md5=4cf0a026bb812c7eab0c9db8210a9524"
+msgstr ""
+"@@image: 'figures/crop_thirds.jpg'; md5=4cf0a026bb812c7eab0c9db8210a9524"
+
+#: C/edit-crop.page:7(desc)
+msgid "Improve the composition of a photo by cutting out parts of it."
+msgstr "Jak zdokonalit kompozici fotografie odříznutím některých částí."
+
+#: C/edit-crop.page:12(title)
+msgid "Cropping"
+msgstr "Ořezání"
+
+#: C/edit-crop.page:14(p)
+msgid ""
+"To reduce the area of a photo and concentrate the viewer's attention on a "
+"smaller portion of it, use the Crop tool. The crop tool is only available in "
+"full-window or fullscreen mode."
+msgstr ""
+"Jestli chcete zmenšit plochu fotografie a zaměřit pohled jen na nějakou její "
+"část, použijte nástroj pro ořezání. Tento nástroj je přístupný jen v režimu "
+"celého okna nebo celé obrazovky."
+
+#: C/edit-crop.page:19(p)
+msgid ""
+"Double-click on a photo to enter full-window mode, then press the <gui>Crop</"
+"gui> button on the toolbar."
+msgstr ""
+"Dvojitým kliknutím na fotografii se přepněte do režimu celého okna a po té "
+"zmáčkněte na nástrojové liště tlačítko <gui>Oříznout</gui>."
+
+#: C/edit-crop.page:22(p)
+msgid ""
+"A white box, the crop rectangle, will appear over the photo. The lighter "
+"portion of the photo within the crop rectangle represents what the photo "
+"will look like when you crop it."
+msgstr ""
+"Přes fotografii se objeví ořezové hranice v podobě bílého obdélníku. "
+"Světlejší část uvnitř ořezového obdélníku odpovídá tomu, co z fotografie "
+"uvidíte po jejím ořezání."
+
+#: C/edit-crop.page:25(p)
+msgid ""
+"If you place your cursor in the middle of the box, you can move the box "
+"around. If you drag the edges of the box, you can adjust its size. As you "
+"move and adjust the crop box, you'll see four lines appear inside it, like a "
+"tic-tac-toe grid. These are <em>rule of thirds</em> lines."
+msgstr ""
+"Když umístíte ukazatel do vnitřní části obdélníku, můžete obdélníkem "
+"posouvat. Přetahováním hran obdélníku můžete přizpůsobovat jeho velikost. "
+"Když obdélník přesouváte nebo měníte jeho velikost, uvidíte uvnitř něj "
+"mřížku. Ta odpovídá čárám <em>pravidla třetin</em>."
+
+#: C/edit-crop.page:26(p)
+msgid ""
+"You can also constrain the crop box to one of many common sizes. Choose a "
+"size from the drop-down list that suits your needs. If you press the flip "
+"button next to it, the orientation of the constraint will switch (from "
+"landscape to portrait)."
+msgstr ""
+"Obdélník můžete také upravit na některou z běžných velikostí. V rozbalovacím "
+"seznamu si zvolte velikost, kterou potřebujete. Zmáčknutím otáčecího "
+"tlačítka vedle tohoto výběru můžete změnit orientaci ořezu (z krajiny na "
+"portrét)."
+
+#: C/edit-crop.page:29(p)
+msgid ""
+"When you're happy with your crop outline, press the <gui>Apply</gui> button. "
+"Shotwell will display the cropped photo."
+msgstr ""
+"Až jste s výběrem ořezávané části spokojeni, zmáčkněte tlačítko <gui>Použít</"
+"gui>. Shotwell zobrazí ořezanou fotografii."
+
+#: C/edit-crop.page:32(p)
+msgid ""
+"If you change your mind, press the <gui>Crop</gui> button again and fine-"
+"tune the crop."
+msgstr ""
+"Pokud změníte ohledně ořezu názor, zmáčkněte tlačítko <gui>Oříznout</gui> "
+"znovu a ořez si dolaďte."
+
+#: C/edit-crop.page:33(p)
+msgid ""
+"If you press <gui>Cancel</gui> rather than <gui>Apply</gui>, Shotwell will "
+"return to the photo's previous crop dimensions."
+msgstr ""
+"Při zmáčknutí <gui>Zrušit</gui> místo <gui>Použít</gui> vrátí Shotwell "
+"fotografie na původní ořezané rozměry."
+
+#: C/edit-crop.page:38(title)
+msgid "What is the rule of thirds?"
+msgstr "Co je to pravidlo třetin?"
+
+#: C/edit-crop.page:39(p)
+msgid ""
+"The <em>rule of thirds</em> helps you to choose a pleasing composition for a "
+"photo."
+msgstr ""
+"<em>Pravidlo třetin</em> pomáhá zvolit uspokojivou kompozici fotografie."
+
+#: C/edit-crop.page:40(p)
+msgid ""
+"Imagine that the scene is divided up into a 3x3 grid by two equally-spaced "
+"vertical lines and two equally-spaced horizontal lines. According to the "
+"rule, you're more likely to get a pleasing composition if you align major "
+"features (like the horizon, or a person's body) with one of the lines. "
+"Paying attention to the way features flow from one part of the grid to "
+"another can also help."
+msgstr ""
+"Pomyslně si scénu rozdělte do mřížky 3×3 pomocí dvou rovnoměrně rozmístěných "
+"svislých a dvou rovnoměrně rozmístěných vodorovných čar. Při dodržení tohoto "
+"pravidla spíše získáte uspokojivou kompozici, když hlavní objekty zájmu "
+"(jako je horizont nebo tělo osoby) umístíte k těmto čarám. Povšimněte si "
+"také možnosti přesunu jedné části mřížky do jiné, což může rovněž pomoci."
+
+#: C/edit-crop.page:41(p)
+msgid ""
+"Cropping a photo so that it conforms to the rule of thirds often results in "
+"a more visually appealing image."
+msgstr ""
+"Oříznutí fotografie podle pravidla třetin čas přinese výsledek v podobě "
+"mnohem působivějšího obrázku."
+
+#: C/edit-crop.page:43(p)
+msgid ""
+"Cropping a photo, using the \"rule of thirds\" lines to improve the "
+"composition."
+msgstr ""
+"Ořezáním fotografie za pomocí „pravidla třetin“ můžete vylepšit její "
+"kompozici."
+
+#: C/edit-adjustments.page:7(desc)
+msgid "Change the exposure, saturation, tint, and shadows of a photo."
+msgstr "Jak změnit expozici, sytost, odstín a tónování fotografie."
+
+#: C/edit-adjustments.page:12(title)
+msgid "Color adjustments"
+msgstr "Přizpůsobení barev"
+
+#: C/edit-adjustments.page:14(p)
+msgid ""
+"The <gui>Adjust</gui> button opens a floating window with a histogram and "
+"sliders to adjust a photo's exposure, saturation, tint, temperature, and "
+"shadows. The histogram also has sliders to reduce the upper and lower "
+"intensity thresholds of the photograph, expanding the contrast of the middle "
+"range."
+msgstr ""
+"Tlačítko <gui>Upravit</gui> otevře plovoucí okno s histogramem a posuvníky "
+"sloužícími k úpravě expozice, sytosti, odstínu, teploty a tónů fotografie. "
+"Na histogramu je táhlo umožňující omezit horní a dolní práh intenzity, čímž "
+"se roztáhne kontrast ve střední části."
+
+#: C/edit-adjustments.page:16(p)
+msgid ""
+"The <gui>Enhance</gui> button adjusts the histogram and shadows sliders to "
+"improve the quality of a photo."
+msgstr ""
+"Tlačítko <gui>Vylepšit</gui> upraví histogram a posun tónů tak, aby "
+"fotografie vypadala kvalitněji."
+
+#: C/edit-adjustments.page:18(p)
+msgid ""
+"When the photo's colors and contrast are to your liking, press <gui>Apply</"
+"gui> to save the changes. <gui>Reset</gui> will return the image to its "
+"original state. <gui>Cancel</gui> discards all changes you've made."
+msgstr ""
+"Až barevnost a kontrast fotografie odpovídají vašim představám, zmáčkněte "
+"<gui>Použít</gui> a změny se uloží. Tlačítko <gui>Původní</gui> vrací "
+"obrázek do původního stavu. Pomocí <gui>Zrušit</gui> se všechny provedené "
+"změny zahodí a s úpravami se skončí."
+
+#: C/edit-adjustments.page:21(title)
+msgid "What do the color adjustments do?"
+msgstr "Co dělá která úprava barvy?"
+
+#: C/edit-adjustments.page:24(title)
+msgid "Exposure"
+msgstr "Expozice"
+
+#: C/edit-adjustments.page:25(p)
+msgid ""
+"Changes the brightness to make it look like the photo was exposed for a "
+"longer or shorter time. Use this to correct under- or over-exposed photos."
+msgstr ""
+"Mění jas, což funguje podobně, jako by byla fotografie exponována po delší "
+"nebo kratší čas. Použijte ke korekci podexponované nebo přeexponované "
+"fotografie."
+
+#: C/edit-adjustments.page:28(title)
+msgid "Saturation"
+msgstr "Sytost"
+
+#: C/edit-adjustments.page:29(p)
+msgid ""
+"Changes how vivid colors look. If your photo looks gray and washed out, try "
+"increasing the saturation. If colors look too bold, try decreasing it."
+msgstr ""
+"Mění, jak jasně vypadají barvy. Když vaše fotografie působí šedě a vybledle, "
+"zkuste zvýšit sytost. Když barvy naopak příliš křičí, zkuste ji snížit."
+
+#: C/edit-adjustments.page:32(title)
+msgid "Tint"
+msgstr "Odstín"
+
+#: C/edit-adjustments.page:33(p)
+msgid ""
+"This tints the photo with a color. It's useful for correcting photos taken "
+"with the wrong white balance setting, which typically have an unnatural "
+"color cast. For example, photos taken outdoors with the white balance set to "
+"\"Tungsten\" may have a blue cast."
+msgstr ""
+"Mění barevný odstín fotografie. Hodí se ke korekci fotografií, které mají "
+"nastaveno nesprávné vyvážení bílé, což typicky působí nepřirozené barevné "
+"podání. Například fotografie pořízené v přírodě s nastavením vyvážení bílé "
+"na „žárovka“ mají modrý nádech."
+
+#: C/edit-adjustments.page:36(title)
+msgid "Temperature"
+msgstr "Teplota"
+
+#: C/edit-adjustments.page:37(p)
+msgid ""
+"Changes how \"warm\" or \"cool\" the picture looks. Use this to make cold, "
+"depressing scenes look more lively, for example."
+msgstr ""
+"Mění, jak „teple“ nebo naopak „studeně“ má obrázek působit. Můžete jej "
+"použít například k tomu, aby studené depresivní scény vypadaly více živě."
+
+#: C/edit-adjustments.page:40(title)
+msgid "Shadows"
+msgstr "Tóny"
+
+#: C/edit-adjustments.page:41(p)
+msgid ""
+"This makes shadowy areas appear lighter. Use this to make detail more "
+"visible if it's obscured by the darkness of a shadow."
+msgstr ""
+"Dělá temné oblasti světlejšími. Použijte ke zviditelnění více detailů, když "
+"tonou v tmavých stínech."
+
+#: C/edit-adjustments.page:44(title)
+msgid "Intensity Threshold (sliders on the histogram)"
+msgstr "Práh intenzity (táhla na histogramu)"
+
+#: C/edit-adjustments.page:45(p)
+msgid ""
+"These sliders change how light the brightest white is and how dark the "
+"darkest black is. Use them to change the contrast of the photo. Photos which "
+"look washed out should particularly benefit from changing these settings."
+msgstr ""
+"Tato táhla mění jak moc světlá je nejsvětlejší bílá a jak moc tmavá je "
+"nejtmavější černá. Použijte ke změně kontrastu fotografie. Změna tohoto "
+"nastavení může přinést výsledky u fotografií, které vypadají mdle a vybledle."
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: C/edit-adjustments.page:0(None)
+msgid "translator-credits"
+msgstr "Marek Černocký <marek@manet.cz>"
diff --git a/help/de/de.po b/help/de/de.po
new file mode 100644
index 0000000..8885642
--- /dev/null
+++ b/help/de/de.po
@@ -0,0 +1,2193 @@
+# German translation for shotwell.
+# Copyright (C) 2015 shotwell's COPYRIGHT HOLDER
+# This file is distributed under the same license as the shotwell package.
+# Christian Kirbach <Christian.Kirbach@gmail.com>, 2015.
+# Benjamin Steinwender <b@stbe.at>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: shotwell shotwell-0.20\n"
+"POT-Creation-Date: 2015-01-27 11:44+0000\n"
+"PO-Revision-Date: 2015-01-27 20:35+0100\n"
+"Last-Translator: Benjamin Steinwender <b@stbe.at>\n"
+"Language-Team: German <gnome-de@gnome.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.7.1\n"
+
+#: C/view-sidebar.page:7(desc)
+msgid ""
+"The sidebar on the left of the window lists various views of your library."
+msgstr ""
+
+#: C/view-sidebar.page:21(title)
+msgid "The sidebar"
+msgstr "Die Seitenleiste"
+
+#: C/view-sidebar.page:23(p)
+msgid ""
+"The sidebar on the left side of the Shotwell window lists various views of "
+"your library. Although you may see the same photo in multiple views, it's "
+"only stored once on your hard drive."
+msgstr ""
+
+#: C/view-sidebar.page:25(p)
+msgid ""
+"The <gui>Last Import</gui> view lists your last imported photos no matter if "
+"they are imported from F-Spot, your camera, a memory card or the hard disk."
+msgstr ""
+
+#: C/view-sidebar.page:27(p)
+msgid "The <gui>Flagged</gui> lists all photos you had previous flagged."
+msgstr ""
+
+#: C/view-sidebar.page:29(p)
+msgid ""
+"The <gui>Saved Search</gui> allows you to sort your library by many criteria."
+msgstr ""
+
+#: C/view-sidebar.page:31(p)
+msgid ""
+"The <gui>Events</gui> folder lists all events in your library. An event is a "
+"group of photos that were taken at approximately the same time."
+msgstr ""
+
+#: C/view-sidebar.page:33(p)
+msgid ""
+"The <gui>Tags</gui> folder lists all tags you've assigned to photos. Photos "
+"can have multiple tags attached to them. When you click on the name of a tag "
+"in the sidebar, you will see all the photos associated with that tag."
+msgstr ""
+
+#: C/view-information.page:7(desc)
+msgid ""
+"View more detailed information about photos, like the exposure mode used by "
+"the camera."
+msgstr ""
+
+#: C/view-information.page:12(title)
+msgid "Basic and extended information"
+msgstr ""
+
+#: C/view-information.page:14(p)
+msgid ""
+"The Basic Information pane appears at the bottom of the sidebar, and "
+"displays a brief summary of the photos you've selected. If no photos are "
+"selected, it displays a summary of the entire collection. You can toggle the "
+"display of this pane using the <guiseq><gui>View</gui><gui>Basic "
+"Information</gui></guiseq> command."
+msgstr ""
+
+#: C/view-information.page:16(p)
+msgid ""
+"The floating Extended Information window displays more information about the "
+"selected photo. The <guiseq><gui>View</gui><gui>Extended Information</gui></"
+"guiseq> command or <keyseq><key>Ctrl</key><key>Shift</key><key>X</key></"
+"keyseq> toggles the display of this window."
+msgstr ""
+
+#: C/view-displaying.page:7(desc)
+msgid ""
+"Learn about different ways of viewing your photos: in a grid, filling the "
+"main window, or filling the whole screen."
+msgstr ""
+
+#: C/view-displaying.page:12(title)
+msgid "Photo views"
+msgstr ""
+
+#: C/view-displaying.page:14(p)
+msgid ""
+"When you select any collection in the sidebar, Shotwell displays all photos "
+"in the collection in the main window area. At the bottom right is a slider "
+"which adjusts the viewing size of the thumbnails. You may also adjust the "
+"thumbnail size using the plus and minus keys (<key>+</key> and <key>-</key>) "
+"or by pressing <key>Ctrl</key> while moving your mouse scroll wheel."
+msgstr ""
+
+#: C/view-displaying.page:16(p)
+msgid ""
+"You can view a photo full-window by double-clicking on it. From there you "
+"may move to other photos in the collection with the Back and Forward "
+"buttons. To return to the collection, double-click on the photo or press "
+"<key>Esc</key>."
+msgstr ""
+
+#: C/view-displaying.page:18(p)
+msgid ""
+"When viewing a photo in full-window mode, the slider on the toolbar controls "
+"zoom. You can pan around by grabbing and dragging anywhere on the photo. You "
+"can also zoom using your scroll wheel or by pressing the following keyboard "
+"shortcuts: <keyseq><key>Ctrl</key>0</keyseq> for the full image, "
+"<keyseq><key>Ctrl</key>1</keyseq> for 100% (1 photo pixel = 1 screen pixel), "
+"and <keyseq><key>Ctrl</key>2</keyseq> for 200% (1 photo pixel = 2x2 screen "
+"pixels)."
+msgstr ""
+
+#: C/view-displaying.page:20(p)
+msgid ""
+"Shotwell offers a fullscreen mode to display photos. Choose "
+"<guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> or press <key>F11</"
+"key>. To see the fullscreen toolbar, move your mouse to the bottom of the "
+"screen. The toolbar offers buttons to move through the collection, to pin "
+"the toolbar down (so it isn't hidden when you move the mouse away), and to "
+"leave fullscreen view."
+msgstr ""
+
+#: C/view-displaying.page:23(title)
+msgid "Viewing videos"
+msgstr "Videos ansehen"
+
+#: C/view-displaying.page:24(p)
+msgid ""
+"When you double-click a video, Shotwell will launch an external video player "
+"to play the video. It's not currently possible to display a video in full-"
+"window mode in Shotwell or to play the video within Shotwell itself."
+msgstr ""
+
+#: C/share-upload.page:7(desc)
+msgid "Publish photos to Facebook, Flickr, Picasa Web Albums, or other sites."
+msgstr ""
+
+#: C/share-upload.page:12(title)
+msgid "Publishing to the Web"
+msgstr "Ins Internet veröffentlichen"
+
+#: C/share-upload.page:14(p)
+msgid ""
+"Through the use of <link xref=\"other-plugins\">plugins</link>, Shotwell can "
+"publish photos and videos to the following services, each of which requires "
+"an account:"
+msgstr ""
+
+#: C/share-upload.page:18(link)
+msgid "Facebook"
+msgstr "Facebook"
+
+#: C/share-upload.page:19(link)
+msgid "Flickr"
+msgstr "Flickr"
+
+#: C/share-upload.page:20(p)
+msgid ""
+"<link href=\"http://picasaweb.google.com\">Picasa Web Albums</link> and "
+"<link href=\"http://plus.google.com\">Google+</link>"
+msgstr ""
+
+#: C/share-upload.page:21(p)
+msgid "<link href=\"http://youtube.com\">YouTube</link> (videos only)"
+msgstr ""
+
+#: C/share-upload.page:22(p)
+msgid ""
+"<link href=\"http://fotki.yandex.ru\">Yandex.Fotki</link>, a photo site "
+"popular in Russia (photos only)"
+msgstr ""
+
+#: C/share-upload.page:23(p)
+msgid ""
+"Any site running the <link href=\"http://piwigo.org\">Piwigo</link> photo "
+"gallery software (photos only)"
+msgstr ""
+
+#: C/share-upload.page:26(p)
+msgid ""
+"To publish selected photos in a collection, choose <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui></guiseq> and click on the <gui>Plugins</gui> tab "
+"to enable the plugin for the service you want to publish to. Next, choose, "
+"<guiseq><gui>File</gui><gui>Publish</gui></guiseq>, press the <gui>Publish</"
+"gui> toolbar button or use <keyseq><key>Ctrl</key><key>P</key></keyseq>. You "
+"will see a dialog that lets you select a publishing service. You will then "
+"need to log in or create an account."
+msgstr ""
+
+#: C/share-upload.page:31(p)
+msgid ""
+"Publishing to Facebook requires you to grant certain permissions to the "
+"Shotwell Connect Facebook application. You only need to grant these "
+"permissions once, when you first associate Shotwell Connect with your "
+"Facebook account."
+msgstr ""
+
+#: C/share-upload.page:35(p)
+msgid ""
+"Similarly, publishing to Flickr requires you to log in and permit Shotwell "
+"Connect to access your account."
+msgstr ""
+
+#: C/share-upload.page:37(p)
+msgid ""
+"If you have a Google account, but have not yet used Picasa Web Albums, you "
+"will need to log in to Picasa using a browser once before you can publish to "
+"this service."
+msgstr ""
+
+#: C/share-slideshow.page:7(desc)
+msgid "Watch a slideshow of your photos."
+msgstr "Eine Bildvorführung Ihrer Fotos ansehen"
+
+#: C/share-slideshow.page:12(title)
+msgid "Slideshows"
+msgstr "Bildvorführungen"
+
+#: C/share-slideshow.page:14(p)
+msgid ""
+"To see a sideshow of any collection in Shotwell, navigate to that collection "
+"and select <guiseq><gui>View</gui><gui>Slideshow</gui></guiseq> or press "
+"<key>F5</key>."
+msgstr ""
+
+#: C/share-slideshow.page:16(p)
+msgid "You can change some settings in a running slideshow:"
+msgstr ""
+
+#: C/share-slideshow.page:19(p)
+msgid "The duration how long an image should be shown: 1 - 30 seconds"
+msgstr ""
+
+#: C/share-slideshow.page:20(p)
+msgid "You can select different transition effects."
+msgstr ""
+
+#: C/share-slideshow.page:21(p)
+msgid "The time for each transition effect: 0.1 - 1.0 seconds"
+msgstr ""
+
+#: C/share-send.page:7(desc)
+msgid "Send photos via email, instant messaging or in other ways."
+msgstr ""
+
+#: C/share-send.page:12(title)
+msgid "Sending photos"
+msgstr "Fotos versenden"
+
+#: C/share-send.page:14(p)
+msgid ""
+"Shotwell can send photos using the GNOME desktop's Send To mechanism, which "
+"lets you send photos via email, instant messaging or in other ways."
+msgstr ""
+
+#: C/share-send.page:16(p)
+msgid ""
+"To send photos, select them in Shotwell and choose <guiseq><gui>File</"
+"gui><gui>Send To...</gui></guiseq>, or right-click the photos and choose "
+"<gui>Send To...</gui> from the context menu. A <gui>Send To</gui> dialog box "
+"will appear which lets you choose a mechanism for sending the files (such as "
+"email or instant messaging) and a destination. You can optionally choose to "
+"send the files in a compressed format."
+msgstr ""
+
+#: C/share-print.page:7(desc)
+msgid ""
+"Click <guiseq><gui>File</gui><gui>Print</gui></guiseq>. For more printing "
+"options, select the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog."
+msgstr ""
+
+#: C/share-print.page:12(title)
+msgid "Printing"
+msgstr "Drucken"
+
+#: C/share-print.page:14(p)
+msgid ""
+"To print a photo, select it and choose <guiseq><gui>File</gui><gui>Print</"
+"gui></guiseq>."
+msgstr ""
+
+#: C/share-print.page:16(p)
+msgid ""
+"Shotwell can also print multiple images in one page; to do this, select "
+"multiple images, choose <guiseq><gui>File</gui><gui>Print</gui></guiseq>, "
+"and in the <gui>Print</gui> dialog, choose the <gui>Image Settings</gui> "
+"tab. In <gui>Image Settings</gui>, choose one of the multiple-image-per-page "
+"options under <gui>Autosize</gui>."
+msgstr ""
+
+#: C/share-print.page:23(p)
+msgid ""
+"If you would like to set formatting, paper size, and orientation options, "
+"choose the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog prior to "
+"printing."
+msgstr ""
+
+#: C/share-export.page:7(desc)
+msgid "Copy photos out of Shotwell so you can put them somewhere else."
+msgstr ""
+
+#: C/share-export.page:12(title)
+msgid "Exporting photos"
+msgstr "Fotos exportieren"
+
+#: C/share-export.page:14(p)
+msgid ""
+"To export photos from Shotwell via drag and drop, drag the photos from "
+"Shotwell onto a file manager window or your desktop. The new files will be "
+"full-sized copies of the photos in your library."
+msgstr ""
+
+#: C/share-export.page:18(p)
+msgid ""
+"Alternatively, select a set of photos and choose the <guiseq><gui>File</"
+"gui><gui>Export</gui></guiseq> command or press <keyseq><key>Shift</"
+"key><key>Ctrl</key><key>E</key></keyseq>, which exports photos while letting "
+"you fine-tune the size and dimensions of your photo files. A window will "
+"appear allowing you to make several choices:"
+msgstr ""
+
+#: C/share-export.page:24(p)
+msgid "A format for export."
+msgstr ""
+
+#: C/share-export.page:27(p)
+msgid ""
+"Choose <gui>Unmodified</gui> to export photos in their original format "
+"without any edits made in Shotwell. RAW photos will be exported in their "
+"original RAW format."
+msgstr ""
+
+#: C/share-export.page:29(p)
+msgid ""
+"Choose <gui>Current</gui> to export photos including edits made in Shotwell. "
+"RAW photos will be exported in JPEG format if you have edited them in "
+"Shotwell, and otherwise in their original RAW format."
+msgstr ""
+
+#: C/share-export.page:31(p)
+msgid ""
+"Or you can choose a particular image format (JPEG, PNG, TIFF, BMP) to be "
+"used for exporting. Any edits made in Shotwell will be included, and "
+"Shotwell will convert photos to the destination format."
+msgstr ""
+
+#: C/share-export.page:37(p)
+msgid "The image quality for exporting (Low, Medium, High, or Maximum)."
+msgstr ""
+
+#: C/share-export.page:38(p)
+msgid ""
+"A scaling constraint (which means how Shotwell will decide to scale the "
+"photos down), and the desired pixel size."
+msgstr ""
+
+#: C/share-export.page:39(p)
+msgid ""
+"The option whether you like to export metadatas such as tags or ratings. "
+"This can help to save your privacy if you have geolocation tags or tags "
+"which shouldn't be seen by anyone."
+msgstr ""
+
+#: C/share-export.page:42(p)
+msgid ""
+"If selected, Shotwell will write tags, titles, and other metadata to the new "
+"files."
+msgstr ""
+
+#: C/share-background.page:7(desc)
+msgid ""
+"Set your desktop background to a single photo or to a slideshow of photos."
+msgstr ""
+
+#: C/share-background.page:12(title)
+msgid "Set a desktop background or slideshow"
+msgstr ""
+
+#: C/share-background.page:14(p)
+msgid ""
+"To set a single photo as your desktop background, select the photo and "
+"choose <guiseq><gui>File</gui><gui>Set as Desktop Background</gui></guiseq>."
+msgstr ""
+
+#: C/share-background.page:16(p)
+msgid ""
+"You can also set your background to a slideshow of photos. To do this, "
+"select the photos for the slideshow and choose <guiseq><gui>File</"
+"gui><gui>Set as Desktop Slideshow</gui></guiseq>. Shotwell will prompt you "
+"for a slideshow delay, which can be any interval up to one day in length. "
+"The background slideshow will proceed even when Shotwell is not running."
+msgstr ""
+
+#: C/running.page:7(desc)
+msgid ""
+"Find Shotwell in the Applications menu, or have it start automatically when "
+"you plug in a camera."
+msgstr ""
+
+#: C/running.page:14(title)
+msgid "Running Shotwell"
+msgstr ""
+
+#: C/running.page:16(p)
+msgid ""
+"Once installed, Shotwell is available in your <gui>Applications</gui> menu "
+"under <gui>Graphics</gui> or <gui>Photography</gui>."
+msgstr ""
+
+#: C/running.page:18(p)
+msgid ""
+"Shotwell may also be executed automatically when a camera is plugged in to "
+"your computer. To check that your system is set up to run Shotwell when a "
+"camera is detected, go to <guiseq><gui>Edit</gui><gui>Preferences</gui></"
+"guiseq> in any Nautilus (file browser) window and choose the <gui>Media</"
+"gui> tab.  You'll see a dropdown box entitled <gui>Photos:</gui> which lets "
+"you choose Shotwell as your photo handling application."
+msgstr ""
+
+#: C/running.page:25(p)
+msgid ""
+"Shotwell may also be executed directly from its build directory, although "
+"this is only recommended for testing out Shotwell or for developers."
+msgstr ""
+
+#: C/raw.page:7(desc)
+msgid "More about RAW support in Shotwell."
+msgstr ""
+
+#: C/raw.page:12(title)
+msgid "RAW support in Shotwell"
+msgstr ""
+
+#: C/raw.page:13(p)
+msgid ""
+"Some cameras have the ability to store data directly off the sensor and into "
+"a file that contains extra color information; this is commonly referred to "
+"as 'RAW' or 'camera RAW', and Shotwell supports these files as well."
+msgstr ""
+
+#: C/raw.page:18(p)
+msgid ""
+"Since RAW photographs normally cannot be displayed directly, but must be "
+"first developed - that is, have their extra information interpreted and "
+"readied for displaying - most cameras will either embed a JPEG inside a RAW-"
+"format file, or produce a JPEG alongside the RAW file at the time the "
+"snapshot is taken. The latter is referred to throughout this document as RAW"
+"+JPEG. If you import a RAW+JPEG pair, Shotwell will keep them paired and "
+"treat them as one item in your library."
+msgstr ""
+
+#: C/raw.page:27(p)
+msgid ""
+"When you import a RAW file, you can choose to either use the camera's "
+"internally-developed JPEG or Shotwell's by selecting <guiseq><gui>Photos</"
+"gui><gui>Developer</gui></guiseq> in the menus."
+msgstr ""
+
+#: C/raw.page:33(p)
+msgid ""
+"Changing between developers will cause all edits made to a photograph to be "
+"discarded."
+msgstr ""
+
+#: C/raw.page:39(p)
+msgid ""
+"In order to publish or use a RAW photograph in most other software, it has "
+"to be exported first. Shotwell can export your RAW photos in JPEG, PNG, TIFF "
+"or BMP format, and, when publishing, will internally export a JPEG version "
+"for you and publish that."
+msgstr ""
+
+#: C/other-plugins.page:7(desc)
+msgid "Extend Shotwell's functionality dynamically."
+msgstr ""
+
+#: C/other-plugins.page:12(title)
+#, fuzzy
+msgid "Plugins"
+msgstr "Plugins"
+
+#: C/other-plugins.page:13(p)
+msgid ""
+"Shotwell can be used with <em>plugins</em>, which are companion shared "
+"libraries that can add support for new publishing destinations or new "
+"slideshow transitions."
+msgstr ""
+
+#: C/other-plugins.page:18(p)
+msgid ""
+"To see a list of installed plugins, choose <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui></guiseq>, and in the <gui>Preferences</gui> "
+"window, click on the <gui>Plugins</gui> tab. You'll see a list of currently-"
+"installed plugins, each with a checkbox by it, and you may enable or disable "
+"each by selecting or deselecting the checkbox by its name."
+msgstr ""
+
+#: C/other-plugins.page:25(p)
+msgid ""
+"Full documentation on how to develop new plugins is available at <link href="
+"\"http://redmine.yorba.org/projects/shotwell/wiki/ShotwellArchWritingPlugins"
+"\">http://redmine.yorba.org/projects/shotwell/wiki/"
+"ShotwellArchWritingPlugins</link>"
+msgstr ""
+
+#: C/other-multiple.page:7(desc)
+msgid ""
+"You can open Shotwell with a different photo library by using the command "
+"line."
+msgstr ""
+
+#: C/other-multiple.page:12(title)
+msgid "Multiple libraries"
+msgstr ""
+
+#: C/other-multiple.page:14(p)
+msgid ""
+"Shotwell normally stores its database and photo thumbnails in the directory "
+"<file>~/.shotwell</file> . This directory does not hold photos, but the "
+"database in this directory contains a list of all the photos in the Shotwell "
+"library."
+msgstr ""
+
+#: C/other-multiple.page:16(p)
+msgid ""
+"As an advanced feature, it's possible for you to have multiple Shotwell "
+"libraries, each of which has its own set of photos. Each library needs its "
+"own database directory. To launch Shotwell with an alternate library, "
+"specify an alternate database directory on the command line as follows:"
+msgstr ""
+
+#: C/other-multiple.page:18(screen)
+#, no-wrap
+msgid ""
+"\n"
+"shotwell -d [library-directory]\n"
+msgstr ""
+
+#: C/other-missing.page:7(desc)
+msgid "If Shotwell can't find a photo in your library, it marks it as missing."
+msgstr ""
+
+#: C/other-missing.page:12(title)
+msgid "Missing photos"
+msgstr "Fehlende Fotos"
+
+#: C/other-missing.page:14(p)
+msgid ""
+"Each time Shotwell starts up, it scans your photo library to verify that all "
+"photo files still exist on your hard drive. If Shotwell finds that any photo "
+"files are missing, it will not display them in the normal Photos, Events and "
+"Tags views, but will instead show them in a separate Missing Files view "
+"which will appear in the sidebar."
+msgstr ""
+
+#: C/other-missing.page:16(p)
+msgid ""
+"If you no longer want the missing files to be part of your Shotwell "
+"collection (perhaps because you deleted them), go to the Missing Files view, "
+"select the photos and then click <gui>Remove From Library</gui>."
+msgstr ""
+
+#: C/other-missing.page:18(p)
+msgid ""
+"If you have photos on a removable disk, such as a CD or USB flash drive, and "
+"<link xref=\"index#import\">import</link> them into Shotwell <em>without</"
+"em> copying the photos to your computer, they will show up as missing files "
+"if you then disconnect the removable disk. See <link xref=\"import-file\"/> "
+"to learn how to copy files from removable disks onto your computer."
+msgstr ""
+
+#: C/other-missing.page:20(p)
+msgid ""
+"If any missing photo files become available again, Shotwell will notice this "
+"the next time it starts. The photos will once again appear in the Photos, "
+"Events and Tags views."
+msgstr ""
+
+#: C/other-files.page:7(desc)
+msgid "Keep the Shotwell library in sync with photo files on disk."
+msgstr ""
+
+#: C/other-files.page:12(title)
+msgid "Photo files"
+msgstr ""
+
+#: C/other-files.page:14(p)
+msgid ""
+"Every photo in the Shotwell library corresponds to a file stored on your "
+"hard disk. Shotwell has several features which help you keep the Shotwell "
+"library and files on disk in sync."
+msgstr ""
+
+#: C/other-files.page:21(title)
+msgid "Using a custom directory pattern"
+msgstr ""
+
+#: C/other-files.page:22(p)
+msgid ""
+"Shotwell allows you to specify how it names directories in your library. You "
+"can do this by changing the <gui>Directory Structure</gui> and <gui>Pattern</"
+"gui> settings in the <gui>Preferences</gui> dialog. You may use a "
+"preselected pattern, or choose <gui>Custom</gui> and type in your own."
+msgstr ""
+
+#: C/other-files.page:29(p)
+msgid ""
+"The available symbols for the directory pattern begin with a % (percent "
+"sign). The values these symbols produce are locale-dependent, so what you "
+"see on your computer may vary from the examples below."
+msgstr ""
+
+#: C/other-files.page:38(em)
+msgid "Symbol"
+msgstr "Symbol"
+
+#: C/other-files.page:38(em)
+msgid "Meaning"
+msgstr "Bedeutung"
+
+#: C/other-files.page:38(em)
+msgid "Example"
+msgstr "Beispiel"
+
+#: C/other-files.page:43(p)
+msgid "%Y"
+msgstr "%Y"
+
+#: C/other-files.page:43(p)
+msgid "Year: full"
+msgstr "Jahr: lang"
+
+#: C/other-files.page:43(p)
+msgid "2011"
+msgstr "2011"
+
+#: C/other-files.page:46(p)
+msgid "%y"
+msgstr "%y"
+
+#: C/other-files.page:46(p)
+msgid "Year: two digit"
+msgstr "Jahr: kurz"
+
+#: C/other-files.page:46(p)
+msgid "11"
+msgstr "11"
+
+#: C/other-files.page:49(p)
+msgid "%d"
+msgstr "%d"
+
+#: C/other-files.page:49(p)
+msgid "Day of the month with leading zero"
+msgstr "Tag des Monats mit führender Null"
+
+#: C/other-files.page:49(p)
+msgid "03"
+msgstr "03"
+
+#: C/other-files.page:52(p)
+msgid "%A"
+msgstr "%A"
+
+#: C/other-files.page:52(p)
+msgid "Day name: full"
+msgstr "Tag: lang"
+
+#: C/other-files.page:52(p)
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: C/other-files.page:55(p)
+msgid "%a"
+msgstr "%a"
+
+#: C/other-files.page:55(p)
+msgid "Day name: abbreviated"
+msgstr "Tag: abgekürzt"
+
+#: C/other-files.page:55(p)
+msgid "Wed"
+msgstr "Mi"
+
+#: C/other-files.page:58(p)
+msgid "%m"
+msgstr "%m"
+
+#: C/other-files.page:58(p)
+msgid "Month number with leading zero"
+msgstr "Monat als Zahl mit führender Null"
+
+#: C/other-files.page:58(p)
+msgid "02"
+msgstr "02"
+
+#: C/other-files.page:60(p)
+msgid "%b"
+msgstr "%b"
+
+#: C/other-files.page:60(p)
+msgid "Month name: abbreviated"
+msgstr "Monat: abgekürzt"
+
+#: C/other-files.page:60(p)
+msgid "Feb"
+msgstr "Feb"
+
+#: C/other-files.page:62(p)
+msgid "%B"
+msgstr "%B"
+
+#: C/other-files.page:62(p)
+msgid "Month name: full"
+msgstr "Monat: lang"
+
+#: C/other-files.page:62(p)
+msgid "February"
+msgstr "Februar"
+
+#: C/other-files.page:63(p)
+msgid "%I"
+msgstr "%I"
+
+#: C/other-files.page:63(p)
+msgid "Hour: 12 hour format"
+msgstr "Stunde: 12-Stunden-Format"
+
+#: C/other-files.page:63(p)
+msgid "05"
+msgstr "05"
+
+#: C/other-files.page:64(p)
+msgid "%H"
+msgstr "%H"
+
+#: C/other-files.page:64(p)
+msgid "Hour: 24 hour format"
+msgstr "Stunde: 24-Stunden-Format"
+
+#: C/other-files.page:64(p)
+msgid "17"
+msgstr "17"
+
+#: C/other-files.page:66(p)
+msgid "%M"
+msgstr "%M"
+
+#: C/other-files.page:66(p)
+msgid "Minute"
+msgstr "Minute"
+
+#: C/other-files.page:66(p)
+msgid "16"
+msgstr "16"
+
+#: C/other-files.page:67(p)
+msgid "%S"
+msgstr "%S"
+
+#: C/other-files.page:67(p)
+msgid "Second"
+msgstr "Sekunde"
+
+#: C/other-files.page:67(p)
+msgid "30"
+msgstr "30"
+
+#: C/other-files.page:68(p)
+msgid "%p"
+msgstr "%p"
+
+#: C/other-files.page:68(p)
+msgid "AM or PM"
+msgstr "a. m. oder p. m."
+
+#: C/other-files.page:68(p)
+msgid "PM"
+msgstr "p. m."
+
+#: C/other-files.page:72(p)
+msgid ""
+"There are other symbols available; please check the manual for strftime by "
+"running the command <cmd>man strftime</cmd> if you need one that isn't "
+"listed here."
+msgstr ""
+
+#: C/other-files.page:79(title)
+msgid "Automatically importing photos"
+msgstr "Automatisch Fotos importieren"
+
+#: C/other-files.page:81(p)
+msgid ""
+"Shotwell can automatically import new photos which appear in the library "
+"directory. (The library directory is usually the <file>Pictures</file> "
+"directory in your home directory; you can change its location in in the "
+"<gui>Preferences</gui> window.)"
+msgstr ""
+
+#: C/other-files.page:86(p)
+msgid ""
+"To enable auto-import, check the box <gui>Watch library directory for new "
+"files</gui> in the <gui>Preferences</gui> window."
+msgstr ""
+
+#: C/other-files.page:90(p)
+msgid ""
+"Shotwell can also follow symbolic links inside automatically-imported "
+"directories."
+msgstr ""
+
+#: C/other-files.page:95(title)
+msgid "Automatically renaming imported photos to lowercase"
+msgstr ""
+
+#: C/other-files.page:97(p)
+msgid ""
+"Shotwell can automatically change the filenames of imported photos to "
+"lowercase. To enable this, choose <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui></guiseq>, and in the <gui>Preferences</gui> window, check the "
+"<gui>Rename imported files to lowercase</gui> box."
+msgstr ""
+
+#: C/other-files.page:107(title)
+msgid "Writing metadata on the fly"
+msgstr ""
+
+#: C/other-files.page:109(p)
+msgid ""
+"By default, Shotwell does not modify photo files, even when you edit photos "
+"or change their tags or titles. Shotwell records these changes in its own "
+"database only."
+msgstr ""
+
+#: C/other-files.page:112(p)
+msgid ""
+"To change this behavior, you can enable the checkbox <gui>Write tags, titles "
+"and other metadata to photo files</gui> in the <gui>Preferences</gui> "
+"dialog. When this option is enabled, Shotwell will write the following "
+"metadata to most photo files whenever you change it in Shotwell:"
+msgstr ""
+
+#: C/other-files.page:118(p)
+msgid "titles"
+msgstr "Titel"
+
+#: C/other-files.page:119(p)
+#, fuzzy
+msgid "tags"
+msgstr "Markierungen"
+
+#: C/other-files.page:120(p)
+msgid "ratings"
+msgstr "Bewertungen"
+
+#: C/other-files.page:121(p)
+msgid "rotation information"
+msgstr "Rotationsinformation"
+
+#: C/other-files.page:122(p)
+msgid "time/date"
+msgstr "Uhrzeit/Datum"
+
+#: C/other-files.page:125(p)
+msgid ""
+"Shotwell stores this information in photo files in EXIF, IPTC and/or XMP "
+"format. Note that Shotwell can write only to photo files in JPEG, PNG and "
+"TIFF format, not to BMP photos, RAW photos or to video files."
+msgstr ""
+
+#: C/other-files.page:133(title)
+msgid "Runtime monitoring"
+msgstr ""
+
+#: C/other-files.page:135(p)
+msgid ""
+"While Shotwell is running, it notices changes made to any photo file "
+"externally. When a photo file changes, Shotwell rereads the file and updates "
+"your view of the photo and metadata."
+msgstr ""
+
+#: C/other-files.page:139(p)
+msgid ""
+"Note that Shotwell checks all photo files for changes at startup, but only "
+"photo files contained in the library directory are monitored in real time "
+"after startup. We hope to remove this limitation in a further release."
+msgstr ""
+
+#: C/organize-title.page:7(desc)
+msgid "Give titles to your photos."
+msgstr ""
+
+#: C/organize-title.page:12(title)
+msgid "Titles"
+msgstr "Titel"
+
+#: C/organize-title.page:14(p)
+msgid ""
+"The <guiseq><gui>View</gui><gui>Titles</gui></guiseq> checkbox toggles the "
+"display of titles beneath each photo. By default, a photo's title is its "
+"filename."
+msgstr ""
+
+#: C/organize-title.page:17(p)
+msgid ""
+"To change a photo's title, select the photo and click <guiseq><gui>Photos</"
+"gui><gui>Edit Title</gui></guiseq>, or press <key>F2</key>."
+msgstr ""
+
+#: C/organize-tag.page:7(desc)
+msgid "Organize photos by labelling them."
+msgstr ""
+
+#: C/organize-tag.page:14(title)
+msgid "Tagging photos"
+msgstr "Fotos markieren"
+
+#: C/organize-tag.page:16(p)
+msgid ""
+"You can assign one or more tags to selected photos. A tag can be one or more "
+"words that you want to associate with those photos."
+msgstr ""
+
+#: C/organize-tag.page:22(p)
+msgid ""
+"To add new tags to photos, select the photos you would like to tag, then do "
+"any of the following:"
+msgstr ""
+
+#: C/organize-tag.page:28(p)
+msgid "Choose <guiseq><gui>Tags</gui><gui>Add Tags</gui></guiseq>."
+msgstr ""
+
+#: C/organize-tag.page:29(p)
+msgid "Type <keyseq><key>Ctrl</key><key>T</key></keyseq>."
+msgstr "Drücken Sie <keyseq><key>Strg</key><key>T</key></keyseq>."
+
+#: C/organize-tag.page:30(p)
+msgid "Drag the selected photos and drop them on the desired tag."
+msgstr ""
+
+#: C/organize-tag.page:33(p)
+msgid ""
+"When you use <keyseq><key>Ctrl</key><key>T</key></keyseq> or "
+"<guiseq><gui>Tags</gui><gui>Add Tags</gui></guiseq> you can type in the "
+"names of one or more tags, separated by commas. Once you have created a tag, "
+"you can rename it by selecting that tag in the sidebar and choosing "
+"<guiseq><gui>Tags</gui><gui>Rename Tag \"[name]\"</gui></guiseq>, by "
+"rightclicking on it and choose <gui>Rename...</gui> or double-click on the "
+"tag in the sidebar."
+msgstr ""
+
+#: C/organize-tag.page:44(p)
+msgid ""
+"To change which tags are associated with a particular photo, select that "
+"photo, choose <guiseq><gui>Tags</gui><gui>Modify Tags</gui></guiseq> or "
+"right-click on a photo and select <gui>Modify Tags</gui> and edit the comma "
+"separated list. To remove a tag from one or more photos, first select that "
+"tag in the sidebar, then select the photos you would like to remove, and "
+"choose <guiseq><gui>Tags</gui><gui>Remove Tag \"[name]\" from Photos</gui></"
+"guiseq> or right-click on the photos an select <gui>Remove Tag \"[name]\" "
+"from Photos</gui>."
+msgstr ""
+
+#: C/organize-tag.page:58(p)
+msgid ""
+"To delete a tag entirely, select that tag in the sidebar and choose "
+"<guiseq><gui>Tags</gui><gui>Delete Tag \"[name]\"</gui></guiseq> or by right-"
+"click and select <gui>Delete Tag \"[name]\"</gui>."
+msgstr ""
+
+#: C/organize-tag.page:64(p)
+msgid ""
+"When you create a tag, it will appear in the sidebar under the Tags item, "
+"which is hidden if there are no tags. Photos can have multiple tags attached "
+"to them, and when you click on the name of a given tag in the sidebar, you "
+"will see all the photos associated with that tag."
+msgstr ""
+
+#: C/organize-tag.page:73(title)
+msgid "Hierarchical Tags"
+msgstr ""
+
+#: C/organize-tag.page:74(p)
+msgid ""
+"Shotwell supports also hierarchial tags. You can rearrange your tags by drag "
+"and drop a tag onto another. To create a new subtag right-click on a tag and "
+"select <gui>New</gui>."
+msgstr ""
+
+#: C/organize-tag.page:81(p)
+msgid ""
+"Hierarchial tags can help you to sort your tag list in ways that better "
+"match how you work or think; for example, you can store location tags like "
+"\"Mountains\" or \"Beach\" under a parent tag \"Places\", which itself can "
+"be placed under the tag \"Summer Holidays\"."
+msgstr ""
+
+#: C/organize-tag.page:89(p)
+msgid "Note that deleting a parent tag will also delete its child tags."
+msgstr ""
+
+#: C/organize-search.page:7(desc)
+msgid "Find photos and videos in your collection by a variety of criteria."
+msgstr ""
+
+#: C/organize-search.page:12(title)
+#, fuzzy
+msgid "Searching"
+msgstr "Suchen"
+
+#: C/organize-search.page:14(p)
+msgid ""
+"There are two ways to search in Shotwell: the filter toolbar, and with a "
+"saved search. The search bar allows you to quickly search the current view "
+"for certain criteria. Saved Searches feature more complex search criteria "
+"and persist in the sidebar between sessions."
+msgstr ""
+
+#: C/organize-search.page:21(title)
+msgid "Search bar"
+msgstr "Suchleiste"
+
+#: C/organize-search.page:22(p)
+msgid ""
+"The <guiseq><gui>View</gui><gui>Search Bar</gui></guiseq> checkbox toggles "
+"the display of the search bar. You can also hit <keyseq><key>Ctrl</"
+"key><key>F</key></keyseq> or <key>F8</key> to bring up the search bar. From "
+"this bar, you can find, show and hide photos and videos based on title, tag, "
+"rating or other options."
+msgstr ""
+
+#: C/organize-search.page:29(p)
+msgid ""
+"To begin searching, simply enter a search keyword in the text box, or click "
+"on <gui>Flagged</gui>, <gui>Rating</gui> or <gui>Type</gui>. The text search "
+"matches your keywords across tag names, photo or video titles and photos' "
+"original filenames. The <gui>Flagged</gui>, <gui>Rating</gui> and <gui>Type</"
+"gui> buttons allow you to filter your collection by whether photos are "
+"flagged, their current number of stars, and whether the items shown are "
+"images, videos, or raw camera files, respectively."
+msgstr ""
+
+#: C/organize-search.page:38(p)
+msgid ""
+"Disabling the search bar or exiting Shotwell automatically resets the search "
+"bar."
+msgstr ""
+
+#: C/organize-search.page:44(title)
+msgid "Saved search"
+msgstr "Gespeicherte Suche"
+
+#: C/organize-search.page:45(p)
+msgid ""
+"A saved search persists across Shotwell sessions, and is updated as photos "
+"and videos are added and removed from your Shotwell library."
+msgstr ""
+
+#: C/organize-search.page:50(p)
+msgid ""
+"Create a new saved search with <guiseq><gui>Edit</gui><gui>New Search</gui></"
+"guiseq> or by hitting <keyseq><key>Ctrl</key><key>S</key></keyseq>. The "
+"dialog box allows you to enter a name for the search and select whether you "
+"want to meet Any, All, or None of the criteria in the following rows."
+msgstr ""
+
+#: C/organize-search.page:56(p)
+msgid ""
+"Each row represents a search criterion. Use the + button to add more rows, "
+"and the - button to remove a specific row. The combo box on the left of each "
+"row selects the type of criteria. Criteria must be entered correctly before "
+"the OK button becomes available."
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/organize-remove.page:15(None)
+msgid ""
+"@@image: 'figures/trash_process.png'; md5=ed596bda34c2f4a79a310fbc8bb51fd2"
+msgstr ""
+
+#: C/organize-remove.page:7(desc)
+msgid ""
+"Remove photos from the library, or delete them from your computer entirely."
+msgstr ""
+
+#: C/organize-remove.page:12(title)
+msgid "Removing and deleting photos"
+msgstr ""
+
+#: C/organize-remove.page:14(p)
+msgid ""
+"You may remove photos from your library and you may additionally delete them "
+"entirely from your hard disk."
+msgstr ""
+
+#: C/organize-remove.page:15(media)
+msgid "Delete process"
+msgstr ""
+
+#: C/organize-remove.page:16(p)
+msgid ""
+"This diagram shows how a photo, when deleted, is first put into Shotwell's "
+"trash. If you delete it from Shotwell's trash, it is put into your "
+"computer's trash. If you delete it from your computer's trash the photo is "
+"finally and irretrievably deleted from your computer."
+msgstr ""
+
+#: C/organize-remove.page:18(title)
+#, fuzzy
+msgid "Removing photos from the library"
+msgstr "Fotos werden aus Bibliothek entfernt"
+
+#: C/organize-remove.page:19(p)
+msgid ""
+"Select the photos to remove and choose <guiseq><gui>Edit</gui><gui>Move to "
+"Trash</gui></guiseq>. (You can also press the <key>Delete</key> key.) The "
+"photos will be moved from your library to Shotwell's Trash."
+msgstr ""
+
+#: C/organize-remove.page:22(p)
+msgid ""
+"If you want to remove photos from Shotwell without having them pass through "
+"the trash, simply select the photos to be removed and choose "
+"<guiseq><gui>Edit</gui><gui>Remove From Library</gui></guiseq>. The photo "
+"files will be left in place on disk."
+msgstr ""
+
+#: C/organize-remove.page:26(title)
+msgid "Emptying or restoring the trash folder"
+msgstr ""
+
+#: C/organize-remove.page:27(p)
+msgid ""
+"Select the Trash entry in the Sidebar and Shotwell will display all photos "
+"that have been marked for removal or deletion. In the Trash view, the "
+"following commands are available:"
+msgstr ""
+
+#: C/organize-remove.page:29(title)
+msgid "Delete"
+msgstr "Löschen"
+
+#: C/organize-remove.page:29(p)
+msgid "Delete the selected photos from the trash folder."
+msgstr ""
+
+#: C/organize-remove.page:30(title)
+msgid "Restore"
+msgstr "Wiederherstellen"
+
+#: C/organize-remove.page:30(p)
+msgid "Restore the selected photos into Shotwell."
+msgstr ""
+
+#: C/organize-remove.page:31(title)
+msgid "Empty trash"
+msgstr "Papierkorb leeren"
+
+#: C/organize-remove.page:31(p)
+msgid "Delete all photos from the trash folder."
+msgstr ""
+
+#: C/organize-remove.page:36(title)
+msgid "Deleting or emptying Trash"
+msgstr ""
+
+#: C/organize-remove.page:37(p)
+msgid ""
+"When you delete files from the Trash folder or empty the Trash folder, you "
+"will be given the following choices:"
+msgstr ""
+
+#: C/organize-remove.page:39(title)
+msgid "Only Remove"
+msgstr "Nur entfernen"
+
+#: C/organize-remove.page:39(p)
+msgid ""
+"Remove photos from the library but leave the photos in their location on the "
+"computer."
+msgstr ""
+
+#: C/organize-remove.page:40(title)
+msgid "Trash file"
+msgstr "Datei löschen"
+
+#: C/organize-remove.page:40(p)
+msgid "Remove photos from the library and delete them from the computer."
+msgstr ""
+
+#: C/organize-remove.page:41(title)
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: C/organize-remove.page:41(p)
+msgid "Do nothing."
+msgstr "Nichts tun."
+
+#: C/organize-rating.page:7(desc)
+msgid ""
+"Give photos a rating between 1 and 5 stars. You can reject bad photos, "
+"hiding them from view."
+msgstr ""
+
+#: C/organize-rating.page:12(title)
+msgid "Ratings"
+msgstr "Bewertungen"
+
+#: C/organize-rating.page:13(p)
+msgid ""
+"You can assign each photo a rating from 1-5 stars, or may alternatively rate "
+"it as Rejected, in which case Shotwell will hide the photo by default."
+msgstr ""
+
+#: C/organize-rating.page:15(p)
+msgid "You can rate a photo or a set of photos in any of these ways:"
+msgstr ""
+
+#: C/organize-rating.page:18(p)
+msgid ""
+"Select the photo(s), then choose a rating from the top-level "
+"<guiseq><gui>Photos</gui><gui>Set Rating</gui></guiseq> menu."
+msgstr ""
+
+#: C/organize-rating.page:19(p)
+msgid ""
+"Right-click on the photo(s), then choose a rating from the Set Rating "
+"context menu."
+msgstr ""
+
+#: C/organize-rating.page:20(p)
+msgid ""
+"Select the photo(s), then press any of the shortcut keys <key>1</key>, "
+"<key>2</key>, <key>3</key>, <key>4</key> or <key>5</key> to assign a rating. "
+"Or press <key>9</key> to mark the photo(s) as rejected or <key>0</key> to "
+"clear the rating(s)."
+msgstr ""
+
+#: C/organize-rating.page:23(p)
+msgid ""
+"Normally Shotwell displays all photos except rejected photos. You can set a "
+"different rating filter using the <guiseq><gui>View</gui><gui>Filter Photos</"
+"gui></guiseq> menu - for example, you can display only photos rated with 3 "
+"stars or higher, or you can display all photos including those marked "
+"rejected. The Shotwell icon on the toolbar displays the current rating "
+"filter and can also be used to set the filter."
+msgstr ""
+
+#: C/organize-rating.page:26(p)
+msgid ""
+"Shotwell normally displays each photo's rating in its lower left-hand "
+"corner. You can turn off the display of ratings using the <guiseq><gui>View</"
+"gui><gui>Ratings</gui></guiseq> menu item."
+msgstr ""
+
+#: C/organize-rating.page:28(p)
+msgid ""
+"You can increase or decrease a photo's rating using the <guiseq><gui>Set "
+"Rating</gui><gui>Increase</gui></guiseq> and <guiseq><gui>Set Rating</"
+"gui><gui>Decrease</gui></guiseq> commands, or the keyboard shortcuts "
+"<key>&lt;</key> and <key>&gt;</key>."
+msgstr ""
+
+#: C/organize-flag.page:7(desc)
+msgid "Flag photos to mark them as special or to work with them as a set."
+msgstr ""
+
+#: C/organize-flag.page:12(title)
+msgid "Flagging photos"
+msgstr ""
+
+#: C/organize-flag.page:14(p)
+msgid ""
+"Shotwell lets you <em>flag</em> photos. When a photo is flagged, a small "
+"flag icon appears in its upper right corner. You can select the "
+"<gui>Flagged</gui> item in the sidebar to see all photos which have been "
+"flagged."
+msgstr ""
+
+#: C/organize-flag.page:18(p)
+msgid ""
+"Flagging a photo marks it as special. You can interpret this in any way you "
+"like. For example, you might flag all photos which need visual adjustment, "
+"or all photos which you want to share with a friend."
+msgstr ""
+
+#: C/organize-flag.page:22(p)
+msgid ""
+"Flagging is also useful because you can operate on all flagged photos as a "
+"set. For example, you can select the <gui>Flagged</gui> view and then upload "
+"all flagged photos to a publishing service."
+msgstr ""
+
+#: C/organize-flag.page:27(title)
+msgid "To flag or unflag a photo"
+msgstr ""
+
+#: C/organize-flag.page:28(p)
+msgid ""
+"To flag or unflag a photo, right-click the photo and choose <gui>Flag</gui> "
+"or <gui>Unflag</gui> from the context menu. Or use the <keyseq><key>Ctrl</"
+"key><key>G</key></keyseq> or <key>/</key> shortcut keys."
+msgstr ""
+
+#: C/organize-event.page:7(desc)
+msgid ""
+"Group photos together that were taken at the same time. Learn how to rename, "
+"merge, and sort events."
+msgstr ""
+
+#: C/organize-event.page:12(title)
+msgid "Events"
+msgstr "Ereignisse"
+
+#: C/organize-event.page:14(p)
+msgid ""
+"An event is a group of photos that were taken at approximately the same "
+"time. When you import photos, Shotwell checks when each photo was taken. It "
+"then groups the photos into events."
+msgstr ""
+
+#: C/organize-event.page:16(p)
+msgid ""
+"Choose <gui>Events</gui> from the sidebar to see your photos organized by "
+"date. If you select a month or year from the sidebar, a list of events will "
+"be displayed in the main window. Double-click an event to see all the photos "
+"that were taken around that time."
+msgstr ""
+
+#: C/organize-event.page:18(p)
+msgid ""
+"If a photo has no embedded date/time information, then Shotwell can't "
+"automatically place it in any event. In this case the photo will appear in "
+"the <gui>No Event</gui> view accessible from the sidebar. You can still move "
+"the photo to any event you like as described below."
+msgstr ""
+
+#: C/organize-event.page:25(title)
+msgid "Renaming events"
+msgstr ""
+
+#: C/organize-event.page:27(p)
+msgid ""
+"To give an event a name rather than referring to it by its date, select the "
+"event, click <guiseq><gui>Edit</gui><gui>Rename Event</gui></guiseq> and "
+"enter a new name. Another way of renaming an event is to double-click its "
+"name in the sidebar; type a new name and then press <key>Enter</key>."
+msgstr ""
+
+#: C/organize-event.page:31(title)
+msgid "Moving photos between events"
+msgstr ""
+
+#: C/organize-event.page:33(p)
+msgid ""
+"Even though photos are initially grouped into events by their date, you can "
+"move photos between events. To do this, drag any photo to the sidebar and "
+"drop it on an event."
+msgstr ""
+
+#: C/organize-event.page:37(title)
+msgid "Creating and merging events"
+msgstr ""
+
+#: C/organize-event.page:38(p)
+msgid ""
+"To create a new event, select the photos you would like in the new event and "
+"click <guiseq><gui>Events</gui><gui>New Event</gui></guiseq>."
+msgstr ""
+
+#: C/organize-event.page:39(p)
+msgid ""
+"To merge events, select <guiseq><gui>Events</gui></guiseq> from the sidebar, "
+"then, while holding down <key>Ctrl</key> click on the events you want to "
+"merge in the main window area. Finally, click <guiseq><gui>Events</"
+"gui><gui>Merge Events</gui></guiseq>."
+msgstr ""
+
+#: C/organize-event.page:43(title)
+msgid "Sorting events"
+msgstr ""
+
+#: C/organize-event.page:45(p)
+msgid ""
+"Events are displayed in a tree in the sidebar, organized by the year and "
+"month of the earliest photo in the event. To change the event sort order, "
+"click <guiseq><gui>View</gui><gui>Sort Events</gui></guiseq> and select "
+"either ascending or descending."
+msgstr ""
+
+#: C/organize-event.page:51(title)
+msgid "Change the photo used to represent each event"
+msgstr ""
+
+#: C/organize-event.page:53(p)
+msgid ""
+"If you select the Events item in the sidebar, you'll see a single photo "
+"which represents each event. This is called the key photo."
+msgstr ""
+
+#: C/organize-event.page:55(p)
+msgid ""
+"By default, Shotwell uses the first photo in each event as its key photo. To "
+"use a different key photo, select the photo and choose <guiseq><gui>Photos</"
+"gui><gui>Make Key Photo for Event</gui></guiseq>."
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/index.page:23(None)
+msgid ""
+"@@image: 'figures/shotwell_logo.png'; md5=59de2b2c4fa64ea1497c98452c509dbd"
+msgstr "original"
+
+#: C/index.page:6(title) C/index.page:7(title)
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#: C/index.page:9(name)
+msgid "Jim Nelson"
+msgstr "Jim Nelson"
+
+#: C/index.page:10(email)
+msgid "jim@yorba.org"
+msgstr "jim@yorba.org"
+
+#: C/index.page:11(name)
+msgid "Allison Barlow"
+msgstr "Allison Barlow"
+
+#: C/index.page:12(email)
+msgid "allison@yorba.org"
+msgstr "allison@yorba.org"
+
+#: C/index.page:13(name)
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#: C/index.page:14(email)
+msgid "robert.ancell@canonical.com"
+msgstr "robert.ancell@canonical.com"
+
+#: C/index.page:15(name)
+msgid "Peter Smith"
+msgstr "Peter Smith"
+
+#: C/index.page:16(email)
+msgid "pdo.smith@gmail.com"
+msgstr "pdo.smith@gmail.com"
+
+#: C/index.page:17(name)
+msgid "Phil Bull"
+msgstr "Phil Bull"
+
+#: C/index.page:18(email)
+msgid "philbull@gmail.com"
+msgstr "philbull@gmail.com"
+
+#: C/index.page:23(title)
+msgid ""
+"<media type=\"image\" src=\"figures/shotwell_logo.png\"/>Shotwell Photo "
+"Manager"
+msgstr ""
+
+#: C/index.page:26(title)
+msgid "Importing Photos"
+msgstr ""
+
+#: C/index.page:30(title)
+msgid "Viewing Photos"
+msgstr ""
+
+#: C/index.page:34(title)
+msgid "Organizing Photos"
+msgstr ""
+
+#: C/index.page:38(title)
+msgid "Editing Photos"
+msgstr ""
+
+#: C/index.page:42(title)
+msgid "Sharing Photos"
+msgstr ""
+
+#: C/index.page:46(title)
+msgid "Other Features"
+msgstr ""
+
+#: C/import-memorycard.page:7(desc)
+msgid "Import photos from a digital camera's memory card."
+msgstr ""
+
+#: C/import-memorycard.page:12(title)
+msgid "Importing from a memory card"
+msgstr ""
+
+#: C/import-memorycard.page:14(p)
+msgid "To import photos from a camera memory card:"
+msgstr ""
+
+#: C/import-memorycard.page:18(p)
+msgid ""
+"Put the card into your card reader. Make sure the card reader is plugged in "
+"to the computer and switched on."
+msgstr ""
+
+#: C/import-memorycard.page:21(p)
+msgid "The card reader and card should be detected automatically."
+msgstr ""
+
+#: C/import-memorycard.page:24(p)
+msgid ""
+"Follow the instructions for <link xref=\"import-file\">importing photos from "
+"your hard disk</link>. If you click <guiseq><gui>File</gui><gui>Import From "
+"Folder</gui></guiseq>, the memory card should be visible as a folder in the "
+"side bar of the file selection window."
+msgstr ""
+
+#: C/import-memorycard.page:28(p)
+msgid ""
+"Shotwell can import photos from any memory card that is compatible with your "
+"card reader."
+msgstr ""
+
+#: C/import-memorycard.page:30(p)
+msgid ""
+"If the card is not detected automatically, your card reader may not have "
+"been recognized. Try unplugging it and then plugging it in again. If that "
+"doesn't work, you should still be able to import photos by <link xref="
+"\"import-camera\">connecting your camera directly to the computer</link>, "
+"though."
+msgstr ""
+
+#: C/import-f-spot.page:7(desc)
+msgid ""
+"Shotwell can import all your photos and tags from the F-Spot photo manager."
+msgstr ""
+
+#: C/import-f-spot.page:12(title)
+msgid "Importing from F-Spot"
+msgstr ""
+
+#: C/import-f-spot.page:14(p)
+msgid "To import an existing photo collection from F-Spot:"
+msgstr ""
+
+#: C/import-f-spot.page:16(p)
+msgid "Select <guiseq><gui>File</gui><gui>Import From F-Spot</gui></guiseq>."
+msgstr ""
+
+#: C/import-f-spot.page:17(p)
+msgid ""
+"Now choose either the default F-Spot library or another F-Spot database. If "
+"importing from another F-Spot database, select a directory and file from the "
+"chooser dialog box."
+msgstr ""
+
+#: C/import-f-spot.page:20(p)
+msgid ""
+"Shotwell will import your photos, together with their tags and other "
+"information. Once the import is complete, you can select <gui>Last Import</"
+"gui> in the sidebar to see all photos successfully imported. The Events list "
+"will also show new entries for the dates corresponding to the imported "
+"photos."
+msgstr ""
+
+#: C/import-file.page:7(desc)
+msgid "Import photos that are already saved on your computer."
+msgstr ""
+
+#: C/import-file.page:12(title)
+msgid "Importing from your hard disk"
+msgstr ""
+
+#: C/import-file.page:14(p)
+msgid ""
+"To import photo files from your hard disk into Shotwell, just drag them from "
+"your file browser into the Shotwell window."
+msgstr ""
+
+#: C/import-file.page:16(p)
+msgid ""
+"Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder</gui></"
+"guiseq> and select the folder containing the photos you want to import."
+msgstr ""
+
+#: C/import-file.page:18(p)
+msgid ""
+"Shotwell will ask whether you want to copy the photo files to your library "
+"folder (usually this is the <file>Pictures</file> folder in your home "
+"directory) or to import them in place without copying the files."
+msgstr ""
+
+#: C/import-file.page:20(p)
+msgid ""
+"If you hold down <key>Ctrl</key> while dragging photos in, Shotwell will "
+"copy the photos into your library folder without prompting. Similarly, if "
+"you hold down <keyseq><key>Ctrl</key><key>Shift</key></keyseq> while "
+"dragging photos in, Shotwell will import the photos without copying them."
+msgstr ""
+
+#: C/import-file.page:22(p)
+msgid ""
+"Once the import is complete, you can select <gui>Last Import</gui> in the "
+"sidebar to see all photos successfully imported. The Events list will also "
+"show new entries for the dates corresponding to the imported photos."
+msgstr ""
+
+#: C/import-camera.page:7(desc)
+msgid "Copy photos from a digital camera."
+msgstr ""
+
+#: C/import-camera.page:12(title)
+msgid "Importing from a camera"
+msgstr ""
+
+#: C/import-camera.page:14(p)
+msgid "To import photos from a digital camera:"
+msgstr ""
+
+#: C/import-camera.page:18(p)
+msgid ""
+"Connect the camera to your computer and switch it on. Shotwell will detect "
+"it and list it in the sidebar."
+msgstr ""
+
+#: C/import-camera.page:22(p)
+msgid ""
+"Select the camera in the sidebar. Previews of each photo on the camera will "
+"be displayed."
+msgstr ""
+
+#: C/import-camera.page:25(p)
+msgid ""
+"If you like, you can choose a set of specific photos to import. To do this, "
+"hold down the <key>Ctrl</key> key and click to select individual photos. You "
+"can hold down <key>Shift</key> and click to select a range of photos too."
+msgstr ""
+
+#: C/import-camera.page:28(p)
+msgid ""
+"Click either <gui>Import Selected</gui> or <gui>Import All</gui>. The photos "
+"will be copied from the camera and saved on your computer."
+msgstr ""
+
+#: C/import-camera.page:32(p)
+msgid ""
+"Once the import is complete, you can open the <gui>Last Import</gui> view "
+"(in the sidebar) to see all photos that were imported. The Events list (also "
+"in the sidebar) will also show the new photos, organized by date."
+msgstr ""
+
+#: C/formats.page:7(desc)
+msgid ""
+"Shotwell supports JPEG, PNG, TIFF, BMP and RAW photo files as well as video "
+"files."
+msgstr ""
+
+#: C/formats.page:12(title)
+msgid "Supported photo and video formats"
+msgstr ""
+
+#: C/formats.page:14(p)
+msgid ""
+"Shotwell supports JPEG, PNG, TIFF, BMP and <link type=\"guide\" xref=\"other-"
+"raw\">RAW</link> photo files. Shotwell does not yet support other graphics "
+"format such as GIF."
+msgstr ""
+
+#: C/formats.page:16(p)
+msgid ""
+"Shotwell's RAW format support is currently limited. When you view a RAW "
+"photo, you are actually viewing a JPEG derived from the RAW photo, not the "
+"RAW image itself. Additionally, the RAW editing pipeline is not fully 16-bit "
+"- you can only export edited photos as 8-bit files. All supported formats "
+"can be used for export (JPEG, PNG, TIFF, BMP)."
+msgstr ""
+
+#: C/formats.page:18(p)
+msgid ""
+"For more information about RAW-format photos in Shotwell, please see the "
+"<link type=\"guide\" xref=\"other-raw\">RAW</link> section."
+msgstr ""
+
+#: C/formats.page:22(p)
+msgid ""
+"Shotwell also supports video files in any format supported by the GStreamer "
+"media library on the system where Shotwell is running. This typically "
+"includes the following formats among others:"
+msgstr ""
+
+#: C/formats.page:25(p)
+msgid "Container formats: Ogg, QuickTime, MP4, AVI."
+msgstr ""
+
+#: C/formats.page:26(p)
+msgid ""
+"Codecs: Theora, Quicktime, MPEG-4, Motion JPEG. <em>Note that some operating "
+"systems may not include all codecs listed here due to legal or licensing "
+"restrictions.</em>"
+msgstr ""
+
+#: C/formats.page:30(p)
+msgid ""
+"Shotwell supports both photos and videos, but for simplicity, this "
+"documentation uses just the term \"photos\" in most places. Many operations "
+"in Shotwell apply to both photos and videos, however. In particular, events, "
+"flagging, rating, tagging, and publishing work both for photos and for "
+"videos."
+msgstr ""
+
+#: C/edit-undo.page:7(desc)
+msgid "Return a photo to its original, unedited form."
+msgstr ""
+
+#: C/edit-undo.page:14(title)
+msgid "Undoing changes"
+msgstr "Änderungen rückgängig machen"
+
+#: C/edit-undo.page:16(p)
+msgid ""
+"Because Shotwell is a non-destructive photo editor, you can undo any "
+"alterations you make to a photograph."
+msgstr ""
+
+#: C/edit-undo.page:18(p) C/edit-nondestructive.page:16(p)
+msgid ""
+"If you want to see what a photo looked like before your modifications, press "
+"the <key>Shift</key> key. The original photo will be displayed as long as "
+"you hold the key down."
+msgstr ""
+
+#: C/edit-undo.page:20(p)
+msgid ""
+"To completely undo all the changes you've made to a photo, click "
+"<guiseq><gui>Photos</gui><gui>Revert to Original</gui></guiseq>. The only "
+"exception is that time and date adjustments will not be reverted."
+msgstr ""
+
+#: C/edit-time-date.page:7(desc)
+msgid "Change the time and date of photos if those details are incorrect."
+msgstr ""
+
+#: C/edit-time-date.page:12(title)
+msgid "Adjust the time and date of photos"
+msgstr ""
+
+#: C/edit-time-date.page:14(p)
+msgid ""
+"To adjust the time and date of photos, select the photos you would like to "
+"adjust, choose <guiseq><gui>Photos</gui><gui>Adjust Time and Date</gui></"
+"guiseq> and select a new time and date."
+msgstr ""
+
+#: C/edit-time-date.page:16(p)
+msgid ""
+"If you are changing the date and time of multiple photos at once, you can "
+"choose to shift all the photos by the same amount of time or to set all the "
+"photos to the same time."
+msgstr ""
+
+#: C/edit-time-date.page:18(p)
+msgid ""
+"By default, the time and date are only changed inside Shotwell. You can also "
+"choose to modify the time and date in the original file, but this cannot be "
+"undone once you exit Shotwell."
+msgstr ""
+
+#: C/edit-straighten.page:7(desc)
+msgid "Straighten a photo so that its horizon appears level."
+msgstr ""
+
+#: C/edit-straighten.page:12(title)
+msgid "Straighten photos"
+msgstr ""
+
+#: C/edit-straighten.page:14(p)
+msgid ""
+"The straighten tools allows photos to be leveled and straightened. The "
+"straighten tool is only available in full-window or fullscreen mode."
+msgstr ""
+
+#: C/edit-straighten.page:18(p)
+msgid ""
+"Click <gui>Straighten</gui>. The straighten slider will appear. "
+"Alternatively, use the keyboard shortcut <keyseq><key>Ctrl</key><key>A</"
+"key></keyseq>."
+msgstr ""
+
+#: C/edit-straighten.page:21(p)
+msgid "Drag the slider to achieve the desired degree of straightening."
+msgstr ""
+
+#: C/edit-straighten.page:24(p)
+msgid "Press <gui>OK</gui> when finished."
+msgstr ""
+
+#: C/edit-rotate.page:7(desc)
+msgid ""
+"Click the <gui>Rotate</gui> button, or choose one of the commands in the "
+"<gui>Photo</gui> menu."
+msgstr ""
+
+#: C/edit-rotate.page:12(title)
+msgid "Rotate or flip a photo"
+msgstr ""
+
+#: C/edit-rotate.page:14(p)
+msgid ""
+"You can rotate your photos left and right (clockwise and counterclockwise) "
+"with the <gui>Rotate</gui> button on the toolbar of most views. You can also "
+"make a mirror image of any photo."
+msgstr ""
+
+#: C/edit-rotate.page:16(p)
+msgid ""
+"To rotate right, click on the <gui>Rotate</gui> button. To rotate left, "
+"press and hold the <key>Ctrl</key> key and then click the button. Both "
+"commands are available in the <gui>Photos</gui> menu too. Alternatively, use "
+"the following keyboard shortcuts:"
+msgstr ""
+
+#: C/edit-rotate.page:18(p)
+msgid ""
+"rotate left: <keyseq><key>Shift</key><key>Ctrl</key><key>R</key></keyseq> or "
+"<key>[</key>"
+msgstr ""
+
+#: C/edit-rotate.page:19(p)
+msgid ""
+"rotate right: <keyseq><key>Ctrl</key><key>R</key></keyseq> or <key>]</key>"
+msgstr ""
+
+#: C/edit-rotate.page:21(p)
+msgid ""
+"To create a mirror image of a photo, use the <gui>Flip Horizontally</gui> "
+"command in the <gui>Photos</gui> menu. To flip an image vertically, use the "
+"<gui>Flip Vertically</gui> command in the same menu."
+msgstr ""
+
+#: C/edit-rotate.page:24(p)
+msgid ""
+"If you select more than one image, you can rotate all of them at the same "
+"time."
+msgstr ""
+
+#: C/edit-redeye.page:7(desc)
+msgid ""
+"Correct photos where people have red eyes because of the camera's flash."
+msgstr ""
+
+#: C/edit-redeye.page:12(title)
+msgid "Removing red-eye"
+msgstr "Rote Augen werden entfernt"
+
+#: C/edit-redeye.page:14(p)
+msgid ""
+"Red-eye occurs when the camera's flash reflects off the pupil of someone's "
+"eye. To eliminate this in a photo, use the Red-eye tool."
+msgstr ""
+
+#: C/edit-redeye.page:17(p)
+msgid "Click <gui>Red-eye</gui>. A circle will appear on the photo."
+msgstr ""
+
+#: C/edit-redeye.page:20(p)
+msgid ""
+"Drag the circle over the affected pupil, adjust its size with the slider "
+"control, and press <gui>Apply</gui>. The redness will be removed."
+msgstr ""
+
+#: C/edit-redeye.page:23(p)
+msgid ""
+"Repeat this process for all red pupils in your photo. Press <gui>Close</gui> "
+"when finished."
+msgstr ""
+
+#: C/edit-nondestructive.page:7(desc)
+msgid ""
+"Shotwell is a non-destructive photo editor - it does not modify your "
+"original photos."
+msgstr ""
+
+#: C/edit-nondestructive.page:12(title)
+msgid "What happens to the original when I edit a photo?"
+msgstr ""
+
+#: C/edit-nondestructive.page:14(p)
+msgid ""
+"Shotwell is a non-destructive photo editor. It does not modify your original "
+"photographs. That is to say, if you crop a photo or adjust its colors, the "
+"photo file on disc remains untouched. Shotwell stores your edits in a "
+"database and applies them on the fly as necessary. This means you can undo "
+"any alterations you make to a photograph."
+msgstr ""
+
+#: C/edit-nondestructive.page:18(p)
+msgid ""
+"Note that Shotwell can optionally write metadata (such as tags and titles) "
+"to photo files. For more information, see the section <link xref=\"other-"
+"files\">Photo files</link>."
+msgstr ""
+
+#: C/edit-external.page:7(desc)
+msgid "Use a different program to edit a photo."
+msgstr ""
+
+#: C/edit-external.page:12(title)
+msgid "Edit photos with an external program"
+msgstr ""
+
+#: C/edit-external.page:16(p)
+msgid ""
+"You might want to use an external editor to do additional work on a photo. "
+"If installed, GIMP and UFRaw are the default external editors for photo and "
+"RAW editing, respectively. If these programs are not installed, you must "
+"select your preferred editors by choosing <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui></guiseq> and selecting editors from drop-down "
+"menus of installed applications."
+msgstr ""
+
+#: C/edit-external.page:24(p)
+msgid ""
+"Once your editors have been set, select a photo and choose "
+"<guiseq><gui>Photos</gui><gui>Open With External Editor</gui></guiseq> to "
+"open the photo with the external editor. Likewise, if the original photo is "
+"a RAW file, select <guiseq><gui>Photos</gui><gui>Open With RAW Editor</gui></"
+"guiseq> to edit the RAW file directly with the set RAW editor."
+msgstr ""
+
+#: C/edit-external.page:31(p)
+msgid ""
+"When you complete your edits and save the file, Shotwell will detect the "
+"changes and update the photo. When external edits have been made, press and "
+"hold the <key>Shift</key> key in full-window view to show the original photo "
+"rather than the externally-edited one."
+msgstr ""
+
+#: C/edit-external.page:38(p)
+msgid "Reverting to original will erase any external edits."
+msgstr ""
+
+#: C/edit-external.page:43(p)
+msgid ""
+"If you externally edit a RAW photo and save the result to another image, "
+"such as a JPEG or PNG, Shotwell cannot automatically determine that the "
+"original RAW and the new image should be paired."
+msgstr ""
+
+#: C/edit-external.page:49(p)
+msgid ""
+"If you want to work within the resulting image within Shotwell, you'll need "
+"to import it yourself."
+msgstr ""
+
+#: C/edit-enhance.page:7(desc)
+msgid ""
+"Let Shotwell improve the brightness and contrast of a photo automatically."
+msgstr ""
+
+#: C/edit-enhance.page:14(title)
+msgid "Auto-enhance"
+msgstr ""
+
+#: C/edit-enhance.page:16(p)
+msgid ""
+"Clicking on the <gui>Enhance</gui> button is a quick way to automatically "
+"adjust the brightness and contrast of your photo. It will often give you a "
+"photo that is correctly exposed. You can also use it as a starting point and "
+"then improve the adjustments by clicking on the <gui>Adjust</gui> button."
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/edit-crop.page:42(None)
+msgid ""
+"@@image: 'figures/crop_thirds.jpg'; md5=4cf0a026bb812c7eab0c9db8210a9524"
+msgstr "original"
+
+#: C/edit-crop.page:7(desc)
+msgid "Improve the composition of a photo by cutting out parts of it."
+msgstr ""
+
+#: C/edit-crop.page:12(title)
+msgid "Cropping"
+msgstr "Bild wird zugeschnitten"
+
+#: C/edit-crop.page:14(p)
+msgid ""
+"To reduce the area of a photo and concentrate the viewer's attention on a "
+"smaller portion of it, use the Crop tool. The crop tool is only available in "
+"full-window or fullscreen mode."
+msgstr ""
+
+#: C/edit-crop.page:19(p)
+msgid ""
+"Double-click on a photo to enter full-window mode, then press the <gui>Crop</"
+"gui> button on the toolbar."
+msgstr ""
+
+#: C/edit-crop.page:22(p)
+msgid ""
+"A white box, the crop rectangle, will appear over the photo. The lighter "
+"portion of the photo within the crop rectangle represents what the photo "
+"will look like when you crop it."
+msgstr ""
+
+#: C/edit-crop.page:25(p)
+msgid ""
+"If you place your cursor in the middle of the box, you can move the box "
+"around. If you drag the edges of the box, you can adjust its size. As you "
+"move and adjust the crop box, you'll see four lines appear inside it, like a "
+"tic-tac-toe grid. These are <em>rule of thirds</em> lines."
+msgstr ""
+
+#: C/edit-crop.page:26(p)
+msgid ""
+"You can also constrain the crop box to one of many common sizes. Choose a "
+"size from the drop-down list that suits your needs. If you press the flip "
+"button next to it, the orientation of the constraint will switch (from "
+"landscape to portrait)."
+msgstr ""
+
+#: C/edit-crop.page:29(p)
+msgid ""
+"When you're happy with your crop outline, press the <gui>Apply</gui> button. "
+"Shotwell will display the cropped photo."
+msgstr ""
+
+#: C/edit-crop.page:32(p)
+msgid ""
+"If you change your mind, press the <gui>Crop</gui> button again and fine-"
+"tune the crop."
+msgstr ""
+
+#: C/edit-crop.page:33(p)
+msgid ""
+"If you press <gui>Cancel</gui> rather than <gui>Apply</gui>, Shotwell will "
+"return to the photo's previous crop dimensions."
+msgstr ""
+
+#: C/edit-crop.page:38(title)
+msgid "What is the rule of thirds?"
+msgstr ""
+
+#: C/edit-crop.page:39(p)
+msgid ""
+"The <em>rule of thirds</em> helps you to choose a pleasing composition for a "
+"photo."
+msgstr ""
+
+#: C/edit-crop.page:40(p)
+msgid ""
+"Imagine that the scene is divided up into a 3x3 grid by two equally-spaced "
+"vertical lines and two equally-spaced horizontal lines. According to the "
+"rule, you're more likely to get a pleasing composition if you align major "
+"features (like the horizon, or a person's body) with one of the lines. "
+"Paying attention to the way features flow from one part of the grid to "
+"another can also help."
+msgstr ""
+
+#: C/edit-crop.page:41(p)
+msgid ""
+"Cropping a photo so that it conforms to the rule of thirds often results in "
+"a more visually appealing image."
+msgstr ""
+
+#: C/edit-crop.page:43(p)
+msgid ""
+"Cropping a photo, using the \"rule of thirds\" lines to improve the "
+"composition."
+msgstr ""
+
+#: C/edit-adjustments.page:7(desc)
+msgid "Change the exposure, saturation, tint, and shadows of a photo."
+msgstr ""
+
+#: C/edit-adjustments.page:12(title)
+msgid "Color adjustments"
+msgstr ""
+
+#: C/edit-adjustments.page:14(p)
+msgid ""
+"The <gui>Adjust</gui> button opens a floating window with a histogram and "
+"sliders to adjust a photo's exposure, saturation, tint, temperature, and "
+"shadows. The histogram also has sliders to reduce the upper and lower "
+"intensity thresholds of the photograph, expanding the contrast of the middle "
+"range."
+msgstr ""
+
+#: C/edit-adjustments.page:16(p)
+msgid ""
+"The <gui>Enhance</gui> button adjusts the histogram and shadows sliders to "
+"improve the quality of a photo."
+msgstr ""
+
+#: C/edit-adjustments.page:18(p)
+msgid ""
+"When the photo's colors and contrast are to your liking, press <gui>Apply</"
+"gui> to save the changes. <gui>Reset</gui> will return the image to its "
+"original state. <gui>Cancel</gui> discards all changes you've made."
+msgstr ""
+
+#: C/edit-adjustments.page:21(title)
+msgid "What do the color adjustments do?"
+msgstr ""
+
+#: C/edit-adjustments.page:24(title)
+msgid "Exposure"
+msgstr "Belichtung"
+
+#: C/edit-adjustments.page:25(p)
+msgid ""
+"Changes the brightness to make it look like the photo was exposed for a "
+"longer or shorter time. Use this to correct under- or over-exposed photos."
+msgstr ""
+
+#: C/edit-adjustments.page:28(title)
+msgid "Saturation"
+msgstr "Sättigung"
+
+#: C/edit-adjustments.page:29(p)
+msgid ""
+"Changes how vivid colors look. If your photo looks gray and washed out, try "
+"increasing the saturation. If colors look too bold, try decreasing it."
+msgstr ""
+
+#: C/edit-adjustments.page:32(title)
+msgid "Tint"
+msgstr "Farbton"
+
+#: C/edit-adjustments.page:33(p)
+msgid ""
+"This tints the photo with a color. It's useful for correcting photos taken "
+"with the wrong white balance setting, which typically have an unnatural "
+"color cast. For example, photos taken outdoors with the white balance set to "
+"\"Tungsten\" may have a blue cast."
+msgstr ""
+
+#: C/edit-adjustments.page:36(title)
+msgid "Temperature"
+msgstr "Temperatur"
+
+#: C/edit-adjustments.page:37(p)
+msgid ""
+"Changes how \"warm\" or \"cool\" the picture looks. Use this to make cold, "
+"depressing scenes look more lively, for example."
+msgstr ""
+
+#: C/edit-adjustments.page:40(title)
+msgid "Shadows"
+msgstr "Schatten"
+
+#: C/edit-adjustments.page:41(p)
+msgid ""
+"This makes shadowy areas appear lighter. Use this to make detail more "
+"visible if it's obscured by the darkness of a shadow."
+msgstr ""
+
+#: C/edit-adjustments.page:44(title)
+msgid "Intensity Threshold (sliders on the histogram)"
+msgstr ""
+
+#: C/edit-adjustments.page:45(p)
+msgid ""
+"These sliders change how light the brightest white is and how dark the "
+"darkest black is. Use them to change the contrast of the photo. Photos which "
+"look washed out should particularly benefit from changing these settings."
+msgstr ""
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: C/edit-adjustments.page:0(None)
+msgid "translator-credits"
+msgstr "Christian Kirbach <Christian.Kirbach@gmail.com>, 2014"
diff --git a/icons/enhance.png b/icons/shotwell-auto-enhance.png
index 4f3dea1..4f3dea1 100644
--- a/icons/enhance.png
+++ b/icons/shotwell-auto-enhance.png
diff --git a/misc/shotwell.appdata.xml b/misc/shotwell.appdata.xml
index 47cad46..ba5c2ab 100644
--- a/misc/shotwell.appdata.xml
+++ b/misc/shotwell.appdata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2013-2014 Yorba Foundation (shotwell@yorba.org) -->
+<!-- Copyright 2013-2015 Yorba Foundation (shotwell@yorba.org) -->
 <application>
   <id type="desktop">shotwell.desktop</id>
   <metadata_license>CC0</metadata_license>
diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala
index 7334de6..fdde409 100644
--- a/plugins/common/RESTSupport.vala
+++ b/plugins/common/RESTSupport.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/common/Resources.vala b/plugins/common/Resources.vala
index 79d4818..3e3fea6 100644
--- a/plugins/common/Resources.vala
+++ b/plugins/common/Resources.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/common/SqliteSupport.vala b/plugins/common/SqliteSupport.vala
index 1c4a2bf..bd959a6 100644
--- a/plugins/common/SqliteSupport.vala
+++ b/plugins/common/SqliteSupport.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/plugins/common/VersionNumber.vala b/plugins/common/VersionNumber.vala
index 5a69cfe..c613dd2 100644
--- a/plugins/common/VersionNumber.vala
+++ b/plugins/common/VersionNumber.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotDatabase.vala b/plugins/shotwell-data-imports/FSpotDatabase.vala
index 634c5c9..7003ae6 100644
--- a/plugins/shotwell-data-imports/FSpotDatabase.vala
+++ b/plugins/shotwell-data-imports/FSpotDatabase.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala
index 973eb38..c8d8324 100644
--- a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala
+++ b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotDatabaseTable.vala b/plugins/shotwell-data-imports/FSpotDatabaseTable.vala
index eba64be..3c7744f 100644
--- a/plugins/shotwell-data-imports/FSpotDatabaseTable.vala
+++ b/plugins/shotwell-data-imports/FSpotDatabaseTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotImporter.vala b/plugins/shotwell-data-imports/FSpotImporter.vala
index 03abe01..593f456 100644
--- a/plugins/shotwell-data-imports/FSpotImporter.vala
+++ b/plugins/shotwell-data-imports/FSpotImporter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -31,7 +31,7 @@ public class FSpotService : Object, Spit.Pluggable, Spit.DataImports.Service {
 
     public void get_info(ref Spit.PluggableInfo info) {
         info.authors = "Bruno Girin";
-        info.copyright = _("Copyright 2009-2014 Yorba Foundation");
+        info.copyright = _("Copyright 2009-2015 Yorba Foundation");
         info.translators = Resources.TRANSLATORS;
         info.version = _VERSION;
         info.website_name = Resources.WEBSITE_NAME;
@@ -94,6 +94,7 @@ public class FSpotImportableItem : Spit.DataImports.ImportableMediaItem, GLib.Ob
     private FSpotImportableRating rating;
     private string folder_path;
     private string filename;
+    private time_t? date_time;
     
     public FSpotImportableItem(
         DataImports.FSpot.Db.FSpotPhotoRow photo_row,
@@ -109,6 +110,7 @@ public class FSpotImportableItem : Spit.DataImports.ImportableMediaItem, GLib.Ob
         this.roll_row = roll_row;
         this.tags = tags;
         this.event = event;
+        this.date_time = photo_row.time;
         if (photo_row.rating > 0)
             this.rating = new FSpotImportableRating(photo_row.rating);
         else if (is_hidden)
@@ -166,6 +168,10 @@ public class FSpotImportableItem : Spit.DataImports.ImportableMediaItem, GLib.Ob
     public Spit.DataImports.ImportableRating get_rating() {
         return rating;
     }
+
+    public time_t? get_exposure_time() {
+        return date_time;
+    }
     
     private string decode_url(string url) {
         StringBuilder builder = new StringBuilder();
diff --git a/plugins/shotwell-data-imports/FSpotMetaTable.vala b/plugins/shotwell-data-imports/FSpotMetaTable.vala
index b2d16eb..2e58379 100644
--- a/plugins/shotwell-data-imports/FSpotMetaTable.vala
+++ b/plugins/shotwell-data-imports/FSpotMetaTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala
index 7d65594..b5897cb 100644
--- a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala
+++ b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala
index 8378884..9df0600 100644
--- a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala
+++ b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotPhotosTable.vala b/plugins/shotwell-data-imports/FSpotPhotosTable.vala
index 4231102..5ef0751 100644
--- a/plugins/shotwell-data-imports/FSpotPhotosTable.vala
+++ b/plugins/shotwell-data-imports/FSpotPhotosTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotRollsTable.vala b/plugins/shotwell-data-imports/FSpotRollsTable.vala
index fd5362d..6924762 100644
--- a/plugins/shotwell-data-imports/FSpotRollsTable.vala
+++ b/plugins/shotwell-data-imports/FSpotRollsTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotTableBehavior.vala b/plugins/shotwell-data-imports/FSpotTableBehavior.vala
index 2d94427..a0b003f 100644
--- a/plugins/shotwell-data-imports/FSpotTableBehavior.vala
+++ b/plugins/shotwell-data-imports/FSpotTableBehavior.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotTagsTable.vala b/plugins/shotwell-data-imports/FSpotTagsTable.vala
index 07045cf..e846eb5 100644
--- a/plugins/shotwell-data-imports/FSpotTagsTable.vala
+++ b/plugins/shotwell-data-imports/FSpotTagsTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/shotwell-data-imports.vala b/plugins/shotwell-data-imports/shotwell-data-imports.vala
index c6e7d46..8a16aaa 100644
--- a/plugins/shotwell-data-imports/shotwell-data-imports.vala
+++ b/plugins/shotwell-data-imports/shotwell-data-imports.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.vala b/plugins/shotwell-publishing-extras/GalleryConnector.vala
index 682aff0..6eb5a3a 100644
--- a/plugins/shotwell-publishing-extras/GalleryConnector.vala
+++ b/plugins/shotwell-publishing-extras/GalleryConnector.vala
@@ -1019,9 +1019,10 @@ public class GalleryPublisher : Spit.Publishing.Publisher, GLib.Object {
             warning("Could not parse UI file! Error: %s.", e.message);
             host.post_error(
                 new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
-                    _("A file required for publishing is " +
-                        "unavailable. Publishing to " + SERVICE_NAME +
-                        " can't continue.")));
+                    _("A file required for publishing is unavailable. Publishing to %s can't continue.")
+                        .printf(SERVICE_NAME)
+                )
+            );
             return;
         }
 
@@ -1771,9 +1772,11 @@ internal class CredentialsPane : Spit.Publishing.DialogPane, GLib.Object {
             warning("Could not parse UI file! Error: %s.", e.message);
             host.post_error(
                 new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
-                    _("A file required for publishing is " +
-                        "unavailable. Publishing to " + SERVICE_NAME +
-                        " can't continue.")));
+                    _("A file required for publishing is unavailable. Publishing to %s can't continue.")
+                        .printf(SERVICE_NAME)
+                    )
+                );
+            
             return;
         }
 
diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
index c5e32ee..24f7ea2 100644
--- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
+++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-publishing/FacebookPublishing.vala b/plugins/shotwell-publishing/FacebookPublishing.vala
index 79b7a0a..1dd793d 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.vala
+++ b/plugins/shotwell-publishing/FacebookPublishing.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -29,7 +29,7 @@ public class FacebookService : Object, Spit.Pluggable, Spit.Publishing.Service {
 
     public void get_info(ref Spit.PluggableInfo info) {
         info.authors = "Lucas Beeler";
-        info.copyright = _("Copyright 2009-2014 Yorba Foundation");
+        info.copyright = _("Copyright 2009-2015 Yorba Foundation");
         info.translators = Resources.TRANSLATORS;
         info.version = _VERSION;
         info.website_name = Resources.WEBSITE_NAME;
@@ -1393,9 +1393,19 @@ internal class GraphSession {
             if (publishable.get_media_type() == Spit.Publishing.Publisher.MediaType.VIDEO)
                 mp_envelope.append_form_string("privacy", resource_privacy);
             
-            string publishable_title = publishable.get_publishing_name();
-            if (!suppress_titling && publishable_title != "")
+            //Get photo title and post it as message on FB API
+            string publishable_title = publishable.get_param_string("title");
+            if (!suppress_titling && publishable_title != null)
                 mp_envelope.append_form_string("name", publishable_title);
+                
+            //Set 'message' data field with EXIF comment field. Title has precedence.
+            string publishable_comment = publishable.get_param_string("comment");
+            if (!suppress_titling && publishable_comment != null)
+               mp_envelope.append_form_string("message", publishable_comment);
+            
+            //Sets correct date of the picture
+            if (!suppress_titling)
+               mp_envelope.append_form_string("backdated_time", publishable.get_exposure_date_time().to_string());
 
             string source_file_mime_type =
                 (publishable.get_media_type() == Spit.Publishing.Publisher.MediaType.VIDEO) ?
diff --git a/plugins/shotwell-publishing/FlickrPublishing.vala b/plugins/shotwell-publishing/FlickrPublishing.vala
index dcf7971..71f295c 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.vala
+++ b/plugins/shotwell-publishing/FlickrPublishing.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -31,7 +31,7 @@ public class FlickrService : Object, Spit.Pluggable, Spit.Publishing.Service {
     
     public void get_info(ref Spit.PluggableInfo info) {
         info.authors = "Lucas Beeler";
-        info.copyright = _("Copyright 2009-2014 Yorba Foundation");
+        info.copyright = _("Copyright 2009-2015 Yorba Foundation");
         info.translators = Resources.TRANSLATORS;
         info.version = _VERSION;
         info.website_name = Resources.WEBSITE_NAME;
@@ -1152,7 +1152,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
 
         string upload_label_text = _("You are logged into Flickr as %s.\n\n").printf(parameters.username);
         if (parameters.user_kind == UserKind.FREE) {
-            upload_label_text += _("Your free Flickr account limits how much data you can upload per month.\nThis month, you have %d megabytes remaining in your upload quota.").printf(parameters.quota_free_mb);
+            upload_label_text += ngettext(
+            "Your free Flickr account limits how much data you can upload per month.\nThis month you have %d megabyte remaining in your upload quota.",
+            "Your free Flickr account limits how much data you can upload per month.\nThis month you have %d megabytes remaining in your upload quota.",
+            parameters.quota_free_mb).printf(parameters.quota_free_mb);
         } else {
             upload_label_text += _("Your Flickr Pro account entitles you to unlimited uploads.");
         }
diff --git a/plugins/shotwell-publishing/PicasaPublishing.vala b/plugins/shotwell-publishing/PicasaPublishing.vala
index c360e59..9749d5a 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.vala
+++ b/plugins/shotwell-publishing/PicasaPublishing.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -29,7 +29,7 @@ public class PicasaService : Object, Spit.Pluggable, Spit.Publishing.Service {
     
     public void get_info(ref Spit.PluggableInfo info) {
         info.authors = "Lucas Beeler";
-        info.copyright = _("Copyright 2009-2014 Yorba Foundation");
+        info.copyright = _("Copyright 2009-2015 Yorba Foundation");
         info.translators = Resources.TRANSLATORS;
         info.version = _VERSION;
         info.website_name = Resources.WEBSITE_NAME;
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala b/plugins/shotwell-publishing/PiwigoPublishing.vala
index 8deada4..3b6c632 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.vala
+++ b/plugins/shotwell-publishing/PiwigoPublishing.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -29,7 +29,7 @@ public class PiwigoService : Object, Spit.Pluggable, Spit.Publishing.Service {
     
     public void get_info(ref Spit.PluggableInfo info) {
         info.authors = "Bruno Girin";
-        info.copyright = _("Copyright 2009-2014 Yorba Foundation");
+        info.copyright = _("Copyright 2009-2015 Yorba Foundation");
         info.translators = Resources.TRANSLATORS;
         info.version = _VERSION;
         info.website_name = Resources.WEBSITE_NAME;
diff --git a/plugins/shotwell-publishing/YouTubePublishing.vala b/plugins/shotwell-publishing/YouTubePublishing.vala
index c84240b..81af039 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.vala
+++ b/plugins/shotwell-publishing/YouTubePublishing.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -29,7 +29,7 @@ public class YouTubeService : Object, Spit.Pluggable, Spit.Publishing.Service {
 
     public void get_info(ref Spit.PluggableInfo info) {
         info.authors = "Jani Monoses, Lucas Beeler";
-        info.copyright = _("Copyright 2009-2014 Yorba Foundation");
+        info.copyright = _("Copyright 2009-2015 Yorba Foundation");
         info.translators = Resources.TRANSLATORS;
         info.version = _VERSION;
         info.website_name = Resources.WEBSITE_NAME;
diff --git a/plugins/shotwell-publishing/shotwell-publishing.vala b/plugins/shotwell-publishing/shotwell-publishing.vala
index f9f2080..9af744e 100644
--- a/plugins/shotwell-publishing/shotwell-publishing.vala
+++ b/plugins/shotwell-publishing/shotwell-publishing.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-transitions/BlindsEffect.vala b/plugins/shotwell-transitions/BlindsEffect.vala
index 6fdcf18..52f39ee 100644
--- a/plugins/shotwell-transitions/BlindsEffect.vala
+++ b/plugins/shotwell-transitions/BlindsEffect.vala
@@ -1,5 +1,5 @@
 /* Copyright 2013 Jens Bav
- * Copyright 2011-2014 Yorba Foundation
+ * Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-transitions/ChessEffect.vala b/plugins/shotwell-transitions/ChessEffect.vala
index 37c9fd2..c857ddb 100644
--- a/plugins/shotwell-transitions/ChessEffect.vala
+++ b/plugins/shotwell-transitions/ChessEffect.vala
@@ -1,5 +1,5 @@
 /* Copyright 2013 Jens Bav
- * Copyright 2011-2014 Yorba Foundation
+ * Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-transitions/CircleEffect.vala b/plugins/shotwell-transitions/CircleEffect.vala
index 11e7631..651ce37 100644
--- a/plugins/shotwell-transitions/CircleEffect.vala
+++ b/plugins/shotwell-transitions/CircleEffect.vala
@@ -1,5 +1,5 @@
 /* Copyright 2013 Jens Bav
- * Copyright 2011-2014 Yorba Foundation
+ * Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-transitions/CirclesEffect.vala b/plugins/shotwell-transitions/CirclesEffect.vala
index b01e06f..85c514b 100644
--- a/plugins/shotwell-transitions/CirclesEffect.vala
+++ b/plugins/shotwell-transitions/CirclesEffect.vala
@@ -1,5 +1,5 @@
 /* Copyright 2013 Jens Bav
- * Copyright 2011-2014 Yorba Foundation
+ * Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-transitions/ClockEffect.vala b/plugins/shotwell-transitions/ClockEffect.vala
index 78b39a6..6b29d40 100644
--- a/plugins/shotwell-transitions/ClockEffect.vala
+++ b/plugins/shotwell-transitions/ClockEffect.vala
@@ -1,5 +1,5 @@
 /* Copyright 2013 Jens Bav
- * Copyright 2011-2014 Yorba Foundation
+ * Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-transitions/CrumbleEffect.vala b/plugins/shotwell-transitions/CrumbleEffect.vala
index a458811..0fe7cdc 100644
--- a/plugins/shotwell-transitions/CrumbleEffect.vala
+++ b/plugins/shotwell-transitions/CrumbleEffect.vala
@@ -1,5 +1,5 @@
 /* Copyright 2010 Maxim Kartashev
- * Copyright 2011-2014 Yorba Foundation
+ * Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-transitions/FadeEffect.vala b/plugins/shotwell-transitions/FadeEffect.vala
index efe1d74..e672a76 100644
--- a/plugins/shotwell-transitions/FadeEffect.vala
+++ b/plugins/shotwell-transitions/FadeEffect.vala
@@ -1,5 +1,5 @@
 /* Copyright 2010 Maxim Kartashev
- * Copyright 2011-2014 Yorba Foundation
+ * Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-transitions/SlideEffect.vala b/plugins/shotwell-transitions/SlideEffect.vala
index 1019f62..0737e3a 100644
--- a/plugins/shotwell-transitions/SlideEffect.vala
+++ b/plugins/shotwell-transitions/SlideEffect.vala
@@ -1,5 +1,5 @@
 /* Copyright 2010 Maxim Kartashev
- * Copyright 2011-2014 Yorba Foundation
+ * Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-transitions/SquaresEffect.vala b/plugins/shotwell-transitions/SquaresEffect.vala
index c5a0163..0077336 100644
--- a/plugins/shotwell-transitions/SquaresEffect.vala
+++ b/plugins/shotwell-transitions/SquaresEffect.vala
@@ -1,5 +1,5 @@
 /* Copyright 2013 Jens Bav
- * Copyright 2011-2014 Yorba Foundation
+ * Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-transitions/StripesEffect.vala b/plugins/shotwell-transitions/StripesEffect.vala
index 2edbdfe..9bb4369 100644
--- a/plugins/shotwell-transitions/StripesEffect.vala
+++ b/plugins/shotwell-transitions/StripesEffect.vala
@@ -1,5 +1,5 @@
 /* Copyright 2013 Jens Bav
- * Copyright 2011-2014 Yorba Foundation
+ * Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-transitions/shotwell-transitions.vala b/plugins/shotwell-transitions/shotwell-transitions.vala
index bd358c3..790d035 100644
--- a/plugins/shotwell-transitions/shotwell-transitions.vala
+++ b/plugins/shotwell-transitions/shotwell-transitions.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -72,7 +72,7 @@ public abstract class ShotwellTransitionDescriptor : Object, Spit.Pluggable, Spi
     
     public void get_info(ref Spit.PluggableInfo info) {
         info.authors = "Maxim Kartashev";
-        info.copyright = _("Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation");
+        info.copyright = _("Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation");
         info.translators = Resources.TRANSLATORS;
         info.version = _VERSION;
         info.website_name = Resources.WEBSITE_NAME;
diff --git a/po/LINGUAS b/po/LINGUAS
index 3e37202..855b9ae 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -5,6 +5,7 @@ ast
 bg
 bn
 bn_IN
+bs
 ca
 cs
 da
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0f3a05e..84c6d92 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -157,17 +157,17 @@ src/folders/Branch.vala
 src/folders/Folders.vala
 src/folders/Page.vala
 src/library/Branch.vala
-src/library/FlaggedBranch.vala
+src/library/FlaggedSidebarEntry.vala
 src/library/FlaggedPage.vala
-src/library/ImportQueueBranch.vala
+src/library/ImportQueueSidebarEntry.vala
 src/library/ImportQueuePage.vala
-src/library/LastImportBranch.vala
+src/library/LastImportSidebarEntry.vala
 src/library/LastImportPage.vala
 src/library/Library.vala
 src/library/LibraryWindow.vala
-src/library/OfflineBranch.vala
+src/library/OfflineSidebarEntry.vala
 src/library/OfflinePage.vala
-src/library/TrashBranch.vala
+src/library/TrashSidebarEntry.vala
 src/library/TrashPage.vala
 src/main.vala
 src/photos/BmpSupport.vala
diff --git a/po/bs.po b/po/bs.po
new file mode 100644
index 0000000..4f1dc31
--- /dev/null
+++ b/po/bs.po
@@ -0,0 +1,5165 @@
+# Bosnian translation for bosnianuniversetranslation
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the bosnianuniversetranslation package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bosnianuniversetranslation\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
+"POT-Creation-Date: 2015-02-26 23:57+0000\n"
+"PO-Revision-Date: 2015-03-02 23:38+0100\n"
+"Last-Translator: Samir Ribic <samir.ribic@etf.unsa.ba>\n"
+"Language-Team: Bosnian <bs@li.org>\n"
+"Language: bs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Poedit 1.7.4\n"
+"X-Launchpad-Export-Date: 2015-02-17 06:23+0000\n"
+
+#: ../plugins/common/RESTSupport.vala:424
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
+msgid "A temporary file needed for publishing is unavailable"
+msgstr "Privremena datoteka, neophodna za objavljivanje nije dostupna"
+
+#: ../plugins/common/RESTSupport.vala:1138
+msgid ""
+"You have already logged in and out of a Google service during this Shotwell "
+"session.\n"
+"\n"
+"To continue publishing to Google services, quit and restart Shotwell, then "
+"try publishing again."
+msgstr ""
+"Već ste prijavljeni i odjavljeni s Google servisa tokom ove Shotwell "
+"sesije.\n"
+"\n"
+"Za nastavak objavljivanja na Google usluge, zatvorite i ponovo pokrenite "
+"Shotwell, a zatim pokušajte ponovo objavljivanje."
+
+#: ../plugins/common/Resources.vala:9
+msgid "Visit the Shotwell home page"
+msgstr "Posjeti Shotwell početnu stranicu"
+
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
+msgid "translator-credits"
+msgstr ""
+"   Maida Bakovic https://launchpad.net/~maidabakovic\n"
+"  Samir Ribić https://launchpad.net/~megaribi"
+
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:32
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:34
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:32
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
+#: ../src/Resources.vala:27
+msgid "Copyright 2009-2015 Yorba Foundation"
+msgstr "Autorska prava 2009-2015 Yorba Foundation"
+
+#: ../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 ""
+"Dobro došli u servis za uvoz F-Spot zbirke slika.\n"
+"\n"
+"Molim izaberite zbirku za uvoz, izborom postojeće zbirke koju je Foto-bunar "
+"pronašao ili izborom neke druge datoteke F-Spot zbirke."
+
+#: ../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 ""
+"Dobro došli u servis za uvoz F-Spot zbirke slika.\n"
+"\n"
+"Molim izaberite datoteku F-Spot zbirke."
+
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
+msgid "Manually select an F-Spot database file to import:"
+msgstr "Ručni izbor datoteke F-Spot zbirke za uvoz:"
+
+#: ../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 ""
+"Nije uspjelo otvaranje datoteke F-Spot zbirke: datoteka ne postoji ili nije "
+"F-Spot zbirka"
+
+#: ../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 ""
+"Nije uspjelo otvaranje datoteke F-Spot zbirke:  Shotwell ne podržava ovu "
+"verzija F-Spot zbirke."
+
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading tags table"
+msgstr ""
+"Nije uspelo otvaranje datoteke F-Spot zbirke: greška prilikom čitanja tabele "
+"sa oznakama"
+
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:68
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading photos "
+"table"
+msgstr ""
+"Nije uspelo otvaranje datoteke F-Spot zbirke: greška prilikom čitanja tabele "
+"sa slikama"
+
+#: ../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 ""
+"Shotwell je pronašao %d slika u F-Spot zbirci i trenutno ih uvozi. Duplikati "
+"će automatski biti pronađeni i obrisani.\n"
+"\n"
+"Možete zatvoriti ovaj dijalog i započeti korišćenje Shotwella, uvoz slika će "
+"se nastaviti u pozadini."
+
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
+#, c-format
+msgid "F-Spot library: %s"
+msgstr "F-Spot zbirka: %s"
+
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
+msgid "Preparing to import"
+msgstr "Pripremam za uvoz"
+
+#: ../plugins/shotwell-data-imports/shotwell-data-imports.vala:22
+msgid "Core Data Import Services"
+msgstr "Osnovni servis za uvoz"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+msgid "Gallery3 publishing module"
+msgstr "Gallery3 modul za objavljivanje"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
+msgid ""
+"You are not currently logged into your Gallery.\n"
+"\n"
+"You must have already signed up for a Gallery3 account to complete the login "
+"process."
+msgstr ""
+"Trenutno niste logirani u vašu galeriju.\n"
+"\n"
+"Morate imati već prijavljen Gallery3 račun da dovršite login proces."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: ../src/MediaPage.vala:434 ../src/photos/RawSupport.vala:300
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+msgid "Shotwell default directory"
+msgstr "Shotwell zadani direktorij"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:801
+#, c-format
+msgid ""
+"\n"
+"\n"
+"The file \"%s\" may not be supported by or may be too large for this "
+"instance of Gallery3."
+msgstr ""
+"\n"
+"\n"
+"Datoteka \"%s\" možda nije podržana ili je prevelika za ovu instancu "
+"Gallery3."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:802
+msgid ""
+"\n"
+"Note that Gallery3 only supports the video types that Flowplayer does."
+msgstr ""
+"\n"
+"Imajte na umu da Gallery3 podržava samo video tipove koje podržava i "
+"Flowplayer."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+#, c-format
+msgid ""
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
+msgstr ""
+"Datoteka potrebna za objavljivanje je nedostupna. Objava na %s se ne može "
+"nastaviti."
+
+#. populate any widgets whose contents are
+#. programmatically-generated
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
+#, c-format
+msgid "Publishing to %s as %s."
+msgstr "Objavljivanje na %s kao %s."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
+msgid ""
+"Enter the URL for your Gallery3 site and the username and password (or API "
+"key) for your Gallery3 account."
+msgstr ""
+"Unesite URL za vašu Gallery3 stranicu, i korisničko ime i lozinku (ili API "
+"ključ) za vaš Gallery3 račun."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
+msgid ""
+"The username and password or API key were incorrect. To try again, re-enter "
+"your username and password below."
+msgstr ""
+"Korisničko ime i lozinka ili API ključ nisu ispravni. Da pokušate ponovo, "
+"unesite vaše korisničko ime i lozinku ispod."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
+msgid ""
+"The URL entered does not appear to be the main directory of a Gallery3 "
+"instance. Please make sure you typed it correctly and it does not have any "
+"trailing components (e.g., index.php)."
+msgstr ""
+"Unešeni URL nije glavni direktorij Gallery3 instance. Provjerite da li ste "
+"ukucali ispravno i da ne sadrži nikakve prateće komponente (npr., index.php)."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
+msgid "Unrecognized User"
+msgstr "Nepoznat korisnik"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
+msgid " Site Not Found"
+msgstr " Stranica nije pronađena"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
+msgid "Copyright (C) 2013 rajce.net"
+msgstr "Autorska prava (C) 2013 rajce.nit"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
+msgid "An error message occurred when publishing to Rajce. Please try again."
+msgstr ""
+"Poruka greške se pojavila prilikom objavljivanja na Rajce. Pokušajte ponovo."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
+msgid "Enter email and password associated with your Rajce account."
+msgstr "Unesite e-mail i lozinku povezanu vašim Rajce računom."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
+msgid "Invalid email and/or password. Please try again"
+msgstr "Pogrešna e-mail adresa i/ili lozinka. Pokušajte ponovo"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
+msgid "Invalid User Email or Password"
+msgstr "Pogrešna e-mail adresa korisnika ili lozinka"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:890
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:2
+msgid "_Email address"
+msgstr "_E-mail adresa"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:891
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
+msgid "_Password"
+msgstr "_Lozinka"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
+msgid "_Remember"
+msgstr "_Zapamti"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
+msgid "Login"
+msgstr "Login"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:5
+msgid "_Hide album"
+msgstr "_Sakrij album"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
+#, c-format
+msgid "You are logged into Rajce as %s."
+msgstr "Logirani ste u Rajce kao %s."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
+msgid "Photos will appear in:"
+msgstr "Slike će se pojaviti u:"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
+msgid "An _existing album:"
+msgstr "_Postojeći album:"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
+msgid "A _new album named:"
+msgstr "_Novi album:"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:6
+msgid "Open target _album in browser"
+msgstr "Otvori ciljani _album u pretraživaču"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:8
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
+msgid "_Publish"
+msgstr "_Objavi"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
+msgid "_Logout"
+msgstr "_Odjava"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Autorska prava 2012 BJA Electronics"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
+msgid "500 x 375 pixels"
+msgstr "500 x 375 piksela"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
+msgid "1024 x 768 pixels"
+msgstr "1024 x 768 piksela"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
+msgid "1280 x 853 pixels"
+msgstr "1280 x 853 piksela"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:310
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:320
+#, c-format
+msgid "'%s' isn't a valid response to an OAuth authentication request"
+msgstr "'%s' nije ispravan odgovor na OAuth upit za autorizaciju"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:558
+msgid ""
+"TumblrPublisher: start( ): can't start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( ): se ne može ponovo pokrenuti jer objavljivač to ne "
+"dozvoljava."
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "Unesite korisničko ime i lozinku za pristup vašem Tumblr računu."
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
+msgid "Username and/or password invalid. Please try again"
+msgstr "Korisničko ime i/ili lozinka nisu ispravni. Pokušajte ponovo."
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:617
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
+msgid "Invalid User Name or Password"
+msgstr "Nije ispravno korisničko ime ili lozinka"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:636
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Ne mogu da učitam korisnički interfejs: %s"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:739
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Prijavljeni ste na Tumblr kao %s.\n"
+"\n"
+
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
+msgstr "Autorska prava 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
+
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:25
+msgid "Visit the Yandex.Fotki web site"
+msgstr "Posjetite Yandex.Fotki web stranicu"
+
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:632
+msgid "You are not currently logged into Yandex.Fotki."
+msgstr "Trenutno niste prijavljeni na Yandex.Fotki."
+
+#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+msgid "Shotwell Extra Publishing Services"
+msgstr "Shotwell dodatne usluge za objavljivanje"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
+msgid "Go _Back"
+msgstr "Idi _nazad"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
+#: ../ui/shotwell.glade.h:42
+msgid "_Login"
+msgstr "_Login"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
+msgid "Intro message replaced at runtime"
+msgstr "Uvodna poruka zamijenjena za vrijeme izvršenja"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
+msgid "_Gallery3 URL:"
+msgstr "_Gallery3 URL:"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
+msgid "_User name:"
+msgstr "_Korisničko ime:"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
+msgid "_Password:"
+msgstr "_Lozinka:"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:7
+msgid "API _Key:"
+msgstr "API _Ključ:"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
+msgid "or"
+msgstr "ili"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
+msgid "A _new album"
+msgstr "_Novi album"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
+msgid "An _existing album"
+msgstr "_Postojeći album"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
+msgid "_Remove location, tag and camera-identifying data before uploading"
+msgstr ""
+"_Ukloni lokaciju, oznaku i podatke za identifikaciju kamere prije slanja"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
+msgid "'Publishing to $url as $username' (populated in application code)"
+msgstr "'Objavljivanje na $url kao $username' (smješteno u aplikacijskom kodu)"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
+msgid "Scaling constraint:"
+msgstr "Ograničenje skaliranja:"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
+msgid "pixels"
+msgstr "pikseli"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
+#: ../src/Dimensions.vala:17
+msgid "Original size"
+msgstr "Originalna veličina"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:10
+#: ../src/Dimensions.vala:20
+msgid "Width or height"
+msgstr "Širina ili visina"
+
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
+#: ../ui/shotwell.glade.h:14
+msgid "label"
+msgstr "oznaka"
+
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
+msgid "Blogs:"
+msgstr "Blogovi:"
+
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:1
+msgid "Photo _size:"
+msgstr "_Veličina slike:"
+
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
+msgid "you are logged in rajce as $name"
+msgstr "logirani ste u rajce kao $name"
+
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
+msgid "$mediatype will appear in"
+msgstr "$mediatype će se pojaviti u"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
+msgid "_Albums (or write new):"
+msgstr "_Albumi (ili piši novi):"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:2
+msgid "Access _type:"
+msgstr "_Tip pristupa:"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
+msgid "Disable _comments"
+msgstr "Onemogući _komentare"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:4
+msgid "_Forbid downloading original photo"
+msgstr "_Zabrani preuzimanje originalne slike"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
+msgid "Public"
+msgstr "Javno"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:8
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1181
+msgid "Friends"
+msgstr "Prijatelji"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:9
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
+msgid "Private"
+msgstr "Privatni"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:59
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1127
+msgid "Shotwell Connect"
+msgstr "Shotwell povezivanje"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:63
+msgid ""
+"You are not currently logged into Facebook.\n"
+"\n"
+"If you don't yet have a Facebook account, you can create one during the "
+"login process. During login, Shotwell Connect may ask you for permission to "
+"upload photos and publish to your feed. These permissions are required for "
+"Shotwell Connect to function."
+msgstr ""
+"Trenutno niste prijavljeni na Facebook.\n"
+"\n"
+"Ako ne posedujete Facebook nalog, moći ćete da ga otvorite tokom ovog "
+"procesa. Takođe je neophodno da dozvolite Shotwell-u pristup vašem nalogu. "
+"To je neophodno za funkcionisanje ovog servisa."
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:65
+msgid ""
+"You have already logged in and out of Facebook during this Shotwell "
+"session.\n"
+"To continue publishing to Facebook, quit and restart Shotwell, then try "
+"publishing again."
+msgstr ""
+"Tokom ove Shotwell sesije već ste se jednom prijavljivali i odjavljivali sa "
+"Facebook-a.\n"
+"Kako bi nastavili objavljivanje slika na Facebook, izađite i ponovo "
+"pokrenite Shotwell, pa pokušajte ponovo."
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:86
+msgid "Standard (720 pixels)"
+msgstr "Standardno (720 piksela)"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:89
+msgid "Large (2048 pixels)"
+msgstr "Veliko (2048 piksela)"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:254
+msgid "Testing connection to Facebook..."
+msgstr "Testiram vezu sa Facebook-om ..."
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:347
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
+msgid "Creating album..."
+msgstr "Pravljenje albuma..."
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:374
+msgid ""
+"A file required for publishing is unavailable. Publishing to Facebook can't "
+"continue."
+msgstr ""
+"Ne mogu da nastavim objavljivanje na Facebook jer nije dostupna datoteka."
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1019
+#, c-format
+msgid ""
+"You are logged into Facebook as %s.\n"
+"\n"
+msgstr ""
+"Prijavili ste se na Facebook kao %s.\n"
+"\n"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1020
+msgid "Where would you like to publish the selected photos?"
+msgstr "Gdje želite da objavite izabrane slike?"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1021
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
+msgid "Upload _size:"
+msgstr "_Veličina slanja:"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
+msgid "Just me"
+msgstr "Samo meni"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+msgid "Everyone"
+msgstr "Svi"
+
+#: ../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 ""
+"Trenutno niste povezani sa vašim Flickr nalogom.\n"
+"\n"
+"Prijavite se na Flickr u vašem pretraživaču interneta.  Kako bi se povezali "
+"sa vašim Flickr nalogom morate autorizovati vezu."
+
+#: ../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 ""
+"Već ste se prijavljivali i odjavljivali sa Flickr-a tokom ove Shotwell "
+"sesije.\n"
+"Da bi nastavili slanje slika na Flickr morate ponovo pokrenuti Shotwell i "
+"pokušati ponovo."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:375
+msgid "Preparing for login..."
+msgstr "Spremam se za prijavljivanje ..."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:444
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:595
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can't "
+"continue."
+msgstr ""
+"Ne mogu da nastavim objavljivanje na Flickr jer nije dostupna datoteka."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:457
+msgid "Verifying authorization..."
+msgstr "Verifikujem autorizaciju ..."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1153
+#, c-format
+msgid ""
+"You are logged into Flickr as %s.\n"
+"\n"
+msgstr ""
+"Logirani ste na Flickr kao %s.\n"
+"\n"
+
+#         translations.
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
+#, c-format
+msgid ""
+"Your free Flickr account limits how much data you can upload per month.\n"
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"Vaš Flickr račun ograničava koliko podataka možete upload-ovati mjesečno.\n"
+"Ovaj mjesec imate %d megabajt preostalo u vašoj upload kvoti."
+msgstr[1] ""
+"Vaš Flickr račun ograničava koliko podataka možete upload-ovati mjesečno.\n"
+"Ovaj mjesec imate %d megabajta preostalo u vašoj upload kvoti."
+msgstr[2] ""
+"Vaš Flickr račun ograničava koliko podataka možete upload-ovati mjesečno.\n"
+"Ovaj mjesec imate %d megabajta preostalo u vašoj upload kvoti."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
+msgid "Your Flickr Pro account entitles you to unlimited uploads."
+msgstr "Vaš Flickr Pro račun omogućava Vam neograničen upload slika."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
+msgid "Photos _visible to:"
+msgstr "Slike su _vidljive za:"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+msgid "Videos _visible to:"
+msgstr "Video snimak je _vidljiv za:"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
+msgid "Photos and videos _visible to:"
+msgstr "Fotografije i video snimci su _vidljivi:"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+msgid "Friends & family only"
+msgstr "Samo prijateljima i porodici"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
+msgid "Family only"
+msgstr "Samo porodica"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
+msgid "Friends only"
+msgstr "Samo prijatelji"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
+msgid "2048 x 1536 pixels"
+msgstr "2048 x 1536 piksela"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
+msgid "4096 x 3072 pixels"
+msgstr "4096 x 3072 piksela"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:58
+msgid ""
+"You are not currently logged into Picasa Web Albums.\n"
+"\n"
+"Click Login to log into Picasa Web Albums in your Web browser. You will have "
+"to authorize Shotwell Connect to link to your Picasa Web Albums account."
+msgstr ""
+"Trenutno niste prijavljeni na  Picasa internet albume.\n"
+"\n"
+"Kliknite \"Prijavi se\" za pristup Picasa internet albumima u vašem "
+"pregledaču interneta. Potrebno je da autorizujete Shotwell povezivač kako bi "
+"se povezali sa vašim Picasa računom."
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:361
+msgid ""
+"A file required for publishing is unavailable. Publishing to Picasa can't "
+"continue."
+msgstr ""
+"Ne mogu da nastavim objavljivanje na Picasa jer nije dostupna datoteka."
+
+#. populate any widgets whose contents are programmatically-generated.
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:659
+#, c-format
+msgid "You are logged into Picasa Web Albums as %s."
+msgstr "Prijavljeni ste u Picasa Web Albums kao %s."
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:665
+msgid "Videos will appear in:"
+msgstr "Video snimci će se pojaviti u:"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
+msgid "Small (640 x 480 pixels)"
+msgstr "Mala (640 x 480 piksela)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:747
+msgid "Medium (1024 x 768 pixels)"
+msgstr "Srednja (1024 x 768 piksela)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:748
+msgid "Recommended (1600 x 1200 pixels)"
+msgstr "Preporučeno (1600 x 1200 piksela)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:749
+msgid "Google+ (2048 x 1536 pixels)"
+msgstr "Google+ (2048 x 1536 piksela)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:750
+#: ../src/editing_tools/EditingTools.vala:756
+msgid "Original Size"
+msgstr "Originalna veličina"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
+#, c-format
+msgid "Creating album %s..."
+msgstr "Pravim album %s..."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:917
+msgid "An error message occurred when publishing to Piwigo. Please try again."
+msgstr ""
+"Poruka o grešci se pojavila pri objavljivanju na Piwigo. Molim pokušajte "
+"ponovo."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:998
+msgid ""
+"Enter the URL of your Piwigo photo library as well as the username and "
+"password associated with your Piwigo account for that library."
+msgstr ""
+"Unesite internet adresu vaše Piwigo zbirke slika kao i korisničko ime i "
+"lozinku za pristup Piwigo računu te zbirke slika."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:999
+msgid ""
+"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
+"entered"
+msgstr ""
+"Shotwell nije uspio da pristupi Piwigo zbirci slika. Molimo da provjerite "
+"unešenu internet adresu."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+msgid "Invalid URL"
+msgstr "Pogrešan URL"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+msgid "Admins, Family, Friends, Contacts"
+msgstr "Administratori, Porodica, Prijatelji, Kontakti"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+msgid "Admins, Family, Friends"
+msgstr "Administratori, porodica, prijatelji"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+msgid "Admins, Family"
+msgstr "Administratori, porodica"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+msgid "Admins"
+msgstr "Administratori"
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:57
+msgid ""
+"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 ""
+"Trenutno niste prijavljeni na YouTube.\n"
+"\n"
+"Da bi nastavili morate da posjedujete Google račun koji je podešen da "
+"koristi YouTube. Račun možete podesiti i prijaviti se na YouTube-u koristeći "
+"vaš omiljeni pretraživač interneta."
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
+msgid ""
+"A file required for publishing is unavailable. Publishing to Youtube can't "
+"continue."
+msgstr ""
+"Ne mogu da nastavim objavljivanje na Youtube jer nije dostupna datoteka."
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:461
+#, c-format
+msgid "You are logged into YouTube as %s."
+msgstr "Logirani ste na YouTube kao %s."
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:463
+#, c-format
+msgid "Videos will appear in '%s'"
+msgstr "Video snimci će se pojaviti u '%s'"
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:495
+msgid "Public listed"
+msgstr "Javno je dostupno"
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
+msgid "Public unlisted"
+msgstr "Nije javno dostupno"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
+msgid "Publish to an e_xisting album:"
+msgstr "Objavi u _postojeći album:"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:2
+msgid "Create a _new album named:"
+msgstr "Napravite _novi album imenovan:"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
+msgid "Videos and new photo albums _visible to:"
+msgstr "Novi albumi video  snimaka i fotografija su _vidljivi za:"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:5
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:8
+msgid ""
+"_Remove location, camera, and other identifying information before uploading"
+msgstr ""
+"_Ukloni lokaciju, kameru i druge identifikacijske informacije prije slanja"
+
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
+msgid ""
+"Enter the confirmation number which appears after you log into Flickr in "
+"your Web browser."
+msgstr ""
+"Unesite broj za potvrdu koji se pojavljuje nakon što pristupite vašem Flickr "
+"računu u pretraživaču interneta."
+
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
+msgid "Authorization _Number:"
+msgstr "_Broj za autorizaciju:"
+
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:3
+#: ../src/Dialogs.vala:131
+msgid "Con_tinue"
+msgstr "_Nastavi"
+
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
+msgid "L_ist album in public gallery"
+msgstr "_Spisak albuma u javnoj galeriji"
+
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
+msgid "Photo _size preset:"
+msgstr "_Veličine slika:"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
+msgid "_URL of your Piwigo photo library"
+msgstr "_URL vaše Piwigo foto biblioteke"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
+msgid "User _name"
+msgstr "Koris_ničko ime"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
+msgid "_Remember Password"
+msgstr "_Zapamti lozinku"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
+msgid "An _existing category:"
+msgstr "_Postojeća kategorija:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:4
+msgid "Photos will be _visible by:"
+msgstr "Slike će biti _vidljive za:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:5
+msgid "Photo size:"
+msgstr "Veličina slike:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:6
+msgid "within category:"
+msgstr "u kategoriji:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
+msgid "Album comment:"
+msgstr "Komentar albuma:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
+msgid "_If a title is set and comment unset, use title as comment"
+msgstr ""
+"_Ako je naslov postavljen, a komentar nije, koristi naslov kao komentar"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:10
+msgid "_Do no upload tags"
+msgstr "_Nemoj slati oznake"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
+msgid "Logout"
+msgstr "Odjava"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
+#: ../src/Resources.vala:303
+msgid "Publish"
+msgstr "Objavi"
+
+#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
+msgid "Core Publishing Services"
+msgstr "Osnovni servis za objavljivanje"
+
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
+msgid "Video privacy _setting:"
+msgstr "Podešavanje _privatnosti video snimka:"
+
+#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+msgid "Blinds"
+msgstr "Separatori"
+
+#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+msgid "Chess"
+msgstr "Šah"
+
+#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+msgid "Circle"
+msgstr "Krug"
+
+#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+msgid "Circles"
+msgstr "Krugovi"
+
+#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+msgid "Clock"
+msgstr "Sat"
+
+#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+msgid "Crumble"
+msgstr "Raspadanje"
+
+#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+msgid "Fade"
+msgstr "Utapanje"
+
+#: ../plugins/shotwell-transitions/SlideEffect.vala:20
+msgid "Slide"
+msgstr "Slajd"
+
+#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
+msgid "Squares"
+msgstr "Kvadrati"
+
+#: ../plugins/shotwell-transitions/StripesEffect.vala:20
+msgid "Stripes"
+msgstr "Trake"
+
+#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
+msgid "Core Slideshow Transitions"
+msgstr "Osnovni prijelaz pokretnog prikaza"
+
+#: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+msgstr ""
+"Autorska prava 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+
+#: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
+#, c-format
+msgid "Unable to create cache directory %s: %s"
+msgstr "Nisam uspio da napravim direktorijum privremene ostave %s: %s"
+
+#: ../src/AppDirs.vala:58 ../src/AppDirs.vala:88
+#, c-format
+msgid "Unable to create data directory %s: %s"
+msgstr "Ne mogu kreirati direktorij podataka %s: %s"
+
+#. If XDG yarfed, usi ~/Pictures
+#: ../src/AppDirs.vala:152
+msgid "Pictures"
+msgstr "Slike"
+
+#: ../src/AppDirs.vala:190
+#, c-format
+msgid "Unable to create temporary directory %s: %s"
+msgstr "Nije moguće kreirati privremeni direktorij %s: %s"
+
+#: ../src/AppDirs.vala:207 ../src/AppDirs.vala:223
+#, c-format
+msgid "Unable to create data subdirectory %s: %s"
+msgstr "Nije moguće kreirati poddirektorij podataka %s: %s"
+
+#: ../src/AppWindow.vala:53
+msgid "Pin Toolbar"
+msgstr "Prikači alatnu traku"
+
+#: ../src/AppWindow.vala:54
+msgid "Pin the toolbar open"
+msgstr "Otkači alatnu traku"
+
+#: ../src/AppWindow.vala:59
+msgid "Leave fullscreen"
+msgstr "Napusti prikaz preko cijelog ekrana"
+
+#: ../src/AppWindow.vala:525
+msgid "_Contents"
+msgstr "_Sadržaji"
+
+#: ../src/AppWindow.vala:530
+msgid "_Frequently Asked Questions"
+msgstr "_Često postavljana pitanja"
+
+#: ../src/AppWindow.vala:535
+msgid "_Report a Problem..."
+msgstr "_Prijavi problem..."
+
+#: ../src/AppWindow.vala:634 ../src/AppWindow.vala:655
+#: ../src/AppWindow.vala:672 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
+#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441 ../src/Resources.vala:162
+#: ../src/data_imports/DataImportsUI.vala:374
+#: ../src/publishing/PublishingUI.vala:475
+msgid "_Cancel"
+msgstr "_Otkaži"
+
+#: ../src/AppWindow.vala:682
+#, c-format
+msgid ""
+"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
+"continue.\n"
+"\n"
+"%s"
+msgstr ""
+"Pojavila se fatalna greška prilikom pristupa Shotwell biblioteci.  Shotwell "
+"ne može da nastavi rad.\n"
+"\n"
+"%s"
+
+#: ../src/AppWindow.vala:702
+msgid "Visit the Yorba web site"
+msgstr "Posjeti Yorba internet stranicu"
+
+#: ../src/AppWindow.vala:714
+#, c-format
+msgid "Unable to display help: %s"
+msgstr "Nije moguće prikazati pomoć: %s"
+
+#: ../src/AppWindow.vala:722
+#, c-format
+msgid "Unable to navigate to bug database: %s"
+msgstr "Ne mogu da pristupim bazi podataka o greškama: %s"
+
+#: ../src/AppWindow.vala:730
+#, c-format
+msgid "Unable to display FAQ: %s"
+msgstr "Nisam uspeo da prikažem ČPP: %s"
+
+#: ../src/BatchImport.vala:26
+msgid "Success"
+msgstr "Uspješno"
+
+#: ../src/BatchImport.vala:29
+msgid "File error"
+msgstr "Greška u datoteci"
+
+#: ../src/BatchImport.vala:32
+msgid "Unable to decode file"
+msgstr "Ne mogu da dešifrujem datoteku"
+
+#: ../src/BatchImport.vala:35
+msgid "Database error"
+msgstr "Greška u bazi podataka"
+
+#: ../src/BatchImport.vala:38
+msgid "User aborted import"
+msgstr "Korisnički prekinut uvoz"
+
+#: ../src/BatchImport.vala:41
+msgid "Not a file"
+msgstr "Nije datoteka"
+
+#: ../src/BatchImport.vala:44
+msgid "File already exists in database"
+msgstr "Datoteka već postoji u bazi"
+
+#: ../src/BatchImport.vala:47
+msgid "Unsupported file format"
+msgstr "Format datoteke nije podržan"
+
+#: ../src/BatchImport.vala:50
+msgid "Not an image file"
+msgstr "Datoteka nije slika"
+
+#: ../src/BatchImport.vala:53
+msgid "Disk failure"
+msgstr "Greška na disku"
+
+#: ../src/BatchImport.vala:56
+msgid "Disk full"
+msgstr "Disk je pun"
+
+#: ../src/BatchImport.vala:59
+msgid "Camera error"
+msgstr "Greška kamere"
+
+#: ../src/BatchImport.vala:62
+msgid "File write error"
+msgstr "Greška prilikom upisa u datoteku"
+
+#: ../src/BatchImport.vala:65
+msgid "Corrupt image file"
+msgstr "Oštećena datoteka slike"
+
+#: ../src/BatchImport.vala:68
+#, c-format
+msgid "Imported failed (%d)"
+msgstr "Uvoz nije uspješan (%d)"
+
+#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
+msgid "S_lideshow"
+msgstr "_Prikaz slajdova"
+
+#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
+msgid "Play a slideshow"
+msgstr "Započni prikaz slajdova"
+
+#: ../src/CollectionPage.vala:456
+msgid "Export Photo/Video"
+msgstr "Eksportuj sliku/video"
+
+#: ../src/CollectionPage.vala:456
+msgid "Export Photos/Videos"
+msgstr "Izvezi sliku/video"
+
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
+#: ../src/PhotoPage.vala:3211
+msgid "Export Photo"
+msgstr "Izvezi sliku"
+
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:87
+msgid "Export Photos"
+msgstr "Izvezi slike"
+
+#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+msgid "Rotating"
+msgstr "Rotiranje"
+
+#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+msgid "Undoing Rotate"
+msgstr "Poništavam rotaciju"
+
+#: ../src/CollectionPage.vala:570
+msgid "Flipping Horizontally"
+msgstr "Okretanje horizontalno"
+
+#: ../src/CollectionPage.vala:571
+msgid "Undoing Flip Horizontally"
+msgstr "Poništavam okretanje horizontalno"
+
+#: ../src/CollectionPage.vala:580
+msgid "Flipping Vertically"
+msgstr "Okretanje vertikalno"
+
+#: ../src/CollectionPage.vala:581
+msgid "Undoing Flip Vertically"
+msgstr "Poništavam okretanje vertikalno"
+
+#: ../src/Commands.vala:733
+msgid "Reverting"
+msgstr "Poništavanje"
+
+#: ../src/Commands.vala:733
+msgid "Undoing Revert"
+msgstr "Povrati prethodno"
+
+#: ../src/Commands.vala:777
+msgid "Enhancing"
+msgstr "Poboljšavanje"
+
+#: ../src/Commands.vala:777
+msgid "Undoing Enhance"
+msgstr "Poništavam poboljšavanje"
+
+#: ../src/Commands.vala:853
+msgid "Applying Color Transformations"
+msgstr "Primjenjujem transformaciju boja"
+
+#: ../src/Commands.vala:853
+msgid "Undoing Color Transformations"
+msgstr "Poništavam transformaciju boja"
+
+#: ../src/Commands.vala:1003
+msgid "Creating New Event"
+msgstr "Pravljenje novog događaja"
+
+#: ../src/Commands.vala:1004
+msgid "Removing Event"
+msgstr "Uklanjam događaj"
+
+#: ../src/Commands.vala:1013
+msgid "Moving Photos to New Event"
+msgstr "Premjesti slike u novi događaj"
+
+#: ../src/Commands.vala:1014
+msgid "Setting Photos to Previous Event"
+msgstr "Dodjeli sliku u prethodnom događaju"
+
+#: ../src/Commands.vala:1071
+msgid "Merging"
+msgstr "Spajanje"
+
+#: ../src/Commands.vala:1072
+msgid "Unmerging"
+msgstr "Razdvajanje"
+
+#: ../src/Commands.vala:1081
+msgid "Duplicating photos"
+msgstr "Dupliciranje slika"
+
+#: ../src/Commands.vala:1081
+msgid "Removing duplicated photos"
+msgstr "Uklanjanje dupliciranja slika"
+
+#         translations.
+#: ../src/Commands.vala:1104
+#, 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] "Nemoguće duplicirati %d sliku zbog greške u datoteci"
+msgstr[1] "Nemoguće duplicirati %d slike zbog greške u datoteci"
+msgstr[2] "Nemoguće duplicirati %d slika zbog greške u datoteci"
+
+#: ../src/Commands.vala:1191
+msgid "Restoring previous rating"
+msgstr "Vraćam prethodnu ocjenu"
+
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+msgid "Increasing ratings"
+msgstr "Povećavam ocjenu"
+
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+msgid "Decreasing ratings"
+msgstr "Smanjujem ocjenu"
+
+#: ../src/Commands.vala:1252
+msgid "Setting RAW developer"
+msgstr "Postavljam RAW razvijač"
+
+#: ../src/Commands.vala:1252
+msgid "Restoring previous RAW developer"
+msgstr "Obnavljam prethodni RAW razvijač"
+
+#: ../src/Commands.vala:1253
+msgid "Set Developer"
+msgstr "Postavi razvijača"
+
+#: ../src/Commands.vala:1343
+msgid "Original photo could not be adjusted."
+msgstr "Ne mogu da korigujem izvornu sliku."
+
+#: ../src/Commands.vala:1364
+msgid "Adjusting Date and Time"
+msgstr "Korigujem datum i vrijeme"
+
+#: ../src/Commands.vala:1364
+msgid "Undoing Date and Time Adjustment"
+msgstr "Poništavam promjenu datuma i vremena"
+
+#         translations.
+#: ../src/Commands.vala:1395
+msgid "One original photo could not be adjusted."
+msgid_plural "The following original photos could not be adjusted."
+msgstr[0] "Ne mogu da korigujem izvornu sliku."
+msgstr[1] "Ne mogu da korigujem izvorne slike."
+msgstr[2] "Ne mogu da korigujem izvorne slike."
+
+#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
+msgid "Time Adjustment Error"
+msgstr "Greška pri korigovanju vremena"
+
+#         translations.
+#: ../src/Commands.vala:1419
+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] ""
+"Podešavanja vremena se ne mogu poništiti na sljedećoj fotografskoj datoteci."
+msgstr[1] ""
+"Podešavanja vremena se ne mogu poništiti na sljedećim fotografskim "
+"datotekama."
+msgstr[2] "Time adjustments could not bje undone on the following photo files."
+
+#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
+msgid "Create Tag"
+msgstr "Kreiraj oznaku"
+
+#: ../src/Commands.vala:1691
+#, c-format
+msgid "Move Tag \"%s\""
+msgstr "Premjesti oznaku \"%s\""
+
+#: ../src/Commands.vala:2343
+msgid "Move Photos to Trash"
+msgstr "Premjesti slike u kantu"
+
+#: ../src/Commands.vala:2343
+msgid "Restore Photos from Trash"
+msgstr "Povrati slike iz kante"
+
+#: ../src/Commands.vala:2344
+msgid "Move the photos to the Shotwell trash"
+msgstr "Premjesti slike u Shotwell kantu"
+
+#: ../src/Commands.vala:2344
+msgid "Restore the photos back to the Shotwell library"
+msgstr "Povrati slike nazad u Shotwell biblioteku"
+
+#: ../src/Commands.vala:2363
+msgid "Moving Photos to Trash"
+msgstr "Premještam slike u kantu"
+
+#: ../src/Commands.vala:2363
+msgid "Restoring Photos From Trash"
+msgstr "Vraćam slike iz kante"
+
+#: ../src/Commands.vala:2449
+msgid "Flag selected photos"
+msgstr "Označi odabrane fotografije"
+
+#: ../src/Commands.vala:2450
+msgid "Unflag selected photos"
+msgstr "Poništi označenost odabranih fotografija"
+
+#: ../src/Commands.vala:2451
+msgid "Flagging selected photos"
+msgstr "Označavam izabrane fotografije"
+
+#: ../src/Commands.vala:2452
+msgid "Unflagging selected photos"
+msgstr "Skidam oznaku s izabranih fotografija"
+
+#: ../src/Commands.vala:2459
+msgid "Flag"
+msgstr "Označi"
+
+#: ../src/Commands.vala:2459
+msgid "Unflag"
+msgstr "Ukini oznaku"
+
+#: ../src/DesktopIntegration.vala:121
+#, c-format
+msgid "Unable to launch Nautilus Send-To: %s"
+msgstr "Nije moguće pokrenuti Nautilus Send-To: %s"
+
+#: ../src/DesktopIntegration.vala:129
+msgid "Send To"
+msgstr "Pošalji za"
+
+#: ../src/DesktopIntegration.vala:174
+#, c-format
+msgid "Unable to export background to %s: %s"
+msgstr "Nisam uspeo da izvezem pozadinu u %s: %s"
+
+#: ../src/DesktopIntegration.vala:311
+#, c-format
+msgid "Unable to prepare desktop slideshow: %s"
+msgstr "Nije moguće pripremiti prikaz slajdova na radnoj površini: %s"
+
+#         translations.
+#: ../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] "Da li ste sigurni da želite da uklonite oznaku \"%s\" sa %d slike?"
+msgstr[1] "Da li ste sigurni da želite da uklonite oznaku \"%s\" sa %d slike?"
+msgstr[2] "Da li ste sigurni da želite da uklonite oznaku \"%s\" sa %d slika?"
+
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
+#: ../src/Resources.vala:163 ../src/Resources.vala:369
+#: ../src/Resources.vala:417 ../src/Resources.vala:682
+msgid "_Delete"
+msgstr "_Ukloni"
+
+#: ../src/Dialogs.vala:25
+#, c-format
+msgid "This will remove the saved search \"%s\".  Continue?"
+msgstr "Ovo će ukloniti snimljenu pretragui \"%s\".  Nastavi?"
+
+#         translations.
+#: ../src/Dialogs.vala:35
+msgid ""
+"Switching developers will undo all changes you have made to this photo in "
+"Shotwell"
+msgid_plural ""
+"Switching developers will undo all changes you have made to these photos in "
+"Shotwell"
+msgstr[0] ""
+"Promjena razvijača će poništiti sve izmjene koje ste napravili na ovoj "
+"fotografiji"
+msgstr[1] ""
+"Promjena razvijača će poništiti sve izmjene koje ste napravili na ovim "
+"fotografijama"
+msgstr[2] ""
+"Promjena razvijača će poništiti sve izmjene koje ste napravili na ovim "
+"fotografijama"
+
+#: ../src/Dialogs.vala:39
+msgid "_Switch Developer"
+msgstr "_Promijeni razvijač"
+
+#: ../src/Dialogs.vala:58
+msgid "Export Video"
+msgstr "Izvezi video"
+
+#. Ticket #3023
+#. Attempt to replace the system error with something friendlier
+#. if we can't copy an image over for editing in an external tool.
+#. Did we fail because we can't write to this directory?
+#. Yes - display an alternate error message here.
+#: ../src/Dialogs.vala:115
+#, c-format
+msgid ""
+"Shotwell couldn't create a file for editing this photo because you do not "
+"have permission to write to %s."
+msgstr ""
+"Shotwell ne može da uređuje ovu fotografiju jer nemate neophodne dozvole za "
+"upis u %s."
+
+#: ../src/Dialogs.vala:124
+msgid ""
+"Unable to export the following photo due to a file error.\n"
+"\n"
+msgstr ""
+"Izvoz slike nije uspeo zbog greške u datoteci.\n"
+"\n"
+
+#: ../src/Dialogs.vala:130
+msgid ""
+"\n"
+"\n"
+"Would you like to continue exporting?"
+msgstr ""
+"\n"
+"\n"
+"Da li želite da nastavite izvoz?"
+
+#. "Unmodified" and "Current," though they appear in the "Format:" popup mijenu, really
+#. aren't formats so much as they are operating modes that determine specific formats.
+#. Hereafter we'll refer to these as "special formats."
+#: ../src/Dialogs.vala:147
+msgid "Unmodified"
+msgstr "Neizmijenjeno"
+
+#: ../src/Dialogs.vala:148
+msgid "Current"
+msgstr "Trenutni"
+
+#. layout controls
+#: ../src/Dialogs.vala:213
+msgid "_Format:"
+msgstr "_Format:"
+
+#: ../src/Dialogs.vala:216
+msgid "_Quality:"
+msgstr "_Kvalitet:"
+
+#: ../src/Dialogs.vala:219
+msgid "_Scaling constraint:"
+msgstr "_Ograničenje skaliranja:"
+
+#: ../src/Dialogs.vala:222
+msgid "_Pixels:"
+msgstr "_Pikseli:"
+
+#: ../src/Dialogs.vala:225
+msgid "Export metadata"
+msgstr "Izvezi metapodatke"
+
+#: ../src/Dialogs.vala:459
+msgid "Save Details..."
+msgstr "Sačuvaj detalje..."
+
+#: ../src/Dialogs.vala:460
+msgid "Save Details"
+msgstr "Sačuvaj detalje"
+
+#: ../src/Dialogs.vala:475
+#, c-format
+msgid "(and %d more)\n"
+msgstr "(i još %d)\n"
+
+#: ../src/Dialogs.vala:528
+msgid "Import Results Report"
+msgstr "Izvještaj o rezultatima uvoza"
+
+#         translations.
+#: ../src/Dialogs.vala:532
+#, c-format
+msgid "Attempted to import %d file."
+msgid_plural "Attempted to import %d files."
+msgstr[0] "Pokušaj uvoza %d datoteke."
+msgstr[1] "Pokušaj uvoza %d datoteke."
+msgstr[2] "Pokušaj uvoza %d datoteka."
+
+#         translations.
+#: ../src/Dialogs.vala:535
+#, c-format
+msgid "Of these, %d file was successfully imported."
+msgid_plural "Of these, %d files were successfully imported."
+msgstr[0] "Od toga %d datoteka je uspješno uvezena."
+msgstr[1] "Od toga %d datoteka su uspješno uvezene."
+msgstr[2] "Od toga %d datoteka je uspješno uvezeno."
+
+#.
+#. Duplicates
+#.
+#: ../src/Dialogs.vala:547
+msgid "Duplicate Photos/Videos Not Imported:"
+msgstr "Duple slike/video nisu uvezene:"
+
+#: ../src/Dialogs.vala:551
+msgid "duplicates existing media item"
+msgstr "duplicira postojeći medijski element"
+
+#.
+#. Files Not Imported Due to Camera Errors
+#.
+#: ../src/Dialogs.vala:562
+msgid "Photos/Videos Not Imported Due to Camera Errors:"
+msgstr "Fotografije/Video nisu uvezeni zbog greške kamere:"
+
+#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
+#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
+msgid "error message:"
+msgstr "poruka greške:"
+
+#.
+#. Files Not Imported Because They Weren't Recognized as Photos or Videos
+#.
+#: ../src/Dialogs.vala:576
+msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+msgstr ""
+"Fotografije/Video nisu uvezene jer nisu prepoznati kao fotografije ili video:"
+
+#.
+#. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
+#.
+#: ../src/Dialogs.vala:591
+msgid ""
+"Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
+"Understands:"
+msgstr ""
+"Fotografije/Video nisu uvezene jer nisu u formatu koji Shotwell razumije:"
+
+#.
+#. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
+#.
+#: ../src/Dialogs.vala:606
+msgid ""
+"Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
+"Library:"
+msgstr ""
+"Fotografije/Video nisu uvezeni jer ih Shotwell ne može kopirati u biblioteku:"
+
+#: ../src/Dialogs.vala:610
+#, c-format
+msgid ""
+"couldn't copy %s\n"
+"\tto %s"
+msgstr ""
+"ne mogu kopirati %s\n"
+"\tna %s"
+
+#.
+#. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
+#.
+#: ../src/Dialogs.vala:622
+msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
+msgstr "Fotografije/video nisu uvezene jer su oštećeni:"
+
+#.
+#. Photos/Videos Not Imported for Other Reasons
+#.
+#: ../src/Dialogs.vala:637
+msgid "Photos/Videos Not Imported for Other Reasons:"
+msgstr "Fotografije/Video nisu uvezene iz drugih razloga:"
+
+#         translations.
+#: ../src/Dialogs.vala:657
+#, c-format
+msgid "1 duplicate photo was not imported:\n"
+msgid_plural "%d duplicate photos were not imported:\n"
+msgstr[0] "%d slika nije uvežena jer se već nalazi u biblioteci:\n"
+msgstr[1] "%d slike nisu uvežene jer se već nalazi u biblioteci:\n"
+msgstr[2] "%d slika nije uveženo jer se već nalaze u biblioteci:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:660
+#, c-format
+msgid "1 duplicate video was not imported:\n"
+msgid_plural "%d duplicate videos were not imported:\n"
+msgstr[0] "%d dupli video snimak nije uvezen:\n"
+msgstr[1] "%d dupla video snimka nisu uvezena:\n"
+msgstr[2] "%d duplih video snimaka nije uvezeno:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:663
+#, c-format
+msgid "1 duplicate photo/video was not imported:\n"
+msgid_plural "%d duplicate photos/videos were not imported:\n"
+msgstr[0] "%d dupla fotografija/video snimak nije uvezena:\n"
+msgstr[1] "%d duple fotografije/video snimka nisu uvezene:\n"
+msgstr[2] "%d duplih fotografija/video snimaka nije uvezeno:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:677
+#, 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] "%d slika nije uvežena zbog hardverske greške:\n"
+msgstr[1] "%d slike nisu uvežene zbog hardverske greške:\n"
+msgstr[2] "%d slika nije uveženo zbog hardverske greške:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:680
+#, 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] ""
+"Uvoz %d video snimka nije uspio zbog greške u datoteci ili uređaju:\n"
+msgstr[1] ""
+"Uvoz %d video snimka nije uspio zbog greške u datoteci ili uređaju:\n"
+msgstr[2] ""
+"Uvoz %d video snimkaa nije uspio zbog greške u datoteci ili uređaju:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:683
+#, 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] ""
+"Uvoz %d fotografije/video snimka nije uspio zbog greške u datoteci ili "
+"uređaju:\n"
+msgstr[1] ""
+"Uvoz %d fotografije/video snimka nije uspio zbog greške u datoteci ili "
+"uređaju:\n"
+msgstr[2] ""
+"Uvoz %d fotografija/video snimaka nije uspio zbog greške u datoteci ili "
+"uređaju:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:686
+#, 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] ""
+"%d datoteka je neuspjela s uvozom zbog greške u datoteci ili hardveru:\n"
+msgstr[1] ""
+"%d datoteke su neuspjela s uvozom zbog greške u datoteci ili hardveru:\n"
+msgstr[2] ""
+"%d datoteka je neuspjelo s uvozom zbog greške u datoteci ili hardveru:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:700
+#, 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] ""
+"%d fotografija nije uspjela da se uveze, jer se ne može pisati u direktorij "
+"foto biblioteke:\n"
+msgstr[1] ""
+"%d fotografije nisu uspjela da se uvezu, jer se ne može pisati u direktorij "
+"foto biblioteke:\n"
+msgstr[2] ""
+"%d fotografije nije uspjelo da se uvez, jer se ne može pisati u direktorij "
+"foto biblioteke:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:703
+#, 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] ""
+"Uvoz %d video snimka nije uspio, jer nije dozvoljeno pisanje u direktorijum "
+"zbirke fotografija:\n"
+msgstr[1] ""
+"Uvoz %d video snimka nije uspio, jer nije dozvoljeno pisanje u direktorijum "
+"zbirke fotografija:\n"
+msgstr[2] ""
+"Uvoz %d video snimaka nije uspio, jer nije dozvoljeno pisanje u direktorijum "
+"zbirke fotografija:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:706
+#, 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] ""
+"%d fotografija/video zapis nije uspjela da se uveze, jer se ne može pisati u "
+"direktorij foto biblioteke:\n"
+msgstr[1] ""
+"%d fotografije/video zapisa nije uspjelo da se uveze, jer se ne može pisati "
+"u direktorij foto biblioteke:\n"
+msgstr[2] ""
+"%d fotografija/video zapisa nije uspjelo da se uveze, jer se ne može pisati "
+"u direktorij foto biblioteke:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:709
+#, 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] ""
+"%d datoteka je neuspjela s uvozom jer direktorij fotobiblioteke nije "
+"upisiv:\n"
+msgstr[1] ""
+"%d datoteka su neuspjele s uvozom jer direktorij fotobiblioteke nije "
+"upisiv:\n"
+msgstr[2] ""
+"%d datoteka je neuspjelo s uvozom jer direktorij fotobiblioteke nije "
+"upisiv:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:723
+#, 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] "%d slika nije uvežena zbog greške u fotoaparatu:\n"
+msgstr[1] "%d slike nisu uvežene zbog greške u fotoaparatu:\n"
+msgstr[2] "%d slika nije uveženo zbog greške u fotoaparatu:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:726
+#, 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] "Uvoz %d video snimka nije uspio zbog greške na fotoaparatu:\n"
+msgstr[1] "Uvoz %d video snimka nije uspio zbog greške na fotoaparatu:\n"
+msgstr[2] "Uvoz %d video snimaka nije uspio zbog greške na fotoaparatu:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:729
+#, 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] ""
+"Uvoz %d fotografije/video snimka nije uspio zbog greške na fotoaparatu:\n"
+msgstr[1] ""
+"Uvoz %d fotografije/video snimka nije uspio zbog greške na fotoaparatu:\n"
+msgstr[2] ""
+"Uvoz %d fotografija/video snimaka nije uspio zbog greške na fotoaparatu:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:732
+#, 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] "%d datoteka je neuspjela s uvozom zbog greške u fotoaparatu:\n"
+msgstr[1] "%d datoteka su neuspjele s uvozom zbog greške u fotoaparatu:\n"
+msgstr[2] "%d datoteka je neuspjelo s uvozom zbog greške u fotoaparatu:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:746
+#, c-format
+msgid "1 photo failed to import because it was corrupt:\n"
+msgid_plural "%d photos failed to import because they were corrupt:\n"
+msgstr[0] "%d fotografija neuspjela jer je oštećena:\n"
+msgstr[1] "%d fotografije neuspjele jer su oštećena:\n"
+msgstr[2] "%d fotografija neuspjelo jer su oštećena:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:749
+#, c-format
+msgid "1 video failed to import because it was corrupt:\n"
+msgid_plural "%d videos failed to import because they were corrupt:\n"
+msgstr[0] "%d video neuspio jer je oštećen:\n"
+msgstr[1] "%d video neuspjela jer su oštećena:\n"
+msgstr[2] "%d video neuspjelo jer su oštećena:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:752
+#, c-format
+msgid "1 photo/video failed to import because it was corrupt:\n"
+msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
+msgstr[0] "%d foto/video zapis neuspio jer je oštećen:\n"
+msgstr[1] "%d foto/video zapisa neuspjelo jer su oštećena:\n"
+msgstr[2] "%d foto/video zapisa neuspjelo jer je oštećeno:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:755
+#, c-format
+msgid "1 file failed to import because it was corrupt:\n"
+msgid_plural "%d files failed to import because it was corrupt:\n"
+msgstr[0] "%d datoteka  neuspjela za uvoz jer je oštećena:\n"
+msgstr[1] "%d datoteke neuspjele za uvoz jer su oštećene:\n"
+msgstr[2] "%d datoteka neuspjelo za uvoz jer su oštećene:\n"
+
+#         translations.
+#. we have no notion of "unsupported" video files right now in Shotwell (all
+#. standard container formats are supported, it's just that the streams in them
+#. might or might not bje interpretable), so this message does not need to bje
+#. media specific
+#: ../src/Dialogs.vala:772
+#, c-format
+msgid "1 unsupported photo skipped:\n"
+msgid_plural "%d unsupported photos skipped:\n"
+msgstr[0] "Preskočena je %d nepodržana slika:\n"
+msgstr[1] "Preskočene su %d nepodržane slike:\n"
+msgstr[2] "Preskočene su %d nepodržanih slika:\n"
+
+#         translations.
+#. we have no notion of "non-video" video files right now in Shotwell, so this
+#. message doesn't need to bje media specific
+#: ../src/Dialogs.vala:787
+#, c-format
+msgid "1 non-image file skipped.\n"
+msgid_plural "%d non-image files skipped.\n"
+msgstr[0] "Preskočena je %d datoteka koja nije slika:\n"
+msgstr[1] "Preskočene su %d datoteke koje nisu slike:\n"
+msgstr[2] "Preskočeno je %d datoteka koje nisu slike:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:798
+#, c-format
+msgid "1 photo skipped due to user cancel:\n"
+msgid_plural "%d photos skipped due to user cancel:\n"
+msgstr[0] "%d slika nije uvežena jer ste prekinuli uvoz:\n"
+msgstr[1] "%d slike nisu uvežena jer ste prekinuli uvoz:\n"
+msgstr[2] "%d slika nije uveženo jer ste prekinuli uvoz:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:801
+#, c-format
+msgid "1 video skipped due to user cancel:\n"
+msgid_plural "%d videos skipped due to user cancel:\n"
+msgstr[0] "%d video snimak je preskočen pri uvozu:\n"
+msgstr[1] "%d video snimka su preskočena pri uvozu:\n"
+msgstr[2] "%d video snimaka jepreskočeno pri uvozu:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:804
+#, 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] "%d fotografija/video snimak je preskočena pri uvozu:\n"
+msgstr[1] "%d fotografije/video snimka su preskočene pri uvozu:\n"
+msgstr[2] "%d fotografija/video snimaka je preskočeno pri uvozu:\n"
+
+#         translations.
+#: ../src/Dialogs.vala:807
+#, c-format
+msgid "1 file skipped due to user cancel:\n"
+msgid_plural "%d file skipped due to user cancel:\n"
+msgstr[0] "%d datoteka preskočena zbog korisničkog otkazivanja\n"
+msgstr[1] "%d datoteke preskočene zbog korisničkog otkazivanja\n"
+msgstr[2] "%d datoteka preskočeno zbog korisničkog otkazivanja\n"
+
+#         translations.
+#: ../src/Dialogs.vala:821
+#, c-format
+msgid "1 photo successfully imported.\n"
+msgid_plural "%d photos successfully imported.\n"
+msgstr[0] "%d slika je uspješno uvežena.\n"
+msgstr[1] "%d slike su uspješno uvežene.\n"
+msgstr[2] "%d slika je uspješno uveženo.\n"
+
+#         translations.
+#: ../src/Dialogs.vala:824
+#, c-format
+msgid "1 video successfully imported.\n"
+msgid_plural "%d videos successfully imported.\n"
+msgstr[0] "%d video snimak je uspješno uvezen.\n"
+msgstr[1] "%d video snimka su uspješno uvezena.\n"
+msgstr[2] "%d video snimaka jw uspješno uvezeno.\n"
+
+#         translations.
+#: ../src/Dialogs.vala:827
+#, c-format
+msgid "1 photo/video successfully imported.\n"
+msgid_plural "%d photos/videos successfully imported.\n"
+msgstr[0] "%d fotografija/video snimak je uspješno uvezen.\n"
+msgstr[1] "%d fotografije/video snimak je uspješno uvezen.\n"
+msgstr[2] "%d fotografija/video snimaka je uspješno uvezen.\n"
+
+#. if no media items were imported at all (i.e. an empty directory attempted), need to at least
+#. report that nothing was imported
+#: ../src/Dialogs.vala:843
+msgid "No photos or videos imported.\n"
+msgstr "Nijedna fotografija ni video snimak nisu uvezeni.\n"
+
+#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
+msgid "Import Complete"
+msgstr "Uvoz je završen"
+
+#         translations.
+#: ../src/Dialogs.vala:1155
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunda"
+msgstr[1] "%d sekunde"
+msgstr[2] "%d sekundi"
+
+#         translations.
+#: ../src/Dialogs.vala:1158
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuta"
+msgstr[1] "%d minute"
+msgstr[2] "%d minuta"
+
+#         translations.
+#: ../src/Dialogs.vala:1162
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d sat"
+msgstr[1] "%d sata"
+msgstr[2] "%d sati"
+
+#: ../src/Dialogs.vala:1165
+msgid "1 day"
+msgstr "1 dan"
+
+#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
+msgid "Rename Event"
+msgstr "Preimenuj događaj"
+
+#: ../src/Dialogs.vala:1315
+msgid "Name:"
+msgstr "Ime:"
+
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
+msgid "Edit Title"
+msgstr "Uredi naslov"
+
+#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
+msgid "Title:"
+msgstr "Naslov:"
+
+#. Dialog title
+#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
+msgid "Edit Event Comment"
+msgstr "Uredi komentar događaja"
+
+#: ../src/Dialogs.vala:1344
+msgid "Edit Photo/Video Comment"
+msgstr "Uredi komentar fotografije/video"
+
+#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
+msgid "Comment:"
+msgstr "Komentar:"
+
+#         translations.
+#: ../src/Dialogs.vala:1361
+msgid "Remove and _Trash File"
+msgid_plural "Remove and _Trash Files"
+msgstr[0] "Ukloni i smjesti datoteku u _kantu"
+msgstr[1] "Ukloni i smjesti datoteke u _kantu"
+msgstr[2] "Ukloni i smjesti datoteke u _kantu"
+
+#: ../src/Dialogs.vala:1365
+msgid "_Remove From Library"
+msgstr "_Ukloni iz zbirke"
+
+#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
+msgid "_Keep"
+msgstr "_Zadrži"
+
+#: ../src/Dialogs.vala:1408
+msgid "Revert External Edit?"
+msgstr "Poništiti spoljnju izmjenu?"
+
+#: ../src/Dialogs.vala:1408
+msgid "Revert External Edits?"
+msgstr "Da vratim spoljna uređivanja?"
+
+#         translations.
+#: ../src/Dialogs.vala:1410
+#, 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] ""
+"Ova akcija će poništiti sve promjene na %d datoteci izvršene u spoljnom "
+"uređivaču. Da li želite da nastavite?"
+msgstr[1] ""
+"Ova akcija će poništiti sve promjene na %d datotekr izvršene u spoljnom "
+"uređivaču. Da li želite da nastavite?"
+msgstr[2] ""
+"Ova akcija će poništiti sve promjene na %d datoteka izvršene u spoljnom "
+"uređivaču. Da li želite da nastavite?"
+
+#: ../src/Dialogs.vala:1414
+msgid "Re_vert External Edit"
+msgstr "_Vrati spoljno uređivanje"
+
+#: ../src/Dialogs.vala:1414
+msgid "Re_vert External Edits"
+msgstr "_Vrati spoljna uređivanja"
+
+#         translations.
+#: ../src/Dialogs.vala:1435
+#, 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] "Ovo će ukloniti %d sliku iz biblioteke? Nastaviti?"
+msgstr[1] "Ovo će ukloniti %d slike iz biblioteke? Nastaviti?"
+msgstr[2] "Ovo će ukloniti %d slika iz biblioteke? Nastaviti?"
+
+#: ../src/Dialogs.vala:1442 ../src/Resources.vala:178
+msgid "_Remove"
+msgstr "_Ukloni"
+
+#: ../src/Dialogs.vala:1443
+msgid "Remove Photo From Library"
+msgstr "Ukloni fotografiju iz zbirke"
+
+#: ../src/Dialogs.vala:1443
+msgid "Remove Photos From Library"
+msgstr "Ukloni fotografije iz zbirke"
+
+#: ../src/Dialogs.vala:1536
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: ../src/Dialogs.vala:1688
+msgid "AM"
+msgstr "AM"
+
+#: ../src/Dialogs.vala:1689
+msgid "PM"
+msgstr "PM"
+
+#: ../src/Dialogs.vala:1690
+msgid "24 Hr"
+msgstr "24 sata"
+
+#: ../src/Dialogs.vala:1705
+msgid "_Shift photos/videos by the same amount"
+msgstr "_Pomjeri fotografije/video snimke za istu vrijednost"
+
+#: ../src/Dialogs.vala:1710
+msgid "Set _all photos/videos to this time"
+msgstr "Postavi ovo vrijeme za _sve fotografije"
+
+#: ../src/Dialogs.vala:1717
+msgid "_Modify original photo file"
+msgstr "_Izmijeni izvornu fotografiju"
+
+#: ../src/Dialogs.vala:1717
+msgid "_Modify original photo files"
+msgstr "_Izmijeni izvorne fotografije"
+
+#: ../src/Dialogs.vala:1720
+msgid "_Modify original file"
+msgstr "_Izmijeni izvornu datoteku"
+
+#: ../src/Dialogs.vala:1720
+msgid "_Modify original files"
+msgstr "_Izmijeni izvorne datoteke"
+
+#: ../src/Dialogs.vala:1806
+msgid "Original: "
+msgstr "Izvorno: "
+
+#: ../src/Dialogs.vala:1807
+msgid "%m/%d/%Y, %H:%M:%S"
+msgstr "%d.%m.%Y. %H:%M:%S"
+
+#: ../src/Dialogs.vala:1808
+msgid "%m/%d/%Y, %I:%M:%S %p"
+msgstr "%d.%m.%Y. %H:%M:%S"
+
+#: ../src/Dialogs.vala:1897
+#, c-format
+msgid ""
+"Exposure time will be shifted forward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Datum slikanja će biti pomjeren unaprijed za\n"
+"%d %s, %d %s, %d %s, and %d %s."
+
+#: ../src/Dialogs.vala:1898
+#, c-format
+msgid ""
+"Exposure time will be shifted backward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Datum slikanja će biti pomjeren unazad za\n"
+"%d %s, %d %s, %d %s, and %d %s."
+
+#         translations.
+#: ../src/Dialogs.vala:1900
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dan"
+msgstr[1] "dani"
+msgstr[2] "dani"
+
+#         translations.
+#: ../src/Dialogs.vala:1901
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "sat"
+msgstr[1] "sati"
+msgstr[2] "sati"
+
+#         translations.
+#: ../src/Dialogs.vala:1902
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuta"
+msgstr[1] "minute"
+msgstr[2] "minute"
+
+#         translations.
+#: ../src/Dialogs.vala:1903
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "sekunda"
+msgstr[1] "sekunde"
+msgstr[2] "sekunde"
+
+#         translations.
+#: ../src/Dialogs.vala:1947
+#, c-format
+msgid ""
+"\n"
+"\n"
+"And %d other."
+msgid_plural ""
+"\n"
+"\n"
+"And %d others."
+msgstr[0] ""
+"\n"
+"\n"
+"I %d drugi."
+msgstr[1] ""
+"\n"
+"\n"
+"I %d druga."
+msgstr[2] ""
+"\n"
+"\n"
+"I %d drugih."
+
+#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
+msgid "Tags (separated by commas):"
+msgstr "Oznake (razdvojene zarezima):"
+
+#: ../src/Dialogs.vala:2076
+msgid "Welcome!"
+msgstr "Dobrodošli!"
+
+#: ../src/Dialogs.vala:2083
+msgid "Welcome to Shotwell!"
+msgstr "Dobrodošli u Shotwell"
+
+#: ../src/Dialogs.vala:2087
+msgid "To get started, import photos in any of these ways:"
+msgstr "Kako bi počeli, morate uvesti slike na neki od sljedećih načina:"
+
+#: ../src/Dialogs.vala:2106
+#, c-format
+msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
+msgstr ""
+"Izaberite <span weight=\"bold\">Datoteka %s Uvezi iz direktorija</span>"
+
+#: ../src/Dialogs.vala:2107
+msgid "Drag and drop photos onto the Shotwell window"
+msgstr "Prevucite sliku iz menadžera datoteka u Shotwell prozor"
+
+#: ../src/Dialogs.vala:2108
+msgid "Connect a camera to your computer and import"
+msgstr "Povežite fotoaparat sa računarom i uvezite slike"
+
+#: ../src/Dialogs.vala:2118
+#, c-format
+msgid "_Import photos from your %s folder"
+msgstr "_Uvezi slike iz %s direktorija"
+
+#: ../src/Dialogs.vala:2125
+msgid "You can also import photos in any of these ways:"
+msgstr "Možete uvesti slike na neki od sljedećih načina:"
+
+#: ../src/Dialogs.vala:2135
+msgid "_Don't show this message again"
+msgstr "_Ne prikazuj više ovu poruku"
+
+#: ../src/Dialogs.vala:2170
+#, c-format
+msgid "Import photos from your %s library"
+msgstr "Uvezi fotografije iz vaše %s zbirke"
+
+#. We're installed system-wide, so usi the system help.
+#. We're being run from the build directory; we'll have to handle clicks to this
+#. link manually ourselves, due to a limitation ghelp: URIs.
+#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
+msgid "(Help)"
+msgstr "(Pomoć)"
+
+#: ../src/Dialogs.vala:2324
+#, c-format
+msgid "Year%sMonth%sDay"
+msgstr "Godina%sMjesec%sDan"
+
+#: ../src/Dialogs.vala:2326
+#, c-format
+msgid "Year%sMonth"
+msgstr "Godina%sMjesec"
+
+#: ../src/Dialogs.vala:2328
+#, c-format
+msgid "Year%sMonth-Day"
+msgstr "Godina%sMjesec-Dan"
+
+#: ../src/Dialogs.vala:2330
+msgid "Year-Month-Day"
+msgstr "Godina-mjesec-dan"
+
+#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
+msgid "Custom"
+msgstr "Prilagođeno"
+
+#. Invalid pattern.
+#: ../src/Dialogs.vala:2568
+msgid "Invalid pattern"
+msgstr "Neispravan obrazac"
+
+#. This function is used to determine whether or not files should bje copied or linked when imported.
+#. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
+#: ../src/Dialogs.vala:2670
+msgid ""
+"Shotwell can copy the photos into your library folder or it can import them "
+"without copying."
+msgstr ""
+"Shotwell može da iskopira slike u vašu zbirku ili napravi vezu ka vašim "
+"slikama bez kopiranja."
+
+#: ../src/Dialogs.vala:2675
+msgid "Co_py Photos"
+msgstr "Ko_piraj slike"
+
+#: ../src/Dialogs.vala:2676
+msgid "_Import in Place"
+msgstr "Uvez_i na mjestu"
+
+#: ../src/Dialogs.vala:2677
+msgid "Import to Library"
+msgstr "Uvezi u zbirku"
+
+#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
+msgid "Remove From Library"
+msgstr "Ukloni iz zbirke"
+
+#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
+msgid "Removing Photo From Library"
+msgstr "Uklanjam fotografiju iz zbirke"
+
+#: ../src/Dialogs.vala:2688
+msgid "Removing Photos From Library"
+msgstr "Uklanjam fotografije iz zbirke"
+
+#         translations.
+#: ../src/Dialogs.vala:2702
+#, 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] ""
+"Uklanjam %d fotografiju/video snimak iz Shotwellove zbirke.   Da li želite "
+"da ga prebacite u smeće na radnoj površini?\n"
+"\n"
+"Ova akcija je nepovratna."
+msgstr[1] ""
+"Uklanjam %d fotografije/video snimka iz Shotwellove zbirke.  Da li želite da "
+"ih prebacite u smeće na radnoj površini?\n"
+"\n"
+"Ova akcija je nepovratna."
+msgstr[2] ""
+"Uklanjam %d fotografija/video snimaka iz Shotwellove zbirke.   Da li želite "
+"da ih prebacite u smeće na radnoj površini?\n"
+"\n"
+"Ova akcija je nepovratna."
+
+#         translations.
+#: ../src/Dialogs.vala:2706
+#, 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] ""
+"Uklanjam %d video snimak iz Shotwellove zbirke.  Da li želite da ga "
+"prebacite u smeće na radnoj površini?\n"
+"\n"
+"Ova akcija je nepovratna."
+msgstr[1] ""
+"Uklanjam %d video snimka iz Shotwellove zbirke.  Da li želite da ih "
+"prebacite u smeće na radnoj površini?\n"
+"\n"
+"Ova akcija je nepovratna."
+msgstr[2] ""
+"Uklanjam %d video snimaka iz Shotwellove zbirke.  Da li želite da ih "
+"prebacite u smeće na radnoj površini?\n"
+"\n"
+"Ova akcija je nepovratna."
+
+#         translations.
+#: ../src/Dialogs.vala:2710
+#, 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] ""
+"Ova akcija će ukloniti %d sliku iz Shotwell biblioteke.  Da li želite da je "
+"prebacite u smeće na radnoj površini?\n"
+"\n"
+"Ova akcija je nepovratna."
+msgstr[1] ""
+"Ova akcija će ukloniti %d slike iz Shotwell biblioteke.  Da li želite daih "
+"prebacite u smeće na radnoj površini?\n"
+"\n"
+"Ova akcija je nepovratna."
+msgstr[2] ""
+"Ova akcija će ukloniti %d slika iz Shotwell biblioteke.  Da li želite daih "
+"prebacite u smeće na radnoj površini?\n"
+"\n"
+"Ova akcija je nepovratna."
+
+#         translations.
+#: ../src/Dialogs.vala:2742
+#, 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] ""
+"%d fotografija/video snimak ne mogu premjestiti u smeće.  Da li želite da ga "
+"uklonim trajno sa diska?"
+msgstr[1] ""
+"%d fotografije/video snimka ne mogu premjestiti u smeće.  Da li želite da ga "
+"uklonim trajno sa diska?"
+msgstr[2] ""
+"%d fotografija/video snimaka ne mogu premjestiti u smeće.  Da li želite da "
+"ih uklonim trajno sa diska?"
+
+#         translations.
+#. Alert the user that the files were not removed.
+#: ../src/Dialogs.vala:2759
+#, c-format
+msgid "The photo or video cannot be deleted."
+msgid_plural "%d photos/videos cannot be deleted."
+msgstr[0] "Ne mogu da obrišem %d fotografiju/video snimak."
+msgstr[1] "Ne mogu da obrišem %d fotografije/video snimak."
+msgstr[2] "Ne mogu da obrišem %d fotografija/video snimak."
+
+#: ../src/Dimensions.vala:23
+msgid "Width"
+msgstr "Širina"
+
+#: ../src/Dimensions.vala:26
+msgid "Height"
+msgstr "Visina"
+
+#. verify this is a directory
+#: ../src/DirectoryMonitor.vala:889
+#, c-format
+msgid "Unable to monitor %s: Not a directory (%s)"
+msgstr "Ne mogu da pratim %s: Nije direktorij (%s)"
+
+#. if no nami, pretty up the start time
+#: ../src/Event.vala:751
+#, c-format
+msgid "Event %s"
+msgstr "Događaj %s"
+
+#: ../src/Exporter.vala:232
+#, c-format
+msgid "Unable to generate a temporary file for %s: %s"
+msgstr "Nisam uspio da napravim privremenu datoteku za %s: %s"
+
+#: ../src/Exporter.vala:299
+msgid "Exporting"
+msgstr "Izvozim"
+
+#: ../src/Exporter.vala:317
+#, c-format
+msgid "File %s already exists.  Replace?"
+msgstr "Datoteka %s već postoji. Da li da je zamjenim?"
+
+#: ../src/Exporter.vala:319
+msgid "_Skip"
+msgstr "_Preskoči"
+
+#: ../src/Exporter.vala:319
+msgid "_Replace"
+msgstr "_Zamijeni"
+
+#: ../src/Exporter.vala:319
+msgid "Replace _All"
+msgstr "Zamjeni _Sve"
+
+#: ../src/Exporter.vala:319
+msgid "Export"
+msgstr "Izvoz"
+
+#: ../src/MediaMonitor.vala:400
+#, c-format
+msgid "Unable to process monitoring updates: %s"
+msgstr "Ne mogu obraditi praćenje nadogradnji: %s"
+
+#: ../src/MediaPage.vala:157
+msgid "Adjust the size of the thumbnails"
+msgstr "Promjeni dimezije umanjenog prikaza"
+
+#: ../src/MediaPage.vala:339 ../src/PhotoPage.vala:2593
+#: ../src/Resources.vala:188 ../src/direct/DirectPhotoPage.vala:174
+msgid "Zoom _In"
+msgstr "_Uvećaj"
+
+#: ../src/MediaPage.vala:340
+msgid "Increase the magnification of the thumbnails"
+msgstr "Uvećaj prikaz umanjenih sličica"
+
+#: ../src/MediaPage.vala:345 ../src/PhotoPage.vala:2599
+#: ../src/Resources.vala:189 ../src/direct/DirectPhotoPage.vala:180
+msgid "Zoom _Out"
+msgstr "_Umanji"
+
+#: ../src/MediaPage.vala:346
+msgid "Decrease the magnification of the thumbnails"
+msgstr "Umanji prikaz umanjenih sličica"
+
+#: ../src/MediaPage.vala:413
+msgid "Sort _Photos"
+msgstr "Sortiraj slike"
+
+#: ../src/MediaPage.vala:422
+msgid "_Play Video"
+msgstr "_Pusti video snimak"
+
+#: ../src/MediaPage.vala:423
+msgid "Open the selected videos in the system video player"
+msgstr "Otvori izabrani video snimak u programu za njihovo puštanje"
+
+#: ../src/MediaPage.vala:427 ../src/PhotoPage.vala:2642
+msgid "_Developer"
+msgstr "_Razvio"
+
+#: ../src/MediaPage.vala:439 ../src/camera/Branch.vala:99
+#: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
+#: ../src/photos/RawSupport.vala:303
+msgid "Camera"
+msgstr "Kamera"
+
+#: ../src/MediaPage.vala:450 ../src/camera/ImportPage.vala:874
+msgid "_Titles"
+msgstr "_Naslovi"
+
+#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:875
+msgid "Display the title of each photo"
+msgstr "Prikaži nazive slika"
+
+#: ../src/MediaPage.vala:456 ../src/events/EventsDirectoryPage.vala:130
+msgid "_Comments"
+msgstr "_Komentari"
+
+#: ../src/MediaPage.vala:457
+msgid "Display the comment of each photo"
+msgstr "Prikaži komentar na svaku sliku"
+
+#: ../src/MediaPage.vala:468 ../src/library/LibraryWindow.vala:375
+msgid "Ta_gs"
+msgstr "Oz_nake"
+
+#: ../src/MediaPage.vala:469
+msgid "Display each photo's tags"
+msgstr "Prikaži oznake slika"
+
+#: ../src/MediaPage.vala:485
+msgid "By _Title"
+msgstr "Po _nazivu"
+
+#: ../src/MediaPage.vala:486
+msgid "Sort photos by title"
+msgstr "Sortiraj slike po nazivu"
+
+#: ../src/MediaPage.vala:491
+msgid "By Exposure _Date"
+msgstr "Po _datumu slikanja"
+
+#: ../src/MediaPage.vala:492
+msgid "Sort photos by exposure date"
+msgstr "Sortiraj slike po datumu slikanja"
+
+#: ../src/MediaPage.vala:497
+msgid "By _Rating"
+msgstr "Po _ocjeni"
+
+#: ../src/MediaPage.vala:498
+msgid "Sort photos by rating"
+msgstr "Sortiraj slike po ocjeni"
+
+#: ../src/MediaPage.vala:508 ../src/library/LibraryWindow.vala:421
+msgid "_Ascending"
+msgstr "_Rastuće"
+
+#: ../src/MediaPage.vala:509 ../src/library/LibraryWindow.vala:422
+msgid "Sort photos in an ascending order"
+msgstr "Sortiraj slike po rastućem poretku"
+
+#: ../src/MediaPage.vala:514 ../src/library/LibraryWindow.vala:428
+msgid "D_escending"
+msgstr "_Opadajući"
+
+#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:429
+msgid "Sort photos in a descending order"
+msgstr "Sortiraj slike po opadajućem poretku"
+
+#: ../src/MediaPage.vala:716
+#, c-format
+msgid ""
+"Shotwell was unable to play the selected video:\n"
+"%s"
+msgstr ""
+"Shotwell nije uspio da pusti izabrani video snimak:\n"
+"%s"
+
+#: ../src/Page.vala:1263
+msgid "No photos/videos"
+msgstr "Nema fotografija/videa"
+
+#: ../src/Page.vala:1267
+msgid "No photos/videos found"
+msgstr "Nema pronađenih fotografija/videa"
+
+#: ../src/Page.vala:2565
+msgid "Photos cannot be exported to this directory."
+msgstr "Slike ne mogu biti izvezene u ovaj direktorij."
+
+#: ../src/Photo.vala:3753
+msgid "modified"
+msgstr "izmijenjeno"
+
+#. previous button
+#: ../src/PhotoPage.vala:533
+msgid "Previous photo"
+msgstr "Prethodna slika"
+
+#. next button
+#: ../src/PhotoPage.vala:539
+msgid "Next photo"
+msgstr "Slijedeća slika"
+
+#: ../src/PhotoPage.vala:1847
+#, c-format
+msgid "Photo source file missing: %s"
+msgstr "Izvorna datoteka slike %s više ne postoji."
+
+#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
+#: ../src/library/LibraryWindow.vala:359
+msgid "_View"
+msgstr "_Pregled"
+
+#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
+msgid "T_ools"
+msgstr "_Alati"
+
+#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
+msgid "_Previous Photo"
+msgstr "_Prethodna slika"
+
+#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
+msgid "Previous Photo"
+msgstr "Prethodna slika"
+
+#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
+msgid "_Next Photo"
+msgstr "_Slijedeća slika"
+
+#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
+msgid "Next Photo"
+msgstr "Slijedeća slika"
+
+#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
+msgid "Increase the magnification of the photo"
+msgstr "Uvećaj prikaz slike"
+
+#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
+msgid "Decrease the magnification of the photo"
+msgstr "Umanji prikaz slike"
+
+#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
+msgid "Fit to _Page"
+msgstr "Prilagodi za _stranicu"
+
+#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
+msgid "Zoom the photo to fit on the screen"
+msgstr "Prikaži sliku tako da se cijela vidi na ekranu"
+
+#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
+#, no-c-format
+msgid "Zoom _100%"
+msgstr "Uvećaj na _100%"
+
+#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
+#, no-c-format
+msgid "Zoom the photo to 100% magnification"
+msgstr "Prikaži sliku u punoj rezoluciji"
+
+#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
+#, no-c-format
+msgid "Zoom _200%"
+msgstr "Uvećaj na _200%"
+
+#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
+#, no-c-format
+msgid "Zoom the photo to 200% magnification"
+msgstr "Prikaži sliku uvećanu za duplo"
+
+#: ../src/PhotoPage.vala:3231
+#, c-format
+msgid "Unable to export %s: %s"
+msgstr "Nije uspjeo izvoz %s: %s"
+
+#: ../src/Printing.vala:255
+msgid "Fill the entire page"
+msgstr "Raširi na cijelu stranu"
+
+#: ../src/Printing.vala:256
+msgid "2 images per page"
+msgstr "2 slike po strani"
+
+#: ../src/Printing.vala:257
+msgid "4 images per page"
+msgstr "4 slike po strani"
+
+#: ../src/Printing.vala:258
+msgid "6 images per page"
+msgstr "6 slika po strani"
+
+#: ../src/Printing.vala:259
+msgid "8 images per page"
+msgstr "8 slika po strani"
+
+#: ../src/Printing.vala:260
+msgid "16 images per page"
+msgstr "16 slika po strani"
+
+#: ../src/Printing.vala:261
+msgid "32 images per page"
+msgstr "32 slike po strani"
+
+#: ../src/Printing.vala:348
+msgid "in."
+msgstr "inč."
+
+#: ../src/Printing.vala:349
+msgid "cm"
+msgstr "cm"
+
+#: ../src/Printing.vala:817 ../src/editing_tools/EditingTools.vala:761
+msgid "Wallet (2 x 3 in.)"
+msgstr "Novčanik (2 x 3 inča)"
+
+#: ../src/Printing.vala:820 ../src/editing_tools/EditingTools.vala:762
+msgid "Notecard (3 x 5 in.)"
+msgstr "Zabilješka (3 x 5 inča)"
+
+#: ../src/Printing.vala:823 ../src/editing_tools/EditingTools.vala:763
+msgid "4 x 6 in."
+msgstr "4 x 6 inča."
+
+#: ../src/Printing.vala:826 ../src/editing_tools/EditingTools.vala:764
+msgid "5 x 7 in."
+msgstr "5 x 7 inča."
+
+#: ../src/Printing.vala:829 ../src/editing_tools/EditingTools.vala:765
+msgid "8 x 10 in."
+msgstr "8 x 10 inča."
+
+#: ../src/Printing.vala:832 ../src/editing_tools/EditingTools.vala:767
+msgid "11 x 14 in."
+msgstr "11 x 14 inča."
+
+#: ../src/Printing.vala:835 ../src/editing_tools/EditingTools.vala:769
+msgid "16 x 20 in."
+msgstr "16 x 20 inča."
+
+#: ../src/Printing.vala:841 ../src/editing_tools/EditingTools.vala:771
+msgid "Metric Wallet (9 x 13 cm)"
+msgstr "Metrički novčanik (9 x 13 cm)"
+
+#: ../src/Printing.vala:844 ../src/editing_tools/EditingTools.vala:772
+msgid "Postcard (10 x 15 cm)"
+msgstr "Čestitka (10 x 15 cm)"
+
+#: ../src/Printing.vala:847 ../src/editing_tools/EditingTools.vala:773
+msgid "13 x 18 cm"
+msgstr "13 x 18 cm"
+
+#: ../src/Printing.vala:850 ../src/editing_tools/EditingTools.vala:774
+msgid "18 x 24 cm"
+msgstr "18 x 24 cm"
+
+#: ../src/Printing.vala:853 ../src/editing_tools/EditingTools.vala:776
+msgid "20 x 30 cm"
+msgstr "20 x 30 cm"
+
+#: ../src/Printing.vala:856 ../src/editing_tools/EditingTools.vala:777
+msgid "24 x 40 cm"
+msgstr "24 x 40 cm"
+
+#: ../src/Printing.vala:859 ../src/editing_tools/EditingTools.vala:778
+msgid "30 x 40 cm"
+msgstr "30 x 40 cm"
+
+#: ../src/Printing.vala:875
+msgid "Image Settings"
+msgstr "Postavke slike"
+
+#: ../src/Printing.vala:888
+msgid "Printing..."
+msgstr "Ispis ..."
+
+#: ../src/Printing.vala:908 ../src/Printing.vala:1111
+#, c-format
+msgid ""
+"Unable to print photo:\n"
+"\n"
+"%s"
+msgstr ""
+"Neuspjelo printanje slike:\n"
+"\n"
+"%s"
+
+#: ../src/Properties.vala:84
+msgid "Today"
+msgstr "Danas"
+
+#: ../src/Properties.vala:86
+msgid "Yesterday"
+msgstr "Jučer"
+
+#: ../src/Properties.vala:227 ../src/camera/ImportPage.vala:312
+msgid "RAW+JPEG"
+msgstr "RAW+JPEG"
+
+#: ../src/Properties.vala:343
+msgid "Items:"
+msgstr "Stavke:"
+
+#         translations.
+#: ../src/Properties.vala:346
+#, c-format
+msgid "%d Event"
+msgid_plural "%d Events"
+msgstr[0] "%d događaj"
+msgstr[1] "%d događaja"
+msgstr[2] "%d događaja"
+
+#         translations.
+#: ../src/Properties.vala:353 ../src/events/EventDirectoryItem.vala:87
+#, c-format
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] "%d slika"
+msgstr[1] "%d slike"
+msgstr[2] "%d slika"
+
+#         translations.
+#: ../src/Properties.vala:355 ../src/events/EventDirectoryItem.vala:85
+#, c-format
+msgid "%d Video"
+msgid_plural "%d Videos"
+msgstr[0] "%d video snimak"
+msgstr[1] "%d video snimka"
+msgstr[2] "%d video snimaka"
+
+#. display only one date if start and end are the same
+#: ../src/Properties.vala:377
+msgid "Date:"
+msgstr "Datum:"
+
+#. display only one time if start and end are the same
+#: ../src/Properties.vala:381
+msgid "Time:"
+msgstr "Vrijeme:"
+
+#. display time range
+#. display date range
+#: ../src/Properties.vala:384 ../src/Properties.vala:389
+msgid "From:"
+msgstr "Od:"
+
+#: ../src/Properties.vala:385 ../src/Properties.vala:390
+msgid "To:"
+msgstr "Za:"
+
+#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1890
+msgid "Size:"
+msgstr "Veličina:"
+
+#: ../src/Properties.vala:404
+msgid "Duration:"
+msgstr "Trajanje:"
+
+#: ../src/Properties.vala:404
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f sekundi"
+
+#: ../src/Properties.vala:408
+msgid "Developer:"
+msgstr "Razvio:"
+
+#. fit both on the top linije, emit and move on
+#: ../src/Properties.vala:436 ../src/Properties.vala:440
+#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2258
+msgid "Exposure:"
+msgstr "Izloženost:"
+
+#. nothing special to bje donje for now for Events
+#: ../src/Properties.vala:583
+msgid "Location:"
+msgstr "Lokacija:"
+
+#: ../src/Properties.vala:586
+msgid "File size:"
+msgstr "Veličina datoteke:"
+
+#: ../src/Properties.vala:590
+msgid "Current Development:"
+msgstr "Trenutni razvoj:"
+
+#: ../src/Properties.vala:592
+msgid "Original dimensions:"
+msgstr "Izvorne dimenzije:"
+
+#: ../src/Properties.vala:595
+msgid "Camera make:"
+msgstr "Marka fotoaparata:"
+
+#: ../src/Properties.vala:598
+msgid "Camera model:"
+msgstr "Model fotoaparata:"
+
+#: ../src/Properties.vala:601
+msgid "Flash:"
+msgstr "Blic:"
+
+#: ../src/Properties.vala:603
+msgid "Focal length:"
+msgstr "Žižna daljina:"
+
+#: ../src/Properties.vala:606
+msgid "Exposure date:"
+msgstr "Datum ekspozicije:"
+
+#: ../src/Properties.vala:609
+msgid "Exposure time:"
+msgstr "Vrijeme ekspozicije:"
+
+#: ../src/Properties.vala:612
+msgid "Exposure bias:"
+msgstr "Kompenzacija ekspozicije:"
+
+#: ../src/Properties.vala:614
+msgid "GPS latitude:"
+msgstr "Geografska širina:"
+
+#: ../src/Properties.vala:617
+msgid "GPS longitude:"
+msgstr "Geografska dužina:"
+
+#: ../src/Properties.vala:620
+msgid "Artist:"
+msgstr "Izvođač:"
+
+#: ../src/Properties.vala:622
+msgid "Copyright:"
+msgstr "Autorska prava:"
+
+#: ../src/Properties.vala:624
+msgid "Software:"
+msgstr "Verzija programa:"
+
+#: ../src/Properties.vala:639
+msgid "Extended Information"
+msgstr "Dodatni podaci"
+
+#: ../src/Resources.vala:17
+msgid "Photo Manager"
+msgstr "Organizator Slika"
+
+#: ../src/Resources.vala:18
+msgid "Photo Viewer"
+msgstr "Preglednik fotografija"
+
+#: ../src/Resources.vala:144
+msgid "Rotate _Right"
+msgstr "Rotiraj _desno"
+
+#: ../src/Resources.vala:145 ../src/Resources.vala:150
+msgid "Rotate"
+msgstr "Rotiraj"
+
+#: ../src/Resources.vala:146
+msgid "Rotate Right"
+msgstr "Rotiraj desno"
+
+#: ../src/Resources.vala:147
+msgid "Rotate the photos right (press Ctrl to rotate left)"
+msgstr "Okreće slike na desno (pritisni Ctrl za okretanje na lijevo)"
+
+#: ../src/Resources.vala:149
+msgid "Rotate _Left"
+msgstr "Rotiraj _lijevo"
+
+#: ../src/Resources.vala:151
+msgid "Rotate Left"
+msgstr "Rotiraj lijevo"
+
+#: ../src/Resources.vala:152
+msgid "Rotate the photos left"
+msgstr "Okreni slike lijevo"
+
+#: ../src/Resources.vala:154
+msgid "Flip Hori_zontally"
+msgstr "Izvrni _vodoravno"
+
+#: ../src/Resources.vala:155
+msgid "Flip Horizontally"
+msgstr "Izvrni vodoravno"
+
+#: ../src/Resources.vala:157
+msgid "Flip Verti_cally"
+msgstr "Izvrni verti_kalno"
+
+#: ../src/Resources.vala:158
+msgid "Flip Vertically"
+msgstr "Izvrni vertikalno"
+
+#: ../src/Resources.vala:160
+msgid "_About"
+msgstr "_O programu"
+
+#: ../src/Resources.vala:161
+msgid "_Apply"
+msgstr "_Primijeni"
+
+#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
+#: ../src/library/LibraryWindow.vala:355
+msgid "_Edit"
+msgstr "_Izmijeni..."
+
+#: ../src/Resources.vala:165
+msgid "_Forward"
+msgstr "_Naprijed"
+
+#: ../src/Resources.vala:166
+msgid "Fulls_creen"
+msgstr "Preko _cijelog ekrana"
+
+#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
+#: ../src/library/LibraryWindow.vala:379
+msgid "_Help"
+msgstr "_Pomoć"
+
+#: ../src/Resources.vala:168
+msgid "Leave _Fullscreen"
+msgstr "Napusti _prikaz preko cijelog ekrana"
+
+#: ../src/Resources.vala:169 ../src/Resources.vala:371
+msgid "_New"
+msgstr "_Novi"
+
+#: ../src/Resources.vala:170
+msgid "_Next"
+msgstr "_Sljedeća"
+
+#: ../src/Resources.vala:171
+msgid "_OK"
+msgstr "_U redu"
+
+#: ../src/Resources.vala:172
+msgid "_Play"
+msgstr "_Izvedi"
+
+#: ../src/Resources.vala:173 ../src/Resources.vala:325
+msgid "_Preferences"
+msgstr "_Podešavanja"
+
+#: ../src/Resources.vala:174
+msgid "_Previous"
+msgstr "_Prethodno"
+
+#: ../src/Resources.vala:175
+msgid "_Print"
+msgstr "Š_tampaj"
+
+#: ../src/Resources.vala:176
+msgid "_Quit"
+msgstr "_Izlaz"
+
+#: ../src/Resources.vala:177
+msgid "_Refresh"
+msgstr "_Osvježi"
+
+#: ../src/Resources.vala:179
+msgid "_Revert"
+msgstr "_Vrati"
+
+#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save"
+msgstr "_Sačuvaj"
+
+#: ../src/Resources.vala:181
+msgid "Save _As"
+msgstr "Snimi _Kao"
+
+#: ../src/Resources.vala:182
+msgid "Sort _Ascending"
+msgstr "Razvrstaj _rastuće"
+
+#: ../src/Resources.vala:183
+msgid "Sort _Descending"
+msgstr "Razvrstaj _opadajuće"
+
+#: ../src/Resources.vala:184
+msgid "_Stop"
+msgstr "_Zaustavi"
+
+#: ../src/Resources.vala:185
+msgid "_Undelete"
+msgstr "_Vrati obrisano"
+
+#: ../src/Resources.vala:186
+msgid "_Normal Size"
+msgstr "_Normalna veličina"
+
+#: ../src/Resources.vala:187
+msgid "Best _Fit"
+msgstr "Naj_bolje uklapanje"
+
+#: ../src/Resources.vala:191
+msgid "_Enhance"
+msgstr "_Poboljšaj"
+
+#: ../src/Resources.vala:192
+msgid "Enhance"
+msgstr "Poboljšaj"
+
+#: ../src/Resources.vala:193
+msgid "Automatically improve the photo's appearance"
+msgstr "Automatski unaprijedi izgled slike"
+
+#: ../src/Resources.vala:195
+msgid "_Copy Color Adjustments"
+msgstr "_Kopiraj prilagođenje boja"
+
+#: ../src/Resources.vala:196
+msgid "Copy Color Adjustments"
+msgstr "Kopiraj prilagođenje boja"
+
+#: ../src/Resources.vala:197
+msgid "Copy the color adjustments applied to the photo"
+msgstr "Kopiraj prilagođenje boja primijenjenih na fotografiju"
+
+#: ../src/Resources.vala:199
+msgid "_Paste Color Adjustments"
+msgstr "_Umetni prilagođenje boja"
+
+#: ../src/Resources.vala:200
+msgid "Paste Color Adjustments"
+msgstr "Umetni prilagođenje boja"
+
+#: ../src/Resources.vala:201
+msgid "Apply copied color adjustments to the selected photos"
+msgstr "Primijeni prilagođenje boja na izabrane fotografije"
+
+#: ../src/Resources.vala:203
+msgid "_Crop"
+msgstr "_Isijeci"
+
+#: ../src/Resources.vala:204
+msgid "Crop"
+msgstr "Isijeci"
+
+#: ../src/Resources.vala:205
+msgid "Crop the photo's size"
+msgstr "Smanjivanje veličine slike"
+
+#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
+msgid "_Straighten"
+msgstr "_Ispravi"
+
+#: ../src/Resources.vala:208
+msgid "Straighten"
+msgstr "Ispravi"
+
+#: ../src/Resources.vala:209
+msgid "Straighten the photo"
+msgstr "Ispravi sliku"
+
+#: ../src/Resources.vala:211
+msgid "_Red-eye"
+msgstr "_Uklanjanje crvenih očiju"
+
+#: ../src/Resources.vala:212
+msgid "Red-eye"
+msgstr "Uklanjanje crvenih očiju"
+
+#: ../src/Resources.vala:213
+msgid "Reduce or eliminate any red-eye effects in the photo"
+msgstr "Smanjuje i uklanja efekat crvenih očiju sa slike"
+
+#: ../src/Resources.vala:215
+msgid "_Adjust"
+msgstr "_Podesi"
+
+#: ../src/Resources.vala:216
+msgid "Adjust"
+msgstr "Podesi"
+
+#: ../src/Resources.vala:217
+msgid "Adjust the photo's color and tone"
+msgstr "Podesi boje i ton slike"
+
+#: ../src/Resources.vala:219
+msgid "Re_vert to Original"
+msgstr "V_rati na original"
+
+#: ../src/Resources.vala:220
+msgid "Revert to Original"
+msgstr "Vrati na original"
+
+#: ../src/Resources.vala:222
+msgid "Revert External E_dits"
+msgstr "Vrati na _izmijenjenu sliku"
+
+#: ../src/Resources.vala:223
+msgid "Revert to the master photo"
+msgstr "Povrati izvornu sliku"
+
+#: ../src/Resources.vala:225
+msgid "Set as _Desktop Background"
+msgstr "Postavi kao _pozadinu radne površine"
+
+#: ../src/Resources.vala:226
+msgid "Set selected image to be the new desktop background"
+msgstr "Postavlja izabranu sliku kao vašu novu pozadinu radne površine"
+
+#: ../src/Resources.vala:227
+msgid "Set as _Desktop Slideshow..."
+msgstr "Postavi kao promjenjivu _pozadinsku sliku..."
+
+#: ../src/Resources.vala:229
+msgid "_Undo"
+msgstr "_Poništi"
+
+#: ../src/Resources.vala:230
+msgid "Undo"
+msgstr "Poništi"
+
+#: ../src/Resources.vala:232
+msgid "_Redo"
+msgstr "_Ponovi"
+
+#: ../src/Resources.vala:233
+msgid "Redo"
+msgstr "Vrati"
+
+#: ../src/Resources.vala:235
+msgid "Re_name Event..."
+msgstr "_Preimenuj događaj..."
+
+#: ../src/Resources.vala:238
+msgid "Make _Key Photo for Event"
+msgstr "Postavite kao _ključnu sliku za ovaj događaj"
+
+#: ../src/Resources.vala:239
+msgid "Make Key Photo for Event"
+msgstr "Postavite kao ključnu sliku za ovaj događaj"
+
+#: ../src/Resources.vala:241
+msgid "_New Event"
+msgstr "_Novi događaj"
+
+#: ../src/Resources.vala:242
+msgid "New Event"
+msgstr "Novi događaj"
+
+#: ../src/Resources.vala:244
+msgid "Move Photos"
+msgstr "Premjesti slike"
+
+#: ../src/Resources.vala:245
+msgid "Move photos to an event"
+msgstr "Premješta slike u događaj"
+
+#: ../src/Resources.vala:247
+msgid "_Merge Events"
+msgstr "_Spoji događaje"
+
+#: ../src/Resources.vala:248
+msgid "Merge"
+msgstr "Spoji"
+
+#: ../src/Resources.vala:249
+msgid "Combine events into a single event"
+msgstr "Spajanje dva događaja u jedan"
+
+#: ../src/Resources.vala:251
+msgid "_Set Rating"
+msgstr "_Ocijeni"
+
+#: ../src/Resources.vala:252
+msgid "Set Rating"
+msgstr "Ocjeni"
+
+#: ../src/Resources.vala:253
+msgid "Change the rating of your photo"
+msgstr "Promjeni ocjenu slike"
+
+#: ../src/Resources.vala:255
+msgid "_Increase"
+msgstr "_Uvećaj"
+
+#: ../src/Resources.vala:256
+msgid "Increase Rating"
+msgstr "Uvećaj ocjenu"
+
+#: ../src/Resources.vala:258
+msgid "_Decrease"
+msgstr "_Umanji"
+
+#: ../src/Resources.vala:259
+msgid "Decrease Rating"
+msgstr "Umanji ocjenu"
+
+#: ../src/Resources.vala:261
+msgid "_Unrated"
+msgstr "_Bez ocjene"
+
+#: ../src/Resources.vala:262
+msgid "Unrated"
+msgstr "Bez ocjene"
+
+#: ../src/Resources.vala:263
+msgid "Rate Unrated"
+msgstr "Postavi kao neocijenjeno"
+
+#: ../src/Resources.vala:264
+msgid "Setting as unrated"
+msgstr "Označava da slika nije ocjenjena"
+
+#: ../src/Resources.vala:265
+msgid "Remove any ratings"
+msgstr "Skini sve ocjene"
+
+#: ../src/Resources.vala:267
+msgid "_Rejected"
+msgstr "_Odbijeno"
+
+#: ../src/Resources.vala:268
+msgid "Rejected"
+msgstr "Odbijeno"
+
+#: ../src/Resources.vala:269
+msgid "Rate Rejected"
+msgstr "Ocijeni kao odbijeno"
+
+#: ../src/Resources.vala:270
+msgid "Setting as rejected"
+msgstr "Postavi kao odbijenu"
+
+#: ../src/Resources.vala:271
+msgid "Set rating to rejected"
+msgstr "Postavi ocjenu na odbijeno"
+
+#: ../src/Resources.vala:273
+msgid "Rejected _Only"
+msgstr "Samo _odbijene"
+
+#: ../src/Resources.vala:274
+msgid "Rejected Only"
+msgstr "Samo odbijene"
+
+#: ../src/Resources.vala:275
+msgid "Show only rejected photos"
+msgstr "Prikaži samo odbijene slike"
+
+#: ../src/Resources.vala:277
+msgid "All + _Rejected"
+msgstr "Sve + _Loša"
+
+#: ../src/Resources.vala:278 ../src/Resources.vala:279
+msgid "Show all photos, including rejected"
+msgstr "Prikaži sve slike uključujući i odbijene"
+
+#: ../src/Resources.vala:281
+msgid "_All Photos"
+msgstr "_Sve slike"
+
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:283 ../src/Resources.vala:285
+msgid "Show all photos"
+msgstr "Prikaži sve slike"
+
+#: ../src/Resources.vala:287
+msgid "_Ratings"
+msgstr "_Ocjene"
+
+#: ../src/Resources.vala:288
+msgid "Display each photo's rating"
+msgstr "Prikaži ocjene svih slika"
+
+#: ../src/Resources.vala:290
+msgid "_Filter Photos"
+msgstr "_Filtrirane slike"
+
+#: ../src/Resources.vala:291
+msgid "Filter Photos"
+msgstr "Filtriranje slike"
+
+#: ../src/Resources.vala:292
+msgid "Limit the number of photos displayed based on a filter"
+msgstr "Ograniči broj slika koje se prikazuju na osnovu filtera"
+
+#: ../src/Resources.vala:294
+msgid "_Duplicate"
+msgstr "_Dupliciraj"
+
+#: ../src/Resources.vala:295
+msgid "Duplicate"
+msgstr "Dupliciraj"
+
+#: ../src/Resources.vala:296
+msgid "Make a duplicate of the photo"
+msgstr "Napravi duplikat slike"
+
+#: ../src/Resources.vala:298
+msgid "_Export..."
+msgstr "_Izvoz..."
+
+#: ../src/Resources.vala:300
+msgid "_Print..."
+msgstr "_Ispis..."
+
+#: ../src/Resources.vala:302
+msgid "Pu_blish..."
+msgstr "_Objavi..."
+
+#: ../src/Resources.vala:304
+msgid "Publish to various websites"
+msgstr "Objavi izabrane slike na različitim sajtovima"
+
+#: ../src/Resources.vala:306
+msgid "Edit _Title..."
+msgstr "Izmijeni _naslov ..."
+
+#: ../src/Resources.vala:310
+msgid "Edit _Comment..."
+msgstr "Uredi _komentar..."
+
+#. Button label
+#: ../src/Resources.vala:312
+msgid "Edit Comment"
+msgstr "Uredi komentar"
+
+#: ../src/Resources.vala:314
+msgid "Edit Event _Comment..."
+msgstr "Uredi _komentare događaja..."
+
+#: ../src/Resources.vala:317
+msgid "_Adjust Date and Time..."
+msgstr "_Podesi datum i vrijeme..."
+
+#: ../src/Resources.vala:318
+msgid "Adjust Date and Time"
+msgstr "Podesi datum i vrijeme"
+
+#: ../src/Resources.vala:320
+msgid "Add _Tags..."
+msgstr "Dodaj _oznake ..."
+
+#: ../src/Resources.vala:321
+msgid "_Add Tags..."
+msgstr "_Dodaj oznake..."
+
+#. Dialog title
+#. Undo/Redo command nami (in Edit mijenu)
+#: ../src/Resources.vala:323 ../src/Resources.vala:356
+msgid "Add Tags"
+msgstr "Dodaj oznake"
+
+#: ../src/Resources.vala:327
+msgid "Open With E_xternal Editor"
+msgstr "_Otvori u spoljnom uređivaču slika"
+
+#: ../src/Resources.vala:329
+msgid "Open With RA_W Editor"
+msgstr "Otvori u uređivaču RA_W slika"
+
+#: ../src/Resources.vala:331
+msgid "Send _To..."
+msgstr "Pošalji _na..."
+
+#: ../src/Resources.vala:332
+msgid "Send T_o..."
+msgstr "Pošalji _na..."
+
+#: ../src/Resources.vala:334
+msgid "_Find..."
+msgstr "_Nađi..."
+
+#: ../src/Resources.vala:335
+msgid "Find"
+msgstr "Nađi"
+
+#: ../src/Resources.vala:336
+msgid "Find an image by typing text that appears in its name or tags"
+msgstr "Nađi slike unoseći tekst koji se pojavljuje u imenu ili oznaci"
+
+#: ../src/Resources.vala:338
+msgid "_Flag"
+msgstr "_Obilježi"
+
+#: ../src/Resources.vala:340
+msgid "Un_flag"
+msgstr "_Skini obilježje"
+
+#: ../src/Resources.vala:343
+#, c-format
+msgid "Unable to launch editor: %s"
+msgstr "Neuspjelo pokretanje uređivača slika: %s"
+
+#: ../src/Resources.vala:348
+#, c-format
+msgid "Add Tag \"%s\""
+msgstr "Dodaj oznaku \"%s\""
+
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:351
+#, c-format
+msgid "Add Tags \"%s\" and \"%s\""
+msgstr "Dodaj oznake \"%s\" i \"%s\""
+
+#: ../src/Resources.vala:361
+#, c-format
+msgid "_Delete Tag \"%s\""
+msgstr "_Izbriši oznaku \"%s\""
+
+#: ../src/Resources.vala:365
+#, c-format
+msgid "Delete Tag \"%s\""
+msgstr "Izbriši oznaku \"%s\""
+
+#: ../src/Resources.vala:368
+msgid "Delete Tag"
+msgstr "Ukloni oznaku"
+
+#: ../src/Resources.vala:374
+#, c-format
+msgid "Re_name Tag \"%s\"..."
+msgstr "_Preimenuj oznaku \"%s\"..."
+
+#: ../src/Resources.vala:378
+#, c-format
+msgid "Rename Tag \"%s\" to \"%s\""
+msgstr "Preimenuj oznaku \"%s\" u \"%s\""
+
+#: ../src/Resources.vala:381
+msgid "_Rename..."
+msgstr "_Preimenuj..."
+
+#: ../src/Resources.vala:383
+msgid "Modif_y Tags..."
+msgstr "Izmjena _oznaka ..."
+
+#: ../src/Resources.vala:384
+msgid "Modify Tags"
+msgstr "Izmjena oznaka"
+
+#: ../src/Resources.vala:387
+#, c-format
+msgid "Tag Photo as \"%s\""
+msgstr "Označi sliku kao \"%s\""
+
+#: ../src/Resources.vala:387
+#, c-format
+msgid "Tag Photos as \"%s\""
+msgstr "Označi fotografije kao „%s“"
+
+#: ../src/Resources.vala:391
+#, c-format
+msgid "Tag the selected photo as \"%s\""
+msgstr "Označi izabranu fotografiju kao \"%s\""
+
+#: ../src/Resources.vala:392
+#, c-format
+msgid "Tag the selected photos as \"%s\""
+msgstr "Označi izabrane fotografije kao „%s“"
+
+#: ../src/Resources.vala:396
+#, c-format
+msgid "Remove Tag \"%s\" From _Photo"
+msgstr "Ukloni oznaku \"%s\" sa _fotografije"
+
+#: ../src/Resources.vala:397
+#, c-format
+msgid "Remove Tag \"%s\" From _Photos"
+msgstr "Ukloni oznaku „%s“ sa _fotografija"
+
+#: ../src/Resources.vala:401
+#, c-format
+msgid "Remove Tag \"%s\" From Photo"
+msgstr "Ukloni oznaku \"%s\" sa fotografije"
+
+#: ../src/Resources.vala:402
+#, c-format
+msgid "Remove Tag \"%s\" From Photos"
+msgstr "Ukloni oznaku „%s“ sa fotografija"
+
+#: ../src/Resources.vala:406
+#, c-format
+msgid "Unable to rename tag to \"%s\" because the tag already exists."
+msgstr ""
+"Nije uspjela promjena oznake na \"%s\" jer već postoji oznaka sa tim nazivom."
+
+#: ../src/Resources.vala:410
+#, c-format
+msgid "Unable to rename search to \"%s\" because the search already exists."
+msgstr "Nije uspjela promjena pretrage na \"%s\" jer ta pretraga već postoji."
+
+#: ../src/Resources.vala:413
+msgid "Saved Search"
+msgstr "Sačuvana pretraga"
+
+#: ../src/Resources.vala:415
+msgid "Delete Search"
+msgstr "Obriši pretragu"
+
+#: ../src/Resources.vala:418
+msgid "_Edit..."
+msgstr "_Izmijeni..."
+
+#: ../src/Resources.vala:419
+msgid "Re_name..."
+msgstr "_Preimenuj..."
+
+#: ../src/Resources.vala:422
+#, c-format
+msgid "Rename Search \"%s\" to \"%s\""
+msgstr "Preimenuj pretragu \"%s\" u \"%s\""
+
+#: ../src/Resources.vala:426
+#, c-format
+msgid "Delete Search \"%s\""
+msgstr "Obriši pretragu \"%s\""
+
+#: ../src/Resources.vala:584
+#, c-format
+msgid "Rate %s"
+msgstr "Ocijeni %s"
+
+#: ../src/Resources.vala:585
+#, c-format
+msgid "Set rating to %s"
+msgstr "Ocijeni %s"
+
+#: ../src/Resources.vala:586
+#, c-format
+msgid "Setting rating to %s"
+msgstr "Ocijenjujem %s"
+
+#: ../src/Resources.vala:588
+#, c-format
+msgid "Display %s"
+msgstr "Prikaži %s"
+
+#: ../src/Resources.vala:589
+#, c-format
+msgid "Only show photos with a rating of %s"
+msgstr "Prikazuje samo slike sa ocjenom %s"
+
+#: ../src/Resources.vala:590
+#, c-format
+msgid "%s or Better"
+msgstr "%s ili bolje"
+
+#: ../src/Resources.vala:591
+#, c-format
+msgid "Display %s or Better"
+msgstr "Prikaži %s ili više"
+
+#: ../src/Resources.vala:592
+#, c-format
+msgid "Only show photos with a rating of %s or better"
+msgstr "Prikazuje samo slike sa ocjenom %s ili više"
+
+#: ../src/Resources.vala:683
+msgid "Remove the selected photos from the trash"
+msgstr "Uklanja izabrane slike iz kante"
+
+#: ../src/Resources.vala:684
+msgid "Remove the selected photos from the library"
+msgstr "Uklanja izabrane slike iz biblioteke"
+
+#: ../src/Resources.vala:686
+msgid "_Restore"
+msgstr "_Povrati"
+
+#: ../src/Resources.vala:687
+msgid "Move the selected photos back into the library"
+msgstr "Premješta izabrane slike nazad u biblioteku"
+
+#: ../src/Resources.vala:689
+msgid "Show in File Mana_ger"
+msgstr "Prikaži u _upravitelju datoteka"
+
+#: ../src/Resources.vala:690
+msgid "Open the selected photo's directory in the file manager"
+msgstr "Otvori direktorij izabranih slika u upravitelju datoteka"
+
+#: ../src/Resources.vala:693
+#, c-format
+msgid "Unable to open in file manager: %s"
+msgstr "Neuspjelo otvaranje upravitelja datoteka: %s"
+
+#: ../src/Resources.vala:696
+msgid "R_emove From Library"
+msgstr "U_kloni iz biblioteke"
+
+#: ../src/Resources.vala:698
+msgid "_Move to Trash"
+msgstr "Premjesti u sme_će"
+
+#: ../src/Resources.vala:700
+msgid "Select _All"
+msgstr "Odaberi _Sve"
+
+#: ../src/Resources.vala:701
+msgid "Select all items"
+msgstr "Izaberi sv_e stavke"
+
+#. ...precache the timestamp string...
+#. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
+#. / Seje http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:780
+msgid "%-I:%M %p"
+msgstr "%-I:%M %p"
+
+#. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
+#. / Seje http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:785
+msgid "%-I:%M:%S %p"
+msgstr "%-I:%M:%S %p"
+
+#. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
+#. / Seje http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:789
+msgid "%a %b %d, %Y"
+msgstr "%a %b %d, %Y"
+
+#. / Locale-specific starting date format for multi-date strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
+#. / Seje http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#. / Locale-specific calendar date format for multi-month strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
+#. / Seje http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:794 ../src/Resources.vala:804
+msgid "%a %b %d"
+msgstr "%a %b %d"
+
+#. / Locale-specific ending date format for multi-date strings,
+#. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
+#. / Seje http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:799
+msgid "%d, %Y"
+msgstr "%d, %Y"
+
+#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
+msgid "Slideshow"
+msgstr "Prikaz slajdova"
+
+#. Flagged label and toggle
+#: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
+#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
+msgid "Flagged"
+msgstr "Označeno"
+
+#: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
+msgid "Photos"
+msgstr "Fotografije"
+
+#: ../src/SearchFilter.vala:599 ../src/SearchFilter.vala:600
+msgid "Videos"
+msgstr "Videi"
+
+#: ../src/SearchFilter.vala:605
+msgid "RAW Photos"
+msgstr "RAW fotografije"
+
+#: ../src/SearchFilter.vala:606
+msgid "RAW photos"
+msgstr "RAW fotografije"
+
+#: ../src/SearchFilter.vala:934
+#, c-format
+msgid "Error loading UI file %s: %s"
+msgstr "Greška prilikom učitavanja UI datoteke %s: %s"
+
+#. Ticket #3260 - Add a 'close' context mijenu to
+#. the searchbar.
+#. Prepare the close mijenu for usi, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: ../src/SearchFilter.vala:945
+msgid "Close"
+msgstr "Zatvori"
+
+#. Type label and toggles
+#: ../src/SearchFilter.vala:951
+msgid "Type"
+msgstr "Tip:"
+
+#. Rating label and button
+#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
+msgid "Rating"
+msgstr "Ocjena"
+
+#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
+msgid "Settings"
+msgstr "Postavke"
+
+#. Set up toolbar
+#. add toolbar buttons
+#: ../src/SlideshowPage.vala:160
+msgid "Back"
+msgstr "Nazad"
+
+#: ../src/SlideshowPage.vala:162
+msgid "Go to the previous photo"
+msgstr "Idi na prethodnu sliku"
+
+#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
+msgid "Pause"
+msgstr "Pauza"
+
+#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
+msgid "Pause the slideshow"
+msgstr "Pauziraj prikaz slajdova"
+
+#: ../src/SlideshowPage.vala:174
+msgid "Next"
+msgstr "Slijedeći"
+
+#: ../src/SlideshowPage.vala:176
+msgid "Go to the next photo"
+msgstr "Idi na slijedeću sliku"
+
+#: ../src/SlideshowPage.vala:184
+msgid "Change slideshow settings"
+msgstr "Mijenja postavke prikaza slajdova"
+
+#. An entire slideshow set might bje missing, so check for a loop.
+#: ../src/SlideshowPage.vala:238
+msgid "All photo source files are missing."
+msgstr "Ne postoji nijedna datoteka sa slikom."
+
+#: ../src/SlideshowPage.vala:270
+msgid "Play"
+msgstr "Pusti"
+
+#: ../src/SlideshowPage.vala:271
+msgid "Continue the slideshow"
+msgstr "Nastavi prikaz slajdova"
+
+#: ../src/Tag.vala:817
+msgid "untitled"
+msgstr "bez naslova"
+
+#. multiple videos
+#: ../src/VideoSupport.vala:489
+msgid "Export Videos"
+msgstr "Izvoz video snimaka"
+
+#: ../src/camera/Branch.vala:85
+msgid "Cameras"
+msgstr "Kamere"
+
+#: ../src/camera/ImportPage.vala:459
+msgid ""
+"Unable to unmount camera.  Try unmounting the camera from the file manager."
+msgstr ""
+"Neuspješno demontiranje kamere. Probajte da je demontirate preko menadžera "
+"datoteka."
+
+#. hide duplicates checkbox
+#: ../src/camera/ImportPage.vala:776
+msgid "Hide photos already imported"
+msgstr "Sakrij slike koje su već uvežene"
+
+#: ../src/camera/ImportPage.vala:777
+msgid "Only display photos that have not been imported"
+msgstr "Prikaži samo slike koje nisu uvežene"
+
+#. Ticket #3304 - Import page shouldn't display confusing message
+#. prior to import.
+#. TODO: replace this with approved text for "talking to camera,
+#. please wait" once new strings are being accepted.
+#: ../src/camera/ImportPage.vala:847
+msgid "Starting import, please wait..."
+msgstr "Pokrećem uvoženje, molim sačekajte..."
+
+#: ../src/camera/ImportPage.vala:886
+msgid "Import _Selected"
+msgstr "Uvezi _izabrano"
+
+#: ../src/camera/ImportPage.vala:887
+msgid "Import the selected photos into your library"
+msgstr "Uvezi izabrane slike u vašu biblioteku"
+
+#: ../src/camera/ImportPage.vala:892
+msgid "Import _All"
+msgstr "Uvezi _sve"
+
+#: ../src/camera/ImportPage.vala:893
+msgid "Import all the photos into your library"
+msgstr "Uvozi sve slike u vašu zbirku slika"
+
+#. it's mounted, offer to unmount for the user
+#: ../src/camera/ImportPage.vala:1014
+msgid ""
+"Shotwell needs to unmount the camera from the filesystem in order to access "
+"it.  Continue?"
+msgstr ""
+"Shotwell mora da demontira kameru sa sistema kako bi mu pristupio. Da li "
+"želite da nastavite?"
+
+#: ../src/camera/ImportPage.vala:1020
+msgid "_Unmount"
+msgstr "_Demontiraj"
+
+#: ../src/camera/ImportPage.vala:1025
+msgid "Please unmount the camera."
+msgstr "Molim Vas demontirajte kameru."
+
+#: ../src/camera/ImportPage.vala:1030
+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 ""
+"Kameru koristi neki drugi program. Morate zatvoriti taj program kako bi "
+"omogućili Shotwell-u da mu pristupi."
+
+#: ../src/camera/ImportPage.vala:1040
+msgid "Please close any other application using the camera."
+msgstr "Molim vas zatvorite sve druge programe koji koriste kameru."
+
+#: ../src/camera/ImportPage.vala:1045
+#, c-format
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
+msgstr ""
+"Neuspješno preuzimanje pregleda slika sa kamere:\n"
+"%s"
+
+#: ../src/camera/ImportPage.vala:1062
+msgid "Unmounting..."
+msgstr "Demontiram..."
+
+#: ../src/camera/ImportPage.vala:1168
+msgid "Fetching photo information"
+msgstr "Preuzimam podatke o slici"
+
+#: ../src/camera/ImportPage.vala:1523
+#, c-format
+msgid "Fetching preview for %s"
+msgstr "Preuzimam izgled slike %s"
+
+#: ../src/camera/ImportPage.vala:1639
+#, c-format
+msgid "Unable to lock camera: %s"
+msgstr "Ne mogu da zaključam kameru: %s"
+
+#         translations.
+#: ../src/camera/ImportPage.vala:1724
+#, c-format
+msgid "Delete this photo from camera?"
+msgid_plural "Delete these %d photos from camera?"
+msgstr[0] "Da li da izbrišem %d sliku sa fotoaparata?"
+msgstr[1] "Da li da izbrišem %d slike sa fotoaparata?"
+msgstr[2] "Da li da izbrišem %d slika sa fotoaparata?"
+
+#         translations.
+#: ../src/camera/ImportPage.vala:1727
+#, c-format
+msgid "Delete this video from camera?"
+msgid_plural "Delete these %d videos from camera?"
+msgstr[0] "Da li da izbrišem %d video snimak sa fotoaparata?"
+msgstr[1] "Da li da izbrišem %d video snimka sa fotoaparata?"
+msgstr[2] "Da li da izbrišem %d video snimaka sa fotoaparata?"
+
+#         translations.
+#: ../src/camera/ImportPage.vala:1730
+#, c-format
+msgid "Delete this photo/video from camera?"
+msgid_plural "Delete these %d photos/videos from camera?"
+msgstr[0] "Da li da izbrišem %d fotografiju/video snimak sa fotoaparata?"
+msgstr[1] "Da li da izbrišem %d fotografije/video snimka sa fotoaparata?"
+msgstr[2] "Da li da izbrišem %d fotografija/video snimaka sa fotoaparata?"
+
+#         translations.
+#: ../src/camera/ImportPage.vala:1733
+#, c-format
+msgid "Delete these files from camera?"
+msgid_plural "Delete these %d files from camera?"
+msgstr[0] "Obrisati ovu %d datoteku s aparata?"
+msgstr[1] "Obrisati ove %d datoteke s aparata?"
+msgstr[2] "Obrisati ovih %d datoteka s aparata?"
+
+#: ../src/camera/ImportPage.vala:1760
+msgid "Removing photos/videos from camera"
+msgstr "Uklanjam fotografije/video snimke sa fotoaparata"
+
+#         translations.
+#: ../src/camera/ImportPage.vala:1764
+#, 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] ""
+"Nisam uspio da izbrišem %d fotografiju/video snimak sa fotoaparata, usljed "
+"greške."
+msgstr[1] ""
+"Nisam uspio da izbrišem %d fotografije/video snimka sa fotoaparata, usljed "
+"greške."
+msgstr[2] ""
+"Nisam uspio da izbrišem %d fotografije/video snimaka sa fotoaparata, usljed "
+"greške."
+
+#: ../src/data_imports/DataImports.vala:22
+msgid "Data Imports"
+msgstr "Uvoz podataka"
+
+#. Send an empty job to the queue to mark the end of the import
+#: ../src/data_imports/DataImportsPluginHost.vala:65
+#: ../src/data_imports/DataImportsPluginHost.vala:78
+#, c-format
+msgid "%s Database"
+msgstr "%s Baza podataka"
+
+#: ../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 "Ne mogu da nastavim uvoz iz %s jer se pojavila slijedeća greška:"
+
+#: ../src/data_imports/DataImportsPluginHost.vala:151
+msgid "To try importing from another service, select one from the above menu."
+msgstr "Izaberite neki od servisa iz gornjeg menija za uvoz fotografija."
+
+#: ../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 ""
+"Niste uključili ni jedan dodatak za uvoz podataka.\n"
+"\n"
+"Kako bi koristili mogućnost uvoza iz programa, morate uključiti bar jedan "
+"dodatak. Dodatke možete uključiti u dijalogu postavki."
+
+#: ../src/data_imports/DataImportsUI.vala:100
+msgid "Database file:"
+msgstr "Datoteka baze podataka:"
+
+#: ../src/data_imports/DataImportsUI.vala:112
+#: ../src/library/LibraryWindow.vala:898
+msgid "_Import"
+msgstr "_Uvezi"
+
+#: ../src/data_imports/DataImportsUI.vala:217
+msgid "Import From Application"
+msgstr "Uvoz iz programa"
+
+#: ../src/data_imports/DataImportsUI.vala:369
+#: ../src/publishing/PublishingUI.vala:470
+msgid "_Close"
+msgstr "_Zatvori"
+
+#: ../src/db/DatabaseTable.vala:37
+#, c-format
+msgid "Unable to open/create photo database %s: error code %d"
+msgstr "Nije moguće otvoriti/kreirati bazu podataka za slike %s: kod greške %d"
+
+#: ../src/db/DatabaseTable.vala:46
+#, c-format
+msgid ""
+"Unable to write to photo database file:\n"
+" %s"
+msgstr ""
+"Ne mogu da pišem u datoteku baze podataka slika:\n"
+" %s"
+
+#: ../src/db/DatabaseTable.vala:48
+#, c-format
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
+msgstr ""
+"Greška prilikom pristupa datoteci baze podataka:\n"
+" %s\n"
+"\n"
+"Greška je:\n"
+"%s"
+
+#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:351
+msgid "_File"
+msgstr "_Datoteka"
+
+#: ../src/direct/DirectPhotoPage.vala:52
+msgid "Save photo"
+msgstr "Sačuvaj sliku"
+
+#: ../src/direct/DirectPhotoPage.vala:57
+msgid "Save _As..."
+msgstr "Spremi _kao..."
+
+#: ../src/direct/DirectPhotoPage.vala:58
+msgid "Save photo with a different name"
+msgstr "Spremi sliku pod drugim nazivom"
+
+#: ../src/direct/DirectPhotoPage.vala:69
+msgid "Print the photo to a printer connected to your computer"
+msgstr "Printaj sliku štampačem konektovanim na vaš računar"
+
+#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:363
+msgid "_Photo"
+msgstr "_Slika"
+
+#: ../src/direct/DirectPhotoPage.vala:227
+#, c-format
+msgid "%s does not exist."
+msgstr "%s ne postoji."
+
+#: ../src/direct/DirectPhotoPage.vala:229
+#, c-format
+msgid "%s is not a file."
+msgstr "%s nije datoteka."
+
+#: ../src/direct/DirectPhotoPage.vala:231
+#, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
+msgstr ""
+"%s ne podržava format datoteke\n"
+"%s."
+
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save a Copy"
+msgstr "_Sačuvaj kopiju"
+
+#: ../src/direct/DirectPhotoPage.vala:425
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "Zaboravi izmjene za %s?"
+
+#: ../src/direct/DirectPhotoPage.vala:426
+msgid "Close _without Saving"
+msgstr "Zatvori bez _spremanja"
+
+#: ../src/direct/DirectPhotoPage.vala:459
+#, c-format
+msgid "Error while saving to %s: %s"
+msgstr "Greška pri spremanju u %s: %s"
+
+#: ../src/direct/DirectPhotoPage.vala:487
+#: ../src/direct/DirectPhotoPage.vala:508
+msgid "Save As"
+msgstr "Sačuvaj kao"
+
+#: ../src/editing_tools/EditingTools.vala:665
+msgid "Return to current photo dimensions"
+msgstr "Vrati na postojeću veličinu slike"
+
+#: ../src/editing_tools/EditingTools.vala:668
+msgid "Set the crop for this photo"
+msgstr "Isijeci sliku"
+
+#: ../src/editing_tools/EditingTools.vala:680
+msgid "Pivot the crop rectangle between portrait and landscape orientations"
+msgstr ""
+"Mijenja orijentaciju pravougaonika za isijecanje između vodoravne i uspravne "
+"orijentacije"
+
+#: ../src/editing_tools/EditingTools.vala:753
+msgid "Unconstrained"
+msgstr "Neograničeno"
+
+#: ../src/editing_tools/EditingTools.vala:754
+msgid "Square"
+msgstr "Kvadrat"
+
+#: ../src/editing_tools/EditingTools.vala:755
+msgid "Screen"
+msgstr "Ekran"
+
+#: ../src/editing_tools/EditingTools.vala:757
+#: ../src/editing_tools/EditingTools.vala:760
+#: ../src/editing_tools/EditingTools.vala:770
+#: ../src/editing_tools/EditingTools.vala:780
+msgid "-"
+msgstr "-"
+
+#: ../src/editing_tools/EditingTools.vala:758
+msgid "SD Video (4 : 3)"
+msgstr "SD video (4 : 3)"
+
+#: ../src/editing_tools/EditingTools.vala:759
+msgid "HD Video (16 : 9)"
+msgstr "HD video (16 : 9)"
+
+#: ../src/editing_tools/EditingTools.vala:766
+msgid "Letter (8.5 x 11 in.)"
+msgstr "Pismo (8.5 x 11 in.)"
+
+#: ../src/editing_tools/EditingTools.vala:768
+msgid "Tabloid (11 x 17 in.)"
+msgstr "Tabloid (11 x 17 in.)"
+
+#: ../src/editing_tools/EditingTools.vala:775
+msgid "A4 (210 x 297 mm)"
+msgstr "A4 (210 x 297 mm)"
+
+#: ../src/editing_tools/EditingTools.vala:779
+msgid "A3 (297 x 420 mm)"
+msgstr "A3 (297×420 mm)"
+
+#: ../src/editing_tools/EditingTools.vala:1905
+msgid "Close the red-eye tool"
+msgstr "Zatvori alat za uklanjanje crvenih očiju"
+
+#: ../src/editing_tools/EditingTools.vala:1908
+msgid "Remove any red-eye effects in the selected region"
+msgstr "Ukloni efekat crvenih očiju u izabranom dijelu slike"
+
+#: ../src/editing_tools/EditingTools.vala:2244
+#: ../src/editing_tools/StraightenTool.vala:102
+msgid "_Reset"
+msgstr "_Resetuj"
+
+#: ../src/editing_tools/EditingTools.vala:2266
+msgid "Saturation:"
+msgstr "Zasićenje:"
+
+#: ../src/editing_tools/EditingTools.vala:2274
+msgid "Tint:"
+msgstr "Nijansa:"
+
+#: ../src/editing_tools/EditingTools.vala:2283
+msgid "Temperature:"
+msgstr "Temperatura:"
+
+#: ../src/editing_tools/EditingTools.vala:2291
+msgid "Shadows:"
+msgstr "Sjene:"
+
+#: ../src/editing_tools/EditingTools.vala:2299
+msgid "Highlights:"
+msgstr "Naglašeno:"
+
+#: ../src/editing_tools/EditingTools.vala:2353
+msgid "Reset Colors"
+msgstr "Povrati boje"
+
+#: ../src/editing_tools/EditingTools.vala:2353
+msgid "Reset all color adjustments to original"
+msgstr "Poništi sve promjene boja"
+
+#: ../src/editing_tools/EditingTools.vala:2705
+msgid "Temperature"
+msgstr "Temperatura"
+
+#: ../src/editing_tools/EditingTools.vala:2718
+msgid "Tint"
+msgstr "Nijansa"
+
+#: ../src/editing_tools/EditingTools.vala:2731
+msgid "Saturation"
+msgstr "Zasićenje"
+
+#: ../src/editing_tools/EditingTools.vala:2744
+msgid "Exposure"
+msgstr "Ekspozicija"
+
+#: ../src/editing_tools/EditingTools.vala:2757
+msgid "Shadows"
+msgstr "Sjene"
+
+#: ../src/editing_tools/EditingTools.vala:2770
+msgid "Highlights"
+msgstr "Naglašeno"
+
+#: ../src/editing_tools/EditingTools.vala:2780
+msgid "Contrast Expansion"
+msgstr "Ekspanzija kontrasta"
+
+#: ../src/editing_tools/StraightenTool.vala:99
+msgid "Angle:"
+msgstr "Ugao:"
+
+#         translations.
+#: ../src/events/EventDirectoryItem.vala:83
+#, c-format
+msgid "%d Photo/Video"
+msgid_plural "%d Photos/Videos"
+msgstr[0] "%d fotografija/video snimak"
+msgstr[1] "%d fotografije/video snimka"
+msgstr[2] "%d fotografija/video snimaka"
+
+#: ../src/events/EventPage.vala:129
+msgid "No Event"
+msgstr "Bez događaja"
+
+#: ../src/events/EventsDirectoryPage.vala:131
+msgid "Display the comment of each event"
+msgstr "Prikaz komentara na svakom događaju"
+
+#: ../src/events/EventsDirectoryPage.vala:155
+msgid "No events"
+msgstr "Bez događaja"
+
+#: ../src/events/EventsDirectoryPage.vala:159
+msgid "No events found"
+msgstr "Nije pronađen nijedan događaj"
+
+#: ../src/events/EventsDirectoryPage.vala:230
+msgid "Events"
+msgstr "Događaji"
+
+#: ../src/events/EventsDirectoryPage.vala:244
+msgid "Undated"
+msgstr "Bez datuma"
+
+#: ../src/events/EventsDirectoryPage.vala:245
+msgid "%Y"
+msgstr "%Y"
+
+#: ../src/events/EventsDirectoryPage.vala:246
+msgid "%B"
+msgstr "%B"
+
+#: ../src/folders/Branch.vala:141
+msgid "Folders"
+msgstr "Direktoriji"
+
+#: ../src/library/Branch.vala:36 ../ui/shotwell.glade.h:32
+msgid "Library"
+msgstr "Biblioteka"
+
+#: ../src/library/ImportQueuePage.vala:8
+msgid "Importing..."
+msgstr "Uvozim..."
+
+#: ../src/library/ImportQueuePage.vala:67
+msgid "_Stop Import"
+msgstr "_Zaustavi uvoz"
+
+#: ../src/library/ImportQueuePage.vala:68
+msgid "Stop importing photos"
+msgstr "Prekini uvoz slika"
+
+#: ../src/library/ImportQueuePage.vala:124
+msgid "Preparing to import..."
+msgstr "Spremam slike za uvoz..."
+
+#: ../src/library/ImportQueuePage.vala:151
+#, c-format
+msgid "Imported %s"
+msgstr "Uveženo je %s slika"
+
+#: ../src/library/LastImportPage.vala:8
+msgid "Last Import"
+msgstr "Poslijednji uvoz"
+
+#: ../src/library/LibraryWindow.vala:301
+msgid "_Import From Folder..."
+msgstr "_Uvezi iz direktorija..."
+
+#: ../src/library/LibraryWindow.vala:302
+msgid "Import photos from disk to library"
+msgstr "Uvozi slike sa diska u biblioteku"
+
+#: ../src/library/LibraryWindow.vala:309
+msgid "Import From _Application..."
+msgstr "Uvezi iz _programa ..."
+
+#: ../src/library/LibraryWindow.vala:313
+msgid "Sort _Events"
+msgstr "Poredaj _događaje"
+
+#: ../src/library/LibraryWindow.vala:323
+msgid "Empty T_rash"
+msgstr "Isprazni _kantu"
+
+#: ../src/library/LibraryWindow.vala:324
+msgid "Delete all photos in the trash"
+msgstr "Briše sve slike iz kante"
+
+#: ../src/library/LibraryWindow.vala:329
+msgid "View Eve_nt for Photo"
+msgstr "Pregled do_gađaja sa slike"
+
+#: ../src/library/LibraryWindow.vala:333
+msgid "_Find"
+msgstr "_Nađi"
+
+#: ../src/library/LibraryWindow.vala:334
+msgid "Find photos and videos by search criteria"
+msgstr "Pretražuje zbirku po izabranom kriteriju"
+
+#: ../src/library/LibraryWindow.vala:345 ../src/searches/Branch.vala:77
+#: ../src/sidebar/Tree.vala:185
+msgid "Ne_w Saved Search..."
+msgstr "No_va sačuvana pretraga..."
+
+#: ../src/library/LibraryWindow.vala:367
+msgid "_Photos"
+msgstr "_Slike"
+
+#: ../src/library/LibraryWindow.vala:371
+msgid "Even_ts"
+msgstr "_Događaji"
+
+#: ../src/library/LibraryWindow.vala:390
+msgid "_Basic Information"
+msgstr "_Osnovni podaci"
+
+#: ../src/library/LibraryWindow.vala:391
+msgid "Display basic information for the selection"
+msgstr "Prikazuje osnovne podatke o izabranoj slici"
+
+#: ../src/library/LibraryWindow.vala:396
+msgid "E_xtended Information"
+msgstr "_Dodatni podaci"
+
+#: ../src/library/LibraryWindow.vala:397
+msgid "Display extended information for the selection"
+msgstr "Prikazuje dodatne podatke o izabranoj slici"
+
+#: ../src/library/LibraryWindow.vala:402
+msgid "_Search Bar"
+msgstr "_Linija pretrage"
+
+#: ../src/library/LibraryWindow.vala:403
+msgid "Display the search bar"
+msgstr "Prikaži liniju pretrage"
+
+#: ../src/library/LibraryWindow.vala:408
+msgid "S_idebar"
+msgstr "_Rubni stupac"
+
+#: ../src/library/LibraryWindow.vala:409
+msgid "Display the sidebar"
+msgstr "Prikaži bočnu traku"
+
+#: ../src/library/LibraryWindow.vala:667
+msgid "Import From Folder"
+msgstr "Uvezi iz direktorija"
+
+#: ../src/library/LibraryWindow.vala:736
+msgid "Empty Trash"
+msgstr "Isprazni kantu"
+
+#: ../src/library/LibraryWindow.vala:736
+msgid "Emptying Trash..."
+msgstr "Praznim kantu..."
+
+#: ../src/library/LibraryWindow.vala:895
+#, c-format
+msgid ""
+"Shotwell is configured to import photos to your home directory.\n"
+"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
+"span>.\n"
+"Do you want to continue importing photos?"
+msgstr ""
+"Shotwell je konfigurisan za uvoz fotografija u vaš lični direktoriju.\n"
+"Preporučujemo da ovo promijenite u <span weight=\"bold\">Uredi %s postavke</"
+"span>.\n"
+"Želite li nastaviti s uvozom fotografija?"
+
+#: ../src/library/LibraryWindow.vala:898 ../ui/shotwell.glade.h:18
+msgid "Library Location"
+msgstr "Lokacija biblioteke"
+
+#. TODO: Specify which directory/file.
+#: ../src/library/LibraryWindow.vala:911
+msgid "Photos cannot be imported from this directory."
+msgstr "Slike ne mogu biti uvežene iz ovog direktorija."
+
+#: ../src/library/LibraryWindow.vala:1199
+#, c-format
+msgid "%s (%d%%)"
+msgstr "%s (%d%%)"
+
+#: ../src/library/LibraryWindow.vala:1243
+#: ../src/library/LibraryWindow.vala:1254
+msgid "Updating library..."
+msgstr "Osvježavam zbirku slika ..."
+
+#: ../src/library/LibraryWindow.vala:1260
+msgid "Preparing to auto-import photos..."
+msgstr "Spremam slike za automatski uvoz..."
+
+#: ../src/library/LibraryWindow.vala:1265
+msgid "Auto-importing photos..."
+msgstr "Automatski uvozim slike..."
+
+#: ../src/library/LibraryWindow.vala:1273
+msgid "Writing metadata to files..."
+msgstr "Upisujem metapodatake u datoteke ..."
+
+#: ../src/library/OfflinePage.vala:8
+msgid "Missing Files"
+msgstr "Datoteke koje nedostaju"
+
+#: ../src/library/OfflinePage.vala:106
+msgid "Deleting..."
+msgstr "Brišem..."
+
+#: ../src/library/TrashPage.vala:8
+msgid "Trash"
+msgstr "Kanta"
+
+#: ../src/library/TrashPage.vala:108
+msgid "Trash is empty"
+msgstr "Kanta je prazna"
+
+#: ../src/library/TrashPage.vala:112
+msgid "Delete"
+msgstr "Obriši"
+
+#: ../src/library/TrashPage.vala:113
+msgid "Deleting Photos"
+msgstr "Brišem fotografije"
+
+#: ../src/main.vala:54
+#, 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 ""
+"Vaša zbirka slika nije kompatibilna sa ovom verzijom Shotwell.  Formirana je "
+"od Shotwell %s (izdanje %d).  Trenutna verzija je %s (izdanje %d).  Molim da "
+"uvijek koristite najnoviju verziju Shotwell."
+
+#: ../src/main.vala:59
+#, 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 ""
+"Shotwell nije uspio da unaprijedi vašu zbirku slika sa verzije %s (izdanje %"
+"d) na %s (izdanje %d).  Za više podataka posjetite Shotwell Viki na %s"
+
+#: ../src/main.vala:65
+#, 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 ""
+"Vaša zbirka slika nije kompatibilna sa ovom verzijom Shotwella.  Formirana "
+"je od Shotwella %s (izdanje %d).  Trenutna verzija je %s (izdanje %d).  "
+"Molim izbrišite vašu zbirku slika, brisanjem datoteke %s, a zatim ponovo "
+"uvezite slike."
+
+#: ../src/main.vala:71
+#, c-format
+msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgstr ""
+"Pojavila se nepoznata greška prilikom pokušaja provjere Shotwell baze: %s"
+
+#: ../src/main.vala:104
+msgid "Loading Shotwell"
+msgstr "Učitavam Shotwell"
+
+#: ../src/main.vala:294
+msgid "Path to Shotwell's private data"
+msgstr "Putanja do Shotwell privatnih podataka"
+
+#: ../src/main.vala:294
+msgid "DIRECTORY"
+msgstr "DIREKTORIJ"
+
+#: ../src/main.vala:298
+msgid "Do not monitor library directory at runtime for changes"
+msgstr "Ne prati direktorij biblioteke u toku izvršenja za promjene"
+
+#: ../src/main.vala:302
+msgid "Don't display startup progress meter"
+msgstr "Ne prikazuj mjerač napretka pri startu"
+
+#: ../src/main.vala:306
+msgid "Show the application's version"
+msgstr "Prikaži verziju programa"
+
+#. init GTK (valac has already called g_threads_init())
+#: ../src/main.vala:338
+msgid "[FILE]"
+msgstr "[DATOTEKA]"
+
+#: ../src/main.vala:342
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Pokrenite „%s --help“ da biste vidjeli cijelu listu dostupnih opcija "
+"komandne linije.\n"
+
+#: ../src/photos/BmpSupport.vala:32
+msgid "BMP"
+msgstr "BMP"
+
+#: ../src/photos/JfifSupport.vala:84
+msgid "JPEG"
+msgstr "JPEG"
+
+#: ../src/photos/JfifSupport.vala:185
+#, c-format
+msgid "Low (%d%%)"
+msgstr "Nizak (%d%%)"
+
+#: ../src/photos/JfifSupport.vala:188
+#, c-format
+msgid "Medium (%d%%)"
+msgstr "Srednji (%d%%)"
+
+#: ../src/photos/JfifSupport.vala:191
+#, c-format
+msgid "High (%d%%)"
+msgstr "Visok (%d%%)"
+
+#: ../src/photos/JfifSupport.vala:194
+#, c-format
+msgid "Maximum (%d%%)"
+msgstr "Najveći (%d%%)"
+
+#: ../src/photos/PngSupport.vala:30
+msgid "PNG"
+msgstr "PNG"
+
+#: ../src/photos/RawSupport.vala:134
+msgid "RAW"
+msgstr "RAW"
+
+#: ../src/photos/TiffSupport.vala:86
+msgid "TIFF"
+msgstr "TIFF"
+
+#: ../src/publishing/Publishing.vala:16
+msgid "Publishing"
+msgstr "Objavljivanje"
+
+#: ../src/publishing/PublishingPluginHost.vala:11
+msgid "Preparing for upload"
+msgstr "Pripremam za slanje"
+
+#: ../src/publishing/PublishingPluginHost.vala:12
+#, c-format
+msgid "Uploading %d of %d"
+msgstr "Postavljam %d od %d"
+
+#: ../src/publishing/PublishingPluginHost.vala:81
+#, c-format
+msgid "Publishing to %s can't continue because an error occurred:"
+msgstr ""
+"Ne mogu da nastavim objavljivanje na %s jer se pojavila slijedeća greška:"
+
+#: ../src/publishing/PublishingPluginHost.vala:84
+msgid "To try publishing to another service, select one from the above menu."
+msgstr "Izaberite drugi servis za objavljivanje slika iz menija iznad."
+
+#: ../src/publishing/PublishingUI.vala:105
+msgid "The selected photos/videos were successfully published."
+msgstr "Izabrane fotografije/video snimci su uspješno objavljeni."
+
+#: ../src/publishing/PublishingUI.vala:107
+msgid "The selected videos were successfully published."
+msgstr "Izabrani video snimak je uspješno objavljen."
+
+#: ../src/publishing/PublishingUI.vala:109
+msgid "The selected photos were successfully published."
+msgstr "Izabrane slike su uspješno objavljene."
+
+#: ../src/publishing/PublishingUI.vala:112
+msgid "The selected video was successfully published."
+msgstr "Izabrani video snimak je uspješno objavljen."
+
+#: ../src/publishing/PublishingUI.vala:114
+msgid "The selected photo was successfully published."
+msgstr "Izabrana fotografija je uspješno objavljena."
+
+#: ../src/publishing/PublishingUI.vala:122
+msgid "Fetching account information..."
+msgstr "Pribavljam podataki o računu ..."
+
+#: ../src/publishing/PublishingUI.vala:128
+msgid "Logging in..."
+msgstr "Prijavljujem se..."
+
+#: ../src/publishing/PublishingUI.vala:185
+msgid "Publish Photos"
+msgstr "Objavi slike"
+
+#: ../src/publishing/PublishingUI.vala:186
+msgid "Publish photos _to:"
+msgstr "Objavi slike _na:"
+
+#: ../src/publishing/PublishingUI.vala:188
+msgid "Publish Videos"
+msgstr "Objavi video snimak"
+
+#: ../src/publishing/PublishingUI.vala:189
+msgid "Publish videos _to"
+msgstr "Objavi video snimke _na"
+
+#: ../src/publishing/PublishingUI.vala:191
+msgid "Publish Photos and Videos"
+msgstr "Objavi fotografije i video snimke"
+
+#: ../src/publishing/PublishingUI.vala:192
+msgid "Publish photos and videos _to"
+msgstr "Objavi fotografije i video snimke _na"
+
+#. There are no enabled publishing services that accept this media type,
+#. warn the user.
+#: ../src/publishing/PublishingUI.vala:360
+msgid "Unable to publish"
+msgstr "Ne mogu objaviti"
+
+#: ../src/publishing/PublishingUI.vala:361
+#, 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 ""
+"Shotwell ne može da objavi izabrane stavke jer nemate aktivan kompatibilni "
+"dodatak za to. Da bi ovo ispravili idite na <b>Izmijeni %s Postavke</b> i "
+"uključite jedan ili više dodataka za objavljivanje pod karticomom <b>Dodaci</"
+"b>."
+
+#: ../src/searches/Branch.vala:68
+msgid "Saved Searches"
+msgstr "Sačuvane pretrage"
+
+#. Ordering must correspond with SearchConditionText.Context
+#: ../src/searches/SavedSearchDialog.vala:168
+msgid "contains"
+msgstr "sadrži"
+
+#. Ordering must correspond with Context
+#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:500
+msgid "is exactly"
+msgstr "je tačno"
+
+#: ../src/searches/SavedSearchDialog.vala:170
+msgid "starts with"
+msgstr "počni sa"
+
+#: ../src/searches/SavedSearchDialog.vala:171
+msgid "ends with"
+msgstr "završi sa"
+
+#: ../src/searches/SavedSearchDialog.vala:172
+msgid "does not contain"
+msgstr "ne sadrži"
+
+#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:504
+msgid "is not set"
+msgstr "nije postavljeno"
+
+#: ../src/searches/SavedSearchDialog.vala:174
+msgid "is set"
+msgstr "je postavljeno"
+
+#. Ordering must correspond with SearchConditionMediaType.Context
+#: ../src/searches/SavedSearchDialog.vala:248
+#: ../src/searches/SavedSearchDialog.vala:379
+#: ../src/searches/SavedSearchDialog.vala:444
+msgid "is"
+msgstr "je"
+
+#: ../src/searches/SavedSearchDialog.vala:249
+msgid "is not"
+msgstr "nije"
+
+#. Ordering must correspond with SearchConditionMediaType.MediaType
+#: ../src/searches/SavedSearchDialog.vala:255
+msgid "any photo"
+msgstr "bilo koja fotografija"
+
+#: ../src/searches/SavedSearchDialog.vala:256
+msgid "a raw photo"
+msgstr "sirova fotografija"
+
+#: ../src/searches/SavedSearchDialog.vala:257
+msgid "a video"
+msgstr "video snimak"
+
+#: ../src/searches/SavedSearchDialog.vala:311
+msgid "has"
+msgstr "ima"
+
+#: ../src/searches/SavedSearchDialog.vala:312
+msgid "has no"
+msgstr "nema"
+
+#: ../src/searches/SavedSearchDialog.vala:317
+msgid "modifications"
+msgstr "izmjene"
+
+#: ../src/searches/SavedSearchDialog.vala:318
+msgid "internal modifications"
+msgstr "interne izmjene"
+
+#: ../src/searches/SavedSearchDialog.vala:319
+msgid "external modifications"
+msgstr "vanjske izmjene"
+
+#. Ordering must correspond with SearchConditionFlagged.Stati
+#: ../src/searches/SavedSearchDialog.vala:373
+msgid "flagged"
+msgstr "označena"
+
+#: ../src/searches/SavedSearchDialog.vala:374
+msgid "not flagged"
+msgstr "neoznačena"
+
+#: ../src/searches/SavedSearchDialog.vala:437
+msgid "and higher"
+msgstr "i više"
+
+#: ../src/searches/SavedSearchDialog.vala:438
+msgid "only"
+msgstr "samo"
+
+#: ../src/searches/SavedSearchDialog.vala:439
+msgid "and lower"
+msgstr "i niže"
+
+#: ../src/searches/SavedSearchDialog.vala:501
+msgid "is after"
+msgstr "je poslije"
+
+#: ../src/searches/SavedSearchDialog.vala:502
+msgid "is before"
+msgstr "je prije"
+
+#: ../src/searches/SavedSearchDialog.vala:503
+msgid "is between"
+msgstr "je između"
+
+#: ../src/searches/SavedSearchDialog.vala:516
+msgid "and"
+msgstr "i"
+
+#: ../src/searches/SavedSearchDialog.vala:695
+msgid "Search"
+msgstr "Pretraga"
+
+#: ../src/searches/SavedSearchDialog.vala:700
+msgid "Cancel"
+msgstr "Otkaži"
+
+#: ../src/searches/SavedSearchDialog.vala:701
+msgid "OK"
+msgstr "_U redu"
+
+#: ../src/searches/SavedSearchDialog.vala:719
+msgid "any"
+msgstr "bilo koji"
+
+#: ../src/searches/SavedSearchDialog.vala:720
+msgid "all"
+msgstr "sve"
+
+#: ../src/searches/SavedSearchDialog.vala:721
+msgid "none"
+msgstr "ništa"
+
+#: ../src/searches/SearchBoolean.vala:157
+msgid "Any text"
+msgstr "Bilo koji tekst"
+
+#: ../src/searches/SearchBoolean.vala:160
+msgid "Title"
+msgstr "Naslov"
+
+#: ../src/searches/SearchBoolean.vala:163
+msgid "Tag"
+msgstr "Oznaka"
+
+#: ../src/searches/SearchBoolean.vala:166
+msgid "Comment"
+msgstr "Komentar"
+
+#: ../src/searches/SearchBoolean.vala:169
+msgid "Event name"
+msgstr "Ime događaja"
+
+#: ../src/searches/SearchBoolean.vala:172
+msgid "File name"
+msgstr "Naziv datoteke"
+
+#: ../src/searches/SearchBoolean.vala:175
+msgid "Media type"
+msgstr "Tip medija"
+
+#: ../src/searches/SearchBoolean.vala:178
+msgid "Flag state"
+msgstr "Stanje oznake"
+
+#: ../src/searches/SearchBoolean.vala:181
+msgid "Photo state"
+msgstr "Stanje slike"
+
+#: ../src/searches/SearchBoolean.vala:187
+msgid "Date"
+msgstr "Datum"
+
+#: ../src/sidebar/Tree.vala:189
+msgid "New _Tag..."
+msgstr "Nova _oznaka ..."
+
+#: ../src/slideshow/Slideshow.vala:22
+msgid "Slideshow Transitions"
+msgstr "Prelazi u prikazu slajdova"
+
+#: ../src/slideshow/TransitionEffects.vala:98
+msgid "(None)"
+msgstr "(Nijedan)"
+
+#: ../src/slideshow/TransitionEffects.vala:287
+msgid "None"
+msgstr "Nijedan"
+
+#: ../src/slideshow/TransitionEffects.vala:339
+msgid "Random"
+msgstr "Nasumičan"
+
+#: ../src/tags/Branch.vala:127
+msgid "Tags"
+msgstr "Oznake"
+
+#: ../ui/set_background_dialog.glade.h:1
+msgid "Set as Desktop Background"
+msgstr "Postavi kao pozadinu radne površine"
+
+#: ../ui/set_background_dialog.glade.h:2
+#: ../ui/set_background_slideshow_dialog.glade.h:6
+msgid "Use for Desktop"
+msgstr "Koristi za radnu površinu"
+
+#: ../ui/set_background_dialog.glade.h:3
+#: ../ui/set_background_slideshow_dialog.glade.h:7
+msgid "Use for Lock Screen"
+msgstr "Koristi za zakključavanje ekrana"
+
+#: ../ui/set_background_slideshow_dialog.glade.h:1
+msgid "Set as Desktop Slideshow"
+msgstr "Postavi kao promjenjivu pozadinu radne površine"
+
+#: ../ui/set_background_slideshow_dialog.glade.h:2
+msgid "Show each photo for"
+msgstr "Prikaži svaku sliku za"
+
+#: ../ui/set_background_slideshow_dialog.glade.h:3
+msgid "period of time"
+msgstr "period vremena"
+
+#: ../ui/set_background_slideshow_dialog.glade.h:4
+msgid "Generate desktop background slideshow"
+msgstr "Generiši promjenjivu pozadinu radne površine"
+
+#: ../ui/set_background_slideshow_dialog.glade.h:5
+msgid "How long each photo is shown on the desktop background"
+msgstr "Koliko dugo će izabrana slika da bude pozadina vaše radne površine"
+
+#: ../ui/shotwell.glade.h:1
+msgid "_Name of search:"
+msgstr "_Naziv pretrage:"
+
+#: ../ui/shotwell.glade.h:2
+msgid "_Match"
+msgstr "_Poklapanje sa"
+
+#: ../ui/shotwell.glade.h:3
+msgid "of the following:"
+msgstr "od sljedećih:"
+
+#: ../ui/shotwell.glade.h:4
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>Veličina ištampane slike</b>"
+
+#: ../ui/shotwell.glade.h:5
+msgid "Use a _standard size:"
+msgstr "Koristi standardnu veličinu:"
+
+#: ../ui/shotwell.glade.h:6
+msgid "Use a c_ustom size:"
+msgstr "Koristi prilagođenu veličinu:"
+
+#: ../ui/shotwell.glade.h:7
+msgid "_Match photo aspect ratio"
+msgstr "_Podesi omjer slike"
+
+#: ../ui/shotwell.glade.h:8
+msgid "_Autosize:"
+msgstr "_Automatska veličina:"
+
+#: ../ui/shotwell.glade.h:9
+msgid "<b>Titles</b>"
+msgstr "<b>Naslovi</b>"
+
+#: ../ui/shotwell.glade.h:10
+msgid "Print image _title"
+msgstr "Ispiši _naslov slike"
+
+#: ../ui/shotwell.glade.h:11
+msgid "<b>Pixel Resolution</b>"
+msgstr "<b>Rezolucija piksela</b>"
+
+#: ../ui/shotwell.glade.h:12
+msgid "_Output photo at:"
+msgstr "_Ispis slike u:"
+
+#: ../ui/shotwell.glade.h:13
+msgid "pixels per inch"
+msgstr "piksela po inču"
+
+#: ../ui/shotwell.glade.h:15
+msgid "Shotwell Preferences"
+msgstr "Shotwell postavke"
+
+#: ../ui/shotwell.glade.h:16
+msgid "white"
+msgstr "bijela"
+
+#: ../ui/shotwell.glade.h:17
+msgid "black"
+msgstr "crna"
+
+#: ../ui/shotwell.glade.h:19
+msgid "_Watch library directory for new files"
+msgstr "_Prati pojavljivanje novih datoteka u direktoriju biblioteke"
+
+#: ../ui/shotwell.glade.h:20
+msgid "Metadata"
+msgstr "Metapodaci"
+
+#: ../ui/shotwell.glade.h:21
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "Upisuj oznake, naslove i ostale _metapodatke u datoteke slika"
+
+#: ../ui/shotwell.glade.h:22
+msgid "Display"
+msgstr "Prikaži"
+
+#: ../ui/shotwell.glade.h:23
+msgid "_Import photos to:"
+msgstr "_Uvezi slike u:"
+
+#: ../ui/shotwell.glade.h:24
+msgid "_Background:"
+msgstr "_Pozadina:"
+
+#: ../ui/shotwell.glade.h:25
+msgid "Importing"
+msgstr "Uvozim"
+
+#: ../ui/shotwell.glade.h:26
+msgid "_Directory structure:"
+msgstr "Struktura _direktorija:"
+
+#: ../ui/shotwell.glade.h:27
+msgid "_Pattern:"
+msgstr "_Šablon:"
+
+#: ../ui/shotwell.glade.h:28
+msgid "Example:"
+msgstr "Primjer:"
+
+#: ../ui/shotwell.glade.h:29
+msgid "R_ename imported files to lowercase"
+msgstr "_Preimenuj uvežene datoteke na mala slova"
+
+#: ../ui/shotwell.glade.h:30
+msgid "RAW Developer"
+msgstr "RAW razvijač"
+
+#: ../ui/shotwell.glade.h:31
+msgid "De_fault:"
+msgstr "Po_drazumijevano:"
+
+#: ../ui/shotwell.glade.h:33
+msgid "E_xternal photo editor:"
+msgstr "E_ksterni foto editor:"
+
+#: ../ui/shotwell.glade.h:34
+msgid "External _RAW editor:"
+msgstr "Spoljni uređivač _RAW slika:"
+
+#: ../ui/shotwell.glade.h:35
+msgid "External Editors"
+msgstr "Spoljni uređivači"
+
+#: ../ui/shotwell.glade.h:36
+msgid "Plugins"
+msgstr "Plugini"
+
+#: ../ui/shotwell.glade.h:37
+msgid "_Delay:"
+msgstr "_Odgoda:"
+
+#: ../ui/shotwell.glade.h:38
+msgid "_Transition effect:"
+msgstr "_Efekti prijelaza:"
+
+#: ../ui/shotwell.glade.h:39
+msgid "Transition d_elay:"
+msgstr "_Zadrška između prijelaza:"
+
+#: ../ui/shotwell.glade.h:40
+msgid "Show t_itle"
+msgstr "Prikaži _naslov"
+
+#: ../ui/shotwell.glade.h:41
+msgid "seconds"
+msgstr "sekunde"
diff --git a/po/ca.po b/po/ca.po
index 41c0145..0c7dd17 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13,654 +13,1456 @@
 # jodufi <jodufi@gmail.com>, 2012
 # jodufi <jodufi@gmail.com>, 2011
 # lsbeeler <lucas@yorba.org>, 2011
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
-"Report-Msgid-Bugs-To: shotwell@yorba.org\n"
-"POT-Creation-Date: 2013-09-20 11:55-0700\n"
-"PO-Revision-Date: 2013-09-20 19:30+0000\n"
-"Last-Translator: Adolfo Jayme Barrientos <fitoschido@ubuntu.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
+"POT-Creation-Date: 2015-03-16 23:45+0000\n"
+"PO-Revision-Date: 2015-03-17 07:17+0100\n"
+"Last-Translator: Pau Iranzo <paugnu@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/shotwell/"
 "language/ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: src/Event.vala:737
-#, c-format
-msgid "Event %s"
-msgstr "Esdeveniment %s"
+#: ../plugins/common/RESTSupport.vala:424
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
+msgid "A temporary file needed for publishing is unavailable"
+msgstr "No està disponible un fitxer temporal que cal per publicar"
 
-#: src/camera/Branch.vala:87
-msgid "Cameras"
-msgstr "Càmeres"
+#: ../plugins/common/RESTSupport.vala:1138
+msgid ""
+"You have already logged in and out of a Google service during this Shotwell "
+"session.\n"
+"\n"
+"To continue publishing to Google services, quit and restart Shotwell, then "
+"try publishing again."
+msgstr ""
+"Ja us heu connectat i desconnectat als serveis de Google durant aquesta "
+"sessió del Shotwell.\n"
+"\n"
+"Per continuar publicant als serveis de Google, sortiu i reinicieu el "
+"Shotwell i proveu a publicar de nou."
 
-#: src/camera/Branch.vala:101 src/camera/ImportPage.vala:711
-#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:300
-#: src/MediaPage.vala:425
-msgid "Camera"
-msgstr "Càmera"
+#: ../plugins/common/Resources.vala:9
+msgid "Visit the Shotwell home page"
+msgstr "Visiteu la pàgina web del Shotwell"
 
-#: src/camera/ImportPage.vala:312 src/Properties.vala:227
-#, c-format
-msgid "RAW+JPEG"
-msgstr "RAW+JPEG"
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
+msgid "translator-credits"
+msgstr "Pau Iranzo <paugnu@gmail.com>, 2015"
+
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:32
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:34
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:32
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
+#: ../src/Resources.vala:27
+msgid "Copyright 2009-2015 Yorba Foundation"
+msgstr "Copyright 2009-2015 Yorba Foundation"
+
+#: ../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 ""
+"Benvingut al servei d'importació de biblioteques de F-Spot\n"
+"\n"
+"Per favor triau una biblioteca a importar, ja sigui triant una de les "
+"biblioteques trobades per Shotwell o bé seleccionant un fitxer de biblioteca "
+"F-Spot alternatiu."
 
-#: src/camera/ImportPage.vala:459
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:58
 msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
+"Welcome to the F-Spot library import service.\n"
+"\n"
+"Please select an F-Spot database file."
 msgstr ""
-"No s'ha pogut desmuntar la càmera. Intenteu desmuntar-la des del gestor de "
-"fitxers."
+"Benvingut al servei d'importació de biblioteques de l'F-Spot.\n"
+"\n"
+"Seleccioneu un fitxer de base de dades de l'F-Spot."
 
-#: src/camera/ImportPage.vala:776
-msgid "Hide photos already imported"
-msgstr "Amaga les fotografies que ja s'hagin importat"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
+msgid "Manually select an F-Spot database file to import:"
+msgstr "Seleccionar manualment un fitxer de biblioteca F-Spot a importar:"
 
-#: src/camera/ImportPage.vala:777
-msgid "Only display photos that have not been imported"
-msgstr "Mostra només les fotografies que no s'hagin importat"
+#: ../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 ""
+"No es pot obrir el fitxer de base de dades F-Spot seleccionat: el fitxer no "
+"existeix o no és una base de dades F-Spot correcta"
 
-#: src/camera/ImportPage.vala:845
-msgid "Starting import, please wait..."
-msgstr "S'està iniciant la importació, espereu..."
+#: ../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 ""
+"No es pot obrir el fitxer de base de dades F-Spot seleccionat: Shotwell no "
+"suporta aquesta versió de F-Spot"
 
-#: src/camera/ImportPage.vala:872 src/MediaPage.vala:436
-msgid "_Titles"
-msgstr "_Títols"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading tags table"
+msgstr ""
+"No es pot llegir el fitxer de base de dades F-Spot seleccionat: error "
+"llegint taula d'etiquetes"
 
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:437
-msgid "Display the title of each photo"
-msgstr "Mostra el títol de cada fotografia"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:68
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading photos "
+"table"
+msgstr ""
+"No es pot llegir el fitxer de base de dades F-Spot seleccionat: error "
+"llegint taula d'imatges"
 
-#: src/camera/ImportPage.vala:884
-msgid "Import _Selected"
-msgstr "Importa les _seleccionades"
+#: ../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 ""
+"Shotwell ha trobat %d imatges dins la biblioteca F-Spot i les està "
+"important. Les imatges duplicades seran automàticament detectades i "
+"eliminades.\n"
+"\n"
+"Podeu tancar aquest diàleg i començar a emprar el Shotwell mentre la "
+"importació té lloc en segon pla."
 
-#: src/camera/ImportPage.vala:885
-msgid "Import the selected photos into your library"
-msgstr "Importa les fotografies seleccionades a la biblioteca"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
+#, c-format
+msgid "F-Spot library: %s"
+msgstr "Biblioteca F-Spot: %s"
 
-#: src/camera/ImportPage.vala:890
-msgid "Import _All"
-msgstr "Importa-les _totes"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
+msgid "Preparing to import"
+msgstr "Preparant per importar"
 
-#: src/camera/ImportPage.vala:891
-msgid "Import all the photos into your library"
-msgstr "Importa totes les fotografies a la biblioteca"
+#: ../plugins/shotwell-data-imports/shotwell-data-imports.vala:22
+msgid "Core Data Import Services"
+msgstr "Serveis d'importació Core Data"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+msgid "Gallery3 publishing module"
+msgstr "Mòdul de publicació Gallery3"
 
-#: src/camera/ImportPage.vala:1012
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
 msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
+"You are not currently logged into your Gallery.\n"
+"\n"
+"You must have already signed up for a Gallery3 account to complete the login "
+"process."
 msgstr ""
-"Cal que el Shotwell desmunti la càmera del sistema de fitxers per poder-hi "
-"accedir. Voleu continuar?"
+"Actualment no esteu connectat a la vostra Gallery.\n"
+"\n"
+"Per completar el procés d'identificació heu d'estar inscrits a Gallery3 i "
+"tenir un compte per accedir-hi."
 
-#: src/camera/ImportPage.vala:1018
-msgid "_Unmount"
-msgstr "_Desmunta-la"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: ../src/MediaPage.vala:435 ../src/photos/RawSupport.vala:300
+msgid "Shotwell"
+msgstr "Shotwell"
 
-#: src/camera/ImportPage.vala:1023
-msgid "Please unmount the camera."
-msgstr "Desmunteu la càmera."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+msgid "Shotwell default directory"
+msgstr "Directori per defecte del Shotwell"
 
-#: src/camera/ImportPage.vala:1028
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:801
+#, c-format
 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."
+"\n"
+"\n"
+"The file \"%s\" may not be supported by or may be too large for this "
+"instance of Gallery3."
 msgstr ""
-"Una altra aplicació està blocant la càmera. El Shotwell només pot accedir a "
-"la càmera si no està blocada. Tanqueu qualsevol altra aplicació que "
-"l'estigui utilitzant i torneu-ho a intentar."
+"\n"
+"\n"
+"El fitxer «%s» pot no ser compatible o massa gran per a aquesta instància de "
+"Gallery3."
 
-#: src/camera/ImportPage.vala:1038
-msgid "Please close any other application using the camera."
-msgstr "Tanqueu qualsevol altra aplicació que estigui utilitzant la càmera."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:802
+msgid ""
+"\n"
+"Note that Gallery3 only supports the video types that Flowplayer does."
+msgstr ""
+"\n"
+"Tingueu en compte que Gallery3 només és compatible amb els mateixos tipus de "
+"vídeo que són compatibles amb el Flowplayer."
 
-#: src/camera/ImportPage.vala:1043
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
 #, c-format
 msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
 msgstr ""
-"No es poden obtenir previsualitzacions de la càmera:\n"
-"%s"
+"Un fitxer necessari per la publicació no està disponible. No es pot "
+"continuar amb la publicació a %s."
 
-#: src/camera/ImportPage.vala:1060
-msgid "Unmounting..."
-msgstr "S'està desmuntant..."
+#. populate any widgets whose contents are
+#. programmatically-generated
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
+#, c-format
+msgid "Publishing to %s as %s."
+msgstr "S'està publicant a %s com a %s."
 
-#: src/camera/ImportPage.vala:1166
-msgid "Fetching photo information"
-msgstr "S'està recollint la informació de les fotografies"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
+msgid ""
+"Enter the URL for your Gallery3 site and the username and password (or API "
+"key) for your Gallery3 account."
+msgstr ""
+"Introduïu l'URL del vostre lloc Gallery3 i el nom d'usuari i contrasenya (o "
+"clau API) per al vostre compte Gallery3."
 
-#: src/camera/ImportPage.vala:1521
-#, c-format
-msgid "Fetching preview for %s"
-msgstr "S'està recollint la previsualització de %s"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
+msgid ""
+"The username and password or API key were incorrect. To try again, re-enter "
+"your username and password below."
+msgstr ""
+"El nom d'usuari i contrasenya o la clau API són incorrectes. Proveu de nou, "
+"torneu a introduir el vostre nom d'usuari i contrasenya a continuació."
 
-#: src/camera/ImportPage.vala:1637
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "No es pot blocar la càmera: %s"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
+msgid ""
+"The URL entered does not appear to be the main directory of a Gallery3 "
+"instance. Please make sure you typed it correctly and it does not have any "
+"trailing components (e.g., index.php)."
+msgstr ""
+"L'URL que s'ha introduït no forma part del directori principal d'una "
+"instància Gallery3. Assegureu-vos que l'heu introduït correctament i que no "
+"conté cap component al final (p.e. index.php)."
 
-#: src/camera/ImportPage.vala:1722
-#, c-format
-msgid "Delete this photo from camera?"
-msgid_plural "Delete these %d photos from camera?"
-msgstr[0] "Voleu suprimir aquesta fotografia de la càmera?"
-msgstr[1] "Voleu suprimir aquestes %d fotografies de la càmera?"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
+msgid "Unrecognized User"
+msgstr "Usuari no reconegut"
 
-#: src/camera/ImportPage.vala:1725
-#, c-format
-msgid "Delete this video from camera?"
-msgid_plural "Delete these %d videos from camera?"
-msgstr[0] "Voleu suprimir aquest vídeo de la càmera?"
-msgstr[1] "Voleu suprimir aquests %d vídeos de la càmera?"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
+msgid " Site Not Found"
+msgstr "No s'ha trobat el lloc"
 
-#: src/camera/ImportPage.vala:1728
-#, c-format
-msgid "Delete this photo/video from camera?"
-msgid_plural "Delete these %d photos/videos from camera?"
-msgstr[0] "Voleu suprimir aquesta fotografia/vídeo de la càmera?"
-msgstr[1] "Voleu suprimir aquestes %d fotografies/vídeos de la càmera?"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
+msgid "Copyright (C) 2013 rajce.net"
+msgstr "Copyright (C) 2013 rajce.net"
 
-#: src/camera/ImportPage.vala:1731
-#, c-format
-msgid "Delete these files from camera?"
-msgid_plural "Delete these %d files from camera?"
-msgstr[0] "Voleu suprimir aquest fitxer de la càmera?"
-msgstr[1] "Voleu suprimir aquests %d fitxers de la càmera?"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
+msgid "An error message occurred when publishing to Rajce. Please try again."
+msgstr "S'ha produït un error en publicar a Rajce. Proveu de nou."
 
-#: src/camera/ImportPage.vala:1739 src/Dialogs.vala:1328
-msgid "_Keep"
-msgstr "_Manté"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
+msgid "Enter email and password associated with your Rajce account."
+msgstr ""
+"Introduïu l'adreça de correu i la contrasenya associades amb el vostre "
+"compte Rajce."
 
-#: src/camera/ImportPage.vala:1758
-msgid "Removing photos/videos from camera"
-msgstr "S'estan suprimint les fotografies/vídeos de la càmera"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
+msgid "Invalid email and/or password. Please try again"
+msgstr "L'adreça electrònica o la contrasenya no són vàlides. Proveu de nou"
 
-#: src/camera/ImportPage.vala:1762
-#, 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] ""
-"No s'ha pogut suprimir %d fotografia/vídeo de la càmera degut a errors."
-msgstr[1] ""
-"No s'han pogut suprimir %d fotografies/vídeos de la càmera degut a errors."
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
+msgid "Invalid User Email or Password"
+msgstr "Nom d'usuari o contrasenya incorrectes"
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2623
-msgid "S_lideshow"
-msgstr "_Presentació de diapositives"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:890
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:2
+msgid "_Email address"
+msgstr "_Adreça electrònica"
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2624
-msgid "Play a slideshow"
-msgstr "Reprodueix una presentació de diapositives"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:891
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
+msgid "_Password"
+msgstr "_Contrasenya"
 
-#: src/CollectionPage.vala:456
-msgid "Export Photo/Video"
-msgstr "Exporta la fotografia/vídeo"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
+msgid "_Remember"
+msgstr "_Recorda"
 
-#: src/CollectionPage.vala:456
-msgid "Export Photos/Videos"
-msgstr "Exporta les fotografies/vídeos"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
+msgid "Login"
+msgstr "Entra"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:58 src/PhotoPage.vala:3196
-msgid "Export Photo"
-msgstr "Exporta les fotografies"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:5
+msgid "_Hide album"
+msgstr "A_maga l'àlbum"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:87
-msgid "Export Photos"
-msgstr "Exporta les fotografies"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
+#, c-format
+msgid "You are logged into Rajce as %s."
+msgstr "Actualment esteu connectat al Rajce com a %s."
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Rotating"
-msgstr "S'està girant"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
+msgid "Photos will appear in:"
+msgstr "Les fotografies apareixeran a:"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Undoing Rotate"
-msgstr "S'està desfent la rotació"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
+msgid "An _existing album:"
+msgstr "Un àlbum e_xistent:"
 
-#: src/CollectionPage.vala:570
-msgid "Flipping Horizontally"
-msgstr "S'està invertint horitzontalment"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
+msgid "A _new album named:"
+msgstr "Un àlbum _nou anomenat:"
 
-#: src/CollectionPage.vala:571
-msgid "Undoing Flip Horizontally"
-msgstr "S'està desfent la inversió horitzontal"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:6
+msgid "Open target _album in browser"
+msgstr "Obre l'_àlbum al navegador"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:8
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
+msgid "_Publish"
+msgstr "_Publica"
 
-#: src/CollectionPage.vala:580
-msgid "Flipping Vertically"
-msgstr "S'està invertint verticalment"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
+msgid "_Logout"
+msgstr "_Surt"
 
-#: src/CollectionPage.vala:581
-msgid "Undoing Flip Vertically"
-msgstr "S'està desfent la inversió verticalment"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Copyright 2012 BJA Electronics"
 
-#: src/searches/SearchBoolean.vala:157
-msgid "Any text"
-msgstr "Qualsevol text"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
+msgid "500 x 375 pixels"
+msgstr "500 x 375 píxels"
 
-#: src/searches/SearchBoolean.vala:160
-msgid "Title"
-msgstr "Títol"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
+msgid "1024 x 768 pixels"
+msgstr "1024 × 768 píxels"
 
-#: src/searches/SearchBoolean.vala:163
-msgid "Tag"
-msgstr "Etiqueta"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
+msgid "1280 x 853 pixels"
+msgstr "1280 × 853 píxels"
 
-#: src/searches/SearchBoolean.vala:166
-msgid "Comment"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:310
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:320
+#, c-format
+msgid "'%s' isn't a valid response to an OAuth authentication request"
+msgstr "«%s» no és una resposta vàlida per a una petició d'autenticació OAuth"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:558
+msgid ""
+"TumblrPublisher: start( ): can't start; this publisher is not restartable."
 msgstr ""
+"TumblrPublisher: start( ): no es pot iniciar; aquest editor no es pot "
+"reiniciar."
 
-#: src/searches/SearchBoolean.vala:169
-msgid "Event name"
-msgstr "Nom de l'esdeveniment"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "Introduïu el nom i contrasenya associats amb el vostre compte Tumblr."
 
-#: src/searches/SearchBoolean.vala:172
-msgid "File name"
-msgstr "Nom del fitxer"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
+msgid "Username and/or password invalid. Please try again"
+msgstr "L'usuari i/o la contrasenya no són vàlids. Proveu de nou"
 
-#: src/searches/SearchBoolean.vala:175
-msgid "Media type"
-msgstr "Tipus de suport"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:617
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
+msgid "Invalid User Name or Password"
+msgstr "Nom d'usuari o contrasenya incorrectes"
 
-#: src/searches/SearchBoolean.vala:178
-msgid "Flag state"
-msgstr "Estat del senyalador"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:636
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "No s'ha pogut carregar la interfície: %s"
 
-#: src/searches/SearchBoolean.vala:181
-msgid "Photo state"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:739
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
 msgstr ""
+"Esteu connectat a Tumblr com %s.\n"
+"\n"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1003
-msgid "Rating"
-msgstr "Valoració"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
+msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 
-#: src/searches/SearchBoolean.vala:187
-msgid "Date"
-msgstr "Data"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:25
+msgid "Visit the Yandex.Fotki web site"
+msgstr "Vés al lloc web del Yandex.Fotki"
 
-#: src/searches/SavedSearchDialog.vala:169
-msgid "contains"
-msgstr "conté"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:632
+msgid "You are not currently logged into Yandex.Fotki."
+msgstr "Actualment no esteu connectat al Yandex.Fotki."
 
-#: src/searches/SavedSearchDialog.vala:170
-#: src/searches/SavedSearchDialog.vala:497
-msgid "is exactly"
-msgstr "és exactament"
+#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+msgid "Shotwell Extra Publishing Services"
+msgstr "Serveis de publicació addicionals del Shotwell"
 
-#: src/searches/SavedSearchDialog.vala:171
-msgid "starts with"
-msgstr "comença amb"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
+msgid "Go _Back"
+msgstr "_Enrere"
 
-#: src/searches/SavedSearchDialog.vala:172
-msgid "ends with"
-msgstr "acaba amb"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
+#: ../ui/shotwell.glade.h:42
+msgid "_Login"
+msgstr "_Connecta"
 
-#: src/searches/SavedSearchDialog.vala:173
-msgid "does not contain"
-msgstr "no conté"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
+msgid "Intro message replaced at runtime"
+msgstr "Messatge d'introducció reemplaçat en temps d'execució"
 
-#: src/searches/SavedSearchDialog.vala:174
-#: src/searches/SavedSearchDialog.vala:501
-msgid "is not set"
-msgstr "no està establert"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
+msgid "_Gallery3 URL:"
+msgstr "URL _Gallery3:"
 
-#: src/searches/SavedSearchDialog.vala:245
-#: src/searches/SavedSearchDialog.vala:376
-#: src/searches/SavedSearchDialog.vala:441
-msgid "is"
-msgstr "és"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
+msgid "_User name:"
+msgstr "_Nom d'usuari:"
 
-#: src/searches/SavedSearchDialog.vala:246
-msgid "is not"
-msgstr "no és"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
+msgid "_Password:"
+msgstr "_Contrasenya:"
 
-#: src/searches/SavedSearchDialog.vala:252
-msgid "any photo"
-msgstr "qualsevol fotografia"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:7
+msgid "API _Key:"
+msgstr "_Clau API:"
 
-#: src/searches/SavedSearchDialog.vala:253
-msgid "a raw photo"
-msgstr "una fotografia RAW"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
+msgid "or"
+msgstr "o"
 
-#: src/searches/SavedSearchDialog.vala:254
-msgid "a video"
-msgstr "un vídeo"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
+msgid "A _new album"
+msgstr "Un àlbum _nou"
 
-#: src/searches/SavedSearchDialog.vala:308
-msgid "has"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
+msgid "An _existing album"
+msgstr "Un àlbum e_xistent"
 
-#: src/searches/SavedSearchDialog.vala:309
-msgid "has no"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
+msgid "_Remove location, tag and camera-identifying data before uploading"
 msgstr ""
+"Sup_rimeix les dades d'ubicació, d'etiquetes i d'identificació de la càmera "
+"abans de la càrrega."
 
-#: src/searches/SavedSearchDialog.vala:314
-msgid "modifications"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
+msgid "'Publishing to $url as $username' (populated in application code)"
 msgstr ""
+"«S'està publicant a $url com $username» (completat al codi de l'aplicació)"
 
-#: src/searches/SavedSearchDialog.vala:315
-msgid "internal modifications"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
+msgid "Scaling constraint:"
+msgstr "Constant d'e_scala:"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
+msgid "pixels"
+msgstr " píxels"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
+#: ../src/Dimensions.vala:17
+msgid "Original size"
+msgstr "Mida original"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:10
+#: ../src/Dimensions.vala:20
+msgid "Width or height"
+msgstr "Amplada o alçada"
+
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
+#: ../ui/shotwell.glade.h:14
+msgid "label"
+msgstr "etiqueta"
+
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
+msgid "Blogs:"
+msgstr "Blogs:"
+
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:1
+msgid "Photo _size:"
+msgstr "_Mida de la fotografia:"
+
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
+msgid "you are logged in rajce as $name"
+msgstr "Actualment esteu connectat al rajce com a $name"
+
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
+msgid "$mediatype will appear in"
+msgstr "$mediatype apareixeran a"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
+msgid "_Albums (or write new):"
+msgstr "À_lbums (o escriviu-ne un de nou):"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:2
+msgid "Access _type:"
+msgstr "_Tipus d'accés:"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
+msgid "Disable _comments"
+msgstr "Inhabilita els _comentaris"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:4
+msgid "_Forbid downloading original photo"
+msgstr "_Prohibeix baixar la fotografia original"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
+msgid "Public"
+msgstr "Públic"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:8
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1181
+msgid "Friends"
+msgstr "Amics"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:9
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
+msgid "Private"
+msgstr "Privat"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:59
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1127
+msgid "Shotwell Connect"
+msgstr "Shotwell Connect"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:63
+msgid ""
+"You are not currently logged into Facebook.\n"
+"\n"
+"If you don't yet have a Facebook account, you can create one during the "
+"login process. During login, Shotwell Connect may ask you for permission to "
+"upload photos and publish to your feed. These permissions are required for "
+"Shotwell Connect to function."
 msgstr ""
+"Actualment no esteu connectat al Facebook.\n"
+"\n"
+"Si encara no teniu un compte al Facebook, podeu crear-ne un durant el procés "
+"de connexió. Durant la connexió, el Shotwell Connect pot ser que us demani "
+"permís per pujar fotografies i publicar-les al mur. Aquests permisos són "
+"necessaris perquè el Shotwell Connect funcioni."
 
-#: src/searches/SavedSearchDialog.vala:316
-msgid "external modifications"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:65
+msgid ""
+"You have already logged in and out of Facebook during this Shotwell "
+"session.\n"
+"To continue publishing to Facebook, quit and restart Shotwell, then try "
+"publishing again."
 msgstr ""
+"Ja us heu connectat i desconnectat al Facebook en aquesta sessió del "
+"Shotwell.\n"
+"Per continuar publicant al Facebook, sortiu, reinicieu el Shotwell i torneu "
+"a intentar-ho."
 
-#: src/searches/SavedSearchDialog.vala:370
-msgid "flagged"
-msgstr "senyalat"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:86
+msgid "Standard (720 pixels)"
+msgstr "Estàndard (720 píxels)"
 
-#: src/searches/SavedSearchDialog.vala:371
-msgid "not flagged"
-msgstr "sense senyalar"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:89
+msgid "Large (2048 pixels)"
+msgstr "Gran (2048 píxels)"
 
-#: src/searches/SavedSearchDialog.vala:434
-msgid "and higher"
-msgstr "i superior"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:254
+msgid "Testing connection to Facebook..."
+msgstr "S'està comprovant la connexió amb el Facebook..."
 
-#: src/searches/SavedSearchDialog.vala:435
-msgid "only"
-msgstr "només"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:347
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
+msgid "Creating album..."
+msgstr "S'està creant l'àlbum..."
 
-#: src/searches/SavedSearchDialog.vala:436
-msgid "and lower"
-msgstr "i inferior"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:374
+msgid ""
+"A file required for publishing is unavailable. Publishing to Facebook can't "
+"continue."
+msgstr ""
+"Un dels fitxers necessaris per a la publicació no està disponible. No es pot "
+"continuar amb la publicació a Facebook."
 
-#: src/searches/SavedSearchDialog.vala:498
-msgid "is after"
-msgstr "està després"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1019
+#, c-format
+msgid ""
+"You are logged into Facebook as %s.\n"
+"\n"
+msgstr ""
+"Actualment esteu connectat al Facebook com a %s.\n"
+"\n"
 
-#: src/searches/SavedSearchDialog.vala:499
-msgid "is before"
-msgstr "està abans"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1020
+msgid "Where would you like to publish the selected photos?"
+msgstr "On us agradaria publicar les fotografies seleccionades?"
 
-#: src/searches/SavedSearchDialog.vala:500
-msgid "is between"
-msgstr "està entre"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1021
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
+msgid "Upload _size:"
+msgstr "Mida de _pujada:"
 
-#: src/searches/SavedSearchDialog.vala:513
-msgid "and"
-msgstr "i"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
+msgid "Just me"
+msgstr "Només jo"
 
-#: src/searches/SavedSearchDialog.vala:720
-msgid "any"
-msgstr "qualsevol"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+msgid "Everyone"
+msgstr "Tothom"
 
-#: src/searches/SavedSearchDialog.vala:721
-msgid "all"
-msgstr "tots"
+#: ../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 ""
+"Actualment no esteu connectat al Flickr.\n"
+"\n"
+"Feu clic a connecta per connectar-vos al Flickr en el navegador web.  Haureu "
+"d'autoritzar al Shotwell Connect per enllaçar el vostre compte del Flickr."
 
-#: src/searches/SavedSearchDialog.vala:722
-msgid "none"
-msgstr "cap"
+#: ../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 ""
+"Ja us heu connectat i desconnectat al Flickr en aquesta sessió del "
+"Shotwell.\n"
+"Per continuar publicant al Flickr, sortiu, reinicieu el Shotwell i torneu a "
+"intentar-ho."
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Cerques desades"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:375
+msgid "Preparing for login..."
+msgstr "S'està preparant per connectar..."
 
-#: src/searches/Branch.vala:77 src/library/LibraryWindow.vala:346
-#: src/sidebar/Tree.vala:195
-msgid "Ne_w Saved Search..."
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:444
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:595
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can't "
+"continue."
 msgstr ""
+"Un dels fitxers necessaris per a la publicació no està disponible. No es pot "
+"continuar amb la publicació a Flickr."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:457
+msgid "Verifying authorization..."
+msgstr "S'està verificant l'autorització..."
 
-#: src/main.vala:54
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1153
 #, 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."
+"You are logged into Flickr as %s.\n"
+"\n"
 msgstr ""
-"La biblioteca de fotografies no és compatible amb aquesta versió del "
-"Shotwell. Sembla que es va crear amb el Shotwell %s (esquema %d). Aquesta "
-"versió és la %s (esquema %d). Utilitzeu l'última versió del Shotwell."
+"Heu entrat al Flickr com a %s.\n"
+"\n"
 
-#: src/main.vala:59
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
 #, 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"
+"Your free Flickr account limits how much data you can upload per month.\n"
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"El vostre compte gratuït del Flickr restringeix la quantitat de dades que "
+"podeu pujar cada mes.\n"
+"Aquest mes, us queden %d megabyte de quota de pujada."
+msgstr[1] ""
+"El vostre compte gratuït del Flickr restringeix la quantitat de dades que "
+"podeu pujar cada mes.\n"
+"Aquest mes, us queden %d megabytes de quota de pujada."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
+msgid "Your Flickr Pro account entitles you to unlimited uploads."
+msgstr "El vostre compte del Flickr Pro us permet pujades il·limitades."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
+msgid "Photos _visible to:"
+msgstr "Les fotografies són _visibles per:"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+msgid "Videos _visible to:"
+msgstr "Els vídeos són _visibles per:"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
+msgid "Photos and videos _visible to:"
+msgstr "Les fotografies i els vídeos són _visibles per:"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+msgid "Friends & family only"
+msgstr "Només els amics i la família"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
+msgid "Family only"
+msgstr "Només família"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
+msgid "Friends only"
+msgstr "Només amics"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
+msgid "2048 x 1536 pixels"
+msgstr "2048 x 1536 píxels"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
+msgid "4096 x 3072 pixels"
+msgstr "4096 x 3072 píxels"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:58
+msgid ""
+"You are not currently logged into Picasa Web Albums.\n"
+"\n"
+"Click Login to log into Picasa Web Albums in your Web browser. You will have "
+"to authorize Shotwell Connect to link to your Picasa Web Albums account."
 msgstr ""
-"El Shotwell no ha pogut actualitzar la biblioteca de fotografies de la "
-"versió %s (esquema %d) a la %s (esquema %d). Per obtenir més informació "
-"comproveu el Wiki del Shotwell a %s."
+"No esteu connectat a Picasa Web Albums.\n"
+"\n"
+"Feu clic en «Entra» per connectar-vos a Picasa Web Albums al navegador web. "
+"Haureu d'autoritzar Shotwell Connect per poder enllaçar amb el vostre compte "
+"Picasa Web Albums."
 
-#: src/main.vala:65
-#, c-format
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:361
 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."
+"A file required for publishing is unavailable. Publishing to Picasa can't "
+"continue."
 msgstr ""
-"La biblioteca de fotografies no és compatible amb aquesta versió del "
-"Shotwell. Sembla que es va crear amb el Shotwell %s (esquema %d). Aquesta "
-"versió és la %s (esquema %d). Netegeu la biblioteca mitjançant la supressió "
-"de %s i torneu a importar les fotografies."
+"Un fitxer necessari per la publicació no està disponible. No es pot dur a "
+"terme la publicació cap a Picasa."
 
-#: src/main.vala:71
+#. populate any widgets whose contents are programmatically-generated.
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:659
 #, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgid "You are logged into Picasa Web Albums as %s."
+msgstr "Heu entrant als àlbums web del Picasa com a %s."
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:665
+msgid "Videos will appear in:"
+msgstr "Els vídeos apareixeran a:"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
+msgid "Small (640 x 480 pixels)"
+msgstr "Petita (640 x 480 píxels)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:747
+msgid "Medium (1024 x 768 pixels)"
+msgstr "Mitjana (1024 x 768 píxels)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:748
+msgid "Recommended (1600 x 1200 pixels)"
+msgstr "Recomanada (1600 x 1200 píxels)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:749
+msgid "Google+ (2048 x 1536 pixels)"
+msgstr "Google+ (2048 x 1536 pixels)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:750
+#: ../src/editing_tools/EditingTools.vala:756
+msgid "Original Size"
+msgstr "Mida original"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
+#, c-format
+msgid "Creating album %s..."
+msgstr "Creant àlbum %s..."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:917
+msgid "An error message occurred when publishing to Piwigo. Please try again."
+msgstr "S'ha produït un error en connectar-se a Piwigo. Proveu de nou."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:998
+msgid ""
+"Enter the URL of your Piwigo photo library as well as the username and "
+"password associated with your Piwigo account for that library."
 msgstr ""
-"S'ha produït un error desconegut en intentar verificar la base de dades del "
-"Shotwell: %s"
+"Introduïu l'URL de la vostra biblioteca fotogràfica Piwigo i també el nom "
+"d'usuari i contrasenya associats amb el vostre compte Piwigo per aquesta "
+"biblioteca."
 
-#: src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "S'està carregant el Shotwell"
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:999
+msgid ""
+"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
+"entered"
+msgstr ""
+"El Shotwell no pot contactar amb la vostra biblioteca fotogràfica Piwigo. "
+"Comproveu l'URL que heu introduït"
 
-#: src/main.vala:294
-msgid "Path to Shotwell's private data"
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+msgid "Invalid URL"
+msgstr "Adreça incorrecta"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+msgid "Admins, Family, Friends, Contacts"
+msgstr "Administradors, família, amics, contactes"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+msgid "Admins, Family, Friends"
+msgstr "Administradors, família, amics"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+msgid "Admins, Family"
+msgstr "Administradors, família"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+msgid "Admins"
+msgstr "Administradors"
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:57
+msgid ""
+"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 ""
+"Actualment no esteu connectat al YouTube.\n"
+"\n"
+"Per continuar heu de tenir un compte al Google i configurar-lo per poder "
+"utilitzar-lo amb el YoutTube. Podeu configurar la majoria de comtes "
+"utilitzant el navegador i entrant almenys un cop al lloc YouTube."
 
-#: src/main.vala:294
-msgid "DIRECTORY"
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
+msgid ""
+"A file required for publishing is unavailable. Publishing to Youtube can't "
+"continue."
 msgstr ""
+"Un dels fitxers necessaris per a la publicació no està disponible. No es pot "
+"continuar amb la publicació a Youtube."
 
-#: src/main.vala:298
-msgid "Do not monitor library directory at runtime for changes"
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:461
+#, c-format
+msgid "You are logged into YouTube as %s."
+msgstr "Actualment esteu connectat al YouTube com a %s."
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:463
+#, c-format
+msgid "Videos will appear in '%s'"
+msgstr "Els vídeos apareixeran a «%s»"
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:495
+msgid "Public listed"
+msgstr "Llistat públicament"
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
+msgid "Public unlisted"
+msgstr "Sense llistar públicament"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
+msgid "Publish to an e_xisting album:"
+msgstr "Public_a a un àlbum existent:"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:2
+msgid "Create a _new album named:"
+msgstr "Crea un àlbum _nou anomenat:"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
+msgid "Videos and new photo albums _visible to:"
+msgstr "Els vídeos i els àlbums de fotografies nous són _visibles per a:"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:5
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:8
+msgid ""
+"_Remove location, camera, and other identifying information before uploading"
 msgstr ""
+"Sup_rimeix la ubicació, càmera i qualsevol altra informació identificativa "
+"abans de la càrrega"
 
-#: src/main.vala:302
-msgid "Don't display startup progress meter"
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
+msgid ""
+"Enter the confirmation number which appears after you log into Flickr in "
+"your Web browser."
 msgstr ""
+"Introduïu el número de confirmació que apareix després que us connecteu al "
+"Flickr en el navegador web."
 
-#: src/main.vala:306
-msgid "Show the application's version"
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
+msgid "Authorization _Number:"
+msgstr "_Número d'autorització:"
+
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:3
+#: ../src/Dialogs.vala:131
+msgid "Con_tinue"
+msgstr "Con_tinua"
+
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
+msgid "L_ist album in public gallery"
+msgstr "_Llista l'àlbum en una galeria pública"
+
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
+msgid "Photo _size preset:"
+msgstr "Mida p_redeterminada de les fotografies:"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
+msgid "_URL of your Piwigo photo library"
+msgstr "_URL de la biblioteca de fotografies Piwigo"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
+msgid "User _name"
+msgstr "_Nom d'usuari"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
+msgid "_Remember Password"
+msgstr "_Recorda la contrasenya"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
+msgid "An _existing category:"
+msgstr "Una categoria _existent:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:4
+msgid "Photos will be _visible by:"
+msgstr "Les fotografies seran _visibles per a:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:5
+msgid "Photo size:"
+msgstr "Mida de la fotografia:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:6
+msgid "within category:"
+msgstr "a la categoria:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
+msgid "Album comment:"
+msgstr "Comentari de l'àlbum:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
+msgid "_If a title is set and comment unset, use title as comment"
 msgstr ""
+"S_i el títol està definit i el comentari no ho està, es farà servir el títol "
+"com a comentari"
 
-#: src/main.vala:338
-msgid "[FILE]"
-msgstr "[FITXER]"
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:10
+msgid "_Do no upload tags"
+msgstr "_No pugis les etiquetes"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
+msgid "Logout"
+msgstr "Surt"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
+#: ../src/Resources.vala:303
+msgid "Publish"
+msgstr "Publica"
+
+#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
+msgid "Core Publishing Services"
+msgstr "Serveis de publicació principals"
+
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
+msgid "Video privacy _setting:"
+msgstr "_Paràmetres de la privacitat dels vídeos:"
+
+#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+msgid "Blinds"
+msgstr "Persiana"
+
+#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+msgid "Chess"
+msgstr "Escacs"
+
+#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+msgid "Circle"
+msgstr "Cercle"
+
+#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+msgid "Circles"
+msgstr "Cercles"
+
+#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+msgid "Clock"
+msgstr "Rellotge"
+
+#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+msgid "Crumble"
+msgstr "Esmicolament"
+
+#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+msgid "Fade"
+msgstr "Esvaïment"
+
+#: ../plugins/shotwell-transitions/SlideEffect.vala:20
+msgid "Slide"
+msgstr "Diapositiva"
 
-#: src/main.vala:342
+#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
+msgid "Squares"
+msgstr "Quadrats"
+
+#: ../plugins/shotwell-transitions/StripesEffect.vala:20
+msgid "Stripes"
+msgstr "Ratlles"
+
+#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
+msgid "Core Slideshow Transitions"
+msgstr "Transicions principals de la projecció de diapositives"
+
+#: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+
+#: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
 #, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Executeu «%s --help» per veure una llista completa de les opcions "
-"disponibles de la línia d'ordres.\n"
+msgid "Unable to create cache directory %s: %s"
+msgstr "Impossible crear el directori de memòria cau %s: %s"
 
-#: src/Properties.vala:84
-msgid "Today"
-msgstr "Avui"
+#: ../src/AppDirs.vala:58 ../src/AppDirs.vala:88
+#, c-format
+msgid "Unable to create data directory %s: %s"
+msgstr "No s'ha pogut crear el directori de dades %s: %s"
 
-#: src/Properties.vala:86
-msgid "Yesterday"
-msgstr "Ahir"
+#. If XDG yarfed, use ~/Pictures
+#: ../src/AppDirs.vala:152
+msgid "Pictures"
+msgstr "Imatges"
 
-#: src/Properties.vala:340 src/Dialogs.vala:1273
-msgid "Title:"
-msgstr "Títol:"
+#: ../src/AppDirs.vala:190
+#, c-format
+msgid "Unable to create temporary directory %s: %s"
+msgstr "No s'ha pogut crear el directori temporal %s: %s"
 
-#: src/Properties.vala:343
-msgid "Items:"
-msgstr "Elements:"
+#: ../src/AppDirs.vala:207 ../src/AppDirs.vala:223
+#, c-format
+msgid "Unable to create data subdirectory %s: %s"
+msgstr "No s'ha pogut crear el subdirectori de dades %s: %s"
+
+#: ../src/AppWindow.vala:53
+msgid "Pin Toolbar"
+msgstr "Mantén la barra d'eines"
+
+#: ../src/AppWindow.vala:54
+msgid "Pin the toolbar open"
+msgstr "Mantén la barra d'eines oberta"
+
+#: ../src/AppWindow.vala:59
+msgid "Leave fullscreen"
+msgstr "Surt de la pantalla completa"
 
-#: src/Properties.vala:346
+#: ../src/AppWindow.vala:525
+msgid "_Contents"
+msgstr "C_ontingut"
+
+#: ../src/AppWindow.vala:530
+msgid "_Frequently Asked Questions"
+msgstr "_Preguntes més freqüents"
+
+#: ../src/AppWindow.vala:535
+msgid "_Report a Problem..."
+msgstr "Info_rma d'un problema..."
+
+#: ../src/AppWindow.vala:634 ../src/AppWindow.vala:655
+#: ../src/AppWindow.vala:672 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
+#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441 ../src/Resources.vala:162
+#: ../src/data_imports/DataImportsUI.vala:374
+#: ../src/publishing/PublishingUI.vala:475
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: ../src/AppWindow.vala:682
 #, c-format
-msgid "%d Event"
-msgid_plural "%d Events"
-msgstr[0] "%d esdeveniment"
-msgstr[1] "%d esdeveniments"
+msgid ""
+"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
+"continue.\n"
+"\n"
+"%s"
+msgstr ""
+"S'ha produït un error fatal en accedir a la biblioteca del Shotwell. El "
+"Shotwell no pot continuar.\n"
+"\n"
+"%s"
 
-#: src/Properties.vala:353 src/events/EventDirectoryItem.vala:87
+#: ../src/AppWindow.vala:702
+msgid "Visit the Yorba web site"
+msgstr "Vés al lloc web d'en Yorba"
+
+#: ../src/AppWindow.vala:714
 #, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] "Una fotografia"
-msgstr[1] "%d fotografies"
+msgid "Unable to display help: %s"
+msgstr "No s'ha pogut mostrar l'ajuda: %s"
 
-#: src/Properties.vala:355 src/events/EventDirectoryItem.vala:85
+#: ../src/AppWindow.vala:722
 #, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] "%d vídeo"
-msgstr[1] "%d vídeos"
+msgid "Unable to navigate to bug database: %s"
+msgstr "No es pot navegar a causa d'un error a la base de dades: %s"
 
-#: src/Properties.vala:377
-msgid "Date:"
-msgstr "Data:"
+#: ../src/AppWindow.vala:730
+#, c-format
+msgid "Unable to display FAQ: %s"
+msgstr "No s'han pogut mostrar les PMF: %s"
 
-#: src/Properties.vala:381
-msgid "Time:"
-msgstr "Hora:"
+#: ../src/BatchImport.vala:26
+msgid "Success"
+msgstr "Correcte"
 
-#: src/Properties.vala:384 src/Properties.vala:389
-msgid "From:"
-msgstr "Des de:"
+#: ../src/BatchImport.vala:29
+msgid "File error"
+msgstr "S'ha produït un error de fitxer"
 
-#: src/Properties.vala:385 src/Properties.vala:390
-msgid "To:"
-msgstr "A:"
+#: ../src/BatchImport.vala:32
+msgid "Unable to decode file"
+msgstr "No s'ha pogut descodificar el fitxer"
 
-#: src/Properties.vala:395 src/editing_tools/EditingTools.vala:1850
-msgid "Size:"
-msgstr "Mida:"
+#: ../src/BatchImport.vala:35
+msgid "Database error"
+msgstr "S'ha produït un error de la base de dades"
 
-#: src/Properties.vala:404
-msgid "Duration:"
-msgstr "Durada:"
+#: ../src/BatchImport.vala:38
+msgid "User aborted import"
+msgstr "L'usuari ha interromput la importació"
+
+#: ../src/BatchImport.vala:41
+msgid "Not a file"
+msgstr "No és un fitxer"
+
+#: ../src/BatchImport.vala:44
+msgid "File already exists in database"
+msgstr "El fitxer ja existeix a la base de dades"
+
+#: ../src/BatchImport.vala:47
+msgid "Unsupported file format"
+msgstr "El format de fitxer no és compatible"
 
-#: src/Properties.vala:404
+#: ../src/BatchImport.vala:50
+msgid "Not an image file"
+msgstr "No és un fitxer d'imatge"
+
+#: ../src/BatchImport.vala:53
+msgid "Disk failure"
+msgstr "Ha fallat el disc"
+
+#: ../src/BatchImport.vala:56
+msgid "Disk full"
+msgstr "El disc està ple"
+
+#: ../src/BatchImport.vala:59
+msgid "Camera error"
+msgstr "S'ha produït un error a la càmera"
+
+#: ../src/BatchImport.vala:62
+msgid "File write error"
+msgstr "S'ha produït un error en escriure el fitxer"
+
+#: ../src/BatchImport.vala:65
+msgid "Corrupt image file"
+msgstr "Fitxer d'imatge corromput"
+
+#: ../src/BatchImport.vala:68
 #, c-format
-msgid "%.1f seconds"
-msgstr "%.1f segons"
+msgid "Imported failed (%d)"
+msgstr "Ha fallat la importació (%d)"
 
-#: src/Properties.vala:408
-msgid "Developer:"
-msgstr "Revelador:"
+#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
+msgid "S_lideshow"
+msgstr "_Presentació de diapositives"
 
-#: src/Properties.vala:436 src/Properties.vala:440 src/Properties.vala:447
-#: src/editing_tools/EditingTools.vala:2218
-msgid "Exposure:"
-msgstr "Exposició:"
+#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
+msgid "Play a slideshow"
+msgstr "Reprodueix una presentació de diapositives"
 
-#: src/Properties.vala:585
-msgid "Location:"
-msgstr "Ubicació:"
+#: ../src/CollectionPage.vala:456
+msgid "Export Photo/Video"
+msgstr "Exporta la fotografia/vídeo"
 
-#: src/Properties.vala:588
-msgid "File size:"
-msgstr "Mida del fitxer:"
+#: ../src/CollectionPage.vala:456
+msgid "Export Photos/Videos"
+msgstr "Exporta les fotografies/vídeos"
 
-#: src/Properties.vala:592
-msgid "Current Development:"
-msgstr ""
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
+#: ../src/PhotoPage.vala:3211
+msgid "Export Photo"
+msgstr "Exporta les fotografies"
 
-#: src/Properties.vala:594
-msgid "Original dimensions:"
-msgstr "Mida original:"
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:87
+msgid "Export Photos"
+msgstr "Exporta les fotografies"
 
-#: src/Properties.vala:597
-msgid "Camera make:"
-msgstr "Fabricant de la càmera:"
+#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+msgid "Rotating"
+msgstr "S'està girant"
 
-#: src/Properties.vala:600
-msgid "Camera model:"
-msgstr "Model de la càmera:"
+#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+msgid "Undoing Rotate"
+msgstr "S'està desfent la rotació"
 
-#: src/Properties.vala:603
-msgid "Flash:"
-msgstr "Flaix:"
+#: ../src/CollectionPage.vala:570
+msgid "Flipping Horizontally"
+msgstr "S'està invertint horitzontalment"
 
-#: src/Properties.vala:605
-msgid "Focal length:"
-msgstr "Distància focal:"
+#: ../src/CollectionPage.vala:571
+msgid "Undoing Flip Horizontally"
+msgstr "S'està desfent la inversió horitzontal"
 
-#: src/Properties.vala:608
-msgid "Exposure date:"
-msgstr ""
+#: ../src/CollectionPage.vala:580
+msgid "Flipping Vertically"
+msgstr "S'està invertint verticalment"
 
-#: src/Properties.vala:611
-msgid "Exposure time:"
-msgstr ""
+#: ../src/CollectionPage.vala:581
+msgid "Undoing Flip Vertically"
+msgstr "S'està desfent la inversió verticalment"
 
-#: src/Properties.vala:614
-msgid "Exposure bias:"
-msgstr "Desplaçament de l'exposició:"
+#: ../src/Commands.vala:733
+msgid "Reverting"
+msgstr "S'està revertint"
 
-#: src/Properties.vala:616
-msgid "GPS latitude:"
-msgstr "Latitud GPS:"
+#: ../src/Commands.vala:733
+msgid "Undoing Revert"
+msgstr "S'està desfent la reversió"
 
-#: src/Properties.vala:619
-msgid "GPS longitude:"
-msgstr "Longitud GPS:"
+#: ../src/Commands.vala:777
+msgid "Enhancing"
+msgstr "S'està millorant"
 
-#: src/Properties.vala:622
-msgid "Artist:"
-msgstr "Artista:"
+#: ../src/Commands.vala:777
+msgid "Undoing Enhance"
+msgstr "S'està desfent la millora"
 
-#: src/Properties.vala:624
-msgid "Copyright:"
-msgstr "Copyright:"
+#: ../src/Commands.vala:853
+msgid "Applying Color Transformations"
+msgstr "S'estan aplicant les transformacions de colors"
 
-#: src/Properties.vala:626
-msgid "Software:"
-msgstr "Programari:"
+#: ../src/Commands.vala:853
+msgid "Undoing Color Transformations"
+msgstr "S'estan desfent les transformacions de color"
 
-#: src/Properties.vala:630 src/Dialogs.vala:1288
-msgid "Comment:"
-msgstr ""
+#: ../src/Commands.vala:1003
+msgid "Creating New Event"
+msgstr "S'està creant un esdeveniment nou"
 
-#: src/Properties.vala:639
-msgid "Extended Information"
-msgstr "Informació ampliada"
+#: ../src/Commands.vala:1004
+msgid "Removing Event"
+msgstr "S'està suprimint l'esdeveniment"
+
+#: ../src/Commands.vala:1013
+msgid "Moving Photos to New Event"
+msgstr "S'estan movent les fotografies a l'esdeveniment nou"
+
+#: ../src/Commands.vala:1014
+msgid "Setting Photos to Previous Event"
+msgstr "S'estan establint les fotografies a l'esdeveniment anterior"
+
+#: ../src/Commands.vala:1071
+msgid "Merging"
+msgstr "S'està combinant"
+
+#: ../src/Commands.vala:1072
+msgid "Unmerging"
+msgstr "S'està desfent la combinació"
+
+#: ../src/Commands.vala:1081
+msgid "Duplicating photos"
+msgstr "S'estan duplicant les fotografies"
+
+#: ../src/Commands.vala:1081
+msgid "Removing duplicated photos"
+msgstr "S'estan suprimint les fotografies duplicades"
+
+#: ../src/Commands.vala:1104
+#, 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] ""
+"No s'ha pogut duplicar una fotografia a causa d'un error en el fitxer"
+msgstr[1] ""
+"No s'han pogut duplicar %d fotografies a causa d'errors en els fitxers"
+
+#: ../src/Commands.vala:1191
+msgid "Restoring previous rating"
+msgstr "S'està restaurant la valoració anterior"
+
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+msgid "Increasing ratings"
+msgstr "S'estan incrementant les puntuacions"
+
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+msgid "Decreasing ratings"
+msgstr "S'estan reduint les puntuacions"
+
+#: ../src/Commands.vala:1252
+msgid "Setting RAW developer"
+msgstr "S'està establint el revelador RAW"
+
+#: ../src/Commands.vala:1252
+msgid "Restoring previous RAW developer"
+msgstr "S'està restaurant el revelador RAW anterior"
+
+#: ../src/Commands.vala:1253
+msgid "Set Developer"
+msgstr "Estableix el desenvolupador"
+
+#: ../src/Commands.vala:1343
+msgid "Original photo could not be adjusted."
+msgstr "La fotografia original no s'ha pogut ajustar."
+
+#: ../src/Commands.vala:1364
+msgid "Adjusting Date and Time"
+msgstr "S'està ajustant la data i l'hora"
+
+#: ../src/Commands.vala:1364
+msgid "Undoing Date and Time Adjustment"
+msgstr "S'està desfent l'ajustament de la data i l'hora"
+
+#: ../src/Commands.vala:1395
+msgid "One original photo could not be adjusted."
+msgid_plural "The following original photos could not be adjusted."
+msgstr[0] "La fotografia original no s'ha pogut ajustar."
+msgstr[1] "Les fotografies originals no s'han pogut ajustar."
+
+#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
+msgid "Time Adjustment Error"
+msgstr "S'ha produït un error en ajustar l'hora"
+
+#: ../src/Commands.vala:1419
+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] ""
+"L'ajustament de l'hora no s'ha pogut desfer en el fitxer de fotografia "
+"següent."
+msgstr[1] ""
+"Els ajustaments de l'hora no s'han pogut desfer en els fitxers de "
+"fotografies següents."
+
+#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
+msgid "Create Tag"
+msgstr "Crea una etiqueta"
 
-#: src/Dialogs.vala:16
+#: ../src/Commands.vala:1691
+#, c-format
+msgid "Move Tag \"%s\""
+msgstr "Mou l'etiqueta «%s»"
+
+#: ../src/Commands.vala:2343
+msgid "Move Photos to Trash"
+msgstr "Mou les fotografies a la paperera"
+
+#: ../src/Commands.vala:2343
+msgid "Restore Photos from Trash"
+msgstr "Restaura les fotografies de la paperera"
+
+#: ../src/Commands.vala:2344
+msgid "Move the photos to the Shotwell trash"
+msgstr "Mou les fotografies a la paperera del Shotwell"
+
+#: ../src/Commands.vala:2344
+msgid "Restore the photos back to the Shotwell library"
+msgstr "Restaura les fotografies cap a la biblioteca del Shotwell"
+
+#: ../src/Commands.vala:2363
+msgid "Moving Photos to Trash"
+msgstr "S'estan movent les fotografies a la paperera"
+
+#: ../src/Commands.vala:2363
+msgid "Restoring Photos From Trash"
+msgstr "S'estan restaurant les fotografies de la paperera"
+
+#: ../src/Commands.vala:2449
+msgid "Flag selected photos"
+msgstr "Senyala les fotografies seleccionades"
+
+#: ../src/Commands.vala:2450
+msgid "Unflag selected photos"
+msgstr "Treu el senyalador a les fotografies seleccionades"
+
+#: ../src/Commands.vala:2451
+msgid "Flagging selected photos"
+msgstr "S'estan marcant les fotos seleccionades"
+
+#: ../src/Commands.vala:2452
+msgid "Unflagging selected photos"
+msgstr "S'estan desmarcant les fotos seleccionades"
+
+#: ../src/Commands.vala:2459
+msgid "Flag"
+msgstr "Senyala"
+
+#: ../src/Commands.vala:2459
+msgid "Unflag"
+msgstr "Treu el senyalador"
+
+#: ../src/DesktopIntegration.vala:121
+#, c-format
+msgid "Unable to launch Nautilus Send-To: %s"
+msgstr "No s'ha pogut executar el Nautilus Send-To: %s"
+
+#: ../src/DesktopIntegration.vala:129
+msgid "Send To"
+msgstr "Envia a"
+
+#: ../src/DesktopIntegration.vala:174
+#, c-format
+msgid "Unable to export background to %s: %s"
+msgstr "No s'ha pogut exportar el fons a %s: %s"
+
+#: ../src/DesktopIntegration.vala:311
+#, c-format
+msgid "Unable to prepare desktop slideshow: %s"
+msgstr ""
+"No s'ha pogut preparar la presentació de diapositives de l'escriptori: %s"
+
+#: ../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] "Això suprimirà l'etiqueta «%s» d'una fotografia. Voleu continuar?"
 msgstr[1] "Això suprimirà l'etiqueta «%s» de %d fotografies. Voleu continuar?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1361
-#: src/Dialogs.vala:1384 src/data_imports/DataImportsUI.vala:399
-#: src/AppWindow.vala:615 src/AppWindow.vala:636 src/AppWindow.vala:653
-#: src/publishing/PublishingUI.vala:498
-msgid "_Cancel"
-msgstr "_Cancel·la"
-
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1329
-#: src/Resources.vala:330 src/Resources.vala:378 src/Resources.vala:643
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
+#: ../src/Resources.vala:163 ../src/Resources.vala:369
+#: ../src/Resources.vala:417 ../src/Resources.vala:682
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: src/Dialogs.vala:25
+#: ../src/Dialogs.vala:25
 #, c-format
 msgid "This will remove the saved search \"%s\".  Continue?"
 msgstr "Això suprimirà la cerca desada «%s». Voleu continuar?"
 
-#: src/Dialogs.vala:35
-#, c-format
+#: ../src/Dialogs.vala:35
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
 "Shotwell"
@@ -668,17 +1470,26 @@ msgid_plural ""
 "Switching developers will undo all changes you have made to these photos in "
 "Shotwell"
 msgstr[0] ""
+"En canviar els desenvolupadors es desfaran tots els canvis que heu fet a "
+"aquesta foto al Shotwell"
 msgstr[1] ""
+"En canviar els desenvolupadors es desfaran tots els canvis que heu fet a "
+"aquestes fotos al Shotwell"
 
-#: src/Dialogs.vala:39
+#: ../src/Dialogs.vala:39
 msgid "_Switch Developer"
-msgstr ""
+msgstr "_Canvia el desenvolupador"
 
-#: src/Dialogs.vala:58
+#: ../src/Dialogs.vala:58
 msgid "Export Video"
 msgstr "Exporta vídeos"
 
-#: src/Dialogs.vala:115
+#. Ticket #3023
+#. Attempt to replace the system error with something friendlier
+#. if we can't copy an image over for editing in an external tool.
+#. Did we fail because we can't write to this directory?
+#. Yes - display an alternate error message here.
+#: ../src/Dialogs.vala:115
 #, c-format
 msgid ""
 "Shotwell couldn't create a file for editing this photo because you do not "
@@ -687,15 +1498,16 @@ msgstr ""
 "El Shotwell no ha pogut crear un fitxer per editar aquesta fotografia perquè "
 "no teniu permís per escriure a %s."
 
-#: src/Dialogs.vala:124
+#: ../src/Dialogs.vala:124
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
 msgstr ""
-"No s'ha pogut exportar la fotografia següent degut a un error en el fitxer.\n"
+"No s'ha pogut exportar la fotografia següent a causa d'un error en el "
+"fitxer.\n"
 "\n"
 
-#: src/Dialogs.vala:130
+#: ../src/Dialogs.vala:130
 msgid ""
 "\n"
 "\n"
@@ -705,184 +1517,213 @@ msgstr ""
 "\n"
 "Voleu continuar exportant?"
 
-#: src/Dialogs.vala:131
-msgid "Con_tinue"
-msgstr "Con_tinua"
-
-#: src/Dialogs.vala:147
+#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
+#. aren't formats so much as they are operating modes that determine specific formats.
+#. Hereafter we'll refer to these as "special formats."
+#: ../src/Dialogs.vala:147
 msgid "Unmodified"
 msgstr "Sense modificar"
 
-#: src/Dialogs.vala:148
+#: ../src/Dialogs.vala:148
 msgid "Current"
 msgstr "Actual"
 
-#: src/Dialogs.vala:212
+#. layout controls
+#: ../src/Dialogs.vala:213
 msgid "_Format:"
 msgstr "_Format:"
 
-#: src/Dialogs.vala:215
+#: ../src/Dialogs.vala:216
 msgid "_Quality:"
 msgstr "_Qualitat:"
 
-#: src/Dialogs.vala:218
+#: ../src/Dialogs.vala:219
 msgid "_Scaling constraint:"
 msgstr "Constant d'e_scala:"
 
-#: src/Dialogs.vala:221
-msgid " _pixels"
-msgstr " _píxels"
+#: ../src/Dialogs.vala:222
+msgid "_Pixels:"
+msgstr " _Píxels:"
 
-#: src/Dialogs.vala:229
+#: ../src/Dialogs.vala:225
 msgid "Export metadata"
 msgstr "Exporta les metadades"
 
-#: src/Dialogs.vala:465
+#: ../src/Dialogs.vala:459
 msgid "Save Details..."
-msgstr ""
+msgstr "Desa els detalls..."
 
-#: src/Dialogs.vala:466
+#: ../src/Dialogs.vala:460
 msgid "Save Details"
-msgstr ""
+msgstr "Desa els detalls"
 
-#: src/Dialogs.vala:481
+#: ../src/Dialogs.vala:475
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(i %d més)\n"
 
-#: src/Dialogs.vala:534
+#: ../src/Dialogs.vala:528
 msgid "Import Results Report"
-msgstr ""
+msgstr "Importa l'informe de resultats"
 
-#: src/Dialogs.vala:538
+#: ../src/Dialogs.vala:532
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "S'ha intentat importar %d fitxer"
+msgstr[1] "S'han intentat importar %d fitxers"
 
-#: src/Dialogs.vala:541
+#: ../src/Dialogs.vala:535
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "D'aquests, s'ha importat correctament %d fitxer"
+msgstr[1] "D'aquests, s'han importat correctament %d fitxers"
 
-#: src/Dialogs.vala:553
+#.
+#. Duplicates
+#.
+#: ../src/Dialogs.vala:547
 msgid "Duplicate Photos/Videos Not Imported:"
-msgstr ""
+msgstr "Fotos/Vídeos duplicats que no s'han importat:"
 
-#: src/Dialogs.vala:557
+#: ../src/Dialogs.vala:551
 msgid "duplicates existing media item"
-msgstr ""
+msgstr "duplica un element multimèdia existent"
 
-#: src/Dialogs.vala:568
+#.
+#. Files Not Imported Due to Camera Errors
+#.
+#: ../src/Dialogs.vala:562
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
-msgstr ""
+msgstr "Fotos/Vídeos que no s'han importat a causa d'errors de la càmera:"
 
-#: src/Dialogs.vala:571 src/Dialogs.vala:586 src/Dialogs.vala:601
-#: src/Dialogs.vala:617 src/Dialogs.vala:632 src/Dialogs.vala:646
+#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
+#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
 msgid "error message:"
-msgstr ""
+msgstr "missatge d'error:"
 
-#: src/Dialogs.vala:582
+#.
+#. Files Not Imported Because They Weren't Recognized as Photos or Videos
+#.
+#: ../src/Dialogs.vala:576
 msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgstr ""
+"Fitxers que no s'han importat perquè no s'han reconegut com a fotos o vídeos:"
 
-#: src/Dialogs.vala:597
+#.
+#. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
+#.
+#: ../src/Dialogs.vala:591
 msgid ""
 "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
 "Understands:"
 msgstr ""
+"Fitxers que no s'han importat perquè no estaven en un format que el Shotwell "
+"pugui comprendre:"
 
-#: src/Dialogs.vala:612
+#.
+#. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
+#.
+#: ../src/Dialogs.vala:606
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
 "Library:"
 msgstr ""
+"Fotos/Vídeos que no s'han importat perquè el Shotwell no ha pogut copiar-los "
+"en aquesta biblioteca:"
 
-#: src/Dialogs.vala:616
+#: ../src/Dialogs.vala:610
 #, c-format
 msgid ""
 "couldn't copy %s\n"
 "\tto %s"
 msgstr ""
+"no s'ha pogut copiar %s\n"
+"\ta %s"
 
-#: src/Dialogs.vala:628
+#.
+#. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
+#.
+#: ../src/Dialogs.vala:622
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr ""
+"Fotos/Vídeos que no s'han importat perquè els fitxers estan corromputs:"
 
-#: src/Dialogs.vala:643
+#.
+#. Photos/Videos Not Imported for Other Reasons
+#.
+#: ../src/Dialogs.vala:637
 msgid "Photos/Videos Not Imported for Other Reasons:"
-msgstr ""
+msgstr "Fotos/Vídeos que no s'han importat per altres raons:"
 
-#: src/Dialogs.vala:663
+#: ../src/Dialogs.vala:657
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "No s'ha importat una fotografia duplicada:\n"
 msgstr[1] "No s'han importat %d fotografies duplicades:\n"
 
-#: src/Dialogs.vala:666
+#: ../src/Dialogs.vala:660
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "No s'ha importat un vídeo duplicat:\n"
 msgstr[1] "No s'han importat %d vídeos duplicats:\n"
 
-#: src/Dialogs.vala:669
+#: ../src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "No s'ha importat una fotografia/vídeo duplicat:\n"
 msgstr[1] "No s'han importat %d fotografies/vídeos duplicats:\n"
 
-#: src/Dialogs.vala:683
+#: ../src/Dialogs.vala:677
 #, 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] ""
-"Ha fallat la importació d'una fotografia degut a un error de fitxer o de "
+"Ha fallat la importació d'una fotografia a causa d'un error de fitxer o de "
 "maquinari:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d fotografies degut a un error de fitxer o de "
+"Ha fallat la importació de %d fotografies a causa d'un error de fitxer o de "
 "maquinari:\n"
 
-#: src/Dialogs.vala:686
+#: ../src/Dialogs.vala:680
 #, 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] ""
-"Ha fallat la importació d'un vídeo degut a un error de fitxer o de "
+"Ha fallat la importació d'un vídeo a causa d'un error de fitxer o de "
 "maquinari:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d vídeos degut a un error de fitxer o de "
+"Ha fallat la importació de %d vídeos a causa d'un error de fitxer o de "
 "maquinari:\n"
 
-#: src/Dialogs.vala:689
+#: ../src/Dialogs.vala:683
 #, 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] ""
-"Ha fallat la importació d'una fotografia/vídeo degut a un error de fitxer o "
-"de maquinari:\n"
-msgstr[1] ""
-"Ha fallat la importació de %d fotografies/vídeos degut a un error de fitxer "
+"Ha fallat la importació d'una fotografia/vídeo a causa d'un error de fitxer "
 "o de maquinari:\n"
+msgstr[1] ""
+"Ha fallat la importació de %d fotografies/vídeos a causa d'un error de "
+"fitxer o de maquinari:\n"
 
-#: src/Dialogs.vala:692
+#: ../src/Dialogs.vala:686
 #, 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] ""
-"Ha fallat la importació d'un fitxer degut a un error de fitxer o de "
+"Ha fallat la importació d'un fitxer a causa d'un error de fitxer o de "
 "maquinari:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d fitxers degut a un error de fitxer o de "
+"Ha fallat la importació de %d fitxers a causa d'un error de fitxer o de "
 "maquinari:\n"
 
-#: src/Dialogs.vala:706
+#: ../src/Dialogs.vala:700
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -896,7 +1737,7 @@ msgstr[1] ""
 "Ha fallat la importació de %d fotografies perquè no es pot escriure a la "
 "carpeta de la biblioteca de fotografies:\n"
 
-#: src/Dialogs.vala:709
+#: ../src/Dialogs.vala:703
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -910,7 +1751,7 @@ msgstr[1] ""
 "Ha fallat la importació de %d vídeos perquè no es pot escriure a la carpeta "
 "de la biblioteca de fotografies:\n"
 
-#: src/Dialogs.vala:712
+#: ../src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -925,7 +1766,7 @@ msgstr[1] ""
 "Ha fallat la importació de %d fotografies/vídeos perquè no es pot escriure a "
 "la carpeta de la biblioteca de fotografies:\n"
 
-#: src/Dialogs.vala:715
+#: ../src/Dialogs.vala:709
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -939,208 +1780,236 @@ msgstr[1] ""
 "Ha fallat la importació de %d fitxers perquè no es pot escriure a la carpeta "
 "de la biblioteca de fotografies:\n"
 
-#: src/Dialogs.vala:729
+#: ../src/Dialogs.vala:723
 #, 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] ""
-"Ha fallat la importació d'una fotografia degut a un error de la càmera:\n"
+"Ha fallat la importació d'una fotografia a causa d'un error de la càmera:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d fotografies degut a un error de la càmera:\n"
+"Ha fallat la importació de %d fotografies a causa d'un error de la càmera:\n"
 
-#: src/Dialogs.vala:732
+#: ../src/Dialogs.vala:726
 #, 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] "Ha fallat la importació d'un vídeo degut a un error de la càmera:\n"
+msgstr[0] ""
+"Ha fallat la importació d'un vídeo a causa d'un error de la càmera:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d vídeos degut a un error de la càmera:\n"
+"Ha fallat la importació de %d vídeos a causa d'un error de la càmera:\n"
 
-#: src/Dialogs.vala:735
+#: ../src/Dialogs.vala:729
 #, 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] ""
-"Ha fallat la importació d'una fotografia/vídeo degut a un error de la "
+"Ha fallat la importació d'una fotografia/vídeo a causa d'un error de la "
 "càmera:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d fotografies/vídeos degut a un error de la "
+"Ha fallat la importació de %d fotografies/vídeos a causa d'un error de la "
 "càmera:\n"
 
-#: src/Dialogs.vala:738
+#: ../src/Dialogs.vala:732
 #, 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] ""
-"Ha fallat la importació d'un fitxer degut a un error de la càmera:\n"
+"Ha fallat la importació d'un fitxer a causa d'un error de la càmera:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d fitxers degut a un error de la càmera:\n"
+"Ha fallat la importació de %d fitxers a causa d'un error de la càmera:\n"
 
-#: src/Dialogs.vala:752
+#: ../src/Dialogs.vala:746
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
-msgstr[0] ""
+msgstr[0] "No s'ha pogut importar 1 foto perquè el fitxer està corromput:\n"
 msgstr[1] ""
+"No s'han pogut importar %d fotos perquè els fitxers estan corromputs:\n"
 
-#: src/Dialogs.vala:755
+#: ../src/Dialogs.vala:749
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
-msgstr[0] ""
+msgstr[0] "No s'ha pogut importar 1 vídeo perquè el fitxer està corromput:\n"
 msgstr[1] ""
+"No s'han pogut importar %d vídeos perquè els fitxers estan corromputs:\n"
 
-#: src/Dialogs.vala:758
+#: ../src/Dialogs.vala:752
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
 msgstr[0] ""
+"No s'ha pogut importar 1 foto/vídeo perquè el fitxer està corromput:\n"
 msgstr[1] ""
+"No s'han pogut importar %d fotos/vídeos perquè els fitxers estan corromputs:\n"
 
-#: src/Dialogs.vala:761
+#: ../src/Dialogs.vala:755
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "No s'ha pogut importar 1 fitxer perquè està corromput:\n"
+msgstr[1] "No s'han pogut importar %d fitxers perquè estan corromputs:\n"
 
-#: src/Dialogs.vala:778
+#. we have no notion of "unsupported" video files right now in Shotwell (all
+#. standard container formats are supported, it's just that the streams in them
+#. might or might not be interpretable), so this message does not need to be
+#. media specific
+#: ../src/Dialogs.vala:772
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
 msgstr[0] "S'ha omès una fotografia no compatible:\n"
 msgstr[1] "S'han omès %d fotografies no compatibles:\n"
 
-#: src/Dialogs.vala:793
+#. we have no notion of "non-video" video files right now in Shotwell, so this
+#. message doesn't need to be media specific
+#: ../src/Dialogs.vala:787
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "S'ha omès un fitxer que no era d'imatge:\n"
 msgstr[1] "S'han omès %d fitxers que no eren d'imatge:\n"
 
-#: src/Dialogs.vala:804
+#: ../src/Dialogs.vala:798
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
-msgstr[0] "S'ha omès una fotografia degut a la cancel·lació de l'usuari:\n"
-msgstr[1] "S'han omès %d fotografies degut a la cancel·lació de l'usuari:\n"
+msgstr[0] "S'ha omès una fotografia a causa de la cancel·lació de l'usuari:\n"
+msgstr[1] "S'han omès %d fotografies a causa de la cancel·lació de l'usuari:\n"
 
-#: src/Dialogs.vala:807
+#: ../src/Dialogs.vala:801
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
-msgstr[0] "S'ha omès un vídeo degut a la cancel·lació de l'usuari:\n"
-msgstr[1] "S'han omès %d vídeos degut a la cancel·lació de l'usuari:\n"
+msgstr[0] "S'ha omès un vídeo a causa de la cancel·lació de l'usuari:\n"
+msgstr[1] "S'han omès %d vídeos a causa de la cancel·lació de l'usuari:\n"
 
-#: src/Dialogs.vala:810
+#: ../src/Dialogs.vala:804
 #, 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] ""
-"S'ha omès una fotografia/vídeo degut a la cancel·lació de l'usuari:\n"
+"S'ha omès una fotografia/vídeo a causa de la cancel·lació de l'usuari:\n"
 msgstr[1] ""
-"S'han omès %d fotografies/vídeos degut a la cancel·lació de l'usuari:\n"
+"S'han omès %d fotografies/vídeos a causa de la cancel·lació de l'usuari:\n"
 
-#: src/Dialogs.vala:813
+#: ../src/Dialogs.vala:807
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
-msgstr[0] "S'ha omès un fitxer degut a la cancel·lació de l'usuari:\n"
-msgstr[1] "S'han omès %d fitxers degut a la cancel·lació de l'usuari:\n"
+msgstr[0] "S'ha omès un fitxer a causa de la cancel·lació de l'usuari:\n"
+msgstr[1] "S'han omès %d fitxers a causa de la cancel·lació de l'usuari:\n"
 
-#: src/Dialogs.vala:827
+#: ../src/Dialogs.vala:821
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "S'ha importat una fotografia correctament.\n"
 msgstr[1] "S'han importat %d fotografies correctament.\n"
 
-#: src/Dialogs.vala:830
+#: ../src/Dialogs.vala:824
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "S'ha importat un vídeo correctament.\n"
 msgstr[1] "S'han importat %d vídeos correctament.\n"
 
-#: src/Dialogs.vala:833
+#: ../src/Dialogs.vala:827
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
 msgstr[0] "S'ha importat una fotografia/vídeo correctament.\n"
 msgstr[1] "S'han importat %d fotografies/vídeos correctament.\n"
 
-#: src/Dialogs.vala:849
+#. if no media items were imported at all (i.e. an empty directory attempted), need to at least
+#. report that nothing was imported
+#: ../src/Dialogs.vala:843
 msgid "No photos or videos imported.\n"
 msgstr "No s'ha importat cap vídeo o fotografia.\n"
 
-#: src/Dialogs.vala:856 src/Dialogs.vala:875
+#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
 msgid "Import Complete"
 msgstr "S'ha completat la importació"
 
-#: src/Dialogs.vala:1103
+#: ../src/Dialogs.vala:1155
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segon"
 msgstr[1] "%d segons"
 
-#: src/Dialogs.vala:1106
+#: ../src/Dialogs.vala:1158
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuts"
 
-#: src/Dialogs.vala:1110
+#: ../src/Dialogs.vala:1162
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d hores"
 
-#: src/Dialogs.vala:1113
+#: ../src/Dialogs.vala:1165
 msgid "1 day"
 msgstr "1 dia"
 
-#: src/Dialogs.vala:1263 src/Resources.vala:205
+#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
 msgid "Rename Event"
 msgstr "Canvia el nom de l'esdeveniment"
 
-#: src/Dialogs.vala:1263
+#: ../src/Dialogs.vala:1315
 msgid "Name:"
 msgstr "Nom:"
 
-#: src/Dialogs.vala:1273 src/Resources.vala:274
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
 msgid "Edit Title"
 msgstr "Edita el títol"
 
-#: src/Dialogs.vala:1287 src/Resources.vala:280
+#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
+msgid "Title:"
+msgstr "Títol:"
+
+#. Dialog title
+#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
 msgid "Edit Event Comment"
-msgstr ""
+msgstr "Edita el comentari de l'esdeveniment"
 
-#: src/Dialogs.vala:1287
+#: ../src/Dialogs.vala:1344
 msgid "Edit Photo/Video Comment"
-msgstr ""
+msgstr "Edita el comentari de la foto/vídeo"
+
+#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
+msgid "Comment:"
+msgstr "Comentari:"
 
-#: src/Dialogs.vala:1304
-msgid "_Trash File"
-msgid_plural "_Trash Files"
-msgstr[0] "_Envia el fitxer a la paperera"
-msgstr[1] "_Envia els fitxers a la paperera"
+#: ../src/Dialogs.vala:1361
+msgid "Remove and _Trash File"
+msgid_plural "Remove and _Trash Files"
+msgstr[0] "Suprimeix i _envia el fitxer a la paperera"
+msgstr[1] "Suprimeix i _envia els fitxers a la paperera"
 
-#: src/Dialogs.vala:1308
-msgid "Only _Remove"
-msgstr "_Suprimeix només"
+#: ../src/Dialogs.vala:1365
+msgid "_Remove From Library"
+msgstr "_Suprimeix de la biblioteca"
+
+#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
+msgid "_Keep"
+msgstr "_Manté"
 
-#: src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edit?"
 msgstr "Voleu revertir l'edició externa?"
 
-#: src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edits?"
 msgstr "Voleu revertir les edicions externes?"
 
-#: src/Dialogs.vala:1353
+#: ../src/Dialogs.vala:1410
 #, c-format
 msgid "This will destroy all changes made to the external file.  Continue?"
 msgid_plural ""
@@ -1150,87 +2019,87 @@ msgstr[0] ""
 msgstr[1] ""
 "Això suprimirà tots els canvis fets als %d fitxers externs. Voleu continuar?"
 
-#: src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edit"
 msgstr "_Reverteix l'edició externa"
 
-#: src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edits"
 msgstr "_Reverteix les edicions externes"
 
-#: src/Dialogs.vala:1378
+#: ../src/Dialogs.vala:1435
 #, 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] "Això suprimirà la fotografia de la biblioteca. Voleu continuar?"
 msgstr[1] "Això suprimirà %d fotografies de la biblioteca. Voleu continuar?"
 
-#: src/Dialogs.vala:1385
+#: ../src/Dialogs.vala:1442 ../src/Resources.vala:178
 msgid "_Remove"
 msgstr "_Suprimeix"
 
-#: src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photo From Library"
 msgstr "Suprimeix la fotografia de la biblioteca"
 
-#: src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photos From Library"
 msgstr "Suprimeix les fotografies de la biblioteca"
 
-#: src/Dialogs.vala:1479
+#: ../src/Dialogs.vala:1536
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1626
+#: ../src/Dialogs.vala:1688
 msgid "AM"
 msgstr "AM"
 
-#: src/Dialogs.vala:1627
+#: ../src/Dialogs.vala:1689
 msgid "PM"
 msgstr "PM"
 
-#: src/Dialogs.vala:1628
+#: ../src/Dialogs.vala:1690
 msgid "24 Hr"
 msgstr "24 h"
 
-#: src/Dialogs.vala:1643
+#: ../src/Dialogs.vala:1705
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Desplaça les fotografies/vídeos amb la mateixa quantitat"
 
-#: src/Dialogs.vala:1648
+#: ../src/Dialogs.vala:1710
 msgid "Set _all photos/videos to this time"
 msgstr "Estableix _totes les fotografies/vídeos a aquesta hora"
 
-#: src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo file"
-msgstr "_Modificar el fitxer d'imatge original"
+msgstr "_Modifica el fitxer d'imatge original"
 
-#: src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo files"
-msgstr "_Modificar els fitxers d'imatges originals"
+msgstr "_Modifica els fitxers d'imatges originals"
 
-#: src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original file"
 msgstr "_Modifica el fitxer original"
 
-#: src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original files"
 msgstr "_Modifica els fitxers originals"
 
-#: src/Dialogs.vala:1744
+#: ../src/Dialogs.vala:1806
 msgid "Original: "
 msgstr "Original: "
 
-#: src/Dialogs.vala:1745
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d/%m/%Y, %H:%M:%S"
 
-#: src/Dialogs.vala:1746
+#: ../src/Dialogs.vala:1808
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d/%m/%Y, %I:%M:%S %p"
 
-#: src/Dialogs.vala:1835
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -1239,7 +2108,7 @@ msgstr ""
 "El temps d'exposició es desplaçarà cap endavant per\n"
 "%d %s, %d %s, %d %s i %d %s."
 
-#: src/Dialogs.vala:1836
+#: ../src/Dialogs.vala:1898
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -1248,31 +2117,31 @@ msgstr ""
 "El temps d'exposició es desplaçarà cap enrere per\n"
 "%d %s, %d %s, %d %s i %d %s."
 
-#: src/Dialogs.vala:1838
+#: ../src/Dialogs.vala:1900
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dies"
 
-#: src/Dialogs.vala:1839
+#: ../src/Dialogs.vala:1901
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "hores"
 
-#: src/Dialogs.vala:1840
+#: ../src/Dialogs.vala:1902
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuts"
 
-#: src/Dialogs.vala:1841
+#: ../src/Dialogs.vala:1903
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segon"
 msgstr[1] "segons"
 
-#: src/Dialogs.vala:1885
+#: ../src/Dialogs.vala:1947
 #, c-format
 msgid ""
 "\n"
@@ -1291,89 +2160,93 @@ msgstr[1] ""
 "\n"
 "I %d altres."
 
-#: src/Dialogs.vala:1907 src/Dialogs.vala:1934
+#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
 msgid "Tags (separated by commas):"
 msgstr "Etiquetes (separades per comes):"
 
-#: src/Dialogs.vala:2014
+#: ../src/Dialogs.vala:2076
 msgid "Welcome!"
 msgstr "Us donem la benvinguda"
 
-#: src/Dialogs.vala:2021
-#, c-format
+#: ../src/Dialogs.vala:2083
 msgid "Welcome to Shotwell!"
 msgstr "Us donem la benvinguda al Shotwell"
 
-#: src/Dialogs.vala:2025
-#, c-format
+#: ../src/Dialogs.vala:2087
 msgid "To get started, import photos in any of these ways:"
 msgstr ""
 "Per començar, podeu importar fotografies de qualsevol de les maneres "
 "següents:"
 
-#: src/Dialogs.vala:2044
+#: ../src/Dialogs.vala:2106
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Trieu <span weight=\"bold\">Fitxer %s Importa des d'una carpeta</span>"
 
-#: src/Dialogs.vala:2045
+#: ../src/Dialogs.vala:2107
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Arrossegueu i deixeu anar fotografies a la finestra del Shotwell"
 
-#: src/Dialogs.vala:2046
+#: ../src/Dialogs.vala:2108
 msgid "Connect a camera to your computer and import"
 msgstr "Connecteu una càmera al vostre ordinador i importeu-ne les fotografies"
 
-#: src/Dialogs.vala:2056
+#: ../src/Dialogs.vala:2118
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importa les fotografies de la carpeta %s"
 
-#: src/Dialogs.vala:2063
+#: ../src/Dialogs.vala:2125
 msgid "You can also import photos in any of these ways:"
 msgstr "També podeu importar fotografies de qualsevol d'aquestes maneres:"
 
-#: src/Dialogs.vala:2073
+#: ../src/Dialogs.vala:2135
 msgid "_Don't show this message again"
 msgstr "_No tornis a mostrar aquest missatge"
 
-#: src/Dialogs.vala:2108
+#: ../src/Dialogs.vala:2170
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Importa fotografies de la biblioteca %s"
 
-#: src/Dialogs.vala:2252 src/Dialogs.vala:2256
+#. We're installed system-wide, so use the system help.
+#. We're being run from the build directory; we'll have to handle clicks to this
+#. link manually ourselves, due to a limitation ghelp: URIs.
+#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
 msgid "(Help)"
 msgstr "(ajuda)"
 
-#: src/Dialogs.vala:2265
+#: ../src/Dialogs.vala:2324
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Any%sMes%sDia"
 
-#: src/Dialogs.vala:2267
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth"
 msgstr "Any%sMes"
 
-#: src/Dialogs.vala:2269
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Any%sMes-Dia"
 
-#: src/Dialogs.vala:2271
+#: ../src/Dialogs.vala:2330
 msgid "Year-Month-Day"
 msgstr "Any-Mes-Dia"
 
-#: src/Dialogs.vala:2272 src/editing_tools/EditingTools.vala:777
+#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Personalitzat"
 
-#: src/Dialogs.vala:2509
+#. Invalid pattern.
+#: ../src/Dialogs.vala:2568
 msgid "Invalid pattern"
 msgstr "Patró no vàlid"
 
-#: src/Dialogs.vala:2612
+#. This function is used to determine whether or not files should be copied or linked when imported.
+#. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
+#: ../src/Dialogs.vala:2670
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -1381,31 +2254,31 @@ msgstr ""
 "El Shotwell pot copiar les fotografies a la carpeta de la biblioteca o les "
 "pot importar sense copiar-les."
 
-#: src/Dialogs.vala:2617
+#: ../src/Dialogs.vala:2675
 msgid "Co_py Photos"
 msgstr "Co_pia les fotografies"
 
-#: src/Dialogs.vala:2618
+#: ../src/Dialogs.vala:2676
 msgid "_Import in Place"
 msgstr "_Importa-les a la ubicació"
 
-#: src/Dialogs.vala:2619
+#: ../src/Dialogs.vala:2677
 msgid "Import to Library"
 msgstr "Importa a la biblioteca"
 
-#: src/Dialogs.vala:2629 src/PhotoPage.vala:3075
+#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
 msgid "Remove From Library"
 msgstr "Suprimeix de la biblioteca"
 
-#: src/Dialogs.vala:2630 src/PhotoPage.vala:3075
+#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
 msgid "Removing Photo From Library"
 msgstr "S'està suprimint la fotografia de la biblioteca"
 
-#: src/Dialogs.vala:2630
+#: ../src/Dialogs.vala:2688
 msgid "Removing Photos From Library"
 msgstr "S'estan suprimint les fotografies de la biblioteca"
 
-#: src/Dialogs.vala:2644
+#: ../src/Dialogs.vala:2702
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -1428,7 +2301,7 @@ msgstr[1] ""
 "\n"
 "Aquesta acció no es pot desfer."
 
-#: src/Dialogs.vala:2648
+#: ../src/Dialogs.vala:2706
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -1451,7 +2324,7 @@ msgstr[1] ""
 "\n"
 "Aquesta acció no es pot desfer."
 
-#: src/Dialogs.vala:2652
+#: ../src/Dialogs.vala:2710
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -1474,7 +2347,7 @@ msgstr[1] ""
 "\n"
 "Aquesta acció no es pot desfer."
 
-#: src/Dialogs.vala:2684
+#: ../src/Dialogs.vala:2742
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -1487,621 +2360,392 @@ msgstr[1] ""
 "%d fotografies/vídeos no es poden moure a la paperera de l'escriptori. Voleu "
 "suprimir aquests fitxers?"
 
-#: src/Dialogs.vala:2701
+#. Alert the user that the files were not removed.
+#: ../src/Dialogs.vala:2759
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
 msgstr[0] "La fotografia o vídeo no es pot suprimir."
 msgstr[1] "%d fotografies/vídeos no es poden suprimir."
 
-#: src/folders/Branch.vala:141
-msgid "Folders"
-msgstr ""
+#: ../src/Dimensions.vala:23
+msgid "Width"
+msgstr "Amplada"
 
-#: src/tags/Branch.vala:127
-msgid "Tags"
-msgstr "Etiquetes"
+#: ../src/Dimensions.vala:26
+msgid "Height"
+msgstr "Alçada"
 
-#: src/BatchImport.vala:26
-msgid "Success"
-msgstr "Correcte"
+#. verify this is a directory
+#: ../src/DirectoryMonitor.vala:889
+#, c-format
+msgid "Unable to monitor %s: Not a directory (%s)"
+msgstr "No s'ha pogut fer un seguiment de %s: no és un directori (%s)"
 
-#: src/BatchImport.vala:29
-msgid "File error"
-msgstr "S'ha produït un error de fitxer"
+#. if no name, pretty up the start time
+#: ../src/Event.vala:751
+#, c-format
+msgid "Event %s"
+msgstr "Esdeveniment %s"
 
-#: src/BatchImport.vala:32
-msgid "Unable to decode file"
-msgstr "No s'ha pogut descodificar el fitxer"
+#: ../src/Exporter.vala:232
+#, c-format
+msgid "Unable to generate a temporary file for %s: %s"
+msgstr "No s'ha pogut generar un fitxer temporal per a %s: %s"
 
-#: src/BatchImport.vala:35
-msgid "Database error"
-msgstr "S'ha produït un error de la base de dades"
+#: ../src/Exporter.vala:299
+msgid "Exporting"
+msgstr "S'està exportant"
 
-#: src/BatchImport.vala:38
-msgid "User aborted import"
-msgstr "L'usuari ha interromput la importació"
+#: ../src/Exporter.vala:317
+#, c-format
+msgid "File %s already exists.  Replace?"
+msgstr "Ja existeix el fitxer %s. Voleu reemplaçar-lo?"
 
-#: src/BatchImport.vala:41
-msgid "Not a file"
-msgstr "No és un fitxer"
+#: ../src/Exporter.vala:319
+msgid "_Skip"
+msgstr "_Omet-lo"
 
-#: src/BatchImport.vala:44
-msgid "File already exists in database"
-msgstr "El fitxer ja existeix a la base de dades"
+#: ../src/Exporter.vala:319
+msgid "_Replace"
+msgstr "_Reemplaça'l"
 
-#: src/BatchImport.vala:47
-msgid "Unsupported file format"
-msgstr "El format de fitxer no és compatible"
+#: ../src/Exporter.vala:319
+msgid "Replace _All"
+msgstr "Reempl_aça'ls tots"
 
-#: src/BatchImport.vala:50
-msgid "Not an image file"
-msgstr "No és un fitxer d'imatge"
+#: ../src/Exporter.vala:319
+msgid "Export"
+msgstr "Exporta"
 
-#: src/BatchImport.vala:53
-msgid "Disk failure"
-msgstr "Ha fallat el disc"
+#: ../src/MediaMonitor.vala:400
+#, c-format
+msgid "Unable to process monitoring updates: %s"
+msgstr "No s'han pogut processar les actualitzacions de seguiment: %s"
 
-#: src/BatchImport.vala:56
-msgid "Disk full"
-msgstr "El disc està ple"
+#: ../src/MediaPage.vala:158
+msgid "Adjust the size of the thumbnails"
+msgstr "Ajusta la mida de les miniatures"
 
-#: src/BatchImport.vala:59
-msgid "Camera error"
-msgstr "S'ha produït un error a la càmera"
+#: ../src/MediaPage.vala:340 ../src/PhotoPage.vala:2593
+#: ../src/Resources.vala:188 ../src/direct/DirectPhotoPage.vala:174
+msgid "Zoom _In"
+msgstr "_Amplia"
 
-#: src/BatchImport.vala:62
-msgid "File write error"
-msgstr "S'ha produït un error en escriure el fitxer"
+#: ../src/MediaPage.vala:341
+msgid "Increase the magnification of the thumbnails"
+msgstr "Augmenta la mida de les miniatures"
 
-#: src/BatchImport.vala:65
-msgid "Corrupt image file"
-msgstr ""
+#: ../src/MediaPage.vala:346 ../src/PhotoPage.vala:2599
+#: ../src/Resources.vala:189 ../src/direct/DirectPhotoPage.vala:180
+msgid "Zoom _Out"
+msgstr "_Redueix"
+
+#: ../src/MediaPage.vala:347
+msgid "Decrease the magnification of the thumbnails"
+msgstr "Redueix la mida de les miniatures"
+
+#: ../src/MediaPage.vala:414
+msgid "Sort _Photos"
+msgstr "Ordena les _fotografies"
+
+#: ../src/MediaPage.vala:423
+msgid "_Play Video"
+msgstr "_Reprodueix el vídeo"
+
+#: ../src/MediaPage.vala:424
+msgid "Open the selected videos in the system video player"
+msgstr "Obre els vídeos seleccionats en el reproductor de vídeo del sistema"
+
+#: ../src/MediaPage.vala:428 ../src/PhotoPage.vala:2642
+msgid "_Developer"
+msgstr "_Desenvolupador"
+
+#: ../src/MediaPage.vala:440 ../src/camera/Branch.vala:99
+#: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
+#: ../src/photos/RawSupport.vala:303
+msgid "Camera"
+msgstr "Càmera"
+
+#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:874
+msgid "_Titles"
+msgstr "_Títols"
+
+#: ../src/MediaPage.vala:452 ../src/camera/ImportPage.vala:875
+msgid "Display the title of each photo"
+msgstr "Mostra el títol de cada fotografia"
+
+#: ../src/MediaPage.vala:457 ../src/events/EventsDirectoryPage.vala:130
+msgid "_Comments"
+msgstr "_Comentaris"
+
+#: ../src/MediaPage.vala:458
+msgid "Display the comment of each photo"
+msgstr "Mostra el comentari de cada foto"
+
+#: ../src/MediaPage.vala:469 ../src/library/LibraryWindow.vala:375
+msgid "Ta_gs"
+msgstr "Eti_quetes"
 
-#: src/BatchImport.vala:68
+#: ../src/MediaPage.vala:470
+msgid "Display each photo's tags"
+msgstr "Mostra les etiquetes de cada fotografia"
+
+#: ../src/MediaPage.vala:486
+msgid "By _Title"
+msgstr "Per _títol"
+
+#: ../src/MediaPage.vala:487
+msgid "Sort photos by title"
+msgstr "Ordena les fotografies per títol"
+
+#: ../src/MediaPage.vala:492
+msgid "By Exposure _Date"
+msgstr "Per _data d'exposició"
+
+#: ../src/MediaPage.vala:493
+msgid "Sort photos by exposure date"
+msgstr "Ordena les fotografies per data d'exposició"
+
+#: ../src/MediaPage.vala:498
+msgid "By _Rating"
+msgstr "Per _puntuació"
+
+#: ../src/MediaPage.vala:499
+msgid "Sort photos by rating"
+msgstr "Ordena les fotografies per puntuació"
+
+#: ../src/MediaPage.vala:504
+msgid "By _Filename"
+msgstr "Per nom de _fitxer"
+
+#: ../src/MediaPage.vala:505
+msgid "Sort photos by filename"
+msgstr "Ordena les fotografies per nom de fitxer"
+
+#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:421
+msgid "_Ascending"
+msgstr "_Ascendent"
+
+#: ../src/MediaPage.vala:516 ../src/library/LibraryWindow.vala:422
+msgid "Sort photos in an ascending order"
+msgstr "Ordena les fotografies en ordre ascendent"
+
+#: ../src/MediaPage.vala:521 ../src/library/LibraryWindow.vala:428
+msgid "D_escending"
+msgstr "D_escendent"
+
+#: ../src/MediaPage.vala:522 ../src/library/LibraryWindow.vala:429
+msgid "Sort photos in a descending order"
+msgstr "Ordena les fotografies en ordre descendent"
+
+#: ../src/MediaPage.vala:723
 #, c-format
-msgid "Imported failed (%d)"
-msgstr "Ha fallat la importació (%d)"
+msgid ""
+"Shotwell was unable to play the selected video:\n"
+"%s"
+msgstr ""
+"El Shotwell no ha pogut reproduir el vídeo seleccionat:\n"
+"%s"
+
+#: ../src/Page.vala:1263
+msgid "No photos/videos"
+msgstr "Cap fotografia/vídeo"
+
+#: ../src/Page.vala:1267
+msgid "No photos/videos found"
+msgstr "No s'ha trobat cap fotografia/vídeo"
 
-#: src/Photo.vala:3656
+#: ../src/Page.vala:2565
+msgid "Photos cannot be exported to this directory."
+msgstr "No es poden exportar fotografies a aquest directori."
+
+#: ../src/Photo.vala:3753
 msgid "modified"
 msgstr "modificat"
 
-#: src/PhotoPage.vala:532
+#. previous button
+#: ../src/PhotoPage.vala:533
 msgid "Previous photo"
 msgstr "Fotografia anterior"
 
-#: src/PhotoPage.vala:537
+#. next button
+#: ../src/PhotoPage.vala:539
 msgid "Next photo"
 msgstr "Fotografia següent"
 
-#: src/PhotoPage.vala:1844
+#: ../src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Manca el fitxer font de la fotografia: %s"
 
-#: src/PhotoPage.vala:2404 src/library/LibraryWindow.vala:360
-#: src/direct/DirectPhotoPage.vala:165
+#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
+#: ../src/library/LibraryWindow.vala:359
 msgid "_View"
 msgstr "_Visualitza"
 
-#: src/PhotoPage.vala:2408 src/direct/DirectPhotoPage.vala:81
+#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
 msgid "T_ools"
 msgstr "Ei_nes"
 
-#: src/PhotoPage.vala:2413 src/direct/DirectPhotoPage.vala:86
+#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
 msgid "_Previous Photo"
 msgstr "Fotografia an_terior"
 
-#: src/PhotoPage.vala:2414 src/direct/DirectPhotoPage.vala:87
+#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
 msgid "Previous Photo"
 msgstr "Fotografia anterior"
 
-#: src/PhotoPage.vala:2419 src/direct/DirectPhotoPage.vala:92
+#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
 msgid "_Next Photo"
 msgstr "Fotografia _següent"
 
-#: src/PhotoPage.vala:2420 src/direct/DirectPhotoPage.vala:93
+#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
 msgid "Next Photo"
 msgstr "Fotografia següent"
 
-#: src/PhotoPage.vala:2583 src/direct/DirectPhotoPage.vala:174
-#: src/MediaPage.vala:325
-msgid "Zoom _In"
-msgstr "_Amplia"
-
-#: src/PhotoPage.vala:2584 src/direct/DirectPhotoPage.vala:175
+#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
 msgid "Increase the magnification of the photo"
 msgstr "Incrementa l'ampliació de la fotografia"
 
-#: src/PhotoPage.vala:2589 src/direct/DirectPhotoPage.vala:180
-#: src/MediaPage.vala:331
-msgid "Zoom _Out"
-msgstr "_Redueix"
-
-#: src/PhotoPage.vala:2590 src/direct/DirectPhotoPage.vala:181
+#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
 msgid "Decrease the magnification of the photo"
 msgstr "Redueix l'ampliació de la fotografia"
 
-#: src/PhotoPage.vala:2595 src/direct/DirectPhotoPage.vala:186
+#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
 msgid "Fit to _Page"
 msgstr "Ajusta a l'amplada de la _pàgina"
 
-#: src/PhotoPage.vala:2596 src/direct/DirectPhotoPage.vala:187
+#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
 msgid "Zoom the photo to fit on the screen"
 msgstr "Amplia la fotografia per ajustar-la a la pantalla"
 
-#: src/PhotoPage.vala:2601 src/direct/DirectPhotoPage.vala:192
+#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
+#, no-c-format
 msgid "Zoom _100%"
 msgstr "Ampliació _100%"
 
-#: src/PhotoPage.vala:2602 src/direct/DirectPhotoPage.vala:193
-#, fuzzy, c-format
+#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
+#, no-c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "Amplia la fotografia al 100%"
 
-#: src/PhotoPage.vala:2607 src/direct/DirectPhotoPage.vala:198
+#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
+#, no-c-format
 msgid "Zoom _200%"
 msgstr "Ampliació _200%"
 
-#: src/PhotoPage.vala:2608 src/direct/DirectPhotoPage.vala:199
-#, fuzzy, c-format
+#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
+#, no-c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "Amplia la fotografia al 200%"
 
-#: src/PhotoPage.vala:2628 src/MediaPage.vala:413
-msgid "_Developer"
-msgstr "_Desenvolupador"
-
-#: src/PhotoPage.vala:3216
+#: ../src/PhotoPage.vala:3231
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "No s'ha pogut exportar %s: %s"
 
-#: src/data_imports/DataImportsPluginHost.vala:65
-#: src/data_imports/DataImportsPluginHost.vala:78
-#, c-format
-msgid "%s Database"
-msgstr "Base de dades %s"
-
-#: 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 "No pot continuar la importació des de %s perquè s'ha produït un error:"
-
-#: src/data_imports/DataImportsPluginHost.vala:151
-msgid "To try importing from another service, select one from the above menu."
-msgstr ""
-"Intenteu importar des d'un altre servei, seleccioneu-ne un del menú següent."
-
-#: src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr "Dades de les importacions"
-
-#: 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 ""
-"No teniu cap connector d'importació de dades activat.\n"
-"\n"
-"Per poder utilitzar la funcionalitat d'importació des d'una aplicació, heu "
-"de tenir com a mínim un connector d'importació de dades habilitat. Podeu "
-"habilitar els connectors al diàleg de preferències."
-
-#: src/data_imports/DataImportsUI.vala:100
-msgid "Database file:"
-msgstr "Fitxer de base de dades:"
-
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:899
-msgid "_Import"
-msgstr "_Importa"
-
-#: src/data_imports/DataImportsUI.vala:216
-msgid "Import From Application"
-msgstr "Importa des de l'aplicació"
-
-#: src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "Importar mitjans _de:"
-
-#: src/data_imports/DataImportsUI.vala:394
-#: src/publishing/PublishingUI.vala:493
-msgid "_Close"
-msgstr "_Tanca"
-
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:182
-msgid "Settings"
-msgstr "Paràmetres"
-
-#: src/SlideshowPage.vala:141 src/Screensaver.vala:18
-msgid "Slideshow"
-msgstr "Projecció de diapositives"
-
-#: src/SlideshowPage.vala:161
-msgid "Back"
-msgstr "Enrere"
-
-#: src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "Vés a la fotografia anterior"
-
-#: src/SlideshowPage.vala:168 src/SlideshowPage.vala:273
-msgid "Pause"
-msgstr "Fes una pausa"
-
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:274
-msgid "Pause the slideshow"
-msgstr "Fes una pausa a la presentació de diapositives"
-
-#: src/SlideshowPage.vala:175
-msgid "Next"
-msgstr "Següent"
-
-#: src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "Vés a la fotografia següent"
-
-#: src/SlideshowPage.vala:183
-msgid "Change slideshow settings"
-msgstr "Canvia els paràmetres de la presentació de diapositives"
-
-#: src/SlideshowPage.vala:237
-msgid "All photo source files are missing."
-msgstr "Manquen tots els fitxers d'origen de les fotografies."
-
-#: src/SlideshowPage.vala:269
-msgid "Play"
-msgstr "Reprodueix"
-
-#: src/SlideshowPage.vala:270
-msgid "Continue the slideshow"
-msgstr "Continua la presentació de diapositives"
-
-#: src/Commands.vala:733
-msgid "Reverting"
-msgstr "S'està revertint"
-
-#: src/Commands.vala:733
-msgid "Undoing Revert"
-msgstr "S'està desfent la reversió"
-
-#: src/Commands.vala:777
-msgid "Enhancing"
-msgstr "S'està millorant"
-
-#: src/Commands.vala:777
-msgid "Undoing Enhance"
-msgstr "S'està desfent la millora"
-
-#: src/Commands.vala:845
-msgid "Applying Color Transformations"
-msgstr ""
-
-#: src/Commands.vala:845
-msgid "Undoing Color Transformations"
-msgstr ""
-
-#: src/Commands.vala:995
-msgid "Creating New Event"
-msgstr "S'està creant un esdeveniment nou"
-
-#: src/Commands.vala:996
-msgid "Removing Event"
-msgstr "S'està suprimint l'esdeveniment"
-
-#: src/Commands.vala:1005
-msgid "Moving Photos to New Event"
-msgstr "S'estan movent les fotografies a l'esdeveniment nou"
-
-#: src/Commands.vala:1006
-msgid "Setting Photos to Previous Event"
-msgstr "S'estan establint les fotografies a l'esdeveniment anterior"
-
-#: src/Commands.vala:1063
-msgid "Merging"
-msgstr "S'està combinant"
-
-#: src/Commands.vala:1064
-msgid "Unmerging"
-msgstr "S'està desfent la combinació"
-
-#: src/Commands.vala:1073
-msgid "Duplicating photos"
-msgstr "S'estan duplicant les fotografies"
-
-#: src/Commands.vala:1073
-msgid "Removing duplicated photos"
-msgstr "S'estan suprimint les fotografies duplicades"
-
-#: src/Commands.vala:1096
-#, 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] "No s'ha pogut duplicar una fotografia degut a un error en el fitxer"
-msgstr[1] ""
-"No s'han pogut duplicar %d fotografies degut a errors en els fitxers"
-
-#: src/Commands.vala:1183
-msgid "Restoring previous rating"
-msgstr "S'està restaurant la valoració anterior"
-
-#: src/Commands.vala:1193 src/Commands.vala:1194
-msgid "Increasing ratings"
-msgstr "S'estan incrementant les puntuacions"
-
-#: src/Commands.vala:1193 src/Commands.vala:1194
-msgid "Decreasing ratings"
-msgstr "S'estan reduint les puntuacions"
-
-#: src/Commands.vala:1244
-msgid "Setting RAW developer"
-msgstr "S'està establint el revelador RAW"
-
-#: src/Commands.vala:1244
-msgid "Restoring previous RAW developer"
-msgstr "S'està restaurant el revelador RAW anterior"
-
-#: src/Commands.vala:1245
-msgid "Set Developer"
-msgstr "Estableix el desenvolupador"
-
-#: src/Commands.vala:1335
-msgid "Original photo could not be adjusted."
-msgstr "La fotografia original no s'ha pogut ajustar."
-
-#: src/Commands.vala:1356
-msgid "Adjusting Date and Time"
-msgstr "S'està ajustant la data i l'hora"
-
-#: src/Commands.vala:1356
-msgid "Undoing Date and Time Adjustment"
-msgstr "S'està desfent l'ajustament de la data i l'hora"
-
-#: src/Commands.vala:1387
-msgid "One original photo could not be adjusted."
-msgid_plural "The following original photos could not be adjusted."
-msgstr[0] "La fotografia original no s'ha pogut ajustar."
-msgstr[1] "Les fotografies originals no s'han pogut ajustar."
-
-#: src/Commands.vala:1389 src/Commands.vala:1413
-msgid "Time Adjustment Error"
-msgstr "S'ha produït un error en ajustar l'hora"
-
-#: src/Commands.vala:1411
-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] ""
-"L'ajustament de l'hora no s'ha pogut desfer en el fitxer de fotografia "
-"següent."
-msgstr[1] ""
-"Els ajustaments de l'hora no s'han pogut desfer en els fitxers de "
-"fotografies següents."
-
-#: src/Commands.vala:1625 src/Commands.vala:1648
-msgid "Create Tag"
-msgstr "Crea un etiqueta"
-
-#: src/Commands.vala:1683
-#, c-format
-msgid "Move Tag \"%s\""
-msgstr "Mou l'etiqueta «%s»"
-
-#: src/Commands.vala:2335
-msgid "Move Photos to Trash"
-msgstr "Mou les fotografies a la paperera"
-
-#: src/Commands.vala:2335
-msgid "Restore Photos from Trash"
-msgstr "Restaura les fotografies de la paperera"
-
-#: src/Commands.vala:2336
-msgid "Move the photos to the Shotwell trash"
-msgstr "Mou les fotografies a la paperera del Shotwell"
-
-#: src/Commands.vala:2336
-msgid "Restore the photos back to the Shotwell library"
-msgstr "Restaura les fotografies cap a la biblioteca del Shotwell"
-
-#: src/Commands.vala:2355
-msgid "Moving Photos to Trash"
-msgstr "S'estan movent les fotografies a la paperera"
-
-#: src/Commands.vala:2355
-msgid "Restoring Photos From Trash"
-msgstr "S'estan restaurant les fotografies de la paperera"
-
-#: src/Commands.vala:2441
-msgid "Flag selected photos"
-msgstr "Senyala les fotografies seleccionades"
-
-#: src/Commands.vala:2442
-msgid "Unflag selected photos"
-msgstr "Treu el senyalador a les fotografies seleccionades"
-
-#: src/Commands.vala:2443
-msgid "Flagging selected photos"
-msgstr ""
-
-#: src/Commands.vala:2444
-msgid "Unflagging selected photos"
-msgstr ""
-
-#: src/Commands.vala:2451
-msgid "Flag"
-msgstr "Senyala"
-
-#: src/Commands.vala:2451
-msgid "Unflag"
-msgstr "Treu el senyalador"
-
-#: src/photos/RawSupport.vala:134
-msgid "RAW"
-msgstr "RAW"
-
-#: src/photos/RawSupport.vala:297 src/MediaPage.vala:420
-msgid "Shotwell"
-msgstr "Shotwell"
-
-#: src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr "BMP"
-
-#: src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
-
-#: src/photos/JfifSupport.vala:182
-#, c-format
-msgid "Low (%d%%)"
-msgstr "Baixa (%d%%)"
-
-#: src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "Mitjana (%d%%)"
-
-#: src/photos/JfifSupport.vala:188
-#, c-format
-msgid "High (%d%%)"
-msgstr "Alta (%d%%)"
-
-#: src/photos/JfifSupport.vala:191
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "Màxima (%d%%)"
-
-#: src/photos/PngSupport.vala:30
-msgid "PNG"
-msgstr "PNG"
-
-#: src/photos/TiffSupport.vala:86
-msgid "TIFF"
-msgstr "TIFF"
-
-#: src/Page.vala:1268
-msgid "No photos/videos"
-msgstr "Cap fotografia/vídeo"
-
-#: src/Page.vala:1272
-msgid "No photos/videos found"
-msgstr "No s'ha trobat cap fotografia/vídeo"
-
-#: src/Page.vala:2569
-msgid "Photos cannot be exported to this directory."
-msgstr "No es poden exportar fotografies a aquest directori."
-
-#: src/MediaMonitor.vala:400
-#, c-format
-msgid "Unable to process monitoring updates: %s"
-msgstr "No s'han pogut processar les actualitzacions de seguiment: %s"
-
-#: src/Printing.vala:255
+#: ../src/Printing.vala:255
 msgid "Fill the entire page"
 msgstr "Omple tota la pàgina"
 
-#: src/Printing.vala:256
+#: ../src/Printing.vala:256
 msgid "2 images per page"
 msgstr "2 imatges per pàgina"
 
-#: src/Printing.vala:257
+#: ../src/Printing.vala:257
 msgid "4 images per page"
 msgstr "4 imatges per pàgina"
 
-#: src/Printing.vala:258
+#: ../src/Printing.vala:258
 msgid "6 images per page"
 msgstr "6 imatges per pàgina"
 
-#: src/Printing.vala:259
+#: ../src/Printing.vala:259
 msgid "8 images per page"
 msgstr "8 imatges per pàgina"
 
-#: src/Printing.vala:260
+#: ../src/Printing.vala:260
 msgid "16 images per page"
 msgstr "16 imatges per pàgina"
 
-#: src/Printing.vala:261
+#: ../src/Printing.vala:261
 msgid "32 images per page"
 msgstr "32 imatges per pàgina"
 
-#: src/Printing.vala:348
+#: ../src/Printing.vala:348
 msgid "in."
 msgstr "polzades"
 
-#: src/Printing.vala:349
+#: ../src/Printing.vala:349
 msgid "cm"
 msgstr "cm"
 
-#: src/Printing.vala:817 src/editing_tools/EditingTools.vala:757
+#: ../src/Printing.vala:817 ../src/editing_tools/EditingTools.vala:761
 msgid "Wallet (2 x 3 in.)"
 msgstr "Cartera (2 x 3 polzades)"
 
-#: src/Printing.vala:820 src/editing_tools/EditingTools.vala:758
+#: ../src/Printing.vala:820 ../src/editing_tools/EditingTools.vala:762
 msgid "Notecard (3 x 5 in.)"
 msgstr "Targeta (3 x 5 polzades)"
 
-#: src/Printing.vala:823 src/editing_tools/EditingTools.vala:759
+#: ../src/Printing.vala:823 ../src/editing_tools/EditingTools.vala:763
 msgid "4 x 6 in."
 msgstr "4 x 6 polzades"
 
-#: src/Printing.vala:826 src/editing_tools/EditingTools.vala:760
+#: ../src/Printing.vala:826 ../src/editing_tools/EditingTools.vala:764
 msgid "5 x 7 in."
 msgstr "5 x 7 polzades"
 
-#: src/Printing.vala:829 src/editing_tools/EditingTools.vala:761
+#: ../src/Printing.vala:829 ../src/editing_tools/EditingTools.vala:765
 msgid "8 x 10 in."
 msgstr "8 x 10 polzades"
 
-#: src/Printing.vala:832 src/editing_tools/EditingTools.vala:763
+#: ../src/Printing.vala:832 ../src/editing_tools/EditingTools.vala:767
 msgid "11 x 14 in."
 msgstr "11 x 14 polzades"
 
-#: src/Printing.vala:835 src/editing_tools/EditingTools.vala:765
+#: ../src/Printing.vala:835 ../src/editing_tools/EditingTools.vala:769
 msgid "16 x 20 in."
 msgstr "16 x 20 polzades"
 
-#: src/Printing.vala:841 src/editing_tools/EditingTools.vala:767
+#: ../src/Printing.vala:841 ../src/editing_tools/EditingTools.vala:771
 msgid "Metric Wallet (9 x 13 cm)"
 msgstr "Cartera en sistema mètric (9 x 13 cm)"
 
-#: src/Printing.vala:844 src/editing_tools/EditingTools.vala:768
+#: ../src/Printing.vala:844 ../src/editing_tools/EditingTools.vala:772
 msgid "Postcard (10 x 15 cm)"
 msgstr "Postal (10 x 15 cm)"
 
-#: src/Printing.vala:847 src/editing_tools/EditingTools.vala:769
+#: ../src/Printing.vala:847 ../src/editing_tools/EditingTools.vala:773
 msgid "13 x 18 cm"
 msgstr "13 x 18 cm"
 
-#: src/Printing.vala:850 src/editing_tools/EditingTools.vala:770
+#: ../src/Printing.vala:850 ../src/editing_tools/EditingTools.vala:774
 msgid "18 x 24 cm"
 msgstr "18 x 24 cm"
 
-#: src/Printing.vala:853 src/editing_tools/EditingTools.vala:772
+#: ../src/Printing.vala:853 ../src/editing_tools/EditingTools.vala:776
 msgid "20 x 30 cm"
 msgstr "20 x 30 cm"
 
-#: src/Printing.vala:856 src/editing_tools/EditingTools.vala:773
+#: ../src/Printing.vala:856 ../src/editing_tools/EditingTools.vala:777
 msgid "24 x 40 cm"
 msgstr "24 x 40 cm"
 
-#: src/Printing.vala:859 src/editing_tools/EditingTools.vala:774
+#: ../src/Printing.vala:859 ../src/editing_tools/EditingTools.vala:778
 msgid "30 x 40 cm"
 msgstr "30 x 40 cm"
 
-#: src/Printing.vala:875
+#: ../src/Printing.vala:875
 msgid "Image Settings"
 msgstr "Paràmetres de la imatge"
 
-#: src/Printing.vala:888
+#: ../src/Printing.vala:888
 msgid "Printing..."
 msgstr "S'està imprimint..."
 
-#: src/Printing.vala:908 src/Printing.vala:1111
+#: ../src/Printing.vala:908 ../src/Printing.vala:1111
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -2112,1536 +2756,1922 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
-msgstr ""
-"No s'ha pogut obrir o crear la base de dades de fotografies %s: codi d'error "
-"%d"
+#: ../src/Properties.vala:84
+msgid "Today"
+msgstr "Avui"
 
-#: src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
-msgstr ""
-"No s'ha pogut escriure al fitxer de la base de dades de fotografies:\n"
-" %s"
+#: ../src/Properties.vala:86
+msgid "Yesterday"
+msgstr "Ahir"
 
-#: src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
-msgstr ""
-"S'ha produït un error en accedir al fitxer de la base de dades:\n"
-" %s\n"
-"\n"
-"L'error ha estat: \n"
-"%s"
+#: ../src/Properties.vala:227 ../src/camera/ImportPage.vala:312
+msgid "RAW+JPEG"
+msgstr "RAW+JPEG"
 
-#: src/VideoSupport.vala:464
-msgid "Export Videos"
-msgstr "Exporta vídeos"
+#: ../src/Properties.vala:343
+msgid "Items:"
+msgstr "Elements:"
 
-#: src/DesktopIntegration.vala:118
+#: ../src/Properties.vala:346
 #, c-format
-msgid "Unable to launch Nautilus Send-To: %s"
-msgstr "No s'ha pogut executar el Nautilus Send-To: %s"
-
-#: src/DesktopIntegration.vala:126
-msgid "Send To"
-msgstr "Envia a"
+msgid "%d Event"
+msgid_plural "%d Events"
+msgstr[0] "%d esdeveniment"
+msgstr[1] "%d esdeveniments"
 
-#: src/DesktopIntegration.vala:171
+#: ../src/Properties.vala:353 ../src/events/EventDirectoryItem.vala:87
 #, c-format
-msgid "Unable to export background to %s: %s"
-msgstr "No s'ha pogut exportar el fons a %s: %s"
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] "Una fotografia"
+msgstr[1] "%d fotografies"
 
-#: src/DesktopIntegration.vala:299
+#: ../src/Properties.vala:355 ../src/events/EventDirectoryItem.vala:85
 #, c-format
-msgid "Unable to prepare desktop slideshow: %s"
-msgstr ""
-"No s'ha pogut preparar la presentació de diapositives de l'escriptori: %s"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:587
-#: src/SearchFilter.vala:588 src/SearchFilter.vala:990
-msgid "Flagged"
-msgstr "Senyalat"
-
-#: src/library/TrashPage.vala:8
-msgid "Trash"
-msgstr "Paperera"
-
-#: src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "La paperera està buida"
-
-#: src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "Suprimeix"
-
-#: src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-msgstr "S'estan suprimint les fotografies"
-
-#: src/library/OfflinePage.vala:8
-msgid "Missing Files"
-msgstr "Manquen fitxers"
-
-#: src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "S'està suprimint..."
-
-#: src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "Darrera importació"
-
-#: src/library/LibraryWindow.vala:301
-msgid "_Import From Folder..."
-msgstr "_Importa des d'una carpeta..."
-
-#: src/library/LibraryWindow.vala:302
-msgid "Import photos from disk to library"
-msgstr "Importa fotografies des del disc a la biblioteca"
-
-#: src/library/LibraryWindow.vala:309
-msgid "Import From _Application..."
-msgstr "Importa des de l'_aplicació..."
-
-#: src/library/LibraryWindow.vala:313
-msgid "Sort _Events"
-msgstr "Ordena els es_deveniments"
-
-#: src/library/LibraryWindow.vala:323
-msgid "Empty T_rash"
-msgstr "Buida la _paperera"
-
-#: src/library/LibraryWindow.vala:324
-msgid "Delete all photos in the trash"
-msgstr "Suprimeix totes les fotografies de la paperera"
-
-#: src/library/LibraryWindow.vala:329
-msgid "View Eve_nt for Photo"
-msgstr "Visualitza l'_esdeveniment de la fotografia"
-
-#: src/library/LibraryWindow.vala:334
-msgid "_Find"
-msgstr "_Cerca"
-
-#: src/library/LibraryWindow.vala:335
-msgid "Find photos and videos by search criteria"
-msgstr "Cerca fotografies i vídeos per criteri de cerca"
-
-#: src/library/LibraryWindow.vala:352 src/direct/DirectPhotoPage.vala:46
-msgid "_File"
-msgstr "_Fitxer"
-
-#: src/library/LibraryWindow.vala:356 src/direct/DirectPhotoPage.vala:73
-msgid "_Edit"
-msgstr "_Edita"
-
-#: src/library/LibraryWindow.vala:364 src/direct/DirectPhotoPage.vala:77
-msgid "_Photo"
-msgstr "_Fotografia"
-
-#: src/library/LibraryWindow.vala:368
-msgid "_Photos"
-msgstr "_Fotografies"
-
-#: src/library/LibraryWindow.vala:372
-msgid "Even_ts"
-msgstr "E_sdeveniments"
-
-#: src/library/LibraryWindow.vala:376 src/MediaPage.vala:454
-msgid "Ta_gs"
-msgstr "Eti_quetes"
-
-#: src/library/LibraryWindow.vala:380 src/direct/DirectPhotoPage.vala:169
-msgid "_Help"
-msgstr "A_juda"
-
-#: src/library/LibraryWindow.vala:391
-msgid "_Basic Information"
-msgstr "Informació _bàsica"
-
-#: src/library/LibraryWindow.vala:392
-msgid "Display basic information for the selection"
-msgstr "Mostra informació bàsica sobre la selecció"
-
-#: src/library/LibraryWindow.vala:397
-msgid "E_xtended Information"
-msgstr "Informació am_pliada"
-
-#: src/library/LibraryWindow.vala:398
-msgid "Display extended information for the selection"
-msgstr "Mostra informació ampliada sobre la selecció"
-
-#: src/library/LibraryWindow.vala:403
-msgid "_Search Bar"
-msgstr "Barra de _cerca"
-
-#: src/library/LibraryWindow.vala:404
-msgid "Display the search bar"
-msgstr "Mostra la barra de cerca"
-
-#: src/library/LibraryWindow.vala:409
-msgid "S_idebar"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:410
-msgid "Display the sidebar"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:422 src/MediaPage.vala:494
-msgid "_Ascending"
-msgstr "_Ascendent"
-
-#: src/library/LibraryWindow.vala:423 src/MediaPage.vala:495
-msgid "Sort photos in an ascending order"
-msgstr "Ordena les fotografies en ordre ascendent"
-
-#: src/library/LibraryWindow.vala:429 src/MediaPage.vala:500
-msgid "D_escending"
-msgstr "D_escendent"
-
-#: src/library/LibraryWindow.vala:430 src/MediaPage.vala:501
-msgid "Sort photos in a descending order"
-msgstr "Ordena les fotografies en ordre descendent"
+msgid "%d Video"
+msgid_plural "%d Videos"
+msgstr[0] "%d vídeo"
+msgstr[1] "%d vídeos"
 
-#: src/library/LibraryWindow.vala:668
-msgid "Import From Folder"
-msgstr "Importa des d'una carpeta"
+#. display only one date if start and end are the same
+#: ../src/Properties.vala:377
+msgid "Date:"
+msgstr "Data:"
 
-#: src/library/LibraryWindow.vala:737
-msgid "Empty Trash"
-msgstr "Buida la paperera"
+#. display only one time if start and end are the same
+#: ../src/Properties.vala:381
+msgid "Time:"
+msgstr "Hora:"
 
-#: src/library/LibraryWindow.vala:737
-msgid "Emptying Trash..."
-msgstr "S'està buidant la paperera..."
+#. display time range
+#. display date range
+#: ../src/Properties.vala:384 ../src/Properties.vala:389
+msgid "From:"
+msgstr "Des de:"
 
-#: src/library/LibraryWindow.vala:896
-msgid "Shotwell is configured to import photos to your home directory.\n"
-msgstr ""
-"El Shotwell està configurat per importar fotografies a la vostra carpeta "
-"d'usuari.\n"
+#: ../src/Properties.vala:385 ../src/Properties.vala:390
+msgid "To:"
+msgstr "A:"
 
-#: src/library/LibraryWindow.vala:899
-msgid "Library Location"
-msgstr "Ubicació de la biblioteca"
+#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1890
+msgid "Size:"
+msgstr "Mida:"
 
-#: src/library/LibraryWindow.vala:912
-msgid "Photos cannot be imported from this directory."
-msgstr "No es poden importar fotografies des d'aquest directori."
+#: ../src/Properties.vala:404
+msgid "Duration:"
+msgstr "Durada:"
 
-#: src/library/LibraryWindow.vala:1200
+#: ../src/Properties.vala:404
 #, c-format
-msgid "%s (%d%%)"
-msgstr "%s (%d%%)"
-
-#: src/library/LibraryWindow.vala:1244 src/library/LibraryWindow.vala:1255
-msgid "Updating library..."
-msgstr "S'està actualitzant la biblioteca..."
-
-#: src/library/LibraryWindow.vala:1261
-msgid "Preparing to auto-import photos..."
-msgstr "S'està preparant la importació automàtica de fotografies..."
-
-#: src/library/LibraryWindow.vala:1266
-msgid "Auto-importing photos..."
-msgstr "S'estan important automàticament les fotografies..."
-
-#: src/library/LibraryWindow.vala:1274
-msgid "Writing metadata to files..."
-msgstr "S'estan escrivint les metadades als fitxers..."
-
-#: src/library/Branch.vala:37
-msgid "Library"
-msgstr "Biblioteca"
+msgid "%.1f seconds"
+msgstr "%.1f segons"
 
-#: src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "S'està important..."
+#: ../src/Properties.vala:408
+msgid "Developer:"
+msgstr "Revelador:"
 
-#: src/library/ImportQueuePage.vala:66
-msgid "_Stop Import"
-msgstr "A_tura la importació"
+#. fit both on the top line, emit and move on
+#: ../src/Properties.vala:436 ../src/Properties.vala:440
+#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2258
+msgid "Exposure:"
+msgstr "Exposició:"
 
-#: src/library/ImportQueuePage.vala:67
-msgid "Stop importing photos"
-msgstr "Atura la importació de fotografies"
+#. nothing special to be done for now for Events
+#: ../src/Properties.vala:583
+msgid "Location:"
+msgstr "Ubicació:"
 
-#: src/library/ImportQueuePage.vala:123
-msgid "Preparing to import..."
-msgstr "S'està preparant per importar..."
+#: ../src/Properties.vala:586
+msgid "File size:"
+msgstr "Mida del fitxer:"
 
-#: src/library/ImportQueuePage.vala:150
-#, c-format
-msgid "Imported %s"
-msgstr "S'ha importat %s"
+#: ../src/Properties.vala:590
+msgid "Current Development:"
+msgstr "Desenvolupament actual:"
 
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:413
-msgid "_Save"
-msgstr "De_sa"
+#: ../src/Properties.vala:592
+msgid "Original dimensions:"
+msgstr "Mida original:"
 
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Desa la fotografia"
+#: ../src/Properties.vala:595
+msgid "Camera make:"
+msgstr "Fabricant de la càmera:"
 
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "Anomena i _desa..."
+#: ../src/Properties.vala:598
+msgid "Camera model:"
+msgstr "Model de la càmera:"
 
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Desa la fotografia amb un nom diferent"
+#: ../src/Properties.vala:601
+msgid "Flash:"
+msgstr "Flaix:"
 
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Imprimeix la fotografia a una impressora connectada a l'ordinador"
+#: ../src/Properties.vala:603
+msgid "Focal length:"
+msgstr "Distància focal:"
 
-#: src/direct/DirectPhotoPage.vala:223
-#, c-format
-msgid "%s does not exist."
-msgstr "No existeix %s."
+#: ../src/Properties.vala:606
+msgid "Exposure date:"
+msgstr "Data d'exposició:"
 
-#: src/direct/DirectPhotoPage.vala:225
-#, c-format
-msgid "%s is not a file."
-msgstr "%s no és un fitxer."
+#: ../src/Properties.vala:609
+msgid "Exposure time:"
+msgstr "Temps d'exposició:"
 
-#: src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr ""
-"%s no és compatible amb el format de fitxer de\n"
-"%s."
+#: ../src/Properties.vala:612
+msgid "Exposure bias:"
+msgstr "Desplaçament de l'exposició:"
 
-#: src/direct/DirectPhotoPage.vala:413
-msgid "_Save a Copy"
-msgstr "De_sa'n una còpia"
+#: ../src/Properties.vala:614
+msgid "GPS latitude:"
+msgstr "Latitud GPS:"
 
-#: src/direct/DirectPhotoPage.vala:416
-#, c-format
-msgid "Lose changes to %s?"
-msgstr "Voleu descartar els canvis a %s?"
+#: ../src/Properties.vala:617
+msgid "GPS longitude:"
+msgstr "Longitud GPS:"
 
-#: src/direct/DirectPhotoPage.vala:417
-msgid "Close _without Saving"
-msgstr "Tanca _sense desar"
+#: ../src/Properties.vala:620
+msgid "Artist:"
+msgstr "Artista:"
 
-#: src/direct/DirectPhotoPage.vala:450
-#, c-format
-msgid "Error while saving to %s: %s"
-msgstr "S'ha produït un error en desar a %s: %s"
+#: ../src/Properties.vala:622
+msgid "Copyright:"
+msgstr "Copyright:"
 
-#: src/direct/DirectPhotoPage.vala:478 src/direct/DirectPhotoPage.vala:499
-msgid "Save As"
-msgstr "Anomena i desa"
+#: ../src/Properties.vala:624
+msgid "Software:"
+msgstr "Programari:"
 
-#: src/DirectoryMonitor.vala:889
-#, c-format
-msgid "Unable to monitor %s: Not a directory (%s)"
-msgstr "No s'ha pogut fer un seguiment de %s: no és un directori (%s)"
+#: ../src/Properties.vala:639
+msgid "Extended Information"
+msgstr "Informació ampliada"
 
-#: src/Resources.vala:17
+#: ../src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Gestor fotogràfic"
 
-#: src/Resources.vala:18
+#: ../src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Visualitzador fotogràfic"
 
-#: src/Resources.vala:27 plugins/shotwell-publishing/YouTubePublishing.vala:32
-#: plugins/shotwell-publishing/FlickrPublishing.vala:34
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:32
-#: plugins/shotwell-publishing/PicasaPublishing.vala:32
-#: plugins/shotwell-publishing/FacebookPublishing.vala:32
-#: plugins/shotwell-data-imports/FSpotImporter.vala:34
-msgid "Copyright 2009-2013 Yorba Foundation"
-msgstr ""
-
-#: src/Resources.vala:144
+#: ../src/Resources.vala:144
 msgid "Rotate _Right"
 msgstr "Gi_ra a la dreta"
 
-#: src/Resources.vala:145 src/Resources.vala:150
+#: ../src/Resources.vala:145 ../src/Resources.vala:150
 msgid "Rotate"
 msgstr "Gira"
 
-#: src/Resources.vala:146
+#: ../src/Resources.vala:146
 msgid "Rotate Right"
 msgstr "Gira a la dreta"
 
-#: src/Resources.vala:147
+#: ../src/Resources.vala:147
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr ""
 "Gira les fotografies cap a la dreta (premeu Ctrl per girar cap a l'esquerra)"
 
-#: src/Resources.vala:149
+#: ../src/Resources.vala:149
 msgid "Rotate _Left"
 msgstr "Gira a _l'esquerra"
 
-#: src/Resources.vala:151
+#: ../src/Resources.vala:151
 msgid "Rotate Left"
 msgstr "Gira a l'esquerra"
 
-#: src/Resources.vala:152
+#: ../src/Resources.vala:152
 msgid "Rotate the photos left"
 msgstr "Gira les fotografies cap a l'esquerra"
 
-#: src/Resources.vala:154
+#: ../src/Resources.vala:154
 msgid "Flip Hori_zontally"
 msgstr "Inverteix horit_zontalment"
 
-#: src/Resources.vala:155
+#: ../src/Resources.vala:155
 msgid "Flip Horizontally"
 msgstr "Inverteix horitzontalment"
 
-#: src/Resources.vala:157
+#: ../src/Resources.vala:157
 msgid "Flip Verti_cally"
 msgstr "Inverteix verti_calment"
 
-#: src/Resources.vala:158
+#: ../src/Resources.vala:158
 msgid "Flip Vertically"
 msgstr "Inverteix verticalment"
 
-#: src/Resources.vala:160
+#: ../src/Resources.vala:160
+msgid "_About"
+msgstr "_Quant a"
+
+#: ../src/Resources.vala:161
+msgid "_Apply"
+msgstr "_Aplica"
+
+#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
+#: ../src/library/LibraryWindow.vala:355
+msgid "_Edit"
+msgstr "_Edita"
+
+#: ../src/Resources.vala:165
+msgid "_Forward"
+msgstr "_Endavant"
+
+#: ../src/Resources.vala:166
+msgid "Fulls_creen"
+msgstr "_Pantalla completa"
+
+#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
+#: ../src/library/LibraryWindow.vala:379
+msgid "_Help"
+msgstr "A_juda"
+
+#: ../src/Resources.vala:168
+msgid "Leave _Fullscreen"
+msgstr "Surt de la _pantalla completa"
+
+#: ../src/Resources.vala:169 ../src/Resources.vala:371
+msgid "_New"
+msgstr "_Nova"
+
+#: ../src/Resources.vala:170
+msgid "_Next"
+msgstr "_Següent"
+
+#: ../src/Resources.vala:171
+msgid "_OK"
+msgstr "_D'acord"
+
+#: ../src/Resources.vala:172
+msgid "_Play"
+msgstr "_Reprodueix"
+
+#: ../src/Resources.vala:173 ../src/Resources.vala:325
+msgid "_Preferences"
+msgstr "Preferè_ncies"
+
+#: ../src/Resources.vala:174
+msgid "_Previous"
+msgstr "An_terior"
+
+#: ../src/Resources.vala:175
+msgid "_Print"
+msgstr "_Imprimeix"
+
+#: ../src/Resources.vala:176
+msgid "_Quit"
+msgstr "_Surt"
+
+#: ../src/Resources.vala:177
+msgid "_Refresh"
+msgstr "Actualit_za"
+
+#: ../src/Resources.vala:179
+msgid "_Revert"
+msgstr "Rever_teix"
+
+#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save"
+msgstr "De_sa"
+
+#: ../src/Resources.vala:181
+msgid "Save _As"
+msgstr "_Anomena i desa"
+
+#: ../src/Resources.vala:182
+msgid "Sort _Ascending"
+msgstr "Ordre _ascendent"
+
+#: ../src/Resources.vala:183
+msgid "Sort _Descending"
+msgstr "Ordre d_escendent"
+
+#: ../src/Resources.vala:184
+msgid "_Stop"
+msgstr "A_tura"
+
+#: ../src/Resources.vala:185
+msgid "_Undelete"
+msgstr "Rec_upera"
+
+#: ../src/Resources.vala:186
+msgid "_Normal Size"
+msgstr "Mida _normal"
+
+#: ../src/Resources.vala:187
+msgid "Best _Fit"
+msgstr "Millor e_ncaix"
+
+#: ../src/Resources.vala:191
 msgid "_Enhance"
 msgstr "_Millora"
 
-#: src/Resources.vala:161
+#: ../src/Resources.vala:192
 msgid "Enhance"
 msgstr "Millora"
 
-#: src/Resources.vala:162
+#: ../src/Resources.vala:193
 msgid "Automatically improve the photo's appearance"
 msgstr "Millora automàticament l'aparença de la fotografia"
 
-#: src/Resources.vala:164
+#: ../src/Resources.vala:195
 msgid "_Copy Color Adjustments"
-msgstr ""
+msgstr "_Copia els ajustaments de color"
 
-#: src/Resources.vala:165
+#: ../src/Resources.vala:196
 msgid "Copy Color Adjustments"
-msgstr ""
+msgstr "Copia els ajustaments de color"
 
-#: src/Resources.vala:166
+#: ../src/Resources.vala:197
 msgid "Copy the color adjustments applied to the photo"
-msgstr ""
+msgstr "Copia els ajustaments de color aplicats a la foto"
 
-#: src/Resources.vala:168
+#: ../src/Resources.vala:199
 msgid "_Paste Color Adjustments"
-msgstr ""
+msgstr "_Enganxa els ajustaments de color"
 
-#: src/Resources.vala:169
+#: ../src/Resources.vala:200
 msgid "Paste Color Adjustments"
-msgstr ""
+msgstr "Enganxa els ajustaments de color"
 
-#: src/Resources.vala:170
+#: ../src/Resources.vala:201
 msgid "Apply copied color adjustments to the selected photos"
-msgstr ""
+msgstr "Aplica els ajustaments de color copiats a les fotos seleccionades"
 
-#: src/Resources.vala:172
+#: ../src/Resources.vala:203
 msgid "_Crop"
 msgstr "Es_capça"
 
-#: src/Resources.vala:173
+#: ../src/Resources.vala:204
 msgid "Crop"
 msgstr "Escapça"
 
-#: src/Resources.vala:174
+#: ../src/Resources.vala:205
 msgid "Crop the photo's size"
 msgstr "Escapça la mida de la fotografia"
 
-#: src/Resources.vala:176 src/editing_tools/StraightenTool.vala:100
+#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
 msgid "_Straighten"
 msgstr "_Adreça"
 
-#: src/Resources.vala:177
+#: ../src/Resources.vala:208
 msgid "Straighten"
 msgstr "Adreça"
 
-#: src/Resources.vala:178
+#: ../src/Resources.vala:209
 msgid "Straighten the photo"
 msgstr "Adreça la fotografia"
 
-#: src/Resources.vala:180
+#: ../src/Resources.vala:211
 msgid "_Red-eye"
 msgstr "_Ulls vermells"
 
-#: src/Resources.vala:181
+#: ../src/Resources.vala:212
 msgid "Red-eye"
 msgstr "Ulls vermells"
 
-#: src/Resources.vala:182
+#: ../src/Resources.vala:213
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Redueix o suprimeix qualsevol efecte d'ulls vermells a la fotografia"
 
-#: src/Resources.vala:184
+#: ../src/Resources.vala:215
 msgid "_Adjust"
 msgstr "_Ajusta"
 
-#: src/Resources.vala:185
+#: ../src/Resources.vala:216
 msgid "Adjust"
 msgstr "Ajusta"
 
-#: src/Resources.vala:186
+#: ../src/Resources.vala:217
 msgid "Adjust the photo's color and tone"
 msgstr "Ajusta el color i el to de la fotografia"
 
-#: src/Resources.vala:188
+#: ../src/Resources.vala:219
 msgid "Re_vert to Original"
 msgstr "_Reverteix a l'original"
 
-#: src/Resources.vala:189
+#: ../src/Resources.vala:220
 msgid "Revert to Original"
 msgstr "Reverteix a l'original"
 
-#: src/Resources.vala:191
+#: ../src/Resources.vala:222
 msgid "Revert External E_dits"
 msgstr "Reverteix les edicions e_xternes"
 
-#: src/Resources.vala:192
+#: ../src/Resources.vala:223
 msgid "Revert to the master photo"
 msgstr "Reverteix a la fotografia mestra"
 
-#: src/Resources.vala:194
+#: ../src/Resources.vala:225
 msgid "Set as _Desktop Background"
 msgstr "Estableix com a fons d'_escriptori"
 
-#: src/Resources.vala:195
+#: ../src/Resources.vala:226
 msgid "Set selected image to be the new desktop background"
 msgstr "Estableix la imatge seleccionada com a fons de l'escriptori"
 
-#: src/Resources.vala:196
+#: ../src/Resources.vala:227
 msgid "Set as _Desktop Slideshow..."
 msgstr "Estableix com a presentació de _diapositives de l'escriptori..."
 
-#: src/Resources.vala:198
+#: ../src/Resources.vala:229
 msgid "_Undo"
 msgstr "_Desfés"
 
-#: src/Resources.vala:199
+#: ../src/Resources.vala:230
 msgid "Undo"
 msgstr "Desfés"
 
-#: src/Resources.vala:201
+#: ../src/Resources.vala:232
 msgid "_Redo"
 msgstr "_Refés"
 
-#: src/Resources.vala:202
+#: ../src/Resources.vala:233
 msgid "Redo"
 msgstr "Refés"
 
-#: src/Resources.vala:204
+#: ../src/Resources.vala:235
 msgid "Re_name Event..."
 msgstr "Can_via el nom de l'esdeveniment..."
 
-#: src/Resources.vala:207
+#: ../src/Resources.vala:238
 msgid "Make _Key Photo for Event"
 msgstr "Fes-la la fotografia _principal de l'esdeveniment"
 
-#: src/Resources.vala:208
+#: ../src/Resources.vala:239
 msgid "Make Key Photo for Event"
 msgstr "Fes-la la fotografia principal de l'esdeveniment"
 
-#: src/Resources.vala:210
+#: ../src/Resources.vala:241
 msgid "_New Event"
 msgstr "Esdeveniment _nou"
 
-#: src/Resources.vala:211
+#: ../src/Resources.vala:242
 msgid "New Event"
 msgstr "Esdeveniment nou"
 
-#: src/Resources.vala:213
+#: ../src/Resources.vala:244
 msgid "Move Photos"
 msgstr "Mou les fotografies"
 
-#: src/Resources.vala:214
+#: ../src/Resources.vala:245
 msgid "Move photos to an event"
 msgstr "Mou les fotografies cap a un esdeveniment"
 
-#: src/Resources.vala:216
+#: ../src/Resources.vala:247
 msgid "_Merge Events"
 msgstr "_Combina els esdeveniments"
 
-#: src/Resources.vala:217
+#: ../src/Resources.vala:248
 msgid "Merge"
 msgstr "Combina"
 
-#: src/Resources.vala:218
+#: ../src/Resources.vala:249
 msgid "Combine events into a single event"
-msgstr "Combinar events en un únic event"
+msgstr "Combina les esdeveniments en un únic esdeveniment"
 
-#: src/Resources.vala:220
+#: ../src/Resources.vala:251
 msgid "_Set Rating"
 msgstr "_Estableix la puntuació"
 
-#: src/Resources.vala:221
+#: ../src/Resources.vala:252
 msgid "Set Rating"
 msgstr "Estableix la puntuació"
 
-#: src/Resources.vala:222
+#: ../src/Resources.vala:253
 msgid "Change the rating of your photo"
 msgstr "Canvia la puntuació de la fotografia"
 
-#: src/Resources.vala:224
+#: ../src/Resources.vala:255
 msgid "_Increase"
 msgstr "_Incrementa"
 
-#: src/Resources.vala:225
+#: ../src/Resources.vala:256
 msgid "Increase Rating"
 msgstr "Incrementa la puntuació"
 
-#: src/Resources.vala:227
+#: ../src/Resources.vala:258
 msgid "_Decrease"
 msgstr "_Redueix"
 
-#: src/Resources.vala:228
+#: ../src/Resources.vala:259
 msgid "Decrease Rating"
 msgstr "Redueix la puntuació"
 
-#: src/Resources.vala:230
+#: ../src/Resources.vala:261
 msgid "_Unrated"
 msgstr "_Sense puntuació"
 
-#: src/Resources.vala:231
+#: ../src/Resources.vala:262
 msgid "Unrated"
 msgstr "Sense puntuació"
 
-#: src/Resources.vala:232
+#: ../src/Resources.vala:263
 msgid "Rate Unrated"
 msgstr "Puntua les fotografies sense puntuació"
 
-#: src/Resources.vala:233
+#: ../src/Resources.vala:264
 msgid "Setting as unrated"
 msgstr "S'està establint com sense puntuació"
 
-#: src/Resources.vala:234
+#: ../src/Resources.vala:265
 msgid "Remove any ratings"
 msgstr "Suprimeix totes les puntuacions"
 
-#: src/Resources.vala:236
+#: ../src/Resources.vala:267
 msgid "_Rejected"
 msgstr "_Rebutjada"
 
-#: src/Resources.vala:237
+#: ../src/Resources.vala:268
 msgid "Rejected"
 msgstr "Rebutjada"
 
-#: src/Resources.vala:238
+#: ../src/Resources.vala:269
 msgid "Rate Rejected"
 msgstr "Puntua com a rebutjada"
 
-#: src/Resources.vala:239
+#: ../src/Resources.vala:270
 msgid "Setting as rejected"
 msgstr "S'està establint com a rebutjada"
 
-#: src/Resources.vala:240
+#: ../src/Resources.vala:271
 msgid "Set rating to rejected"
 msgstr "Estableix la puntuació com a rebutjada"
 
-#: src/Resources.vala:242
+#: ../src/Resources.vala:273
 msgid "Rejected _Only"
 msgstr "Només les _rebutjades"
 
-#: src/Resources.vala:243
+#: ../src/Resources.vala:274
 msgid "Rejected Only"
 msgstr "Només les rebutjades"
 
-#: src/Resources.vala:244
+#: ../src/Resources.vala:275
 msgid "Show only rejected photos"
 msgstr "Mostra només les fotografies rebutjades"
 
-#: src/Resources.vala:246
+#: ../src/Resources.vala:277
 msgid "All + _Rejected"
 msgstr "Totes més les _rebutjades"
 
-#: src/Resources.vala:247 src/Resources.vala:248
+#: ../src/Resources.vala:278 ../src/Resources.vala:279
 msgid "Show all photos, including rejected"
 msgstr "Mostra totes les fotografies, incloses les rebutjades"
 
-#: src/Resources.vala:250
+#: ../src/Resources.vala:281
 msgid "_All Photos"
 msgstr "_Totes les fotografies"
 
-#: src/Resources.vala:251 src/Resources.vala:252
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:283 ../src/Resources.vala:285
 msgid "Show all photos"
 msgstr "Mostra totes les fotografies"
 
-#: src/Resources.vala:254
+#: ../src/Resources.vala:287
 msgid "_Ratings"
 msgstr "_Puntuacions"
 
-#: src/Resources.vala:255
+#: ../src/Resources.vala:288
 msgid "Display each photo's rating"
 msgstr "Mostra la puntuació de cada fotografia"
 
-#: src/Resources.vala:257
+#: ../src/Resources.vala:290
 msgid "_Filter Photos"
 msgstr "_Filtra les fotografies"
 
-#: src/Resources.vala:258
+#: ../src/Resources.vala:291
 msgid "Filter Photos"
 msgstr "Filtra les fotografies"
 
-#: src/Resources.vala:259
+#: ../src/Resources.vala:292
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Limita el nombre de fotografies mostrades basant-se en un filtre"
 
-#: src/Resources.vala:261
+#: ../src/Resources.vala:294
 msgid "_Duplicate"
 msgstr "_Duplica"
 
-#: src/Resources.vala:262
+#: ../src/Resources.vala:295
 msgid "Duplicate"
 msgstr "Duplica"
 
-#: src/Resources.vala:263
+#: ../src/Resources.vala:296
 msgid "Make a duplicate of the photo"
 msgstr "Fes un duplicat de la fotografia"
 
-#: src/Resources.vala:265
+#: ../src/Resources.vala:298
 msgid "_Export..."
 msgstr "_Exporta..."
 
-#: src/Resources.vala:267
+#: ../src/Resources.vala:300
 msgid "_Print..."
 msgstr "_Imprimeix..."
 
-#: src/Resources.vala:269
+#: ../src/Resources.vala:302
 msgid "Pu_blish..."
 msgstr "Pu_blica..."
 
-#: src/Resources.vala:270
-msgid "Publish"
-msgstr "Publica"
-
-#: src/Resources.vala:271
+#: ../src/Resources.vala:304
 msgid "Publish to various websites"
 msgstr "Publica a diversos llocs web"
 
-#: src/Resources.vala:273
+#: ../src/Resources.vala:306
 msgid "Edit _Title..."
 msgstr "Edita el _títol..."
 
-#: src/Resources.vala:276
+#: ../src/Resources.vala:310
 msgid "Edit _Comment..."
-msgstr ""
+msgstr "Edita el _comentari..."
 
-#: src/Resources.vala:277
+#. Button label
+#: ../src/Resources.vala:312
 msgid "Edit Comment"
-msgstr ""
+msgstr "Edita el comentari..."
 
-#: src/Resources.vala:279
+#: ../src/Resources.vala:314
 msgid "Edit Event _Comment..."
-msgstr ""
+msgstr "Edita el _comentari de l'esdeveniment..."
 
-#: src/Resources.vala:282
+#: ../src/Resources.vala:317
 msgid "_Adjust Date and Time..."
 msgstr "_Ajusta la data i l'hora..."
 
-#: src/Resources.vala:283
+#: ../src/Resources.vala:318
 msgid "Adjust Date and Time"
 msgstr "Ajusta la data i l'hora"
 
-#: src/Resources.vala:285
+#: ../src/Resources.vala:320
 msgid "Add _Tags..."
 msgstr "Afegeix e_tiquetes..."
 
-#: src/Resources.vala:286
+#: ../src/Resources.vala:321
 msgid "_Add Tags..."
-msgstr "_Afegir etiquetes..."
+msgstr "_Afegeix etiquetes..."
 
-#: src/Resources.vala:287 src/Resources.vala:318
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:323 ../src/Resources.vala:356
 msgid "Add Tags"
 msgstr "Afegeix etiquetes"
 
-#: src/Resources.vala:289
-msgid "_Preferences"
-msgstr "Preferè_ncies"
-
-#: src/Resources.vala:291
+#: ../src/Resources.vala:327
 msgid "Open With E_xternal Editor"
 msgstr "Obre amb un editor e_xtern"
 
-#: src/Resources.vala:293
+#: ../src/Resources.vala:329
 msgid "Open With RA_W Editor"
 msgstr "Obre amb un editor d'imatges RA_W"
 
-#: src/Resources.vala:295
+#: ../src/Resources.vala:331
 msgid "Send _To..."
 msgstr "Envia _a..."
 
-#: src/Resources.vala:296
+#: ../src/Resources.vala:332
 msgid "Send T_o..."
 msgstr "Enviar _a..."
 
-#: src/Resources.vala:298
+#: ../src/Resources.vala:334
 msgid "_Find..."
 msgstr "_Cerca..."
 
-#: src/Resources.vala:299
+#: ../src/Resources.vala:335
 msgid "Find"
 msgstr "Cerca"
 
-#: src/Resources.vala:300
+#: ../src/Resources.vala:336
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Cerqueu una imatge escrivint text que aparegui en el seu nom o les seves "
 "etiquetes"
 
-#: src/Resources.vala:302
+#: ../src/Resources.vala:338
 msgid "_Flag"
 msgstr "_Senyala"
 
-#: src/Resources.vala:304
+#: ../src/Resources.vala:340
 msgid "Un_flag"
 msgstr "_Treu el senyalador"
 
-#: src/Resources.vala:307
+#: ../src/Resources.vala:343
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "No s'ha pogut executar l'editor: %s"
 
-#: src/Resources.vala:312
+#: ../src/Resources.vala:348
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "Afegeix l'etiqueta «%s»"
 
-#: src/Resources.vala:314
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:351
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "Afegeix les etiquetes «%s» i «%s»"
 
-#: src/Resources.vala:322
+#: ../src/Resources.vala:361
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "_Suprimeix l'etiqueta «%s»"
 
-#: src/Resources.vala:326
+#: ../src/Resources.vala:365
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "Suprimeix l'etiqueta «%s»"
 
-#: src/Resources.vala:329
+#: ../src/Resources.vala:368
 msgid "Delete Tag"
 msgstr "Suprimeix l'etiqueta"
 
-#: src/Resources.vala:332
-msgid "_New"
-msgstr "_Nova"
-
-#: src/Resources.vala:335
+#: ../src/Resources.vala:374
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "Can_via el nom de l'etiqueta «%s»..."
 
-#: src/Resources.vala:339
+#: ../src/Resources.vala:378
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "Canvia el nom de l'etiqueta «%s» a «%s»"
 
-#: src/Resources.vala:342
+#: ../src/Resources.vala:381
 msgid "_Rename..."
 msgstr "_Canvia el nom..."
 
-#: src/Resources.vala:344
+#: ../src/Resources.vala:383
 msgid "Modif_y Tags..."
 msgstr "Modi_fica les etiquetes..."
 
-#: src/Resources.vala:345
+#: ../src/Resources.vala:384
 msgid "Modify Tags"
 msgstr "Modifica les etiquetes"
 
-#: src/Resources.vala:348
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Etiqueta la fotografia com a «%s»"
 
-#: src/Resources.vala:348
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Etiqueta les fotografies com a «%s»"
 
-#: src/Resources.vala:352
+#: ../src/Resources.vala:391
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "Etiqueta la fotografia seleccionada com a «%s»"
 
-#: src/Resources.vala:353
+#: ../src/Resources.vala:392
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "Etiqueta les fotografies seleccionades com a «%s»"
 
-#: src/Resources.vala:357
+#: ../src/Resources.vala:396
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "Suprimeix l'etiqueta «%s» de la _fotografia"
 
-#: src/Resources.vala:358
+#: ../src/Resources.vala:397
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "Suprimeix l'etiqueta «%s» de les _fotografies"
 
-#: src/Resources.vala:362
+#: ../src/Resources.vala:401
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "Suprimeix l'etiqueta «%s» de la fotografia"
 
-#: src/Resources.vala:363
+#: ../src/Resources.vala:402
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "Suprimeix l'etiqueta «%s» de les fotografies"
 
-#: src/Resources.vala:367
+#: ../src/Resources.vala:406
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr ""
 "No s'ha pogut canviar el nom de l'etiqueta a «%s» perquè l'etiqueta ja "
 "existeix."
 
-#: src/Resources.vala:371
+#: ../src/Resources.vala:410
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr ""
 "No s'ha pogut canviar el nom de la cerca a «%s» perquè aquesta ja existeix."
 
-#: src/Resources.vala:374
+#: ../src/Resources.vala:413
 msgid "Saved Search"
 msgstr "Cerca desada"
 
-#: src/Resources.vala:376
+#: ../src/Resources.vala:415
 msgid "Delete Search"
 msgstr "Suprimeix la cerca"
 
-#: src/Resources.vala:379
+#: ../src/Resources.vala:418
 msgid "_Edit..."
 msgstr "_Edita..."
 
-#: src/Resources.vala:380
+#: ../src/Resources.vala:419
 msgid "Re_name..."
 msgstr "Ca_nvia el nom..."
 
-#: src/Resources.vala:383
+#: ../src/Resources.vala:422
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "Canvia el nom de la cerca «%s» a «%s»"
 
-#: src/Resources.vala:387
+#: ../src/Resources.vala:426
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "Suprimeix la cerca «%s»"
 
-#: src/Resources.vala:545
+#: ../src/Resources.vala:584
 #, c-format
 msgid "Rate %s"
 msgstr "Puntua com a %s"
 
-#: src/Resources.vala:546
+#: ../src/Resources.vala:585
 #, c-format
 msgid "Set rating to %s"
 msgstr "Estableix la puntuació a %s"
 
-#: src/Resources.vala:547
+#: ../src/Resources.vala:586
 #, c-format
 msgid "Setting rating to %s"
 msgstr "S'està establint la puntuació a %s"
 
-#: src/Resources.vala:549
+#: ../src/Resources.vala:588
 #, c-format
 msgid "Display %s"
 msgstr "Mostra %s"
 
-#: src/Resources.vala:550
+#: ../src/Resources.vala:589
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Mostra només les fotografies amb una puntuació de %s"
 
-#: src/Resources.vala:551
+#: ../src/Resources.vala:590
 #, c-format
 msgid "%s or Better"
 msgstr "%s o millor"
 
-#: src/Resources.vala:552
+#: ../src/Resources.vala:591
 #, c-format
 msgid "Display %s or Better"
 msgstr "Mostra només les de %s o millors"
 
-#: src/Resources.vala:553
+#: ../src/Resources.vala:592
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Mostra només les fotografies amb una puntuació de %s o millor"
 
-#: src/Resources.vala:644
+#: ../src/Resources.vala:683
 msgid "Remove the selected photos from the trash"
 msgstr "Suprimeix les fotografies seleccionades de la paperera"
 
-#: src/Resources.vala:645
+#: ../src/Resources.vala:684
 msgid "Remove the selected photos from the library"
 msgstr "Suprimeix les fotografies seleccionades de la biblioteca"
 
-#: src/Resources.vala:647
+#: ../src/Resources.vala:686
 msgid "_Restore"
 msgstr "_Restaura"
 
-#: src/Resources.vala:648
+#: ../src/Resources.vala:687
 msgid "Move the selected photos back into the library"
 msgstr "Torna les fotografies seleccionades a la biblioteca"
 
-#: src/Resources.vala:650
+#: ../src/Resources.vala:689
 msgid "Show in File Mana_ger"
 msgstr "Mostra al nave_gador de fitxers"
 
-#: src/Resources.vala:651
+#: ../src/Resources.vala:690
 msgid "Open the selected photo's directory in the file manager"
 msgstr "Obre el directori de la fotografia seleccionada al gestor de fitxers"
 
-#: src/Resources.vala:654
+#: ../src/Resources.vala:693
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "No s'ha pogut obrir en el gestor de fitxers: %s"
 
-#: src/Resources.vala:657
+#: ../src/Resources.vala:696
 msgid "R_emove From Library"
 msgstr "_Suprimeix de la biblioteca"
 
-#: src/Resources.vala:659
+#: ../src/Resources.vala:698
 msgid "_Move to Trash"
 msgstr "_Mou a la paperera"
 
-#: src/Resources.vala:661
+#: ../src/Resources.vala:700
 msgid "Select _All"
 msgstr "Selecciona-ho _tot"
 
-#: src/Resources.vala:662
+#: ../src/Resources.vala:701
 msgid "Select all items"
 msgstr "Selecciona tots els elements"
 
-#: src/Resources.vala:740
+#. ...precache the timestamp string...
+#. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:780
 msgid "%-I:%M %p"
-msgstr ""
+msgstr "%-I:%M %p"
 
-#: src/Resources.vala:741
+#. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:785
 msgid "%-I:%M:%S %p"
-msgstr ""
+msgstr "%-I:%M:%S %p"
 
-#: src/Resources.vala:742
+#. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:789
 msgid "%a %b %d, %Y"
 msgstr "%a, %l de %b de %Y"
 
-#: src/Resources.vala:743 src/Resources.vala:745
+#. / Locale-specific starting date format for multi-date strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#. / Locale-specific calendar date format for multi-month strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:794 ../src/Resources.vala:804
 msgid "%a %b %d"
 msgstr "%a, %l de %d"
 
-#: src/Resources.vala:744
+#. / Locale-specific ending date format for multi-date strings,
+#. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:799
 msgid "%d, %Y"
 msgstr "%l de %Y"
 
-#: src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr "Angle:"
+#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
+msgid "Slideshow"
+msgstr "Projecció de diapositives"
 
-#: src/editing_tools/StraightenTool.vala:102
-#: src/editing_tools/EditingTools.vala:2204
-msgid "_Reset"
-msgstr "_Reinicia"
+#. Flagged label and toggle
+#: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
+#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
+msgid "Flagged"
+msgstr "Senyalat"
+
+#: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
+msgid "Photos"
+msgstr "Fotografies"
+
+#: ../src/SearchFilter.vala:599 ../src/SearchFilter.vala:600
+msgid "Videos"
+msgstr "Vídeos"
+
+#: ../src/SearchFilter.vala:605
+msgid "RAW Photos"
+msgstr "Fotografies RAW"
+
+#: ../src/SearchFilter.vala:606
+msgid "RAW photos"
+msgstr "Fotografies RAW"
+
+#: ../src/SearchFilter.vala:934
+#, c-format
+msgid "Error loading UI file %s: %s"
+msgstr ""
+"S'ha produït un error en carregar el fitxer d'interfície d'usuari %s: %s"
+
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: ../src/SearchFilter.vala:945
+msgid "Close"
+msgstr "Tanca"
+
+#. Type label and toggles
+#: ../src/SearchFilter.vala:951
+msgid "Type"
+msgstr "Tipus"
+
+#. Rating label and button
+#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
+msgid "Rating"
+msgstr "Valoració"
+
+#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
+msgid "Settings"
+msgstr "Paràmetres"
+
+#. Set up toolbar
+#. add toolbar buttons
+#: ../src/SlideshowPage.vala:160
+msgid "Back"
+msgstr "Enrere"
+
+#: ../src/SlideshowPage.vala:162
+msgid "Go to the previous photo"
+msgstr "Vés a la fotografia anterior"
+
+#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
+msgid "Pause"
+msgstr "Fes una pausa"
+
+#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
+msgid "Pause the slideshow"
+msgstr "Fes una pausa a la presentació de diapositives"
+
+#: ../src/SlideshowPage.vala:174
+msgid "Next"
+msgstr "Següent"
+
+#: ../src/SlideshowPage.vala:176
+msgid "Go to the next photo"
+msgstr "Vés a la fotografia següent"
+
+#: ../src/SlideshowPage.vala:184
+msgid "Change slideshow settings"
+msgstr "Canvia els paràmetres de la presentació de diapositives"
+
+#. An entire slideshow set might be missing, so check for a loop.
+#: ../src/SlideshowPage.vala:238
+msgid "All photo source files are missing."
+msgstr "Manquen tots els fitxers d'origen de les fotografies."
+
+#: ../src/SlideshowPage.vala:270
+msgid "Play"
+msgstr "Reprodueix"
+
+#: ../src/SlideshowPage.vala:271
+msgid "Continue the slideshow"
+msgstr "Continua la presentació de diapositives"
+
+#: ../src/Tag.vala:817
+msgid "untitled"
+msgstr "sense títol"
+
+#. multiple videos
+#: ../src/VideoSupport.vala:489
+msgid "Export Videos"
+msgstr "Exporta vídeos"
+
+#: ../src/camera/Branch.vala:85
+msgid "Cameras"
+msgstr "Càmeres"
+
+#: ../src/camera/ImportPage.vala:459
+msgid ""
+"Unable to unmount camera.  Try unmounting the camera from the file manager."
+msgstr ""
+"No s'ha pogut desmuntar la càmera. Intenteu desmuntar-la des del gestor de "
+"fitxers."
+
+#. hide duplicates checkbox
+#: ../src/camera/ImportPage.vala:776
+msgid "Hide photos already imported"
+msgstr "Amaga les fotografies que ja s'hagin importat"
+
+#: ../src/camera/ImportPage.vala:777
+msgid "Only display photos that have not been imported"
+msgstr "Mostra només les fotografies que no s'hagin importat"
+
+#. Ticket #3304 - Import page shouldn't display confusing message
+#. prior to import.
+#. TODO: replace this with approved text for "talking to camera,
+#. please wait" once new strings are being accepted.
+#: ../src/camera/ImportPage.vala:847
+msgid "Starting import, please wait..."
+msgstr "S'està iniciant la importació, espereu..."
+
+#: ../src/camera/ImportPage.vala:886
+msgid "Import _Selected"
+msgstr "Importa les _seleccionades"
+
+#: ../src/camera/ImportPage.vala:887
+msgid "Import the selected photos into your library"
+msgstr "Importa les fotografies seleccionades a la biblioteca"
+
+#: ../src/camera/ImportPage.vala:892
+msgid "Import _All"
+msgstr "Importa-les _totes"
+
+#: ../src/camera/ImportPage.vala:893
+msgid "Import all the photos into your library"
+msgstr "Importa totes les fotografies a la biblioteca"
 
-#: src/editing_tools/EditingTools.vala:661
+#. it's mounted, offer to unmount for the user
+#: ../src/camera/ImportPage.vala:1014
+msgid ""
+"Shotwell needs to unmount the camera from the filesystem in order to access "
+"it.  Continue?"
+msgstr ""
+"Cal que el Shotwell desmunti la càmera del sistema de fitxers per poder-hi "
+"accedir. Voleu continuar?"
+
+#: ../src/camera/ImportPage.vala:1020
+msgid "_Unmount"
+msgstr "_Desmunta-la"
+
+#: ../src/camera/ImportPage.vala:1025
+msgid "Please unmount the camera."
+msgstr "Desmunteu la càmera."
+
+#: ../src/camera/ImportPage.vala:1030
+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 ""
+"Una altra aplicació està blocant la càmera. El Shotwell només pot accedir a "
+"la càmera si no està blocada. Tanqueu qualsevol altra aplicació que "
+"l'estigui utilitzant i torneu-ho a intentar."
+
+#: ../src/camera/ImportPage.vala:1040
+msgid "Please close any other application using the camera."
+msgstr "Tanqueu qualsevol altra aplicació que estigui utilitzant la càmera."
+
+#: ../src/camera/ImportPage.vala:1045
+#, c-format
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
+msgstr ""
+"No es poden obtenir previsualitzacions de la càmera:\n"
+"%s"
+
+#: ../src/camera/ImportPage.vala:1062
+msgid "Unmounting..."
+msgstr "S'està desmuntant..."
+
+#: ../src/camera/ImportPage.vala:1168
+msgid "Fetching photo information"
+msgstr "S'està recollint la informació de les fotografies"
+
+#: ../src/camera/ImportPage.vala:1523
+#, c-format
+msgid "Fetching preview for %s"
+msgstr "S'està recollint la previsualització de %s"
+
+#: ../src/camera/ImportPage.vala:1639
+#, c-format
+msgid "Unable to lock camera: %s"
+msgstr "No es pot blocar la càmera: %s"
+
+#: ../src/camera/ImportPage.vala:1724
+#, c-format
+msgid "Delete this photo from camera?"
+msgid_plural "Delete these %d photos from camera?"
+msgstr[0] "Voleu suprimir aquesta fotografia de la càmera?"
+msgstr[1] "Voleu suprimir aquestes %d fotografies de la càmera?"
+
+#: ../src/camera/ImportPage.vala:1727
+#, c-format
+msgid "Delete this video from camera?"
+msgid_plural "Delete these %d videos from camera?"
+msgstr[0] "Voleu suprimir aquest vídeo de la càmera?"
+msgstr[1] "Voleu suprimir aquests %d vídeos de la càmera?"
+
+#: ../src/camera/ImportPage.vala:1730
+#, c-format
+msgid "Delete this photo/video from camera?"
+msgid_plural "Delete these %d photos/videos from camera?"
+msgstr[0] "Voleu suprimir aquesta fotografia/vídeo de la càmera?"
+msgstr[1] "Voleu suprimir aquestes %d fotografies/vídeos de la càmera?"
+
+#: ../src/camera/ImportPage.vala:1733
+#, c-format
+msgid "Delete these files from camera?"
+msgid_plural "Delete these %d files from camera?"
+msgstr[0] "Voleu suprimir aquest fitxer de la càmera?"
+msgstr[1] "Voleu suprimir aquests %d fitxers de la càmera?"
+
+#: ../src/camera/ImportPage.vala:1760
+msgid "Removing photos/videos from camera"
+msgstr "S'estan suprimint les fotografies/vídeos de la càmera"
+
+#: ../src/camera/ImportPage.vala:1764
+#, 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] ""
+"No s'ha pogut suprimir %d fotografia/vídeo de la càmera a causa d'errors."
+msgstr[1] ""
+"No s'han pogut suprimir %d fotografies/vídeos de la càmera a causa d'errors."
+
+#: ../src/data_imports/DataImports.vala:22
+msgid "Data Imports"
+msgstr "Dades de les importacions"
+
+#. Send an empty job to the queue to mark the end of the import
+#: ../src/data_imports/DataImportsPluginHost.vala:65
+#: ../src/data_imports/DataImportsPluginHost.vala:78
+#, c-format
+msgid "%s Database"
+msgstr "Base de dades %s"
+
+#: ../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 "No pot continuar la importació des de %s perquè s'ha produït un error:"
+
+#: ../src/data_imports/DataImportsPluginHost.vala:151
+msgid "To try importing from another service, select one from the above menu."
+msgstr ""
+"Intenteu importar des d'un altre servei, seleccioneu-ne un del menú següent."
+
+#: ../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 ""
+"No teniu cap connector d'importació de dades activat.\n"
+"\n"
+"Per poder utilitzar la funcionalitat d'importació des d'una aplicació, heu "
+"de tenir com a mínim un connector d'importació de dades habilitat. Podeu "
+"habilitar els connectors al diàleg de preferències."
+
+#: ../src/data_imports/DataImportsUI.vala:100
+msgid "Database file:"
+msgstr "Fitxer de base de dades:"
+
+#: ../src/data_imports/DataImportsUI.vala:112
+#: ../src/library/LibraryWindow.vala:898
+msgid "_Import"
+msgstr "_Importa"
+
+#: ../src/data_imports/DataImportsUI.vala:217
+msgid "Import From Application"
+msgstr "Importa des de l'aplicació"
+
+#: ../src/data_imports/DataImportsUI.vala:369
+#: ../src/publishing/PublishingUI.vala:470
+msgid "_Close"
+msgstr "_Tanca"
+
+#: ../src/db/DatabaseTable.vala:37
+#, c-format
+msgid "Unable to open/create photo database %s: error code %d"
+msgstr ""
+"No s'ha pogut obrir o crear la base de dades de fotografies %s: codi d'error "
+"%d"
+
+#: ../src/db/DatabaseTable.vala:46
+#, c-format
+msgid ""
+"Unable to write to photo database file:\n"
+" %s"
+msgstr ""
+"No s'ha pogut escriure al fitxer de la base de dades de fotografies:\n"
+" %s"
+
+#: ../src/db/DatabaseTable.vala:48
+#, c-format
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
+msgstr ""
+"S'ha produït un error en accedir al fitxer de la base de dades:\n"
+" %s\n"
+"\n"
+"L'error ha estat: \n"
+"%s"
+
+#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:351
+msgid "_File"
+msgstr "_Fitxer"
+
+#: ../src/direct/DirectPhotoPage.vala:52
+msgid "Save photo"
+msgstr "Desa la fotografia"
+
+#: ../src/direct/DirectPhotoPage.vala:57
+msgid "Save _As..."
+msgstr "Anomena i _desa..."
+
+#: ../src/direct/DirectPhotoPage.vala:58
+msgid "Save photo with a different name"
+msgstr "Desa la fotografia amb un nom diferent"
+
+#: ../src/direct/DirectPhotoPage.vala:69
+msgid "Print the photo to a printer connected to your computer"
+msgstr "Imprimeix la fotografia a una impressora connectada a l'ordinador"
+
+#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:363
+msgid "_Photo"
+msgstr "_Fotografia"
+
+#: ../src/direct/DirectPhotoPage.vala:227
+#, c-format
+msgid "%s does not exist."
+msgstr "No existeix %s."
+
+#: ../src/direct/DirectPhotoPage.vala:229
+#, c-format
+msgid "%s is not a file."
+msgstr "%s no és un fitxer."
+
+#: ../src/direct/DirectPhotoPage.vala:231
+#, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
+msgstr ""
+"%s no és compatible amb el format de fitxer de\n"
+"%s."
+
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save a Copy"
+msgstr "De_sa'n una còpia"
+
+#: ../src/direct/DirectPhotoPage.vala:425
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "Voleu descartar els canvis a %s?"
+
+#: ../src/direct/DirectPhotoPage.vala:426
+msgid "Close _without Saving"
+msgstr "Tanca _sense desar"
+
+#: ../src/direct/DirectPhotoPage.vala:459
+#, c-format
+msgid "Error while saving to %s: %s"
+msgstr "S'ha produït un error en desar a %s: %s"
+
+#: ../src/direct/DirectPhotoPage.vala:487
+#: ../src/direct/DirectPhotoPage.vala:508
+msgid "Save As"
+msgstr "Anomena i desa"
+
+#: ../src/editing_tools/EditingTools.vala:665
 msgid "Return to current photo dimensions"
 msgstr "Torna a la mida actual de la fotografia"
 
-#: src/editing_tools/EditingTools.vala:664
+#: ../src/editing_tools/EditingTools.vala:668
 msgid "Set the crop for this photo"
 msgstr "Estableix l'escapçament d'aquesta fotografia"
 
-#: src/editing_tools/EditingTools.vala:676
+#: ../src/editing_tools/EditingTools.vala:680
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr ""
 "Pivota el rectangle d'escapçament entre les orientacions vertical i apaïsada"
 
-#: src/editing_tools/EditingTools.vala:749
+#: ../src/editing_tools/EditingTools.vala:753
 msgid "Unconstrained"
 msgstr "Sense límits"
 
-#: src/editing_tools/EditingTools.vala:750
+#: ../src/editing_tools/EditingTools.vala:754
 msgid "Square"
 msgstr "Quadrat"
 
-#: src/editing_tools/EditingTools.vala:751
+#: ../src/editing_tools/EditingTools.vala:755
 msgid "Screen"
 msgstr "Pantalla"
 
-#: src/editing_tools/EditingTools.vala:752
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
-msgid "Original Size"
-msgstr "Mida original"
-
-#: src/editing_tools/EditingTools.vala:753
-#: src/editing_tools/EditingTools.vala:756
-#: src/editing_tools/EditingTools.vala:766
-#: src/editing_tools/EditingTools.vala:776
+#: ../src/editing_tools/EditingTools.vala:757
+#: ../src/editing_tools/EditingTools.vala:760
+#: ../src/editing_tools/EditingTools.vala:770
+#: ../src/editing_tools/EditingTools.vala:780
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:754
+#: ../src/editing_tools/EditingTools.vala:758
 msgid "SD Video (4 : 3)"
 msgstr "Vídeo SD (4 : 3)"
 
-#: src/editing_tools/EditingTools.vala:755
+#: ../src/editing_tools/EditingTools.vala:759
 msgid "HD Video (16 : 9)"
 msgstr "Vídeo HD (16 : 9)"
 
-#: src/editing_tools/EditingTools.vala:762
+#: ../src/editing_tools/EditingTools.vala:766
 msgid "Letter (8.5 x 11 in.)"
-msgstr ""
+msgstr "Carta (8.5 x 11 in.)"
 
-#: src/editing_tools/EditingTools.vala:764
+#: ../src/editing_tools/EditingTools.vala:768
 msgid "Tabloid (11 x 17 in.)"
-msgstr ""
+msgstr "Tabloide (11 x 17 in.)"
 
-#: src/editing_tools/EditingTools.vala:771
+#: ../src/editing_tools/EditingTools.vala:775
 msgid "A4 (210 x 297 mm)"
 msgstr "A4 (210 x 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:775
+#: ../src/editing_tools/EditingTools.vala:779
 msgid "A3 (297 x 420 mm)"
 msgstr "A3 (297 x 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1865
+#: ../src/editing_tools/EditingTools.vala:1905
 msgid "Close the red-eye tool"
 msgstr "Tanca l'eina d'ulls vermells"
 
-#: src/editing_tools/EditingTools.vala:1868
+#: ../src/editing_tools/EditingTools.vala:1908
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Suprimeix tots els efectes d'ulls vermells de la regió seleccionada"
 
-#: src/editing_tools/EditingTools.vala:2226
+#: ../src/editing_tools/EditingTools.vala:2244
+#: ../src/editing_tools/StraightenTool.vala:102
+msgid "_Reset"
+msgstr "_Reinicia"
+
+#: ../src/editing_tools/EditingTools.vala:2266
 msgid "Saturation:"
 msgstr "Saturació:"
 
-#: src/editing_tools/EditingTools.vala:2234
+#: ../src/editing_tools/EditingTools.vala:2274
 msgid "Tint:"
 msgstr "Tint:"
 
-#: src/editing_tools/EditingTools.vala:2243
+#: ../src/editing_tools/EditingTools.vala:2283
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: src/editing_tools/EditingTools.vala:2251
+#: ../src/editing_tools/EditingTools.vala:2291
 msgid "Shadows:"
 msgstr "Ombres:"
 
-#: src/editing_tools/EditingTools.vala:2259
+#: ../src/editing_tools/EditingTools.vala:2299
 msgid "Highlights:"
-msgstr ""
+msgstr "Realçats:"
 
-#: src/editing_tools/EditingTools.vala:2313
+#: ../src/editing_tools/EditingTools.vala:2353
 msgid "Reset Colors"
 msgstr "Reinicialitza els colors"
 
-#: src/editing_tools/EditingTools.vala:2313
+#: ../src/editing_tools/EditingTools.vala:2353
 msgid "Reset all color adjustments to original"
 msgstr "Reinicialitza tots els ajustaments de color a l'original"
 
-#: src/editing_tools/EditingTools.vala:2665
+#: ../src/editing_tools/EditingTools.vala:2705
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/editing_tools/EditingTools.vala:2678
+#: ../src/editing_tools/EditingTools.vala:2718
 msgid "Tint"
 msgstr "Tint"
 
-#: src/editing_tools/EditingTools.vala:2691
+#: ../src/editing_tools/EditingTools.vala:2731
 msgid "Saturation"
 msgstr "Saturació"
 
-#: src/editing_tools/EditingTools.vala:2704
+#: ../src/editing_tools/EditingTools.vala:2744
 msgid "Exposure"
 msgstr "Exposició"
 
-#: src/editing_tools/EditingTools.vala:2717
+#: ../src/editing_tools/EditingTools.vala:2757
 msgid "Shadows"
 msgstr "Ombres"
 
-#: src/editing_tools/EditingTools.vala:2730
+#: ../src/editing_tools/EditingTools.vala:2770
 msgid "Highlights"
-msgstr ""
+msgstr "Realçats"
 
-#: src/editing_tools/EditingTools.vala:2740
+#: ../src/editing_tools/EditingTools.vala:2780
 msgid "Contrast Expansion"
 msgstr "Expansió del contrast"
 
-#: src/AppWindow.vala:49
-msgid "Pin Toolbar"
-msgstr "Mantén la barra d'eines"
+#: ../src/editing_tools/StraightenTool.vala:99
+msgid "Angle:"
+msgstr "Angle:"
 
-#: src/AppWindow.vala:50
-msgid "Pin the toolbar open"
-msgstr "Mantén la barra d'eines oberta"
+#: ../src/events/EventDirectoryItem.vala:83
+#, c-format
+msgid "%d Photo/Video"
+msgid_plural "%d Photos/Videos"
+msgstr[0] "%d fotografia/vídeo"
+msgstr[1] "%d fotografies/vídeos"
 
-#: src/AppWindow.vala:53 src/AppWindow.vala:131
-msgid "Leave fullscreen"
-msgstr "Surt de la pantalla completa"
+#: ../src/events/EventPage.vala:129
+msgid "No Event"
+msgstr "Cap esdeveniment"
 
-#: src/AppWindow.vala:130
-msgid "Leave _Fullscreen"
-msgstr "Surt de la _pantalla completa"
+#: ../src/events/EventsDirectoryPage.vala:131
+msgid "Display the comment of each event"
+msgstr "Mostra el comentari per cada esdeveniment"
 
-#: src/AppWindow.vala:491
-msgid "_Quit"
-msgstr "_Surt"
+#: ../src/events/EventsDirectoryPage.vala:155
+msgid "No events"
+msgstr "Sense esdeveniments"
 
-#: src/AppWindow.vala:496
-msgid "_About"
-msgstr "_Quant a"
+#: ../src/events/EventsDirectoryPage.vala:159
+msgid "No events found"
+msgstr "No s'han trobat esdeveniments"
 
-#: src/AppWindow.vala:501
-msgid "Fulls_creen"
-msgstr "_Pantalla completa"
+#: ../src/events/EventsDirectoryPage.vala:230
+msgid "Events"
+msgstr "Esdeveniments"
 
-#: src/AppWindow.vala:506
-msgid "_Contents"
-msgstr "C_ontingut"
+#: ../src/events/EventsDirectoryPage.vala:244
+msgid "Undated"
+msgstr "Sense data"
 
-#: src/AppWindow.vala:511
-msgid "_Frequently Asked Questions"
-msgstr "_Preguntes més freqüents"
+#: ../src/events/EventsDirectoryPage.vala:245
+msgid "%Y"
+msgstr "%Y"
 
-#: src/AppWindow.vala:516
-msgid "_Report a Problem..."
-msgstr "_Reportar problema..."
+#: ../src/events/EventsDirectoryPage.vala:246
+msgid "%B"
+msgstr "%B"
 
-#: src/AppWindow.vala:663
-#, c-format
-msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
-"continue.\n"
-"\n"
-"%s"
-msgstr ""
-"S'ha produït un error fatal en accedir a la biblioteca del Shotwell. El "
-"Shotwell no pot continuar.\n"
-"\n"
-"%s"
+#: ../src/folders/Branch.vala:141
+msgid "Folders"
+msgstr "Carpetes"
 
-#: src/AppWindow.vala:683 plugins/common/Resources.vala:9
-msgid "Visit the Yorba web site"
-msgstr "Vés al lloc web d'en Yorba"
+#: ../src/library/Branch.vala:36 ../ui/shotwell.glade.h:32
+msgid "Library"
+msgstr "Biblioteca"
 
-#: src/AppWindow.vala:686 plugins/common/Resources.vala:28
-msgid "translator-credits"
-msgstr "Credits de traducció"
+#: ../src/library/ImportQueuePage.vala:8
+msgid "Importing..."
+msgstr "S'està important..."
 
-#: src/AppWindow.vala:695
-#, c-format
-msgid "Unable to display help: %s"
-msgstr "No s'ha pogut mostrar l'ajuda: %s"
+#: ../src/library/ImportQueuePage.vala:67
+msgid "_Stop Import"
+msgstr "A_tura la importació"
 
-#: src/AppWindow.vala:703
-#, c-format
-msgid "Unable to navigate to bug database: %s"
-msgstr "Incapaç de navegar per un bug a la base de dades: %s"
+#: ../src/library/ImportQueuePage.vala:68
+msgid "Stop importing photos"
+msgstr "Atura la importació de fotografies"
+
+#: ../src/library/ImportQueuePage.vala:124
+msgid "Preparing to import..."
+msgstr "S'està preparant per importar..."
 
-#: src/AppWindow.vala:711
+#: ../src/library/ImportQueuePage.vala:151
 #, c-format
-msgid "Unable to display FAQ: %s"
-msgstr "No s'han pogut mostrar les PMF: %s"
+msgid "Imported %s"
+msgstr "S'ha importat %s"
 
-#: src/Tag.vala:817
-msgid "untitled"
-msgstr "sense títol"
+#: ../src/library/LastImportPage.vala:8
+msgid "Last Import"
+msgstr "Darrera importació"
 
-#: src/Dimensions.vala:17
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1250
-msgid "Original size"
-msgstr "Mida original"
+#: ../src/library/LibraryWindow.vala:301
+msgid "_Import From Folder..."
+msgstr "_Importa des d'una carpeta..."
 
-#: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Amplada o alçada"
+#: ../src/library/LibraryWindow.vala:302
+msgid "Import photos from disk to library"
+msgstr "Importa fotografies des del disc a la biblioteca"
 
-#: src/Dimensions.vala:23
-msgid "Width"
-msgstr "Amplada"
+#: ../src/library/LibraryWindow.vala:309
+msgid "Import From _Application..."
+msgstr "Importa des de l'_aplicació..."
 
-#: src/Dimensions.vala:26
-msgid "Height"
-msgstr "Alçada"
+#: ../src/library/LibraryWindow.vala:313
+msgid "Sort _Events"
+msgstr "Ordena els es_deveniments"
 
-#: src/MediaPage.vala:143
-msgid "Adjust the size of the thumbnails"
-msgstr "Ajusta la mida de les miniatures"
+#: ../src/library/LibraryWindow.vala:323
+msgid "Empty T_rash"
+msgstr "Buida la _paperera"
 
-#: src/MediaPage.vala:326
-msgid "Increase the magnification of the thumbnails"
-msgstr "Augmenta la mida de les miniatures"
+#: ../src/library/LibraryWindow.vala:324
+msgid "Delete all photos in the trash"
+msgstr "Suprimeix totes les fotografies de la paperera"
 
-#: src/MediaPage.vala:332
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Redueix la mida de les miniatures"
+#: ../src/library/LibraryWindow.vala:329
+msgid "View Eve_nt for Photo"
+msgstr "Visualitza l'_esdeveniment de la fotografia"
 
-#: src/MediaPage.vala:399
-msgid "Sort _Photos"
-msgstr "Ordena les _fotografies"
+#: ../src/library/LibraryWindow.vala:333
+msgid "_Find"
+msgstr "_Cerca"
 
-#: src/MediaPage.vala:408
-msgid "_Play Video"
-msgstr "_Reprodueix el vídeo"
+#: ../src/library/LibraryWindow.vala:334
+msgid "Find photos and videos by search criteria"
+msgstr "Cerca fotografies i vídeos per criteri de cerca"
 
-#: src/MediaPage.vala:409
-msgid "Open the selected videos in the system video player"
-msgstr "Obre els vídeos seleccionats en el reproductor de vídeo del sistema"
+#: ../src/library/LibraryWindow.vala:345 ../src/searches/Branch.vala:77
+#: ../src/sidebar/Tree.vala:185
+msgid "Ne_w Saved Search..."
+msgstr "Cerca no_va desada..."
 
-#: src/MediaPage.vala:442 src/events/EventsDirectoryPage.vala:130
-msgid "_Comments"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:367
+msgid "_Photos"
+msgstr "_Fotografies"
 
-#: src/MediaPage.vala:443
-msgid "Display the comment of each photo"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:371
+msgid "Even_ts"
+msgstr "E_sdeveniments"
 
-#: src/MediaPage.vala:455
-msgid "Display each photo's tags"
-msgstr "Mostra les etiquetes de cada fotografia"
+#: ../src/library/LibraryWindow.vala:390
+msgid "_Basic Information"
+msgstr "Informació _bàsica"
 
-#: src/MediaPage.vala:471
-msgid "By _Title"
-msgstr "Per _títol"
+#: ../src/library/LibraryWindow.vala:391
+msgid "Display basic information for the selection"
+msgstr "Mostra informació bàsica sobre la selecció"
 
-#: src/MediaPage.vala:472
-msgid "Sort photos by title"
-msgstr "Ordena les fotografies per títol"
+#: ../src/library/LibraryWindow.vala:396
+msgid "E_xtended Information"
+msgstr "Informació am_pliada"
 
-#: src/MediaPage.vala:477
-msgid "By Exposure _Date"
-msgstr "Per _data d'exposició"
+#: ../src/library/LibraryWindow.vala:397
+msgid "Display extended information for the selection"
+msgstr "Mostra informació ampliada sobre la selecció"
 
-#: src/MediaPage.vala:478
-msgid "Sort photos by exposure date"
-msgstr "Ordena les fotografies per data d'exposició"
+#: ../src/library/LibraryWindow.vala:402
+msgid "_Search Bar"
+msgstr "Barra de _cerca"
 
-#: src/MediaPage.vala:483
-msgid "By _Rating"
-msgstr "Per _puntuació"
+#: ../src/library/LibraryWindow.vala:403
+msgid "Display the search bar"
+msgstr "Mostra la barra de cerca"
 
-#: src/MediaPage.vala:484
-msgid "Sort photos by rating"
-msgstr "Ordena les fotografies per puntuació"
+#: ../src/library/LibraryWindow.vala:408
+msgid "S_idebar"
+msgstr "_Barra lateral"
+
+#: ../src/library/LibraryWindow.vala:409
+msgid "Display the sidebar"
+msgstr "Mostra la barra lateral"
+
+#: ../src/library/LibraryWindow.vala:667
+msgid "Import From Folder"
+msgstr "Importa des d'una carpeta"
+
+#: ../src/library/LibraryWindow.vala:736
+msgid "Empty Trash"
+msgstr "Buida la paperera"
+
+#: ../src/library/LibraryWindow.vala:736
+msgid "Emptying Trash..."
+msgstr "S'està buidant la paperera..."
 
-#: src/MediaPage.vala:702
+#: ../src/library/LibraryWindow.vala:895
 #, c-format
 msgid ""
-"Shotwell was unable to play the selected video:\n"
-"%s"
-msgstr ""
-"El Shotwell no ha pogut reproduir el vídeo seleccionat:\n"
-"%s"
+"Shotwell is configured to import photos to your home directory.\n"
+"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
+"span>.\n"
+"Do you want to continue importing photos?"
+msgstr ""
+"El Shotwell està configurat per importar les fotos al vostre directori "
+"d'inici.\n"
+"Us recomanem canviar això a <span weight=\"bold\">Edita %s Preferències</"
+"span>.\n"
+"Voleu continuar la importació de les fotos?"
+
+#: ../src/library/LibraryWindow.vala:898 ../ui/shotwell.glade.h:18
+msgid "Library Location"
+msgstr "Ubicació de la biblioteca"
+
+#. TODO: Specify which directory/file.
+#: ../src/library/LibraryWindow.vala:911
+msgid "Photos cannot be imported from this directory."
+msgstr "No es poden importar fotografies des d'aquest directori."
 
-#: src/events/EventDirectoryItem.vala:83
+#: ../src/library/LibraryWindow.vala:1199
 #, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] "%d fotografia/vídeo"
-msgstr[1] "%d fotografies/vídeos"
+msgid "%s (%d%%)"
+msgstr "%s (%d%%)"
 
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:1243
+#: ../src/library/LibraryWindow.vala:1254
+msgid "Updating library..."
+msgstr "S'està actualitzant la biblioteca..."
 
-#: src/events/EventsDirectoryPage.vala:155
-msgid "No events"
-msgstr "Sense esdeveniments"
+#: ../src/library/LibraryWindow.vala:1260
+msgid "Preparing to auto-import photos..."
+msgstr "S'està preparant la importació automàtica de fotografies..."
 
-#: src/events/EventsDirectoryPage.vala:159
-msgid "No events found"
-msgstr "No s'han trobat esdeveniments"
+#: ../src/library/LibraryWindow.vala:1265
+msgid "Auto-importing photos..."
+msgstr "S'estan important automàticament les fotografies..."
 
-#: src/events/EventsDirectoryPage.vala:230
-msgid "Events"
-msgstr "Esdeveniments"
+#: ../src/library/LibraryWindow.vala:1273
+msgid "Writing metadata to files..."
+msgstr "S'estan escrivint les metadades als fitxers..."
 
-#: src/events/EventsDirectoryPage.vala:244
-msgid "Undated"
-msgstr "Sense data"
+#: ../src/library/OfflinePage.vala:8
+msgid "Missing Files"
+msgstr "Manquen fitxers"
 
-#: src/events/EventsDirectoryPage.vala:245
-msgid "%Y"
-msgstr "%Y"
+#: ../src/library/OfflinePage.vala:106
+msgid "Deleting..."
+msgstr "S'està suprimint..."
 
-#: src/events/EventsDirectoryPage.vala:246
-msgid "%B"
-msgstr "%B"
+#: ../src/library/TrashPage.vala:8
+msgid "Trash"
+msgstr "Paperera"
 
-#: src/events/EventPage.vala:129
-msgid "No Event"
-msgstr "Cap esdeveniment"
+#: ../src/library/TrashPage.vala:108
+msgid "Trash is empty"
+msgstr "La paperera està buida"
 
-#: src/AppDirs.vala:48 src/AppDirs.vala:99
-#, c-format
-msgid "Unable to create cache directory %s: %s"
-msgstr "Imposible crear el directori de caché %s: %s"
+#: ../src/library/TrashPage.vala:112
+msgid "Delete"
+msgstr "Suprimeix"
+
+#: ../src/library/TrashPage.vala:113
+msgid "Deleting Photos"
+msgstr "S'estan suprimint les fotografies"
 
-#: src/AppDirs.vala:58 src/AppDirs.vala:88
+#: ../src/main.vala:54
 #, c-format
-msgid "Unable to create data directory %s: %s"
-msgstr "No s'ha pogut crear el directori de dades %s: %s"
+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 ""
+"La biblioteca de fotografies no és compatible amb aquesta versió del "
+"Shotwell. Sembla que es va crear amb el Shotwell %s (esquema %d). Aquesta "
+"versió és la %s (esquema %d). Utilitzeu l'última versió del Shotwell."
 
-#: src/AppDirs.vala:152
-msgid "Pictures"
-msgstr "Imatges"
+#: ../src/main.vala:59
+#, 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 ""
+"El Shotwell no ha pogut actualitzar la biblioteca de fotografies de la "
+"versió %s (esquema %d) a la %s (esquema %d). Per obtenir més informació "
+"comproveu el Wiki del Shotwell a %s."
 
-#: src/AppDirs.vala:190
+#: ../src/main.vala:65
 #, c-format
-msgid "Unable to create temporary directory %s: %s"
-msgstr "No s'ha pogut crear el directori temporal %s: %s"
+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 ""
+"La biblioteca de fotografies no és compatible amb aquesta versió del "
+"Shotwell. Sembla que es va crear amb el Shotwell %s (esquema %d). Aquesta "
+"versió és la %s (esquema %d). Netegeu la biblioteca mitjançant la supressió "
+"de %s i torneu a importar les fotografies."
 
-#: src/AppDirs.vala:207 src/AppDirs.vala:223
+#: ../src/main.vala:71
 #, c-format
-msgid "Unable to create data subdirectory %s: %s"
-msgstr "No s'ha pogut crear el subdirectori de dades %s: %s"
+msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgstr ""
+"S'ha produït un error desconegut en intentar verificar la base de dades del "
+"Shotwell: %s"
 
-#: src/slideshow/TransitionEffects.vala:98
-msgid "(None)"
-msgstr "(Cap)"
+#: ../src/main.vala:104
+msgid "Loading Shotwell"
+msgstr "S'està carregant el Shotwell"
 
-#: src/slideshow/TransitionEffects.vala:287
-msgid "None"
-msgstr "Cap"
+#: ../src/main.vala:294
+msgid "Path to Shotwell's private data"
+msgstr "Camí a les dades privades del Shotwell"
 
-#: src/slideshow/TransitionEffects.vala:339
-msgid "Random"
+#: ../src/main.vala:294
+msgid "DIRECTORY"
+msgstr "DIRECTORI"
+
+#: ../src/main.vala:298
+msgid "Do not monitor library directory at runtime for changes"
 msgstr ""
+"No monitoritzis el directori de la biblioteca en mode d'execució per canvis"
 
-#: src/slideshow/Slideshow.vala:22
-msgid "Slideshow Transitions"
-msgstr "Transicions de la presentació de diapositives"
+#: ../src/main.vala:302
+msgid "Don't display startup progress meter"
+msgstr "No mostris la barra de progrés d'inici"
+
+#: ../src/main.vala:306
+msgid "Show the application's version"
+msgstr "Mostra la versió de l'aplicació"
+
+#. init GTK (valac has already called g_threads_init())
+#: ../src/main.vala:338
+msgid "[FILE]"
+msgstr "[FITXER]"
 
-#: src/Exporter.vala:232
+#: ../src/main.vala:342
 #, c-format
-msgid "Unable to generate a temporary file for %s: %s"
-msgstr "No s'ha pogut generar un fitxer temporal per a %s: %s"
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Executeu «%s --help» per veure una llista completa de les opcions "
+"disponibles de la línia d'ordres.\n"
 
-#: src/Exporter.vala:299
-msgid "Exporting"
-msgstr "S'està exportant"
+#: ../src/photos/BmpSupport.vala:32
+msgid "BMP"
+msgstr "BMP"
 
-#: src/Exporter.vala:317
+#: ../src/photos/JfifSupport.vala:84
+msgid "JPEG"
+msgstr "JPEG"
+
+#: ../src/photos/JfifSupport.vala:185
 #, c-format
-msgid "File %s already exists.  Replace?"
-msgstr "Ja existeix el fitxer %s. Voleu reemplaçar-lo?"
+msgid "Low (%d%%)"
+msgstr "Baixa (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "_Skip"
-msgstr "_Omet-lo"
+#: ../src/photos/JfifSupport.vala:188
+#, c-format
+msgid "Medium (%d%%)"
+msgstr "Mitjana (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "_Replace"
-msgstr "_Reemplaça'l"
+#: ../src/photos/JfifSupport.vala:191
+#, c-format
+msgid "High (%d%%)"
+msgstr "Alta (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "Replace _All"
-msgstr "Reempl_aça'ls tots"
+#: ../src/photos/JfifSupport.vala:194
+#, c-format
+msgid "Maximum (%d%%)"
+msgstr "Màxima (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "Export"
-msgstr "Exporta"
+#: ../src/photos/PngSupport.vala:30
+msgid "PNG"
+msgstr "PNG"
 
-#: src/SearchFilter.vala:593 src/SearchFilter.vala:594
-msgid "Photos"
-msgstr "Fotografies"
+#: ../src/photos/RawSupport.vala:134
+msgid "RAW"
+msgstr "RAW"
 
-#: src/SearchFilter.vala:599 src/SearchFilter.vala:600
-msgid "Videos"
-msgstr "Vídeos"
+#: ../src/photos/TiffSupport.vala:86
+msgid "TIFF"
+msgstr "TIFF"
 
-#: src/SearchFilter.vala:605
-msgid "RAW Photos"
-msgstr "Fotografies RAW"
+#: ../src/publishing/Publishing.vala:16
+msgid "Publishing"
+msgstr "S'està publicant"
 
-#: src/SearchFilter.vala:606
-msgid "RAW photos"
-msgstr "Fotografies RAW"
+#: ../src/publishing/PublishingPluginHost.vala:11
+msgid "Preparing for upload"
+msgstr "S'està preparant per pujar"
 
-#: src/SearchFilter.vala:952
+#: ../src/publishing/PublishingPluginHost.vala:12
 #, c-format
-msgid "Error loading UI file %s: %s"
-msgstr ""
-"S'ha produït un error en carregar el fitxer d'interfície d'usuari %s: %s"
+msgid "Uploading %d of %d"
+msgstr "S'està pujant %d de %d"
 
-#: src/SearchFilter.vala:969
-msgid "Type"
-msgstr "Tipus"
+#: ../src/publishing/PublishingPluginHost.vala:81
+#, c-format
+msgid "Publishing to %s can't continue because an error occurred:"
+msgstr "La publicació a %s no pot continuar perquè s'ha produït un error:"
 
-#: src/publishing/Publishing.vala:16
-msgid "Publishing"
-msgstr "S'està publicant"
+#: ../src/publishing/PublishingPluginHost.vala:84
+msgid "To try publishing to another service, select one from the above menu."
+msgstr ""
+"Si voleu intentar publicar les fotografies a un altre servei, seleccioneu-ne "
+"un del menú de sobre."
 
-#: src/publishing/PublishingUI.vala:105
+#: ../src/publishing/PublishingUI.vala:105
 msgid "The selected photos/videos were successfully published."
 msgstr "S'han publicat correctament les fotografies/vídeos seleccionats."
 
-#: src/publishing/PublishingUI.vala:107
+#: ../src/publishing/PublishingUI.vala:107
 msgid "The selected videos were successfully published."
 msgstr "S'han publicat correctament els vídeos seleccionats."
 
-#: src/publishing/PublishingUI.vala:109
+#: ../src/publishing/PublishingUI.vala:109
 msgid "The selected photos were successfully published."
 msgstr "S'han publicat correctament les fotografies seleccionades."
 
-#: src/publishing/PublishingUI.vala:112
+#: ../src/publishing/PublishingUI.vala:112
 msgid "The selected video was successfully published."
 msgstr "S'ha publicat correctament el vídeo seleccionat."
 
-#: src/publishing/PublishingUI.vala:114
+#: ../src/publishing/PublishingUI.vala:114
 msgid "The selected photo was successfully published."
 msgstr "S'ha publicat correctament la fotografia seleccionada."
 
-#: src/publishing/PublishingUI.vala:122
+#: ../src/publishing/PublishingUI.vala:122
 msgid "Fetching account information..."
 msgstr "S'està recollint la informació del compte..."
 
-#: src/publishing/PublishingUI.vala:128
+#: ../src/publishing/PublishingUI.vala:128
 msgid "Logging in..."
 msgstr "S'està entrant..."
 
-#: src/publishing/PublishingUI.vala:183
+#: ../src/publishing/PublishingUI.vala:185
 msgid "Publish Photos"
 msgstr "Publica les fotografies"
 
-#: src/publishing/PublishingUI.vala:184
+#: ../src/publishing/PublishingUI.vala:186
 msgid "Publish photos _to:"
 msgstr "Publica les fotografies _a:"
 
-#: src/publishing/PublishingUI.vala:186
+#: ../src/publishing/PublishingUI.vala:188
 msgid "Publish Videos"
 msgstr "Publica vídeos"
 
-#: src/publishing/PublishingUI.vala:187
+#: ../src/publishing/PublishingUI.vala:189
 msgid "Publish videos _to"
 msgstr "Publica vídeos _a:"
 
-#: src/publishing/PublishingUI.vala:189
+#: ../src/publishing/PublishingUI.vala:191
 msgid "Publish Photos and Videos"
 msgstr "Publica fotografies i vídeos"
 
-#: src/publishing/PublishingUI.vala:190
+#: ../src/publishing/PublishingUI.vala:192
 msgid "Publish photos and videos _to"
 msgstr "Publica fotografies i vídeos _a"
 
-#: src/publishing/PublishingUI.vala:383
+#. There are no enabled publishing services that accept this media type,
+#. warn the user.
+#: ../src/publishing/PublishingUI.vala:360
 msgid "Unable to publish"
 msgstr "No s'ha pogut publicar"
 
-#: src/publishing/PublishingUI.vala:384
+#: ../src/publishing/PublishingUI.vala:361
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -3654,946 +4684,405 @@ msgstr ""
 "<b>Edita les preferències de %s</b> i habiliteu un o més dels connectors de "
 "publicació a la pestanya <b>Connectors</b>."
 
-#: src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr "S'està preparant per pujar"
-
-#: src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
-msgstr "S'està pujant %d de %d"
-
-#: src/publishing/PublishingPluginHost.vala:81
-#, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
-msgstr "La publicació a %s no pot continuar perquè s'ha produït un error:"
-
-#: src/publishing/PublishingPluginHost.vala:84
-msgid "To try publishing to another service, select one from the above menu."
-msgstr ""
-"Si voleu intentar publicar les fotografies a un altre servei, seleccioneu-ne "
-"un del menú de sobre."
-
-#: src/sidebar/Tree.vala:199
-msgid "New _Tag..."
-msgstr "_Etiqueta nova..."
-
-#: plugins/common/RESTSupport.vala:424
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:971
-msgid "A temporary file needed for publishing is unavailable"
-msgstr "No està disponible un fitxer temporal que cal per publicar"
-
-#: plugins/common/RESTSupport.vala:1138
-msgid ""
-"You have already logged in and out of a Google service during this Shotwell "
-"session.\n"
-"\n"
-"To continue publishing to Google services, quit and restart Shotwell, then "
-"try publishing again."
-msgstr ""
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:57
-msgid ""
-"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 ""
-"Actualment no esteu connectat al YouTube.\n"
-"\n"
-"Per continuar heu de tenir un compte al Google i configurar-lo per poder "
-"utilitzar-lo amb el YoutTube. Podeu configurar la majoria de comtes "
-"utilitzant el navegador i entrant almenys un cop al lloc YouTube."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:362
-msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
-"continue."
-msgstr ""
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:461
-#, c-format
-msgid "You are logged into YouTube as %s."
-msgstr "Actualment esteu connectat al YouTube com a %s."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:463
-#, c-format
-msgid "Videos will appear in '%s'"
-msgstr "Els vídeos apareixeran a «%s»"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:495
-msgid "Public listed"
-msgstr "Llistat públicament"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
-msgid "Public unlisted"
-msgstr "Sense llistar públicament"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
-msgid "Private"
-msgstr "Privat"
-
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr "Serveis de publicació principals"
-
-#: 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 ""
-"Actualment no esteu connectat al Flickr.\n"
-"\n"
-"Feu clic a connecta per connectar-vos al Flickr en el navegador web.  Haureu "
-"d'autoritzar al Shotwell Connect per enllaçar el vostre compte del Flickr."
-
-#: 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 ""
-"Ja us heu connectat i desconnectat al Flickr en aquesta sessió del "
-"Shotwell.\n"
-"Per continuar publicant al Flickr, sortiu, reinicieu el Shotwell i torneu a "
-"intentar-ho."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:375
-msgid "Preparing for login..."
-msgstr "S'està preparant per connectar..."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:595
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can't "
-"continue."
-msgstr ""
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "S'està verificant l'autorització..."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1153
-#, c-format
-msgid ""
-"You are logged into Flickr as %s.\n"
-"\n"
-msgstr ""
-"Heu entrat al Flickr com a %s.\n"
-"\n"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
-#, 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 ""
-"El vostre compte gratuït del Flickr restringeix la quantitat de dades que "
-"podeu pujar cada mes.\n"
-"Aquest mes, us queden %d megabytes de quota de pujada."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1157
-msgid "Your Flickr Pro account entitles you to unlimited uploads."
-msgstr "El vostre compte del Flickr Pro us permet pujades il·limitades."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1162
-msgid "Photos _visible to:"
-msgstr "Les fotografies són _visibles per:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
-msgid "Videos _visible to:"
-msgstr "Els vídeos són _visibles per:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1167
-msgid "Photos and videos _visible to:"
-msgstr "Les fotografies i els vídeos són _visibles per:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1234
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1182
-msgid "Everyone"
-msgstr "Tothom"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
-msgid "Friends & family only"
-msgstr "Només els amics i la família"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-msgid "Family only"
-msgstr "Només família"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
-msgid "Friends only"
-msgstr "Només amics"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1180
-msgid "Just me"
-msgstr "Només jo"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1229
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1246
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-#, fuzzy
-msgid "500 x 375 pixels"
-msgstr ""
-"500 × 375 píxels"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1230
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1247
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:108
-#, fuzzy
-msgid "1024 x 768 pixels"
-msgstr ""
-"1024 × 768 píxels"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1248
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 píxels"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1249
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 píxels"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:746
-#, c-format
-msgid "Creating album %s..."
-msgstr "Creant àlbum %s..."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:917
-msgid "An error message occurred when publishing to Piwigo. Please try again."
-msgstr ""
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:998
-msgid ""
-"Enter the URL of your Piwigo photo library as well as the username and "
-"password associated with your Piwigo account for that library."
-msgstr ""
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:999
-msgid ""
-"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
-"entered"
-msgstr ""
+#: ../src/searches/Branch.vala:68
+msgid "Saved Searches"
+msgstr "Cerques desades"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1000
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:590
-msgid "Username and/or password invalid. Please try again"
-msgstr ""
+#. Ordering must correspond with SearchConditionText.Context
+#: ../src/searches/SavedSearchDialog.vala:168
+msgid "contains"
+msgstr "conté"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1032
-#, c-format
-msgid "Invalid URL"
-msgstr "Adreça incorrecta"
+#. Ordering must correspond with Context
+#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:500
+msgid "is exactly"
+msgstr "és exactament"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1037
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:620
-#, c-format
-msgid "Invalid User Name or Password"
-msgstr "Nom d'usuari o contrasenya incorrectes"
+#: ../src/searches/SavedSearchDialog.vala:170
+msgid "starts with"
+msgstr "comença amb"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1127
-#: plugins/shotwell-publishing/PicasaPublishing.vala:59
-#: plugins/shotwell-publishing/FacebookPublishing.vala:61
-msgid "Shotwell Connect"
-msgstr "Shotwell Connect"
+#: ../src/searches/SavedSearchDialog.vala:171
+msgid "ends with"
+msgstr "acaba amb"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1235
-msgid "Admins, Family, Friends, Contacts"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:172
+msgid "does not contain"
+msgstr "no conté"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1236
-msgid "Admins, Family, Friends"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:504
+msgid "is not set"
+msgstr "no està establert"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1237
-msgid "Admins, Family"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:174
+msgid "is set"
+msgstr "està establert"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1238
-msgid "Admins"
-msgstr ""
+#. Ordering must correspond with SearchConditionMediaType.Context
+#: ../src/searches/SavedSearchDialog.vala:248
+#: ../src/searches/SavedSearchDialog.vala:379
+#: ../src/searches/SavedSearchDialog.vala:444
+msgid "is"
+msgstr "és"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:58
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have "
-"to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:249
+msgid "is not"
+msgstr "no és"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:361
-msgid ""
-"A file required for publishing is unavailable. Publishing to Picasa can't "
-"continue."
-msgstr ""
-"Un fitxer necessari per la publicació no està disponible. No es pot dur a "
-"terme la publicació cap a Picasa."
+#. Ordering must correspond with SearchConditionMediaType.MediaType
+#: ../src/searches/SavedSearchDialog.vala:255
+msgid "any photo"
+msgstr "qualsevol fotografia"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
-#: plugins/shotwell-publishing/FacebookPublishing.vala:347
-msgid "Creating album..."
-msgstr "S'està creant l'àlbum..."
+#: ../src/searches/SavedSearchDialog.vala:256
+msgid "a raw photo"
+msgstr "una fotografia RAW"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:659
-#, c-format
-msgid "You are logged into Picasa Web Albums as %s."
-msgstr "Heu entrant als àlbums web del Picasa com a %s."
+#: ../src/searches/SavedSearchDialog.vala:257
+msgid "a video"
+msgstr "un vídeo"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
-msgid "Videos will appear in:"
-msgstr "Els vídeos apareixeran a:"
+#: ../src/searches/SavedSearchDialog.vala:311
+msgid "has"
+msgstr "conté"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:670
-msgid "Photos will appear in:"
-msgstr "Les fotografies apareixeran a:"
+#: ../src/searches/SavedSearchDialog.vala:312
+msgid "has no"
+msgstr "no conté"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "Petita (640 x 480 píxels)"
+#: ../src/searches/SavedSearchDialog.vala:317
+msgid "modifications"
+msgstr "modificacions"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "Mitjana (1024 x 768 píxels)"
+#: ../src/searches/SavedSearchDialog.vala:318
+msgid "internal modifications"
+msgstr "modificacions internes"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Recomanada (1600 x 1200 píxels)"
+#: ../src/searches/SavedSearchDialog.vala:319
+msgid "external modifications"
+msgstr "modificacions externes"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Google+ (2048 x 1536 pixels)"
+#. Ordering must correspond with SearchConditionFlagged.State
+#: ../src/searches/SavedSearchDialog.vala:373
+msgid "flagged"
+msgstr "senyalat"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:63
-msgid ""
-"You are not currently logged into Facebook.\n"
-"\n"
-"If you don't yet have a Facebook account, you can create one during the "
-"login process. During login, Shotwell Connect may ask you for permission to "
-"upload photos and publish to your feed. These permissions are required for "
-"Shotwell Connect to function."
-msgstr ""
-"Actualment no esteu connectat al Facebook.\n"
-"\n"
-"Si encara no teniu un compte al Facebook, podeu crear-ne un durant el procés "
-"de connexió. Durant la connexió, el Shotwell Connect pot ser que us demani "
-"permís per pujar fotografies i publicar-les al mur. Aquests permisos són "
-"necessaris perquè el Shotwell Connect funcioni."
+#: ../src/searches/SavedSearchDialog.vala:374
+msgid "not flagged"
+msgstr "sense senyalar"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:65
-msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Ja us heu connectat i desconnectat al Facebook en aquesta sessió del "
-"Shotwell.\n"
-"Per continuar publicant al Facebook, sortiu, reinicieu el Shotwell i torneu "
-"a intentar-ho."
+#: ../src/searches/SavedSearchDialog.vala:437
+msgid "and higher"
+msgstr "i superior"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:86
-msgid "Standard (720 pixels)"
-msgstr "Estàndard (720 píxels)"
+#: ../src/searches/SavedSearchDialog.vala:438
+msgid "only"
+msgstr "només"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:89
-msgid "Large (2048 pixels)"
-msgstr "Gran (2048 píxels)"
+#: ../src/searches/SavedSearchDialog.vala:439
+msgid "and lower"
+msgstr "i inferior"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:254
-msgid "Testing connection to Facebook..."
-msgstr "S'està comprovant la connexió amb el Facebook..."
+#: ../src/searches/SavedSearchDialog.vala:501
+msgid "is after"
+msgstr "està després"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:374
-msgid ""
-"A file required for publishing is unavailable. Publishing to Facebook can't "
-"continue."
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:502
+msgid "is before"
+msgstr "està abans"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1019
-#, c-format
-msgid ""
-"You are logged into Facebook as %s.\n"
-"\n"
-msgstr ""
-"Actualment esteu connectat al Facebook com a %s.\n"
-"\n"
+#: ../src/searches/SavedSearchDialog.vala:503
+msgid "is between"
+msgstr "està entre"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1020
-msgid "Where would you like to publish the selected photos?"
-msgstr "On us agradaria publicar les fotografies seleccionades?"
+#: ../src/searches/SavedSearchDialog.vala:516
+msgid "and"
+msgstr "i"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1021
-msgid "Upload _size:"
-msgstr "Mida de _pujada:"
+#: ../src/searches/SavedSearchDialog.vala:697
+msgid "Search"
+msgstr "Cerca"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1181
-msgid "Friends"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:702
+msgid "Cancel"
+msgstr "Cancel·la"
 
-#: plugins/shotwell-transitions/CrumbleEffect.vala:20
-msgid "Crumble"
-msgstr "Esmicolament"
+#: ../src/searches/SavedSearchDialog.vala:703
+msgid "OK"
+msgstr "D'acord"
 
-#: plugins/shotwell-transitions/ChessEffect.vala:20
-msgid "Chess"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:721
+msgid "any"
+msgstr "qualsevol"
 
-#: plugins/shotwell-transitions/CirclesEffect.vala:20
-msgid "Circles"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:722
+msgid "all"
+msgstr "tots"
 
-#: plugins/shotwell-transitions/BlindsEffect.vala:20
-msgid "Blinds"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:723
+msgid "none"
+msgstr "cap"
 
-#: plugins/shotwell-transitions/StripesEffect.vala:20
-msgid "Stripes"
-msgstr ""
+#: ../src/searches/SearchBoolean.vala:157
+msgid "Any text"
+msgstr "Qualsevol text"
 
-#: plugins/shotwell-transitions/ClockEffect.vala:20
-msgid "Clock"
-msgstr ""
+#: ../src/searches/SearchBoolean.vala:160
+msgid "Title"
+msgstr "Títol"
 
-#: plugins/shotwell-transitions/CircleEffect.vala:20
-msgid "Circle"
-msgstr ""
+#: ../src/searches/SearchBoolean.vala:163
+msgid "Tag"
+msgstr "Etiqueta"
 
-#: plugins/shotwell-transitions/shotwell-transitions.vala:28
-msgid "Core Slideshow Transitions"
-msgstr "Transicions principals de la projecció de diapositives"
+#: ../src/searches/SearchBoolean.vala:166
+msgid "Comment"
+msgstr "Comentari"
 
-#: plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
-msgstr ""
+#: ../src/searches/SearchBoolean.vala:169
+msgid "Event name"
+msgstr "Nom de l'esdeveniment"
 
-#: plugins/shotwell-transitions/SlideEffect.vala:20
-msgid "Slide"
-msgstr "Diapositiva"
+#: ../src/searches/SearchBoolean.vala:172
+msgid "File name"
+msgstr "Nom del fitxer"
 
-#: plugins/shotwell-transitions/FadeEffect.vala:20
-msgid "Fade"
-msgstr "Esvaïment"
+#: ../src/searches/SearchBoolean.vala:175
+msgid "Media type"
+msgstr "Tipus de suport"
 
-#: plugins/shotwell-transitions/SquaresEffect.vala:20
-msgid "Squares"
-msgstr ""
+#: ../src/searches/SearchBoolean.vala:178
+msgid "Flag state"
+msgstr "Estat del senyalador"
 
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr ""
+#: ../src/searches/SearchBoolean.vala:181
+msgid "Photo state"
+msgstr "Estat de la foto"
 
-#: 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 ""
-"Benvingut al servei d'importació de biblioteques de F-Spot\n"
-"\n"
-"Per favor triau una biblioteca a importar, ja sigui triant una de les "
-"biblioteques trobades per Shotwell o bé seleccionant un fitxer de biblioteca "
-"F-Spot alternatiu."
+#: ../src/searches/SearchBoolean.vala:187
+msgid "Date"
+msgstr "Data"
 
-#: 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 ""
-"Benvingut al servei d'importació de biblioteques de F-Spot.\n"
-"\n"
-"Per favir seleccionau un fitxer de biblioteca F-Spot"
+#: ../src/sidebar/Tree.vala:189
+msgid "New _Tag..."
+msgstr "_Etiqueta nova..."
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Seleccionar manualment un fitxer de biblioteca F-Spot a importar:"
+#: ../src/slideshow/Slideshow.vala:22
+msgid "Slideshow Transitions"
+msgstr "Transicions de la presentació de diapositives"
 
-#: 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 ""
-"No es pot obrir el fitxer de base de dades F-Spot seleccionat: el fitxer no "
-"existeix o no és una base de dades F-Spot correcta"
+#: ../src/slideshow/TransitionEffects.vala:98
+msgid "(None)"
+msgstr "(Cap)"
 
-#: 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 ""
-"No es pot obrir el fitxer de base de dades F-Spot seleccionat: Shotwell no "
-"suporta aquesta versió de F-Spot"
+#: ../src/slideshow/TransitionEffects.vala:287
+msgid "None"
+msgstr "Cap"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"No es pot llegir el fitxer de base de dades F-Spot seleccionat: error "
-"llegint taula d'etiquetes"
+#: ../src/slideshow/TransitionEffects.vala:339
+msgid "Random"
+msgstr "Aleatori"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"No es pot llegir el fitxer de base de dades F-Spot seleccionat: error "
-"llegint taula d'imatges"
+#: ../src/tags/Branch.vala:127
+msgid "Tags"
+msgstr "Etiquetes"
 
-#: 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 ""
-"Shotwell ha trobat %d imatges dins la biblioteca F-Spot i les està "
-"important. Els duplicats seran automàticament detectats i eliminats.\n"
-"\n"
-"Podeu tancar aquest diàleg i començar a emprar Shotwell mentres la "
-"importació té lloc en segon pla."
+#: ../ui/set_background_dialog.glade.h:1
+msgid "Set as Desktop Background"
+msgstr "Estableix com a fons d'escriptori"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:84
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "Biblioteca F-Spot: %s"
+#: ../ui/set_background_dialog.glade.h:2
+#: ../ui/set_background_slideshow_dialog.glade.h:6
+msgid "Use for Desktop"
+msgstr "Utilitza per a l'escriptori"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:416
-msgid "Preparing to import"
-msgstr "Preparant per importar"
+#: ../ui/set_background_dialog.glade.h:3
+#: ../ui/set_background_slideshow_dialog.glade.h:7
+msgid "Use for Lock Screen"
+msgstr "Utilitza per a la pantalla de bloqueig"
 
-#: ui/set_background_dialog.glade:14
+#: ../ui/set_background_slideshow_dialog.glade.h:1
 msgid "Set as Desktop Slideshow"
-msgstr "Estableix coma a presentació de diapositives de l'escriptori"
-
-#: ui/set_background_dialog.glade:55
-msgid "Generate desktop background slideshow"
-msgstr "Genera la presentació de diapositives del fons de l'escriptori"
+msgstr "Estableix com a presentació de diapositives de l'escriptori"
 
-#: ui/set_background_dialog.glade:82
+#: ../ui/set_background_slideshow_dialog.glade.h:2
 msgid "Show each photo for"
 msgstr "Mostra cada fotografia durant"
 
-#: ui/set_background_dialog.glade:94
+#: ../ui/set_background_slideshow_dialog.glade.h:3
 msgid "period of time"
 msgstr "període de temps"
 
-#: ui/set_background_dialog.glade:116
+#: ../ui/set_background_slideshow_dialog.glade.h:4
+msgid "Generate desktop background slideshow"
+msgstr "Genera la presentació de diapositives del fons de l'escriptori"
+
+#: ../ui/set_background_slideshow_dialog.glade.h:5
 msgid "How long each photo is shown on the desktop background"
 msgstr "Quan de temps es mostra cada fotografia en el fons de l'escriptori"
 
-#: ui/shotwell.glade:7
-msgid "Search"
-msgstr "Cerca"
-
-#: ui/shotwell.glade:47
+#: ../ui/shotwell.glade.h:1
 msgid "_Name of search:"
 msgstr "_Nom de la cerca:"
 
-#: ui/shotwell.glade:108
+#: ../ui/shotwell.glade.h:2
 msgid "_Match"
 msgstr "_Coincideix"
 
-#: ui/shotwell.glade:137
+#: ../ui/shotwell.glade.h:3
 msgid "of the following:"
 msgstr "amb el següent:"
 
-#: ui/shotwell.glade:218
+#: ../ui/shotwell.glade.h:4
 msgid "<b>Printed Image Size</b>"
-msgstr ""
+msgstr "<b>Mida de la imatge impresa</b>"
 
-#: ui/shotwell.glade:235
+#: ../ui/shotwell.glade.h:5
 msgid "Use a _standard size:"
 msgstr "Utilitza una mida es_tàndard:"
 
-#: ui/shotwell.glade:278
+#: ../ui/shotwell.glade.h:6
 msgid "Use a c_ustom size:"
 msgstr "Utilitza una mida _personalitzada:"
 
-#: ui/shotwell.glade:368
+#: ../ui/shotwell.glade.h:7
 msgid "_Match photo aspect ratio"
 msgstr "_Coincideix la relació d'aspecte de la fotografia"
 
-#: ui/shotwell.glade:392
+#: ../ui/shotwell.glade.h:8
 msgid "_Autosize:"
 msgstr "Mida _automàtica:"
 
-#: ui/shotwell.glade:432
+#: ../ui/shotwell.glade.h:9
 msgid "<b>Titles</b>"
-msgstr ""
+msgstr "<b>Títols</b>"
 
-#: ui/shotwell.glade:449
+#: ../ui/shotwell.glade.h:10
 msgid "Print image _title"
 msgstr "Imprimeix el _títol de la imatge"
 
-#: ui/shotwell.glade:493
+#: ../ui/shotwell.glade.h:11
 msgid "<b>Pixel Resolution</b>"
-msgstr ""
+msgstr "<b>Resolució de píxels</b>"
 
-#: ui/shotwell.glade:513
+#: ../ui/shotwell.glade.h:12
 msgid "_Output photo at:"
 msgstr "_Imprimeix la fotografia en:"
 
-#: ui/shotwell.glade:548
+#: ../ui/shotwell.glade.h:13
 msgid "pixels per inch"
 msgstr "píxels per polzada"
 
-#: ui/shotwell.glade:581 ui/shotwell.glade:623
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:27
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:27
-msgid "label"
-msgstr "etiqueta"
-
-#: ui/shotwell.glade:719
+#: ../ui/shotwell.glade.h:15
 msgid "Shotwell Preferences"
 msgstr "Preferències del Shotwell"
 
-#: ui/shotwell.glade:796
+#: ../ui/shotwell.glade.h:16
 msgid "white"
 msgstr "blanc"
 
-#: ui/shotwell.glade:823
+#: ../ui/shotwell.glade.h:17
 msgid "black"
 msgstr "negre"
 
-#: ui/shotwell.glade:871
+#: ../ui/shotwell.glade.h:19
 msgid "_Watch library directory for new files"
 msgstr "_Vigila si hi ha fitxers nous al directori de la biblioteca"
 
-#: ui/shotwell.glade:900
+#: ../ui/shotwell.glade.h:20
 msgid "Metadata"
 msgstr "Metadades"
 
-#: ui/shotwell.glade:920
+#: ../ui/shotwell.glade.h:21
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr ""
 "Escrius etiquetes, títols i altres _metadades als fitxers de fotografies"
 
-#: ui/shotwell.glade:946
+#: ../ui/shotwell.glade.h:22
 msgid "Display"
 msgstr "Mostra"
 
-#: ui/shotwell.glade:967
+#: ../ui/shotwell.glade.h:23
 msgid "_Import photos to:"
 msgstr "_Importa fotografies a:"
 
-#: ui/shotwell.glade:990
+#: ../ui/shotwell.glade.h:24
 msgid "_Background:"
 msgstr "_Fons:"
 
-#: ui/shotwell.glade:1013
+#: ../ui/shotwell.glade.h:25
 msgid "Importing"
 msgstr "S'està important"
 
-#: ui/shotwell.glade:1036
+#: ../ui/shotwell.glade.h:26
 msgid "_Directory structure:"
 msgstr "_Estructura dels directoris:"
 
-#: ui/shotwell.glade:1075
+#: ../ui/shotwell.glade.h:27
 msgid "_Pattern:"
 msgstr "_Patró:"
 
-#: ui/shotwell.glade:1157
+#: ../ui/shotwell.glade.h:28
 msgid "Example:"
 msgstr "Exemple:"
 
-#: ui/shotwell.glade:1174
+#: ../ui/shotwell.glade.h:29
 msgid "R_ename imported files to lowercase"
 msgstr "_Canvia el nom dels fitxers importats a minúscules"
 
-#: ui/shotwell.glade:1203
+#: ../ui/shotwell.glade.h:30
 msgid "RAW Developer"
 msgstr "Revelador RAW"
 
-#: ui/shotwell.glade:1238
+#: ../ui/shotwell.glade.h:31
 msgid "De_fault:"
 msgstr "Per de_fecte:"
 
-#: ui/shotwell.glade:1292
+#: ../ui/shotwell.glade.h:33
 msgid "E_xternal photo editor:"
 msgstr "Editor fotogràfic e_xtern:"
 
-#: ui/shotwell.glade:1308
+#: ../ui/shotwell.glade.h:34
 msgid "External _RAW editor:"
 msgstr "Editor extern d'imatges _RAW:"
 
-#: ui/shotwell.glade:1373
+#: ../ui/shotwell.glade.h:35
 msgid "External Editors"
 msgstr "Editors externs"
 
-#: ui/shotwell.glade:1400
+#: ../ui/shotwell.glade.h:36
 msgid "Plugins"
 msgstr "Connectors"
 
-#: ui/shotwell.glade:1469
+#: ../ui/shotwell.glade.h:37
 msgid "_Delay:"
 msgstr "_Retard:"
 
-#: ui/shotwell.glade:1485
+#: ../ui/shotwell.glade.h:38
 msgid "_Transition effect:"
 msgstr "Efecte de _transició:"
 
-#: ui/shotwell.glade:1501
+#: ../ui/shotwell.glade.h:39
 msgid "Transition d_elay:"
 msgstr "R_etard de transició:"
 
-#: ui/shotwell.glade:1513
+#: ../ui/shotwell.glade.h:40
 msgid "Show t_itle"
-msgstr "Mostrar t_ítol"
+msgstr "Mostra el t_ítol"
 
-#: ui/shotwell.glade:1603 ui/shotwell.glade:1616
+#: ../ui/shotwell.glade.h:41
 msgid "seconds"
 msgstr "segons"
 
-#: ui/shotwell.glade:1696
-msgid "_Login"
-msgstr "_Connecta"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:21
-msgid ""
-" (text depends on fb username and is modified in the app - \n"
-"anything put into this field won't display)"
-msgstr ""
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:39
-msgid "Publish to an e_xisting album:"
-msgstr "Public_a a un àlbum existent:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:57
-msgid "Create a _new album named:"
-msgstr "Crea un àlbum _nou anomenat:"
+#~ msgid "Only _Remove"
+#~ msgstr "_Suprimeix només"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:139
-msgid "Videos and new photo albums _visible to:"
-msgstr "Els vídeos i els àlbums de fotografies nous són _visibles per a:"
+#~ msgid "Import media _from:"
+#~ msgstr "Importar mitjans _de:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:175
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:102
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:178
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:226
-msgid ""
-"_Remove location, camera, and other identifying information before uploading"
-msgstr ""
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:197
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:137
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:229
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:99
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:115
-msgid "_Logout"
-msgstr "_Surt"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:212
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:153
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:243
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:115
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:129
-msgid "_Publish"
-msgstr "_Publica"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:16
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Introduïu el número de confirmació que apareix després que us connecteu al "
-"Flickr en el navegador web."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:37
-msgid "Authorization _Number:"
-msgstr "_Número d'autorització:"
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:19
-msgid ""
-"You are logged into Flickr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-msgstr ""
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:44
-msgid "_visibility label (populated in the code)"
-msgstr ""
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:61
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:60
-msgid "Photo _size:"
-msgstr "_Mida de la fotografia:"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:18
-msgid ""
-"'you are logged in as $name'\n"
-"(populated in the application code)"
-msgstr ""
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:75
-msgid "An _existing album:"
-msgstr "Un àlbum e_xistent:"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:94
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:52
-msgid "A _new album named:"
-msgstr "Un àlbum _nou anomenat:"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:113
-msgid "L_ist album in public gallery"
-msgstr "_Llista l'àlbum en una galeria pública"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:134
-msgid ""
-"$mediatype will appear in\n"
-"(populated in code)"
-msgstr ""
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:150
-msgid "Photo _size preset:"
-msgstr "Mida p_redeterminada de les fotografies:"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:49
-msgid "_URL of your Piwigo photo library"
-msgstr "_URL de la biblioteca de fotografies Piwigo"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:59
-msgid "User _name"
-msgstr "_Nom d'usuari"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:73
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:59
-msgid "_Password"
-msgstr "_Contrasenya"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:130
-msgid "_Remember Password"
-msgstr "_Recorda la contrasenya"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:151
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:107
-msgid "Login"
-msgstr "Entra"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:40
-msgid "An _existing category:"
-msgstr "Una categoria _existent:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:121
-msgid "Photos will be _visible by:"
-msgstr "Les fotografies seran _visibles per a:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:149
-msgid "Photo size:"
-msgstr "Mida de la fotografia:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:176
-msgid "within category:"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:210
-msgid "Album comment:"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:242
-msgid "_If a title is set and comment unset, use title as comment"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:258
-msgid "_Do no upload tags"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:278
-msgid "Logout"
-msgstr "Surt"
-
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:55
-msgid "Video privacy _setting:"
-msgstr "_Paràmetres de la privacitat dels vídeos:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:38
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:109
-msgid "1280 x 853 pixels"
-msgstr "1280 × 853 píxels"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:313
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:323
-#, c-format
-msgid "'%s' isn't a valid response to an OAuth authentication request"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:561
-msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:589
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:639
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:760
-#, c-format
-msgid "Could not load UI: %s"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:742
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:24
-msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:27
-msgid "Visit the Yandex.Fotki web site"
-msgstr "Vés al lloc web d'en Yandex.Fotki"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:635
-msgid "You are not currently logged into Yandex.Fotki."
-msgstr "Actualment no esteu connectat al Yandex.Fotki."
-
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:49
-msgid "_Email address"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:19
-msgid ""
-"You are logged into Tumblr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:43
-msgid "Blogs:"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:24
-msgid "_Albums (or write new):"
-msgstr "À_lbums (o escriviu-ne un de nou):"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:38
-msgid "Access _type:"
-msgstr "_Tipus d'accés:"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:81
-msgid "Disable _comments"
-msgstr "Inhabilita els _comentaris"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:96
-msgid "_Forbid downloading original photo"
-msgstr "_Prohibeix baixar la fotografia original"
+#~ msgid "Shotwell is configured to import photos to your home directory.\n"
+#~ msgstr ""
+#~ "El Shotwell està configurat per importar fotografies a la vostra carpeta "
+#~ "d'usuari.\n"
diff --git a/po/cs.po b/po/cs.po
index dc24aac..3b491f3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,23 +4,21 @@
 # See COPYING for license.
 #
 # Translators:
-# jui <appukonrad@gmail.com>, 2012
-# David Štancl <dstancl@gmail.com>, 2011, 2012
-# David Štancl <dstancl@gmail.com>, 2011
-# Lukáš Zapletal, 2011
-# petr.simacek <petr.simacek@gmail.com>, 2012
-# petr.simacek <petr.simacek@gmail.com>, 2013
 # verayin <vera@yorba.org>, 2011
 # lsbeeler <lucas@yorba.org>, 2011
-# Marek Černocký <marek@manet.cz>, 2014.
+# Lukáš Zapletal, 2011
+# David Štancl <dstancl@gmail.com>, 2011, 2012
+# jui <appukonrad@gmail.com>, 2012
+# petr.simacek <petr.simacek@gmail.com>, 2012, 2013.
+# Marek Černocký <marek@manet.cz>, 2014, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2014-05-27 20:10+0000\n"
-"PO-Revision-Date: 2014-05-31 12:35+0200\n"
+"POT-Creation-Date: 2015-03-17 21:19+0000\n"
+"PO-Revision-Date: 2015-03-18 12:15+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -53,7 +51,7 @@ msgstr ""
 msgid "Visit the Shotwell home page"
 msgstr "Navštívit web aplikace Shotwell"
 
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:691
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
 msgid "translator-credits"
 msgstr ""
 "David Štancl <dstancl@dstancl.cz>\n"
@@ -69,8 +67,8 @@ msgstr ""
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
 #: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
 #: ../src/Resources.vala:27
-msgid "Copyright 2009-2014 Yorba Foundation"
-msgstr "Copyright 2009 – 2014 Yorba Foundation"
+msgid "Copyright 2009-2015 Yorba Foundation"
+msgstr "Copyright 2009 – 2015 Yorba Foundation"
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:56
 msgid ""
@@ -151,7 +149,7 @@ msgstr ""
 msgid "F-Spot library: %s"
 msgstr "Knihovna F-Spot: %s"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:416
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
 msgid "Preparing to import"
 msgstr "Připravuje se k importu"
 
@@ -176,7 +174,7 @@ msgstr ""
 "Gallery3."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: ../src/MediaPage.vala:420 ../src/photos/RawSupport.vala:297
+#: ../src/MediaPage.vala:435 ../src/photos/RawSupport.vala:300
 msgid "Shotwell"
 msgstr "Shotwell"
 
@@ -206,18 +204,23 @@ msgstr ""
 "Upozorňujeme, že Gallery3 podporuje jen typy videí, která umí Flowplayer."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1774
-msgid "A file required for publishing is unavailable. Publishing to "
-msgstr "Soubor potřebný pro zveřejnění není k dispozici. Zveřejnění na "
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+#, c-format
+msgid ""
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
+msgstr ""
+"Soubor potřebný pro zveřejnění není k dispozici. Zveřejnění na %s nemůže "
+"pokračovat."
 
 #. populate any widgets whose contents are
 #. programmatically-generated
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
 #, c-format
 msgid "Publishing to %s as %s."
 msgstr "Zveřejnění na %s jako %s."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1816
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
 msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
@@ -225,7 +228,7 @@ msgstr ""
 "Zadejte adresu URL ke svým stránkám Gallery3 a k tomu uživatelské jméno a "
 "heslo (nebo klíč k API) pro účet Gallery3."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
 msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
@@ -233,7 +236,7 @@ msgstr ""
 "Uživatelské jméno nebo heslo nebo klíč k API jsou nesprávné. Zkuste to znovu "
 "zadáním uživatelského jména a hesla níže."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
 msgid ""
 "The URL entered does not appear to be the main directory of a Gallery3 "
 "instance. Please make sure you typed it correctly and it does not have any "
@@ -243,11 +246,11 @@ msgstr ""
 "se, že jste ji zadali správně a že neobsahuje žádné věci navíc (např. index."
 "php)."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1871
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
 msgid "Unrecognized User"
 msgstr "Nerozpoznaný uživatel"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1876
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
 msgid " Site Not Found"
 msgstr " Server nenalezen"
 
@@ -359,13 +362,13 @@ msgid "Copyright 2012 BJA Electronics"
 msgstr "Copyright 2012 BJA Electronics"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1229
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
 msgid "500 x 375 pixels"
 msgstr "500 × 375 pixelů"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1230
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
 msgid "1024 x 768 pixels"
 msgstr "1024 × 768 pixelů"
@@ -437,7 +440,7 @@ msgid "Go _Back"
 msgstr "Jít _zpět"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
-#: ../ui/shotwell.glade.h:43
+#: ../ui/shotwell.glade.h:42
 msgid "_Login"
 msgstr "_Přihlásit se"
 
@@ -492,7 +495,7 @@ msgid "pixels"
 msgstr "pixely"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
 #: ../src/Dimensions.vala:17
 msgid "Original size"
@@ -506,7 +509,7 @@ msgstr "Šířka nebo výška"
 #: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
 #: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
 #: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
-#: ../ui/shotwell.glade.h:15
+#: ../ui/shotwell.glade.h:14
 msgid "label"
 msgstr "štítek"
 
@@ -635,12 +638,12 @@ msgid "Upload _size:"
 msgstr "Nahrávaná veliko_st:"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
 msgid "Just me"
 msgstr "mě výhradně"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
 msgid "Everyone"
 msgstr "všem"
@@ -694,49 +697,58 @@ msgstr ""
 "Jste přihlášeni ke službě Flickr jako %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
 #, 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 ""
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"Váš bezplatný účet Flickr má omezení na množství nahraných dat za měsíc.\n"
+"Tento měsíc vám z přidělené kvóty zbývá %d megabajt."
+msgstr[1] ""
+"Váš bezplatný účet Flickr má omezení na množství nahraných dat za měsíc.\n"
+"Tento měsíc vám z přidělené kvóty zbývají %d megabajty."
+msgstr[2] ""
 "Váš bezplatný účet Flickr má omezení na množství nahraných dat za měsíc.\n"
 "Tento měsíc vám z přidělené kvóty zbývá %d megabajtů."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1157
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Účet Flickr Pro umožňuje nahrávat neomezeně."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1162
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
 msgid "Photos _visible to:"
 msgstr "Fotky _viditelné pro:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
 msgid "Videos _visible to:"
 msgstr "Videa _viditelná pro:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
 msgid "Photos and videos _visible to:"
 msgstr "Fotky a videa _viditelná pro:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
 msgid "Friends & family only"
 msgstr "přátele a rodinu výhradně"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
 msgid "Family only"
 msgstr "rodinu výhradně"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Friends only"
 msgstr "přátele výhradně"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
 msgid "2048 x 1536 pixels"
 msgstr "2048 × 1536 pixelů"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
 msgid "4096 x 3072 pixels"
 msgstr "4096 × 3072 pixelů"
@@ -970,7 +982,7 @@ msgid "Logout"
 msgstr "Odhlásit"
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:268
+#: ../src/Resources.vala:303
 msgid "Publish"
 msgstr "Zveřejnit"
 
@@ -1027,8 +1039,8 @@ msgid "Core Slideshow Transitions"
 msgstr "Základní přechody prezentace"
 
 #: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
-msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011 – 2014 Yorba Foundation"
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011 – 2015 Yorba Foundation"
 
 #: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
 #, c-format
@@ -1055,56 +1067,39 @@ msgstr "Nelze vytvořit složku %s pro dočasné soubory: %s"
 msgid "Unable to create data subdirectory %s: %s"
 msgstr "Nelze vytvořit podsložku %s pro data: %s"
 
-#. restore pin state
-#: ../src/AppWindow.vala:52
+#: ../src/AppWindow.vala:53
 msgid "Pin Toolbar"
 msgstr "Připíchnout lištu"
 
-#: ../src/AppWindow.vala:53
+#: ../src/AppWindow.vala:54
 msgid "Pin the toolbar open"
 msgstr "Připíchnout otevřenou nástrojovou lištu"
 
-#: ../src/AppWindow.vala:57 ../src/AppWindow.vala:135
+#: ../src/AppWindow.vala:59
 msgid "Leave fullscreen"
 msgstr "Opustit režim celé obrazovky"
 
-#: ../src/AppWindow.vala:134
-msgid "Leave _Fullscreen"
-msgstr "Opustit _celou obrazovku"
-
-#: ../src/AppWindow.vala:496
-msgid "_Quit"
-msgstr "U_končit"
-
-#: ../src/AppWindow.vala:501
-msgid "_About"
-msgstr "O _aplikaci"
-
-#: ../src/AppWindow.vala:506
-msgid "Fulls_creen"
-msgstr "_Celá obrazovka"
-
-#: ../src/AppWindow.vala:511
+#: ../src/AppWindow.vala:525
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../src/AppWindow.vala:516
+#: ../src/AppWindow.vala:530
 msgid "_Frequently Asked Questions"
 msgstr "Ča_sté dotazy a odpovědi"
 
-#: ../src/AppWindow.vala:521
+#: ../src/AppWindow.vala:535
 msgid "_Report a Problem..."
 msgstr "_Nahlásit problém…"
 
-#: ../src/AppWindow.vala:620 ../src/AppWindow.vala:641
-#: ../src/AppWindow.vala:658 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1417 ../src/Dialogs.vala:1440
-#: ../src/data_imports/DataImportsUI.vala:399
-#: ../src/publishing/PublishingUI.vala:498
+#: ../src/AppWindow.vala:634 ../src/AppWindow.vala:655
+#: ../src/AppWindow.vala:672 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
+#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441 ../src/Resources.vala:162
+#: ../src/data_imports/DataImportsUI.vala:374
+#: ../src/publishing/PublishingUI.vala:475
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: ../src/AppWindow.vala:668
+#: ../src/AppWindow.vala:682
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
@@ -1117,21 +1112,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/AppWindow.vala:688
+#: ../src/AppWindow.vala:702
 msgid "Visit the Yorba web site"
 msgstr "Navštivte webové stránky Yorba"
 
-#: ../src/AppWindow.vala:700
+#: ../src/AppWindow.vala:714
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Nelze zobrazit nápovědu: %s"
 
-#: ../src/AppWindow.vala:708
+#: ../src/AppWindow.vala:722
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Nelze se připojit k databázi chyb: %s"
 
-#: ../src/AppWindow.vala:716
+#: ../src/AppWindow.vala:730
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Nelze zobrazit časté dotazy a odpovědi: %s"
@@ -1197,11 +1192,11 @@ msgstr "Soubor s obrázkem je poškozený"
 msgid "Imported failed (%d)"
 msgstr "Import selhal (%d)"
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2634
+#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
 msgid "S_lideshow"
 msgstr "P_romítat"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2635
+#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
 msgid "Play a slideshow"
 msgstr "Spustit promítání snímků"
 
@@ -1214,7 +1209,7 @@ msgid "Export Photos/Videos"
 msgstr "Export fotografií/videí"
 
 #: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3207
+#: ../src/PhotoPage.vala:3211
 msgid "Export Photo"
 msgstr "Export fotografie"
 
@@ -1262,47 +1257,47 @@ msgstr "Vylepšuje se"
 msgid "Undoing Enhance"
 msgstr "Vrací se zpět vylepšení"
 
-#: ../src/Commands.vala:845
+#: ../src/Commands.vala:853
 msgid "Applying Color Transformations"
 msgstr "Transformují se barvy"
 
-#: ../src/Commands.vala:845
+#: ../src/Commands.vala:853
 msgid "Undoing Color Transformations"
 msgstr "Vrací se zpět transformace barev"
 
-#: ../src/Commands.vala:995
+#: ../src/Commands.vala:1003
 msgid "Creating New Event"
 msgstr "Vytváří se nová událost"
 
-#: ../src/Commands.vala:996
+#: ../src/Commands.vala:1004
 msgid "Removing Event"
 msgstr "Odstraňuje se událost"
 
-#: ../src/Commands.vala:1005
+#: ../src/Commands.vala:1013
 msgid "Moving Photos to New Event"
 msgstr "Přesouvá se fotografie do nové události"
 
-#: ../src/Commands.vala:1006
+#: ../src/Commands.vala:1014
 msgid "Setting Photos to Previous Event"
 msgstr "Nastavuje se fotografie na předchozí událost"
 
-#: ../src/Commands.vala:1063
+#: ../src/Commands.vala:1071
 msgid "Merging"
 msgstr "Spojuje se"
 
-#: ../src/Commands.vala:1064
+#: ../src/Commands.vala:1072
 msgid "Unmerging"
 msgstr "Ruší se spojení"
 
-#: ../src/Commands.vala:1073
+#: ../src/Commands.vala:1081
 msgid "Duplicating photos"
 msgstr "Zdvojují se fotografie"
 
-#: ../src/Commands.vala:1073
+#: ../src/Commands.vala:1081
 msgid "Removing duplicated photos"
 msgstr "Odstraňují se zdvojené fotografie"
 
-#: ../src/Commands.vala:1096
+#: ../src/Commands.vala:1104
 #, c-format
 msgid "Unable to duplicate one photo due to a file error"
 msgid_plural "Unable to duplicate %d photos due to file errors"
@@ -1310,54 +1305,54 @@ msgstr[0] "Kvůli chybě souboru nelze zdvojit fotografii"
 msgstr[1] "Kvůli chybě souboru nelze zdvojit %d fotografie"
 msgstr[2] "Kvůli chybě souboru nelze zdvojit %d fotografií"
 
-#: ../src/Commands.vala:1183
+#: ../src/Commands.vala:1191
 msgid "Restoring previous rating"
 msgstr "Obnovuje se předchozí hodnocení"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
 msgid "Increasing ratings"
 msgstr "Zvyšuje se hodnocení"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
 msgid "Decreasing ratings"
 msgstr "Snižuje se hodnocení"
 
-#: ../src/Commands.vala:1244
+#: ../src/Commands.vala:1252
 msgid "Setting RAW developer"
 msgstr "Nastavuje se vývojka RAW"
 
-#: ../src/Commands.vala:1244
+#: ../src/Commands.vala:1252
 msgid "Restoring previous RAW developer"
 msgstr "Obnovuje se předchozí vývojka RAW"
 
-#: ../src/Commands.vala:1245
+#: ../src/Commands.vala:1253
 msgid "Set Developer"
 msgstr "Nastavit vývojku"
 
-#: ../src/Commands.vala:1335
+#: ../src/Commands.vala:1343
 msgid "Original photo could not be adjusted."
 msgstr "Původní fotka nemůže být upravována."
 
-#: ../src/Commands.vala:1356
+#: ../src/Commands.vala:1364
 msgid "Adjusting Date and Time"
 msgstr "Nastavuje se datum a čas"
 
-#: ../src/Commands.vala:1356
+#: ../src/Commands.vala:1364
 msgid "Undoing Date and Time Adjustment"
 msgstr "Vrací se zpět nastavení data a času"
 
-#: ../src/Commands.vala:1387
+#: ../src/Commands.vala:1395
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
 msgstr[0] "Jednu původní fotografii nebylo možné upravit."
 msgstr[1] "Následující původní fotografie nebylo možné upravit."
 msgstr[2] "Následující původní fotografie nebylo možné upravit."
 
-#: ../src/Commands.vala:1389 ../src/Commands.vala:1413
+#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
 msgid "Time Adjustment Error"
 msgstr "Chyba při nastavování času"
 
-#: ../src/Commands.vala:1411
+#: ../src/Commands.vala:1419
 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."
@@ -1368,60 +1363,60 @@ msgstr[1] ""
 msgstr[2] ""
 "U následujících souborů s fotkou nebylo možné vrátit zpět nastavení času."
 
-#: ../src/Commands.vala:1625 ../src/Commands.vala:1648
+#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
 msgid "Create Tag"
 msgstr "Vytvořit štítek"
 
-#: ../src/Commands.vala:1683
+#: ../src/Commands.vala:1691
 #, c-format
 msgid "Move Tag \"%s\""
 msgstr "Přesunout štítek „%s“"
 
-#: ../src/Commands.vala:2335
+#: ../src/Commands.vala:2343
 msgid "Move Photos to Trash"
 msgstr "Přesunout fotky do koše"
 
-#: ../src/Commands.vala:2335
+#: ../src/Commands.vala:2343
 msgid "Restore Photos from Trash"
 msgstr "Obnovit fotky z koše"
 
-#: ../src/Commands.vala:2336
+#: ../src/Commands.vala:2344
 msgid "Move the photos to the Shotwell trash"
 msgstr "Přesunout fotky do koše aplikace Shotwell"
 
-#: ../src/Commands.vala:2336
+#: ../src/Commands.vala:2344
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Obnovit fotky zpět do knihovny Shotwell"
 
-#: ../src/Commands.vala:2355
+#: ../src/Commands.vala:2363
 msgid "Moving Photos to Trash"
 msgstr "Přesouvají se fotky do koše"
 
-#: ../src/Commands.vala:2355
+#: ../src/Commands.vala:2363
 msgid "Restoring Photos From Trash"
 msgstr "Obnovují se fotky z koše"
 
-#: ../src/Commands.vala:2441
+#: ../src/Commands.vala:2449
 msgid "Flag selected photos"
 msgstr "Označit vybrané fotky"
 
-#: ../src/Commands.vala:2442
+#: ../src/Commands.vala:2450
 msgid "Unflag selected photos"
 msgstr "Zrušit označení vybraných fotek"
 
-#: ../src/Commands.vala:2443
+#: ../src/Commands.vala:2451
 msgid "Flagging selected photos"
 msgstr "Označují se vybrané fotky"
 
-#: ../src/Commands.vala:2444
+#: ../src/Commands.vala:2452
 msgid "Unflagging selected photos"
 msgstr "Ruší se označení vybraných fotek"
 
-#: ../src/Commands.vala:2451
+#: ../src/Commands.vala:2459
 msgid "Flag"
 msgstr "Označit"
 
-#: ../src/Commands.vala:2451
+#: ../src/Commands.vala:2459
 msgid "Unflag"
 msgstr "Zrušit označení"
 
@@ -1442,7 +1437,7 @@ msgstr "Nelze exportovat pozadí do %s: %s"
 #: ../src/DesktopIntegration.vala:311
 #, c-format
 msgid "Unable to prepare desktop slideshow: %s"
-msgstr "Nelze připravit promítání snímků na ploše: %s"
+msgstr "Nelze připravit prezentaci na ploše: %s"
 
 #: ../src/Dialogs.vala:16
 #, c-format
@@ -1452,9 +1447,9 @@ msgstr[0] "Tím odstraníte štítek „%s“ z jedné fotografie. Pokračovat?"
 msgstr[1] "Tím odstraníte štítek „%s“ ze %d fotografií. Pokračovat?"
 msgstr[2] "Tím odstraníte štítek „%s“ z %d fotografií. Pokračovat?"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1385
-#: ../src/Resources.vala:328 ../src/Resources.vala:376
-#: ../src/Resources.vala:641
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
+#: ../src/Resources.vala:163 ../src/Resources.vala:369
+#: ../src/Resources.vala:417 ../src/Resources.vala:682
 msgid "_Delete"
 msgstr "S_mazat"
 
@@ -1532,44 +1527,44 @@ msgid "Current"
 msgstr "Stávající"
 
 #. layout controls
-#: ../src/Dialogs.vala:212
+#: ../src/Dialogs.vala:213
 msgid "_Format:"
 msgstr "_Formát:"
 
-#: ../src/Dialogs.vala:215
+#: ../src/Dialogs.vala:216
 msgid "_Quality:"
 msgstr "_Kvalita:"
 
-#: ../src/Dialogs.vala:218
+#: ../src/Dialogs.vala:219
 msgid "_Scaling constraint:"
 msgstr "Přešká_lovat:"
 
-#: ../src/Dialogs.vala:221
-msgid " _pixels"
-msgstr "_pixely"
+#: ../src/Dialogs.vala:222
+msgid "_Pixels:"
+msgstr "_Pixely:"
 
-#: ../src/Dialogs.vala:229
+#: ../src/Dialogs.vala:225
 msgid "Export metadata"
 msgstr "Exportovat metadata"
 
-#: ../src/Dialogs.vala:465
+#: ../src/Dialogs.vala:459
 msgid "Save Details..."
 msgstr "Uložit podrobnosti…"
 
-#: ../src/Dialogs.vala:466
+#: ../src/Dialogs.vala:460
 msgid "Save Details"
 msgstr "Uložit podrobnosti"
 
-#: ../src/Dialogs.vala:481
+#: ../src/Dialogs.vala:475
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(a %d dalších)\n"
 
-#: ../src/Dialogs.vala:534
+#: ../src/Dialogs.vala:528
 msgid "Import Results Report"
 msgstr "Zpráva o výsledcích importu"
 
-#: ../src/Dialogs.vala:538
+#: ../src/Dialogs.vala:532
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
@@ -1577,7 +1572,7 @@ msgstr[0] "Pokus o import %d souboru."
 msgstr[1] "Pokus o import %d souborů."
 msgstr[2] "Pokus o import %d souborů"
 
-#: ../src/Dialogs.vala:541
+#: ../src/Dialogs.vala:535
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -1588,37 +1583,37 @@ msgstr[2] "Z toho bylo %d souborů úspěšně importováno."
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:553
+#: ../src/Dialogs.vala:547
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Duplicitní fotografie/videa nejsou importovány:"
 
-#: ../src/Dialogs.vala:557
+#: ../src/Dialogs.vala:551
 msgid "duplicates existing media item"
 msgstr "Zduplikuje existující položky"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: ../src/Dialogs.vala:568
+#: ../src/Dialogs.vala:562
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Fotografie/videa nelze importovat kvůli chybě fotoaparátu:"
 
-#: ../src/Dialogs.vala:571 ../src/Dialogs.vala:586 ../src/Dialogs.vala:601
-#: ../src/Dialogs.vala:617 ../src/Dialogs.vala:632 ../src/Dialogs.vala:646
+#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
+#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
 msgid "error message:"
 msgstr "chybová zpráva:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: ../src/Dialogs.vala:582
+#: ../src/Dialogs.vala:576
 msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgstr "Soubory nebyly importovány, protože nejde o fotografie nebo videa:"
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: ../src/Dialogs.vala:597
+#: ../src/Dialogs.vala:591
 msgid ""
 "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
 "Understands:"
@@ -1629,7 +1624,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: ../src/Dialogs.vala:612
+#: ../src/Dialogs.vala:606
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
 "Library:"
@@ -1637,7 +1632,7 @@ msgstr ""
 "Fotografie/videa nelze importovat, protože Shotwell je nemůže zkopírovat do "
 "své knihovny:"
 
-#: ../src/Dialogs.vala:616
+#: ../src/Dialogs.vala:610
 #, c-format
 msgid ""
 "couldn't copy %s\n"
@@ -1649,18 +1644,18 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: ../src/Dialogs.vala:628
+#: ../src/Dialogs.vala:622
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Fotografie/videa nelze importovat, protože soubory jsou poškozené:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: ../src/Dialogs.vala:643
+#: ../src/Dialogs.vala:637
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Fotografie/videa nelze importovat z jiných důvodů:"
 
-#: ../src/Dialogs.vala:663
+#: ../src/Dialogs.vala:657
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
@@ -1668,7 +1663,7 @@ msgstr[0] "Jedna duplicitní fotografie nebyla naimportována:\n"
 msgstr[1] "%d duplicitní fotografie nebyly naimportovány:\n"
 msgstr[2] "%d duplicitních fotografií nebylo naimportováno:\n"
 
-#: ../src/Dialogs.vala:666
+#: ../src/Dialogs.vala:660
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
@@ -1676,7 +1671,7 @@ msgstr[0] "Jedno duplicitní video nebylo naimportováno:\n"
 msgstr[1] "%d duplicitní videa nebyla naimportováno:\n"
 msgstr[2] "%d duplicitních videí nebylo naimportováno:\n"
 
-#: ../src/Dialogs.vala:669
+#: ../src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
@@ -1684,7 +1679,7 @@ msgstr[0] "Jedna duplicitní fotografie/video nebylo naimportováno:\n"
 msgstr[1] "%d duplicitní fotografie/videa nebyly naimportovány:\n"
 msgstr[2] "%d duplicitní fotografií/videí nebylo naimportováno:\n"
 
-#: ../src/Dialogs.vala:683
+#: ../src/Dialogs.vala:677
 #, 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"
@@ -1693,7 +1688,7 @@ msgstr[0] ""
 msgstr[1] "U %d fotografií selhal import kvůli chybě souboru nebo hardwaru:\n"
 msgstr[2] "U %d fotografií selhal import kvůli chybě souboru nebo hardwaru:\n"
 
-#: ../src/Dialogs.vala:686
+#: ../src/Dialogs.vala:680
 #, 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"
@@ -1701,7 +1696,7 @@ msgstr[0] "U jednoho videa selhal import kvůli chybě souboru nebo hardwaru:\n"
 msgstr[1] "U %d videí selhal import kvůli chybě souboru nebo hardwaru:\n"
 msgstr[2] "U %d videí selhal import kvůli chybě souboru nebo hardwaru:\n"
 
-#: ../src/Dialogs.vala:689
+#: ../src/Dialogs.vala:683
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -1713,7 +1708,7 @@ msgstr[1] ""
 msgstr[2] ""
 "U %d fotografií/videí selhal import kvůli chybě souboru nebo hardwaru:\n"
 
-#: ../src/Dialogs.vala:692
+#: ../src/Dialogs.vala:686
 #, 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"
@@ -1722,7 +1717,7 @@ msgstr[0] ""
 msgstr[1] "U %d souborů selhal import kvůli chybě souboru nebo hardwaru:\n"
 msgstr[2] "U %d souborů selhal import kvůli chybě souboru nebo hardwaru:\n"
 
-#: ../src/Dialogs.vala:706
+#: ../src/Dialogs.vala:700
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -1736,7 +1731,7 @@ msgstr[1] ""
 msgstr[2] ""
 "U %d fotografií selhal import, protože složka knihovny neumožňila zápis:\n"
 
-#: ../src/Dialogs.vala:709
+#: ../src/Dialogs.vala:703
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -1750,7 +1745,7 @@ msgstr[1] ""
 msgstr[2] ""
 "U %d videí selhal import, protože složka knihovny neumožňila zápis:\n"
 
-#: ../src/Dialogs.vala:712
+#: ../src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1768,7 +1763,7 @@ msgstr[2] ""
 "U %d fotografií/videí selhal import, protože složka knihovny neumožňila "
 "zápis:\n"
 
-#: ../src/Dialogs.vala:715
+#: ../src/Dialogs.vala:709
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -1782,7 +1777,7 @@ msgstr[1] ""
 msgstr[2] ""
 "U %d souborů selhal import, protože složka knihovny neumožňila zápis:\n"
 
-#: ../src/Dialogs.vala:729
+#: ../src/Dialogs.vala:723
 #, 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"
@@ -1790,7 +1785,7 @@ msgstr[0] "U jedné fotografie selhal import kvůli chybě fotoaparátu:\n"
 msgstr[1] "U %d fotografií selhal import kvůli chybě fotoaparátu:\n"
 msgstr[2] "U %d fotografií selhal import kvůli chybě fotoaparátu:\n"
 
-#: ../src/Dialogs.vala:732
+#: ../src/Dialogs.vala:726
 #, 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"
@@ -1798,7 +1793,7 @@ msgstr[0] "U jednoho videa selhal import kvůli chybě fotoaparátu:\n"
 msgstr[1] "U %d videí selhal import kvůli chybě fotoaparátu:\n"
 msgstr[2] "U %d videí selhal import kvůli chybě fotoaparátu:\n"
 
-#: ../src/Dialogs.vala:735
+#: ../src/Dialogs.vala:729
 #, 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"
@@ -1806,7 +1801,7 @@ msgstr[0] "U jedné fotografie/videa selhal import kvůli chybě fotoaparátu:\n
 msgstr[1] "U %d fotografií/videí selhal import kvůli chybě fotoaparátu:\n"
 msgstr[2] "U %d fotografií/videí selhal import kvůli chybě fotoaparátu:\n"
 
-#: ../src/Dialogs.vala:738
+#: ../src/Dialogs.vala:732
 #, 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"
@@ -1814,7 +1809,7 @@ msgstr[0] "U jednoho souboru selhal import kvůli chybě fotoaparátu:\n"
 msgstr[1] "U %d souborů selhal import kvůli chybě fotoaparátu:\n"
 msgstr[2] "U %d souborů selhal import kvůli chybě fotoaparátu:\n"
 
-#: ../src/Dialogs.vala:752
+#: ../src/Dialogs.vala:746
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
@@ -1822,7 +1817,7 @@ msgstr[0] "U jedné fotografie selhal import protože byla poškozená:\n"
 msgstr[1] "U %d fotografií selhal import protože byly poškozené:\n"
 msgstr[2] "U %d fotografií selhal import protože byly poškozené:\n"
 
-#: ../src/Dialogs.vala:755
+#: ../src/Dialogs.vala:749
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
@@ -1830,7 +1825,7 @@ msgstr[0] "U jednoho videa selhal import protože bylo poškozené:\n"
 msgstr[1] "U %d videí selhal import protože byly poškozená:\n"
 msgstr[2] "U %d videí selhal import protože byly poškozená:\n"
 
-#: ../src/Dialogs.vala:758
+#: ../src/Dialogs.vala:752
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
@@ -1838,7 +1833,7 @@ msgstr[0] "U jedné fotografie/videa selhal import protože bylo poškozené:\n"
 msgstr[1] "U %d fotografií/videí selhal import protože byly poškozené:\n"
 msgstr[2] "U %d fotografií/videí selhal import protože byly poškozené:\n"
 
-#: ../src/Dialogs.vala:761
+#: ../src/Dialogs.vala:755
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
@@ -1850,7 +1845,7 @@ msgstr[2] "U %d souborů selhal import protože byly poškozené:\n"
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: ../src/Dialogs.vala:778
+#: ../src/Dialogs.vala:772
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1860,7 +1855,7 @@ msgstr[2] "%d nepodporovaných fotografií bylo vynecháno:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: ../src/Dialogs.vala:793
+#: ../src/Dialogs.vala:787
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
@@ -1868,7 +1863,7 @@ msgstr[0] "Jeden neobrázkový soubor byl vynechán.\n"
 msgstr[1] "%d neobrázkové soubory byly vynechány.\n"
 msgstr[2] "%d neobrázkových souborů bylo vynecháno.\n"
 
-#: ../src/Dialogs.vala:804
+#: ../src/Dialogs.vala:798
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
@@ -1877,7 +1872,7 @@ msgstr[0] ""
 msgstr[1] "%d fotografie byly vynechány kvůli zrušení ze strany uživatele:\n"
 msgstr[2] "%d fotografií bylo vynecháno kvůli zrušení ze strany uživatele:\n"
 
-#: ../src/Dialogs.vala:807
+#: ../src/Dialogs.vala:801
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
@@ -1885,7 +1880,7 @@ msgstr[0] "Jedno video bylo vynecháno kvůli zrušení ze strany uživatele:\n"
 msgstr[1] "%d videa byla vynechána kvůli zrušení ze strany uživatele:\n"
 msgstr[2] "%d videí bylo vynecháno kvůli zrušení ze strany uživatele:\n"
 
-#: ../src/Dialogs.vala:810
+#: ../src/Dialogs.vala:804
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
@@ -1896,7 +1891,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%d fotografií/videí bylo vynecháno kvůli zrušení ze strany uživatele:\n"
 
-#: ../src/Dialogs.vala:813
+#: ../src/Dialogs.vala:807
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
@@ -1904,7 +1899,7 @@ msgstr[0] "Jeden soubor byl vynechán kvůli zrušení ze strany uživatele:\n"
 msgstr[1] "%d soubory byly vynechány kvůli zrušení ze strany uživatele:\n"
 msgstr[2] "%d souborů bylo vynecháno kvůli zrušení ze strany uživatele:\n"
 
-#: ../src/Dialogs.vala:827
+#: ../src/Dialogs.vala:821
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
@@ -1912,7 +1907,7 @@ msgstr[0] "Jedna fotografie byla úspěšně naimportována.\n"
 msgstr[1] "%d fotografie byly úspěšně naimportovány.\n"
 msgstr[2] "%d fotografií bylo úspěšně naimportováno.\n"
 
-#: ../src/Dialogs.vala:830
+#: ../src/Dialogs.vala:824
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
@@ -1920,7 +1915,7 @@ msgstr[0] "Jedno video bylo úspěšně naimportováno.\n"
 msgstr[1] "%d videa byla úspěšně naimportována.\n"
 msgstr[2] "%d videí bylo úspěšně naimportováno.\n"
 
-#: ../src/Dialogs.vala:833
+#: ../src/Dialogs.vala:827
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -1930,15 +1925,15 @@ msgstr[2] "%d fotografií/videí bylo úspěšně naimportováno.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: ../src/Dialogs.vala:849
+#: ../src/Dialogs.vala:843
 msgid "No photos or videos imported.\n"
 msgstr "Žádné fotografie ani videa nebyly naimportovány.\n"
 
-#: ../src/Dialogs.vala:856 ../src/Dialogs.vala:875
+#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
 msgid "Import Complete"
 msgstr "Import dokončen"
 
-#: ../src/Dialogs.vala:1161
+#: ../src/Dialogs.vala:1155
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1946,7 +1941,7 @@ msgstr[0] "%d vteřina"
 msgstr[1] "%d vteřiny"
 msgstr[2] "%d vteřin"
 
-#: ../src/Dialogs.vala:1164
+#: ../src/Dialogs.vala:1158
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1954,7 +1949,7 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: ../src/Dialogs.vala:1168
+#: ../src/Dialogs.vala:1162
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1962,62 +1957,65 @@ msgstr[0] "%d hodina"
 msgstr[1] "%d hodiny"
 msgstr[2] "%d hodin"
 
-#: ../src/Dialogs.vala:1171
+#: ../src/Dialogs.vala:1165
 msgid "1 day"
 msgstr "1 den"
 
-#: ../src/Dialogs.vala:1319 ../src/Resources.vala:203
+#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
 msgid "Rename Event"
 msgstr "Přejmenovat událost"
 
-#: ../src/Dialogs.vala:1319
+#: ../src/Dialogs.vala:1315
 msgid "Name:"
 msgstr "Název:"
 
-#: ../src/Dialogs.vala:1329 ../src/Resources.vala:272
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
 msgid "Edit Title"
 msgstr "Úprava názvu"
 
-#: ../src/Dialogs.vala:1329 ../src/Properties.vala:340
+#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
 msgid "Title:"
 msgstr "Název:"
 
-#: ../src/Dialogs.vala:1343 ../src/Resources.vala:278
+#. Dialog title
+#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
 msgid "Edit Event Comment"
 msgstr "Úprava komentáře k události"
 
-#: ../src/Dialogs.vala:1343
+#: ../src/Dialogs.vala:1344
 msgid "Edit Photo/Video Comment"
 msgstr "Úprava komentáře k fotografii/videu"
 
-#: ../src/Dialogs.vala:1344 ../src/Properties.vala:630
+#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
 msgid "Comment:"
 msgstr "Komentář:"
 
-#: ../src/Dialogs.vala:1360
+#: ../src/Dialogs.vala:1361
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Soubor odstranit a přesunou_t do koše"
 msgstr[1] "Soubory odstranit a přesunou_t do koše"
 msgstr[2] "Soubory odstranit a přesunou_t do koše"
 
-#: ../src/Dialogs.vala:1364
+#: ../src/Dialogs.vala:1365
 msgid "_Remove From Library"
 msgstr "Odst_ranit z knihovny"
 
-#: ../src/Dialogs.vala:1384 ../src/camera/ImportPage.vala:1739
+#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
 msgid "_Keep"
 msgstr "_Zachovat"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edit?"
 msgstr "Vrátit zpět externí úpravu?"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edits?"
 msgstr "Vrátit zpět externí úpravy?"
 
-#: ../src/Dialogs.vala:1409
+#: ../src/Dialogs.vala:1410
 #, c-format
 msgid "This will destroy all changes made to the external file.  Continue?"
 msgid_plural ""
@@ -2029,15 +2027,15 @@ msgstr[1] ""
 msgstr[2] ""
 "Tím se odstraní všechny změny provedené v %d externích souborech. Pokračovat?"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edit"
 msgstr "_Vrátit zpět externí úpravu"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edits"
 msgstr "_Vrátit zpět externí úpravy"
 
-#: ../src/Dialogs.vala:1434
+#: ../src/Dialogs.vala:1435
 #, c-format
 msgid "This will remove the photo from the library.  Continue?"
 msgid_plural "This will remove %d photos from the library.  Continue?"
@@ -2045,72 +2043,72 @@ msgstr[0] "Tím se fotka odebere z knihovny. Pokračovat?"
 msgstr[1] "Tím se odeberou %d fotky z knihovny. Pokračovat?"
 msgstr[2] "Tím se odebere %d fotek z knihovny. Pokračovat?"
 
-#: ../src/Dialogs.vala:1441
+#: ../src/Dialogs.vala:1442 ../src/Resources.vala:178
 msgid "_Remove"
 msgstr "Odeb_rat"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photo From Library"
 msgstr "Odstranit fotografii z knihovny"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photos From Library"
 msgstr "Odstranit fotografie z knihovny"
 
-#: ../src/Dialogs.vala:1535
+#: ../src/Dialogs.vala:1536
 #, c-format
 msgid "%d%%"
 msgstr "%d %%"
 
-#: ../src/Dialogs.vala:1682
+#: ../src/Dialogs.vala:1688
 msgid "AM"
 msgstr "dop."
 
-#: ../src/Dialogs.vala:1683
+#: ../src/Dialogs.vala:1689
 msgid "PM"
 msgstr "odp."
 
-#: ../src/Dialogs.vala:1684
+#: ../src/Dialogs.vala:1690
 msgid "24 Hr"
 msgstr "24hod"
 
-#: ../src/Dialogs.vala:1699
+#: ../src/Dialogs.vala:1705
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Posunout fotografie/videa o tu samou hodnotu"
 
-#: ../src/Dialogs.vala:1704
+#: ../src/Dialogs.vala:1710
 msgid "Set _all photos/videos to this time"
 msgstr "Nastavit tento čas _všem fotkám/videím"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo file"
 msgstr "Z_měnit původní soubor s fotkou"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo files"
 msgstr "Z_měnit původní soubory s fotkami"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original file"
 msgstr "Z_měnit původní soubor"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original files"
 msgstr "Z_měnit původní soubory"
 
-#: ../src/Dialogs.vala:1800
+#: ../src/Dialogs.vala:1806
 msgid "Original: "
 msgstr "Původní:"
 
-#: ../src/Dialogs.vala:1801
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d.%m.%Y, %k∶%M∶%S"
 
-#: ../src/Dialogs.vala:1802
+#: ../src/Dialogs.vala:1808
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d.%m.%Y, %l∶%M∶%S %p"
 
-#: ../src/Dialogs.vala:1891
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -2119,7 +2117,7 @@ msgstr ""
 "Čas expozice bude posunut dopředu\n"
 "o %d %s, %d %s, %d %s a %d %s."
 
-#: ../src/Dialogs.vala:1892
+#: ../src/Dialogs.vala:1898
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2128,35 +2126,35 @@ msgstr ""
 "Čas expozice bude posunut dozadu\n"
 "o %d %s, %d %s, %d %s a %d %s."
 
-#: ../src/Dialogs.vala:1894
+#: ../src/Dialogs.vala:1900
 msgid "day"
 msgid_plural "days"
 msgstr[0] "den"
 msgstr[1] "dny"
 msgstr[2] "dní"
 
-#: ../src/Dialogs.vala:1895
+#: ../src/Dialogs.vala:1901
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hodinu"
 msgstr[1] "hodiny"
 msgstr[2] "hodin"
 
-#: ../src/Dialogs.vala:1896
+#: ../src/Dialogs.vala:1902
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutu"
 msgstr[1] "minuty"
 msgstr[2] "minut"
 
-#: ../src/Dialogs.vala:1897
+#: ../src/Dialogs.vala:1903
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "vteřinu"
 msgstr[1] "vteřiny"
 msgstr[2] "vteřin"
 
-#: ../src/Dialogs.vala:1941
+#: ../src/Dialogs.vala:1947
 #, c-format
 msgid ""
 "\n"
@@ -2179,50 +2177,50 @@ msgstr[2] ""
 "\n"
 "A %d dalších."
 
-#: ../src/Dialogs.vala:1963 ../src/Dialogs.vala:1990
+#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
 msgid "Tags (separated by commas):"
 msgstr "Štítky (oddělené čárkou):"
 
-#: ../src/Dialogs.vala:2070
+#: ../src/Dialogs.vala:2076
 msgid "Welcome!"
 msgstr "Vítejte!"
 
-#: ../src/Dialogs.vala:2077
+#: ../src/Dialogs.vala:2083
 msgid "Welcome to Shotwell!"
 msgstr "Vítejte v aplikaci Shotwell"
 
-#: ../src/Dialogs.vala:2081
+#: ../src/Dialogs.vala:2087
 msgid "To get started, import photos in any of these ways:"
 msgstr "Pro začátek naimportujte fotky libovolným postupem:"
 
-#: ../src/Dialogs.vala:2100
+#: ../src/Dialogs.vala:2106
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr ""
 "výběrem z nabídky <span weight=\"bold\">Soubor %s Importovat ze složky</span>"
 
-#: ../src/Dialogs.vala:2101
+#: ../src/Dialogs.vala:2107
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "přetažením a upuštěním souborů nad oknem aplikace"
 
-#: ../src/Dialogs.vala:2102
+#: ../src/Dialogs.vala:2108
 msgid "Connect a camera to your computer and import"
 msgstr "připojením fotoaparátu k počítači a importem z něj"
 
-#: ../src/Dialogs.vala:2112
+#: ../src/Dialogs.vala:2118
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importovat fotografie ze složky %s"
 
-#: ../src/Dialogs.vala:2119
+#: ../src/Dialogs.vala:2125
 msgid "You can also import photos in any of these ways:"
 msgstr "Můžete také některým z těchto způsobů importovat fotky:"
 
-#: ../src/Dialogs.vala:2129
+#: ../src/Dialogs.vala:2135
 msgid "_Don't show this message again"
 msgstr "Příště _nezobrazovat"
 
-#: ../src/Dialogs.vala:2164
+#: ../src/Dialogs.vala:2170
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Importovat fotky z knihovny %s"
@@ -2230,41 +2228,41 @@ msgstr "Importovat fotky z knihovny %s"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2308 ../src/Dialogs.vala:2312
+#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
 msgid "(Help)"
 msgstr "(nápověda)"
 
-#: ../src/Dialogs.vala:2321
+#: ../src/Dialogs.vala:2324
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "rok%směsíc%sden"
 
-#: ../src/Dialogs.vala:2323
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth"
 msgstr "rok%směsíc"
 
-#: ../src/Dialogs.vala:2325
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "rok%směsíc-den"
 
-#: ../src/Dialogs.vala:2327
+#: ../src/Dialogs.vala:2330
 msgid "Year-Month-Day"
 msgstr "rok-měsíc-den"
 
-#: ../src/Dialogs.vala:2328 ../src/editing_tools/EditingTools.vala:781
+#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Vlastní"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2565
+#: ../src/Dialogs.vala:2568
 msgid "Invalid pattern"
 msgstr "Neplatný vzor"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: ../src/Dialogs.vala:2668
+#: ../src/Dialogs.vala:2670
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2272,31 +2270,31 @@ msgstr ""
 "Shotwell může zkopírovat fotky do knihovny nebo je může importovat bez "
 "kopírování."
 
-#: ../src/Dialogs.vala:2673
+#: ../src/Dialogs.vala:2675
 msgid "Co_py Photos"
 msgstr "Ko_pírovat fotky"
 
-#: ../src/Dialogs.vala:2674
+#: ../src/Dialogs.vala:2676
 msgid "_Import in Place"
 msgstr "_Importovat bez kopírování"
 
-#: ../src/Dialogs.vala:2675
+#: ../src/Dialogs.vala:2677
 msgid "Import to Library"
 msgstr "Import do knihovny"
 
-#: ../src/Dialogs.vala:2685 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
 msgid "Remove From Library"
 msgstr "Odstranění z knihovny"
 
-#: ../src/Dialogs.vala:2686 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
 msgid "Removing Photo From Library"
 msgstr "Odstraňuje se fotografie z knihovny"
 
-#: ../src/Dialogs.vala:2686
+#: ../src/Dialogs.vala:2688
 msgid "Removing Photos From Library"
 msgstr "Odstraňují se fotografie z knihovny"
 
-#: ../src/Dialogs.vala:2700
+#: ../src/Dialogs.vala:2702
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -2324,7 +2322,7 @@ msgstr[2] ""
 "\n"
 "Tuto operaci nelze vrátit zpět."
 
-#: ../src/Dialogs.vala:2704
+#: ../src/Dialogs.vala:2706
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -2352,7 +2350,7 @@ msgstr[2] ""
 "\n"
 "Tuto operaci nelze vrátit zpět."
 
-#: ../src/Dialogs.vala:2708
+#: ../src/Dialogs.vala:2710
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -2380,7 +2378,7 @@ msgstr[2] ""
 "\n"
 "Tuto operaci nelze vrátit zpět."
 
-#: ../src/Dialogs.vala:2740
+#: ../src/Dialogs.vala:2742
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -2393,7 +2391,7 @@ msgstr[2] ""
 "%d fotografií/videí nelze přesunout do koše. Mají se soubory smazat?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2757
+#: ../src/Dialogs.vala:2759
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -2456,115 +2454,123 @@ msgstr "Export"
 msgid "Unable to process monitoring updates: %s"
 msgstr "Nelze sledovat změny: %s"
 
-#: ../src/MediaPage.vala:143
+#: ../src/MediaPage.vala:158
 msgid "Adjust the size of the thumbnails"
 msgstr "Nastavit velikost náhledů"
 
-#: ../src/MediaPage.vala:325 ../src/PhotoPage.vala:2590
-#: ../src/direct/DirectPhotoPage.vala:174
+#: ../src/MediaPage.vala:340 ../src/PhotoPage.vala:2593
+#: ../src/Resources.vala:188 ../src/direct/DirectPhotoPage.vala:174
 msgid "Zoom _In"
 msgstr "Přiblíž_it"
 
-#: ../src/MediaPage.vala:326
+#: ../src/MediaPage.vala:341
 msgid "Increase the magnification of the thumbnails"
 msgstr "Zvětšit velikost náhledů"
 
-#: ../src/MediaPage.vala:331 ../src/PhotoPage.vala:2596
-#: ../src/direct/DirectPhotoPage.vala:180
+#: ../src/MediaPage.vala:346 ../src/PhotoPage.vala:2599
+#: ../src/Resources.vala:189 ../src/direct/DirectPhotoPage.vala:180
 msgid "Zoom _Out"
 msgstr "_Oddálit"
 
-#: ../src/MediaPage.vala:332
+#: ../src/MediaPage.vala:347
 msgid "Decrease the magnification of the thumbnails"
 msgstr "Zmenšit velikost náhledů"
 
-#: ../src/MediaPage.vala:399
+#: ../src/MediaPage.vala:414
 msgid "Sort _Photos"
 msgstr "Seřadit _fotky"
 
-#: ../src/MediaPage.vala:408
+#: ../src/MediaPage.vala:423
 msgid "_Play Video"
 msgstr "_Přehrát video"
 
-#: ../src/MediaPage.vala:409
+#: ../src/MediaPage.vala:424
 msgid "Open the selected videos in the system video player"
 msgstr "Otevřít vybraná videa v systémovém přehrávači videí"
 
-#: ../src/MediaPage.vala:413 ../src/PhotoPage.vala:2639
+#: ../src/MediaPage.vala:428 ../src/PhotoPage.vala:2642
 msgid "_Developer"
 msgstr "_Vývojka"
 
-#: ../src/MediaPage.vala:425 ../src/camera/Branch.vala:101
+#: ../src/MediaPage.vala:440 ../src/camera/Branch.vala:99
 #: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
-#: ../src/photos/RawSupport.vala:300
+#: ../src/photos/RawSupport.vala:303
 msgid "Camera"
 msgstr "Fotoaparát"
 
-#: ../src/MediaPage.vala:436 ../src/camera/ImportPage.vala:872
+#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:874
 msgid "_Titles"
 msgstr "_Názvy"
 
-#: ../src/MediaPage.vala:437 ../src/camera/ImportPage.vala:873
+#: ../src/MediaPage.vala:452 ../src/camera/ImportPage.vala:875
 msgid "Display the title of each photo"
 msgstr "U každé fotografie zobrazit název"
 
-#: ../src/MediaPage.vala:442 ../src/events/EventsDirectoryPage.vala:130
+#: ../src/MediaPage.vala:457 ../src/events/EventsDirectoryPage.vala:130
 msgid "_Comments"
 msgstr "_Komentáře"
 
-#: ../src/MediaPage.vala:443
+#: ../src/MediaPage.vala:458
 msgid "Display the comment of each photo"
 msgstr "U každé fotografie zobrazit komentář"
 
-#: ../src/MediaPage.vala:454 ../src/library/LibraryWindow.vala:376
+#: ../src/MediaPage.vala:469 ../src/library/LibraryWindow.vala:360
 msgid "Ta_gs"
 msgstr "Štít_ky"
 
-#: ../src/MediaPage.vala:455
+#: ../src/MediaPage.vala:470
 msgid "Display each photo's tags"
 msgstr "U každé fotografie zobrazit štítky"
 
-#: ../src/MediaPage.vala:471
+#: ../src/MediaPage.vala:486
 msgid "By _Title"
 msgstr "Podle _názvu"
 
-#: ../src/MediaPage.vala:472
+#: ../src/MediaPage.vala:487
 msgid "Sort photos by title"
 msgstr "Seřadit fotografie podle názvu"
 
-#: ../src/MediaPage.vala:477
+#: ../src/MediaPage.vala:492
 msgid "By Exposure _Date"
 msgstr "Podle _data pořízení"
 
-#: ../src/MediaPage.vala:478
+#: ../src/MediaPage.vala:493
 msgid "Sort photos by exposure date"
 msgstr "Seřadit fotografie podle data pořízení"
 
-#: ../src/MediaPage.vala:483
+#: ../src/MediaPage.vala:498
 msgid "By _Rating"
 msgstr "Podle _hodnocení"
 
-#: ../src/MediaPage.vala:484
+#: ../src/MediaPage.vala:499
 msgid "Sort photos by rating"
 msgstr "Seřadit fotografie podle hodnocení"
 
-#: ../src/MediaPage.vala:494 ../src/library/LibraryWindow.vala:422
+#: ../src/MediaPage.vala:504
+msgid "By _Filename"
+msgstr "Podle názvu _souboru"
+
+#: ../src/MediaPage.vala:505
+msgid "Sort photos by filename"
+msgstr "Seřadit fotografie podle názvu souboru"
+
+#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:406
 msgid "_Ascending"
 msgstr "_Vzestupně"
 
-#: ../src/MediaPage.vala:495 ../src/library/LibraryWindow.vala:423
+#: ../src/MediaPage.vala:516 ../src/library/LibraryWindow.vala:407
 msgid "Sort photos in an ascending order"
 msgstr "Seřadit fotografie ve vzestupném pořadí"
 
-#: ../src/MediaPage.vala:500 ../src/library/LibraryWindow.vala:429
+#: ../src/MediaPage.vala:521 ../src/library/LibraryWindow.vala:413
 msgid "D_escending"
 msgstr "_Sestupně"
 
-#: ../src/MediaPage.vala:501 ../src/library/LibraryWindow.vala:430
+#: ../src/MediaPage.vala:522 ../src/library/LibraryWindow.vala:414
 msgid "Sort photos in a descending order"
 msgstr "Seřadit fotografie v sestupném pořadí"
 
-#: ../src/MediaPage.vala:702
+#: ../src/MediaPage.vala:723
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -2573,99 +2579,99 @@ msgstr ""
 "Nelze přehrát vybrané video:\n"
 "%s"
 
-#: ../src/Page.vala:1268
+#: ../src/Page.vala:1263
 msgid "No photos/videos"
 msgstr "Žádné fotografie/videa"
 
-#: ../src/Page.vala:1272
+#: ../src/Page.vala:1267
 msgid "No photos/videos found"
 msgstr "Nebyla nalezena žádná fotografie ani video"
 
-#: ../src/Page.vala:2569
+#: ../src/Page.vala:2565
 msgid "Photos cannot be exported to this directory."
 msgstr "Fotografie nelze exportovat do této složky."
 
-#: ../src/Photo.vala:3656
+#: ../src/Photo.vala:3753
 msgid "modified"
 msgstr "změněno"
 
 #. previous button
-#: ../src/PhotoPage.vala:532
+#: ../src/PhotoPage.vala:533
 msgid "Previous photo"
 msgstr "Předchozí fotografie"
 
 #. next button
-#: ../src/PhotoPage.vala:537
+#: ../src/PhotoPage.vala:539
 msgid "Next photo"
 msgstr "Následující fotografie"
 
-#: ../src/PhotoPage.vala:1844
+#: ../src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Chybí zdrojový soubor s fotografií: %s"
 
-#: ../src/PhotoPage.vala:2411 ../src/direct/DirectPhotoPage.vala:165
-#: ../src/library/LibraryWindow.vala:360
+#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
+#: ../src/library/LibraryWindow.vala:344
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: ../src/PhotoPage.vala:2415 ../src/direct/DirectPhotoPage.vala:81
+#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
 msgid "T_ools"
 msgstr "Nástr_oje"
 
-#: ../src/PhotoPage.vala:2420 ../src/direct/DirectPhotoPage.vala:86
+#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
 msgid "_Previous Photo"
 msgstr "_Předchozí fotka"
 
-#: ../src/PhotoPage.vala:2421 ../src/direct/DirectPhotoPage.vala:87
+#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
 msgid "Previous Photo"
 msgstr "Předchozí fotografie"
 
-#: ../src/PhotoPage.vala:2426 ../src/direct/DirectPhotoPage.vala:92
+#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
 msgid "_Next Photo"
 msgstr "_Následující fotka"
 
-#: ../src/PhotoPage.vala:2427 ../src/direct/DirectPhotoPage.vala:93
+#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
 msgid "Next Photo"
 msgstr "Následující fotografie"
 
-#: ../src/PhotoPage.vala:2591 ../src/direct/DirectPhotoPage.vala:175
+#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
 msgid "Increase the magnification of the photo"
 msgstr "Zvýšit přiblížení fotografie"
 
-#: ../src/PhotoPage.vala:2597 ../src/direct/DirectPhotoPage.vala:181
+#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
 msgid "Decrease the magnification of the photo"
 msgstr "Snížit přiblížení fotografie"
 
-#: ../src/PhotoPage.vala:2602 ../src/direct/DirectPhotoPage.vala:186
+#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
 msgid "Fit to _Page"
 msgstr "Přizpůsobit _stránce"
 
-#: ../src/PhotoPage.vala:2603 ../src/direct/DirectPhotoPage.vala:187
+#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
 msgid "Zoom the photo to fit on the screen"
 msgstr "Přizpůsobit přiblížení fotografie velikosti obrazovky"
 
-#: ../src/PhotoPage.vala:2609 ../src/direct/DirectPhotoPage.vala:193
+#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
 #, no-c-format
 msgid "Zoom _100%"
 msgstr "Přiblížení _100%"
 
-#: ../src/PhotoPage.vala:2611 ../src/direct/DirectPhotoPage.vala:195
+#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
 #, no-c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "Zobrazit fotografii v původní velikosti"
 
-#: ../src/PhotoPage.vala:2617 ../src/direct/DirectPhotoPage.vala:201
+#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
 #, no-c-format
 msgid "Zoom _200%"
 msgstr "Přiblížení _200%"
 
-#: ../src/PhotoPage.vala:2619 ../src/direct/DirectPhotoPage.vala:203
+#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
 #, no-c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "Zobrazit fotografii v dvojnásobku původní velikosti"
 
-#: ../src/PhotoPage.vala:3227
+#: ../src/PhotoPage.vala:3231
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Nelze exportovat %s: %s"
@@ -2865,67 +2871,67 @@ msgid "Exposure:"
 msgstr "Expozice:"
 
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:585
+#: ../src/Properties.vala:583
 msgid "Location:"
 msgstr "Místo:"
 
-#: ../src/Properties.vala:588
+#: ../src/Properties.vala:586
 msgid "File size:"
 msgstr "Velikost souboru:"
 
-#: ../src/Properties.vala:592
+#: ../src/Properties.vala:590
 msgid "Current Development:"
 msgstr "Aktuální vývojka:"
 
-#: ../src/Properties.vala:594
+#: ../src/Properties.vala:592
 msgid "Original dimensions:"
 msgstr "Původní velikost:"
 
-#: ../src/Properties.vala:597
+#: ../src/Properties.vala:595
 msgid "Camera make:"
 msgstr "Výrobce fotoaparátu:"
 
-#: ../src/Properties.vala:600
+#: ../src/Properties.vala:598
 msgid "Camera model:"
 msgstr "Model fotoaparátu:"
 
-#: ../src/Properties.vala:603
+#: ../src/Properties.vala:601
 msgid "Flash:"
 msgstr "Blesk:"
 
-#: ../src/Properties.vala:605
+#: ../src/Properties.vala:603
 msgid "Focal length:"
 msgstr "Ohnisko:"
 
-#: ../src/Properties.vala:608
+#: ../src/Properties.vala:606
 msgid "Exposure date:"
 msgstr "Datum expozice:"
 
-#: ../src/Properties.vala:611
+#: ../src/Properties.vala:609
 msgid "Exposure time:"
 msgstr "Čas expozice:"
 
-#: ../src/Properties.vala:614
+#: ../src/Properties.vala:612
 msgid "Exposure bias:"
 msgstr "Expoziční korekce:"
 
-#: ../src/Properties.vala:616
+#: ../src/Properties.vala:614
 msgid "GPS latitude:"
 msgstr "Zeměpisná šířka:"
 
-#: ../src/Properties.vala:619
+#: ../src/Properties.vala:617
 msgid "GPS longitude:"
 msgstr "Zeměpisná délka:"
 
-#: ../src/Properties.vala:622
+#: ../src/Properties.vala:620
 msgid "Artist:"
 msgstr "Umělec:"
 
-#: ../src/Properties.vala:624
+#: ../src/Properties.vala:622
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../src/Properties.vala:626
+#: ../src/Properties.vala:624
 msgid "Software:"
 msgstr "Software:"
 
@@ -2941,651 +2947,752 @@ msgstr "Správce fotografií"
 msgid "Photo Viewer"
 msgstr "Prohlížeč fotografií"
 
-#: ../src/Resources.vala:142
+#: ../src/Resources.vala:144
 msgid "Rotate _Right"
 msgstr "Otočit dop_rava"
 
-#: ../src/Resources.vala:143 ../src/Resources.vala:148
+#: ../src/Resources.vala:145 ../src/Resources.vala:150
 msgid "Rotate"
 msgstr "Otočit"
 
-#: ../src/Resources.vala:144
+#: ../src/Resources.vala:146
 msgid "Rotate Right"
 msgstr "Otočit doprava"
 
-#: ../src/Resources.vala:145
+#: ../src/Resources.vala:147
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Otočit fotografii doprava (pro otočení doleva zmáčkněte Ctrl)"
 
-#: ../src/Resources.vala:147
+#: ../src/Resources.vala:149
 msgid "Rotate _Left"
 msgstr "Otočit do_leva"
 
-#: ../src/Resources.vala:149
+#: ../src/Resources.vala:151
 msgid "Rotate Left"
 msgstr "Otočit doleva"
 
-#: ../src/Resources.vala:150
+#: ../src/Resources.vala:152
 msgid "Rotate the photos left"
 msgstr "Otočí fotografii doleva"
 
-#: ../src/Resources.vala:152
+#: ../src/Resources.vala:154
 msgid "Flip Hori_zontally"
 msgstr "Překlopit vo_dorovně"
 
-#: ../src/Resources.vala:153
+#: ../src/Resources.vala:155
 msgid "Flip Horizontally"
 msgstr "Překlopit vodorovně"
 
-#: ../src/Resources.vala:155
+#: ../src/Resources.vala:157
 msgid "Flip Verti_cally"
 msgstr "Překlopit s_visle"
 
-#: ../src/Resources.vala:156
+#: ../src/Resources.vala:158
 msgid "Flip Vertically"
 msgstr "Překlopit svisle"
 
-#: ../src/Resources.vala:158
+#: ../src/Resources.vala:160
+msgid "_About"
+msgstr "O _aplikaci"
+
+#: ../src/Resources.vala:161
+msgid "_Apply"
+msgstr "_Použít"
+
+#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
+#: ../src/library/LibraryWindow.vala:340
+msgid "_Edit"
+msgstr "_Upravit"
+
+#: ../src/Resources.vala:165
+msgid "_Forward"
+msgstr "V_před"
+
+#: ../src/Resources.vala:166
+msgid "Fulls_creen"
+msgstr "_Celá obrazovka"
+
+#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
+#: ../src/library/LibraryWindow.vala:364
+msgid "_Help"
+msgstr "_Nápověda"
+
+#: ../src/Resources.vala:168
+msgid "Leave _Fullscreen"
+msgstr "Opustit _celou obrazovku"
+
+#: ../src/Resources.vala:169 ../src/Resources.vala:371
+msgid "_New"
+msgstr "_Nový"
+
+#: ../src/Resources.vala:170
+msgid "_Next"
+msgstr "_Následující"
+
+#: ../src/Resources.vala:171
+msgid "_OK"
+msgstr "_Budiž"
+
+#: ../src/Resources.vala:172
+msgid "_Play"
+msgstr "_Přehrát"
+
+#: ../src/Resources.vala:173 ../src/Resources.vala:325
+msgid "_Preferences"
+msgstr "_Předvolby"
+
+#: ../src/Resources.vala:174
+msgid "_Previous"
+msgstr "_Předchozí"
+
+#: ../src/Resources.vala:175
+msgid "_Print"
+msgstr "_Tisk"
+
+#: ../src/Resources.vala:176
+msgid "_Quit"
+msgstr "U_končit"
+
+#: ../src/Resources.vala:177
+msgid "_Refresh"
+msgstr "_Aktualizovat"
+
+#: ../src/Resources.vala:179
+msgid "_Revert"
+msgstr "V_rátit"
+
+#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save"
+msgstr "_Uložit"
+
+#: ../src/Resources.vala:181
+msgid "Save _As"
+msgstr "Uložit j_ako"
+
+#: ../src/Resources.vala:182
+msgid "Sort _Ascending"
+msgstr "Ř_adit vzestupně"
+
+#: ../src/Resources.vala:183
+msgid "Sort _Descending"
+msgstr "Řa_dit sestupně"
+
+#: ../src/Resources.vala:184
+msgid "_Stop"
+msgstr "Za_stavit"
+
+#: ../src/Resources.vala:185
+msgid "_Undelete"
+msgstr "Vrátit _smazání"
+
+#: ../src/Resources.vala:186
+msgid "_Normal Size"
+msgstr "_Normální velikost"
+
+#: ../src/Resources.vala:187
+msgid "Best _Fit"
+msgstr "Přizpůso_bit"
+
+#: ../src/Resources.vala:191
 msgid "_Enhance"
 msgstr "_Vylepšit"
 
-#: ../src/Resources.vala:159
+#: ../src/Resources.vala:192
 msgid "Enhance"
 msgstr "Vylepšit"
 
-#: ../src/Resources.vala:160
+#: ../src/Resources.vala:193
 msgid "Automatically improve the photo's appearance"
 msgstr "Automaticky vylepšit vzhled fotografie"
 
-#: ../src/Resources.vala:162
+#: ../src/Resources.vala:195
 msgid "_Copy Color Adjustments"
 msgstr "_Kopírovat úpravu barev"
 
-#: ../src/Resources.vala:163
+#: ../src/Resources.vala:196
 msgid "Copy Color Adjustments"
 msgstr "Kopírovat úpravu barev"
 
-#: ../src/Resources.vala:164
+#: ../src/Resources.vala:197
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Kopírovat parametry úpravy barev použité u fotografie"
 
-#: ../src/Resources.vala:166
+#: ../src/Resources.vala:199
 msgid "_Paste Color Adjustments"
 msgstr "Vložit ú_pravu barev"
 
-#: ../src/Resources.vala:167
+#: ../src/Resources.vala:200
 msgid "Paste Color Adjustments"
 msgstr "Vložit úpravu barev"
 
-#: ../src/Resources.vala:168
+#: ../src/Resources.vala:201
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Použít u vybraných fotografií zkopírované parametry úpravy barev"
 
-#: ../src/Resources.vala:170
+#: ../src/Resources.vala:203
 msgid "_Crop"
 msgstr "_Oříznout"
 
-#: ../src/Resources.vala:171
+#: ../src/Resources.vala:204
 msgid "Crop"
 msgstr "Oříznout"
 
-#: ../src/Resources.vala:172
+#: ../src/Resources.vala:205
 msgid "Crop the photo's size"
 msgstr "Oříznout rozměry fotografie"
 
-#: ../src/Resources.vala:174 ../src/editing_tools/StraightenTool.vala:100
+#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
 msgid "_Straighten"
 msgstr "_Vyrovnat"
 
-#: ../src/Resources.vala:175
+#: ../src/Resources.vala:208
 msgid "Straighten"
 msgstr "Vyrovnat"
 
-#: ../src/Resources.vala:176
+#: ../src/Resources.vala:209
 msgid "Straighten the photo"
 msgstr "Vyrovnat fotografii"
 
-#: ../src/Resources.vala:178
+#: ../src/Resources.vala:211
 msgid "_Red-eye"
 msgstr "Če_rvené oči"
 
-#: ../src/Resources.vala:179
+#: ../src/Resources.vala:212
 msgid "Red-eye"
 msgstr "Červené oči"
 
-#: ../src/Resources.vala:180
+#: ../src/Resources.vala:213
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Odstranit nebo potlačit efekt červených očí ve fotografii"
 
-#: ../src/Resources.vala:182
+#: ../src/Resources.vala:215
 msgid "_Adjust"
 msgstr "_Upravit"
 
-#: ../src/Resources.vala:183
+#: ../src/Resources.vala:216
 msgid "Adjust"
 msgstr "Upravit"
 
-#: ../src/Resources.vala:184
+#: ../src/Resources.vala:217
 msgid "Adjust the photo's color and tone"
 msgstr "Upravit barvy a tón fotografie"
 
-#: ../src/Resources.vala:186
+#: ../src/Resources.vala:219
 msgid "Re_vert to Original"
 msgstr "_Vrátit zpět na původní"
 
-#: ../src/Resources.vala:187
+#: ../src/Resources.vala:220
 msgid "Revert to Original"
 msgstr "Vrátit zpět na původní"
 
-#: ../src/Resources.vala:189
+#: ../src/Resources.vala:222
 msgid "Revert External E_dits"
 msgstr "Vrátit zpět e_xterní úpravy"
 
-#: ../src/Resources.vala:190
+#: ../src/Resources.vala:223
 msgid "Revert to the master photo"
 msgstr "Zrušit změny a vrátit se zpět k původní fotografii"
 
-#: ../src/Resources.vala:192
+#: ../src/Resources.vala:225
 msgid "Set as _Desktop Background"
 msgstr "Nastavit jako poza_dí plochy"
 
-#: ../src/Resources.vala:193
+#: ../src/Resources.vala:226
 msgid "Set selected image to be the new desktop background"
 msgstr "Nastavit vybranou fotografii jako obrázek na pozadí pracovní plochy"
 
-#: ../src/Resources.vala:194
+#: ../src/Resources.vala:227
 msgid "Set as _Desktop Slideshow..."
 msgstr "Nastavit jako prezentaci na p_loše…"
 
-#: ../src/Resources.vala:196
+#: ../src/Resources.vala:229
 msgid "_Undo"
 msgstr "_Zpět"
 
-#: ../src/Resources.vala:197
+#: ../src/Resources.vala:230
 msgid "Undo"
 msgstr "Zpět"
 
-#: ../src/Resources.vala:199
+#: ../src/Resources.vala:232
 msgid "_Redo"
 msgstr "Zn_ovu"
 
-#: ../src/Resources.vala:200
+#: ../src/Resources.vala:233
 msgid "Redo"
 msgstr "Znovu"
 
-#: ../src/Resources.vala:202
+#: ../src/Resources.vala:235
 msgid "Re_name Event..."
 msgstr "Přejme_novat událost…"
 
-#: ../src/Resources.vala:205
+#: ../src/Resources.vala:238
 msgid "Make _Key Photo for Event"
 msgstr "Použít jako _klíčovou fotku pro událost"
 
-#: ../src/Resources.vala:206
+#: ../src/Resources.vala:239
 msgid "Make Key Photo for Event"
 msgstr "Nastavit jako klíčovou fotografii pro událost"
 
-#: ../src/Resources.vala:208
+#: ../src/Resources.vala:241
 msgid "_New Event"
 msgstr "_Nová událost"
 
-#: ../src/Resources.vala:209
+#: ../src/Resources.vala:242
 msgid "New Event"
 msgstr "Nová událost"
 
-#: ../src/Resources.vala:211
+#: ../src/Resources.vala:244
 msgid "Move Photos"
 msgstr "Přesunout fotky"
 
-#: ../src/Resources.vala:212
+#: ../src/Resources.vala:245
 msgid "Move photos to an event"
 msgstr "Přiřadit fotografie k události"
 
-#: ../src/Resources.vala:214
+#: ../src/Resources.vala:247
 msgid "_Merge Events"
 msgstr "S_pojit události"
 
-#: ../src/Resources.vala:215
+#: ../src/Resources.vala:248
 msgid "Merge"
 msgstr "Spojit"
 
-#: ../src/Resources.vala:216
+#: ../src/Resources.vala:249
 msgid "Combine events into a single event"
 msgstr "Sloučit události do jedné"
 
-#: ../src/Resources.vala:218
+#: ../src/Resources.vala:251
 msgid "_Set Rating"
 msgstr "_Hodnotit"
 
-#: ../src/Resources.vala:219
+#: ../src/Resources.vala:252
 msgid "Set Rating"
 msgstr "Nastavit hodnocení"
 
-#: ../src/Resources.vala:220
+#: ../src/Resources.vala:253
 msgid "Change the rating of your photo"
 msgstr "Změnit hodnocení své fotografie"
 
-#: ../src/Resources.vala:222
+#: ../src/Resources.vala:255
 msgid "_Increase"
 msgstr "Z_výšit"
 
-#: ../src/Resources.vala:223
+#: ../src/Resources.vala:256
 msgid "Increase Rating"
 msgstr "Zvýšení hodnocení"
 
-#: ../src/Resources.vala:225
+#: ../src/Resources.vala:258
 msgid "_Decrease"
 msgstr "S_nížit"
 
-#: ../src/Resources.vala:226
+#: ../src/Resources.vala:259
 msgid "Decrease Rating"
 msgstr "Snížení hodnocení"
 
-#: ../src/Resources.vala:228
+#: ../src/Resources.vala:261
 msgid "_Unrated"
 msgstr "_Bez ohodnocení"
 
-#: ../src/Resources.vala:229
+#: ../src/Resources.vala:262
 msgid "Unrated"
 msgstr "Nehodnoceno"
 
-#: ../src/Resources.vala:230
+#: ../src/Resources.vala:263
 msgid "Rate Unrated"
 msgstr "Bez ohodnocení"
 
-#: ../src/Resources.vala:231
+#: ../src/Resources.vala:264
 msgid "Setting as unrated"
 msgstr "Nastavuje se jako nehodnocené"
 
-#: ../src/Resources.vala:232
+#: ../src/Resources.vala:265
 msgid "Remove any ratings"
 msgstr "Odebrat hodnocení"
 
-#: ../src/Resources.vala:234
+#: ../src/Resources.vala:267
 msgid "_Rejected"
 msgstr "_Zamítnout"
 
-#: ../src/Resources.vala:235
+#: ../src/Resources.vala:268
 msgid "Rejected"
 msgstr "Zamítnuto"
 
-#: ../src/Resources.vala:236
+#: ../src/Resources.vala:269
 msgid "Rate Rejected"
 msgstr "Zamítavé hodnocení"
 
-#: ../src/Resources.vala:237
+#: ../src/Resources.vala:270
 msgid "Setting as rejected"
 msgstr "Nastavuje se na zamítnuté"
 
-#: ../src/Resources.vala:238
+#: ../src/Resources.vala:271
 msgid "Set rating to rejected"
 msgstr "Nastavit hodnocení na zamítnuté"
 
-#: ../src/Resources.vala:240
+#: ../src/Resources.vala:273
 msgid "Rejected _Only"
 msgstr "Jen _zamítnuté"
 
-#: ../src/Resources.vala:241
+#: ../src/Resources.vala:274
 msgid "Rejected Only"
 msgstr "Jen zamítnuté"
 
-#: ../src/Resources.vala:242
+#: ../src/Resources.vala:275
 msgid "Show only rejected photos"
 msgstr "Zobrazit je zamítnuté fotografie"
 
-#: ../src/Resources.vala:244
+#: ../src/Resources.vala:277
 msgid "All + _Rejected"
 msgstr "Všechny + _zamítnuté"
 
-#: ../src/Resources.vala:245 ../src/Resources.vala:246
+#: ../src/Resources.vala:278 ../src/Resources.vala:279
 msgid "Show all photos, including rejected"
 msgstr "Zobrazit všechny fotografie, včetně zamítnutých"
 
-#: ../src/Resources.vala:248
+#: ../src/Resources.vala:281
 msgid "_All Photos"
 msgstr "_Všechny fotografie"
 
-#: ../src/Resources.vala:249 ../src/Resources.vala:250
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:283 ../src/Resources.vala:285
 msgid "Show all photos"
 msgstr "Zobrazit všechny fotografie"
 
-#: ../src/Resources.vala:252
+#: ../src/Resources.vala:287
 msgid "_Ratings"
 msgstr "_Hodnocení"
 
-#: ../src/Resources.vala:253
+#: ../src/Resources.vala:288
 msgid "Display each photo's rating"
 msgstr "U každé fotografie zobrazit hodnocení"
 
-#: ../src/Resources.vala:255
+#: ../src/Resources.vala:290
 msgid "_Filter Photos"
 msgstr "_Filtrovat fotografie"
 
-#: ../src/Resources.vala:256
+#: ../src/Resources.vala:291
 msgid "Filter Photos"
 msgstr "Filtrovat fotografie"
 
-#: ../src/Resources.vala:257
+#: ../src/Resources.vala:292
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Omezit počet zobrazených fotografií pomocí filtru"
 
-#: ../src/Resources.vala:259
+#: ../src/Resources.vala:294
 msgid "_Duplicate"
 msgstr "_Duplikovat"
 
-#: ../src/Resources.vala:260
+#: ../src/Resources.vala:295
 msgid "Duplicate"
 msgstr "Duplikovat"
 
-#: ../src/Resources.vala:261
+#: ../src/Resources.vala:296
 msgid "Make a duplicate of the photo"
 msgstr "Vytvořit kopii této fotografie"
 
-#: ../src/Resources.vala:263
+#: ../src/Resources.vala:298
 msgid "_Export..."
 msgstr "_Export…"
 
-#: ../src/Resources.vala:265
+#: ../src/Resources.vala:300
 msgid "_Print..."
 msgstr "_Tisk…"
 
-#: ../src/Resources.vala:267
+#: ../src/Resources.vala:302
 msgid "Pu_blish..."
 msgstr "Zveře_jnit…"
 
-#: ../src/Resources.vala:269
+#: ../src/Resources.vala:304
 msgid "Publish to various websites"
 msgstr "Zveřejnit na různých webových stránkách"
 
-#: ../src/Resources.vala:271
+#: ../src/Resources.vala:306
 msgid "Edit _Title..."
 msgstr "Upravi_t název…"
 
-#: ../src/Resources.vala:274
+#: ../src/Resources.vala:310
 msgid "Edit _Comment..."
 msgstr "Upravit _komentář…"
 
-#: ../src/Resources.vala:275
+#. Button label
+#: ../src/Resources.vala:312
 msgid "Edit Comment"
 msgstr "Upravit komentář"
 
-#: ../src/Resources.vala:277
+#: ../src/Resources.vala:314
 msgid "Edit Event _Comment..."
 msgstr "Upravit _komentář události…"
 
-#: ../src/Resources.vala:280
+#: ../src/Resources.vala:317
 msgid "_Adjust Date and Time..."
 msgstr "Nastavit d_atum a čas…"
 
-#: ../src/Resources.vala:281
+#: ../src/Resources.vala:318
 msgid "Adjust Date and Time"
 msgstr "Nastavení data a času"
 
-#: ../src/Resources.vala:283
+#: ../src/Resources.vala:320
 msgid "Add _Tags..."
 msgstr "Přidat š_títky…"
 
-#: ../src/Resources.vala:284
+#: ../src/Resources.vala:321
 msgid "_Add Tags..."
 msgstr "Přid_at štítky…"
 
-#: ../src/Resources.vala:285 ../src/Resources.vala:316
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:323 ../src/Resources.vala:356
 msgid "Add Tags"
 msgstr "Přidání štítků"
 
-#: ../src/Resources.vala:287
-msgid "_Preferences"
-msgstr "_Předvolby"
-
-#: ../src/Resources.vala:289
+#: ../src/Resources.vala:327
 msgid "Open With E_xternal Editor"
 msgstr "Otevřít v e_xterním editoru"
 
-#: ../src/Resources.vala:291
+#: ../src/Resources.vala:329
 msgid "Open With RA_W Editor"
 msgstr "Otevřít v editoru RA_W"
 
-#: ../src/Resources.vala:293
+#: ../src/Resources.vala:331
 msgid "Send _To..."
 msgstr "Odesla_t…"
 
-#: ../src/Resources.vala:294
+#: ../src/Resources.vala:332
 msgid "Send T_o..."
 msgstr "_Odeslat…"
 
-#: ../src/Resources.vala:296
+#: ../src/Resources.vala:334
 msgid "_Find..."
 msgstr "Na_jít…"
 
-#: ../src/Resources.vala:297
+#: ../src/Resources.vala:335
 msgid "Find"
 msgstr "Najít"
 
-#: ../src/Resources.vala:298
+#: ../src/Resources.vala:336
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Najít obrázky, jejichž název nebo štítek obsahují napsaný text"
 
-#: ../src/Resources.vala:300
+#: ../src/Resources.vala:338
 msgid "_Flag"
 msgstr "_Označit"
 
-#: ../src/Resources.vala:302
+#: ../src/Resources.vala:340
 msgid "Un_flag"
 msgstr "Zrušit _označení"
 
-#: ../src/Resources.vala:305
+#: ../src/Resources.vala:343
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Nelze spustit editor: %s"
 
-#: ../src/Resources.vala:310
+#: ../src/Resources.vala:348
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "Přidat štítek „%s“"
 
-#: ../src/Resources.vala:312
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:351
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "Přidat štítky „%s“ a „%s“"
 
-#: ../src/Resources.vala:320
+#: ../src/Resources.vala:361
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "S_mazat štítek „%s“"
 
-#: ../src/Resources.vala:324
+#: ../src/Resources.vala:365
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "Smazat štítek „%s“"
 
-#: ../src/Resources.vala:327
+#: ../src/Resources.vala:368
 msgid "Delete Tag"
 msgstr "Smazat štítek"
 
-#: ../src/Resources.vala:330
-msgid "_New"
-msgstr "_Nový"
-
-#: ../src/Resources.vala:333
+#: ../src/Resources.vala:374
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "Přejme_novat štítek „%s“…"
 
-#: ../src/Resources.vala:337
+#: ../src/Resources.vala:378
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "Přejmenovat štítek „%s“ na „%s“"
 
-#: ../src/Resources.vala:340
+#: ../src/Resources.vala:381
 msgid "_Rename..."
 msgstr "_Přejmenovat…"
 
-#: ../src/Resources.vala:342
+#: ../src/Resources.vala:383
 msgid "Modif_y Tags..."
 msgstr "Změnit štítk_y…"
 
-#: ../src/Resources.vala:343
+#: ../src/Resources.vala:384
 msgid "Modify Tags"
 msgstr "Změnit štítky"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Oštítkovat fotku jak „%s“"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Oštítkovat fotku jak „%s“"
 
-#: ../src/Resources.vala:350
+#: ../src/Resources.vala:391
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "Oštítkovat vybranou fotku jako „%s“"
 
-#: ../src/Resources.vala:351
+#: ../src/Resources.vala:392
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "Oštítkovat vybrané fotky jako „%s“"
 
-#: ../src/Resources.vala:355
+#: ../src/Resources.vala:396
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "Odstranit z _fotky štítek „%s“"
 
-#: ../src/Resources.vala:356
+#: ../src/Resources.vala:397
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "Odstranit z _fotek štítek „%s“"
 
-#: ../src/Resources.vala:360
+#: ../src/Resources.vala:401
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "Odstranit z fotky šítek „%s“"
 
-#: ../src/Resources.vala:361
+#: ../src/Resources.vala:402
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "Odstranit z fotek štítek „%s“"
 
-#: ../src/Resources.vala:365
+#: ../src/Resources.vala:406
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr "Nelze přejmenovat šítek na „%s“, protože takový už existuje."
 
-#: ../src/Resources.vala:369
+#: ../src/Resources.vala:410
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr "Nelze přejmenovat hledání na „%s“, protože takové už existuje."
 
-#: ../src/Resources.vala:372
+#: ../src/Resources.vala:413
 msgid "Saved Search"
 msgstr "Uložené hledání"
 
-#: ../src/Resources.vala:374
+#: ../src/Resources.vala:415
 msgid "Delete Search"
 msgstr "Smazat hledání"
 
-#: ../src/Resources.vala:377
+#: ../src/Resources.vala:418
 msgid "_Edit..."
 msgstr "_Upravit…"
 
-#: ../src/Resources.vala:378
+#: ../src/Resources.vala:419
 msgid "Re_name..."
 msgstr "Přejme_novat…"
 
-#: ../src/Resources.vala:381
+#: ../src/Resources.vala:422
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "Přejmenovat hledání „%s“ na „%s“"
 
-#: ../src/Resources.vala:385
+#: ../src/Resources.vala:426
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "Smazat hledání „%s“"
 
-#: ../src/Resources.vala:543
+#: ../src/Resources.vala:584
 #, c-format
 msgid "Rate %s"
 msgstr "Hodnocení %s"
 
-#: ../src/Resources.vala:544
+#: ../src/Resources.vala:585
 #, c-format
 msgid "Set rating to %s"
 msgstr "Nastavit ohodnocení na %s"
 
-#: ../src/Resources.vala:545
+#: ../src/Resources.vala:586
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Nastavuje se ohodnocení na %s"
 
-#: ../src/Resources.vala:547
+#: ../src/Resources.vala:588
 #, c-format
 msgid "Display %s"
 msgstr "Zobrazit %s"
 
-#: ../src/Resources.vala:548
+#: ../src/Resources.vala:589
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Zobrazit jen fotografie s ohodnocením %s"
 
-#: ../src/Resources.vala:549
+#: ../src/Resources.vala:590
 #, c-format
 msgid "%s or Better"
 msgstr "%s nebo lepší"
 
-#: ../src/Resources.vala:550
+#: ../src/Resources.vala:591
 #, c-format
 msgid "Display %s or Better"
 msgstr "Zobrazit %s nebo lepší"
 
-#: ../src/Resources.vala:551
+#: ../src/Resources.vala:592
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Zobrazit jen fotografie s hodnocením %s nebo lepším"
 
-#: ../src/Resources.vala:642
+#: ../src/Resources.vala:683
 msgid "Remove the selected photos from the trash"
 msgstr "Odstranit vybrané fotografie z koše"
 
-#: ../src/Resources.vala:643
+#: ../src/Resources.vala:684
 msgid "Remove the selected photos from the library"
 msgstr "Odstraní vybrané fotografie z knihovny"
 
-#: ../src/Resources.vala:645
+#: ../src/Resources.vala:686
 msgid "_Restore"
 msgstr "O_bnovit"
 
-#: ../src/Resources.vala:646
+#: ../src/Resources.vala:687
 msgid "Move the selected photos back into the library"
 msgstr "Přesunout vybrané fotografie zpět do knihovny"
 
-#: ../src/Resources.vala:648
+#: ../src/Resources.vala:689
 msgid "Show in File Mana_ger"
 msgstr "Otevřít ve _správci souborů"
 
-#: ../src/Resources.vala:649
+#: ../src/Resources.vala:690
 msgid "Open the selected photo's directory in the file manager"
 msgstr "Otevřít vybranou složku s fotografiemi ve správci souborů"
 
-#: ../src/Resources.vala:652
+#: ../src/Resources.vala:693
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Nelze otevřít ve správci souborů: %s"
 
-#: ../src/Resources.vala:655
+#: ../src/Resources.vala:696
 msgid "R_emove From Library"
 msgstr "O_dstranit z knihovny"
 
-#: ../src/Resources.vala:657
+#: ../src/Resources.vala:698
 msgid "_Move to Trash"
 msgstr "Přesu_nout do koše"
 
-#: ../src/Resources.vala:659
+#: ../src/Resources.vala:700
 msgid "Select _All"
 msgstr "Vybrat _vše"
 
-#: ../src/Resources.vala:660
+#: ../src/Resources.vala:701
 msgid "Select all items"
 msgstr "Vybrat všechny položky"
 
@@ -3593,20 +3700,20 @@ msgstr "Vybrat všechny položky"
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:741
+#: ../src/Resources.vala:780
 msgid "%-I:%M %p"
 msgstr "%l∶%M %p"
 
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:746
+#: ../src/Resources.vala:785
 msgid "%-I:%M:%S %p"
 msgstr "%l∶%M:%S %p"
 
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:750
+#: ../src/Resources.vala:789
 msgid "%a %b %d, %Y"
 msgstr "%a, %e. %B %Y"
 
@@ -3616,14 +3723,14 @@ msgstr "%a, %e. %B %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:755 ../src/Resources.vala:765
+#: ../src/Resources.vala:794 ../src/Resources.vala:804
 msgid "%a %b %d"
 msgstr "%a, %e. %B"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:760
+#: ../src/Resources.vala:799
 msgid "%d, %Y"
 msgstr "%e. %Y"
 
@@ -3633,11 +3740,12 @@ msgstr "Prezentace"
 
 #. Flagged label and toggle
 #: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
-#: ../src/SearchFilter.vala:990 ../src/library/FlaggedPage.vala:8
+#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
 msgid "Flagged"
 msgstr "Označeno"
 
 #: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
+#: ../src/library/Branch.vala:97
 msgid "Photos"
 msgstr "Fotografie"
 
@@ -3653,28 +3761,37 @@ msgstr "Fotografie RAW"
 msgid "RAW photos"
 msgstr "Fotografie RAW"
 
-#: ../src/SearchFilter.vala:952
+#: ../src/SearchFilter.vala:934
 #, c-format
 msgid "Error loading UI file %s: %s"
 msgstr "Chyba při čtení souboru %s s uživatelským rozhraním: %s"
 
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: ../src/SearchFilter.vala:945
+msgid "Close"
+msgstr "Zavřít"
+
 #. Type label and toggles
-#: ../src/SearchFilter.vala:969
+#: ../src/SearchFilter.vala:951
 msgid "Type"
 msgstr "Typ"
 
 #. Rating label and button
-#: ../src/SearchFilter.vala:1003 ../src/searches/SearchBoolean.vala:184
+#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
 msgid "Rating"
 msgstr "Hodnocení"
 
-#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:182
+#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
 msgid "Settings"
 msgstr "Nastavení"
 
 #. Set up toolbar
 #. add toolbar buttons
-#: ../src/SlideshowPage.vala:161
+#: ../src/SlideshowPage.vala:160
 msgid "Back"
 msgstr "Předchozí"
 
@@ -3682,15 +3799,15 @@ msgstr "Předchozí"
 msgid "Go to the previous photo"
 msgstr "Přejít na předchozí fotografii"
 
-#: ../src/SlideshowPage.vala:168 ../src/SlideshowPage.vala:273
+#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:274
+#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
 msgid "Pause the slideshow"
 msgstr "Pozastavit promítání"
 
-#: ../src/SlideshowPage.vala:175
+#: ../src/SlideshowPage.vala:174
 msgid "Next"
 msgstr "Následující"
 
@@ -3698,20 +3815,20 @@ msgstr "Následující"
 msgid "Go to the next photo"
 msgstr "Přejít na následující fotografii"
 
-#: ../src/SlideshowPage.vala:183
+#: ../src/SlideshowPage.vala:184
 msgid "Change slideshow settings"
 msgstr "Změnit nastavení prezentace"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: ../src/SlideshowPage.vala:237
+#: ../src/SlideshowPage.vala:238
 msgid "All photo source files are missing."
 msgstr "Chybí všechny zdrojové soubory s fotografiemi."
 
-#: ../src/SlideshowPage.vala:269
+#: ../src/SlideshowPage.vala:270
 msgid "Play"
 msgstr "Přehrát"
 
-#: ../src/SlideshowPage.vala:270
+#: ../src/SlideshowPage.vala:271
 msgid "Continue the slideshow"
 msgstr "Pokračovat v promítání"
 
@@ -3720,11 +3837,11 @@ msgid "untitled"
 msgstr "bez názvu"
 
 #. multiple videos
-#: ../src/VideoSupport.vala:486
+#: ../src/VideoSupport.vala:489
 msgid "Export Videos"
 msgstr "Export videí"
 
-#: ../src/camera/Branch.vala:87
+#: ../src/camera/Branch.vala:85
 msgid "Cameras"
 msgstr "Fotoaparáty"
 
@@ -3748,28 +3865,28 @@ msgstr "Zobrazit jen fotografie, které ještě nebyly naimportovány"
 #. prior to import.
 #. TODO: replace this with approved text for "talking to camera,
 #. please wait" once new strings are being accepted.
-#: ../src/camera/ImportPage.vala:845
+#: ../src/camera/ImportPage.vala:847
 msgid "Starting import, please wait..."
 msgstr "Začíná import, čekejte prosím…"
 
-#: ../src/camera/ImportPage.vala:884
+#: ../src/camera/ImportPage.vala:886
 msgid "Import _Selected"
 msgstr "Importovat vy_brané"
 
-#: ../src/camera/ImportPage.vala:885
+#: ../src/camera/ImportPage.vala:887
 msgid "Import the selected photos into your library"
 msgstr "Importovat vybrané fotografie do knihovny"
 
-#: ../src/camera/ImportPage.vala:890
+#: ../src/camera/ImportPage.vala:892
 msgid "Import _All"
 msgstr "Importovat _vše"
 
-#: ../src/camera/ImportPage.vala:891
+#: ../src/camera/ImportPage.vala:893
 msgid "Import all the photos into your library"
 msgstr "Importovat všechny fotografie do knihovny"
 
 #. it's mounted, offer to unmount for the user
-#: ../src/camera/ImportPage.vala:1012
+#: ../src/camera/ImportPage.vala:1014
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it.  Continue?"
@@ -3777,15 +3894,15 @@ msgstr ""
 "Shotwell potřebuje kvůli přístupu odpojit fotoaparát ze souborového systému. "
 "Pokračovat?"
 
-#: ../src/camera/ImportPage.vala:1018
+#: ../src/camera/ImportPage.vala:1020
 msgid "_Unmount"
 msgstr "_Odpojit"
 
-#: ../src/camera/ImportPage.vala:1023
+#: ../src/camera/ImportPage.vala:1025
 msgid "Please unmount the camera."
 msgstr "Odpojte prosím fotoaparát."
 
-#: ../src/camera/ImportPage.vala:1028
+#: ../src/camera/ImportPage.vala:1030
 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 "
@@ -3795,11 +3912,11 @@ msgstr ""
 "který není blokovaný jinou aplikací. Ukončete všechny aplikace, které ho "
 "používají, a zkuste to znovu."
 
-#: ../src/camera/ImportPage.vala:1038
+#: ../src/camera/ImportPage.vala:1040
 msgid "Please close any other application using the camera."
 msgstr "Ukončete prosím ostatní aplikace používající fotoaparát."
 
-#: ../src/camera/ImportPage.vala:1043
+#: ../src/camera/ImportPage.vala:1045
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -3808,25 +3925,25 @@ msgstr ""
 "Nelze načíst náhledy z fotoaparátu:\n"
 "%s"
 
-#: ../src/camera/ImportPage.vala:1060
+#: ../src/camera/ImportPage.vala:1062
 msgid "Unmounting..."
 msgstr "Odpojuje se…"
 
-#: ../src/camera/ImportPage.vala:1166
+#: ../src/camera/ImportPage.vala:1168
 msgid "Fetching photo information"
 msgstr "Získávají se informace o fotografii"
 
-#: ../src/camera/ImportPage.vala:1521
+#: ../src/camera/ImportPage.vala:1523
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Získává se náhled pro %s"
 
-#: ../src/camera/ImportPage.vala:1637
+#: ../src/camera/ImportPage.vala:1639
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Nelze uzamknout fotoaparát: %s"
 
-#: ../src/camera/ImportPage.vala:1722
+#: ../src/camera/ImportPage.vala:1724
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -3834,7 +3951,7 @@ msgstr[0] "Smazat tuto fotografii z fotoaparátu?"
 msgstr[1] "Smazat tyto %d fotografie z fotoaparátu?"
 msgstr[2] "Smazat těchto %d fotografií z fotoaparátu?"
 
-#: ../src/camera/ImportPage.vala:1725
+#: ../src/camera/ImportPage.vala:1727
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -3842,7 +3959,7 @@ msgstr[0] "Smazat toto video z fotoaparátu?"
 msgstr[1] "Smazat tato %d videa z fotoaparátu?"
 msgstr[2] "Smazat těchto %d videí z fotoaparátu?"
 
-#: ../src/camera/ImportPage.vala:1728
+#: ../src/camera/ImportPage.vala:1730
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
@@ -3850,7 +3967,7 @@ msgstr[0] "Smazat tuto fotografii/video z fotoaparátu?"
 msgstr[1] "Smazat tyto %d fotografie/videa z fotoaparátu?"
 msgstr[2] "Smazat těchto %d fotografií/videí z fotoaparátu?"
 
-#: ../src/camera/ImportPage.vala:1731
+#: ../src/camera/ImportPage.vala:1733
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
@@ -3858,11 +3975,11 @@ msgstr[0] "Smazat tento soubor z fotoaparátu?"
 msgstr[1] "Smazat tyto %d soubory z fotoaparátu?"
 msgstr[2] "Smazat těchto %d souborů z fotoaparátu?"
 
-#: ../src/camera/ImportPage.vala:1758
+#: ../src/camera/ImportPage.vala:1760
 msgid "Removing photos/videos from camera"
 msgstr "Odstraňují se fotografie/videa z fotoaparátu"
 
-#: ../src/camera/ImportPage.vala:1762
+#: ../src/camera/ImportPage.vala:1764
 #, 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."
@@ -3909,20 +4026,16 @@ msgid "Database file:"
 msgstr "Databázový soubor:"
 
 #: ../src/data_imports/DataImportsUI.vala:112
-#: ../src/library/LibraryWindow.vala:899
+#: ../src/library/LibraryWindow.vala:883
 msgid "_Import"
 msgstr "_Import"
 
-#: ../src/data_imports/DataImportsUI.vala:216
+#: ../src/data_imports/DataImportsUI.vala:217
 msgid "Import From Application"
 msgstr "Import z aplikace"
 
-#: ../src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "Importovat média _z:"
-
-#: ../src/data_imports/DataImportsUI.vala:394
-#: ../src/publishing/PublishingUI.vala:493
+#: ../src/data_imports/DataImportsUI.vala:369
+#: ../src/publishing/PublishingUI.vala:470
 msgid "_Close"
 msgstr "_Zavřít"
 
@@ -3955,15 +4068,10 @@ msgstr ""
 "Chyba:\n"
 "%s"
 
-#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:352
+#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:336
 msgid "_File"
 msgstr "_Soubor"
 
-#: ../src/direct/DirectPhotoPage.vala:51
-#: ../src/direct/DirectPhotoPage.vala:417
-msgid "_Save"
-msgstr "_Uložit"
-
 #: ../src/direct/DirectPhotoPage.vala:52
 msgid "Save photo"
 msgstr "Uložit fotografii"
@@ -3980,19 +4088,10 @@ msgstr "Uložit fotografii pod jiným názvem"
 msgid "Print the photo to a printer connected to your computer"
 msgstr "Vytisknout fotografii na tiskárně připojené k počítači"
 
-#: ../src/direct/DirectPhotoPage.vala:73 ../src/library/LibraryWindow.vala:356
-msgid "_Edit"
-msgstr "_Upravit"
-
-#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:364
+#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:348
 msgid "_Photo"
 msgstr "_Fotografie"
 
-#: ../src/direct/DirectPhotoPage.vala:169
-#: ../src/library/LibraryWindow.vala:380
-msgid "_Help"
-msgstr "_Nápověda"
-
 #: ../src/direct/DirectPhotoPage.vala:227
 #, c-format
 msgid "%s does not exist."
@@ -4010,26 +4109,26 @@ msgid ""
 "%s."
 msgstr "%s nepodporuje formát %s."
 
-#: ../src/direct/DirectPhotoPage.vala:417
+#: ../src/direct/DirectPhotoPage.vala:422
 msgid "_Save a Copy"
 msgstr "Uložit _kopii"
 
-#: ../src/direct/DirectPhotoPage.vala:420
+#: ../src/direct/DirectPhotoPage.vala:425
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Zahodit změny v %s?"
 
-#: ../src/direct/DirectPhotoPage.vala:421
+#: ../src/direct/DirectPhotoPage.vala:426
 msgid "Close _without Saving"
 msgstr "Zavřít _bez uložení"
 
-#: ../src/direct/DirectPhotoPage.vala:454
+#: ../src/direct/DirectPhotoPage.vala:459
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Chyba při ukládání %s: %s"
 
-#: ../src/direct/DirectPhotoPage.vala:482
-#: ../src/direct/DirectPhotoPage.vala:503
+#: ../src/direct/DirectPhotoPage.vala:487
+#: ../src/direct/DirectPhotoPage.vala:508
 msgid "Save As"
 msgstr "Uložení jako"
 
@@ -4161,6 +4260,10 @@ msgstr "Zvýšení kontrastu"
 msgid "Angle:"
 msgstr "Úhel:"
 
+#: ../src/events/Branch.vala:25
+msgid "Events"
+msgstr "Události"
+
 #: ../src/events/EventDirectoryItem.vala:83
 #, c-format
 msgid "%d Photo/Video"
@@ -4186,8 +4289,8 @@ msgid "No events found"
 msgstr "Nebyly nalezeny žádné události"
 
 #: ../src/events/EventsDirectoryPage.vala:230
-msgid "Events"
-msgstr "Události"
+msgid "All Events"
+msgstr "Všechny události"
 
 #: ../src/events/EventsDirectoryPage.vala:244
 msgid "Undated"
@@ -4205,7 +4308,8 @@ msgstr "%B"
 msgid "Folders"
 msgstr "Složky"
 
-#: ../src/library/Branch.vala:37 ../ui/shotwell.glade.h:33
+#: ../src/library/Branch.vala:30 ../src/library/Branch.vala:130
+#: ../ui/shotwell.glade.h:32
 msgid "Library"
 msgstr "Knihovna"
 
@@ -4213,19 +4317,19 @@ msgstr "Knihovna"
 msgid "Importing..."
 msgstr "Importuje se…"
 
-#: ../src/library/ImportQueuePage.vala:66
+#: ../src/library/ImportQueuePage.vala:67
 msgid "_Stop Import"
 msgstr "Za_stavit import"
 
-#: ../src/library/ImportQueuePage.vala:67
+#: ../src/library/ImportQueuePage.vala:68
 msgid "Stop importing photos"
 msgstr "Zastavit import fotografií"
 
-#: ../src/library/ImportQueuePage.vala:123
+#: ../src/library/ImportQueuePage.vala:124
 msgid "Preparing to import..."
 msgstr "Připravuje se na import…"
 
-#: ../src/library/ImportQueuePage.vala:150
+#: ../src/library/ImportQueuePage.vala:151
 #, c-format
 msgid "Imported %s"
 msgstr "Naimportováno %s"
@@ -4234,100 +4338,100 @@ msgstr "Naimportováno %s"
 msgid "Last Import"
 msgstr "Poslední import"
 
-#: ../src/library/LibraryWindow.vala:301
+#: ../src/library/LibraryWindow.vala:286
 msgid "_Import From Folder..."
 msgstr "_Importovat ze složky…"
 
-#: ../src/library/LibraryWindow.vala:302
+#: ../src/library/LibraryWindow.vala:287
 msgid "Import photos from disk to library"
 msgstr "Importovat fotografie z disku do knihovny"
 
-#: ../src/library/LibraryWindow.vala:309
+#: ../src/library/LibraryWindow.vala:294
 msgid "Import From _Application..."
 msgstr "Importovat z _aplikace…"
 
-#: ../src/library/LibraryWindow.vala:313
+#: ../src/library/LibraryWindow.vala:298
 msgid "Sort _Events"
 msgstr "S_eřadit události"
 
-#: ../src/library/LibraryWindow.vala:323
+#: ../src/library/LibraryWindow.vala:308
 msgid "Empty T_rash"
 msgstr "Vyp_rázdnit koš"
 
-#: ../src/library/LibraryWindow.vala:324
+#: ../src/library/LibraryWindow.vala:309
 msgid "Delete all photos in the trash"
 msgstr "Vymazat všechny fotografie v koši"
 
-#: ../src/library/LibraryWindow.vala:329
+#: ../src/library/LibraryWindow.vala:314
 msgid "View Eve_nt for Photo"
 msgstr "Zobrazit u_dálosti pro fotku"
 
-#: ../src/library/LibraryWindow.vala:334
+#: ../src/library/LibraryWindow.vala:318
 msgid "_Find"
 msgstr "Na_jít"
 
-#: ../src/library/LibraryWindow.vala:335
+#: ../src/library/LibraryWindow.vala:319
 msgid "Find photos and videos by search criteria"
 msgstr "Najít fotografie nebo videa podle zadaných kritérií"
 
-#: ../src/library/LibraryWindow.vala:346 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:195
+#: ../src/library/LibraryWindow.vala:330 ../src/searches/Branch.vala:77
+#: ../src/sidebar/Tree.vala:199
 msgid "Ne_w Saved Search..."
 msgstr "No_vé uložené vyhledávání…"
 
-#: ../src/library/LibraryWindow.vala:368
+#: ../src/library/LibraryWindow.vala:352
 msgid "_Photos"
 msgstr "_Fotografie"
 
-#: ../src/library/LibraryWindow.vala:372
+#: ../src/library/LibraryWindow.vala:356
 msgid "Even_ts"
 msgstr "Událos_ti"
 
-#: ../src/library/LibraryWindow.vala:391
+#: ../src/library/LibraryWindow.vala:375
 msgid "_Basic Information"
 msgstr "_Základní informace"
 
-#: ../src/library/LibraryWindow.vala:392
+#: ../src/library/LibraryWindow.vala:376
 msgid "Display basic information for the selection"
 msgstr "Zobrazit základní informace o vybrané fotografii"
 
-#: ../src/library/LibraryWindow.vala:397
+#: ../src/library/LibraryWindow.vala:381
 msgid "E_xtended Information"
 msgstr "_Rozšiřující informace"
 
-#: ../src/library/LibraryWindow.vala:398
+#: ../src/library/LibraryWindow.vala:382
 msgid "Display extended information for the selection"
 msgstr "Zobrazit více informací o vybrané fotografii"
 
-#: ../src/library/LibraryWindow.vala:403
+#: ../src/library/LibraryWindow.vala:387
 msgid "_Search Bar"
 msgstr "Vy_hledávací lišta"
 
-#: ../src/library/LibraryWindow.vala:404
+#: ../src/library/LibraryWindow.vala:388
 msgid "Display the search bar"
 msgstr "Zobrazit vyhledávací lištu"
 
-#: ../src/library/LibraryWindow.vala:409
+#: ../src/library/LibraryWindow.vala:393
 msgid "S_idebar"
 msgstr "P_ostranní panel"
 
-#: ../src/library/LibraryWindow.vala:410
+#: ../src/library/LibraryWindow.vala:394
 msgid "Display the sidebar"
 msgstr "Zobrazit postranní panel"
 
-#: ../src/library/LibraryWindow.vala:668
+#: ../src/library/LibraryWindow.vala:652
 msgid "Import From Folder"
 msgstr "Import ze složky"
 
-#: ../src/library/LibraryWindow.vala:737
+#: ../src/library/LibraryWindow.vala:721
 msgid "Empty Trash"
 msgstr "Vyprázdnění koše"
 
-#: ../src/library/LibraryWindow.vala:737
+#: ../src/library/LibraryWindow.vala:721
 msgid "Emptying Trash..."
 msgstr "Vyprazdňuje se koš…"
 
-#: ../src/library/LibraryWindow.vala:896
+#: ../src/library/LibraryWindow.vala:880
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4339,34 +4443,34 @@ msgstr ""
 "Doporučujeme to v <span weight=\"bold\">Upravit %s Předvolby</span> změnit.\n"
 "Chcete pokračovat v importu fotografií?"
 
-#: ../src/library/LibraryWindow.vala:899 ../ui/shotwell.glade.h:19
+#: ../src/library/LibraryWindow.vala:883 ../ui/shotwell.glade.h:18
 msgid "Library Location"
 msgstr "Umístění knihovny"
 
 #. TODO: Specify which directory/file.
-#: ../src/library/LibraryWindow.vala:912
+#: ../src/library/LibraryWindow.vala:896
 msgid "Photos cannot be imported from this directory."
 msgstr "Z této složky nemohou být fotografie importovány."
 
-#: ../src/library/LibraryWindow.vala:1200
+#: ../src/library/LibraryWindow.vala:1184
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d %%)"
 
-#: ../src/library/LibraryWindow.vala:1244
-#: ../src/library/LibraryWindow.vala:1255
+#: ../src/library/LibraryWindow.vala:1228
+#: ../src/library/LibraryWindow.vala:1239
 msgid "Updating library..."
 msgstr "Aktualizuje se knihovna…"
 
-#: ../src/library/LibraryWindow.vala:1261
+#: ../src/library/LibraryWindow.vala:1245
 msgid "Preparing to auto-import photos..."
 msgstr "Připravuje se automatický import fotografií…"
 
-#: ../src/library/LibraryWindow.vala:1266
+#: ../src/library/LibraryWindow.vala:1250
 msgid "Auto-importing photos..."
 msgstr "Provádí se automatický import fotografií…"
 
-#: ../src/library/LibraryWindow.vala:1274
+#: ../src/library/LibraryWindow.vala:1258
 msgid "Writing metadata to files..."
 msgstr "Zapisují se metadata do souborů…"
 
@@ -4476,22 +4580,22 @@ msgstr "BMP"
 msgid "JPEG"
 msgstr "JPEG"
 
-#: ../src/photos/JfifSupport.vala:182
+#: ../src/photos/JfifSupport.vala:185
 #, c-format
 msgid "Low (%d%%)"
 msgstr "nízká (%d %%)"
 
-#: ../src/photos/JfifSupport.vala:185
+#: ../src/photos/JfifSupport.vala:188
 #, c-format
 msgid "Medium (%d%%)"
 msgstr "střední (%d %%)"
 
-#: ../src/photos/JfifSupport.vala:188
+#: ../src/photos/JfifSupport.vala:191
 #, c-format
 msgid "High (%d%%)"
 msgstr "vysoká (%d %%)"
 
-#: ../src/photos/JfifSupport.vala:191
+#: ../src/photos/JfifSupport.vala:194
 #, c-format
 msgid "Maximum (%d%%)"
 msgstr "maximální (%d %%)"
@@ -4558,37 +4662,37 @@ msgstr "Získávají se informace o účtu…"
 msgid "Logging in..."
 msgstr "Přihlašuje se…"
 
-#: ../src/publishing/PublishingUI.vala:183
+#: ../src/publishing/PublishingUI.vala:185
 msgid "Publish Photos"
 msgstr "Zveřejnit fotografie"
 
-#: ../src/publishing/PublishingUI.vala:184
+#: ../src/publishing/PublishingUI.vala:186
 msgid "Publish photos _to:"
 msgstr "Zveřejni_t fotografie na"
 
-#: ../src/publishing/PublishingUI.vala:186
+#: ../src/publishing/PublishingUI.vala:188
 msgid "Publish Videos"
 msgstr "Zveřejnit videa"
 
-#: ../src/publishing/PublishingUI.vala:187
+#: ../src/publishing/PublishingUI.vala:189
 msgid "Publish videos _to"
 msgstr "Zveřejni_t videa na"
 
-#: ../src/publishing/PublishingUI.vala:189
+#: ../src/publishing/PublishingUI.vala:191
 msgid "Publish Photos and Videos"
 msgstr "Zveřejnit fotografie a videa"
 
-#: ../src/publishing/PublishingUI.vala:190
+#: ../src/publishing/PublishingUI.vala:192
 msgid "Publish photos and videos _to"
 msgstr "Zveřejni_t fotografie a videa na"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: ../src/publishing/PublishingUI.vala:383
+#: ../src/publishing/PublishingUI.vala:360
 msgid "Unable to publish"
 msgstr "Nelze zveřejnit"
 
-#: ../src/publishing/PublishingUI.vala:384
+#: ../src/publishing/PublishingUI.vala:361
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -4606,123 +4710,139 @@ msgid "Saved Searches"
 msgstr "Uložená hledání"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:168
 msgid "contains"
 msgstr "obsahuje"
 
 #. Ordering must correspond with Context
-#: ../src/searches/SavedSearchDialog.vala:170
-#: ../src/searches/SavedSearchDialog.vala:497
+#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:500
 msgid "is exactly"
 msgstr "je přesně"
 
-#: ../src/searches/SavedSearchDialog.vala:171
+#: ../src/searches/SavedSearchDialog.vala:170
 msgid "starts with"
 msgstr "začíná"
 
-#: ../src/searches/SavedSearchDialog.vala:172
+#: ../src/searches/SavedSearchDialog.vala:171
 msgid "ends with"
 msgstr "končí"
 
-#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:172
 msgid "does not contain"
 msgstr "neobsahuje"
 
-#: ../src/searches/SavedSearchDialog.vala:174
-#: ../src/searches/SavedSearchDialog.vala:501
+#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:504
 msgid "is not set"
 msgstr "není nastaveno"
 
+#: ../src/searches/SavedSearchDialog.vala:174
+msgid "is set"
+msgstr "je nastaveno"
+
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: ../src/searches/SavedSearchDialog.vala:245
-#: ../src/searches/SavedSearchDialog.vala:376
-#: ../src/searches/SavedSearchDialog.vala:441
+#: ../src/searches/SavedSearchDialog.vala:248
+#: ../src/searches/SavedSearchDialog.vala:379
+#: ../src/searches/SavedSearchDialog.vala:444
 msgid "is"
 msgstr "je"
 
-#: ../src/searches/SavedSearchDialog.vala:246
+#: ../src/searches/SavedSearchDialog.vala:249
 msgid "is not"
 msgstr "není"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:252
+#: ../src/searches/SavedSearchDialog.vala:255
 msgid "any photo"
 msgstr "libovolná fotka"
 
-#: ../src/searches/SavedSearchDialog.vala:253
+#: ../src/searches/SavedSearchDialog.vala:256
 msgid "a raw photo"
 msgstr "fotka RAW"
 
-#: ../src/searches/SavedSearchDialog.vala:254
+#: ../src/searches/SavedSearchDialog.vala:257
 msgid "a video"
 msgstr "video"
 
-#: ../src/searches/SavedSearchDialog.vala:308
+#: ../src/searches/SavedSearchDialog.vala:311
 msgid "has"
 msgstr "má"
 
-#: ../src/searches/SavedSearchDialog.vala:309
+#: ../src/searches/SavedSearchDialog.vala:312
 msgid "has no"
 msgstr "nemá"
 
-#: ../src/searches/SavedSearchDialog.vala:314
+#: ../src/searches/SavedSearchDialog.vala:317
 msgid "modifications"
 msgstr "změny"
 
-#: ../src/searches/SavedSearchDialog.vala:315
+#: ../src/searches/SavedSearchDialog.vala:318
 msgid "internal modifications"
 msgstr "interní změny"
 
-#: ../src/searches/SavedSearchDialog.vala:316
+#: ../src/searches/SavedSearchDialog.vala:319
 msgid "external modifications"
 msgstr "externí změny"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:370
+#: ../src/searches/SavedSearchDialog.vala:373
 msgid "flagged"
 msgstr "označeno"
 
-#: ../src/searches/SavedSearchDialog.vala:371
+#: ../src/searches/SavedSearchDialog.vala:374
 msgid "not flagged"
 msgstr "neoznačeno"
 
-#: ../src/searches/SavedSearchDialog.vala:434
+#: ../src/searches/SavedSearchDialog.vala:437
 msgid "and higher"
 msgstr "a více"
 
-#: ../src/searches/SavedSearchDialog.vala:435
+#: ../src/searches/SavedSearchDialog.vala:438
 msgid "only"
 msgstr "jen"
 
-#: ../src/searches/SavedSearchDialog.vala:436
+#: ../src/searches/SavedSearchDialog.vala:439
 msgid "and lower"
 msgstr "a méně"
 
-#: ../src/searches/SavedSearchDialog.vala:498
+#: ../src/searches/SavedSearchDialog.vala:501
 msgid "is after"
 msgstr "je po"
 
-#: ../src/searches/SavedSearchDialog.vala:499
+#: ../src/searches/SavedSearchDialog.vala:502
 msgid "is before"
 msgstr "je před"
 
-#: ../src/searches/SavedSearchDialog.vala:500
+#: ../src/searches/SavedSearchDialog.vala:503
 msgid "is between"
 msgstr "je mezi"
 
-#: ../src/searches/SavedSearchDialog.vala:513
+#: ../src/searches/SavedSearchDialog.vala:516
 msgid "and"
 msgstr "a"
 
-#: ../src/searches/SavedSearchDialog.vala:720
+#: ../src/searches/SavedSearchDialog.vala:697
+msgid "Search"
+msgstr "Hledání"
+
+#: ../src/searches/SavedSearchDialog.vala:702
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: ../src/searches/SavedSearchDialog.vala:703
+msgid "OK"
+msgstr "Budiž"
+
+#: ../src/searches/SavedSearchDialog.vala:721
 msgid "any"
 msgstr "cokoliv"
 
-#: ../src/searches/SavedSearchDialog.vala:721
+#: ../src/searches/SavedSearchDialog.vala:722
 msgid "all"
 msgstr "vše"
 
-#: ../src/searches/SavedSearchDialog.vala:722
+#: ../src/searches/SavedSearchDialog.vala:723
 msgid "none"
 msgstr "nic"
 
@@ -4766,7 +4886,7 @@ msgstr "Stav fotky"
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/sidebar/Tree.vala:199
+#: ../src/sidebar/Tree.vala:203
 msgid "New _Tag..."
 msgstr "Nový š_títek…"
 
@@ -4786,7 +4906,7 @@ msgstr "Žádný"
 msgid "Random"
 msgstr "Náhodně"
 
-#: ../src/tags/Branch.vala:127
+#: ../src/tags/Branch.vala:131
 msgid "Tags"
 msgstr "Štítky"
 
@@ -4825,157 +4945,153 @@ msgid "How long each photo is shown on the desktop background"
 msgstr "Na jak dlouho se má zobrazit jedna fotografie"
 
 #: ../ui/shotwell.glade.h:1
-msgid "Search"
-msgstr "Hledání"
-
-#: ../ui/shotwell.glade.h:2
 msgid "_Name of search:"
 msgstr "_Název hledání:"
 
-#: ../ui/shotwell.glade.h:3
+#: ../ui/shotwell.glade.h:2
 msgid "_Match"
 msgstr "_Shoduje se"
 
-#: ../ui/shotwell.glade.h:4
+#: ../ui/shotwell.glade.h:3
 msgid "of the following:"
 msgstr "z následujícího:"
 
-#: ../ui/shotwell.glade.h:5
+#: ../ui/shotwell.glade.h:4
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Velikost tištěného obrázku</b>"
 
-#: ../ui/shotwell.glade.h:6
+#: ../ui/shotwell.glade.h:5
 msgid "Use a _standard size:"
 msgstr "Použít _standardní velikost:"
 
-#: ../ui/shotwell.glade.h:7
+#: ../ui/shotwell.glade.h:6
 msgid "Use a c_ustom size:"
 msgstr "Použít _vlastní velikost:"
 
-#: ../ui/shotwell.glade.h:8
+#: ../ui/shotwell.glade.h:7
 msgid "_Match photo aspect ratio"
 msgstr "Zachovat po_měr stran"
 
-#: ../ui/shotwell.glade.h:9
+#: ../ui/shotwell.glade.h:8
 msgid "_Autosize:"
 msgstr "_Automatická velikost:"
 
-#: ../ui/shotwell.glade.h:10
+#: ../ui/shotwell.glade.h:9
 msgid "<b>Titles</b>"
 msgstr "<b>Názvy</b>"
 
-#: ../ui/shotwell.glade.h:11
+#: ../ui/shotwell.glade.h:10
 msgid "Print image _title"
 msgstr "Tisknout _název obrázku"
 
-#: ../ui/shotwell.glade.h:12
+#: ../ui/shotwell.glade.h:11
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Rozlišení</b>"
 
-#: ../ui/shotwell.glade.h:13
+#: ../ui/shotwell.glade.h:12
 msgid "_Output photo at:"
 msgstr "Vytiskn_out v rozlišení:"
 
-#: ../ui/shotwell.glade.h:14
+#: ../ui/shotwell.glade.h:13
 msgid "pixels per inch"
 msgstr "bodů na palec"
 
-#: ../ui/shotwell.glade.h:16
+#: ../ui/shotwell.glade.h:15
 msgid "Shotwell Preferences"
 msgstr "Předvolby Shotwell"
 
-#: ../ui/shotwell.glade.h:17
+#: ../ui/shotwell.glade.h:16
 msgid "white"
 msgstr "bílé"
 
-#: ../ui/shotwell.glade.h:18
+#: ../ui/shotwell.glade.h:17
 msgid "black"
 msgstr "černé"
 
-#: ../ui/shotwell.glade.h:20
+#: ../ui/shotwell.glade.h:19
 msgid "_Watch library directory for new files"
 msgstr "S_ledovat, jestli nejsou do knihovny přidány nové soubory"
 
-#: ../ui/shotwell.glade.h:21
+#: ../ui/shotwell.glade.h:20
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../ui/shotwell.glade.h:22
+#: ../ui/shotwell.glade.h:21
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "Zapisovat štítky, názvy a další _metadata do souborů s fotografiemi"
 
-#: ../ui/shotwell.glade.h:23
+#: ../ui/shotwell.glade.h:22
 msgid "Display"
 msgstr "Zobrazení"
 
-#: ../ui/shotwell.glade.h:24
+#: ../ui/shotwell.glade.h:23
 msgid "_Import photos to:"
 msgstr "_Importovat fotografie do:"
 
-#: ../ui/shotwell.glade.h:25
+#: ../ui/shotwell.glade.h:24
 msgid "_Background:"
 msgstr "_Pozadí:"
 
-#: ../ui/shotwell.glade.h:26
+#: ../ui/shotwell.glade.h:25
 msgid "Importing"
 msgstr "Import"
 
-#: ../ui/shotwell.glade.h:27
+#: ../ui/shotwell.glade.h:26
 msgid "_Directory structure:"
 msgstr "Struktura _složek:"
 
-#: ../ui/shotwell.glade.h:28
+#: ../ui/shotwell.glade.h:27
 msgid "_Pattern:"
 msgstr "_Vzor:"
 
-#: ../ui/shotwell.glade.h:29
+#: ../ui/shotwell.glade.h:28
 msgid "Example:"
 msgstr "Příklad:"
 
-#: ../ui/shotwell.glade.h:30
+#: ../ui/shotwell.glade.h:29
 msgid "R_ename imported files to lowercase"
 msgstr "Př_evádět názvy importovaných souborů na malá písmena"
 
-#: ../ui/shotwell.glade.h:31
+#: ../ui/shotwell.glade.h:30
 msgid "RAW Developer"
 msgstr "Vývojka RAW"
 
-#: ../ui/shotwell.glade.h:32
+#: ../ui/shotwell.glade.h:31
 msgid "De_fault:"
 msgstr "_Výchozí:"
 
-#: ../ui/shotwell.glade.h:34
+#: ../ui/shotwell.glade.h:33
 msgid "E_xternal photo editor:"
 msgstr "E_xterní editor fotografií:"
 
-#: ../ui/shotwell.glade.h:35
+#: ../ui/shotwell.glade.h:34
 msgid "External _RAW editor:"
 msgstr "Externí editor _RAW:"
 
-#: ../ui/shotwell.glade.h:36
+#: ../ui/shotwell.glade.h:35
 msgid "External Editors"
 msgstr "Externí editory"
 
-#: ../ui/shotwell.glade.h:37
+#: ../ui/shotwell.glade.h:36
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
-#: ../ui/shotwell.glade.h:38
+#: ../ui/shotwell.glade.h:37
 msgid "_Delay:"
 msgstr "_Doba zobrazení:"
 
-#: ../ui/shotwell.glade.h:39
+#: ../ui/shotwell.glade.h:38
 msgid "_Transition effect:"
 msgstr "Efek_t přechodu:"
 
-#: ../ui/shotwell.glade.h:40
+#: ../ui/shotwell.glade.h:39
 msgid "Transition d_elay:"
 msgstr "Trvání př_echodu:"
 
-#: ../ui/shotwell.glade.h:41
+#: ../ui/shotwell.glade.h:40
 msgid "Show t_itle"
 msgstr "Zobrazovat n_ázev"
 
-#: ../ui/shotwell.glade.h:42
+#: ../ui/shotwell.glade.h:41
 msgid "seconds"
 msgstr "vteřin"
diff --git a/po/de.po b/po/de.po
index 0521bc5..df1eaf3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -44,8 +44,8 @@ msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2014-10-06 10:55+0000\n"
-"PO-Revision-Date: 2014-10-06 16:40+0100\n"
+"POT-Creation-Date: 2014-10-06 10:54+0000\n"
+"PO-Revision-Date: 2014-10-06 16:46+0100\n"
 "Last-Translator: Wolfgang Stoeggl <c72578@yahoo.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/shotwell/language/"
 "de/)\n"
@@ -229,20 +229,28 @@ msgstr ""
 "Flowplayer unterstützt werden."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1774
-msgid "A file required for publishing is unavailable. Publishing to "
+#, c-format
+msgid ""
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
 msgstr ""
-"Eine zur Veröffentlichung benötigte Datei ist nicht verfügbar. "
-"Veröffentlichen nach "
+"Eine Datei, die veröffentlicht werden soll, ist nicht verfügbar. Die "
+"Veröffentlichung auf %s ist nicht möglich."
 
 #. populate any widgets whose contents are
 #. programmatically-generated
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
 #, c-format
 msgid "Publishing to %s as %s."
 msgstr "Veröffentlichung nach »%s« als »%s«"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1816
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+msgid "A file required for publishing is unavailable. Publishing to "
+msgstr ""
+"Eine zur Veröffentlichung benötigte Datei ist nicht verfügbar. "
+"Veröffentlichen nach "
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
 msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
@@ -251,7 +259,7 @@ msgstr ""
 "Benutzernamen und Kennwort (oder API-Schlüssel) für das mir Ihrer Bibliothek "
 "verbundene Gallery3-Benutzerkonto."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
 msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
@@ -260,7 +268,7 @@ msgstr ""
 "zu versuchen, geben Sie Ihren Benutzernamen und Ihr Passwort unterhalb "
 "erneut ein."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
 msgid ""
 "The URL entered does not appear to be the main directory of a Gallery3 "
 "instance. Please make sure you typed it correctly and it does not have any "
@@ -270,11 +278,11 @@ msgstr ""
 "Instanz zu sein. Bitte stellen Sie sicher, dass Sie sie korrekt eingegeben "
 "haben und dass Sie keine nachfolgenden Bestandteile haben (z.B.: index.php)."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1871
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
 msgid "Unrecognized User"
 msgstr "Unbekannter Benutzer"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1876
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
 msgid " Site Not Found"
 msgstr "Seite nicht gefunden"
 
@@ -388,13 +396,13 @@ msgid "Copyright 2012 BJA Electronics"
 msgstr "Copyright 2012 BJA Electronics"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1229
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
 msgid "500 x 375 pixels"
 msgstr "500 x 375 Pixel"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1230
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
 msgid "1024 x 768 pixels"
 msgstr "1024 x 768 Pixel"
@@ -525,7 +533,7 @@ msgid "pixels"
 msgstr "Pixel"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
 #: ../src/Dimensions.vala:17
 msgid "Original size"
@@ -669,12 +677,12 @@ msgid "Upload _size:"
 msgstr "_Größe zum Hochladen:"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
 msgid "Just me"
 msgstr "Nur mich"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
 msgid "Everyone"
 msgstr "Alle"
@@ -728,50 +736,57 @@ msgstr ""
 "Sie sind bei Flickr als %s angemeldet.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
 #, 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 ""
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"Ihr kostenloses Flickr-Konto ist auf ein monatliches Upload-Volumen "
+"limitiert.\n"
+"Diesen Monat können Sie noch %d Megabyte hochladen."
+msgstr[1] ""
 "Ihr kostenloses Flickr-Konto ist auf ein monatliches Upload-Volumen "
 "limitiert.\n"
 "Diesen Monat können Sie noch %d Megabyte hochladen."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1157
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Ihr Flickr-Pro-Konto erlaubt unbeschränkte Uploads."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1162
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
 msgid "Photos _visible to:"
 msgstr "Fotos _sichtbar für:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
 msgid "Videos _visible to:"
 msgstr "Videos _sichtbar für:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
 msgid "Photos and videos _visible to:"
 msgstr "Fotos und Videos _sichtbar für:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
 msgid "Friends & family only"
 msgstr "Nur Freunde und Familie"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
 msgid "Family only"
 msgstr "Nur Familie"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Friends only"
 msgstr "Nur Freunde"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
 msgid "2048 x 1536 pixels"
 msgstr "2048 x 1536 Pixel"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
 msgid "4096 x 3072 pixels"
 msgstr "4096 x 3072 Pixel"
@@ -1010,7 +1025,7 @@ msgid "Logout"
 msgstr "Ausloggen"
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:268
+#: ../src/Resources.vala:270
 msgid "Publish"
 msgstr "Veröffentlichen"
 
@@ -1138,7 +1153,7 @@ msgstr "_Ein Problem melden …"
 
 #: ../src/AppWindow.vala:624 ../src/AppWindow.vala:645
 #: ../src/AppWindow.vala:662 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1417 ../src/Dialogs.vala:1440
+#: ../src/Dialogs.vala:1422 ../src/Dialogs.vala:1445
 #: ../src/data_imports/DataImportsUI.vala:399
 #: ../src/publishing/PublishingUI.vala:498
 msgid "_Cancel"
@@ -1487,9 +1502,9 @@ msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
 msgstr[0] "Dies wird den Tag »%s« von einem Foto entfernen. Fortsetzen?"
 msgstr[1] "Dies wird den Tag »%s« von %d Fotos entfernen. Fortsetzen?"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1385
-#: ../src/Resources.vala:328 ../src/Resources.vala:376
-#: ../src/Resources.vala:641
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1390
+#: ../src/Resources.vala:336 ../src/Resources.vala:384
+#: ../src/Resources.vala:649
 msgid "_Delete"
 msgstr "_Löschen"
 
@@ -2003,49 +2018,52 @@ msgstr "Ereignis umbenennen"
 msgid "Name:"
 msgstr "Name:"
 
-#: ../src/Dialogs.vala:1329 ../src/Resources.vala:272
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1330 ../src/Resources.vala:275
 msgid "Edit Title"
 msgstr "Titel bearbeiten"
 
-#: ../src/Dialogs.vala:1329 ../src/Properties.vala:340
+#: ../src/Dialogs.vala:1331 ../src/Properties.vala:340
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../src/Dialogs.vala:1343 ../src/Resources.vala:278
+#. Dialog title
+#: ../src/Dialogs.vala:1347 ../src/Resources.vala:282
 msgid "Edit Event Comment"
 msgstr "Bearbeite Kommentar des Ereignisses"
 
-#: ../src/Dialogs.vala:1343
+#: ../src/Dialogs.vala:1348
 msgid "Edit Photo/Video Comment"
 msgstr "Foto-/Video-Kommentar bearbeiten"
 
-#: ../src/Dialogs.vala:1344 ../src/Properties.vala:630
+#: ../src/Dialogs.vala:1349 ../src/Properties.vala:630
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../src/Dialogs.vala:1360
+#: ../src/Dialogs.vala:1365
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Datei entfernen und _löschen"
 msgstr[1] "Dateien entfernen und _löschen"
 
-#: ../src/Dialogs.vala:1364
+#: ../src/Dialogs.vala:1369
 msgid "_Remove From Library"
 msgstr "Aus der Bibliothek _entfernen"
 
-#: ../src/Dialogs.vala:1384 ../src/camera/ImportPage.vala:1739
+#: ../src/Dialogs.vala:1389 ../src/camera/ImportPage.vala:1739
 msgid "_Keep"
 msgstr "_Behalten"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1412
 msgid "Revert External Edit?"
 msgstr "Externe Veränderung zurücknehmen?"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1412
 msgid "Revert External Edits?"
 msgstr "Externe Veränderungen zurücknehmen?"
 
-#: ../src/Dialogs.vala:1409
+#: ../src/Dialogs.vala:1414
 #, c-format
 msgid "This will destroy all changes made to the external file.  Continue?"
 msgid_plural ""
@@ -2055,87 +2073,87 @@ msgstr[0] ""
 msgstr[1] ""
 "Dies wird alle Veränderungen der %d externen Dateien zerstören. Fortfahren?"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1418
 msgid "Re_vert External Edit"
 msgstr "Externe _Veränderung zurücknehmen"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1418
 msgid "Re_vert External Edits"
 msgstr "Externe _Veränderungen zurücknehmen"
 
-#: ../src/Dialogs.vala:1434
+#: ../src/Dialogs.vala:1439
 #, 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] "Dies wird das Foto aus der Bibliothek entfernen. Fortsetzen?"
 msgstr[1] "Dies wird %d Fotos aus der Bibliothek entfernen. Fortsetzen?"
 
-#: ../src/Dialogs.vala:1441
+#: ../src/Dialogs.vala:1446
 msgid "_Remove"
 msgstr "Entfe_rnen"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1447
 msgid "Remove Photo From Library"
 msgstr "Foto aus der Bibliothek entfernen"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1447
 msgid "Remove Photos From Library"
 msgstr "Fotos aus der Bibliothek entfernen"
 
-#: ../src/Dialogs.vala:1535
+#: ../src/Dialogs.vala:1540
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1682
+#: ../src/Dialogs.vala:1687
 msgid "AM"
 msgstr "Vormittag"
 
-#: ../src/Dialogs.vala:1683
+#: ../src/Dialogs.vala:1688
 msgid "PM"
 msgstr "Nachmittag"
 
-#: ../src/Dialogs.vala:1684
+#: ../src/Dialogs.vala:1689
 msgid "24 Hr"
 msgstr "24 Stunden"
 
-#: ../src/Dialogs.vala:1699
+#: ../src/Dialogs.vala:1704
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Versetze Fotos/Videos gleich viel"
 
-#: ../src/Dialogs.vala:1704
+#: ../src/Dialogs.vala:1709
 msgid "Set _all photos/videos to this time"
 msgstr "Setze Zeit für _alle Fotos/Videos"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1716
 msgid "_Modify original photo file"
 msgstr "Original Bilddatei _verändern"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1716
 msgid "_Modify original photo files"
 msgstr "Original Bilddateien _verändern"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1719
 msgid "_Modify original file"
 msgstr "Originale _Bearbeiten"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1719
 msgid "_Modify original files"
 msgstr "_Verändere Originaldateien"
 
-#: ../src/Dialogs.vala:1800
+#: ../src/Dialogs.vala:1805
 msgid "Original: "
 msgstr "Ursprüngliche Größe:"
 
-#: ../src/Dialogs.vala:1801
+#: ../src/Dialogs.vala:1806
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d.%m.%Y, %H:%M:%S"
 
-#: ../src/Dialogs.vala:1802
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d.%m.%Y, %I:%M:%S %p"
 
-#: ../src/Dialogs.vala:1891
+#: ../src/Dialogs.vala:1896
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -2144,7 +2162,7 @@ msgstr ""
 "Aufnahmezeit wird um \n"
 "%d %s, %d %s, %d %s, und %d %s nach vorne verlegt."
 
-#: ../src/Dialogs.vala:1892
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2153,31 +2171,31 @@ msgstr ""
 "Aufnahmezeit wird um \n"
 "%d %s, %d %s, %d %s, und %d %s nach hinten verlegt."
 
-#: ../src/Dialogs.vala:1894
+#: ../src/Dialogs.vala:1899
 msgid "day"
 msgid_plural "days"
 msgstr[0] "Tag"
 msgstr[1] "Tage"
 
-#: ../src/Dialogs.vala:1895
+#: ../src/Dialogs.vala:1900
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "Stunde"
 msgstr[1] "Stunden"
 
-#: ../src/Dialogs.vala:1896
+#: ../src/Dialogs.vala:1901
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "Minute"
 msgstr[1] "Minuten"
 
-#: ../src/Dialogs.vala:1897
+#: ../src/Dialogs.vala:1902
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "Sekunde"
 msgstr[1] "Sekunden"
 
-#: ../src/Dialogs.vala:1941
+#: ../src/Dialogs.vala:1946
 #, c-format
 msgid ""
 "\n"
@@ -2196,50 +2214,50 @@ msgstr[1] ""
 "\n"
 "Und %d andere."
 
-#: ../src/Dialogs.vala:1963 ../src/Dialogs.vala:1990
+#: ../src/Dialogs.vala:1968 ../src/Dialogs.vala:1995
 msgid "Tags (separated by commas):"
 msgstr "Tags (getrennt durch Kommas)"
 
-#: ../src/Dialogs.vala:2070
+#: ../src/Dialogs.vala:2075
 msgid "Welcome!"
 msgstr "Willkommen!"
 
-#: ../src/Dialogs.vala:2077
+#: ../src/Dialogs.vala:2082
 msgid "Welcome to Shotwell!"
 msgstr "Willkommen zu Shotwell!"
 
-#: ../src/Dialogs.vala:2081
+#: ../src/Dialogs.vala:2086
 msgid "To get started, import photos in any of these ways:"
 msgstr "Importieren Sie Fotos auf eine der folgenden Arten, um loszulegen:"
 
-#: ../src/Dialogs.vala:2100
+#: ../src/Dialogs.vala:2105
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr ""
 "Wählen Sie <span weight=\"bold\">Datei %s Aus Ordner importieren</span>"
 
-#: ../src/Dialogs.vala:2101
+#: ../src/Dialogs.vala:2106
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Verschieben Sie Fotos per Ziehen und Ablegen in das Shotwell-Fenster"
 
-#: ../src/Dialogs.vala:2102
+#: ../src/Dialogs.vala:2107
 msgid "Connect a camera to your computer and import"
 msgstr "Verbinden Sie die Kamera mit Ihrem Computer und importieren Sie"
 
-#: ../src/Dialogs.vala:2112
+#: ../src/Dialogs.vala:2117
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "Fotos aus dem Ordner »%s« _importieren"
 
-#: ../src/Dialogs.vala:2119
+#: ../src/Dialogs.vala:2124
 msgid "You can also import photos in any of these ways:"
 msgstr "Sie können Fotos auch auf eine der folgenden Weisen importieren:"
 
-#: ../src/Dialogs.vala:2129
+#: ../src/Dialogs.vala:2134
 msgid "_Don't show this message again"
 msgstr "Diese Meldung nicht noch einmal _zeigen"
 
-#: ../src/Dialogs.vala:2164
+#: ../src/Dialogs.vala:2169
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Importiere Bilder aus der %s Bibliothek"
@@ -2247,41 +2265,41 @@ msgstr "Importiere Bilder aus der %s Bibliothek"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2308 ../src/Dialogs.vala:2312
+#: ../src/Dialogs.vala:2313 ../src/Dialogs.vala:2317
 msgid "(Help)"
 msgstr "(Hilfe)"
 
-#: ../src/Dialogs.vala:2321
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Jahr%sMonat%sTag"
 
-#: ../src/Dialogs.vala:2323
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth"
 msgstr "Jahr%sMonat"
 
-#: ../src/Dialogs.vala:2325
+#: ../src/Dialogs.vala:2330
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Jahr%sMonat-Tag"
 
-#: ../src/Dialogs.vala:2327
+#: ../src/Dialogs.vala:2332
 msgid "Year-Month-Day"
 msgstr "Jahr-Monat-Tag"
 
-#: ../src/Dialogs.vala:2328 ../src/editing_tools/EditingTools.vala:781
+#: ../src/Dialogs.vala:2333 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2565
+#: ../src/Dialogs.vala:2570
 msgid "Invalid pattern"
 msgstr "Ungültiges Muster"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: ../src/Dialogs.vala:2668
+#: ../src/Dialogs.vala:2673
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2289,31 +2307,31 @@ msgstr ""
 "Shotwell kann die Fotos aus dem Ordner in die Bibliothek kopieren oder sie "
 "können verlinkt werden, ohne sie zu kopieren."
 
-#: ../src/Dialogs.vala:2673
+#: ../src/Dialogs.vala:2678
 msgid "Co_py Photos"
 msgstr "Fotos ko_pieren"
 
-#: ../src/Dialogs.vala:2674
+#: ../src/Dialogs.vala:2679
 msgid "_Import in Place"
 msgstr "_Import durch Verlinken"
 
-#: ../src/Dialogs.vala:2675
+#: ../src/Dialogs.vala:2680
 msgid "Import to Library"
 msgstr "In Bibliothek importieren"
 
-#: ../src/Dialogs.vala:2685 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2690 ../src/PhotoPage.vala:3086
 msgid "Remove From Library"
 msgstr "Aus Bibliothek entfernen"
 
-#: ../src/Dialogs.vala:2686 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2691 ../src/PhotoPage.vala:3086
 msgid "Removing Photo From Library"
 msgstr "Foto wird aus Bibliothek entfernt"
 
-#: ../src/Dialogs.vala:2686
+#: ../src/Dialogs.vala:2691
 msgid "Removing Photos From Library"
 msgstr "Fotos werden aus Bibliothek entfernt"
 
-#: ../src/Dialogs.vala:2700
+#: ../src/Dialogs.vala:2705
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -2336,7 +2354,7 @@ msgstr[1] ""
 "\n"
 "Diese Aktion kann nicht rückgängig gemacht werden!"
 
-#: ../src/Dialogs.vala:2704
+#: ../src/Dialogs.vala:2709
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -2359,7 +2377,7 @@ msgstr[1] ""
 "\n"
 "Diese Aktion kann nicht rückgängig gemacht werden!"
 
-#: ../src/Dialogs.vala:2708
+#: ../src/Dialogs.vala:2713
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -2382,7 +2400,7 @@ msgstr[1] ""
 "\n"
 "Diese Aktion kann nicht rückgängig gemacht werden!"
 
-#: ../src/Dialogs.vala:2740
+#: ../src/Dialogs.vala:2745
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -2396,7 +2414,7 @@ msgstr[1] ""
 "löschen?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2757
+#: ../src/Dialogs.vala:2762
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -3245,353 +3263,359 @@ msgstr "Alle Fotos einschließlich abgelehnter anzeigen"
 msgid "_All Photos"
 msgstr "_Alle Fotos"
 
-#: ../src/Resources.vala:249 ../src/Resources.vala:250
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:250 ../src/Resources.vala:252
 msgid "Show all photos"
 msgstr "Alle Fotos anzeigen"
 
-#: ../src/Resources.vala:252
+#: ../src/Resources.vala:254
 msgid "_Ratings"
 msgstr "_Bewertungen"
 
-#: ../src/Resources.vala:253
+#: ../src/Resources.vala:255
 msgid "Display each photo's rating"
 msgstr "Bewertung jedes Fotos anzeigen"
 
-#: ../src/Resources.vala:255
+#: ../src/Resources.vala:257
 msgid "_Filter Photos"
 msgstr "Fotos _filtern"
 
-#: ../src/Resources.vala:256
+#: ../src/Resources.vala:258
 msgid "Filter Photos"
 msgstr "Fotos filtern"
 
-#: ../src/Resources.vala:257
+#: ../src/Resources.vala:259
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Angezeigte Fotos anhand eines Filter einschränken"
 
-#: ../src/Resources.vala:259
+#: ../src/Resources.vala:261
 msgid "_Duplicate"
 msgstr "_Duplizieren"
 
-#: ../src/Resources.vala:260
+#: ../src/Resources.vala:262
 msgid "Duplicate"
 msgstr "Duplizieren"
 
-#: ../src/Resources.vala:261
+#: ../src/Resources.vala:263
 msgid "Make a duplicate of the photo"
 msgstr "Duplikat dieses Fotos erstellen"
 
-#: ../src/Resources.vala:263
+#: ../src/Resources.vala:265
 msgid "_Export..."
 msgstr "_Exportieren …"
 
-#: ../src/Resources.vala:265
+#: ../src/Resources.vala:267
 msgid "_Print..."
 msgstr "_Drucken …"
 
-#: ../src/Resources.vala:267
+#: ../src/Resources.vala:269
 msgid "Pu_blish..."
 msgstr "_Veröffentlichen …"
 
-#: ../src/Resources.vala:269
+#: ../src/Resources.vala:271
 msgid "Publish to various websites"
 msgstr "Das ausgewählte Foto auf verschiedenen Websites veröffentlichen"
 
-#: ../src/Resources.vala:271
+#: ../src/Resources.vala:273
 msgid "Edit _Title..."
 msgstr "_Titel bearbeiten"
 
-#: ../src/Resources.vala:274
+#: ../src/Resources.vala:277
 msgid "Edit _Comment..."
 msgstr "_Kommentar bearbeiten …"
 
-#: ../src/Resources.vala:275
+#. Button label
+#: ../src/Resources.vala:279
 msgid "Edit Comment"
 msgstr "Kommentar bearbeiten"
 
-#: ../src/Resources.vala:277
+#: ../src/Resources.vala:281
 msgid "Edit Event _Comment..."
 msgstr "Bearbeite _Kommentar des Ereignisses"
 
-#: ../src/Resources.vala:280
+#: ../src/Resources.vala:284
 msgid "_Adjust Date and Time..."
 msgstr "Datum und Zeit _anpassen …"
 
-#: ../src/Resources.vala:281
+#: ../src/Resources.vala:285
 msgid "Adjust Date and Time"
 msgstr "Datum und Zeit anpassen"
 
-#: ../src/Resources.vala:283
+#: ../src/Resources.vala:287
 msgid "Add _Tags..."
 msgstr "_Tags hinzufügen …"
 
-#: ../src/Resources.vala:284
+#: ../src/Resources.vala:288
 msgid "_Add Tags..."
 msgstr "_Tags hinzufügen …"
 
-#: ../src/Resources.vala:285 ../src/Resources.vala:316
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:290 ../src/Resources.vala:323
 msgid "Add Tags"
 msgstr "Tags hinzufügen"
 
-#: ../src/Resources.vala:287
+#: ../src/Resources.vala:292
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../src/Resources.vala:289
+#: ../src/Resources.vala:294
 msgid "Open With E_xternal Editor"
 msgstr "Mit e_xternen Editor öffnen"
 
-#: ../src/Resources.vala:291
+#: ../src/Resources.vala:296
 msgid "Open With RA_W Editor"
 msgstr "Mit RA_W-Editor öffnen"
 
-#: ../src/Resources.vala:293
+#: ../src/Resources.vala:298
 msgid "Send _To..."
 msgstr "_Senden an …"
 
-#: ../src/Resources.vala:294
+#: ../src/Resources.vala:299
 msgid "Send T_o..."
 msgstr "Senden _An"
 
-#: ../src/Resources.vala:296
+#: ../src/Resources.vala:301
 msgid "_Find..."
 msgstr "_Suchen …"
 
-#: ../src/Resources.vala:297
+#: ../src/Resources.vala:302
 msgid "Find"
 msgstr "Suchen"
 
-#: ../src/Resources.vala:298
+#: ../src/Resources.vala:303
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Ein Bild durch Eingabe von Text suchen, der im Namen oder in den Tags "
 "enthalten ist"
 
-#: ../src/Resources.vala:300
+#: ../src/Resources.vala:305
 msgid "_Flag"
 msgstr "_Markieren"
 
-#: ../src/Resources.vala:302
+#: ../src/Resources.vala:307
 msgid "Un_flag"
 msgstr "Markierung au_fheben"
 
-#: ../src/Resources.vala:305
+#: ../src/Resources.vala:310
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Editor kann nicht gestartet werden: %s"
 
-#: ../src/Resources.vala:310
+#: ../src/Resources.vala:315
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "Tag »%s« hinzufügen"
 
-#: ../src/Resources.vala:312
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:318
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "Tags »%s« und »%s« hinzufügen"
 
-#: ../src/Resources.vala:320
+#: ../src/Resources.vala:328
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "Tag »%s« _entfernen"
 
-#: ../src/Resources.vala:324
+#: ../src/Resources.vala:332
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "Tag »%s« entfernen"
 
-#: ../src/Resources.vala:327
+#: ../src/Resources.vala:335
 msgid "Delete Tag"
 msgstr "Tag entfernen"
 
-#: ../src/Resources.vala:330
+#: ../src/Resources.vala:338
 msgid "_New"
 msgstr "_Neu"
 
-#: ../src/Resources.vala:333
+#: ../src/Resources.vala:341
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "Tag »%s« _umbenennen …"
 
-#: ../src/Resources.vala:337
+#: ../src/Resources.vala:345
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "Tag »%s« zu »%s« umbenennen"
 
-#: ../src/Resources.vala:340
+#: ../src/Resources.vala:348
 msgid "_Rename..."
 msgstr "_Umbenennen"
 
-#: ../src/Resources.vala:342
+#: ../src/Resources.vala:350
 msgid "Modif_y Tags..."
 msgstr "Tags _ändern …"
 
-#: ../src/Resources.vala:343
+#: ../src/Resources.vala:351
 msgid "Modify Tags"
 msgstr "Tags ändern"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:354
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Foto als »%s« taggen"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:354
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Fotos als »%s« taggen"
 
-#: ../src/Resources.vala:350
+#: ../src/Resources.vala:358
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "Ausgewähltes Foto als »%s« taggen"
 
-#: ../src/Resources.vala:351
+#: ../src/Resources.vala:359
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "Ausgewählte Fotos als »%s« taggen"
 
-#: ../src/Resources.vala:355
+#: ../src/Resources.vala:363
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "Tag »%s« von _Foto entfernen"
 
-#: ../src/Resources.vala:356
+#: ../src/Resources.vala:364
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "Tag »%s« von _Fotos entfernen"
 
-#: ../src/Resources.vala:360
+#: ../src/Resources.vala:368
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "Tag »%s« von Foto entfernen"
 
-#: ../src/Resources.vala:361
+#: ../src/Resources.vala:369
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "Tag »%s« von Fotos entfernen"
 
-#: ../src/Resources.vala:365
+#: ../src/Resources.vala:373
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr ""
 "Tag kann nicht zu »%s« umbenannt werden, weil ein entsprechender Tag bereits "
 "vorhanden ist."
 
-#: ../src/Resources.vala:369
+#: ../src/Resources.vala:377
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr ""
 "Die Suche kann nicht nach »%s« umbenannt werden, weil die Suche bereits "
 "vorhanden ist."
 
-#: ../src/Resources.vala:372
+#: ../src/Resources.vala:380
 msgid "Saved Search"
 msgstr "Gespeicherte Suche"
 
-#: ../src/Resources.vala:374
+#: ../src/Resources.vala:382
 msgid "Delete Search"
 msgstr "Suche löschen"
 
-#: ../src/Resources.vala:377
+#: ../src/Resources.vala:385
 msgid "_Edit..."
 msgstr "_Bearbeiten …"
 
-#: ../src/Resources.vala:378
+#: ../src/Resources.vala:386
 msgid "Re_name..."
 msgstr "_Umbenennen …"
 
-#: ../src/Resources.vala:381
+#: ../src/Resources.vala:389
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "Suche »%s« zu »%s« umbenennen"
 
-#: ../src/Resources.vala:385
+#: ../src/Resources.vala:393
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "Suche »%s« löschen"
 
-#: ../src/Resources.vala:543
+#: ../src/Resources.vala:551
 #, c-format
 msgid "Rate %s"
 msgstr "%s bewerten"
 
-#: ../src/Resources.vala:544
+#: ../src/Resources.vala:552
 #, c-format
 msgid "Set rating to %s"
 msgstr "Mit %s bewerten"
 
-#: ../src/Resources.vala:545
+#: ../src/Resources.vala:553
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Wird mit %s bewertet"
 
-#: ../src/Resources.vala:547
+#: ../src/Resources.vala:555
 #, c-format
 msgid "Display %s"
 msgstr "Anzeige %s"
 
-#: ../src/Resources.vala:548
+#: ../src/Resources.vala:556
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Nur Fotos mit einer Bewertung von %s anzeigen"
 
-#: ../src/Resources.vala:549
+#: ../src/Resources.vala:557
 #, c-format
 msgid "%s or Better"
 msgstr "%s oder besser"
 
-#: ../src/Resources.vala:550
+#: ../src/Resources.vala:558
 #, c-format
 msgid "Display %s or Better"
 msgstr "%s oder besser anzeigen"
 
-#: ../src/Resources.vala:551
+#: ../src/Resources.vala:559
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Nur Fotos mit einer Bewertung von %s oder besser anzeigen"
 
-#: ../src/Resources.vala:642
+#: ../src/Resources.vala:650
 msgid "Remove the selected photos from the trash"
 msgstr "Ausgewählte Fotos aus dem Müll entfernen"
 
-#: ../src/Resources.vala:643
+#: ../src/Resources.vala:651
 msgid "Remove the selected photos from the library"
 msgstr "Die ausgewählten Fotos aus der Bibliothek entfernen"
 
-#: ../src/Resources.vala:645
+#: ../src/Resources.vala:653
 msgid "_Restore"
 msgstr "_Wiederherstellen"
 
-#: ../src/Resources.vala:646
+#: ../src/Resources.vala:654
 msgid "Move the selected photos back into the library"
 msgstr "Die ausgewählten Bilder zurück in die Bibliothek verschieben"
 
-#: ../src/Resources.vala:648
+#: ../src/Resources.vala:656
 msgid "Show in File Mana_ger"
 msgstr "Mit der Dateiverwaltung öffnen"
 
-#: ../src/Resources.vala:649
+#: ../src/Resources.vala:657
 msgid "Open the selected photo's directory in the file manager"
 msgstr "Den Speicherort des ausgewählten Fotos in der Dateiverwaltung öffnen"
 
-#: ../src/Resources.vala:652
+#: ../src/Resources.vala:660
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Konnte Speicherort nicht in der Dateiverwaltung öffnen: %s"
 
-#: ../src/Resources.vala:655
+#: ../src/Resources.vala:663
 msgid "R_emove From Library"
 msgstr "Aus Bibliothek _entfernen"
 
-#: ../src/Resources.vala:657
+#: ../src/Resources.vala:665
 msgid "_Move to Trash"
 msgstr "In den _Müll verschieben"
 
-#: ../src/Resources.vala:659
+#: ../src/Resources.vala:667
 msgid "Select _All"
 msgstr "_Alle auswählen"
 
-#: ../src/Resources.vala:660
+#: ../src/Resources.vala:668
 msgid "Select all items"
 msgstr "Alle auswählen"
 
@@ -3599,20 +3623,20 @@ msgstr "Alle auswählen"
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:741
+#: ../src/Resources.vala:749
 msgid "%-I:%M %p"
 msgstr "%-I:%M %p"
 
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:746
+#: ../src/Resources.vala:754
 msgid "%-I:%M:%S %p"
 msgstr "%-I:%M:%S %p"
 
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:750
+#: ../src/Resources.vala:758
 msgid "%a %b %d, %Y"
 msgstr "%a %d. %b, %Y"
 
@@ -3622,14 +3646,14 @@ msgstr "%a %d. %b, %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:755 ../src/Resources.vala:765
+#: ../src/Resources.vala:763 ../src/Resources.vala:773
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:760
+#: ../src/Resources.vala:768
 msgid "%d, %Y"
 msgstr "%d, %Y"
 
@@ -4998,13 +5022,6 @@ msgstr "T_itel anzeigen"
 msgid "seconds"
 msgstr "Sekunden"
 
-#~ msgid ""
-#~ "A file required for publishing is unavailable. Publishing to %s can't "
-#~ "continue."
-#~ msgstr ""
-#~ "Eine Datei, die veröffentlicht werden soll, ist nicht verfügbar. Die "
-#~ "Veröffentlichung auf %s ist nicht möglich."
-
 #~ msgid "Only _Remove"
 #~ msgstr "Nur _entfernen"
 
diff --git a/po/el.po b/po/el.po
index bf674cb..32e4344 100644
--- a/po/el.po
+++ b/po/el.po
@@ -20,16 +20,16 @@ msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2014-02-16 23:27+0000\n"
-"PO-Revision-Date: 2014-02-17 02:18+0200\n"
-"Last-Translator: Vangelis Skarmoutsos <skarmoutsosv@gmail.com>\n"
+"POT-Creation-Date: 2015-02-21 00:57+0000\n"
+"PO-Revision-Date: 2015-02-25 15:45+0200\n"
+"Last-Translator: Tom Tryfonidis <tomtryf@gmail.com>\n"
 "Language-Team: Ελληνικά <team@gnome.gr>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.7.4\n"
 "X-Project-Style: gnome\n"
 
 #: ../plugins/common/RESTSupport.vala:424
@@ -52,20 +52,25 @@ msgstr ""
 "Για να συνεχίσετε τη δημοσίευση στις υπηρεσίες Google, βγείτε και "
 "επανεκκινήστε το Shotwell, έπειτα προσπαθήστε να δημοσιεύσετε ξανά."
 
-#: ../plugins/common/Resources.vala:9 ../src/AppWindow.vala:683
-msgid "Visit the Yorba web site"
-msgstr "Επισκεφθείτε την ιστοτόπο του Yorba"
+#: ../plugins/common/Resources.vala:9
+msgid "Visit the Shotwell home page"
+msgstr "Επισκεφθείτε τον ιστότοπο Shotwell "
 
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:686
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
 msgid "translator-credits"
 msgstr ""
+"Ελληνική μεταφραστική ομάδα GNOME\n"
 "Δημήτρης Σπίγγος <dmtrs32@gmail.com>\n"
-"Dimitris Glezos <dimitris@glezos.com>\n"
-"Thalia Papoutsaki <saliyath@gmail.com>\n"
-"Sterios Prosiniklis <steriosprosiniklis@gmail.com>\n"
-"Petros Dias <petrosdias@gmail.com>\n"
-"Konstantinos Kypris <kcypre@gmail.com>\n"
-"Evangelos Skarmoutsos <skarmoutsosv@gmail.com>"
+"Δημήτρης Γλέζος <dimitris@glezos.com>\n"
+"Θάλια Παπουτσάκη <saliyath@gmail.com>\n"
+"Στέργιος Προσινικλής <steriosprosiniklis@gmail.com>\n"
+"Πέτρος Ντίας <petrosdias@gmail.com>\n"
+"Κωνσταντίνος Κυπρής <kcypre@gmail.com>\n"
+"Ευάγγελος Σκαρμούτσος <skarmoutsosv@gmail.com>\n"
+"Μαρία Μαυρίδου <mavridou@gmail.com>\n"
+"\n"
+"Για περισσότερες πληροφορίες, επισκεφθείτε τη σελίδα\n"
+"http://gnome.gr/"
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:32
@@ -74,8 +79,8 @@ msgstr ""
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
 #: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
 #: ../src/Resources.vala:27
-msgid "Copyright 2009-2014 Yorba Foundation"
-msgstr "Πνευματικά δικαιώματα 2009-2014 Ίδρυμα Yorba"
+msgid "Copyright 2009-2015 Yorba Foundation"
+msgstr "Πνευματικά δικαιώματα 2009-2015 Ίδρυμα Yorba"
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:56
 msgid ""
@@ -110,16 +115,16 @@ msgid ""
 "Cannot open the selected F-Spot database file: the file does not exist or is "
 "not an F-Spot database"
 msgstr ""
-"Δεν είναι εφικτό το άνοιγμα της επιλεγμένης βάσης δεδομένων του F-Spot: το "
-"αρχείο δεν υπάρχει ή δεν είναι βάση δεδομένων του F-Spot"
+"Αδύνατο το άνοιγμα της επιλεγμένης βάσης δεδομένων του F-Spot: το αρχείο δεν "
+"υπάρχει ή δεν είναι βάση δεδομένων του F-Spot"
 
 #: ../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 ""
-"Δεν είναι εφικτό το άνοιγμα της επιλεγμένης βάσης δεδομένων του F-Spot: αυτη "
-"η έκδοση της βάση δεδομένων του F-Spot δεν υποστηρίζεται από το Shotwell"
+"Αδύνατο το άνοιγμα της επιλεγμένης βάσης δεδομένων του F-Spot: αυτη η έκδοση "
+"της βάση δεδομένων του F-Spot δεν υποστηρίζεται από το Shotwell"
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
 msgid ""
@@ -145,10 +150,10 @@ msgid ""
 "You can close this dialog and start using Shotwell while the import is "
 "taking place in the background."
 msgstr ""
-"Το Shotwell βρήκε %d φωτογραφίες στη βιβλιοθήκη F-Spot και τα εισάγει τώρα. "
+"Το Shotwell βρήκε %d φωτογραφίες στη βιβλιοθήκη F-Spot και τις εισάγει τώρα. "
 "Οι διπλοεγγραφές θα αναγνωριστούν αυτόματα και θα αφαιρεθούν.\n"
 "\n"
-"Μπορείτε να κλείσετε αυτόν τον διάλογο και να ξεκινήσετε χρησιμοποιώντας το "
+"Μπορείτε να κλείσετε αυτόν τον διάλογο και να ξεκινήσετε τη χρήση του "
 "Shotwell ενώ η εισαγωγή λαμβάνει χώρα στο παρασκήνιο."
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
@@ -156,7 +161,7 @@ msgstr ""
 msgid "F-Spot library: %s"
 msgstr "Βιβλιοθήκη F-Spot: %s"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:416
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
 msgid "Preparing to import"
 msgstr "Προετοιμασία για εισαγωγή"
 
@@ -164,18 +169,226 @@ msgstr "Προετοιμασία για εισαγωγή"
 msgid "Core Data Import Services"
 msgstr "Υπηρεσίες εισαγωγής δεδομένων πυρήνα"
 
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+msgid "Gallery3 publishing module"
+msgstr "Άρθρωμα δημοσιεύσεων Gallery3"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
+msgid ""
+"You are not currently logged into your Gallery.\n"
+"\n"
+"You must have already signed up for a Gallery3 account to complete the login "
+"process."
+msgstr ""
+"Αυτήν τη στιγμή δεν είστε συνδεδεμένος στο Gallery.\n"
+"\n"
+"Θα πρέπει να έχετε ήδη εγγραφεί για έναν λογαριασμό Gallery3 για "
+"ολοκληρώσετε τη διαδικασία σύνδεσης."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: ../src/MediaPage.vala:434 ../src/photos/RawSupport.vala:300
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+msgid "Shotwell default directory"
+msgstr "Προεπιλεγμένος κατάλογος Shotwell "
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:801
+#, c-format
+msgid ""
+"\n"
+"\n"
+"The file \"%s\" may not be supported by or may be too large for this "
+"instance of Gallery3."
+msgstr ""
+"\n"
+"\n"
+"Το αρχείο \"% s\" δεν μπορεί να υποστηριχθεί από το Gallery3 ή μπορεί να "
+"είναι πολύ μεγάλο γι' αυτήν την περίπτωση. "
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:802
+msgid ""
+"\n"
+"Note that Gallery3 only supports the video types that Flowplayer does."
+msgstr ""
+"\n"
+"Σημειώστε ότι το Gallery3 υποστηρίζει μόνο τους ίδιους τύπους βίντεο που "
+"υποστηρίζει το Flowplayer."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+#, c-format
+msgid ""
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
+msgstr ""
+"Δεν είναι διαθέσιμο το απαιτούμενο αρχείο για τη δημοσίευση. Η δημοσίευση "
+"στο %s δεν μπορεί να συνεχιστεί."
+
+#. populate any widgets whose contents are
+#. programmatically-generated
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
+#, c-format
+msgid "Publishing to %s as %s."
+msgstr "Δημοσίευση στο %s ως %s."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
+msgid ""
+"Enter the URL for your Gallery3 site and the username and password (or API "
+"key) for your Gallery3 account."
+msgstr ""
+"Εισάγετε τη διεύθυνση για την τοποθεσία σας στο Gallery3 και το όνομα χρήστη "
+"και τον κωδικό πρόσβασης (ή το κλειδί API) του λογαγιασμού σας στο Gallery3."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
+msgid ""
+"The username and password or API key were incorrect. To try again, re-enter "
+"your username and password below."
+msgstr ""
+"Το όνομα χρήστη και ο κωδικός πρόσβασης ή το κλειδί API δεν ήταν σωστά. Για "
+"να προσπαθήσετε ξανά, εισάγετε εκ νέου το όνομα χρήστη και τον κωδικό "
+"πρόσβασής σας παρακάτω."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
+msgid ""
+"The URL entered does not appear to be the main directory of a Gallery3 "
+"instance. Please make sure you typed it correctly and it does not have any "
+"trailing components (e.g., index.php)."
+msgstr ""
+"Η διεύθυνση που πληκτρολογήσατε δεν φαίνεται να είναι o κύριος κατάλογος "
+"μιας περίπτωσης Gallery3. Παρακαλώ βεβαιωθείτε ότι την έχετε πληκτρολογήσει "
+"σωστά και δεν έχει οποιαδήποτε στοιχεία στο τέλος (π.χ. index.php)."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
+msgid "Unrecognized User"
+msgstr "Μη αναγνωρίσιμος χρήστης"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
+msgid " Site Not Found"
+msgstr " Η τοποθεσία δεν βρέθηκε"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
+msgid "Copyright (C) 2013 rajce.net"
+msgstr "Πνευματικά δικαιώματα (C) 2013 rajce.net"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
+msgid "An error message occurred when publishing to Rajce. Please try again."
+msgstr ""
+"Ένα μήνυμα λάθους εμφανίστηκε κατά τη δημοσίευση στο Rajce. Παρακαλώ "
+"δοκιμάστε ξανά."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
+msgid "Enter email and password associated with your Rajce account."
+msgstr ""
+"Εισάγετε το όνομα χρήστη και τον κωδικό πρόσβασης που είναι συσχετισμένα με "
+"το λογαριασμό σας στο Rajce."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
+msgid "Invalid email and/or password. Please try again"
+msgstr ""
+"Η διεύθυνση ηλ. αλληλογραφίας και/ή ο κωδικός πρόσβασης δεν είναι έγκυρα. "
+"Παρακαλούμε δοκιμάστε ξανά."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
+msgid "Invalid User Email or Password"
+msgstr "Μη έγκυρη διεύθυνση ηλ. αλληλογραφίας ή κωδικός πρόσβασης"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:890
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:2
+msgid "_Email address"
+msgstr "Δι_εύθυνση ηλεκτρονικής αλληλογραφίας"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:891
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
+msgid "_Password"
+msgstr "Κωδικός _πρόσβασης"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
+msgid "_Remember"
+msgstr "Απομ_νημόνευση"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
+msgid "Login"
+msgstr "Σύνδεση"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:5
+msgid "_Hide album"
+msgstr "Απόκρυψ_η άλμπουμ"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
+#, c-format
+msgid "You are logged into Rajce as %s."
+msgstr "Είστε συνδεδεμένος στο Rajce ως %s."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
+msgid "Photos will appear in:"
+msgstr "Οι φωτογραφίες θα εμφανίζονται σε:"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
+msgid "An _existing album:"
+msgstr "Ένα _υπάρχον άλμπουμ:"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
+msgid "A _new album named:"
+msgstr "Μια _νέα συλλογή με όνομα:"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:6
+msgid "Open target _album in browser"
+msgstr "Ανοίξτε το _άλμπουμ προορισμού στο πρόγραμμα περιήγησης"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:8
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
+msgid "_Publish"
+msgstr "_Δημοσίευση"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
+msgid "_Logout"
+msgstr "Απο_σύνδεση"
+
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
 msgid "Copyright 2012 BJA Electronics"
 msgstr "Πνευματικά δικαιώματα 2012 BJA Electronics"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1229
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
 msgid "500 x 375 pixels"
 msgstr "500 x 375 εικονοστοιχεία"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1230
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
 msgid "1024 x 768 pixels"
 msgstr "1024 x 768 εικονοστοιχεία"
@@ -194,14 +407,14 @@ msgstr "Το '%s' δεν είναι έγκυρη ανταπόκριση στο �
 msgid ""
 "TumblrPublisher: start( ): can't start; this publisher is not restartable."
 msgstr ""
-"TumblrPublisher: start( ): δεν μπορεί να εκκινήσει; ο μηχανισμός "
-"κοινοποίησης δεν είναι διαθέσιμος."
+"TumblrPublisher: start( ): δεν μπορεί να ξεκινήσει, ο μηχανισμός δημοσίευσης "
+"δεν είναι εκκινήσιμος."
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
 msgid "Enter the username and password associated with your Tumblr account."
 msgstr ""
-"Εισάγετε το όνομα χρήστη και κωδικό που είναι συσχετισμένα με το λογαριασμό "
-"του Tumblr σας."
+"Εισάγετε το όνομα χρήστη και κωδικό τον κωδικό πρόσβασης που είναι "
+"συσχετισμένα με το λογαριασμό σας στο Tumblr."
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
@@ -213,13 +426,13 @@ msgstr ""
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:617
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
 msgid "Invalid User Name or Password"
-msgstr "Μη έγκυρο Όνομα Χρήστη ή Κωδικός"
+msgstr "Μη έγκυρο όνομα χρήστη ή κωδικός πρόσβασης"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:636
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
 #, c-format
 msgid "Could not load UI: %s"
-msgstr "Δεν ήταν δυνατή η φόρτωση της διεπιφάνειας εργασίας: %s"
+msgstr "Δεν ήταν δυνατή η φόρτωση του περιβάλλοντος χρήστη: %s"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:739
 #, c-format
@@ -232,40 +445,99 @@ msgstr ""
 
 #: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
+msgstr "Πνευματικά δικαιώματα 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 
 #: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:25
 msgid "Visit the Yandex.Fotki web site"
-msgstr "Επισκεφθείτε τον ιστοχώρο του Yandex.Fotki"
+msgstr "Επισκεφθείτε τον ιστοτόπο του Yandex.Fotki"
 
 #: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:632
 msgid "You are not currently logged into Yandex.Fotki."
-msgstr "Δεν είστε συνδεδεμένος αυτή τη στιγμή στο Yandex.Fotki."
+msgstr "Αυτήν τη στιγμή δεν είστε συνδεδεμένος στο Yandex.Fotki."
 
-#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:18
+#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
 msgid "Shotwell Extra Publishing Services"
 msgstr "Πρόσθετες υπηρεσίες δημοσίευσης του Shotwell"
 
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
+msgid "Go _Back"
+msgstr "Επιστροφή _πίσω"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
+#: ../ui/shotwell.glade.h:42
+msgid "_Login"
+msgstr "_Σύνδεση"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
+msgid "Intro message replaced at runtime"
+msgstr "Εισαγωγικό μήνυμα που αντικαταστάθηκε στο χρόνο εκτέλεσης"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
+msgid "_Gallery3 URL:"
+msgstr "Διεύθυνση _Gallery3:"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
+msgid "_User name:"
+msgstr "Όνομα _Χρήστη:"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
+msgid "_Password:"
+msgstr "_Κωδικός πρόσβασης:"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:7
+msgid "API _Key:"
+msgstr "Κλει_δί API:"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
+msgid "or"
+msgstr "ή"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
+msgid "A _new album"
+msgstr "Ένα _νέο άλμπουμ "
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
+msgid "An _existing album"
+msgstr "Ένα _υπάρχον άλμπουμ"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
+msgid "_Remove location, tag and camera-identifying data before uploading"
+msgstr ""
+"Κατά_ργηση τοποθεσίας, ετικέτας και δεδομένων ταυτοποίησης της κάμερας πριν "
+"από τη αποστολή"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
+msgid "'Publishing to $url as $username' (populated in application code)"
+msgstr ""
+"'Δημοσίευση στο $url ως $username' (συμπληρώνεται στον κώδικα εφαρμογής)"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
+msgid "Scaling constraint:"
+msgstr "Περιορισμός _κλιμάκωσης:"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
+msgid "pixels"
+msgstr " _εικονοστοιχεία"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
+#: ../src/Dimensions.vala:17
+msgid "Original size"
+msgstr "Αρχικό μέγεθος"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:10
+#: ../src/Dimensions.vala:20
+msgid "Width or height"
+msgstr "Πλάτος ή ύψος"
+
 #: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
 #: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
-#: ../ui/shotwell.glade.h:15
+#: ../ui/shotwell.glade.h:14
 msgid "label"
 msgstr "ετικέτα"
 
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
-msgid "_Email address"
-msgstr "_Διεύθυνση email"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
-msgid "_Password"
-msgstr "_Κωδικός"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
-msgid "Login"
-msgstr "Σύνδεση"
-
 #: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
 msgid "Blogs:"
 msgstr "Ιστολόγια:"
@@ -273,33 +545,23 @@ msgstr "Ιστολόγια:"
 #: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:2
 #: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:1
 msgid "Photo _size:"
-msgstr "Μέγεθος_εικόνας:"
+msgstr "Μέγεθος _εικόνας:"
 
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
-msgid "_Logout"
-msgstr "_Αποσύνδεση"
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
+msgid "you are logged in rajce as $name"
+msgstr "είστε συνδεδεμένος στο rajce ως $name"
 
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:7
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:7
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
-msgid "_Publish"
-msgstr "_Δημοσίευση"
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
+msgid "$mediatype will appear in"
+msgstr "το $mediatype θα εμφανιστεί στο:"
 
 #: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
 msgid "_Albums (or write new):"
-msgstr "_Συλλογές (ή εγγραφή νέων):"
+msgstr "Ά_λμπουμ (ή εγγραφή νέων):"
 
 #: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:2
 msgid "Access _type:"
-msgstr "Τύπος _Πρόσβασης:"
+msgstr "Τύπος _πρόσβασης:"
 
 #: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
 msgid "Disable _comments"
@@ -338,13 +600,13 @@ msgid ""
 "upload photos and publish to your feed. These permissions are required for "
 "Shotwell Connect to function."
 msgstr ""
-"Δεν είστε ακόμα συνδεδεμένος στο Facebook.\n"
+"Αυτήν τη στιγμή δεν είστε συνδεδεμένος στο Facebook.\n"
 "\n"
 "Αν δεν έχετε ακόμα λογαριασμό στο Facebook, μπορείτε να δημιουργήσετε έναν "
 "κατά τη διαδικασία σύνδεσης. Κατά τη διάρκεια της σύνδεσης το Shotwell "
-"Connect μπορεί να σας ζητήσει την άδεια να φορτώσει φωτογραφίες και να τις "
-"δημοσιοποιήσει στη τροφοδοσία σας. Τα δικαιώματα αυτά είναι απαραίτητα για "
-"τη λειτουργία του Shotwell Connect."
+"Connect μπορεί να σας ζητήσει την άδεια να αποστείλει φωτογραφίες και να τις "
+"δημοσιεύσει στην τροφοδοσία σας. Τα δικαιώματα αυτά είναι απαραίτητα για τη "
+"λειτουργία του Shotwell Connect."
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:65
 msgid ""
@@ -373,7 +635,7 @@ msgstr "Έλεγχος σύνδεσης με το Facebook..."
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:347
 #: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
 msgid "Creating album..."
-msgstr "Δημιουργία συλλογής..."
+msgstr "Δημιουργία άλμπουμ..."
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:374
 msgid ""
@@ -399,15 +661,15 @@ msgstr "Που θέλετε να δημοσιεύσετε τις επιλεγμ�
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1021
 #: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
 msgid "Upload _size:"
-msgstr "_Μέγεθος μεταφόρτωσης:"
+msgstr "_Μέγεθος αποστολής:"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
 msgid "Just me"
 msgstr "Μόνο εγώ"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
 msgid "Everyone"
 msgstr "Όλοι"
@@ -419,11 +681,11 @@ msgid ""
 "Click Login to log into Flickr in your Web browser.  You will have to "
 "authorize Shotwell Connect to link to your Flickr account."
 msgstr ""
-"Δεν είστε συνδεδεμένοι με το Flickr.\n"
+"Αυτήν τη στιγμή δεν είστε συνδεδεμένος με το Flickr.\n"
 "\n"
 "Πατήστε στο Σύνδεση για να συνδεθείτε με το Flickr στον περιηγητή ιστού σας. "
 "Θα πρέπει να εξουσιοδοτήσετε το Shotwell Connect για σύνδεση στο λογαριασμό "
-"του Flickr σας."
+"σας στο Flickr."
 
 #: ../plugins/shotwell-publishing/FlickrPublishing.vala:63
 msgid ""
@@ -462,61 +724,62 @@ msgstr ""
 "Είστε συνδεδεμένος στο Flickr ως %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
 #, 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 ""
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
 "Ο δωρεάν λογαριασμός Flickr περιορίζει τον όγκο δεδομένων που μπορείτε να "
-"ανεβάσετε κάθε μήνα.\n"
+"αποστέλνετε κάθε μήνα.\n"
+"Αυτόν τον μήνα, έχετε %d megabyte ακόμα μέχρι το ανώτατο όριο."
+msgstr[1] ""
+"Ο δωρεάν λογαριασμός Flickr περιορίζει τον όγκο δεδομένων που μπορείτε να "
+"αποστέλνετε κάθε μήνα.\n"
 "Αυτόν τον μήνα, έχετε %d megabytes ακόμα μέχρι το ανώτατο όριο."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1157
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr ""
-"Ο λογαριασμός Flickr Pro σας δίνει το δικαίωμα για απεριόριστα ανεβάσματα."
+"Ο λογαριασμός Flickr Pro σας δίνει το δικαίωμα για απεριόριστες αποστολές."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1162
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
 msgid "Photos _visible to:"
 msgstr "_Φωτογραφίες ορατές σε:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
 msgid "Videos _visible to:"
 msgstr "_Βίντεο ορατά σε:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
 msgid "Photos and videos _visible to:"
 msgstr "Φωτογραφίες και βίντεο _ορατά σε:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
 msgid "Friends & family only"
 msgstr "Φίλοι & οικογένεια μόνο"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
 msgid "Family only"
 msgstr "Μόνο οικογένεια"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Friends only"
 msgstr "Μόνο φίλοι"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
 msgid "2048 x 1536 pixels"
 msgstr "2048 x 1536 εικονοστοιχεία"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
 msgid "4096 x 3072 pixels"
 msgstr "4096 x 3072 εικονοστοιχεία"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
-#: ../src/Dimensions.vala:17
-msgid "Original size"
-msgstr "Αρχικό μέγεθος"
-
 #: ../plugins/shotwell-publishing/PicasaPublishing.vala:58
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
@@ -524,11 +787,11 @@ msgid ""
 "Click Login to log into Picasa Web Albums in your Web browser. You will have "
 "to authorize Shotwell Connect to link to your Picasa Web Albums account."
 msgstr ""
-"Δεν είστε συνδεδεμένοι τώρα με τη συλλογή ιστού Picasa.\n"
+"Αυτήν τη στιγμή δεν είστε συνδεδεμένος με τα άλμπουμ ιστού Picasa.\n"
 "\n"
-"Πατήστε στη σύνδεση για να συνδεθείτε με τη συλλογή ιστού Picasa στον "
+"Πατήστε στη σύνδεση για να συνδεθείτε με τα άλμπουμ ιστού Picasa στον "
 "περιηγητή ιστού σας. Θα πρέπει να εξουσιοδοτήσετε το Shotwell Connect για "
-"σύνδεση στον λογαριασμό σας συλλογών ιστού Picasa."
+"σύνδεση στον λογαριασμό σας των άλμπουμ ιστού Picasa."
 
 #: ../plugins/shotwell-publishing/PicasaPublishing.vala:361
 msgid ""
@@ -542,17 +805,12 @@ msgstr ""
 #: ../plugins/shotwell-publishing/PicasaPublishing.vala:659
 #, c-format
 msgid "You are logged into Picasa Web Albums as %s."
-msgstr "Είστε συνδεδεμένος στη συλλογή ιστού Picasa ως %s."
+msgstr "Είστε συνδεδεμένος με τα άλμπουμ ιστού Picasa ως %s."
 
 #: ../plugins/shotwell-publishing/PicasaPublishing.vala:665
 msgid "Videos will appear in:"
 msgstr "Τα βίντεο θα εμφανιστούν στο:"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
-msgid "Photos will appear in:"
-msgstr "Οι φωτογραφίες θα εμφανίζονται στα:"
-
 #: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
 msgid "Small (640 x 480 pixels)"
 msgstr "ΜΙκρό (640 x 480 pixels)"
@@ -577,7 +835,7 @@ msgstr "Αρχικό μέγεθος"
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
 #, c-format
 msgid "Creating album %s..."
-msgstr "Δημιουργία συλλογής %s..."
+msgstr "Δημιουργία άλμπουμ %s..."
 
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:917
 msgid "An error message occurred when publishing to Piwigo. Please try again."
@@ -590,9 +848,9 @@ msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
 msgstr ""
-"Εισάγετε το URL της βιβλιοθήκης φωτογραφιών Piwigo καθώς και το όνομα χρήστη "
-"και τον κωδικό πρόσβασης που συνδέεται με τον λογαριασμό Piwigo για αυτήν τη "
-"βιβλιοθήκη."
+"Εισάγετε τη διεύθυνση της βιβλιοθήκης φωτογραφιών Piwigo καθώς και το όνομα "
+"χρήστη και τον κωδικό πρόσβασης που συνδέεται με τον λογαριασμό σας στο "
+"Piwigo για αυτήν τη βιβλιοθήκη."
 
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:999
 msgid ""
@@ -600,11 +858,11 @@ msgid ""
 "entered"
 msgstr ""
 "Το Shotwell δεν μπορεί να επικοινωνήσει με τη βιβλιοθήκη φωτογραφιών Piwigo. "
-"Παρακαλούμε επιβεβαιώστε το URL που εισάγατε"
+"Παρακαλούμε επιβεβαιώστε το τη διεύθυνση που εισάγατε"
 
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
 msgid "Invalid URL"
-msgstr "Άκυρο URL"
+msgstr "Άκυρη διεύθυνση"
 
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
 msgid "Admins, Family, Friends, Contacts"
@@ -630,7 +888,7 @@ msgid ""
 "with YouTube to continue. You can set up most accounts by using your browser "
 "to log into the YouTube site at least once."
 msgstr ""
-"Δεν είστε ακόμα συνδεδεμένος στο YouTube.\n"
+"Αυτήν τη στιγμή δεν είστε συνδεδεμένος στο YouTube.\n"
 "\n"
 "Θα πρέπει να έχετε ήδη εγγραφεί για έναν λογαριασμό Google και να τον έχετε "
 "ρυθμίσει για χρήση με το YouTube για να συνεχίσετε. Μπορείτε να ρυθμίσετε "
@@ -665,15 +923,15 @@ msgstr "Δημόσιο μη αρχειοθετημένα"
 
 #: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
 msgid "Publish to an e_xisting album:"
-msgstr "Δημοσίευση σε _υπάρχουσα συλλογή:"
+msgstr "Δημοσίευση σε _υπάρχον άλμπουμ:"
 
 #: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:2
 msgid "Create a _new album named:"
-msgstr "Δημιουργία _νέας συλλογής με όνομα:"
+msgstr "Δημιουργία _νέου άλμπουμ με όνομα:"
 
 #: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
 msgid "Videos and new photo albums _visible to:"
-msgstr "Βίντεο και νέες συλλογές φωτογραφιών _ορατά σε:"
+msgstr "Βίντεο και νέα άλμπουμ φωτογραφιών _ορατά σε:"
 
 #: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:5
 #: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:2
@@ -682,8 +940,8 @@ msgstr "Βίντεο και νέες συλλογές φωτογραφιών _ο
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
 msgstr ""
-"Α_φαιρέστε τοποθεσία, κάμερα και άλλες πληροφορίες αναγνώρισης πριν τη "
-"μεταφόρτωση"
+"Α_φαιρέστε τοποθεσία, κάμερα και άλλες πληροφορίες αναγνώρισης πριν την "
+"αποστολή"
 
 #: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
 msgid ""
@@ -702,18 +960,9 @@ msgstr "Α_ριθμός εξουσιοδότησης:"
 msgid "Con_tinue"
 msgstr "_Συνέχεια"
 
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
-msgid "An _existing album:"
-msgstr "_Υπάρχουσα συλλογή:"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
-msgid "A _new album named:"
-msgstr "Μια _νέα συλλογή με όνομα:"
-
 #: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
 msgid "L_ist album in public gallery"
-msgstr "_Ταξινόμηση συλλογής στη δημόσια πινακοθήκη"
+msgstr "_Ταξινόμηση άλμπουμ στη δημόσια πινακοθήκη"
 
 #: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
 msgid "Photo _size preset:"
@@ -721,7 +970,7 @@ msgstr "Προκα_θορισμένο μέγεθος φωτογραφίας:"
 
 #: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
 msgid "_URL of your Piwigo photo library"
-msgstr "_URL της βιβλιοθήκης φωτογραφιών Piwigo"
+msgstr "_Διεύθυνση της βιβλιοθήκης φωτογραφιών Piwigo"
 
 #: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
 msgid "User _name"
@@ -729,7 +978,7 @@ msgstr "Όνομα _Χρήστη"
 
 #: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
 msgid "_Remember Password"
-msgstr "_Απομνημόνευση Κωδικού"
+msgstr "_Απομνημόνευση κωδικού πρόσβασης"
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
 msgid "An _existing category:"
@@ -749,7 +998,7 @@ msgstr "στην κατηγορία:"
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
 msgid "Album comment:"
-msgstr "Σχόλιο συλλογής:"
+msgstr "Σχόλιο άλμπουμ:"
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
 msgid "_If a title is set and comment unset, use title as comment"
@@ -759,14 +1008,14 @@ msgstr ""
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:10
 msgid "_Do no upload tags"
-msgstr "Να _μην μεταφορτώνονται ετικέτες"
+msgstr "Να _μην αποστέλνονται ετικέτες"
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
 msgid "Logout"
 msgstr "Αποσύνδεση"
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:270
+#: ../src/Resources.vala:303
 msgid "Publish"
 msgstr "Δημοσίευση"
 
@@ -776,7 +1025,7 @@ msgstr "Βασικές υπηρεσίες δημοσίευσης"
 
 #: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
 msgid "Video privacy _setting:"
-msgstr "_Ρυθμίσεις ιδιωτικότητας βίντεο:"
+msgstr "_Ρυθμίσεις απορρήτου για βίντεο:"
 
 #: ../plugins/shotwell-transitions/BlindsEffect.vala:20
 msgid "Blinds"
@@ -823,8 +1072,10 @@ msgid "Core Slideshow Transitions"
 msgstr "Βασικές μεταβάσεις αλληλουχίας εικόνων"
 
 #: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
-msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+msgstr ""
+"Πνευματικά δικαιώματα 2010 Maxim Kartashev, Πνευματικά δικαιώματα 2011-2015 "
+"Ίδρυμα Yorba"
 
 #: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
 #, c-format
@@ -851,55 +1102,39 @@ msgstr "Αδυναμία δημιουργίας προσωρινού φακέλ�
 msgid "Unable to create data subdirectory %s: %s"
 msgstr "Αδυναμία δημιουργίας υποφακέλου %s: %s"
 
-#: ../src/AppWindow.vala:49
+#: ../src/AppWindow.vala:53
 msgid "Pin Toolbar"
 msgstr "Καρφίτσωμα γραμμής εργαλείων"
 
-#: ../src/AppWindow.vala:50
+#: ../src/AppWindow.vala:54
 msgid "Pin the toolbar open"
 msgstr "Ανοικτό καρφίτσωμα της γραμμής εργαλείων"
 
-#: ../src/AppWindow.vala:53 ../src/AppWindow.vala:131
+#: ../src/AppWindow.vala:59
 msgid "Leave fullscreen"
 msgstr "Έξοδος από πλήρη οθόνη"
 
-#: ../src/AppWindow.vala:130
-msgid "Leave _Fullscreen"
-msgstr "Έ_ξοδος από πλήρη οθόνη"
-
-#: ../src/AppWindow.vala:491
-msgid "_Quit"
-msgstr "Έ_ξοδος"
-
-#: ../src/AppWindow.vala:496
-msgid "_About"
-msgstr "Πε_ρί"
-
-#: ../src/AppWindow.vala:501
-msgid "Fulls_creen"
-msgstr "Πλήρης ο_θόνη"
-
-#: ../src/AppWindow.vala:506
+#: ../src/AppWindow.vala:525
 msgid "_Contents"
 msgstr "_Περιεχόμενα"
 
-#: ../src/AppWindow.vala:511
+#: ../src/AppWindow.vala:530
 msgid "_Frequently Asked Questions"
 msgstr "_Συχνές ερωτήσεις"
 
-#: ../src/AppWindow.vala:516
+#: ../src/AppWindow.vala:535
 msgid "_Report a Problem..."
 msgstr "_Αναφορά προβλήματος..."
 
-#: ../src/AppWindow.vala:615 ../src/AppWindow.vala:636
-#: ../src/AppWindow.vala:653 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1361 ../src/Dialogs.vala:1384
-#: ../src/data_imports/DataImportsUI.vala:399
-#: ../src/publishing/PublishingUI.vala:498
+#: ../src/AppWindow.vala:634 ../src/AppWindow.vala:655
+#: ../src/AppWindow.vala:672 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
+#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441 ../src/Resources.vala:162
+#: ../src/data_imports/DataImportsUI.vala:374
+#: ../src/publishing/PublishingUI.vala:475
 msgid "_Cancel"
 msgstr "Α_κύρωση"
 
-#: ../src/AppWindow.vala:663
+#: ../src/AppWindow.vala:682
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
@@ -912,17 +1147,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/AppWindow.vala:695
+#: ../src/AppWindow.vala:702
+msgid "Visit the Yorba web site"
+msgstr "Επισκεφθείτε τον ιστοτόπο του Yorba"
+
+#: ../src/AppWindow.vala:714
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Δεν ήταν δυνατή η εμφάνιση της βοήθειας: %s"
 
-#: ../src/AppWindow.vala:703
+#: ../src/AppWindow.vala:722
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Αδύνατη η περιήγηση στη βάση δεδομένων σφαλμάτων: %s"
 
-#: ../src/AppWindow.vala:711
+#: ../src/AppWindow.vala:730
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Αδυναμία εμφάνισης συχνών ερωτήσεων: %s"
@@ -988,11 +1227,11 @@ msgstr "Αλλοιωμένο αρχείο εικόνας"
 msgid "Imported failed (%d)"
 msgstr "Αποτυχία εισαγωγής (%d)"
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2627
+#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
 msgid "S_lideshow"
 msgstr "_Αλληλουχία"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2628
+#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
 msgid "Play a slideshow"
 msgstr "Αναπαραγωγή αλληλουχίας εικόνων"
 
@@ -1005,7 +1244,7 @@ msgid "Export Photos/Videos"
 msgstr "Εξαγωγή φωτογραφιών/βίντεο"
 
 #: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3200
+#: ../src/PhotoPage.vala:3211
 msgid "Export Photo"
 msgstr "Εξαγωγή φωτογραφίας"
 
@@ -1053,47 +1292,47 @@ msgstr "Βελτίωση"
 msgid "Undoing Enhance"
 msgstr "Αναίρεση βελτίωσης"
 
-#: ../src/Commands.vala:845
+#: ../src/Commands.vala:853
 msgid "Applying Color Transformations"
 msgstr "Εφαρμογή μετασχηματισμών χρώματος"
 
-#: ../src/Commands.vala:845
+#: ../src/Commands.vala:853
 msgid "Undoing Color Transformations"
 msgstr "Αναίρεση μετασχηματισμών χρώματος"
 
-#: ../src/Commands.vala:995
+#: ../src/Commands.vala:1003
 msgid "Creating New Event"
 msgstr "Δημιουργία νέου συμβάντος"
 
-#: ../src/Commands.vala:996
+#: ../src/Commands.vala:1004
 msgid "Removing Event"
 msgstr "Αφαίρεση συμβάντος"
 
-#: ../src/Commands.vala:1005
+#: ../src/Commands.vala:1013
 msgid "Moving Photos to New Event"
 msgstr "Μετακίνηση φωτογραφιών σε νέο συμβάν"
 
-#: ../src/Commands.vala:1006
+#: ../src/Commands.vala:1014
 msgid "Setting Photos to Previous Event"
 msgstr "Ορισμός φωτογραφιών σε προηγούμενο συμβάν"
 
-#: ../src/Commands.vala:1063
+#: ../src/Commands.vala:1071
 msgid "Merging"
 msgstr "Συγχώνευση"
 
-#: ../src/Commands.vala:1064
+#: ../src/Commands.vala:1072
 msgid "Unmerging"
 msgstr "Ακύρωση συγχώνευσης"
 
-#: ../src/Commands.vala:1073
+#: ../src/Commands.vala:1081
 msgid "Duplicating photos"
 msgstr "Αντιγραφή φωτογραφιών"
 
-#: ../src/Commands.vala:1073
+#: ../src/Commands.vala:1081
 msgid "Removing duplicated photos"
 msgstr "Αφαίρεση διπλών αντιγράφων φωτογραφιών"
 
-#: ../src/Commands.vala:1096
+#: ../src/Commands.vala:1104
 #, c-format
 msgid "Unable to duplicate one photo due to a file error"
 msgid_plural "Unable to duplicate %d photos due to file errors"
@@ -1104,53 +1343,53 @@ msgstr[1] ""
 "Δεν ήταν δυνατή η δημιουργία αντιγράφου %d φωτογραφιών εξαιτίας κάποιου "
 "σφάλματος αρχείου"
 
-#: ../src/Commands.vala:1183
+#: ../src/Commands.vala:1191
 msgid "Restoring previous rating"
 msgstr "Επαναφορά προηγούμενων αξιολογήσεων"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
 msgid "Increasing ratings"
 msgstr "Αύξηση αξιολογήσεων"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
 msgid "Decreasing ratings"
 msgstr "Μείωση αξιολογήσεων"
 
-#: ../src/Commands.vala:1244
+#: ../src/Commands.vala:1252
 msgid "Setting RAW developer"
 msgstr "Ορισμός της εφαρμογής επεξεργασίας RAW αρχείων"
 
-#: ../src/Commands.vala:1244
+#: ../src/Commands.vala:1252
 msgid "Restoring previous RAW developer"
 msgstr "Επαναφορά προηγούμενης εφαρμογής επεξεργασίας RAW αρχείων"
 
-#: ../src/Commands.vala:1245
+#: ../src/Commands.vala:1253
 msgid "Set Developer"
 msgstr "Ορισμός εφαρμογής επεξεργασίας RAW αρχείων"
 
-#: ../src/Commands.vala:1335
+#: ../src/Commands.vala:1343
 msgid "Original photo could not be adjusted."
 msgstr "Η αυθεντική φωτογραφία δεν ήταν δυνατό να ρυθμιστεί."
 
-#: ../src/Commands.vala:1356
+#: ../src/Commands.vala:1364
 msgid "Adjusting Date and Time"
 msgstr "Ρύθμιση Ημερομηνίας και Ώρας"
 
-#: ../src/Commands.vala:1356
+#: ../src/Commands.vala:1364
 msgid "Undoing Date and Time Adjustment"
 msgstr "Αναίρεση ρυθμίσεων ημερομηνίας και ώρας"
 
-#: ../src/Commands.vala:1387
+#: ../src/Commands.vala:1395
 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:1389 ../src/Commands.vala:1413
+#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
 msgid "Time Adjustment Error"
 msgstr "Σφάλμα ρύθμισης ώρας"
 
-#: ../src/Commands.vala:1411
+#: ../src/Commands.vala:1419
 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."
@@ -1159,78 +1398,78 @@ msgstr[0] ""
 msgstr[1] ""
 "Δεν ήταν δυνατή η αναίρεση των ρυθμίσεων ώρας για τα παρακάτω αρχεία εικόνας."
 
-#: ../src/Commands.vala:1625 ../src/Commands.vala:1648
+#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
 msgid "Create Tag"
 msgstr "Δημιουργία ετικέτας"
 
-#: ../src/Commands.vala:1683
+#: ../src/Commands.vala:1691
 #, c-format
 msgid "Move Tag \"%s\""
-msgstr "Μετακίνηση Καρτέλας \"%s\""
+msgstr "Μετακίνηση ετικέτας \"%s\""
 
-#: ../src/Commands.vala:2335
+#: ../src/Commands.vala:2343
 msgid "Move Photos to Trash"
-msgstr "Μετακίνηση φωτογραφιών στον κάδο απορριμμάτων"
+msgstr "Μετακίνηση φωτογραφιών στα απορρίμματα"
 
-#: ../src/Commands.vala:2335
+#: ../src/Commands.vala:2343
 msgid "Restore Photos from Trash"
-msgstr "Επαναφορά φωτογραφιών από τον κάδο απορριμμάτων"
+msgstr "Επαναφορά φωτογραφιών από τα απορρίμματα"
 
-#: ../src/Commands.vala:2336
+#: ../src/Commands.vala:2344
 msgid "Move the photos to the Shotwell trash"
-msgstr "Μετακίνηση φωτογραφιών στον κάδο απορριμμάτων του Shotwell"
+msgstr "Μετακίνηση φωτογραφιών στα απορρίμματα του Shotwell"
 
-#: ../src/Commands.vala:2336
+#: ../src/Commands.vala:2344
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Επαναφορά των εικόνων στη βιβλιοθήκη του Shotwell"
 
-#: ../src/Commands.vala:2355
+#: ../src/Commands.vala:2363
 msgid "Moving Photos to Trash"
-msgstr "Μετακίνηση φωτογραφιών στον κάδο απορριμμάτων"
+msgstr "Μετακίνηση φωτογραφιών στα απορρίμματα"
 
-#: ../src/Commands.vala:2355
+#: ../src/Commands.vala:2363
 msgid "Restoring Photos From Trash"
-msgstr "Επαναφορά φωτογραφιών από τον κάδο απορριμμάτων"
+msgstr "Επαναφορά φωτογραφιών από τα απορρίμματα"
 
-#: ../src/Commands.vala:2441
+#: ../src/Commands.vala:2449
 msgid "Flag selected photos"
 msgstr "Επισήμανση επιλεγμένων φωτογραφιών"
 
-#: ../src/Commands.vala:2442
+#: ../src/Commands.vala:2450
 msgid "Unflag selected photos"
 msgstr "Αναίρεση επισήμανσης επιλεγμένων φωτογραφιών"
 
-#: ../src/Commands.vala:2443
+#: ../src/Commands.vala:2451
 msgid "Flagging selected photos"
 msgstr "Επισήμανση επιλεγμένων φωτογραφιών"
 
-#: ../src/Commands.vala:2444
+#: ../src/Commands.vala:2452
 msgid "Unflagging selected photos"
 msgstr "Αφαίρεση επισήμανσης επιλεγμένων φωτογραφιών"
 
-#: ../src/Commands.vala:2451
+#: ../src/Commands.vala:2459
 msgid "Flag"
 msgstr "Επισήμανση"
 
-#: ../src/Commands.vala:2451
+#: ../src/Commands.vala:2459
 msgid "Unflag"
 msgstr "Αναίρεση επισήμανσης"
 
-#: ../src/DesktopIntegration.vala:118
+#: ../src/DesktopIntegration.vala:121
 #, c-format
 msgid "Unable to launch Nautilus Send-To: %s"
 msgstr "Δεν ήταν δυνατή η εκκίνηση της αποστολής μέσω Ναυτίλου: %s"
 
-#: ../src/DesktopIntegration.vala:126
+#: ../src/DesktopIntegration.vala:129
 msgid "Send To"
 msgstr "Αποστολή σε"
 
-#: ../src/DesktopIntegration.vala:171
+#: ../src/DesktopIntegration.vala:174
 #, c-format
 msgid "Unable to export background to %s: %s"
 msgstr "Αδυναμία εξαγωγής φόντου στο %s: %s"
 
-#: ../src/DesktopIntegration.vala:299
+#: ../src/DesktopIntegration.vala:311
 #, c-format
 msgid "Unable to prepare desktop slideshow: %s"
 msgstr "Αδυναμία προετοιμασίας προβολής διαφανειών στην επιφάνεια εργασίας: %s"
@@ -1244,16 +1483,16 @@ msgstr[0] ""
 msgstr[1] ""
 "Αυτή η ενέργεια θα αφαιρέσει την ετικέτα \"%s\" από %d φωτογραφίες. Συνέχεια;"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1329
-#: ../src/Resources.vala:330 ../src/Resources.vala:378
-#: ../src/Resources.vala:643
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
+#: ../src/Resources.vala:163 ../src/Resources.vala:369
+#: ../src/Resources.vala:417 ../src/Resources.vala:682
 msgid "_Delete"
 msgstr "_Διαγραφή"
 
 #: ../src/Dialogs.vala:25
 #, c-format
 msgid "This will remove the saved search \"%s\".  Continue?"
-msgstr "Αυτό θα αφαιρέσει την αποθηκευμένη αναζήτηση \"%s\".  Να συνεχίσει;"
+msgstr "Αυτό θα αφαιρέσει την αποθηκευμένη αναζήτηση \"%s\".  Συνέχεια;"
 
 #: ../src/Dialogs.vala:35
 msgid ""
@@ -1321,51 +1560,51 @@ msgid "Current"
 msgstr "Τρέχον"
 
 #. layout controls
-#: ../src/Dialogs.vala:212
+#: ../src/Dialogs.vala:213
 msgid "_Format:"
 msgstr "_Μορφοποίηση:"
 
-#: ../src/Dialogs.vala:215
+#: ../src/Dialogs.vala:216
 msgid "_Quality:"
 msgstr "_Ποιότητα:"
 
-#: ../src/Dialogs.vala:218
+#: ../src/Dialogs.vala:219
 msgid "_Scaling constraint:"
 msgstr "Περιορισμός _κλίμακας:"
 
-#: ../src/Dialogs.vala:221
-msgid " _pixels"
-msgstr " _Εικονοστοιχεία"
+#: ../src/Dialogs.vala:222
+msgid "_Pixels:"
+msgstr " _Εικονοστοιχεία:"
 
-#: ../src/Dialogs.vala:229
+#: ../src/Dialogs.vala:225
 msgid "Export metadata"
 msgstr "Εξαγωγή μεταδεδομένων"
 
-#: ../src/Dialogs.vala:465
+#: ../src/Dialogs.vala:459
 msgid "Save Details..."
 msgstr "Αποθήκευση Λεπτομερειών..."
 
-#: ../src/Dialogs.vala:466
+#: ../src/Dialogs.vala:460
 msgid "Save Details"
 msgstr "Αποθήκευση Λεπτομερειών"
 
-#: ../src/Dialogs.vala:481
+#: ../src/Dialogs.vala:475
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(και άλλα %d)\n"
 
-#: ../src/Dialogs.vala:534
+#: ../src/Dialogs.vala:528
 msgid "Import Results Report"
-msgstr "Αναφορά Αποτελεσμάτων Εισαγωγής"
+msgstr "Αναφορά αποτελεσμάτων εισαγωγής"
 
-#: ../src/Dialogs.vala:538
+#: ../src/Dialogs.vala:532
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "Προσπάθεια εισαγωγής %d αρχείου."
 msgstr[1] "Προσπάθεια εισαγωγής %d αρχείων."
 
-#: ../src/Dialogs.vala:541
+#: ../src/Dialogs.vala:535
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -1375,37 +1614,37 @@ msgstr[1] "Από αυτά, %d αρχεία εισήχθησαν επιτυχώ�
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:553
+#: ../src/Dialogs.vala:547
 msgid "Duplicate Photos/Videos Not Imported:"
-msgstr "Διπλότυπες Φωτογραφίες/Βίντεο που δεν Εισήχθησαν:"
+msgstr "Διπλότυπες φωτογραφίες/βίντεο που δεν εισήχθησαν:"
 
-#: ../src/Dialogs.vala:557
+#: ../src/Dialogs.vala:551
 msgid "duplicates existing media item"
-msgstr "Διπλότυπο υπάρχον αντικείμενο"
+msgstr "δημιουργεί αντίφραφο του υφιστάμενου αντικειμένου πολυμέσων"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: ../src/Dialogs.vala:568
+#: ../src/Dialogs.vala:562
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Δεν εισήχθησαν φωτογραφίες/βίντεο λόγω σφαλμάτων κάμερας:"
 
-#: ../src/Dialogs.vala:571 ../src/Dialogs.vala:586 ../src/Dialogs.vala:601
-#: ../src/Dialogs.vala:617 ../src/Dialogs.vala:632 ../src/Dialogs.vala:646
+#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
+#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
 msgid "error message:"
 msgstr "μήνυμα λάθους:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: ../src/Dialogs.vala:582
+#: ../src/Dialogs.vala:576
 msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgstr "Μη εισαγωγή αρχείων επειδή δεν αναγνωρίστηκαν ως φωτογραφίες ή βίντεο:"
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: ../src/Dialogs.vala:597
+#: ../src/Dialogs.vala:591
 msgid ""
 "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
 "Understands:"
@@ -1415,7 +1654,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: ../src/Dialogs.vala:612
+#: ../src/Dialogs.vala:606
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
 "Library:"
@@ -1423,51 +1662,51 @@ msgstr ""
 "Μη εισαγωγή αρχείων επειδή το Shotwell δε μπόρεσε να τα αντιγράψει στη "
 "βιβλιοθήκη:"
 
-#: ../src/Dialogs.vala:616
+#: ../src/Dialogs.vala:610
 #, c-format
 msgid ""
 "couldn't copy %s\n"
 "\tto %s"
 msgstr ""
 "Αδυναμία αντιγραφής %s\n"
-"\tσε %s"
+"\tto %s"
 
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: ../src/Dialogs.vala:628
+#: ../src/Dialogs.vala:622
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
-msgstr "Μη εισαγωγή φωτογραφιών/βίντεο επειδή τα αρχεία είναι αλλοιωμένα:"
+msgstr "Μη εισαγωγή φωτογραφιών/βίντεο επειδή τα αρχεία είναι καταστραμμένα:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: ../src/Dialogs.vala:643
+#: ../src/Dialogs.vala:637
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Μη εισαγωγή φωτογραφιών/βίντεο για άλλους λόγους:"
 
-#: ../src/Dialogs.vala:663
+#: ../src/Dialogs.vala:657
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "1 διπλή φωτογραφία δεν εισήχθη:\n"
 msgstr[1] "%d διπλές φωτογραφίες δεν εισήχθησαν:\n"
 
-#: ../src/Dialogs.vala:666
+#: ../src/Dialogs.vala:660
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "1 διπλό βίντεο δεν εισήχθη:\n"
 msgstr[1] "%d διπλά βίντεο δεν εισήχθησαν:\n"
 
-#: ../src/Dialogs.vala:669
+#: ../src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "1 διπλή φωτογραφία/βίντεο δεν εισήχθη:\n"
 msgstr[1] "%d διπλές φωτογραφίες/βίντεο δεν εισήχθησαν:\n"
 
-#: ../src/Dialogs.vala:683
+#: ../src/Dialogs.vala:677
 #, 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"
@@ -1478,7 +1717,7 @@ msgstr[1] ""
 "%d φωτογραφίες απέτυχαν να εισαχθούν εξαιτίας ενός σφάλματος αρχείου ή "
 "σφάλματος του υλικού:\n"
 
-#: ../src/Dialogs.vala:686
+#: ../src/Dialogs.vala:680
 #, 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"
@@ -1489,7 +1728,7 @@ msgstr[1] ""
 "%d βίντεο απέτυχαν να εισαχθούν εξαιτίας ενός σφάλματος αρχείου ή σφάλματος "
 "του υλικού:\n"
 
-#: ../src/Dialogs.vala:689
+#: ../src/Dialogs.vala:683
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -1501,7 +1740,7 @@ msgstr[1] ""
 "%d φωτογραφίες/βίντεο απέτυχαν να εισαχθούν εξαιτίας ενός σφάλματος αρχείου "
 "ή σφάλματος του υλικού:\n"
 
-#: ../src/Dialogs.vala:692
+#: ../src/Dialogs.vala:686
 #, 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"
@@ -1511,7 +1750,7 @@ msgstr[1] ""
 "Απέτυχε η εισαγωγή %d αρχείων λόγω σφάλματος αρχείου ή σφάλματος του "
 "υλικού:\n"
 
-#: ../src/Dialogs.vala:706
+#: ../src/Dialogs.vala:700
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -1525,7 +1764,7 @@ msgstr[1] ""
 "Απέτυχε η εισαγωγή %d φωτογραφιών επειδή ο φάκελος της βιβλιοθήκης δεν είναι "
 "εγγράψιμος:\n"
 
-#: ../src/Dialogs.vala:709
+#: ../src/Dialogs.vala:703
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -1539,7 +1778,7 @@ msgstr[1] ""
 "Απέτυχε η εισαγωγή %d βίντεο επειδή ο φάκελος της βιβλιοθήκης δεν είναι "
 "εγγράψιμος:\n"
 
-#: ../src/Dialogs.vala:712
+#: ../src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1554,7 +1793,7 @@ msgstr[1] ""
 "Απέτυχε η εισαγωγή %d φωτογραφιών/βίντεο επειδή ο φάκελος της βιβλιοθήκης "
 "δεν είναι εγγράψιμος:\n"
 
-#: ../src/Dialogs.vala:715
+#: ../src/Dialogs.vala:709
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -1568,7 +1807,7 @@ msgstr[1] ""
 "Απέτυχε η εισαγωγή %d αρχείων επειδή ο φάκελος της βιβλιοθήκης δεν ήταν "
 "εγγράψιμος:\n"
 
-#: ../src/Dialogs.vala:729
+#: ../src/Dialogs.vala:723
 #, 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"
@@ -1577,7 +1816,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Αποτυχία εισαγωγής %d φωτογραφιών εξαιτίας κάποιου σφάλματος της κάμερας:\n"
 
-#: ../src/Dialogs.vala:732
+#: ../src/Dialogs.vala:726
 #, 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"
@@ -1586,7 +1825,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Αποτυχία εισαγωγής %d βίντεο εξαιτίας κάποιου σφάλματος της κάμερας:\n"
 
-#: ../src/Dialogs.vala:735
+#: ../src/Dialogs.vala:729
 #, 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"
@@ -1597,46 +1836,48 @@ msgstr[1] ""
 "Αποτυχία εισαγωγής %d φωτογραφιών/βίντεο εξαιτίας κάποιου σφάλματος της "
 "κάμερας:\n"
 
-#: ../src/Dialogs.vala:738
+#: ../src/Dialogs.vala:732
 #, 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] "Απέτυχε η εισαγωγή 1 αρχείου λόγω σφάλματος της κάμερας:\n"
 msgstr[1] "Απέτυχε η εισαγωγή %d αρχείων λόγω σφάλματος της κάμερας:\n"
 
-#: ../src/Dialogs.vala:752
+#: ../src/Dialogs.vala:746
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
-msgstr[0] "Αποτυχία εισαγωγής 1 φωτογραφίας επειδή ήταν αλλοιωμένη:\n"
-msgstr[1] "Αποτυχία εισαγωγής %d φωτογραφιών επειδή ήταν αλλοιωμένες:\n"
+msgstr[0] "Αποτυχία εισαγωγής 1 φωτογραφίας επειδή ήταν καταστραμμένη:\n"
+msgstr[1] "Αποτυχία εισαγωγής %d φωτογραφιών επειδή ήταν καταστραμμένες:\n"
 
-#: ../src/Dialogs.vala:755
+#: ../src/Dialogs.vala:749
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
-msgstr[0] "Αποτυχία εισαγωγής 1 βίντεο επειδή ήταν αλλοιωμένο:\n"
-msgstr[1] "Αποτυχία εισαγωγής %d βίντεο επειδή ήταν αλλοιωμένα:\n"
+msgstr[0] "Αποτυχία εισαγωγής 1 βίντεο επειδή ήταν καταστραμμένο:\n"
+msgstr[1] "Αποτυχία εισαγωγής %d βίντεο επειδή ήταν καταστραμμένα:\n"
 
-#: ../src/Dialogs.vala:758
+#: ../src/Dialogs.vala:752
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
-msgstr[0] "Αποτυχία εισαγωγής 1 φωτογραφίας/βίντεο επειδή ήταν αλλοιωμένη:\n"
-msgstr[1] "Αποτυχία εισαγωγής %d φωτογραφιών/βίντεο επειδή ήταν αλλοιωμένες:\n"
+msgstr[0] ""
+"Αποτυχία εισαγωγής 1 φωτογραφίας/βίντεο επειδή ήταν καταστραμμένη/ο:\n"
+msgstr[1] ""
+"Αποτυχία εισαγωγής %d φωτογραφιών/βίντεο επειδή ήταν καταστραμμένες/α:\n"
 
-#: ../src/Dialogs.vala:761
+#: ../src/Dialogs.vala:755
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
-msgstr[0] "Αποτυχία εισαγωγής 1 αρχείου επειδή ήταν αλλοιωμένο:\n"
-msgstr[1] "Αποτυχία εισαγωγής %d αρχείων επειδή ήταν αλλοιωμένα:\n"
+msgstr[0] "Αποτυχία εισαγωγής 1 αρχείου επειδή ήταν καταστραμμένο:\n"
+msgstr[1] "Αποτυχία εισαγωγής %d αρχείων επειδή ήταν καταστραμμένα:\n"
 
 #. we have no notion of "unsupported" video files right now in Shotwell (all
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: ../src/Dialogs.vala:778
+#: ../src/Dialogs.vala:772
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1645,56 +1886,56 @@ msgstr[1] "Παράλειψη %d ανυποστήρικτων φωτογραφί
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: ../src/Dialogs.vala:793
+#: ../src/Dialogs.vala:787
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "Παράλειψη ενός αρχείου που δεν ήταν εικόνας.\n"
 msgstr[1] "Παράλειψη %d αρχείων που δεν ήταν εικόνας.\n"
 
-#: ../src/Dialogs.vala:804
+#: ../src/Dialogs.vala:798
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "Παράλειψη 1 φωτογραφίας λόγω ακύρωσης από το χρήστη:\n"
 msgstr[1] "Παράλειψη %d φωτογραφιών λόγω ακύρωσης από το χρήστη:\n"
 
-#: ../src/Dialogs.vala:807
+#: ../src/Dialogs.vala:801
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "Παράλειψη 1 βίντεο λόγω ακύρωσης από το χρήστη:\n"
 msgstr[1] "Παράλειψη %d βίντεο λόγω ακύρωσης από το χρήστη:\n"
 
-#: ../src/Dialogs.vala:810
+#: ../src/Dialogs.vala:804
 #, 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] "Παράλειψη 1 φωτογραφίας/βίντεο λόγω ακύρωσης από το χρήστη:\n"
 msgstr[1] "Παράλειψη %d φωτογραφιών/βίντεο λόγω ακύρωσης από το χρήστη:\n"
 
-#: ../src/Dialogs.vala:813
+#: ../src/Dialogs.vala:807
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "1 αρχείο παραλείφθηκε λόγω ακύρωσης από το χρήστη:\n"
 msgstr[1] "%d αρχεία παραλείφθηκαν λόγω ακύρωσης από το χρήστη:\n"
 
-#: ../src/Dialogs.vala:827
+#: ../src/Dialogs.vala:821
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "1 φωτογραφία εισήχθη με επιτυχία.\n"
 msgstr[1] "%d φωτογραφίες εισήχθησαν με επιτυχία.\n"
 
-#: ../src/Dialogs.vala:830
+#: ../src/Dialogs.vala:824
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "1 βίντεο εισήχθη με επιτυχία.\n"
 msgstr[1] "%d βίντεο εισήχθησαν με επιτυχία.\n"
 
-#: ../src/Dialogs.vala:833
+#: ../src/Dialogs.vala:827
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -1703,184 +1944,187 @@ msgstr[1] "%d φωτογραφίες/βίντεο εισήχθησαν με επ
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: ../src/Dialogs.vala:849
+#: ../src/Dialogs.vala:843
 msgid "No photos or videos imported.\n"
 msgstr "Δεν εισήχθησαν εικόνες ή βίντεο.\n"
 
-#: ../src/Dialogs.vala:856 ../src/Dialogs.vala:875
+#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
 msgid "Import Complete"
 msgstr "Η εισαγωγή ολοκληρώθηκε"
 
-#: ../src/Dialogs.vala:1103
+#: ../src/Dialogs.vala:1155
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d δευτερόλεπτο"
 msgstr[1] "%d δευτερόλεπτα"
 
-#: ../src/Dialogs.vala:1106
+#: ../src/Dialogs.vala:1158
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d λεπτό"
 msgstr[1] "%d λεπτά"
 
-#: ../src/Dialogs.vala:1110
+#: ../src/Dialogs.vala:1162
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ώρα"
 msgstr[1] "%d ώρες"
 
-#: ../src/Dialogs.vala:1113
+#: ../src/Dialogs.vala:1165
 msgid "1 day"
 msgstr "1 ημέρα"
 
-#: ../src/Dialogs.vala:1263 ../src/Resources.vala:205
+#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
 msgid "Rename Event"
 msgstr "Μετονομασία γεγονότος"
 
-#: ../src/Dialogs.vala:1263
+#: ../src/Dialogs.vala:1315
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: ../src/Dialogs.vala:1273 ../src/Resources.vala:274
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
 msgid "Edit Title"
 msgstr "Επεξεργασία τίτλου"
 
-#: ../src/Dialogs.vala:1273 ../src/Properties.vala:340
+#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
 msgid "Title:"
 msgstr "Τίτλος:"
 
-#: ../src/Dialogs.vala:1287 ../src/Resources.vala:280
+#. Dialog title
+#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
 msgid "Edit Event Comment"
 msgstr "Επεξεργασία σχολίου συμβάντος"
 
-#: ../src/Dialogs.vala:1287
+#: ../src/Dialogs.vala:1344
 msgid "Edit Photo/Video Comment"
 msgstr "Επεξεργασία σχολίου φωτογραφίας/βίντεο"
 
-#: ../src/Dialogs.vala:1288 ../src/Properties.vala:630
+#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
 msgid "Comment:"
 msgstr "Σχόλιο:"
 
-#: ../src/Dialogs.vala:1304
-msgid "_Trash File"
-msgid_plural "_Trash Files"
-msgstr[0] "_Αρχείο κάδου απορριμμάτων"
-msgstr[1] "_Αρχεία κάδου απορριμμάτων"
+#: ../src/Dialogs.vala:1361
+msgid "Remove and _Trash File"
+msgid_plural "Remove and _Trash Files"
+msgstr[0] "Αφαίρεση και μεταφορά του αρχείου στα απορρίμμα_τα"
+msgstr[1] "Αφαίρεση και μεταφορά των αρχείων στα απορρίμμα_τα"
 
-#: ../src/Dialogs.vala:1308
-msgid "Only _Remove"
-msgstr "Α_φαίρεση μόνο"
+#: ../src/Dialogs.vala:1365
+msgid "_Remove From Library"
+msgstr "Αφαί_ρεση από τη βιοβλιοθήκη"
 
-#: ../src/Dialogs.vala:1328 ../src/camera/ImportPage.vala:1739
+#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
 msgid "_Keep"
 msgstr "_Διατήρηση"
 
-#: ../src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edit?"
 msgstr "Να αναιρεθεί η εξωτερική επεξεργασία;"
 
-#: ../src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edits?"
 msgstr "Να αναιρεθούν οι εξωτερικές επεξεργασίες;"
 
-#: ../src/Dialogs.vala:1353
+#: ../src/Dialogs.vala:1410
 #, 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] ""
 "Αυτή η ενέργεια θα καταστρέψει όλες τις αλλαγές που έγιναν στα %d εξωτερικά "
-"αρχεία. Να συνεχιστεί;"
+"αρχεία.  Συνέχεια;"
 
-#: ../src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edit"
 msgstr "_Αναίρεση εξωτερικής επεξεργασίας"
 
-#: ../src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edits"
 msgstr "_Αναίρεση Εξωτερικών Επεξεργασιών"
 
-#: ../src/Dialogs.vala:1378
+#: ../src/Dialogs.vala:1435
 #, 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] ""
-"Αυτή η ενέργεια θα αφαιρέσει %d φωτογραφίες από τη βιβλιοθήκη. Συνέχεια;"
+"Αυτή η ενέργεια θα αφαιρέσει %d φωτογραφίες από τη βιβλιοθήκη.  Συνέχεια;"
 
-#: ../src/Dialogs.vala:1385
+#: ../src/Dialogs.vala:1442 ../src/Resources.vala:178
 msgid "_Remove"
 msgstr "_Αφαίρεση"
 
-#: ../src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photo From Library"
 msgstr "Απομάκρυνση της φωτογραφίας από τη βιβλιοθήκη"
 
-#: ../src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photos From Library"
 msgstr "Απομάκρυνση των φωτογραφιών από τη βιβλιοθήκη"
 
-#: ../src/Dialogs.vala:1479
+#: ../src/Dialogs.vala:1536
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1626
+#: ../src/Dialogs.vala:1688
 msgid "AM"
 msgstr "ΠΜ"
 
-#: ../src/Dialogs.vala:1627
+#: ../src/Dialogs.vala:1689
 msgid "PM"
 msgstr "ΜΜ"
 
-#: ../src/Dialogs.vala:1628
+#: ../src/Dialogs.vala:1690
 msgid "24 Hr"
 msgstr "24 ώρες"
 
-#: ../src/Dialogs.vala:1643
+#: ../src/Dialogs.vala:1705
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Μετακίνηση φωτογραφιών/βίντεο κατά την ίδια ποσότητα"
 
-#: ../src/Dialogs.vala:1648
+#: ../src/Dialogs.vala:1710
 msgid "Set _all photos/videos to this time"
 msgstr "Ορισμός ό_λων των φωτογραφιών/βίντεο σε αυτόν τον χρόνο"
 
-#: ../src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo file"
 msgstr "_Τροποποίηση αρχικού αρχείου φωτογραφίας"
 
-#: ../src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo files"
 msgstr "_Τροποποίηση αρχικών αρχείων φωτογραφίας"
 
-#: ../src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original file"
 msgstr "_Τροποποίηση αυθεντικού αρχείου"
 
-#: ../src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original files"
 msgstr "_Τροποποίηση αυθεντικών αρχείων"
 
-#: ../src/Dialogs.vala:1744
+#: ../src/Dialogs.vala:1806
 msgid "Original: "
 msgstr "Αρχικό: "
 
-#: ../src/Dialogs.vala:1745
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%m/%d/%Y, %H:%M:%S"
 
-#: ../src/Dialogs.vala:1746
+#: ../src/Dialogs.vala:1808
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%m/%d/%Y, %I:%M:%S %p"
 
-#: ../src/Dialogs.vala:1835
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -1889,7 +2133,7 @@ msgstr ""
 "Ο χρόνος έκθεσης θα μετατοπιστεί προς τα εμπρός κατά\n"
 "%d %s, %d %s, %d %s, και %d %s."
 
-#: ../src/Dialogs.vala:1836
+#: ../src/Dialogs.vala:1898
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -1898,31 +2142,31 @@ msgstr ""
 "Ο χρόνος έκθεσης θα μετατοπιστεί προς τα πίσω κατά\n"
 "%d %s, %d %s, %d %s, και %d %s."
 
-#: ../src/Dialogs.vala:1838
+#: ../src/Dialogs.vala:1900
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ημέρα"
 msgstr[1] "ημέρες"
 
-#: ../src/Dialogs.vala:1839
+#: ../src/Dialogs.vala:1901
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ώρα"
 msgstr[1] "ώρες"
 
-#: ../src/Dialogs.vala:1840
+#: ../src/Dialogs.vala:1902
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "λεπτό"
 msgstr[1] "λεπτά"
 
-#: ../src/Dialogs.vala:1841
+#: ../src/Dialogs.vala:1903
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "δευτερόλεπτο"
 msgstr[1] "δευτερόλεπτα"
 
-#: ../src/Dialogs.vala:1885
+#: ../src/Dialogs.vala:1947
 #, c-format
 msgid ""
 "\n"
@@ -1941,51 +2185,51 @@ msgstr[1] ""
 "\n"
 "Και %d άλλα."
 
-#: ../src/Dialogs.vala:1907 ../src/Dialogs.vala:1934
+#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
 msgid "Tags (separated by commas):"
 msgstr "Ετικέτες (διαχωρισμένες με κόμματα):"
 
-#: ../src/Dialogs.vala:2014
+#: ../src/Dialogs.vala:2076
 msgid "Welcome!"
 msgstr "Καλώς ήλθατε!"
 
-#: ../src/Dialogs.vala:2021
+#: ../src/Dialogs.vala:2083
 msgid "Welcome to Shotwell!"
 msgstr "Καλωσορίσατε στο Shotwell!"
 
-#: ../src/Dialogs.vala:2025
+#: ../src/Dialogs.vala:2087
 msgid "To get started, import photos in any of these ways:"
 msgstr ""
 "Για να ξεκινήσετε, εισάγετε φωτογραφίες με κάποιον από αυτούς τους τρόπους:"
 
-#: ../src/Dialogs.vala:2044
+#: ../src/Dialogs.vala:2106
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Επιλέξτε <span weight=\"bold\">Εισαγωγή %s αρχείων από φάκελο</span>"
 
-#: ../src/Dialogs.vala:2045
+#: ../src/Dialogs.vala:2107
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Μεταφορά και απόθεση φωτογραφιών στο παράθυρο του Shotwell"
 
-#: ../src/Dialogs.vala:2046
+#: ../src/Dialogs.vala:2108
 msgid "Connect a camera to your computer and import"
 msgstr "Συνδέστε μια κάμερα στον υπολογιστή σας και εισάγετε"
 
-#: ../src/Dialogs.vala:2056
+#: ../src/Dialogs.vala:2118
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Εισαγωγή φωτογραφιών από το φάκελο %s"
 
-#: ../src/Dialogs.vala:2063
+#: ../src/Dialogs.vala:2125
 msgid "You can also import photos in any of these ways:"
 msgstr ""
 "Μπορείτε επίσης να εισάγετε φωτογραφίες με κάποιον από αυτούς τους τρόπους:"
 
-#: ../src/Dialogs.vala:2073
+#: ../src/Dialogs.vala:2135
 msgid "_Don't show this message again"
 msgstr "_Να μην εμφανιστεί ξανά αυτό το μήνυμα"
 
-#: ../src/Dialogs.vala:2108
+#: ../src/Dialogs.vala:2170
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Εισαγωγή φωτογραφιών από τη συλλογή %s"
@@ -1993,41 +2237,41 @@ msgstr "Εισαγωγή φωτογραφιών από τη συλλογή %s"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2252 ../src/Dialogs.vala:2256
+#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
 msgid "(Help)"
 msgstr "(Βοήθεια)"
 
-#: ../src/Dialogs.vala:2265
+#: ../src/Dialogs.vala:2324
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Έτος%sΜήνας%sΗμέρα"
 
-#: ../src/Dialogs.vala:2267
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth"
 msgstr "Έτος%sΜήνας"
 
-#: ../src/Dialogs.vala:2269
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Έτος%sΜήνας-Ημέρα"
 
-#: ../src/Dialogs.vala:2271
+#: ../src/Dialogs.vala:2330
 msgid "Year-Month-Day"
 msgstr "Έτος-Μήνας-Ημέρα"
 
-#: ../src/Dialogs.vala:2272 ../src/editing_tools/EditingTools.vala:781
+#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Προσαρμοσμένο"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2509
+#: ../src/Dialogs.vala:2568
 msgid "Invalid pattern"
 msgstr "Μη έγκυρο πρότυπο"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: ../src/Dialogs.vala:2612
+#: ../src/Dialogs.vala:2670
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2035,31 +2279,31 @@ msgstr ""
 "Το Shotwell μπορεί να αντιγράψει τις φωτογραφίες στο φάκελο της βιβλιοθήκης "
 "ή μπορεί να τις εισάγει χωρίς να τις αντιγράψει."
 
-#: ../src/Dialogs.vala:2617
+#: ../src/Dialogs.vala:2675
 msgid "Co_py Photos"
 msgstr "_Αντιγραφή φωτογραφιών"
 
-#: ../src/Dialogs.vala:2618
+#: ../src/Dialogs.vala:2676
 msgid "_Import in Place"
 msgstr "_Εισαγωγή σε φάκελο"
 
-#: ../src/Dialogs.vala:2619
+#: ../src/Dialogs.vala:2677
 msgid "Import to Library"
 msgstr "Εισαγωγή στη βιβλιοθήκη"
 
-#: ../src/Dialogs.vala:2629 ../src/PhotoPage.vala:3079
+#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
 msgid "Remove From Library"
 msgstr "Απομάκρυνση από τη Βιβλιοθήκη"
 
-#: ../src/Dialogs.vala:2630 ../src/PhotoPage.vala:3079
+#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
 msgid "Removing Photo From Library"
 msgstr "Απομάκρυνση της φωτογραφίας από τη βιβλιοθήκη"
 
-#: ../src/Dialogs.vala:2630
+#: ../src/Dialogs.vala:2688
 msgid "Removing Photos From Library"
 msgstr "Αφαίρεση των φωτογραφιών από τη Βιβλιοθήκη"
 
-#: ../src/Dialogs.vala:2644
+#: ../src/Dialogs.vala:2702
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -2084,7 +2328,7 @@ msgstr[1] ""
 "\n"
 "Αυτή η κίνηση δεν μπορεί να αναιρεθεί."
 
-#: ../src/Dialogs.vala:2648
+#: ../src/Dialogs.vala:2706
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -2109,7 +2353,7 @@ msgstr[1] ""
 "\n"
 "Αυτή η κίνηση δεν μπορεί να αναιρεθεί."
 
-#: ../src/Dialogs.vala:2652
+#: ../src/Dialogs.vala:2710
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -2134,7 +2378,7 @@ msgstr[1] ""
 "\n"
 "Αυτή η κίνηση δεν μπορεί να αναιρεθεί."
 
-#: ../src/Dialogs.vala:2684
+#: ../src/Dialogs.vala:2742
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -2148,17 +2392,13 @@ msgstr[1] ""
 "επιφάνειας εργασίας. Να διαγραφούν αυτά τα αρχεία;"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2701
+#: ../src/Dialogs.vala:2759
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
 msgstr[0] "Δεν είναι δυνατή η διαγραφή της εικόνας ή του βίντεο."
 msgstr[1] "Δεν είναι δυνατή η διαγραφή %d εικόνων ή βίντεο."
 
-#: ../src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Πλάτος ή ύψος"
-
 #: ../src/Dimensions.vala:23
 msgid "Width"
 msgstr "Πλάτος"
@@ -2174,7 +2414,7 @@ msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Αδυναμία παρακολούθησης του %s: Δεν είναι φάκελος (%s)"
 
 #. if no name, pretty up the start time
-#: ../src/Event.vala:737
+#: ../src/Event.vala:751
 #, c-format
 msgid "Event %s"
 msgstr "Συμβάν %s"
@@ -2214,120 +2454,116 @@ msgstr "Εξαγωγή"
 msgid "Unable to process monitoring updates: %s"
 msgstr "Η επεξεργασία της παρακολούθησης των ενημερώσεων δεν ήταν δυνατή: %s"
 
-#: ../src/MediaPage.vala:143
+#: ../src/MediaPage.vala:157
 msgid "Adjust the size of the thumbnails"
 msgstr "Προσαρμογή μεγέθους μικρογραφιών"
 
-#: ../src/MediaPage.vala:325 ../src/PhotoPage.vala:2583
-#: ../src/direct/DirectPhotoPage.vala:174
+#: ../src/MediaPage.vala:339 ../src/PhotoPage.vala:2593
+#: ../src/Resources.vala:188 ../src/direct/DirectPhotoPage.vala:174
 msgid "Zoom _In"
 msgstr "_Μεγέθυνση"
 
-#: ../src/MediaPage.vala:326
+#: ../src/MediaPage.vala:340
 msgid "Increase the magnification of the thumbnails"
 msgstr "Αύξηση της μεγέθυνσης των μικρογραφιών"
 
-#: ../src/MediaPage.vala:331 ../src/PhotoPage.vala:2589
-#: ../src/direct/DirectPhotoPage.vala:180
+#: ../src/MediaPage.vala:345 ../src/PhotoPage.vala:2599
+#: ../src/Resources.vala:189 ../src/direct/DirectPhotoPage.vala:180
 msgid "Zoom _Out"
 msgstr "Σμίκρ_υνση"
 
-#: ../src/MediaPage.vala:332
+#: ../src/MediaPage.vala:346
 msgid "Decrease the magnification of the thumbnails"
 msgstr "Μείωση της μεγέθυνσης των μικρογραφιών"
 
-#: ../src/MediaPage.vala:399
+#: ../src/MediaPage.vala:413
 msgid "Sort _Photos"
 msgstr "_Ταξινόμηση φωτογραφιών"
 
-#: ../src/MediaPage.vala:408
+#: ../src/MediaPage.vala:422
 msgid "_Play Video"
 msgstr "_Αναπαραγωγή βίντεο"
 
-#: ../src/MediaPage.vala:409
+#: ../src/MediaPage.vala:423
 msgid "Open the selected videos in the system video player"
 msgstr ""
 "Άνοιγμα των επιλεγμένων βίντεο με την εφαρμογή αναπαραγωγής του συστήματος"
 
-#: ../src/MediaPage.vala:413 ../src/PhotoPage.vala:2632
+#: ../src/MediaPage.vala:427 ../src/PhotoPage.vala:2642
 msgid "_Developer"
 msgstr "_Επεξεργασία RAW"
 
-#: ../src/MediaPage.vala:420 ../src/photos/RawSupport.vala:297
-msgid "Shotwell"
-msgstr "Shotwell"
-
-#: ../src/MediaPage.vala:425 ../src/camera/Branch.vala:101
+#: ../src/MediaPage.vala:439 ../src/camera/Branch.vala:99
 #: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
-#: ../src/photos/RawSupport.vala:300
+#: ../src/photos/RawSupport.vala:303
 msgid "Camera"
 msgstr "Κάμερα"
 
-#: ../src/MediaPage.vala:436 ../src/camera/ImportPage.vala:872
+#: ../src/MediaPage.vala:450 ../src/camera/ImportPage.vala:874
 msgid "_Titles"
 msgstr "Τίτ_λοι"
 
-#: ../src/MediaPage.vala:437 ../src/camera/ImportPage.vala:873
+#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:875
 msgid "Display the title of each photo"
 msgstr "Εμφάνιση του τίτλου κάθε φωτογραφίας"
 
-#: ../src/MediaPage.vala:442 ../src/events/EventsDirectoryPage.vala:130
+#: ../src/MediaPage.vala:456 ../src/events/EventsDirectoryPage.vala:130
 msgid "_Comments"
 msgstr "_Σχόλια"
 
-#: ../src/MediaPage.vala:443
+#: ../src/MediaPage.vala:457
 msgid "Display the comment of each photo"
 msgstr "Εμφάνιση του σχολίου κάθε φωτογραφίας"
 
-#: ../src/MediaPage.vala:454 ../src/library/LibraryWindow.vala:376
+#: ../src/MediaPage.vala:468 ../src/library/LibraryWindow.vala:375
 msgid "Ta_gs"
 msgstr "_Ετικέτες"
 
-#: ../src/MediaPage.vala:455
+#: ../src/MediaPage.vala:469
 msgid "Display each photo's tags"
 msgstr "Εμφάνιση των ετικετών κάθε φωτογραφίας"
 
-#: ../src/MediaPage.vala:471
+#: ../src/MediaPage.vala:485
 msgid "By _Title"
 msgstr "Κατά _τίτλο"
 
-#: ../src/MediaPage.vala:472
+#: ../src/MediaPage.vala:486
 msgid "Sort photos by title"
 msgstr "Ταξινόμηση των φωτογραφιών βάσει τίτλου"
 
-#: ../src/MediaPage.vala:477
+#: ../src/MediaPage.vala:491
 msgid "By Exposure _Date"
 msgstr "Κατά _ημερομηνία τροποποίησης"
 
-#: ../src/MediaPage.vala:478
+#: ../src/MediaPage.vala:492
 msgid "Sort photos by exposure date"
 msgstr "Ταξινόμηση φωτογραφιών βάσει ημερομηνία έκθεσης"
 
-#: ../src/MediaPage.vala:483
+#: ../src/MediaPage.vala:497
 msgid "By _Rating"
 msgstr "Βάσει _αξιολόγησης"
 
-#: ../src/MediaPage.vala:484
+#: ../src/MediaPage.vala:498
 msgid "Sort photos by rating"
 msgstr "Ταξινόμηση των φωτογραφιών βάσει αξιολόγησης"
 
-#: ../src/MediaPage.vala:494 ../src/library/LibraryWindow.vala:422
+#: ../src/MediaPage.vala:508 ../src/library/LibraryWindow.vala:421
 msgid "_Ascending"
 msgstr "_Αύξουσα"
 
-#: ../src/MediaPage.vala:495 ../src/library/LibraryWindow.vala:423
+#: ../src/MediaPage.vala:509 ../src/library/LibraryWindow.vala:422
 msgid "Sort photos in an ascending order"
 msgstr "Ταξινόμηση φωτογραφιών κατά αύξουσα σειρά"
 
-#: ../src/MediaPage.vala:500 ../src/library/LibraryWindow.vala:429
+#: ../src/MediaPage.vala:514 ../src/library/LibraryWindow.vala:428
 msgid "D_escending"
 msgstr "_Φθινουσα"
 
-#: ../src/MediaPage.vala:501 ../src/library/LibraryWindow.vala:430
+#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:429
 msgid "Sort photos in a descending order"
 msgstr "Ταξινόμηση φωτογραφιών κατά φθίνουσα σειρά"
 
-#: ../src/MediaPage.vala:702
+#: ../src/MediaPage.vala:716
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -2336,99 +2572,99 @@ msgstr ""
 "Το Shotwell απέτυχε να παίξει το επιλεγμένο βίντεο:\n"
 "%s"
 
-#: ../src/Page.vala:1268
+#: ../src/Page.vala:1263
 msgid "No photos/videos"
 msgstr "Καμία φωτογραφία/βίντεο"
 
-#: ../src/Page.vala:1272
+#: ../src/Page.vala:1267
 msgid "No photos/videos found"
 msgstr "Δεν βρέθηκαν φωτογραφίες/βίντεο"
 
-#: ../src/Page.vala:2569
+#: ../src/Page.vala:2565
 msgid "Photos cannot be exported to this directory."
 msgstr "Δεν είναι δυνατή η εξαγωγή των φωτογραφιών σε αυτόν τον φάκελο."
 
-#: ../src/Photo.vala:3656
+#: ../src/Photo.vala:3753
 msgid "modified"
 msgstr "τροποποιημένο"
 
 #. previous button
-#: ../src/PhotoPage.vala:532
+#: ../src/PhotoPage.vala:533
 msgid "Previous photo"
 msgstr "Προηγούμενη φωτογραφία"
 
 #. next button
-#: ../src/PhotoPage.vala:537
+#: ../src/PhotoPage.vala:539
 msgid "Next photo"
 msgstr "Επόμενη φωτογραφία"
 
-#: ../src/PhotoPage.vala:1844
+#: ../src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Το πηγαίο αρχείο της φωτογραφίας λείπει:%s"
 
-#: ../src/PhotoPage.vala:2404 ../src/direct/DirectPhotoPage.vala:165
-#: ../src/library/LibraryWindow.vala:360
+#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
+#: ../src/library/LibraryWindow.vala:359
 msgid "_View"
 msgstr "_Προβολή"
 
-#: ../src/PhotoPage.vala:2408 ../src/direct/DirectPhotoPage.vala:81
+#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
 msgid "T_ools"
 msgstr "Ε_ργαλεία"
 
-#: ../src/PhotoPage.vala:2413 ../src/direct/DirectPhotoPage.vala:86
+#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
 msgid "_Previous Photo"
 msgstr "_Προηγούμενη φωτογραφία"
 
-#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:87
+#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
 msgid "Previous Photo"
 msgstr "Προηγούμενη φωτογραφία"
 
-#: ../src/PhotoPage.vala:2419 ../src/direct/DirectPhotoPage.vala:92
+#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
 msgid "_Next Photo"
 msgstr "_Επόμενη φωτογραφία"
 
-#: ../src/PhotoPage.vala:2420 ../src/direct/DirectPhotoPage.vala:93
+#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
 msgid "Next Photo"
 msgstr "Επόμενη φωτογραφία"
 
-#: ../src/PhotoPage.vala:2584 ../src/direct/DirectPhotoPage.vala:175
+#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
 msgid "Increase the magnification of the photo"
 msgstr "Αύξηση της μεγέθυνσης της φωτογραφίας"
 
-#: ../src/PhotoPage.vala:2590 ../src/direct/DirectPhotoPage.vala:181
+#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
 msgid "Decrease the magnification of the photo"
 msgstr "Μείωση της μεγέθυνσης της φωτογραφίας"
 
-#: ../src/PhotoPage.vala:2595 ../src/direct/DirectPhotoPage.vala:186
+#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
 msgid "Fit to _Page"
 msgstr "Μέγεθος _οθόνης"
 
-#: ../src/PhotoPage.vala:2596 ../src/direct/DirectPhotoPage.vala:187
+#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
 msgid "Zoom the photo to fit on the screen"
 msgstr "Μεγέθυνση της εικόνας στο μέγεθος της οθόνης"
 
-#: ../src/PhotoPage.vala:2602 ../src/direct/DirectPhotoPage.vala:193
+#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
 #, no-c-format
 msgid "Zoom _100%"
 msgstr "Μεγέθυνση _100%"
 
-#: ../src/PhotoPage.vala:2604 ../src/direct/DirectPhotoPage.vala:195
+#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
 #, no-c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "Μεγέθυνση της φωτογραφίας στο 100%"
 
-#: ../src/PhotoPage.vala:2610 ../src/direct/DirectPhotoPage.vala:201
+#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
 #, no-c-format
 msgid "Zoom _200%"
 msgstr "Μεγέθυνση _200%"
 
-#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:203
+#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
 #, no-c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "Μεγέθυνση της φωτογραφίας στο 200%"
 
-#: ../src/PhotoPage.vala:3220
+#: ../src/PhotoPage.vala:3231
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Αδυναμία εξαγωγής %s: %s"
@@ -2601,7 +2837,7 @@ msgstr "Από:"
 msgid "To:"
 msgstr "Σε:"
 
-#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1861
+#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1890
 msgid "Size:"
 msgstr "Μέγεθος:"
 
@@ -2620,72 +2856,72 @@ msgstr "Προγραμματιστής:"
 
 #. fit both on the top line, emit and move on
 #: ../src/Properties.vala:436 ../src/Properties.vala:440
-#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2229
+#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2258
 msgid "Exposure:"
 msgstr "Έκθεση:"
 
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:585
+#: ../src/Properties.vala:583
 msgid "Location:"
 msgstr "Τοποθεσία:"
 
-#: ../src/Properties.vala:588
+#: ../src/Properties.vala:586
 msgid "File size:"
 msgstr "Μέγεθος αρχείου:"
 
-#: ../src/Properties.vala:592
+#: ../src/Properties.vala:590
 msgid "Current Development:"
 msgstr "Τρέχουσα Ανάπτυξη:"
 
-#: ../src/Properties.vala:594
+#: ../src/Properties.vala:592
 msgid "Original dimensions:"
 msgstr "Αρχικές διαστάσεις:"
 
-#: ../src/Properties.vala:597
+#: ../src/Properties.vala:595
 msgid "Camera make:"
 msgstr "Κατασκευαστής κάμερας:"
 
-#: ../src/Properties.vala:600
+#: ../src/Properties.vala:598
 msgid "Camera model:"
 msgstr "Μοντέλο κάμερας:"
 
-#: ../src/Properties.vala:603
+#: ../src/Properties.vala:601
 msgid "Flash:"
 msgstr "Φλας:"
 
-#: ../src/Properties.vala:605
+#: ../src/Properties.vala:603
 msgid "Focal length:"
 msgstr "Εστιακό μήκος:"
 
-#: ../src/Properties.vala:608
+#: ../src/Properties.vala:606
 msgid "Exposure date:"
 msgstr "Ημερομηνία έκθεσης:"
 
-#: ../src/Properties.vala:611
+#: ../src/Properties.vala:609
 msgid "Exposure time:"
 msgstr "Χρόνος έκθεσης:"
 
-#: ../src/Properties.vala:614
+#: ../src/Properties.vala:612
 msgid "Exposure bias:"
 msgstr "Πόλωση έκθεσης:"
 
-#: ../src/Properties.vala:616
+#: ../src/Properties.vala:614
 msgid "GPS latitude:"
 msgstr "Γεωγραφικό πλάτος GPS:"
 
-#: ../src/Properties.vala:619
+#: ../src/Properties.vala:617
 msgid "GPS longitude:"
 msgstr "Γεωγραφικό μήκος GPS:"
 
-#: ../src/Properties.vala:622
+#: ../src/Properties.vala:620
 msgid "Artist:"
 msgstr "Καλλιτέχνης:"
 
-#: ../src/Properties.vala:624
+#: ../src/Properties.vala:622
 msgid "Copyright:"
 msgstr "Πνευματικά δικαιώματα:"
 
-#: ../src/Properties.vala:626
+#: ../src/Properties.vala:624
 msgid "Software:"
 msgstr "Λογισμικό:"
 
@@ -2747,613 +2983,714 @@ msgid "Flip Vertically"
 msgstr "Κατακόρυφος κατοπτρισμός"
 
 #: ../src/Resources.vala:160
+msgid "_About"
+msgstr "Πε_ρί"
+
+#: ../src/Resources.vala:161
+msgid "_Apply"
+msgstr "Ε_φαρμογή"
+
+#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
+#: ../src/library/LibraryWindow.vala:355
+msgid "_Edit"
+msgstr "_Επεξεργασία"
+
+#: ../src/Resources.vala:165
+msgid "_Forward"
+msgstr "Π_ροώθηση"
+
+#: ../src/Resources.vala:166
+msgid "Fulls_creen"
+msgstr "Πλήρης ο_θόνη"
+
+#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
+#: ../src/library/LibraryWindow.vala:379
+msgid "_Help"
+msgstr "_Βοήθεια"
+
+#: ../src/Resources.vala:168
+msgid "Leave _Fullscreen"
+msgstr "Έ_ξοδος από πλήρη οθόνη"
+
+#: ../src/Resources.vala:169 ../src/Resources.vala:371
+msgid "_New"
+msgstr "_Νέο"
+
+#: ../src/Resources.vala:170
+msgid "_Next"
+msgstr "Επόμε_νο"
+
+#: ../src/Resources.vala:171
+msgid "_OK"
+msgstr "Ε_ντάξει"
+
+#: ../src/Resources.vala:172
+msgid "_Play"
+msgstr "Ανα_παραγωγή"
+
+#: ../src/Resources.vala:173 ../src/Resources.vala:325
+msgid "_Preferences"
+msgstr "_Προτιμήσεις"
+
+#: ../src/Resources.vala:174
+msgid "_Previous"
+msgstr "Προη_γούμενο"
+
+#: ../src/Resources.vala:175
+msgid "_Print"
+msgstr "Ε_κτύπωση"
+
+#: ../src/Resources.vala:176
+msgid "_Quit"
+msgstr "Έ_ξοδος"
+
+#: ../src/Resources.vala:177
+msgid "_Refresh"
+msgstr "Ανα_νέωση"
+
+#: ../src/Resources.vala:179
+msgid "_Revert"
+msgstr "Επανα_φορά"
+
+#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save"
+msgstr "_Αποθήκευση"
+
+#: ../src/Resources.vala:181
+msgid "Save _As"
+msgstr "Αποθήκευση _ως"
+
+#: ../src/Resources.vala:182
+msgid "Sort _Ascending"
+msgstr "Αύξουσα τα_ξινόμηση"
+
+#: ../src/Resources.vala:183
+msgid "Sort _Descending"
+msgstr "Φθίνουσα τ_αξινόμηση"
+
+#: ../src/Resources.vala:184
+msgid "_Stop"
+msgstr "_Διακοπή"
+
+#: ../src/Resources.vala:185
+msgid "_Undelete"
+msgstr "Επα_ναφορά"
+
+#: ../src/Resources.vala:186
+msgid "_Normal Size"
+msgstr "Κα_νονικό μέγεθος"
+
+#: ../src/Resources.vala:187
+msgid "Best _Fit"
+msgstr "Βέλτιστο ταί_ριασμα"
+
+#: ../src/Resources.vala:191
 msgid "_Enhance"
 msgstr "_Βελτίωση"
 
-#: ../src/Resources.vala:161
+#: ../src/Resources.vala:192
 msgid "Enhance"
 msgstr "Βελτίωση"
 
-#: ../src/Resources.vala:162
+#: ../src/Resources.vala:193
 msgid "Automatically improve the photo's appearance"
 msgstr "Αυτόματη βελτίωση της εμφάνισης της φωτογραφίας"
 
-#: ../src/Resources.vala:164
+#: ../src/Resources.vala:195
 msgid "_Copy Color Adjustments"
 msgstr "Α_ντιγραφή ρυθμίσεων χρώματος"
 
-#: ../src/Resources.vala:165
+#: ../src/Resources.vala:196
 msgid "Copy Color Adjustments"
 msgstr "Αντιγραφή ρυθμίσεων χρώματος"
 
-#: ../src/Resources.vala:166
+#: ../src/Resources.vala:197
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Αντιγραφή των εφαρμοζόμενων ρυθμίσεων χρώματος στη φωτογραφία"
 
-#: ../src/Resources.vala:168
+#: ../src/Resources.vala:199
 msgid "_Paste Color Adjustments"
 msgstr "Ε_πικόλληση ρυθμίσεων χρώματος"
 
-#: ../src/Resources.vala:169
+#: ../src/Resources.vala:200
 msgid "Paste Color Adjustments"
 msgstr "Επικόλληση ρυθμίσεων χρώματος"
 
-#: ../src/Resources.vala:170
+#: ../src/Resources.vala:201
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Εφαρμογή αντιγραμμένων ρυθμίσεων χρώματος στις επιλεγμένες φωτογραφίες"
 
-#: ../src/Resources.vala:172
+#: ../src/Resources.vala:203
 msgid "_Crop"
 msgstr "_Κοπή"
 
-#: ../src/Resources.vala:173
+#: ../src/Resources.vala:204
 msgid "Crop"
 msgstr "Κοπή"
 
-#: ../src/Resources.vala:174
+#: ../src/Resources.vala:205
 msgid "Crop the photo's size"
 msgstr "Κοπή μεγέθους φωτογραφίας"
 
-#: ../src/Resources.vala:176 ../src/editing_tools/StraightenTool.vala:100
+#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
 msgid "_Straighten"
 msgstr "Ί_σιωμα"
 
-#: ../src/Resources.vala:177
+#: ../src/Resources.vala:208
 msgid "Straighten"
 msgstr "Ίσιωμα"
 
-#: ../src/Resources.vala:178
+#: ../src/Resources.vala:209
 msgid "Straighten the photo"
 msgstr "Ίσιωμα της εικόνας"
 
-#: ../src/Resources.vala:180
+#: ../src/Resources.vala:211
 msgid "_Red-eye"
 msgstr "_Φαινόμενο κόκκινων ματιών"
 
-#: ../src/Resources.vala:181
+#: ../src/Resources.vala:212
 msgid "Red-eye"
 msgstr "Φαινόμενο κόκκινων ματιών"
 
-#: ../src/Resources.vala:182
+#: ../src/Resources.vala:213
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr ""
 "Μείωση ή εξαφάνιση επιδράσεων φαινομένου κόκκινων-ματιών στη φωτογραφία"
 
-#: ../src/Resources.vala:184
+#: ../src/Resources.vala:215
 msgid "_Adjust"
 msgstr "_Προσαρμογή"
 
-#: ../src/Resources.vala:185
+#: ../src/Resources.vala:216
 msgid "Adjust"
 msgstr "Προσαρμογή"
 
-#: ../src/Resources.vala:186
+#: ../src/Resources.vala:217
 msgid "Adjust the photo's color and tone"
 msgstr "Ρύθμιση χρώματος και τόνου της φωτογραφίας"
 
-#: ../src/Resources.vala:188
+#: ../src/Resources.vala:219
 msgid "Re_vert to Original"
 msgstr "_Επαναφορά στην αρχική"
 
-#: ../src/Resources.vala:189
+#: ../src/Resources.vala:220
 msgid "Revert to Original"
 msgstr "Επαναφορά στην αρχική"
 
-#: ../src/Resources.vala:191
+#: ../src/Resources.vala:222
 msgid "Revert External E_dits"
 msgstr "Αναίρεση ε_ξωτερικών επεξεργασιών"
 
-#: ../src/Resources.vala:192
+#: ../src/Resources.vala:223
 msgid "Revert to the master photo"
 msgstr "Επαναφορά στην αρχική φωτογραφία"
 
-#: ../src/Resources.vala:194
+#: ../src/Resources.vala:225
 msgid "Set as _Desktop Background"
 msgstr "Ορισμός ως _παρασκηνίου επιφάνειας εργασίας"
 
-#: ../src/Resources.vala:195
+#: ../src/Resources.vala:226
 msgid "Set selected image to be the new desktop background"
 msgstr ""
 "Ορισμός της επιλεγμένης φωτογραφίας σαν νέο παρασκήνιο επιφάνειας εργασίας"
 
-#: ../src/Resources.vala:196
+#: ../src/Resources.vala:227
 msgid "Set as _Desktop Slideshow..."
 msgstr "Ορισμός ως προβολής διαφανειών _επιφάνειας εργασίας..."
 
-#: ../src/Resources.vala:198
+#: ../src/Resources.vala:229
 msgid "_Undo"
 msgstr "_Αναίρεση"
 
-#: ../src/Resources.vala:199
+#: ../src/Resources.vala:230
 msgid "Undo"
 msgstr "Αναίρεση"
 
-#: ../src/Resources.vala:201
+#: ../src/Resources.vala:232
 msgid "_Redo"
 msgstr "Α_κύρωση αναίρεσης"
 
-#: ../src/Resources.vala:202
+#: ../src/Resources.vala:233
 msgid "Redo"
 msgstr "Ακύρωση αναίρεσης"
 
-#: ../src/Resources.vala:204
+#: ../src/Resources.vala:235
 msgid "Re_name Event..."
 msgstr "_Μετονομασία συμβάντος..."
 
-#: ../src/Resources.vala:207
+#: ../src/Resources.vala:238
 msgid "Make _Key Photo for Event"
 msgstr "Δημιουργία φωτογραφίας-_κλειδιού για το συμβάν"
 
-#: ../src/Resources.vala:208
+#: ../src/Resources.vala:239
 msgid "Make Key Photo for Event"
 msgstr "Δημιουργία φωτογραφίας-κλειδιού για το συμβάν"
 
-#: ../src/Resources.vala:210
+#: ../src/Resources.vala:241
 msgid "_New Event"
 msgstr "_Νέο συμβάν"
 
-#: ../src/Resources.vala:211
+#: ../src/Resources.vala:242
 msgid "New Event"
 msgstr "Νέο συμβάν"
 
-#: ../src/Resources.vala:213
+#: ../src/Resources.vala:244
 msgid "Move Photos"
 msgstr "Μετακίνηση φωτογραφιών"
 
-#: ../src/Resources.vala:214
+#: ../src/Resources.vala:245
 msgid "Move photos to an event"
 msgstr "Μετακίνηση εικόνων σε ένα συμβάν"
 
-#: ../src/Resources.vala:216
+#: ../src/Resources.vala:247
 msgid "_Merge Events"
 msgstr "_Συγχώνευση συμβάντων"
 
-#: ../src/Resources.vala:217
+#: ../src/Resources.vala:248
 msgid "Merge"
 msgstr "Συγχώνευση"
 
-#: ../src/Resources.vala:218
+#: ../src/Resources.vala:249
 msgid "Combine events into a single event"
 msgstr "Σύμπτηξη εκδηλώσεων σε μια εκδήλωση"
 
-#: ../src/Resources.vala:220
+#: ../src/Resources.vala:251
 msgid "_Set Rating"
 msgstr "_Ορισμός αξιολόγησης"
 
-#: ../src/Resources.vala:221
+#: ../src/Resources.vala:252
 msgid "Set Rating"
 msgstr "Ορισμός αξιολόγησης"
 
-#: ../src/Resources.vala:222
+#: ../src/Resources.vala:253
 msgid "Change the rating of your photo"
 msgstr "Αλλαγή της αξιολόγησης της φωτογραφίας"
 
-#: ../src/Resources.vala:224
+#: ../src/Resources.vala:255
 msgid "_Increase"
 msgstr "_Αύξηση"
 
-#: ../src/Resources.vala:225
+#: ../src/Resources.vala:256
 msgid "Increase Rating"
 msgstr "Αύξηση αξιολόγησης"
 
-#: ../src/Resources.vala:227
+#: ../src/Resources.vala:258
 msgid "_Decrease"
 msgstr "_Μείωση"
 
-#: ../src/Resources.vala:228
+#: ../src/Resources.vala:259
 msgid "Decrease Rating"
 msgstr "Μείωση αξιολόγησης"
 
-#: ../src/Resources.vala:230
+#: ../src/Resources.vala:261
 msgid "_Unrated"
 msgstr "_Χωρίς αξιολόγηση"
 
-#: ../src/Resources.vala:231
+#: ../src/Resources.vala:262
 msgid "Unrated"
 msgstr "Χωρίς αξιολόγηση"
 
-#: ../src/Resources.vala:232
+#: ../src/Resources.vala:263
 msgid "Rate Unrated"
 msgstr "Αξιολόγηση αβαθμολόγητων"
 
-#: ../src/Resources.vala:233
+#: ../src/Resources.vala:264
 msgid "Setting as unrated"
 msgstr "Ορισμός ως χωρίς αξιολόγηση"
 
-#: ../src/Resources.vala:234
+#: ../src/Resources.vala:265
 msgid "Remove any ratings"
 msgstr "Διαγραφή αξιολογήσεων"
 
-#: ../src/Resources.vala:236
+#: ../src/Resources.vala:267
 msgid "_Rejected"
 msgstr "_Απορρίφθηκε"
 
-#: ../src/Resources.vala:237
+#: ../src/Resources.vala:268
 msgid "Rejected"
 msgstr "Απορρίφθηκε"
 
-#: ../src/Resources.vala:238
+#: ../src/Resources.vala:269
 msgid "Rate Rejected"
 msgstr "Η αξιολόγηση απορρίφθηκε"
 
-#: ../src/Resources.vala:239
+#: ../src/Resources.vala:270
 msgid "Setting as rejected"
 msgstr "Ορισμός ως απορριφθείσα"
 
-#: ../src/Resources.vala:240
+#: ../src/Resources.vala:271
 msgid "Set rating to rejected"
 msgstr "Ορισμός αξιολόγησης ως απορριφθείσα"
 
-#: ../src/Resources.vala:242
+#: ../src/Resources.vala:273
 msgid "Rejected _Only"
 msgstr "Απορριφθείσες _μόνο"
 
-#: ../src/Resources.vala:243
+#: ../src/Resources.vala:274
 msgid "Rejected Only"
 msgstr "Απορριφθείσες μόνο"
 
-#: ../src/Resources.vala:244
+#: ../src/Resources.vala:275
 msgid "Show only rejected photos"
 msgstr "Εμφάνιση μόνο των απορριφθέντων φωτογραφιών"
 
-#: ../src/Resources.vala:246
+#: ../src/Resources.vala:277
 msgid "All + _Rejected"
 msgstr "Όλες + _απορριφθείσες"
 
-#: ../src/Resources.vala:247 ../src/Resources.vala:248
+#: ../src/Resources.vala:278 ../src/Resources.vala:279
 msgid "Show all photos, including rejected"
 msgstr "Προβολή όλων των φωτογραφιών, συμπεριλαμβανομένων των απορριφθέντων"
 
-#: ../src/Resources.vala:250
+#: ../src/Resources.vala:281
 msgid "_All Photos"
 msgstr "Ό_λες οι φωτογραφίες"
 
-#: ../src/Resources.vala:251 ../src/Resources.vala:252
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:283 ../src/Resources.vala:285
 msgid "Show all photos"
 msgstr "Εμφάνιση όλων των φωτογραφιών"
 
-#: ../src/Resources.vala:254
+#: ../src/Resources.vala:287
 msgid "_Ratings"
 msgstr "Α_ξιολογήσεις"
 
-#: ../src/Resources.vala:255
+#: ../src/Resources.vala:288
 msgid "Display each photo's rating"
 msgstr "Προβολή αξιολόγησης κάθε φωτογραφίας"
 
-#: ../src/Resources.vala:257
+#: ../src/Resources.vala:290
 msgid "_Filter Photos"
 msgstr "_Φιλτράρισμα φωτογραφιών"
 
-#: ../src/Resources.vala:258
+#: ../src/Resources.vala:291
 msgid "Filter Photos"
 msgstr "Φιλτράρισμα φωτογραφιών"
 
-#: ../src/Resources.vala:259
+#: ../src/Resources.vala:292
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Μείωση του αριθμού φωτογραφιών που προβάλλονται βάσει φίλτρου"
 
-#: ../src/Resources.vala:261
+#: ../src/Resources.vala:294
 msgid "_Duplicate"
 msgstr "Α_ντίγραφο"
 
-#: ../src/Resources.vala:262
+#: ../src/Resources.vala:295
 msgid "Duplicate"
 msgstr "Αντίγραφο"
 
-#: ../src/Resources.vala:263
+#: ../src/Resources.vala:296
 msgid "Make a duplicate of the photo"
 msgstr "Δημιουργία αντιγράφου της φωτογραφίας"
 
-#: ../src/Resources.vala:265
+#: ../src/Resources.vala:298
 msgid "_Export..."
 msgstr "_Εξαγωγή..."
 
-#: ../src/Resources.vala:267
+#: ../src/Resources.vala:300
 msgid "_Print..."
 msgstr "Ε_κτύπωση..."
 
-#: ../src/Resources.vala:269
+#: ../src/Resources.vala:302
 msgid "Pu_blish..."
 msgstr "_Δημοσίευση..."
 
-#: ../src/Resources.vala:271
+#: ../src/Resources.vala:304
 msgid "Publish to various websites"
 msgstr "Δημοσίευση σε διάφορες ιστοσελίδες"
 
-#: ../src/Resources.vala:273
+#: ../src/Resources.vala:306
 msgid "Edit _Title..."
 msgstr "Επεξεργασία _Τίτλου..."
 
-#: ../src/Resources.vala:276
+#: ../src/Resources.vala:310
 msgid "Edit _Comment..."
 msgstr "Επεξεργασία _σχολίου..."
 
-#: ../src/Resources.vala:277
+#. Button label
+#: ../src/Resources.vala:312
 msgid "Edit Comment"
 msgstr "Επεξεργασία σχολίου"
 
-#: ../src/Resources.vala:279
+#: ../src/Resources.vala:314
 msgid "Edit Event _Comment..."
 msgstr "Επεξεργασία _σχολίου συμβάντος..."
 
-#: ../src/Resources.vala:282
+#: ../src/Resources.vala:317
 msgid "_Adjust Date and Time..."
 msgstr "Ρύθμιση ώ_ρας και ημερομηνίας..."
 
-#: ../src/Resources.vala:283
+#: ../src/Resources.vala:318
 msgid "Adjust Date and Time"
 msgstr "Ρύθμιση ημερομηνίας και ώρας"
 
-#: ../src/Resources.vala:285
+#: ../src/Resources.vala:320
 msgid "Add _Tags..."
 msgstr "_Προσθήκη ετικετών..."
 
-#: ../src/Resources.vala:286
+#: ../src/Resources.vala:321
 msgid "_Add Tags..."
 msgstr "_Προσθήκη ετικετών..."
 
-#: ../src/Resources.vala:287 ../src/Resources.vala:318
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:323 ../src/Resources.vala:356
 msgid "Add Tags"
 msgstr "Προσθήκη ετικετών"
 
-#: ../src/Resources.vala:289
-msgid "_Preferences"
-msgstr "_Προτιμήσεις"
-
-#: ../src/Resources.vala:291
+#: ../src/Resources.vala:327
 msgid "Open With E_xternal Editor"
 msgstr "Άνοιγμα με Ε_ξωτερική Εφαρμογή"
 
-#: ../src/Resources.vala:293
+#: ../src/Resources.vala:329
 msgid "Open With RA_W Editor"
 msgstr "Άνοιγμα με εφαρμογή _επεξεργασίας RAW"
 
-#: ../src/Resources.vala:295
+#: ../src/Resources.vala:331
 msgid "Send _To..."
 msgstr "Αποστολή _σε..."
 
-#: ../src/Resources.vala:296
+#: ../src/Resources.vala:332
 msgid "Send T_o..."
 msgstr "Αποστολή σ_ε..."
 
-#: ../src/Resources.vala:298
+#: ../src/Resources.vala:334
 msgid "_Find..."
 msgstr "_Εύρεση..."
 
-#: ../src/Resources.vala:299
+#: ../src/Resources.vala:335
 msgid "Find"
 msgstr "Εύρεση"
 
-#: ../src/Resources.vala:300
+#: ../src/Resources.vala:336
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Βρείτε μια φωτογραφία γράφοντας κείμενο που εμφανίζεται στο όνομα της ή στις "
 "ετικέτες της"
 
-#: ../src/Resources.vala:302
+#: ../src/Resources.vala:338
 msgid "_Flag"
 msgstr "_Επισήμανση"
 
-#: ../src/Resources.vala:304
+#: ../src/Resources.vala:340
 msgid "Un_flag"
 msgstr "_Αναίρεση επισήμανσης"
 
-#: ../src/Resources.vala:307
+#: ../src/Resources.vala:343
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Δεν ήταν δυνατή η εκκίνηση της εφαρμογής επεξεργασίας: %s"
 
-#: ../src/Resources.vala:312
+#: ../src/Resources.vala:348
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "Προσθήκη ετικέτας \"%s\""
 
-#: ../src/Resources.vala:314
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:351
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "Προσθήκη των ετικετών \"%s\" και \"%s\""
 
-#: ../src/Resources.vala:322
+#: ../src/Resources.vala:361
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "_Διαγραφή ετικέτας \"%s\""
 
-#: ../src/Resources.vala:326
+#: ../src/Resources.vala:365
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "Διαγραφή ετικέτας \"%s\""
 
-#: ../src/Resources.vala:329
+#: ../src/Resources.vala:368
 msgid "Delete Tag"
 msgstr "Διαγραφή ετικέτας"
 
-#: ../src/Resources.vala:332
-msgid "_New"
-msgstr "_Νέο"
-
-#: ../src/Resources.vala:335
+#: ../src/Resources.vala:374
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "Με_τονομασία ετικέτας \"%s\"..."
 
-#: ../src/Resources.vala:339
+#: ../src/Resources.vala:378
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "Μετονομασία ετικέτας \"%s\" σε \"%s\""
 
-#: ../src/Resources.vala:342
+#: ../src/Resources.vala:381
 msgid "_Rename..."
 msgstr "_Μετονομασία..."
 
-#: ../src/Resources.vala:344
+#: ../src/Resources.vala:383
 msgid "Modif_y Tags..."
 msgstr "_Μετατροπή ετικετών..."
 
-#: ../src/Resources.vala:345
+#: ../src/Resources.vala:384
 msgid "Modify Tags"
 msgstr "Μετατροπή ετικετών"
 
-#: ../src/Resources.vala:348
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Ορισμός ετικέτας στις φωτογραφίες \"%s\""
 
-#: ../src/Resources.vala:348
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Προσθήκη στις φωτογραφίες της ετικέτας \"%s\""
 
-#: ../src/Resources.vala:352
+#: ../src/Resources.vala:391
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "Ορισμός ετικέτας στις επιλεγμένες φωτογραφίες \"%s\""
 
-#: ../src/Resources.vala:353
+#: ../src/Resources.vala:392
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "Προσθήκη στις επιλεγμένες φωτογραφίες της ετικέτας \"%s\""
 
-#: ../src/Resources.vala:357
+#: ../src/Resources.vala:396
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "Αφαίρεση ετικέτας \"%s\" από τις _φωτογραφίες"
 
-#: ../src/Resources.vala:358
+#: ../src/Resources.vala:397
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "Αφαίρεση της ετικέτας \"%s\" από τις _επιλεγμένες φωτογραφίες"
 
-#: ../src/Resources.vala:362
+#: ../src/Resources.vala:401
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "Αφαίρεση ετικέτας \"%s\" από τις φωτογραφίες"
 
-#: ../src/Resources.vala:363
+#: ../src/Resources.vala:402
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "Αφαίρεση της ετικέτας \"%s\" από τις φωτογραφίες"
 
-#: ../src/Resources.vala:367
+#: ../src/Resources.vala:406
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr ""
 "Αδυναμία μετονομασίας της ετικέτας \"%s\" επειδή η ετικέτα υπάρχει ήδη."
 
-#: ../src/Resources.vala:371
+#: ../src/Resources.vala:410
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr ""
 "Δεν ήταν δυνατή η μετονομασία της αναζήτησης σε \"%s\" γιατί η αναζήτηση "
 "αυτή υπάρχει ήδη."
 
-#: ../src/Resources.vala:374
+#: ../src/Resources.vala:413
 msgid "Saved Search"
 msgstr "Αποθηκευμένη αναζήτηση"
 
-#: ../src/Resources.vala:376
+#: ../src/Resources.vala:415
 msgid "Delete Search"
 msgstr "Διαγραφή Αναζήτησης"
 
-#: ../src/Resources.vala:379
+#: ../src/Resources.vala:418
 msgid "_Edit..."
 msgstr "_Επεξεργασία..."
 
-#: ../src/Resources.vala:380
+#: ../src/Resources.vala:419
 msgid "Re_name..."
 msgstr "Με_τονομασία..."
 
-#: ../src/Resources.vala:383
+#: ../src/Resources.vala:422
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "Μετονομασία της αναζήτησης \"%s\" σε \"%s\""
 
-#: ../src/Resources.vala:387
+#: ../src/Resources.vala:426
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "Διαγραφή της Αναζήτησης \"%s\""
 
-#: ../src/Resources.vala:545
+#: ../src/Resources.vala:584
 #, c-format
 msgid "Rate %s"
 msgstr "Αξιολόγηση %s"
 
-#: ../src/Resources.vala:546
+#: ../src/Resources.vala:585
 #, c-format
 msgid "Set rating to %s"
 msgstr "Ορισμός αξιολόγησης σε %s"
 
-#: ../src/Resources.vala:547
+#: ../src/Resources.vala:586
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Ορισμός αξιολόγησης σε %s"
 
-#: ../src/Resources.vala:549
+#: ../src/Resources.vala:588
 #, c-format
 msgid "Display %s"
 msgstr "Προβολή %s"
 
-#: ../src/Resources.vala:550
+#: ../src/Resources.vala:589
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Προβολή μόνο φωτογραφιών με αξιολόγηση %s"
 
-#: ../src/Resources.vala:551
+#: ../src/Resources.vala:590
 #, c-format
 msgid "%s or Better"
 msgstr "%s ή καλύτερη"
 
-#: ../src/Resources.vala:552
+#: ../src/Resources.vala:591
 #, c-format
 msgid "Display %s or Better"
 msgstr "Προβολή %s ή καλύτερων"
 
-#: ../src/Resources.vala:553
+#: ../src/Resources.vala:592
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Προβολή μόνο φωτογραφιών με αξιολόγηση %s ή καλύτερη"
 
-#: ../src/Resources.vala:644
+#: ../src/Resources.vala:683
 msgid "Remove the selected photos from the trash"
-msgstr "Αφαίρεση των επιλεγμένων εικόνων από τον κάδο"
+msgstr "Αφαίρεση των επιλεγμένων εικόνων από τα απορρίματα"
 
-#: ../src/Resources.vala:645
+#: ../src/Resources.vala:684
 msgid "Remove the selected photos from the library"
 msgstr "Αφαίρεση των επιλεγμένων εικόνων από τη βιβλιοθήκη"
 
-#: ../src/Resources.vala:647
+#: ../src/Resources.vala:686
 msgid "_Restore"
 msgstr "_Επαναφορά"
 
-#: ../src/Resources.vala:648
+#: ../src/Resources.vala:687
 msgid "Move the selected photos back into the library"
 msgstr "Μετακίνηση των επιλεγμένων εικόνων πίσω στη βιβλιοθήκη"
 
-#: ../src/Resources.vala:650
+#: ../src/Resources.vala:689
 msgid "Show in File Mana_ger"
 msgstr "Προβολή στη _διαχείριση αρχείων"
 
-#: ../src/Resources.vala:651
+#: ../src/Resources.vala:690
 msgid "Open the selected photo's directory in the file manager"
 msgstr "Άνοιγμα του φακέλου των επιλεγμένων εικόνων με τον περιηγητή αρχείων"
 
-#: ../src/Resources.vala:654
+#: ../src/Resources.vala:693
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Αδυναμία ανοίγματος με τη διαχείριση αρχείων: %s"
 
-#: ../src/Resources.vala:657
+#: ../src/Resources.vala:696
 msgid "R_emove From Library"
 msgstr "_Απομάκρυνση από τη βιβλιοθήκη"
 
-#: ../src/Resources.vala:659
+#: ../src/Resources.vala:698
 msgid "_Move to Trash"
-msgstr "_Μετακίνηση στον κάδο απορριμμάτων"
+msgstr "_Μετακίνηση στα απορρίματα"
 
-#: ../src/Resources.vala:661
+#: ../src/Resources.vala:700
 msgid "Select _All"
 msgstr "Επιλογή ό_λων"
 
-#: ../src/Resources.vala:662
+#: ../src/Resources.vala:701
 msgid "Select all items"
 msgstr "Επιλογή όλων των αντικειμένων"
 
@@ -3361,20 +3698,20 @@ msgstr "Επιλογή όλων των αντικειμένων"
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:743
+#: ../src/Resources.vala:780
 msgid "%-I:%M %p"
 msgstr "%-I:%M %p"
 
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:748
+#: ../src/Resources.vala:785
 msgid "%-I:%M:%S %p"
 msgstr "%-I:%M:%S %p"
 
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:752
+#: ../src/Resources.vala:789
 msgid "%a %b %d, %Y"
 msgstr "%a %b %d, %Y"
 
@@ -3384,14 +3721,14 @@ msgstr "%a %b %d, %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:757 ../src/Resources.vala:767
+#: ../src/Resources.vala:794 ../src/Resources.vala:804
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:762
+#: ../src/Resources.vala:799
 msgid "%d, %Y"
 msgstr "%d, %Y"
 
@@ -3401,7 +3738,7 @@ msgstr "Προβολή σε αλληλουχία"
 
 #. Flagged label and toggle
 #: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
-#: ../src/SearchFilter.vala:990 ../src/library/FlaggedPage.vala:8
+#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
 msgid "Flagged"
 msgstr "Με επισήμανση"
 
@@ -3421,28 +3758,37 @@ msgstr "Εικόνες RAW"
 msgid "RAW photos"
 msgstr "εικόνες RAW"
 
-#: ../src/SearchFilter.vala:952
+#: ../src/SearchFilter.vala:934
 #, c-format
 msgid "Error loading UI file %s: %s"
 msgstr "Σφάλμα κατά τη φόρτωση του αρχείου UI %s: %s"
 
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: ../src/SearchFilter.vala:945
+msgid "Close"
+msgstr "Κλείσιμο"
+
 #. Type label and toggles
-#: ../src/SearchFilter.vala:969
+#: ../src/SearchFilter.vala:951
 msgid "Type"
 msgstr "Τύπος"
 
 #. Rating label and button
-#: ../src/SearchFilter.vala:1003 ../src/searches/SearchBoolean.vala:184
+#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
 msgid "Rating"
 msgstr "Αξιολόγηση"
 
-#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:182
+#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
 #. Set up toolbar
 #. add toolbar buttons
-#: ../src/SlideshowPage.vala:161
+#: ../src/SlideshowPage.vala:160
 msgid "Back"
 msgstr "Πίσω"
 
@@ -3450,15 +3796,15 @@ msgstr "Πίσω"
 msgid "Go to the previous photo"
 msgstr "Μετάβαση στην προηγούμενη φωτογραφία"
 
-#: ../src/SlideshowPage.vala:168 ../src/SlideshowPage.vala:273
+#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
 msgid "Pause"
 msgstr "Παύση"
 
-#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:274
+#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
 msgid "Pause the slideshow"
 msgstr "Παύση αλληλουχίας"
 
-#: ../src/SlideshowPage.vala:175
+#: ../src/SlideshowPage.vala:174
 msgid "Next"
 msgstr "Επόμενη"
 
@@ -3466,20 +3812,20 @@ msgstr "Επόμενη"
 msgid "Go to the next photo"
 msgstr "Μετάβαση στην επόμενη φωτογραφία"
 
-#: ../src/SlideshowPage.vala:183
+#: ../src/SlideshowPage.vala:184
 msgid "Change slideshow settings"
 msgstr "Αλλαγή ρυθμίσεων αλληλουχίας"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: ../src/SlideshowPage.vala:237
+#: ../src/SlideshowPage.vala:238
 msgid "All photo source files are missing."
 msgstr "Όλα τα πηγαία αρχεία των φωτογραφιών λείπουν."
 
-#: ../src/SlideshowPage.vala:269
+#: ../src/SlideshowPage.vala:270
 msgid "Play"
 msgstr "Αναπαραγωγή"
 
-#: ../src/SlideshowPage.vala:270
+#: ../src/SlideshowPage.vala:271
 msgid "Continue the slideshow"
 msgstr "Συνέχιση αλληλουχίας"
 
@@ -3488,11 +3834,11 @@ msgid "untitled"
 msgstr "χωρίς τίτλο"
 
 #. multiple videos
-#: ../src/VideoSupport.vala:492
+#: ../src/VideoSupport.vala:489
 msgid "Export Videos"
 msgstr "Εξαγωγή βίντεο"
 
-#: ../src/camera/Branch.vala:87
+#: ../src/camera/Branch.vala:85
 msgid "Cameras"
 msgstr "Κάμερες"
 
@@ -3516,44 +3862,44 @@ msgstr "Εμφάνιση μόνο των φωτογραφιών που δεν έ
 #. prior to import.
 #. TODO: replace this with approved text for "talking to camera,
 #. please wait" once new strings are being accepted.
-#: ../src/camera/ImportPage.vala:845
+#: ../src/camera/ImportPage.vala:847
 msgid "Starting import, please wait..."
 msgstr "Εκκίνηση εισαγωγής, παρακαλώ περιμένετε..."
 
-#: ../src/camera/ImportPage.vala:884
+#: ../src/camera/ImportPage.vala:886
 msgid "Import _Selected"
 msgstr "_Εισαγωγή επιλεγμένων"
 
-#: ../src/camera/ImportPage.vala:885
+#: ../src/camera/ImportPage.vala:887
 msgid "Import the selected photos into your library"
 msgstr "Εισαγωγή των επιλεγμένων φωτογραφιών στην βιβλιοθήκη"
 
-#: ../src/camera/ImportPage.vala:890
+#: ../src/camera/ImportPage.vala:892
 msgid "Import _All"
 msgstr "_Εισαγωγή όλων"
 
-#: ../src/camera/ImportPage.vala:891
+#: ../src/camera/ImportPage.vala:893
 msgid "Import all the photos into your library"
 msgstr "Εισαγωγή όλων των φωτογραφιών στην βιβλιοθήκη"
 
 #. it's mounted, offer to unmount for the user
-#: ../src/camera/ImportPage.vala:1012
+#: ../src/camera/ImportPage.vala:1014
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it.  Continue?"
 msgstr ""
 "Το Shotwell πρέπει να αποπροσαρτήσει την κάμερα από το σύστημα αρχείων για "
-"να έχει πρόσβαση σε αυτήν. Συνέχεια;"
+"να έχει πρόσβαση σε αυτήν.  Συνέχεια;"
 
-#: ../src/camera/ImportPage.vala:1018
+#: ../src/camera/ImportPage.vala:1020
 msgid "_Unmount"
 msgstr "_Αποπροσάρτηση"
 
-#: ../src/camera/ImportPage.vala:1023
+#: ../src/camera/ImportPage.vala:1025
 msgid "Please unmount the camera."
 msgstr "Παρακαλώ αποπροσαρτήστε την κάμερα."
 
-#: ../src/camera/ImportPage.vala:1028
+#: ../src/camera/ImportPage.vala:1030
 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 "
@@ -3563,11 +3909,11 @@ msgstr ""
 "έχει πρόσβαση στη κάμερα μόνο όταν είναι ξεκλείδωτη. Παρακαλώ κλείστε κάθε "
 "άλλη εφαρμογή που χρησιμοποιεί την κάμερα και προσπαθήστε ξανά."
 
-#: ../src/camera/ImportPage.vala:1038
+#: ../src/camera/ImportPage.vala:1040
 msgid "Please close any other application using the camera."
 msgstr "Παρακαλώ κλείστε κάθε άλλη εφαρμογή που χρησιμοποιεί την κάμερα."
 
-#: ../src/camera/ImportPage.vala:1043
+#: ../src/camera/ImportPage.vala:1045
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -3576,57 +3922,57 @@ msgstr ""
 "Αδυναμία μεταφοράς προεπισκοπήσεων από την κάμερα:\n"
 "%s"
 
-#: ../src/camera/ImportPage.vala:1060
+#: ../src/camera/ImportPage.vala:1062
 msgid "Unmounting..."
 msgstr "Αποπροσάρτηση..."
 
-#: ../src/camera/ImportPage.vala:1166
+#: ../src/camera/ImportPage.vala:1168
 msgid "Fetching photo information"
 msgstr "Λήψη πληροφοριών φωτογραφίας"
 
-#: ../src/camera/ImportPage.vala:1521
+#: ../src/camera/ImportPage.vala:1523
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Λήψη προεπισκοπήσεων για %s"
 
-#: ../src/camera/ImportPage.vala:1637
+#: ../src/camera/ImportPage.vala:1639
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Αδυναμία κλειδώματος κάμερας: %s"
 
-#: ../src/camera/ImportPage.vala:1722
+#: ../src/camera/ImportPage.vala:1724
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "Διαγραφή αυτής της φωτογραφίας από τη κάμερα;"
 msgstr[1] "Διαγραφή αυτών των %d φωτογραφιών από τη κάμερα;"
 
-#: ../src/camera/ImportPage.vala:1725
+#: ../src/camera/ImportPage.vala:1727
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] "Διαγραφή αυτού του βίντεο από τη κάμερα;"
 msgstr[1] "Διαγραφή αυτών των %d βίντεο από τη κάμερα;"
 
-#: ../src/camera/ImportPage.vala:1728
+#: ../src/camera/ImportPage.vala:1730
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "Διαγραφή αυτής της φωτογραφίας/βίντεο από τη κάμερα;"
 msgstr[1] "Διαγραφή αυτών των %d φωτογραφιών/βίντεο από τη κάμερα;"
 
-#: ../src/camera/ImportPage.vala:1731
+#: ../src/camera/ImportPage.vala:1733
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] "Να διαγραφούν αυτά τα αρχεία από την κάμερα;"
 msgstr[1] "Να διαγραφούν αυτά τα %d αρχεία από την κάμερα;"
 
-#: ../src/camera/ImportPage.vala:1758
+#: ../src/camera/ImportPage.vala:1760
 msgid "Removing photos/videos from camera"
 msgstr "Απομάκρυνση των φωτογραφιών/βίντεο από την κάμερα"
 
-#: ../src/camera/ImportPage.vala:1762
+#: ../src/camera/ImportPage.vala:1764
 #, 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."
@@ -3667,31 +4013,27 @@ msgid ""
 "at least one data imports plugin enabled. Plugins can be enabled in the "
 "Preferences dialog."
 msgstr ""
-"Δεν έχετε ενεργοποιήσει τις πρόσθετες λειτουργίας εισαγωγής δεδομένων.\n"
+"Δεν έχετε ενεργοποιήσει το πρόσθετο εισαγωγής δεδομένων.\n"
 "\n"
-"Για να χρησιμοποιήσετε τη λειτουργία Εισαγωγής από Εφαρμογή, πρέπει να έχετε "
-"ενεργοποιήσει τουλάχιστο μια πρόσθετη λειτουργία εισαγωγής. Μπορείτε να "
-"ενεργοποιήσετε τις πρόσθετες λειτουργίες στις Ρυθμίσεις."
+"Για να χρησιμοποιήσετε τη λειτουργία εισαγωγής από εφαρμογή, πρέπει να έχετε "
+"ενεργοποιήσει τουλάχιστο ένα πρόσθετο εισαγωγής δεδομένων. Μπορείτε να "
+"ενεργοποιήσετε τα πρόσθετα στις ρυθμίσεις."
 
 #: ../src/data_imports/DataImportsUI.vala:100
 msgid "Database file:"
 msgstr "Αρχείο βάσης δεδομένων:"
 
 #: ../src/data_imports/DataImportsUI.vala:112
-#: ../src/library/LibraryWindow.vala:899
+#: ../src/library/LibraryWindow.vala:898
 msgid "_Import"
 msgstr "Ει_σαγωγή"
 
-#: ../src/data_imports/DataImportsUI.vala:216
+#: ../src/data_imports/DataImportsUI.vala:217
 msgid "Import From Application"
 msgstr "Εισαγωγή από εφαρμογή"
 
-#: ../src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "Εισαγωγή πολυμέσων _από:"
-
-#: ../src/data_imports/DataImportsUI.vala:394
-#: ../src/publishing/PublishingUI.vala:493
+#: ../src/data_imports/DataImportsUI.vala:369
+#: ../src/publishing/PublishingUI.vala:470
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
@@ -3726,15 +4068,10 @@ msgstr ""
 "Το σφάλμα ήταν: \n"
 "%s"
 
-#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:352
+#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:351
 msgid "_File"
 msgstr "_Αρχείο"
 
-#: ../src/direct/DirectPhotoPage.vala:51
-#: ../src/direct/DirectPhotoPage.vala:417
-msgid "_Save"
-msgstr "_Αποθήκευση"
-
 #: ../src/direct/DirectPhotoPage.vala:52
 msgid "Save photo"
 msgstr "Αποθήκευση φωτογραφίας"
@@ -3752,19 +4089,10 @@ msgid "Print the photo to a printer connected to your computer"
 msgstr ""
 "Εκτυπώστε την φωτογραφία σε έναν εκτυπωτή συνδεδεμένο στον υπολογιστή σας"
 
-#: ../src/direct/DirectPhotoPage.vala:73 ../src/library/LibraryWindow.vala:356
-msgid "_Edit"
-msgstr "_Επεξεργασία"
-
-#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:364
+#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:363
 msgid "_Photo"
 msgstr "_Φωτογραφία"
 
-#: ../src/direct/DirectPhotoPage.vala:169
-#: ../src/library/LibraryWindow.vala:380
-msgid "_Help"
-msgstr "_Βοήθεια"
-
 #: ../src/direct/DirectPhotoPage.vala:227
 #, c-format
 msgid "%s does not exist."
@@ -3784,26 +4112,26 @@ msgstr ""
 "Το %s δεν υποστηρίζει τη μορφή αρχείου του\n"
 "%s."
 
-#: ../src/direct/DirectPhotoPage.vala:417
+#: ../src/direct/DirectPhotoPage.vala:422
 msgid "_Save a Copy"
 msgstr "_Αποθήκευση αντιγράφου"
 
-#: ../src/direct/DirectPhotoPage.vala:420
+#: ../src/direct/DirectPhotoPage.vala:425
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Απόρριψη αλλαγών του %s;"
 
-#: ../src/direct/DirectPhotoPage.vala:421
+#: ../src/direct/DirectPhotoPage.vala:426
 msgid "Close _without Saving"
 msgstr "Κλείσιμο _χωρίς αποθήκευση"
 
-#: ../src/direct/DirectPhotoPage.vala:454
+#: ../src/direct/DirectPhotoPage.vala:459
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Σφάλμα κατά την αποθήκευση στο %s: %s"
 
-#: ../src/direct/DirectPhotoPage.vala:482
-#: ../src/direct/DirectPhotoPage.vala:503
+#: ../src/direct/DirectPhotoPage.vala:487
+#: ../src/direct/DirectPhotoPage.vala:508
 msgid "Save As"
 msgstr "Αποθήκευση ως"
 
@@ -3863,74 +4191,74 @@ msgstr "A4 (210 x 297 mm)"
 msgid "A3 (297 x 420 mm)"
 msgstr "A3 (297 x 420 mm)"
 
-#: ../src/editing_tools/EditingTools.vala:1876
+#: ../src/editing_tools/EditingTools.vala:1905
 msgid "Close the red-eye tool"
 msgstr "Κλείσιμο του εργαλείου κόκκινων ματιών"
 
-#: ../src/editing_tools/EditingTools.vala:1879
+#: ../src/editing_tools/EditingTools.vala:1908
 msgid "Remove any red-eye effects in the selected region"
 msgstr ""
 "Αφαίρεση κάθε επίδρασης του φαινομένου κόκκινων ματιών στην επιλεγμένη "
 "περιοχή"
 
-#: ../src/editing_tools/EditingTools.vala:2215
+#: ../src/editing_tools/EditingTools.vala:2244
 #: ../src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Επαναφορά"
 
-#: ../src/editing_tools/EditingTools.vala:2237
+#: ../src/editing_tools/EditingTools.vala:2266
 msgid "Saturation:"
 msgstr "Κορεσμός:"
 
-#: ../src/editing_tools/EditingTools.vala:2245
+#: ../src/editing_tools/EditingTools.vala:2274
 msgid "Tint:"
 msgstr "Απόχρωση:"
 
-#: ../src/editing_tools/EditingTools.vala:2254
+#: ../src/editing_tools/EditingTools.vala:2283
 msgid "Temperature:"
 msgstr "Θερμοκρασία:"
 
-#: ../src/editing_tools/EditingTools.vala:2262
+#: ../src/editing_tools/EditingTools.vala:2291
 msgid "Shadows:"
 msgstr "Σκιές:"
 
-#: ../src/editing_tools/EditingTools.vala:2270
+#: ../src/editing_tools/EditingTools.vala:2299
 msgid "Highlights:"
 msgstr "Επισημάνσεις:"
 
-#: ../src/editing_tools/EditingTools.vala:2324
+#: ../src/editing_tools/EditingTools.vala:2353
 msgid "Reset Colors"
 msgstr "Επαναφορά χρωμάτων"
 
-#: ../src/editing_tools/EditingTools.vala:2324
+#: ../src/editing_tools/EditingTools.vala:2353
 msgid "Reset all color adjustments to original"
 msgstr "Επαναφορά όλων των χρωματικών ρυθμίσεων στις αρχικές"
 
-#: ../src/editing_tools/EditingTools.vala:2676
+#: ../src/editing_tools/EditingTools.vala:2705
 msgid "Temperature"
 msgstr "Θερμοκρασία"
 
-#: ../src/editing_tools/EditingTools.vala:2689
+#: ../src/editing_tools/EditingTools.vala:2718
 msgid "Tint"
 msgstr "Απόχρωση"
 
-#: ../src/editing_tools/EditingTools.vala:2702
+#: ../src/editing_tools/EditingTools.vala:2731
 msgid "Saturation"
 msgstr "Κορεσμός"
 
-#: ../src/editing_tools/EditingTools.vala:2715
+#: ../src/editing_tools/EditingTools.vala:2744
 msgid "Exposure"
 msgstr "Έκθεση"
 
-#: ../src/editing_tools/EditingTools.vala:2728
+#: ../src/editing_tools/EditingTools.vala:2757
 msgid "Shadows"
 msgstr "Σκιές"
 
-#: ../src/editing_tools/EditingTools.vala:2741
+#: ../src/editing_tools/EditingTools.vala:2770
 msgid "Highlights"
 msgstr "Επισημάνσεις"
 
-#: ../src/editing_tools/EditingTools.vala:2751
+#: ../src/editing_tools/EditingTools.vala:2780
 msgid "Contrast Expansion"
 msgstr "Επέκταση αντίθεσης"
 
@@ -3981,7 +4309,7 @@ msgstr "%B"
 msgid "Folders"
 msgstr "Φάκελοι"
 
-#: ../src/library/Branch.vala:37 ../ui/shotwell.glade.h:33
+#: ../src/library/Branch.vala:36 ../ui/shotwell.glade.h:32
 msgid "Library"
 msgstr "Βιβλιοθήκη"
 
@@ -3989,19 +4317,19 @@ msgstr "Βιβλιοθήκη"
 msgid "Importing..."
 msgstr "Γίνεται εισαγωγή..."
 
-#: ../src/library/ImportQueuePage.vala:66
+#: ../src/library/ImportQueuePage.vala:67
 msgid "_Stop Import"
 msgstr "_Διακοπή Εισαγωγής"
 
-#: ../src/library/ImportQueuePage.vala:67
+#: ../src/library/ImportQueuePage.vala:68
 msgid "Stop importing photos"
 msgstr "Διακοπή εισαγωγής εικόνων"
 
-#: ../src/library/ImportQueuePage.vala:123
+#: ../src/library/ImportQueuePage.vala:124
 msgid "Preparing to import..."
 msgstr "Προετοιμασία για εισαγωγή..."
 
-#: ../src/library/ImportQueuePage.vala:150
+#: ../src/library/ImportQueuePage.vala:151
 #, c-format
 msgid "Imported %s"
 msgstr "Εισήχθησαν %s"
@@ -4028,82 +4356,82 @@ msgstr "_Ταξινόμηση συμβάντων"
 
 #: ../src/library/LibraryWindow.vala:323
 msgid "Empty T_rash"
-msgstr "Άδειασμα _κάδου απορριμμάτων"
+msgstr "Άδειασμα απο_ρριμμάτων"
 
 #: ../src/library/LibraryWindow.vala:324
 msgid "Delete all photos in the trash"
-msgstr "Διαγραφή όλων των εικόνων στον κάδο απορριμμάτων"
+msgstr "Διαγραφή όλων των εικόνων από τα απορρίματα"
 
 #: ../src/library/LibraryWindow.vala:329
 msgid "View Eve_nt for Photo"
 msgstr "Προβολή _συμβάντος φωτογραφίας"
 
-#: ../src/library/LibraryWindow.vala:334
+#: ../src/library/LibraryWindow.vala:333
 msgid "_Find"
 msgstr "_Εύρεση"
 
-#: ../src/library/LibraryWindow.vala:335
+#: ../src/library/LibraryWindow.vala:334
 msgid "Find photos and videos by search criteria"
 msgstr "Αναζήτηση φωτογραφιών και βίντεο βάσει κριτηρίων"
 
-#: ../src/library/LibraryWindow.vala:346 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:195
+#: ../src/library/LibraryWindow.vala:345 ../src/searches/Branch.vala:77
+#: ../src/sidebar/Tree.vala:185
 msgid "Ne_w Saved Search..."
 msgstr "_Νέα αποθηκευμένη αναζήτηση..."
 
-#: ../src/library/LibraryWindow.vala:368
+#: ../src/library/LibraryWindow.vala:367
 msgid "_Photos"
 msgstr "Φω_τογραφίες"
 
-#: ../src/library/LibraryWindow.vala:372
+#: ../src/library/LibraryWindow.vala:371
 msgid "Even_ts"
 msgstr "Συ_μβάντα"
 
-#: ../src/library/LibraryWindow.vala:391
+#: ../src/library/LibraryWindow.vala:390
 msgid "_Basic Information"
 msgstr "_Βασικές πληροφορίες"
 
-#: ../src/library/LibraryWindow.vala:392
+#: ../src/library/LibraryWindow.vala:391
 msgid "Display basic information for the selection"
 msgstr "Προβολή βασικών πληροφοριών της επιλογής"
 
-#: ../src/library/LibraryWindow.vala:397
+#: ../src/library/LibraryWindow.vala:396
 msgid "E_xtended Information"
 msgstr "Εκτενείς _πληροφορίες"
 
-#: ../src/library/LibraryWindow.vala:398
+#: ../src/library/LibraryWindow.vala:397
 msgid "Display extended information for the selection"
 msgstr "Εμφάνιση εκτενών πληροφοριών της επιλογής"
 
-#: ../src/library/LibraryWindow.vala:403
+#: ../src/library/LibraryWindow.vala:402
 msgid "_Search Bar"
 msgstr "_Γραμμή αναζήτησης"
 
-#: ../src/library/LibraryWindow.vala:404
+#: ../src/library/LibraryWindow.vala:403
 msgid "Display the search bar"
 msgstr "Εμφάνιση της γραμμής αναζήτησης"
 
-#: ../src/library/LibraryWindow.vala:409
+#: ../src/library/LibraryWindow.vala:408
 msgid "S_idebar"
 msgstr "Πλευ_ρική στήλη"
 
-#: ../src/library/LibraryWindow.vala:410
+#: ../src/library/LibraryWindow.vala:409
 msgid "Display the sidebar"
 msgstr "Εμφάνιση της πλαϊνής μπάρας"
 
-#: ../src/library/LibraryWindow.vala:668
+#: ../src/library/LibraryWindow.vala:667
 msgid "Import From Folder"
 msgstr "Εισαγωγή από φάκελο"
 
-#: ../src/library/LibraryWindow.vala:737
+#: ../src/library/LibraryWindow.vala:736
 msgid "Empty Trash"
-msgstr "Άδειασμα κάδου απορριμμάτων"
+msgstr "Άδειασμα απορριμμάτων"
 
-#: ../src/library/LibraryWindow.vala:737
+#: ../src/library/LibraryWindow.vala:736
 msgid "Emptying Trash..."
-msgstr "Άδειασμα κάδου..."
+msgstr "Άδειασμα απορριμμάτων..."
 
-#: ../src/library/LibraryWindow.vala:896
+#: ../src/library/LibraryWindow.vala:895
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4117,34 +4445,34 @@ msgstr ""
 "προτιμήσεων</span>.\n"
 "Θέλετε να συνεχίσετε την εισαγωγή φωτογραφιών;"
 
-#: ../src/library/LibraryWindow.vala:899 ../ui/shotwell.glade.h:19
+#: ../src/library/LibraryWindow.vala:898 ../ui/shotwell.glade.h:18
 msgid "Library Location"
 msgstr "Τοποθεσία βιβλιοθήκης"
 
 #. TODO: Specify which directory/file.
-#: ../src/library/LibraryWindow.vala:912
+#: ../src/library/LibraryWindow.vala:911
 msgid "Photos cannot be imported from this directory."
 msgstr "Δεν ήταν δυνατή η εισαγωγή των φωτογραφιών από αυτόν τον φάκελο."
 
-#: ../src/library/LibraryWindow.vala:1200
+#: ../src/library/LibraryWindow.vala:1199
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: ../src/library/LibraryWindow.vala:1244
-#: ../src/library/LibraryWindow.vala:1255
+#: ../src/library/LibraryWindow.vala:1243
+#: ../src/library/LibraryWindow.vala:1254
 msgid "Updating library..."
 msgstr "Ενημέρωση βιβλιοθήκης..."
 
-#: ../src/library/LibraryWindow.vala:1261
+#: ../src/library/LibraryWindow.vala:1260
 msgid "Preparing to auto-import photos..."
 msgstr "Προετοιμασία για αυτόματη εισαγωγή φωτογραφιών..."
 
-#: ../src/library/LibraryWindow.vala:1266
+#: ../src/library/LibraryWindow.vala:1265
 msgid "Auto-importing photos..."
 msgstr "Αυτόματη εισαγωγή εικόνων..."
 
-#: ../src/library/LibraryWindow.vala:1274
+#: ../src/library/LibraryWindow.vala:1273
 msgid "Writing metadata to files..."
 msgstr "Εγγραφή μεταδεδομένων στα αρχεία..."
 
@@ -4158,11 +4486,11 @@ msgstr "Διαγραφή..."
 
 #: ../src/library/TrashPage.vala:8
 msgid "Trash"
-msgstr "Κάδος απορριμμάτων"
+msgstr "Απορρίματα"
 
 #: ../src/library/TrashPage.vala:108
 msgid "Trash is empty"
-msgstr "Ο κάδος απορριμάτων είναι άδειος"
+msgstr "Ο απορρίματα είναι άδεια"
 
 #: ../src/library/TrashPage.vala:112
 msgid "Delete"
@@ -4260,22 +4588,22 @@ msgstr "BMP"
 msgid "JPEG"
 msgstr "JPEG"
 
-#: ../src/photos/JfifSupport.vala:182
+#: ../src/photos/JfifSupport.vala:185
 #, c-format
 msgid "Low (%d%%)"
 msgstr "Χαμηλό (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:185
+#: ../src/photos/JfifSupport.vala:188
 #, c-format
 msgid "Medium (%d%%)"
 msgstr "Μεσαίο (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:188
+#: ../src/photos/JfifSupport.vala:191
 #, c-format
 msgid "High (%d%%)"
 msgstr "Υψηλό (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:191
+#: ../src/photos/JfifSupport.vala:194
 #, c-format
 msgid "Maximum (%d%%)"
 msgstr "Μέγιστο (%d%%)"
@@ -4298,12 +4626,12 @@ msgstr "Δημοσίευση"
 
 #: ../src/publishing/PublishingPluginHost.vala:11
 msgid "Preparing for upload"
-msgstr "Προετοιμασία για ανέβασμα"
+msgstr "Προετοιμασία για αποστολή"
 
 #: ../src/publishing/PublishingPluginHost.vala:12
 #, c-format
 msgid "Uploading %d of %d"
-msgstr "Ανέβασμα %d από %d"
+msgstr "Αποστολή %d από %d"
 
 #: ../src/publishing/PublishingPluginHost.vala:81
 #, c-format
@@ -4344,37 +4672,37 @@ msgstr "Λήψη πληροφοριών λογαριασμού..."
 msgid "Logging in..."
 msgstr "Σύνδεση..."
 
-#: ../src/publishing/PublishingUI.vala:183
+#: ../src/publishing/PublishingUI.vala:185
 msgid "Publish Photos"
 msgstr "Δημοσίευση φωτογραφιών"
 
-#: ../src/publishing/PublishingUI.vala:184
+#: ../src/publishing/PublishingUI.vala:186
 msgid "Publish photos _to:"
 msgstr "Δημοσίευση _φωτογραφιών στο:"
 
-#: ../src/publishing/PublishingUI.vala:186
+#: ../src/publishing/PublishingUI.vala:188
 msgid "Publish Videos"
 msgstr "Δημοσίευση βίντεο"
 
-#: ../src/publishing/PublishingUI.vala:187
+#: ../src/publishing/PublishingUI.vala:189
 msgid "Publish videos _to"
 msgstr "Δημοσίευση _φωτογραφιών στο"
 
-#: ../src/publishing/PublishingUI.vala:189
+#: ../src/publishing/PublishingUI.vala:191
 msgid "Publish Photos and Videos"
 msgstr "Δημοσίευση φωτογραφιών και βίντεο"
 
-#: ../src/publishing/PublishingUI.vala:190
+#: ../src/publishing/PublishingUI.vala:192
 msgid "Publish photos and videos _to"
 msgstr "Δημοσίευση φωτογραφιών και βίντεο _στο"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: ../src/publishing/PublishingUI.vala:383
+#: ../src/publishing/PublishingUI.vala:360
 msgid "Unable to publish"
 msgstr "Δεν ήταν δυνατή η δημοσίευση"
 
-#: ../src/publishing/PublishingUI.vala:384
+#: ../src/publishing/PublishingUI.vala:361
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -4393,123 +4721,139 @@ msgid "Saved Searches"
 msgstr "Αποθηκευμένες Αναζητήσεις"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:168
 msgid "contains"
 msgstr "περιέχει"
 
 #. Ordering must correspond with Context
-#: ../src/searches/SavedSearchDialog.vala:170
-#: ../src/searches/SavedSearchDialog.vala:497
+#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:500
 msgid "is exactly"
 msgstr "είναι ακριβώς"
 
-#: ../src/searches/SavedSearchDialog.vala:171
+#: ../src/searches/SavedSearchDialog.vala:170
 msgid "starts with"
 msgstr "αρχίζει με"
 
-#: ../src/searches/SavedSearchDialog.vala:172
+#: ../src/searches/SavedSearchDialog.vala:171
 msgid "ends with"
 msgstr "τελειώνει με"
 
-#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:172
 msgid "does not contain"
 msgstr "δεν περιέχει"
 
-#: ../src/searches/SavedSearchDialog.vala:174
-#: ../src/searches/SavedSearchDialog.vala:501
+#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:504
 msgid "is not set"
 msgstr "δεν είναι ορισμένο"
 
+#: ../src/searches/SavedSearchDialog.vala:174
+msgid "is set"
+msgstr "είναι ορισμένο"
+
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: ../src/searches/SavedSearchDialog.vala:245
-#: ../src/searches/SavedSearchDialog.vala:376
-#: ../src/searches/SavedSearchDialog.vala:441
+#: ../src/searches/SavedSearchDialog.vala:248
+#: ../src/searches/SavedSearchDialog.vala:379
+#: ../src/searches/SavedSearchDialog.vala:444
 msgid "is"
 msgstr "είναι"
 
-#: ../src/searches/SavedSearchDialog.vala:246
+#: ../src/searches/SavedSearchDialog.vala:249
 msgid "is not"
 msgstr "δεν είναι"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:252
+#: ../src/searches/SavedSearchDialog.vala:255
 msgid "any photo"
 msgstr "οποιαδήποτε φωτογραφία"
 
-#: ../src/searches/SavedSearchDialog.vala:253
+#: ../src/searches/SavedSearchDialog.vala:256
 msgid "a raw photo"
 msgstr "μια φωτογραφία raw"
 
-#: ../src/searches/SavedSearchDialog.vala:254
+#: ../src/searches/SavedSearchDialog.vala:257
 msgid "a video"
 msgstr "ένα βίντεο"
 
-#: ../src/searches/SavedSearchDialog.vala:308
+#: ../src/searches/SavedSearchDialog.vala:311
 msgid "has"
 msgstr "έχει"
 
-#: ../src/searches/SavedSearchDialog.vala:309
+#: ../src/searches/SavedSearchDialog.vala:312
 msgid "has no"
 msgstr "δεν έχει"
 
-#: ../src/searches/SavedSearchDialog.vala:314
+#: ../src/searches/SavedSearchDialog.vala:317
 msgid "modifications"
 msgstr "τροποποιήσεις"
 
-#: ../src/searches/SavedSearchDialog.vala:315
+#: ../src/searches/SavedSearchDialog.vala:318
 msgid "internal modifications"
 msgstr "εσωτερικές τροποποιήσεις"
 
-#: ../src/searches/SavedSearchDialog.vala:316
+#: ../src/searches/SavedSearchDialog.vala:319
 msgid "external modifications"
 msgstr "εξωτερικές τροποποιήσεις"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:370
+#: ../src/searches/SavedSearchDialog.vala:373
 msgid "flagged"
 msgstr "με ετικέτα"
 
-#: ../src/searches/SavedSearchDialog.vala:371
+#: ../src/searches/SavedSearchDialog.vala:374
 msgid "not flagged"
 msgstr "χωρίς ετικέτα"
 
-#: ../src/searches/SavedSearchDialog.vala:434
+#: ../src/searches/SavedSearchDialog.vala:437
 msgid "and higher"
 msgstr "και ψηλότερα"
 
-#: ../src/searches/SavedSearchDialog.vala:435
+#: ../src/searches/SavedSearchDialog.vala:438
 msgid "only"
 msgstr "μόνο"
 
-#: ../src/searches/SavedSearchDialog.vala:436
+#: ../src/searches/SavedSearchDialog.vala:439
 msgid "and lower"
 msgstr "και χαμηλότερα"
 
-#: ../src/searches/SavedSearchDialog.vala:498
+#: ../src/searches/SavedSearchDialog.vala:501
 msgid "is after"
 msgstr "είναι μετά"
 
-#: ../src/searches/SavedSearchDialog.vala:499
+#: ../src/searches/SavedSearchDialog.vala:502
 msgid "is before"
 msgstr "είναι πριν"
 
-#: ../src/searches/SavedSearchDialog.vala:500
+#: ../src/searches/SavedSearchDialog.vala:503
 msgid "is between"
 msgstr "είναι ανάμεσα"
 
-#: ../src/searches/SavedSearchDialog.vala:513
+#: ../src/searches/SavedSearchDialog.vala:516
 msgid "and"
 msgstr "και"
 
-#: ../src/searches/SavedSearchDialog.vala:720
+#: ../src/searches/SavedSearchDialog.vala:695
+msgid "Search"
+msgstr "Αναζήτηση"
+
+#: ../src/searches/SavedSearchDialog.vala:700
+msgid "Cancel"
+msgstr "Ακύρωση"
+
+#: ../src/searches/SavedSearchDialog.vala:701
+msgid "OK"
+msgstr "Eντάξει"
+
+#: ../src/searches/SavedSearchDialog.vala:719
 msgid "any"
 msgstr "οποιαδήποτε"
 
-#: ../src/searches/SavedSearchDialog.vala:721
+#: ../src/searches/SavedSearchDialog.vala:720
 msgid "all"
 msgstr "όλα"
 
-#: ../src/searches/SavedSearchDialog.vala:722
+#: ../src/searches/SavedSearchDialog.vala:721
 msgid "none"
 msgstr "καμία"
 
@@ -4553,7 +4897,7 @@ msgstr "Κατάσταση φωτογραφίας"
 msgid "Date"
 msgstr "Ημερομηνία"
 
-#: ../src/sidebar/Tree.vala:199
+#: ../src/sidebar/Tree.vala:189
 msgid "New _Tag..."
 msgstr "Καινούρια _Καρτέλα..."
 
@@ -4578,187 +4922,207 @@ msgid "Tags"
 msgstr "Ετικέτες"
 
 #: ../ui/set_background_dialog.glade.h:1
-msgid "Set as Desktop Slideshow"
-msgstr "Ορισμός ως προβολής διαφανειών επιφάνειας εργασίας"
+msgid "Set as Desktop Background"
+msgstr "Ορισμός ως παρασκηνίου επιφάνειας εργασίας"
 
 #: ../ui/set_background_dialog.glade.h:2
-msgid "Generate desktop background slideshow"
-msgstr "Δημιουργία προβολής διαφανειών παρασκηνίου επιφάνειας εργασίας"
+#: ../ui/set_background_slideshow_dialog.glade.h:6
+msgid "Use for Desktop"
+msgstr "Χρήση για την επιφάνεια εργασίας"
 
 #: ../ui/set_background_dialog.glade.h:3
+#: ../ui/set_background_slideshow_dialog.glade.h:7
+msgid "Use for Lock Screen"
+msgstr "Χρήση για την οθόνη κλειδώματος"
+
+#: ../ui/set_background_slideshow_dialog.glade.h:1
+msgid "Set as Desktop Slideshow"
+msgstr "Ορισμός ως προβολής διαφανειών επιφάνειας εργασίας"
+
+#: ../ui/set_background_slideshow_dialog.glade.h:2
 msgid "Show each photo for"
 msgstr "Εμφάνιση κάθε φωτογραφίας για"
 
-#: ../ui/set_background_dialog.glade.h:4
+#: ../ui/set_background_slideshow_dialog.glade.h:3
 msgid "period of time"
 msgstr "περίοδος χρόνου"
 
-#: ../ui/set_background_dialog.glade.h:5
+#: ../ui/set_background_slideshow_dialog.glade.h:4
+msgid "Generate desktop background slideshow"
+msgstr "Δημιουργία προβολής διαφανειών παρασκηνίου επιφάνειας εργασίας"
+
+#: ../ui/set_background_slideshow_dialog.glade.h:5
 msgid "How long each photo is shown on the desktop background"
 msgstr ""
 "Το χρονικό διάστημα κατά το οποίο μια φωτογραφία παραμένει στην επιφάνεια "
 "εργασίας"
 
 #: ../ui/shotwell.glade.h:1
-msgid "Search"
-msgstr "Αναζήτηση"
-
-#: ../ui/shotwell.glade.h:2
 msgid "_Name of search:"
 msgstr "Ό_νομα αναζήτησης:"
 
-#: ../ui/shotwell.glade.h:3
+#: ../ui/shotwell.glade.h:2
 msgid "_Match"
 msgstr "_Ταίριασμα"
 
-#: ../ui/shotwell.glade.h:4
+#: ../ui/shotwell.glade.h:3
 msgid "of the following:"
 msgstr "από τα παρακάτω:"
 
-#: ../ui/shotwell.glade.h:5
+#: ../ui/shotwell.glade.h:4
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Μέγεθος εκτυπωμένης εικόνας</b>"
 
-#: ../ui/shotwell.glade.h:6
+#: ../ui/shotwell.glade.h:5
 msgid "Use a _standard size:"
 msgstr "Χρήση πρό_τυπου μέγεθους:"
 
-#: ../ui/shotwell.glade.h:7
+#: ../ui/shotwell.glade.h:6
 msgid "Use a c_ustom size:"
 msgstr "Χρήση _προσαρμοσμένου μεγέθους:"
 
-#: ../ui/shotwell.glade.h:8
+#: ../ui/shotwell.glade.h:7
 msgid "_Match photo aspect ratio"
 msgstr "_Ταίριασμα με τις αναλογίες της φωτογραφίας"
 
-#: ../ui/shotwell.glade.h:9
+#: ../ui/shotwell.glade.h:8
 msgid "_Autosize:"
 msgstr "_Αυτόματο μέγεθος:"
 
-#: ../ui/shotwell.glade.h:10
+#: ../ui/shotwell.glade.h:9
 msgid "<b>Titles</b>"
 msgstr "<b>Τίτλοι</b>"
 
-#: ../ui/shotwell.glade.h:11
+#: ../ui/shotwell.glade.h:10
 msgid "Print image _title"
 msgstr "_Εκτύπωση τίτλου εικόνας"
 
-#: ../ui/shotwell.glade.h:12
+#: ../ui/shotwell.glade.h:11
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Ανάλυση εικονοστοιχείου</b>"
 
-#: ../ui/shotwell.glade.h:13
+#: ../ui/shotwell.glade.h:12
 msgid "_Output photo at:"
 msgstr "Ε_ξαγωγή φωτογραφίας στο:"
 
-#: ../ui/shotwell.glade.h:14
+#: ../ui/shotwell.glade.h:13
 msgid "pixels per inch"
 msgstr "εικονοστοιχεία ανά ίντσα"
 
-#: ../ui/shotwell.glade.h:16
+#: ../ui/shotwell.glade.h:15
 msgid "Shotwell Preferences"
 msgstr "Προτιμήσεις Shotwell"
 
-#: ../ui/shotwell.glade.h:17
+#: ../ui/shotwell.glade.h:16
 msgid "white"
 msgstr "λευκό"
 
-#: ../ui/shotwell.glade.h:18
+#: ../ui/shotwell.glade.h:17
 msgid "black"
 msgstr "μαύρο"
 
-#: ../ui/shotwell.glade.h:20
+#: ../ui/shotwell.glade.h:19
 msgid "_Watch library directory for new files"
 msgstr "_Παρακολούθηση φακέλου βιβλιοθήκης για νέα αρχεία"
 
-#: ../ui/shotwell.glade.h:21
+#: ../ui/shotwell.glade.h:20
 msgid "Metadata"
 msgstr "Μεταδεδομένα"
 
-#: ../ui/shotwell.glade.h:22
+#: ../ui/shotwell.glade.h:21
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr ""
 "Εγγραφή ετικετών, τίτλων και λοιπών _μεταδεδομένων στα αρχεία φωτογραφιών"
 
-#: ../ui/shotwell.glade.h:23
+#: ../ui/shotwell.glade.h:22
 msgid "Display"
 msgstr "Προβολή"
 
-#: ../ui/shotwell.glade.h:24
+#: ../ui/shotwell.glade.h:23
 msgid "_Import photos to:"
 msgstr "Εισαγωγή _φωτογραφιών στο:"
 
-#: ../ui/shotwell.glade.h:25
+#: ../ui/shotwell.glade.h:24
 msgid "_Background:"
 msgstr "_Παρασκήνιο:"
 
-#: ../ui/shotwell.glade.h:26
+#: ../ui/shotwell.glade.h:25
 msgid "Importing"
 msgstr "Εισαγωγή"
 
-#: ../ui/shotwell.glade.h:27
+#: ../ui/shotwell.glade.h:26
 msgid "_Directory structure:"
 msgstr "_Δομή καταλόγου:"
 
-#: ../ui/shotwell.glade.h:28
+#: ../ui/shotwell.glade.h:27
 msgid "_Pattern:"
 msgstr "_Υπόδειγμα:"
 
-#: ../ui/shotwell.glade.h:29
+#: ../ui/shotwell.glade.h:28
 msgid "Example:"
 msgstr "Παράδειγμα:"
 
-#: ../ui/shotwell.glade.h:30
+#: ../ui/shotwell.glade.h:29
 msgid "R_ename imported files to lowercase"
 msgstr "_Μετονομασία των εισαγόμενων αρχείων με χρήση πεζών γραμμάτων"
 
-#: ../ui/shotwell.glade.h:31
+#: ../ui/shotwell.glade.h:30
 msgid "RAW Developer"
 msgstr "Εφαρμογή επεξεργασίας RAW αρχείων"
 
-#: ../ui/shotwell.glade.h:32
+#: ../ui/shotwell.glade.h:31
 msgid "De_fault:"
 msgstr "_Προεπιλογή:"
 
-#: ../ui/shotwell.glade.h:34
+#: ../ui/shotwell.glade.h:33
 msgid "E_xternal photo editor:"
 msgstr "Ε_ξωτερικός Επεξεργαστής φωτογραφιών:"
 
-#: ../ui/shotwell.glade.h:35
+#: ../ui/shotwell.glade.h:34
 msgid "External _RAW editor:"
 msgstr "Εξωτερική εφαρμογή _επεξεργασίας αρχείων RAW:"
 
-#: ../ui/shotwell.glade.h:36
+#: ../ui/shotwell.glade.h:35
 msgid "External Editors"
 msgstr "Εξωτερικές εφαρμογές επεξεργασίας"
 
-#: ../ui/shotwell.glade.h:37
+#: ../ui/shotwell.glade.h:36
 msgid "Plugins"
 msgstr "Πρόσθετα"
 
-#: ../ui/shotwell.glade.h:38
+#: ../ui/shotwell.glade.h:37
 msgid "_Delay:"
 msgstr "_Καθυστέρηση:"
 
-#: ../ui/shotwell.glade.h:39
+#: ../ui/shotwell.glade.h:38
 msgid "_Transition effect:"
 msgstr "_Εφέ μετάβασης:"
 
-#: ../ui/shotwell.glade.h:40
+#: ../ui/shotwell.glade.h:39
 msgid "Transition d_elay:"
 msgstr "Καθυστέρηση _μετάβασης:"
 
-#: ../ui/shotwell.glade.h:41
+#: ../ui/shotwell.glade.h:40
 msgid "Show t_itle"
 msgstr "Εμφάνιση _τίτλου"
 
-#: ../ui/shotwell.glade.h:42
+#: ../ui/shotwell.glade.h:41
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
-#: ../ui/shotwell.glade.h:43
-msgid "_Login"
-msgstr "_Σύνδεση"
+#~| msgid ""
+#~| "A file required for publishing is unavailable. Publishing to Flickr "
+#~| "can't continue."
+#~ msgid "A file required for publishing is unavailable. Publishing to "
+#~ msgstr ""
+#~ "Ένα απαιτούμενο αρχείο για τη δημοσίευση δεν είναι διαθέσιμο. Δημοσίευση "
+#~ "στο "
+
+#~ msgid "Import media _from:"
+#~ msgstr "Εισαγωγή πολυμέσων _από:"
+
+#~ msgid "Only _Remove"
+#~ msgstr "Α_φαίρεση μόνο"
 
 #~ msgid ""
 #~ "You are logged into Tumblr as (name).\n"
@@ -4796,13 +5160,6 @@ msgstr "_Σύνδεση"
 #~ msgstr "η ετικέτα _ορατότητας (συμπληρωμένη στον κώδικα)"
 
 #~ msgid ""
-#~ "'you are logged in as $name'\n"
-#~ "(populated in the application code)"
-#~ msgstr ""
-#~ "'είσαστε συνδεμένοι ως $name'\n"
-#~ "(συμπληρωμένο στον κώδικα εφαρμογής)"
-
-#~ msgid ""
 #~ "$mediatype will appear in\n"
 #~ "(populated in code)"
 #~ msgstr ""
diff --git a/po/fr.po b/po/fr.po
index acdb78f..24a0ccf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,7 +3,7 @@
 # See COPYING for license.
 #
 # Translators:
-# Alexandre Franke <alexandre.franke@gmail.com>, 2011.
+# Alexandre Franke <alexandre.franke@gmail.com>, 2011, 2015.
 # ttoine <ttoine@ttoine.net>, 2013.
 # Claude Paroz <claude@2xlibre.net>, 2011-2012.
 # hellsdark <hellsdark@gmail.com>, 2013.
@@ -19,15 +19,17 @@
 # Clarence Snickers <clarencesnickers@gmail.com>, 2012.
 # lsbeeler <lucas@yorba.org>, 2011.
 # Sam Friedmann <sam.friedmann@redhat.com>, 2014.
+# Guillaume Bernard <translate@filorin.fr>, 2015.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2014-04-06 23:13+0000\n"
-"PO-Revision-Date: 2014-04-07 11:23+0000\n"
-"Last-Translator: Sam Friedmann <sam.friedmann@redhat.com>\n"
-"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
+"POT-Creation-Date: 2015-02-14 00:54+0000\n"
+"PO-Revision-Date: 2015-02-14 22:02+0100\n"
+"Last-Translator: Guillaume Bernard <translate@filorin.fr>\n"
+"Language-Team: français <gnomefr@traduc.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,18 +57,19 @@ msgstr ""
 "Pour continuer à publier vers les services Google, quittez et redémarrez "
 "Shotwell, puis essayez à nouveau de publier."
 
-#: ../plugins/common/Resources.vala:9 ../src/AppWindow.vala:688
-msgid "Visit the Yorba web site"
-msgstr "Visitez le site Web de Yorba"
+#: ../plugins/common/Resources.vala:9
+msgid "Visit the Shotwell home page"
+msgstr "Visiter la page du projet Shotwell"
 
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:691
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:703
 msgid "translator-credits"
 msgstr ""
 "Gabriel Bousquet <gbousque@clipper.ens.fr>\n"
 "Alexandre Franke <alexandre.franke@gmail.com>\n"
 "Pablo Martin-Gomez <pablo.martin-gomez@laposte.net>\n"
 "Claude Paroz <claude@2xlibre.net>\n"
-"Emmanuel Sunyer <emmanuel.sunyer@gmail.com>"
+"Emmanuel Sunyer <emmanuel.sunyer@gmail.com>\n"
+"Guillaume Bernard <translate@filorin.fr>"
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:32
@@ -75,8 +78,8 @@ msgstr ""
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
 #: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
 #: ../src/Resources.vala:27
-msgid "Copyright 2009-2014 Yorba Foundation"
-msgstr "Copyright 2009-2014 Yorba Foundation"
+msgid "Copyright 2009-2015 Yorba Foundation"
+msgstr "Copyright 2009-2015 Fondation Yorba"
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:56
 msgid ""
@@ -158,7 +161,7 @@ msgstr ""
 msgid "F-Spot library: %s"
 msgstr "Photothèque F-Spot : %s"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:416
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
 msgid "Preparing to import"
 msgstr "Importation en préparation"
 
@@ -166,18 +169,224 @@ msgstr "Importation en préparation"
 msgid "Core Data Import Services"
 msgstr "Services de base d'importation de données"
 
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+msgid "Gallery3 publishing module"
+msgstr "Module de publication Gallery3"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
+msgid ""
+"You are not currently logged into your Gallery.\n"
+"\n"
+"You must have already signed up for a Gallery3 account to complete the login "
+"process."
+msgstr ""
+"Vous n'êtes actuellement pas connecté à votre Gallery.\n"
+"\n"
+"Vous devez déjà avoir un compte Gallery3 pour continuer la procédure de "
+"connexion."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: ../src/MediaPage.vala:434 ../src/photos/RawSupport.vala:300
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+msgid "Shotwell default directory"
+msgstr "Répertoire par défaut de Shotwell"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:801
+#, c-format
+msgid ""
+"\n"
+"\n"
+"The file \"%s\" may not be supported by or may be too large for this "
+"instance of Gallery3."
+msgstr ""
+"\n"
+"\n"
+"Le fichier « %s » est peut-être non pris en charge ou trop gros pour "
+"cette instance de Gallery3."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:802
+msgid ""
+"\n"
+"Note that Gallery3 only supports the video types that Flowplayer does."
+msgstr ""
+"\n"
+"Veuillez noter que Gallery3 ne prend en charge que les formats vidéos que "
+"Flowplayer prend en charge."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
+#, c-format
+msgid ""
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
+msgstr ""
+"Un fichier requis pour la publication est indisponible. Impossible de continuer la publication vers %s."
+
+#. populate any widgets whose contents are
+#. programmatically-generated
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
+#, c-format
+msgid "Publishing to %s as %s."
+msgstr "Publier sur %s en tant que %s."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+msgid "A file required for publishing is unavailable. Publishing to "
+msgstr ""
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+msgid ""
+"Enter the URL for your Gallery3 site and the username and password (or API "
+"key) for your Gallery3 account."
+msgstr ""
+"Entrez l'URL pour votre site Gallery3 et les identifiants (ou la clé API) "
+"pour votre compte Gallery3."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
+msgid ""
+"The username and password or API key were incorrect. To try again, re-enter "
+"your username and password below."
+msgstr ""
+"Le nom d'utilisateur, le mot de passe ou votre clé API est incorrect. Pour "
+"ré-essayer entrez à nouveau votre mot de passe et nom d'utilisateur ci-dessous."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
+msgid ""
+"The URL entered does not appear to be the main directory of a Gallery3 "
+"instance. Please make sure you typed it correctly and it does not have any "
+"trailing components (e.g., index.php)."
+msgstr ""
+"L'URL saisie ne semble pas être le répertoire principal d'une instance "
+"Gallery3. Assurez-vous de l'avoir renseignée correctement et qu'elle n'ait "
+"pas d'autres composants (ex : index.php)."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
+msgid "Unrecognized User"
+msgstr "Utilisateur non reconnu"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
+msgid " Site Not Found"
+msgstr "Site non trouvé"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
+msgid "Copyright (C) 2013 rajce.net"
+msgstr "Copyright (C) 2013 rajce.net"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
+msgid "An error message occurred when publishing to Rajce. Please try again."
+msgstr ""
+"Un message d'erreur est apparu lors de la publication sur Rajce. Veuillez "
+"réessayer."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
+msgid "Enter email and password associated with your Rajce account."
+msgstr ""
+"Saisissez le nom d'utilisateur et le mot de passe de votre compte Racje."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
+msgid "Invalid email and/or password. Please try again"
+msgstr "Adresse de courriel et/ou mot de passe non valide. Veuillez réessayer."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
+msgid "Invalid User Email or Password"
+msgstr "L'adresse de courriel de l'utilisateur ou le mot de passe n'est pas valide."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:890
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:2
+msgid "_Email address"
+msgstr "Adresse él_ectronique"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:891
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
+msgid "_Password"
+msgstr "_Mot de passe"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
+msgid "_Remember"
+msgstr "_Se souvenir de moi"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
+msgid "Login"
+msgstr "Connexion"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:5
+msgid "_Hide album"
+msgstr "_Cacher l'album"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
+#, c-format
+msgid "You are logged into Rajce as %s."
+msgstr "Vous êtes connecté sur Rajce en tant que %s."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
+msgid "Photos will appear in:"
+msgstr "Les photos apparaîtront dans :"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
+msgid "An _existing album:"
+msgstr "Un album e_xistant :"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
+msgid "A _new album named:"
+msgstr "Un _nouvel album appelé :"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:6
+msgid "Open target _album in browser"
+msgstr "Ouverture de l'_album cible dans le navigateur"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:8
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
+msgid "_Publish"
+msgstr "_Publier"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
+msgid "_Logout"
+msgstr "Se _déconnecter"
+
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
 msgid "Copyright 2012 BJA Electronics"
 msgstr "Copyright 2012 BJA Electronics"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1229
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
 msgid "500 x 375 pixels"
 msgstr "500 x 375 pixels"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1230
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
 msgid "1024 x 768 pixels"
 msgstr "1024 x 768 pixels"
@@ -242,30 +451,90 @@ msgstr "Visitez le site Web Yandex.Fotki"
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr "Vous n'êtes actuellement pas connecté à Yandex.Fotki."
 
-#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:18
+#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
 msgid "Shotwell Extra Publishing Services"
 msgstr "Services annexes de publication Shotwell"
 
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
+msgid "Go _Back"
+msgstr "_Revenir en arrière"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
+#: ../ui/shotwell.glade.h:42
+msgid "_Login"
+msgstr "_Se connecter"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
+msgid "Intro message replaced at runtime"
+msgstr "Message d'accueil remplacé à l'exécution"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
+msgid "_Gallery3 URL:"
+msgstr "URL de Gallery3 :"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
+msgid "_User name:"
+msgstr "_Identifiant :"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
+msgid "_Password:"
+msgstr "_Mot de passe :"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:7
+msgid "API _Key:"
+msgstr "Clé API :"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
+msgid "or"
+msgstr "ou"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
+msgid "A _new album"
+msgstr "Un _nouvel album :"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
+msgid "An _existing album"
+msgstr "Un album e_xistant :"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
+msgid "_Remove location, tag and camera-identifying data before uploading"
+msgstr ""
+"_Supprimer l'emplacement, les étiquettes et autres informations "
+"permettant d'identifier l'appareil avant d'envoyer les photos"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
+msgid "'Publishing to $url as $username' (populated in application code)"
+msgstr ""
+"'Publication vers $url en tant que $username' (rempli dans le code de "
+"l'application)"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
+msgid "Scaling constraint:"
+msgstr "Contrainte d'échelle :"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
+msgid "pixels"
+msgstr "pixels"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
+#: ../src/Dimensions.vala:17
+msgid "Original size"
+msgstr "Taille originale"
+
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:10
+#: ../src/Dimensions.vala:20
+msgid "Width or height"
+msgstr "Largeur ou hauteur"
+
 #: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
 #: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
-#: ../ui/shotwell.glade.h:15
+#: ../ui/shotwell.glade.h:14
 msgid "label"
 msgstr "étiquette"
 
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
-msgid "_Email address"
-msgstr "Adresse él_ectronique"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
-msgid "_Password"
-msgstr "_Mot de passe"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
-msgid "Login"
-msgstr "Connexion"
-
 #: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
 msgid "Blogs:"
 msgstr "Blogs :"
@@ -275,23 +544,13 @@ msgstr "Blogs :"
 msgid "Photo _size:"
 msgstr "_Taille de la photo :"
 
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
-msgid "_Logout"
-msgstr "Se _déconnecter"
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
+msgid "you are logged in rajce as $name"
+msgstr "Vous êtes connecté sur rajce en tant que $name"
 
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:7
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:7
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
-msgid "_Publish"
-msgstr "_Publier"
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
+msgid "$mediatype will appear in"
+msgstr "Les $mediatype apparaîtront dans"
 
 #: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
 msgid "_Albums (or write new):"
@@ -402,12 +661,12 @@ msgid "Upload _size:"
 msgstr "_Taille d'envoi :"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
 msgid "Just me"
 msgstr "Seulement moi"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
 msgid "Everyone"
 msgstr "Tout le monde"
@@ -461,63 +720,65 @@ msgstr ""
 "Vous êtes connecté sur Flickr en tant que %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
 #, 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 ""
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"Votre compte Flickr gratuit limite la quantité de données que vous pouvez "
+"envoyer par mois.\n"
+"Ce mois-ci, vous pouvez encore envoyer %d mégaoctet avant d'atteindre votre "
+"quota."
+msgstr[1] ""
 "Votre compte Flickr gratuit limite la quantité de données que vous pouvez "
 "envoyer par mois.\n"
 "Ce mois-ci, vous pouvez encore envoyer %d mégaoctets avant d'atteindre votre "
 "quota."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1157
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr ""
 "Votre compte Fickr Pro vous donne droit d'envoyer autant de photos que vous "
 "le voulez."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1162
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
 msgid "Photos _visible to:"
 msgstr "Photos _visibles pour :"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
 msgid "Videos _visible to:"
 msgstr "Vidéos _visibles pour :"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
 msgid "Photos and videos _visible to:"
 msgstr "Photos et vidéos _visibles pour :"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
 msgid "Friends & family only"
 msgstr "Seulement les amis et la famille"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
 msgid "Family only"
 msgstr "Uniquement la famille"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Friends only"
 msgstr "Uniquement les amis"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
 msgid "2048 x 1536 pixels"
 msgstr "2048 x 1536 pixels"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
 msgid "4096 x 3072 pixels"
 msgstr "4096 x 3072 pixels"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
-#: ../src/Dimensions.vala:17
-msgid "Original size"
-msgstr "Taille originale"
-
 #: ../plugins/shotwell-publishing/PicasaPublishing.vala:58
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
@@ -549,11 +810,6 @@ msgstr "Vous êtes connecté sur Picasa Web Albums en tant que %s."
 msgid "Videos will appear in:"
 msgstr "Les vidéos apparaîtront dans :"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
-msgid "Photos will appear in:"
-msgstr "Les photos apparaîtront dans :"
-
 #: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
 msgid "Small (640 x 480 pixels)"
 msgstr "Petit (640 x 480 pixels)"
@@ -701,15 +957,6 @@ msgstr "_Numéro d'autorisation :"
 msgid "Con_tinue"
 msgstr "Pour_suivre"
 
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
-msgid "An _existing album:"
-msgstr "Un album e_xistant :"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
-msgid "A _new album named:"
-msgstr "Un _nouvel album appelé :"
-
 #: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
 msgid "L_ist album in public gallery"
 msgstr "L_ister l'album dans la galerie publique"
@@ -822,8 +1069,8 @@ msgid "Core Slideshow Transitions"
 msgstr "Transitions de diaporama principales"
 
 #: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
-msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Fondation Yorba"
 
 #: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
 #, c-format
@@ -867,39 +1114,39 @@ msgstr "Quitte le mode plein écran"
 msgid "Leave _Fullscreen"
 msgstr "Quitter le mode _plein écran"
 
-#: ../src/AppWindow.vala:496
+#: ../src/AppWindow.vala:508
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../src/AppWindow.vala:501
+#: ../src/AppWindow.vala:513
 msgid "_About"
 msgstr "À _propos"
 
-#: ../src/AppWindow.vala:506
+#: ../src/AppWindow.vala:518
 msgid "Fulls_creen"
 msgstr "_Plein écran"
 
-#: ../src/AppWindow.vala:511
+#: ../src/AppWindow.vala:523
 msgid "_Contents"
 msgstr "_Sommaire"
 
-#: ../src/AppWindow.vala:516
+#: ../src/AppWindow.vala:528
 msgid "_Frequently Asked Questions"
 msgstr "_Foire aux questions"
 
-#: ../src/AppWindow.vala:521
+#: ../src/AppWindow.vala:533
 msgid "_Report a Problem..."
 msgstr "_Signaler un problème…"
 
-#: ../src/AppWindow.vala:620 ../src/AppWindow.vala:641
-#: ../src/AppWindow.vala:658 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1361 ../src/Dialogs.vala:1384
-#: ../src/data_imports/DataImportsUI.vala:399
-#: ../src/publishing/PublishingUI.vala:498
+#: ../src/AppWindow.vala:632 ../src/AppWindow.vala:653
+#: ../src/AppWindow.vala:670 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
+#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441
+#: ../src/data_imports/DataImportsUI.vala:374
+#: ../src/publishing/PublishingUI.vala:475
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../src/AppWindow.vala:668
+#: ../src/AppWindow.vala:680
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
@@ -913,16 +1160,20 @@ msgstr ""
 "%s"
 
 #: ../src/AppWindow.vala:700
+msgid "Visit the Yorba web site"
+msgstr "Visitez le site Web de Yorba"
+
+#: ../src/AppWindow.vala:712
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Impossible d'afficher l'aide : %s"
 
-#: ../src/AppWindow.vala:708
+#: ../src/AppWindow.vala:720
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Impossible de parcourir la base de donnée des anomalies : %s"
 
-#: ../src/AppWindow.vala:716
+#: ../src/AppWindow.vala:728
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Impossible d'afficher la FAQ : %s"
@@ -988,11 +1239,11 @@ msgstr "Fichier image corrompu"
 msgid "Imported failed (%d)"
 msgstr "Échec de l'importation (%d)"
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2627
+#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2634
 msgid "S_lideshow"
 msgstr "Diapora_ma"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2628
+#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2635
 msgid "Play a slideshow"
 msgstr "Lancer un diaporama"
 
@@ -1005,7 +1256,7 @@ msgid "Export Photos/Videos"
 msgstr "Exporter les photos/vidéos"
 
 #: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3200
+#: ../src/PhotoPage.vala:3208
 msgid "Export Photo"
 msgstr "Exporter la photo"
 
@@ -1053,100 +1304,100 @@ msgstr "Amélioration"
 msgid "Undoing Enhance"
 msgstr "Annuler l'amélioration"
 
-#: ../src/Commands.vala:845
+#: ../src/Commands.vala:853
 msgid "Applying Color Transformations"
 msgstr "Application des transformations de couleurs"
 
-#: ../src/Commands.vala:845
+#: ../src/Commands.vala:853
 msgid "Undoing Color Transformations"
 msgstr "Annuler les transformations de couleurs"
 
-#: ../src/Commands.vala:995
+#: ../src/Commands.vala:1003
 msgid "Creating New Event"
 msgstr "Création d'un nouvel événement"
 
-#: ../src/Commands.vala:996
+#: ../src/Commands.vala:1004
 msgid "Removing Event"
 msgstr "Effacement de l'événement"
 
-#: ../src/Commands.vala:1005
+#: ../src/Commands.vala:1013
 msgid "Moving Photos to New Event"
 msgstr "Déplacer les photos vers le nouvel événement"
 
-#: ../src/Commands.vala:1006
+#: ../src/Commands.vala:1014
 msgid "Setting Photos to Previous Event"
 msgstr "Déplacer les photos vers l'événement précédent"
 
-#: ../src/Commands.vala:1063
+#: ../src/Commands.vala:1071
 msgid "Merging"
 msgstr "Fusion"
 
-#: ../src/Commands.vala:1064
+#: ../src/Commands.vala:1072
 msgid "Unmerging"
 msgstr "Annuler la fusion"
 
-#: ../src/Commands.vala:1073
+#: ../src/Commands.vala:1081
 msgid "Duplicating photos"
 msgstr "Duplication des photos"
 
-#: ../src/Commands.vala:1073
+#: ../src/Commands.vala:1081
 msgid "Removing duplicated photos"
 msgstr "Effacement des photos dupliquées"
 
-#: ../src/Commands.vala:1096
+#: ../src/Commands.vala:1104
 #, 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] "Impossible de dupliquer une photo suite à une erreur de fichier"
 msgstr[1] "Impossible de dupliquer %d photos suite à des erreurs de fichier"
 
-#: ../src/Commands.vala:1183
+#: ../src/Commands.vala:1191
 msgid "Restoring previous rating"
 msgstr "Rétablissement de la note précédente"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
 msgid "Increasing ratings"
 msgstr "Amélioration des notes"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
 msgid "Decreasing ratings"
 msgstr "Diminution des notes"
 
-#: ../src/Commands.vala:1244
+#: ../src/Commands.vala:1252
 msgid "Setting RAW developer"
 msgstr "Configurer le révélateur RAW"
 
-#: ../src/Commands.vala:1244
+#: ../src/Commands.vala:1252
 msgid "Restoring previous RAW developer"
 msgstr "Rétablir le révélateur RAW précédent"
 
-#: ../src/Commands.vala:1245
+#: ../src/Commands.vala:1253
 msgid "Set Developer"
 msgstr "Définir le révélateur"
 
-#: ../src/Commands.vala:1335
+#: ../src/Commands.vala:1343
 msgid "Original photo could not be adjusted."
 msgstr "La photo originale n'a pas pu être ajustée."
 
-#: ../src/Commands.vala:1356
+#: ../src/Commands.vala:1364
 msgid "Adjusting Date and Time"
 msgstr "Ajustement de la date et de l'heure"
 
-#: ../src/Commands.vala:1356
+#: ../src/Commands.vala:1364
 msgid "Undoing Date and Time Adjustment"
 msgstr "Annuler l'ajustement de la date et de l'heure"
 
-#: ../src/Commands.vala:1387
+#: ../src/Commands.vala:1395
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
 msgstr[0] "Une photo originale n'a pas pu être ajustée."
 msgstr[1] "Les photos originales suivantes n'ont pas pu être ajustées."
 
-#: ../src/Commands.vala:1389 ../src/Commands.vala:1413
+#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
 msgid "Time Adjustment Error"
 msgstr "Erreur de l'ajustement de la date"
 
-#: ../src/Commands.vala:1411
+#: ../src/Commands.vala:1419
 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."
@@ -1156,78 +1407,78 @@ msgstr[1] ""
 "L'ajustement de l'heure n'a pas pu être annulé sur les fichiers photo "
 "suivants."
 
-#: ../src/Commands.vala:1625 ../src/Commands.vala:1648
+#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
 msgid "Create Tag"
 msgstr "Créer une étiquette"
 
-#: ../src/Commands.vala:1683
+#: ../src/Commands.vala:1691
 #, c-format
 msgid "Move Tag \"%s\""
 msgstr "Déplacer l'étiquette « %s »"
 
-#: ../src/Commands.vala:2335
+#: ../src/Commands.vala:2343
 msgid "Move Photos to Trash"
 msgstr "Mettre les photos dans la corbeille"
 
-#: ../src/Commands.vala:2335
+#: ../src/Commands.vala:2343
 msgid "Restore Photos from Trash"
 msgstr "Restaurer les photos contenues dans la corbeille"
 
-#: ../src/Commands.vala:2336
+#: ../src/Commands.vala:2344
 msgid "Move the photos to the Shotwell trash"
 msgstr "Déplacer les photos dans la corbeille de Shotwell"
 
-#: ../src/Commands.vala:2336
+#: ../src/Commands.vala:2344
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Réintègrer les photos dans la photothèque de Shotwell"
 
-#: ../src/Commands.vala:2355
+#: ../src/Commands.vala:2363
 msgid "Moving Photos to Trash"
 msgstr "Déplacement des photos dans la corbeille"
 
-#: ../src/Commands.vala:2355
+#: ../src/Commands.vala:2363
 msgid "Restoring Photos From Trash"
 msgstr "Restauration des photos de la corbeille"
 
-#: ../src/Commands.vala:2441
+#: ../src/Commands.vala:2449
 msgid "Flag selected photos"
 msgstr "Marquer les photos sélectionnées"
 
-#: ../src/Commands.vala:2442
+#: ../src/Commands.vala:2450
 msgid "Unflag selected photos"
 msgstr "Enlever la marque des photos sélectionnées"
 
-#: ../src/Commands.vala:2443
+#: ../src/Commands.vala:2451
 msgid "Flagging selected photos"
 msgstr "Marquage des photos sélectionnées"
 
-#: ../src/Commands.vala:2444
+#: ../src/Commands.vala:2452
 msgid "Unflagging selected photos"
 msgstr "Suppression de la marque des photos sélectionnées"
 
-#: ../src/Commands.vala:2451
+#: ../src/Commands.vala:2459
 msgid "Flag"
 msgstr "Marquer"
 
-#: ../src/Commands.vala:2451
+#: ../src/Commands.vala:2459
 msgid "Unflag"
 msgstr "Enlever la marque"
 
-#: ../src/DesktopIntegration.vala:118
+#: ../src/DesktopIntegration.vala:121
 #, c-format
 msgid "Unable to launch Nautilus Send-To: %s"
 msgstr "Impossible de lancer Nautilus Send-To : %s"
 
-#: ../src/DesktopIntegration.vala:126
+#: ../src/DesktopIntegration.vala:129
 msgid "Send To"
 msgstr "Envoyer vers"
 
-#: ../src/DesktopIntegration.vala:171
+#: ../src/DesktopIntegration.vala:174
 #, c-format
 msgid "Unable to export background to %s: %s"
 msgstr "Impossible d'exporter le fond d'écran vers %s : %s"
 
-#: ../src/DesktopIntegration.vala:299
+#: ../src/DesktopIntegration.vala:311
 #, c-format
 msgid "Unable to prepare desktop slideshow: %s"
 msgstr "Impossible de préparer le diaporama d'écran : %s"
@@ -1239,9 +1490,9 @@ msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
 msgstr[0] "Ceci enlèvera l'étiquette « %s » d'une photo. Poursuivre ?"
 msgstr[1] "Ceci enlèvera l'étiquette « %s » de %d photos. Poursuivre ?"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1329
-#: ../src/Resources.vala:330 ../src/Resources.vala:378
-#: ../src/Resources.vala:643
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
+#: ../src/Resources.vala:336 ../src/Resources.vala:384
+#: ../src/Resources.vala:649
 msgid "_Delete"
 msgstr "_Supprimer"
 
@@ -1316,51 +1567,51 @@ msgid "Current"
 msgstr "Actuel"
 
 #. layout controls
-#: ../src/Dialogs.vala:212
+#: ../src/Dialogs.vala:213
 msgid "_Format:"
 msgstr "_Format :"
 
-#: ../src/Dialogs.vala:215
+#: ../src/Dialogs.vala:216
 msgid "_Quality:"
 msgstr "_Qualité :"
 
-#: ../src/Dialogs.vala:218
+#: ../src/Dialogs.vala:219
 msgid "_Scaling constraint:"
 msgstr "_Contrainte d'échelle :"
 
-#: ../src/Dialogs.vala:221
-msgid " _pixels"
-msgstr " _pixels"
+#: ../src/Dialogs.vala:222
+msgid "_Pixels:"
+msgstr "_Pixels :"
 
-#: ../src/Dialogs.vala:229
+#: ../src/Dialogs.vala:225
 msgid "Export metadata"
 msgstr "Exporter les métadonnées"
 
-#: ../src/Dialogs.vala:465
+#: ../src/Dialogs.vala:459
 msgid "Save Details..."
 msgstr "Enregistrer les détails..."
 
-#: ../src/Dialogs.vala:466
+#: ../src/Dialogs.vala:460
 msgid "Save Details"
 msgstr "Enregistrer les détails"
 
-#: ../src/Dialogs.vala:481
+#: ../src/Dialogs.vala:475
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(et %d autres)\n"
 
-#: ../src/Dialogs.vala:534
+#: ../src/Dialogs.vala:528
 msgid "Import Results Report"
 msgstr "Importer les résultats du rapport"
 
-#: ../src/Dialogs.vala:538
+#: ../src/Dialogs.vala:532
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "Tentative d'importation de %d fichier."
 msgstr[1] "Tentative d'importation de %d fichiers."
 
-#: ../src/Dialogs.vala:541
+#: ../src/Dialogs.vala:535
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -1370,30 +1621,30 @@ msgstr[1] "Parmi ces derniers, %d fichiers ont été importés avec succès."
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:553
+#: ../src/Dialogs.vala:547
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Photos/vidéos à double non importées :"
 
-#: ../src/Dialogs.vala:557
+#: ../src/Dialogs.vala:551
 msgid "duplicates existing media item"
 msgstr "est identique à un média existant"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: ../src/Dialogs.vala:568
+#: ../src/Dialogs.vala:562
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Photos/vidéos non importées à cause d'une erreur de l'appareil photo :"
 
-#: ../src/Dialogs.vala:571 ../src/Dialogs.vala:586 ../src/Dialogs.vala:601
-#: ../src/Dialogs.vala:617 ../src/Dialogs.vala:632 ../src/Dialogs.vala:646
+#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
+#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
 msgid "error message:"
 msgstr "message d'erreur :"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: ../src/Dialogs.vala:582
+#: ../src/Dialogs.vala:576
 msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgstr ""
 "Fichiers non importés car ils n'ont pas été reconnus en tant que photos ou "
@@ -1402,7 +1653,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: ../src/Dialogs.vala:597
+#: ../src/Dialogs.vala:591
 msgid ""
 "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
 "Understands:"
@@ -1413,7 +1664,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: ../src/Dialogs.vala:612
+#: ../src/Dialogs.vala:606
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
 "Library:"
@@ -1421,7 +1672,7 @@ msgstr ""
 "Photos/vidéos non importées car Shotwell n'a pas pu les copier dans sa "
 "bibliothèque :"
 
-#: ../src/Dialogs.vala:616
+#: ../src/Dialogs.vala:610
 #, c-format
 msgid ""
 "couldn't copy %s\n"
@@ -1433,39 +1684,39 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: ../src/Dialogs.vala:628
+#: ../src/Dialogs.vala:622
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Photos/vidéos non importées car les fichiers sont corrompus :"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: ../src/Dialogs.vala:643
+#: ../src/Dialogs.vala:637
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Photos/vidéos non importées pour d'autres raisons :"
 
-#: ../src/Dialogs.vala:663
+#: ../src/Dialogs.vala:657
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "1 photo dupliquée non importée :\n"
 msgstr[1] "%d photos dupliquées non importées :\n"
 
-#: ../src/Dialogs.vala:666
+#: ../src/Dialogs.vala:660
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "1 vidéo dupliquée non importée :\n"
 msgstr[1] "%d vidéos dupliquées non importées :\n"
 
-#: ../src/Dialogs.vala:669
+#: ../src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "1 photo/vidéo dupliquée non importée :\n"
 msgstr[1] "%d photos/vidéos dupliquées non importées :\n"
 
-#: ../src/Dialogs.vala:683
+#: ../src/Dialogs.vala:677
 #, 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"
@@ -1476,7 +1727,7 @@ msgstr[1] ""
 "L'importation de %d photos a échoué suite à une erreur de fichier ou "
 "matérielle :\n"
 
-#: ../src/Dialogs.vala:686
+#: ../src/Dialogs.vala:680
 #, 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"
@@ -1487,7 +1738,7 @@ msgstr[1] ""
 "L'importation de %d vidéos a échoué suite à une erreur de fichier ou "
 "matérielle :\n"
 
-#: ../src/Dialogs.vala:689
+#: ../src/Dialogs.vala:683
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -1499,7 +1750,7 @@ msgstr[1] ""
 "L'importation de %d photos/vidéos a échoué suite à une erreur de fichier ou "
 "matérielle :\n"
 
-#: ../src/Dialogs.vala:692
+#: ../src/Dialogs.vala:686
 #, 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"
@@ -1510,7 +1761,7 @@ msgstr[1] ""
 "L'importation de %d fichiers a échoué suite à une erreur de fichier ou "
 "matérielle :\n"
 
-#: ../src/Dialogs.vala:706
+#: ../src/Dialogs.vala:700
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -1524,7 +1775,7 @@ msgstr[1] ""
 "L'importation de %d photos a échoué car le dossier de la photothèque n'est "
 "pas accessible en écriture :\n"
 
-#: ../src/Dialogs.vala:709
+#: ../src/Dialogs.vala:703
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -1538,7 +1789,7 @@ msgstr[1] ""
 "L'importation de %d vidéos a échoué car le dossier de la photothèque n'est "
 "pas accessible en écriture :\n"
 
-#: ../src/Dialogs.vala:712
+#: ../src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1553,7 +1804,7 @@ msgstr[1] ""
 "L'importation de %d photos/vidéos a échoué car le dossier de la photothèque "
 "n'est pas accessible en écriture :\n"
 
-#: ../src/Dialogs.vala:715
+#: ../src/Dialogs.vala:709
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -1567,7 +1818,7 @@ msgstr[1] ""
 "L'importation de %d fichiers a échoué car le dossier de la photothèque n'est "
 "pas accessible en écriture :\n"
 
-#: ../src/Dialogs.vala:729
+#: ../src/Dialogs.vala:723
 #, 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"
@@ -1577,7 +1828,7 @@ msgstr[1] ""
 "L'importation de %d photos a échoué suite à une erreur de l'appareil "
 "photo :\n"
 
-#: ../src/Dialogs.vala:732
+#: ../src/Dialogs.vala:726
 #, 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"
@@ -1587,7 +1838,7 @@ msgstr[1] ""
 "L'importation de %d vidéos a échoué suite à une erreur de l'appareil "
 "photo :\n"
 
-#: ../src/Dialogs.vala:735
+#: ../src/Dialogs.vala:729
 #, 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"
@@ -1598,7 +1849,7 @@ msgstr[1] ""
 "L'importation de %d photos/vidéos a échoué suite à une erreur de l'appareil "
 "photo :\n"
 
-#: ../src/Dialogs.vala:738
+#: ../src/Dialogs.vala:732
 #, 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"
@@ -1609,7 +1860,7 @@ msgstr[1] ""
 "L'importation de %d fichiers a échoué suite à une erreur de l'appareil "
 "photo :\n"
 
-#: ../src/Dialogs.vala:752
+#: ../src/Dialogs.vala:746
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
@@ -1617,7 +1868,7 @@ msgstr[0] "L'importation d'une photo a échoué car elle était corrompue :\n"
 msgstr[1] ""
 "L'importation de %d photos a échoué car elles étaient corrompues :\n"
 
-#: ../src/Dialogs.vala:755
+#: ../src/Dialogs.vala:749
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
@@ -1625,7 +1876,7 @@ msgstr[0] "L'importation d'une vidéo a échoué car elle était corrompue :\n"
 msgstr[1] ""
 "L'importation de %d vidéos a échoué car elles étaient corrompues :\n"
 
-#: ../src/Dialogs.vala:758
+#: ../src/Dialogs.vala:752
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
@@ -1634,7 +1885,7 @@ msgstr[0] ""
 msgstr[1] ""
 "L'importation de %d photos/vidéos a échoué car elles étaient corrompues :\n"
 
-#: ../src/Dialogs.vala:761
+#: ../src/Dialogs.vala:755
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
@@ -1645,7 +1896,7 @@ msgstr[1] "L'importation de %d fichiers a échoué car ils étaient corrompus :
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: ../src/Dialogs.vala:778
+#: ../src/Dialogs.vala:772
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1654,14 +1905,14 @@ msgstr[1] "%d photos non prises en charge ont été omises :\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: ../src/Dialogs.vala:793
+#: ../src/Dialogs.vala:787
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "1 fichier non-image omis.\n"
 msgstr[1] "%d fichiers non-images omis.\n"
 
-#: ../src/Dialogs.vala:804
+#: ../src/Dialogs.vala:798
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
@@ -1669,7 +1920,7 @@ msgstr[0] "L'annulation de l'utilisateur a provoqué l'omission d'une photo :\n
 msgstr[1] ""
 "L'annulation de l'utilisateur a provoqué l'omission de %d photos :\n"
 
-#: ../src/Dialogs.vala:807
+#: ../src/Dialogs.vala:801
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
@@ -1677,7 +1928,7 @@ msgstr[0] "L'annulation de l'utilisateur a provoqué l'omission d'une vidéo :\
 msgstr[1] ""
 "L'annulation de l'utilisateur a provoqué l'omission de %d vidéos :\n"
 
-#: ../src/Dialogs.vala:810
+#: ../src/Dialogs.vala:804
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
@@ -1686,28 +1937,28 @@ msgstr[0] ""
 msgstr[1] ""
 "L'annulation de l'utilisateur a provoqué l'omission de %d photos/vidéos :\n"
 
-#: ../src/Dialogs.vala:813
+#: ../src/Dialogs.vala:807
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "1 fichier omis par annulation de l'utilisateur :\n"
 msgstr[1] "%d fichiers omis par annulation de l'utilisateur :\n"
 
-#: ../src/Dialogs.vala:827
+#: ../src/Dialogs.vala:821
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "Une photo importée avec succès.\n"
 msgstr[1] "%d photos importées avec succès.\n"
 
-#: ../src/Dialogs.vala:830
+#: ../src/Dialogs.vala:824
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "Une vidéo importée avec succès.\n"
 msgstr[1] "%d vidéos importées avec succès.\n"
 
-#: ../src/Dialogs.vala:833
+#: ../src/Dialogs.vala:827
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -1716,90 +1967,93 @@ msgstr[1] "%d photos/vidéos importées avec succès.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: ../src/Dialogs.vala:849
+#: ../src/Dialogs.vala:843
 msgid "No photos or videos imported.\n"
 msgstr "Aucune photo ou vidéo importée.\n"
 
-#: ../src/Dialogs.vala:856 ../src/Dialogs.vala:875
+#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
 msgid "Import Complete"
 msgstr "Importation achevée"
 
-#: ../src/Dialogs.vala:1103
+#: ../src/Dialogs.vala:1155
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d secondes"
 
-#: ../src/Dialogs.vala:1106
+#: ../src/Dialogs.vala:1158
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../src/Dialogs.vala:1110
+#: ../src/Dialogs.vala:1162
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: ../src/Dialogs.vala:1113
+#: ../src/Dialogs.vala:1165
 msgid "1 day"
 msgstr "1 jour"
 
-#: ../src/Dialogs.vala:1263 ../src/Resources.vala:205
+#: ../src/Dialogs.vala:1315 ../src/Resources.vala:203
 msgid "Rename Event"
 msgstr "Renommer l'événement"
 
-#: ../src/Dialogs.vala:1263
+#: ../src/Dialogs.vala:1315
 msgid "Name:"
 msgstr "Nom :"
 
-#: ../src/Dialogs.vala:1273 ../src/Resources.vala:274
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1326 ../src/Resources.vala:275
 msgid "Edit Title"
 msgstr "Modifier le titre"
 
-#: ../src/Dialogs.vala:1273 ../src/Properties.vala:340
+#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
 msgid "Title:"
 msgstr "Titre :"
 
-#: ../src/Dialogs.vala:1287 ../src/Resources.vala:280
+#. Dialog title
+#: ../src/Dialogs.vala:1343 ../src/Resources.vala:282
 msgid "Edit Event Comment"
 msgstr "Modifier le commentaire de l'événement"
 
-#: ../src/Dialogs.vala:1287
+#: ../src/Dialogs.vala:1344
 msgid "Edit Photo/Video Comment"
 msgstr "Modifier le commentaire de la photo/vidéo"
 
-#: ../src/Dialogs.vala:1288 ../src/Properties.vala:630
+#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: ../src/Dialogs.vala:1304
+#: ../src/Dialogs.vala:1361
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Supprimer et me_ttre le fichier à la corbeille"
 msgstr[1] "Supprimer et me_ttre les fichiers à la corbeille"
 
-#: ../src/Dialogs.vala:1308
+#: ../src/Dialogs.vala:1365
 msgid "_Remove From Library"
 msgstr "Supp_rimer de la photothèque"
 
-#: ../src/Dialogs.vala:1328 ../src/camera/ImportPage.vala:1739
+#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1739
 msgid "_Keep"
 msgstr "_Garder"
 
-#: ../src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edit?"
 msgstr "Annuler l'édition externe ?"
 
-#: ../src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edits?"
 msgstr "Annuler les éditions externes ?"
 
-#: ../src/Dialogs.vala:1353
+#: ../src/Dialogs.vala:1410
 #, c-format
 msgid "This will destroy all changes made to the external file.  Continue?"
 msgid_plural ""
@@ -1810,87 +2064,87 @@ msgstr[1] ""
 "Ceci détruira tous les changements appliqués aux %d fichiers externes. "
 "Poursuivre ?"
 
-#: ../src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edit"
 msgstr "A_nnuler l'édition externe"
 
-#: ../src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edits"
 msgstr "A_nnuler les éditions externes"
 
-#: ../src/Dialogs.vala:1378
+#: ../src/Dialogs.vala:1435
 #, 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] "Ceci enlèvera la photo de la photothèque. Poursuivre ?"
 msgstr[1] "Ceci enlèvera %d photos de la photothèque. Poursuivre ?"
 
-#: ../src/Dialogs.vala:1385
+#: ../src/Dialogs.vala:1442
 msgid "_Remove"
 msgstr "_Enlever"
 
-#: ../src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photo From Library"
 msgstr "Enlever la photo de la photothèque"
 
-#: ../src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photos From Library"
 msgstr "Enlever les photos de la photothèque"
 
-#: ../src/Dialogs.vala:1479
+#: ../src/Dialogs.vala:1536
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1626
+#: ../src/Dialogs.vala:1688
 msgid "AM"
 msgstr "Matin"
 
-#: ../src/Dialogs.vala:1627
+#: ../src/Dialogs.vala:1689
 msgid "PM"
 msgstr "Après-midi"
 
-#: ../src/Dialogs.vala:1628
+#: ../src/Dialogs.vala:1690
 msgid "24 Hr"
 msgstr "24 Hr"
 
-#: ../src/Dialogs.vala:1643
+#: ../src/Dialogs.vala:1705
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Décaler les photos/vidéos de la même durée"
 
-#: ../src/Dialogs.vala:1648
+#: ../src/Dialogs.vala:1710
 msgid "Set _all photos/videos to this time"
 msgstr "Dé_finir cette date pour toutes les photos/vidéos"
 
-#: ../src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo file"
 msgstr "_Modifier la photo d'origine"
 
-#: ../src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo files"
 msgstr "_Modifier les photos d'origine"
 
-#: ../src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original file"
 msgstr "_Modifier le fichier original"
 
-#: ../src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original files"
 msgstr "_Modifier les fichiers originaux"
 
-#: ../src/Dialogs.vala:1744
+#: ../src/Dialogs.vala:1806
 msgid "Original: "
 msgstr "Original : "
 
-#: ../src/Dialogs.vala:1745
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d/%m/%Y, %H:%M:%S"
 
-#: ../src/Dialogs.vala:1746
+#: ../src/Dialogs.vala:1808
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d/%m/%Y, %I:%M:%S %p"
 
-#: ../src/Dialogs.vala:1835
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -1899,7 +2153,7 @@ msgstr ""
 "La date de la prise de vue sera avancée de\n"
 "%d %s, %d %s, %d %s et %d %s."
 
-#: ../src/Dialogs.vala:1836
+#: ../src/Dialogs.vala:1898
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -1908,31 +2162,31 @@ msgstr ""
 "La date de la prise de vue sera reculée de\n"
 "%d %s, %d %s, %d %s et %d %s."
 
-#: ../src/Dialogs.vala:1838
+#: ../src/Dialogs.vala:1900
 msgid "day"
 msgid_plural "days"
 msgstr[0] "jour"
 msgstr[1] "jours"
 
-#: ../src/Dialogs.vala:1839
+#: ../src/Dialogs.vala:1901
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "heure"
 msgstr[1] "heures"
 
-#: ../src/Dialogs.vala:1840
+#: ../src/Dialogs.vala:1902
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: ../src/Dialogs.vala:1841
+#: ../src/Dialogs.vala:1903
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "seconde"
 msgstr[1] "secondes"
 
-#: ../src/Dialogs.vala:1885
+#: ../src/Dialogs.vala:1947
 #, c-format
 msgid ""
 "\n"
@@ -1951,51 +2205,51 @@ msgstr[1] ""
 "\n"
 "Et %d autres."
 
-#: ../src/Dialogs.vala:1907 ../src/Dialogs.vala:1934
+#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
 msgid "Tags (separated by commas):"
 msgstr "Étiquettes (séparées par des virgules) :"
 
-#: ../src/Dialogs.vala:2014
+#: ../src/Dialogs.vala:2076
 msgid "Welcome!"
 msgstr "Bienvenue !"
 
-#: ../src/Dialogs.vala:2021
+#: ../src/Dialogs.vala:2083
 msgid "Welcome to Shotwell!"
 msgstr "Bienvenue sur Shotwell"
 
-#: ../src/Dialogs.vala:2025
+#: ../src/Dialogs.vala:2087
 msgid "To get started, import photos in any of these ways:"
 msgstr "Pour commencer, importez des photos d'une des manières suivantes :"
 
-#: ../src/Dialogs.vala:2044
+#: ../src/Dialogs.vala:2106
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr ""
 "Choisissez <span weight=\"bold\">Fichier %s Importer depuis un dossier</span>"
 
-#: ../src/Dialogs.vala:2045
+#: ../src/Dialogs.vala:2107
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Faites glisser des photos dans la fenêtre de Shotwell"
 
-#: ../src/Dialogs.vala:2046
+#: ../src/Dialogs.vala:2108
 msgid "Connect a camera to your computer and import"
 msgstr "Connectez un appareil photo à votre ordinateur et importez des photos"
 
-#: ../src/Dialogs.vala:2056
+#: ../src/Dialogs.vala:2118
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importer des photos du dossier %s"
 
-#: ../src/Dialogs.vala:2063
+#: ../src/Dialogs.vala:2125
 msgid "You can also import photos in any of these ways:"
 msgstr ""
 "Vous pouvez également importer des photos avec les méthodes suivantes :"
 
-#: ../src/Dialogs.vala:2073
+#: ../src/Dialogs.vala:2135
 msgid "_Don't show this message again"
 msgstr "_Ne plus afficher ce message"
 
-#: ../src/Dialogs.vala:2108
+#: ../src/Dialogs.vala:2170
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Importer des photos de la photothèque %s"
@@ -2003,41 +2257,41 @@ msgstr "Importer des photos de la photothèque %s"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2252 ../src/Dialogs.vala:2256
+#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
 msgid "(Help)"
 msgstr "(aide)"
 
-#: ../src/Dialogs.vala:2265
+#: ../src/Dialogs.vala:2324
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Année%sMois%sJour"
 
-#: ../src/Dialogs.vala:2267
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth"
 msgstr "Année%sMois"
 
-#: ../src/Dialogs.vala:2269
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Année%sMois-Jour"
 
-#: ../src/Dialogs.vala:2271
+#: ../src/Dialogs.vala:2330
 msgid "Year-Month-Day"
 msgstr "Année-Mois-Jour"
 
-#: ../src/Dialogs.vala:2272 ../src/editing_tools/EditingTools.vala:781
+#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Personnalisé"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2509
+#: ../src/Dialogs.vala:2568
 msgid "Invalid pattern"
 msgstr "Modèle non valable"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: ../src/Dialogs.vala:2612
+#: ../src/Dialogs.vala:2670
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2045,31 +2299,31 @@ msgstr ""
 "Shotwell peut copier les photos dans votre photothèque ou les importer sans "
 "les copier."
 
-#: ../src/Dialogs.vala:2617
+#: ../src/Dialogs.vala:2675
 msgid "Co_py Photos"
 msgstr "Co_pier les photos"
 
-#: ../src/Dialogs.vala:2618
+#: ../src/Dialogs.vala:2676
 msgid "_Import in Place"
 msgstr "Importer _sans copier"
 
-#: ../src/Dialogs.vala:2619
+#: ../src/Dialogs.vala:2677
 msgid "Import to Library"
 msgstr "Importer dans la photothèque"
 
-#: ../src/Dialogs.vala:2629 ../src/PhotoPage.vala:3079
+#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3084
 msgid "Remove From Library"
 msgstr "Enlever de la photothèque"
 
-#: ../src/Dialogs.vala:2630 ../src/PhotoPage.vala:3079
+#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3084
 msgid "Removing Photo From Library"
 msgstr "Effacement de la photo de la photothèque"
 
-#: ../src/Dialogs.vala:2630
+#: ../src/Dialogs.vala:2688
 msgid "Removing Photos From Library"
 msgstr "Effacement des photos de la photothèque"
 
-#: ../src/Dialogs.vala:2644
+#: ../src/Dialogs.vala:2702
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -2092,7 +2346,7 @@ msgstr[1] ""
 "\n"
 "Cette action n'est pas réversible."
 
-#: ../src/Dialogs.vala:2648
+#: ../src/Dialogs.vala:2706
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -2115,7 +2369,7 @@ msgstr[1] ""
 "\n"
 "Cette action n'est pas réversible."
 
-#: ../src/Dialogs.vala:2652
+#: ../src/Dialogs.vala:2710
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -2138,7 +2392,7 @@ msgstr[1] ""
 "\n"
 "Cette action n'est pas réversible."
 
-#: ../src/Dialogs.vala:2684
+#: ../src/Dialogs.vala:2742
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -2152,17 +2406,13 @@ msgstr[1] ""
 "supprimer les fichiers ?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2701
+#: ../src/Dialogs.vala:2759
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
 msgstr[0] "La photo ou la vidéo ne peut pas être supprimée."
 msgstr[1] "%d photos ou vidéos ne peuvent pas être supprimées."
 
-#: ../src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Largeur ou hauteur"
-
 #: ../src/Dimensions.vala:23
 msgid "Width"
 msgstr "Largeur"
@@ -2178,7 +2428,7 @@ msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Impossible de surveiller %s : ce n'est pas un dossier (%s)"
 
 #. if no name, pretty up the start time
-#: ../src/Event.vala:753
+#: ../src/Event.vala:751
 #, c-format
 msgid "Event %s"
 msgstr "Événement %s"
@@ -2218,119 +2468,115 @@ msgstr "Exporter"
 msgid "Unable to process monitoring updates: %s"
 msgstr "Impossible de vérifier les mises à jour : %s"
 
-#: ../src/MediaPage.vala:143
+#: ../src/MediaPage.vala:157
 msgid "Adjust the size of the thumbnails"
 msgstr "Agrandir ou réduire les miniatures"
 
-#: ../src/MediaPage.vala:325 ../src/PhotoPage.vala:2583
+#: ../src/MediaPage.vala:339 ../src/PhotoPage.vala:2590
 #: ../src/direct/DirectPhotoPage.vala:174
 msgid "Zoom _In"
 msgstr "Zoom _avant"
 
-#: ../src/MediaPage.vala:326
+#: ../src/MediaPage.vala:340
 msgid "Increase the magnification of the thumbnails"
 msgstr "Agrandit les miniatures"
 
-#: ../src/MediaPage.vala:331 ../src/PhotoPage.vala:2589
+#: ../src/MediaPage.vala:345 ../src/PhotoPage.vala:2596
 #: ../src/direct/DirectPhotoPage.vala:180
 msgid "Zoom _Out"
 msgstr "Zoom a_rrière"
 
-#: ../src/MediaPage.vala:332
+#: ../src/MediaPage.vala:346
 msgid "Decrease the magnification of the thumbnails"
 msgstr "Réduit les miniatures"
 
-#: ../src/MediaPage.vala:399
+#: ../src/MediaPage.vala:413
 msgid "Sort _Photos"
 msgstr "Trier les _photos"
 
-#: ../src/MediaPage.vala:408
+#: ../src/MediaPage.vala:422
 msgid "_Play Video"
 msgstr "_Lire la vidéo"
 
-#: ../src/MediaPage.vala:409
+#: ../src/MediaPage.vala:423
 msgid "Open the selected videos in the system video player"
 msgstr "Ouvre les vidéos sélectionnées dans le lecteur vidéo du système"
 
-#: ../src/MediaPage.vala:413 ../src/PhotoPage.vala:2632
+#: ../src/MediaPage.vala:427 ../src/PhotoPage.vala:2639
 msgid "_Developer"
 msgstr "_Révélateur"
 
-#: ../src/MediaPage.vala:420 ../src/photos/RawSupport.vala:297
-msgid "Shotwell"
-msgstr "Shotwell"
-
-#: ../src/MediaPage.vala:425 ../src/camera/Branch.vala:101
+#: ../src/MediaPage.vala:439 ../src/camera/Branch.vala:101
 #: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
-#: ../src/photos/RawSupport.vala:300
+#: ../src/photos/RawSupport.vala:303
 msgid "Camera"
 msgstr "Appareil photo"
 
-#: ../src/MediaPage.vala:436 ../src/camera/ImportPage.vala:872
+#: ../src/MediaPage.vala:450 ../src/camera/ImportPage.vala:872
 msgid "_Titles"
 msgstr "_Titres"
 
-#: ../src/MediaPage.vala:437 ../src/camera/ImportPage.vala:873
+#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:873
 msgid "Display the title of each photo"
 msgstr "Affiche le titre de chaque photo"
 
-#: ../src/MediaPage.vala:442 ../src/events/EventsDirectoryPage.vala:130
+#: ../src/MediaPage.vala:456 ../src/events/EventsDirectoryPage.vala:130
 msgid "_Comments"
 msgstr "_Commentaires"
 
-#: ../src/MediaPage.vala:443
+#: ../src/MediaPage.vala:457
 msgid "Display the comment of each photo"
 msgstr "Afficher le commentaire de chaque photo"
 
-#: ../src/MediaPage.vala:454 ../src/library/LibraryWindow.vala:376
+#: ../src/MediaPage.vala:468 ../src/library/LibraryWindow.vala:376
 msgid "Ta_gs"
 msgstr "É_tiquettes"
 
-#: ../src/MediaPage.vala:455
+#: ../src/MediaPage.vala:469
 msgid "Display each photo's tags"
 msgstr "Afficher les étiquettes de chaque photo"
 
-#: ../src/MediaPage.vala:471
+#: ../src/MediaPage.vala:485
 msgid "By _Title"
 msgstr "Par _titre"
 
-#: ../src/MediaPage.vala:472
+#: ../src/MediaPage.vala:486
 msgid "Sort photos by title"
 msgstr "Trie les photos par titre"
 
-#: ../src/MediaPage.vala:477
+#: ../src/MediaPage.vala:491
 msgid "By Exposure _Date"
 msgstr "Par _date"
 
-#: ../src/MediaPage.vala:478
+#: ../src/MediaPage.vala:492
 msgid "Sort photos by exposure date"
 msgstr "Trie les photos par date de prise de vue"
 
-#: ../src/MediaPage.vala:483
+#: ../src/MediaPage.vala:497
 msgid "By _Rating"
 msgstr "Par _note"
 
-#: ../src/MediaPage.vala:484
+#: ../src/MediaPage.vala:498
 msgid "Sort photos by rating"
 msgstr "Trie les photos par note"
 
-#: ../src/MediaPage.vala:494 ../src/library/LibraryWindow.vala:422
+#: ../src/MediaPage.vala:508 ../src/library/LibraryWindow.vala:422
 msgid "_Ascending"
 msgstr "Ordre croiss_ant"
 
-#: ../src/MediaPage.vala:495 ../src/library/LibraryWindow.vala:423
+#: ../src/MediaPage.vala:509 ../src/library/LibraryWindow.vala:423
 msgid "Sort photos in an ascending order"
 msgstr "Trie les photos par ordre croissant"
 
-#: ../src/MediaPage.vala:500 ../src/library/LibraryWindow.vala:429
+#: ../src/MediaPage.vala:514 ../src/library/LibraryWindow.vala:429
 msgid "D_escending"
 msgstr "Ordr_e décroissant"
 
-#: ../src/MediaPage.vala:501 ../src/library/LibraryWindow.vala:430
+#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:430
 msgid "Sort photos in a descending order"
 msgstr "Trie les photos par ordre décroissant"
 
-#: ../src/MediaPage.vala:702
+#: ../src/MediaPage.vala:716
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -2339,19 +2585,19 @@ msgstr ""
 "Shotwell n'a pas pu lire la vidéo sélectionnée :\n"
 "%s"
 
-#: ../src/Page.vala:1268
+#: ../src/Page.vala:1263
 msgid "No photos/videos"
 msgstr "Aucune photo/vidéo"
 
-#: ../src/Page.vala:1272
+#: ../src/Page.vala:1267
 msgid "No photos/videos found"
 msgstr "Aucune photo/vidéo trouvée"
 
-#: ../src/Page.vala:2569
+#: ../src/Page.vala:2565
 msgid "Photos cannot be exported to this directory."
 msgstr "Les photos ne peuvent pas être exportées dans ce dossier."
 
-#: ../src/Photo.vala:3656
+#: ../src/Photo.vala:3753
 msgid "modified"
 msgstr "modifiée"
 
@@ -2370,68 +2616,68 @@ msgstr "Photo suivante"
 msgid "Photo source file missing: %s"
 msgstr "Fichier source de la photo manquant : %s"
 
-#: ../src/PhotoPage.vala:2404 ../src/direct/DirectPhotoPage.vala:165
+#: ../src/PhotoPage.vala:2411 ../src/direct/DirectPhotoPage.vala:165
 #: ../src/library/LibraryWindow.vala:360
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../src/PhotoPage.vala:2408 ../src/direct/DirectPhotoPage.vala:81
+#: ../src/PhotoPage.vala:2415 ../src/direct/DirectPhotoPage.vala:81
 msgid "T_ools"
 msgstr "_Outils"
 
-#: ../src/PhotoPage.vala:2413 ../src/direct/DirectPhotoPage.vala:86
+#: ../src/PhotoPage.vala:2420 ../src/direct/DirectPhotoPage.vala:86
 msgid "_Previous Photo"
 msgstr "Photo _précédente"
 
-#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:87
+#: ../src/PhotoPage.vala:2421 ../src/direct/DirectPhotoPage.vala:87
 msgid "Previous Photo"
 msgstr "Photo précédente"
 
-#: ../src/PhotoPage.vala:2419 ../src/direct/DirectPhotoPage.vala:92
+#: ../src/PhotoPage.vala:2426 ../src/direct/DirectPhotoPage.vala:92
 msgid "_Next Photo"
 msgstr "Photo _suivante"
 
-#: ../src/PhotoPage.vala:2420 ../src/direct/DirectPhotoPage.vala:93
+#: ../src/PhotoPage.vala:2427 ../src/direct/DirectPhotoPage.vala:93
 msgid "Next Photo"
 msgstr "Photo suivante"
 
-#: ../src/PhotoPage.vala:2584 ../src/direct/DirectPhotoPage.vala:175
+#: ../src/PhotoPage.vala:2591 ../src/direct/DirectPhotoPage.vala:175
 msgid "Increase the magnification of the photo"
 msgstr "Augmente l'agrandissement de la photo"
 
-#: ../src/PhotoPage.vala:2590 ../src/direct/DirectPhotoPage.vala:181
+#: ../src/PhotoPage.vala:2597 ../src/direct/DirectPhotoPage.vala:181
 msgid "Decrease the magnification of the photo"
 msgstr "Réduit l'agrandissement de la photo"
 
-#: ../src/PhotoPage.vala:2595 ../src/direct/DirectPhotoPage.vala:186
+#: ../src/PhotoPage.vala:2602 ../src/direct/DirectPhotoPage.vala:186
 msgid "Fit to _Page"
 msgstr "Adapter à la _page"
 
-#: ../src/PhotoPage.vala:2596 ../src/direct/DirectPhotoPage.vala:187
+#: ../src/PhotoPage.vala:2603 ../src/direct/DirectPhotoPage.vala:187
 msgid "Zoom the photo to fit on the screen"
 msgstr "Zoom pour adapter la photo à taille de l'écran"
 
-#: ../src/PhotoPage.vala:2602 ../src/direct/DirectPhotoPage.vala:193
+#: ../src/PhotoPage.vala:2609 ../src/direct/DirectPhotoPage.vala:193
 #, no-c-format
 msgid "Zoom _100%"
 msgstr "Zoom _100 %"
 
-#: ../src/PhotoPage.vala:2604 ../src/direct/DirectPhotoPage.vala:195
+#: ../src/PhotoPage.vala:2611 ../src/direct/DirectPhotoPage.vala:195
 #, no-c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "Zoom pour afficher la photo à sa taille réelle (100 %)"
 
-#: ../src/PhotoPage.vala:2610 ../src/direct/DirectPhotoPage.vala:201
+#: ../src/PhotoPage.vala:2617 ../src/direct/DirectPhotoPage.vala:201
 #, no-c-format
 msgid "Zoom _200%"
 msgstr "Zoom _200 %"
 
-#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:203
+#: ../src/PhotoPage.vala:2619 ../src/direct/DirectPhotoPage.vala:203
 #, no-c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "Zoom pour afficher la photo au double de sa taille réelle (200 %)"
 
-#: ../src/PhotoPage.vala:3220
+#: ../src/PhotoPage.vala:3228
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Impossible d'exporter %s : %s"
@@ -2604,7 +2850,7 @@ msgstr "De :"
 msgid "To:"
 msgstr "À :"
 
-#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1861
+#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1890
 msgid "Size:"
 msgstr "Taille :"
 
@@ -2623,72 +2869,72 @@ msgstr "Révélateur :"
 
 #. fit both on the top line, emit and move on
 #: ../src/Properties.vala:436 ../src/Properties.vala:440
-#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2229
+#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2258
 msgid "Exposure:"
 msgstr "Exposition :"
 
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:585
+#: ../src/Properties.vala:583
 msgid "Location:"
 msgstr "Emplacement :"
 
-#: ../src/Properties.vala:588
+#: ../src/Properties.vala:586
 msgid "File size:"
 msgstr "Taille du fichier :"
 
-#: ../src/Properties.vala:592
+#: ../src/Properties.vala:590
 msgid "Current Development:"
 msgstr "Développement actuel :"
 
-#: ../src/Properties.vala:594
+#: ../src/Properties.vala:592
 msgid "Original dimensions:"
 msgstr "Dimensions originales :"
 
-#: ../src/Properties.vala:597
+#: ../src/Properties.vala:595
 msgid "Camera make:"
 msgstr "Fabricant de l'appareil photo :"
 
-#: ../src/Properties.vala:600
+#: ../src/Properties.vala:598
 msgid "Camera model:"
 msgstr "Modèle de l'appareil photo :"
 
-#: ../src/Properties.vala:603
+#: ../src/Properties.vala:601
 msgid "Flash:"
 msgstr "Flash :"
 
-#: ../src/Properties.vala:605
+#: ../src/Properties.vala:603
 msgid "Focal length:"
 msgstr "Distance focale :"
 
-#: ../src/Properties.vala:608
+#: ../src/Properties.vala:606
 msgid "Exposure date:"
 msgstr "Date d'exposition :"
 
-#: ../src/Properties.vala:611
+#: ../src/Properties.vala:609
 msgid "Exposure time:"
 msgstr "Heure d'exposition :"
 
-#: ../src/Properties.vala:614
+#: ../src/Properties.vala:612
 msgid "Exposure bias:"
 msgstr "Correction de l'exposition :"
 
-#: ../src/Properties.vala:616
+#: ../src/Properties.vala:614
 msgid "GPS latitude:"
 msgstr "Latitude GPS :"
 
-#: ../src/Properties.vala:619
+#: ../src/Properties.vala:617
 msgid "GPS longitude:"
 msgstr "Longitude GPS :"
 
-#: ../src/Properties.vala:622
+#: ../src/Properties.vala:620
 msgid "Artist:"
 msgstr "Auteur :"
 
-#: ../src/Properties.vala:624
+#: ../src/Properties.vala:622
 msgid "Copyright:"
 msgstr "Copyright :"
 
-#: ../src/Properties.vala:626
+#: ../src/Properties.vala:624
 msgid "Software:"
 msgstr "Logiciel :"
 
@@ -2704,313 +2950,315 @@ msgstr "Gestionnaire de photos"
 msgid "Photo Viewer"
 msgstr "Visionneur de photos"
 
-#: ../src/Resources.vala:144
+#: ../src/Resources.vala:142
 msgid "Rotate _Right"
 msgstr "Pivoter à d_roite"
 
-#: ../src/Resources.vala:145 ../src/Resources.vala:150
+#: ../src/Resources.vala:143 ../src/Resources.vala:148
 msgid "Rotate"
 msgstr "Pivoter"
 
-#: ../src/Resources.vala:146
+#: ../src/Resources.vala:144
 msgid "Rotate Right"
 msgstr "Pivoter à droite"
 
-#: ../src/Resources.vala:147
+#: ../src/Resources.vala:145
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr ""
 "Pivote les photos vers la droite (appuyer sur Ctrl pour pivoter vers la "
 "gauche)"
 
-#: ../src/Resources.vala:149
+#: ../src/Resources.vala:147
 msgid "Rotate _Left"
 msgstr "Pivoter à _gauche"
 
-#: ../src/Resources.vala:151
+#: ../src/Resources.vala:149
 msgid "Rotate Left"
 msgstr "Pivoter à gauche"
 
-#: ../src/Resources.vala:152
+#: ../src/Resources.vala:150
 msgid "Rotate the photos left"
 msgstr "Pivote les photos vers la gauche"
 
-#: ../src/Resources.vala:154
+#: ../src/Resources.vala:152
 msgid "Flip Hori_zontally"
 msgstr "Miroir _horizontal"
 
-#: ../src/Resources.vala:155
+#: ../src/Resources.vala:153
 msgid "Flip Horizontally"
 msgstr "Retourner horizontalement"
 
-#: ../src/Resources.vala:157
+#: ../src/Resources.vala:155
 msgid "Flip Verti_cally"
 msgstr "Miroir _vertical"
 
-#: ../src/Resources.vala:158
+#: ../src/Resources.vala:156
 msgid "Flip Vertically"
 msgstr "Retourner verticalement"
 
-#: ../src/Resources.vala:160
+#: ../src/Resources.vala:158
 msgid "_Enhance"
 msgstr "_Améliorer"
 
-#: ../src/Resources.vala:161
+#: ../src/Resources.vala:159
 msgid "Enhance"
 msgstr "Améliorer"
 
-#: ../src/Resources.vala:162
+#: ../src/Resources.vala:160
 msgid "Automatically improve the photo's appearance"
 msgstr "Rehausse automatiquement la qualité de la photo"
 
-#: ../src/Resources.vala:164
+#: ../src/Resources.vala:162
 msgid "_Copy Color Adjustments"
 msgstr "_Copier les ajustements de couleur"
 
-#: ../src/Resources.vala:165
+#: ../src/Resources.vala:163
 msgid "Copy Color Adjustments"
 msgstr "Copier les ajustements de couleur"
 
-#: ../src/Resources.vala:166
+#: ../src/Resources.vala:164
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Copie les ajustements de couleur appliqués à la photo"
 
-#: ../src/Resources.vala:168
+#: ../src/Resources.vala:166
 msgid "_Paste Color Adjustments"
 msgstr "_Coller les ajustements de couleur"
 
-#: ../src/Resources.vala:169
+#: ../src/Resources.vala:167
 msgid "Paste Color Adjustments"
 msgstr "Coller les ajustements de couleur"
 
-#: ../src/Resources.vala:170
+#: ../src/Resources.vala:168
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Applique les ajustements de couleur copiés aux photos sélectionnées"
 
-#: ../src/Resources.vala:172
+#: ../src/Resources.vala:170
 msgid "_Crop"
 msgstr "_Rogner"
 
-#: ../src/Resources.vala:173
+#: ../src/Resources.vala:171
 msgid "Crop"
 msgstr "Rogner"
 
-#: ../src/Resources.vala:174
+#: ../src/Resources.vala:172
 msgid "Crop the photo's size"
 msgstr "Effectue un rognage de la photo"
 
-#: ../src/Resources.vala:176 ../src/editing_tools/StraightenTool.vala:100
+#: ../src/Resources.vala:174 ../src/editing_tools/StraightenTool.vala:100
 msgid "_Straighten"
 msgstr "Redre_sser"
 
-#: ../src/Resources.vala:177
+#: ../src/Resources.vala:175
 msgid "Straighten"
 msgstr "Redresser"
 
-#: ../src/Resources.vala:178
+#: ../src/Resources.vala:176
 msgid "Straighten the photo"
 msgstr "Redresse la photo"
 
-#: ../src/Resources.vala:180
+#: ../src/Resources.vala:178
 msgid "_Red-eye"
 msgstr "_Yeux rouges"
 
-#: ../src/Resources.vala:181
+#: ../src/Resources.vala:179
 msgid "Red-eye"
 msgstr "Yeux rouges"
 
-#: ../src/Resources.vala:182
+#: ../src/Resources.vala:180
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Réduit ou supprime complètement l'effet yeux rouges"
 
-#: ../src/Resources.vala:184
+#: ../src/Resources.vala:182
 msgid "_Adjust"
 msgstr "_Ajuster"
 
-#: ../src/Resources.vala:185
+#: ../src/Resources.vala:183
 msgid "Adjust"
 msgstr "Ajuster"
 
-#: ../src/Resources.vala:186
+#: ../src/Resources.vala:184
 msgid "Adjust the photo's color and tone"
 msgstr "Ajuste les couleurs et les tonalités de la photo"
 
-#: ../src/Resources.vala:188
+#: ../src/Resources.vala:186
 msgid "Re_vert to Original"
 msgstr "Re_venir à l'original"
 
-#: ../src/Resources.vala:189
+#: ../src/Resources.vala:187
 msgid "Revert to Original"
 msgstr "Revenir à l'original"
 
-#: ../src/Resources.vala:191
+#: ../src/Resources.vala:189
 msgid "Revert External E_dits"
 msgstr "Annuler les é_ditions externes"
 
-#: ../src/Resources.vala:192
+#: ../src/Resources.vala:190
 msgid "Revert to the master photo"
 msgstr "Revient à la photo originale"
 
-#: ../src/Resources.vala:194
+#: ../src/Resources.vala:192
 msgid "Set as _Desktop Background"
 msgstr "Définir comme fond d'_écran"
 
-#: ../src/Resources.vala:195
+#: ../src/Resources.vala:193
 msgid "Set selected image to be the new desktop background"
 msgstr "Définit l'image sélectionnée comme le nouveau fond d'écran"
 
-#: ../src/Resources.vala:196
+#: ../src/Resources.vala:194
 msgid "Set as _Desktop Slideshow..."
 msgstr "Définir comme _diaporama d'écran..."
 
-#: ../src/Resources.vala:198
+#: ../src/Resources.vala:196
 msgid "_Undo"
 msgstr "A_nnuler"
 
-#: ../src/Resources.vala:199
+#: ../src/Resources.vala:197
 msgid "Undo"
 msgstr "Annuler"
 
-#: ../src/Resources.vala:201
+#: ../src/Resources.vala:199
 msgid "_Redo"
 msgstr "_Rétablir"
 
-#: ../src/Resources.vala:202
+#: ../src/Resources.vala:200
 msgid "Redo"
 msgstr "Rétablir"
 
-#: ../src/Resources.vala:204
+#: ../src/Resources.vala:202
 msgid "Re_name Event..."
 msgstr "Re_nommer l'événement..."
 
-#: ../src/Resources.vala:207
+#: ../src/Resources.vala:205
 msgid "Make _Key Photo for Event"
 msgstr "Faire de la photo une photo _clé de l'événement"
 
-#: ../src/Resources.vala:208
+#: ../src/Resources.vala:206
 msgid "Make Key Photo for Event"
 msgstr "Faire de la photo une photo clé de l'événement"
 
-#: ../src/Resources.vala:210
+#: ../src/Resources.vala:208
 msgid "_New Event"
 msgstr "_Nouvel événement"
 
-#: ../src/Resources.vala:211
+#: ../src/Resources.vala:209
 msgid "New Event"
 msgstr "Nouvel événement"
 
-#: ../src/Resources.vala:213
+#: ../src/Resources.vala:211
 msgid "Move Photos"
 msgstr "Déplacer les photos"
 
-#: ../src/Resources.vala:214
+#: ../src/Resources.vala:212
 msgid "Move photos to an event"
 msgstr "Déplace les photos vers un événement"
 
-#: ../src/Resources.vala:216
+#: ../src/Resources.vala:214
 msgid "_Merge Events"
 msgstr "_Fusionner les événements"
 
-#: ../src/Resources.vala:217
+#: ../src/Resources.vala:215
 msgid "Merge"
 msgstr "Fusionner"
 
-#: ../src/Resources.vala:218
+#: ../src/Resources.vala:216
 msgid "Combine events into a single event"
 msgstr "Combine plusieurs événements en un seul"
 
-#: ../src/Resources.vala:220
+#: ../src/Resources.vala:218
 msgid "_Set Rating"
 msgstr "_Noter"
 
-#: ../src/Resources.vala:221
+#: ../src/Resources.vala:219
 msgid "Set Rating"
 msgstr "Attribuer une note"
 
-#: ../src/Resources.vala:222
+#: ../src/Resources.vala:220
 msgid "Change the rating of your photo"
 msgstr "Changer la note de cette photo"
 
-#: ../src/Resources.vala:224
+#: ../src/Resources.vala:222
 msgid "_Increase"
 msgstr "_Augmenter"
 
-#: ../src/Resources.vala:225
+#: ../src/Resources.vala:223
 msgid "Increase Rating"
 msgstr "Augmenter la note"
 
-#: ../src/Resources.vala:227
+#: ../src/Resources.vala:225
 msgid "_Decrease"
 msgstr "A_baisser"
 
-#: ../src/Resources.vala:228
+#: ../src/Resources.vala:226
 msgid "Decrease Rating"
 msgstr "Abaisser la note"
 
-#: ../src/Resources.vala:230
+#: ../src/Resources.vala:228
 msgid "_Unrated"
 msgstr "_Sans note"
 
-#: ../src/Resources.vala:231
+#: ../src/Resources.vala:229
 msgid "Unrated"
 msgstr "Sans note"
 
-#: ../src/Resources.vala:232
+#: ../src/Resources.vala:230
 msgid "Rate Unrated"
 msgstr "Enlever la note"
 
-#: ../src/Resources.vala:233
+#: ../src/Resources.vala:231
 msgid "Setting as unrated"
 msgstr "Supprimer la note"
 
-#: ../src/Resources.vala:234
+#: ../src/Resources.vala:232
 msgid "Remove any ratings"
 msgstr "Enlève toute note"
 
-#: ../src/Resources.vala:236
+#: ../src/Resources.vala:234
 msgid "_Rejected"
 msgstr "Re_jeter"
 
-#: ../src/Resources.vala:237
+#: ../src/Resources.vala:235
 msgid "Rejected"
 msgstr "Rejetée"
 
-#: ../src/Resources.vala:238
+#: ../src/Resources.vala:236
 msgid "Rate Rejected"
 msgstr "Noter pour rejeter"
 
-#: ../src/Resources.vala:239
+#: ../src/Resources.vala:237
 msgid "Setting as rejected"
 msgstr "Noter pour rejeter"
 
-#: ../src/Resources.vala:240
+#: ../src/Resources.vala:238
 msgid "Set rating to rejected"
 msgstr "Noter pour rejeter"
 
-#: ../src/Resources.vala:242
+#: ../src/Resources.vala:240
 msgid "Rejected _Only"
 msgstr "Rejetées _uniquement"
 
-#: ../src/Resources.vala:243
+#: ../src/Resources.vala:241
 msgid "Rejected Only"
 msgstr "Rejetées uniquement"
 
-#: ../src/Resources.vala:244
+#: ../src/Resources.vala:242
 msgid "Show only rejected photos"
 msgstr "Afficher uniquement les photos rejetées"
 
-#: ../src/Resources.vala:246
+#: ../src/Resources.vala:244
 msgid "All + _Rejected"
 msgstr "Toutes + re_jetées"
 
-#: ../src/Resources.vala:247 ../src/Resources.vala:248
+#: ../src/Resources.vala:245 ../src/Resources.vala:246
 msgid "Show all photos, including rejected"
 msgstr "Afficher toutes les photos, y compris les rejetées"
 
-#: ../src/Resources.vala:250
+#: ../src/Resources.vala:248
 msgid "_All Photos"
 msgstr "_Toutes les photos"
 
-#: ../src/Resources.vala:251 ../src/Resources.vala:252
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:250 ../src/Resources.vala:252
 msgid "Show all photos"
 msgstr "Afficher toutes les photos"
 
@@ -3066,295 +3314,299 @@ msgstr "Publie sur différents sites Web"
 msgid "Edit _Title..."
 msgstr "Modifier le __titre..."
 
-#: ../src/Resources.vala:276
+#: ../src/Resources.vala:277
 msgid "Edit _Comment..."
 msgstr "Modifier le _commentaire..."
 
-#: ../src/Resources.vala:277
+#. Button label
+#: ../src/Resources.vala:279
 msgid "Edit Comment"
 msgstr "Modifier le commentaire"
 
-#: ../src/Resources.vala:279
+#: ../src/Resources.vala:281
 msgid "Edit Event _Comment..."
 msgstr "Modifier le _commentaire de l'événement..."
 
-#: ../src/Resources.vala:282
+#: ../src/Resources.vala:284
 msgid "_Adjust Date and Time..."
 msgstr "Aj_uster la date et l'heure..."
 
-#: ../src/Resources.vala:283
+#: ../src/Resources.vala:285
 msgid "Adjust Date and Time"
 msgstr "Ajuster la date et l'heure"
 
-#: ../src/Resources.vala:285
+#: ../src/Resources.vala:287
 msgid "Add _Tags..."
 msgstr "Ajouter des é_tiquettes..."
 
-#: ../src/Resources.vala:286
+#: ../src/Resources.vala:288
 msgid "_Add Tags..."
 msgstr "Ajouter des étiquettes"
 
-#: ../src/Resources.vala:287 ../src/Resources.vala:318
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:290 ../src/Resources.vala:323
 msgid "Add Tags"
 msgstr "Ajouter des étiquettes"
 
-#: ../src/Resources.vala:289
+#: ../src/Resources.vala:292
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../src/Resources.vala:291
+#: ../src/Resources.vala:294
 msgid "Open With E_xternal Editor"
 msgstr "Ouvrir avec un éditeur e_xterne"
 
-#: ../src/Resources.vala:293
+#: ../src/Resources.vala:296
 msgid "Open With RA_W Editor"
 msgstr "Ouvrir avec l'éditeur RA_W"
 
-#: ../src/Resources.vala:295
+#: ../src/Resources.vala:298
 msgid "Send _To..."
 msgstr "Envoyer _vers..."
 
-#: ../src/Resources.vala:296
+#: ../src/Resources.vala:299
 msgid "Send T_o..."
 msgstr "Env_oyer à ..."
 
-#: ../src/Resources.vala:298
+#: ../src/Resources.vala:301
 msgid "_Find..."
 msgstr "_Rechercher..."
 
-#: ../src/Resources.vala:299
+#: ../src/Resources.vala:302
 msgid "Find"
 msgstr "Rechercher"
 
-#: ../src/Resources.vala:300
+#: ../src/Resources.vala:303
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Rechercher une image en saisissant du texte se trouvant dans son nom ou ses "
 "étiquettes"
 
-#: ../src/Resources.vala:302
+#: ../src/Resources.vala:305
 msgid "_Flag"
 msgstr "_Marquer"
 
-#: ../src/Resources.vala:304
+#: ../src/Resources.vala:307
 msgid "Un_flag"
 msgstr "_Enlever la marque"
 
-#: ../src/Resources.vala:307
+#: ../src/Resources.vala:310
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Impossible de lancer l'éditeur : %s"
 
-#: ../src/Resources.vala:312
+#: ../src/Resources.vala:315
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "Ajouter l'étiquette « %s »"
 
-#: ../src/Resources.vala:314
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:318
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "Ajouter les étiquettes « %s » et « %s »"
 
-#: ../src/Resources.vala:322
+#: ../src/Resources.vala:328
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "_Supprimer l'étiquette « %s »"
 
-#: ../src/Resources.vala:326
+#: ../src/Resources.vala:332
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "Supprimer l'étiquette « %s »"
 
-#: ../src/Resources.vala:329
+#: ../src/Resources.vala:335
 msgid "Delete Tag"
 msgstr "Supprimer l'étiquette"
 
-#: ../src/Resources.vala:332
+#: ../src/Resources.vala:338
 msgid "_New"
 msgstr "_Nouveau"
 
-#: ../src/Resources.vala:335
+#: ../src/Resources.vala:341
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "Re_nommer l'étiquette « %s »..."
 
-#: ../src/Resources.vala:339
+#: ../src/Resources.vala:345
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "Renommer l'étiquette « %s » en « %s »"
 
-#: ../src/Resources.vala:342
+#: ../src/Resources.vala:348
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: ../src/Resources.vala:344
+#: ../src/Resources.vala:350
 msgid "Modif_y Tags..."
 msgstr "Modifie_r les étiquettes..."
 
-#: ../src/Resources.vala:345
+#: ../src/Resources.vala:351
 msgid "Modify Tags"
 msgstr "Modifier les étiquettes"
 
-#: ../src/Resources.vala:348
+#: ../src/Resources.vala:354
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Étiqueter la photo avec « %s »"
 
-#: ../src/Resources.vala:348
+#: ../src/Resources.vala:354
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Étiqueter les photos avec « %s »"
 
-#: ../src/Resources.vala:352
+#: ../src/Resources.vala:358
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "Étiqueter la photo sélectionnée avec « %s »"
 
-#: ../src/Resources.vala:353
+#: ../src/Resources.vala:359
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "Étiqueter les photos sélectionnées avec « %s »"
 
-#: ../src/Resources.vala:357
+#: ../src/Resources.vala:363
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "Enlever l'étiquette « %s » de la _photo"
 
-#: ../src/Resources.vala:358
+#: ../src/Resources.vala:364
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "Enlever l'étiquette « %s » des _photos"
 
-#: ../src/Resources.vala:362
+#: ../src/Resources.vala:368
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "Enlever l'étiquette « %s » de la photo"
 
-#: ../src/Resources.vala:363
+#: ../src/Resources.vala:369
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "Enlever l'étiquette « %s » des photos"
 
-#: ../src/Resources.vala:367
+#: ../src/Resources.vala:373
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr "Impossible de renommer l'étiquette en « %s » car ce nom existe déjà."
 
-#: ../src/Resources.vala:371
+#: ../src/Resources.vala:377
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr ""
 "Impossible de renommer la recherche en « %s » parce que ce nom existe déjà."
 
-#: ../src/Resources.vala:374
+#: ../src/Resources.vala:380
 msgid "Saved Search"
 msgstr "Recherche enregistrée"
 
-#: ../src/Resources.vala:376
+#: ../src/Resources.vala:382
 msgid "Delete Search"
 msgstr "Supprimer la recherche"
 
-#: ../src/Resources.vala:379
+#: ../src/Resources.vala:385
 msgid "_Edit..."
 msgstr "_Éditer..."
 
-#: ../src/Resources.vala:380
+#: ../src/Resources.vala:386
 msgid "Re_name..."
 msgstr "Re_nommer..."
 
-#: ../src/Resources.vala:383
+#: ../src/Resources.vala:389
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "Renommer la recherche « %s » en « %s »"
 
-#: ../src/Resources.vala:387
+#: ../src/Resources.vala:393
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "Supprimer la recherche « %s »"
 
-#: ../src/Resources.vala:545
+#: ../src/Resources.vala:551
 #, c-format
 msgid "Rate %s"
 msgstr "Noter %s"
 
-#: ../src/Resources.vala:546
+#: ../src/Resources.vala:552
 #, c-format
 msgid "Set rating to %s"
 msgstr "Donner une note à %s"
 
-#: ../src/Resources.vala:547
+#: ../src/Resources.vala:553
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Attribution de note à %s"
 
-#: ../src/Resources.vala:549
+#: ../src/Resources.vala:555
 #, c-format
 msgid "Display %s"
 msgstr "Afficher %s"
 
-#: ../src/Resources.vala:550
+#: ../src/Resources.vala:556
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Montrer uniquement les photos avec une note de %s"
 
-#: ../src/Resources.vala:551
+#: ../src/Resources.vala:557
 #, c-format
 msgid "%s or Better"
 msgstr "%s ou plus"
 
-#: ../src/Resources.vala:552
+#: ../src/Resources.vala:558
 #, c-format
 msgid "Display %s or Better"
 msgstr "Afficher %s ou plus"
 
-#: ../src/Resources.vala:553
+#: ../src/Resources.vala:559
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "N'afficher que les photos avec une note de %s ou plus"
 
-#: ../src/Resources.vala:644
+#: ../src/Resources.vala:650
 msgid "Remove the selected photos from the trash"
 msgstr "Enlève les photos sélectionnées de la corbeille"
 
-#: ../src/Resources.vala:645
+#: ../src/Resources.vala:651
 msgid "Remove the selected photos from the library"
 msgstr "Enlève les photos sélectionnées de la photothèque"
 
-#: ../src/Resources.vala:647
+#: ../src/Resources.vala:653
 msgid "_Restore"
 msgstr "_Restaurer"
 
-#: ../src/Resources.vala:648
+#: ../src/Resources.vala:654
 msgid "Move the selected photos back into the library"
 msgstr "Réintègre les photos dans la photothèque"
 
-#: ../src/Resources.vala:650
+#: ../src/Resources.vala:656
 msgid "Show in File Mana_ger"
 msgstr "Ouvrir dans le _gestionnaire de fichiers"
 
-#: ../src/Resources.vala:651
+#: ../src/Resources.vala:657
 msgid "Open the selected photo's directory in the file manager"
 msgstr ""
 "Ouvre le dossier des photos sélectionnées dans le gestionnaire de fichiers"
 
-#: ../src/Resources.vala:654
+#: ../src/Resources.vala:660
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Impossible d'ouvrir dans le gestionnaire de fichiers : %s"
 
-#: ../src/Resources.vala:657
+#: ../src/Resources.vala:663
 msgid "R_emove From Library"
 msgstr "Su_pprimer de la photothèque"
 
-#: ../src/Resources.vala:659
+#: ../src/Resources.vala:665
 msgid "_Move to Trash"
 msgstr "Déplacer dans la cor_beille"
 
-#: ../src/Resources.vala:661
+#: ../src/Resources.vala:667
 msgid "Select _All"
 msgstr "_Tout sélectionner"
 
-#: ../src/Resources.vala:662
+#: ../src/Resources.vala:668
 msgid "Select all items"
 msgstr "Sélectionner tous les éléments"
 
@@ -3362,20 +3614,20 @@ msgstr "Sélectionner tous les éléments"
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:743
+#: ../src/Resources.vala:749
 msgid "%-I:%M %p"
 msgstr "%-I:%M %p"
 
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:748
+#: ../src/Resources.vala:754
 msgid "%-I:%M:%S %p"
 msgstr "%-I:%M:%S %p"
 
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:752
+#: ../src/Resources.vala:758
 msgid "%a %b %d, %Y"
 msgstr "%a %d %b %Y"
 
@@ -3385,14 +3637,14 @@ msgstr "%a %d %b %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:757 ../src/Resources.vala:767
+#: ../src/Resources.vala:763 ../src/Resources.vala:773
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:762
+#: ../src/Resources.vala:768
 msgid "%d, %Y"
 msgstr "%d %b %Y"
 
@@ -3402,7 +3654,7 @@ msgstr "Diaporama"
 
 #. Flagged label and toggle
 #: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
-#: ../src/SearchFilter.vala:990 ../src/library/FlaggedPage.vala:8
+#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
 msgid "Flagged"
 msgstr "Marquées"
 
@@ -3422,18 +3674,18 @@ msgstr "Photos RAW"
 msgid "RAW photos"
 msgstr "Photos RAW"
 
-#: ../src/SearchFilter.vala:952
+#: ../src/SearchFilter.vala:934
 #, c-format
 msgid "Error loading UI file %s: %s"
 msgstr "Erreur de chargement du fichier d'interface %s : %s"
 
 #. Type label and toggles
-#: ../src/SearchFilter.vala:969
+#: ../src/SearchFilter.vala:951
 msgid "Type"
 msgstr "Type"
 
 #. Rating label and button
-#: ../src/SearchFilter.vala:1003 ../src/searches/SearchBoolean.vala:184
+#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
 msgid "Rating"
 msgstr "Note"
 
@@ -3489,7 +3741,7 @@ msgid "untitled"
 msgstr "sans nom"
 
 #. multiple videos
-#: ../src/VideoSupport.vala:486
+#: ../src/VideoSupport.vala:489
 msgid "Export Videos"
 msgstr "Exporter les vidéos"
 
@@ -3685,16 +3937,12 @@ msgstr "Fichier de base de données :"
 msgid "_Import"
 msgstr "_Importer"
 
-#: ../src/data_imports/DataImportsUI.vala:216
+#: ../src/data_imports/DataImportsUI.vala:217
 msgid "Import From Application"
 msgstr "Importer à partir d'une application"
 
-#: ../src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "Importer du contenu à _partir de :"
-
-#: ../src/data_imports/DataImportsUI.vala:394
-#: ../src/publishing/PublishingUI.vala:493
+#: ../src/data_imports/DataImportsUI.vala:369
+#: ../src/publishing/PublishingUI.vala:470
 msgid "_Close"
 msgstr "_Fermer"
 
@@ -3734,7 +3982,7 @@ msgid "_File"
 msgstr "_Fichier"
 
 #: ../src/direct/DirectPhotoPage.vala:51
-#: ../src/direct/DirectPhotoPage.vala:417
+#: ../src/direct/DirectPhotoPage.vala:422
 msgid "_Save"
 msgstr "Enre_gistrer"
 
@@ -3786,26 +4034,26 @@ msgstr ""
 "%s ne prend pas en charge le format du fichier\n"
 "%s."
 
-#: ../src/direct/DirectPhotoPage.vala:417
+#: ../src/direct/DirectPhotoPage.vala:422
 msgid "_Save a Copy"
 msgstr "_Enregistrer une copie"
 
-#: ../src/direct/DirectPhotoPage.vala:420
+#: ../src/direct/DirectPhotoPage.vala:425
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Perdre les modifications apportées à %s ?"
 
-#: ../src/direct/DirectPhotoPage.vala:421
+#: ../src/direct/DirectPhotoPage.vala:426
 msgid "Close _without Saving"
 msgstr "Fermer _sans enregistrer"
 
-#: ../src/direct/DirectPhotoPage.vala:454
+#: ../src/direct/DirectPhotoPage.vala:459
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Erreur lors de l'enregistrement de %s : %s"
 
-#: ../src/direct/DirectPhotoPage.vala:482
-#: ../src/direct/DirectPhotoPage.vala:503
+#: ../src/direct/DirectPhotoPage.vala:487
+#: ../src/direct/DirectPhotoPage.vala:508
 msgid "Save As"
 msgstr "Enregistrer sous"
 
@@ -3865,72 +4113,72 @@ msgstr "A4 (210 x 297 mm)"
 msgid "A3 (297 x 420 mm)"
 msgstr "A3 (297 x 420 mm)"
 
-#: ../src/editing_tools/EditingTools.vala:1876
+#: ../src/editing_tools/EditingTools.vala:1905
 msgid "Close the red-eye tool"
 msgstr "Fermer l'outil yeux rouges"
 
-#: ../src/editing_tools/EditingTools.vala:1879
+#: ../src/editing_tools/EditingTools.vala:1908
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Enlever ou réduire l'effet yeux rouges dans la zone de sélection"
 
-#: ../src/editing_tools/EditingTools.vala:2215
+#: ../src/editing_tools/EditingTools.vala:2244
 #: ../src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Réinitialiser"
 
-#: ../src/editing_tools/EditingTools.vala:2237
+#: ../src/editing_tools/EditingTools.vala:2266
 msgid "Saturation:"
 msgstr "Saturation :"
 
-#: ../src/editing_tools/EditingTools.vala:2245
+#: ../src/editing_tools/EditingTools.vala:2274
 msgid "Tint:"
 msgstr "Teinte :"
 
-#: ../src/editing_tools/EditingTools.vala:2254
+#: ../src/editing_tools/EditingTools.vala:2283
 msgid "Temperature:"
 msgstr "Température :"
 
-#: ../src/editing_tools/EditingTools.vala:2262
+#: ../src/editing_tools/EditingTools.vala:2291
 msgid "Shadows:"
 msgstr "Ombres :"
 
-#: ../src/editing_tools/EditingTools.vala:2270
+#: ../src/editing_tools/EditingTools.vala:2299
 msgid "Highlights:"
 msgstr "Luminosité :"
 
-#: ../src/editing_tools/EditingTools.vala:2324
+#: ../src/editing_tools/EditingTools.vala:2353
 msgid "Reset Colors"
 msgstr "Réinitialiser les couleurs"
 
-#: ../src/editing_tools/EditingTools.vala:2324
+#: ../src/editing_tools/EditingTools.vala:2353
 msgid "Reset all color adjustments to original"
 msgstr "Réinitialise tous les ajustements colorimétriques à l'original"
 
-#: ../src/editing_tools/EditingTools.vala:2676
+#: ../src/editing_tools/EditingTools.vala:2705
 msgid "Temperature"
 msgstr "Température"
 
-#: ../src/editing_tools/EditingTools.vala:2689
+#: ../src/editing_tools/EditingTools.vala:2718
 msgid "Tint"
 msgstr "Teinte"
 
-#: ../src/editing_tools/EditingTools.vala:2702
+#: ../src/editing_tools/EditingTools.vala:2731
 msgid "Saturation"
 msgstr "Saturation"
 
-#: ../src/editing_tools/EditingTools.vala:2715
+#: ../src/editing_tools/EditingTools.vala:2744
 msgid "Exposure"
 msgstr "Exposition"
 
-#: ../src/editing_tools/EditingTools.vala:2728
+#: ../src/editing_tools/EditingTools.vala:2757
 msgid "Shadows"
 msgstr "Ombres"
 
-#: ../src/editing_tools/EditingTools.vala:2741
+#: ../src/editing_tools/EditingTools.vala:2770
 msgid "Highlights"
 msgstr "Luminosité"
 
-#: ../src/editing_tools/EditingTools.vala:2751
+#: ../src/editing_tools/EditingTools.vala:2780
 msgid "Contrast Expansion"
 msgstr "Expansion du contrate"
 
@@ -3981,7 +4229,7 @@ msgstr "%B"
 msgid "Folders"
 msgstr "Dossiers"
 
-#: ../src/library/Branch.vala:37 ../ui/shotwell.glade.h:33
+#: ../src/library/Branch.vala:36 ../ui/shotwell.glade.h:32
 msgid "Library"
 msgstr "Photothèque"
 
@@ -4047,7 +4295,7 @@ msgid "Find photos and videos by search criteria"
 msgstr "Recherche des photos et des vidéos par critères"
 
 #: ../src/library/LibraryWindow.vala:346 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:195
+#: ../src/sidebar/Tree.vala:182
 msgid "Ne_w Saved Search..."
 msgstr "Nou_velle recherche enregistrée..."
 
@@ -4117,7 +4365,7 @@ msgstr ""
 "Préférences</span>.\n"
 "Voulez-vous continuer d'importer les photos ?"
 
-#: ../src/library/LibraryWindow.vala:899 ../ui/shotwell.glade.h:19
+#: ../src/library/LibraryWindow.vala:899 ../ui/shotwell.glade.h:18
 msgid "Library Location"
 msgstr "Emplacement de la photothèque"
 
@@ -4260,22 +4508,22 @@ msgstr "BMP"
 msgid "JPEG"
 msgstr "JPEG"
 
-#: ../src/photos/JfifSupport.vala:182
+#: ../src/photos/JfifSupport.vala:185
 #, c-format
 msgid "Low (%d%%)"
 msgstr "Faible (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:185
+#: ../src/photos/JfifSupport.vala:188
 #, c-format
 msgid "Medium (%d%%)"
 msgstr "Moyen (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:188
+#: ../src/photos/JfifSupport.vala:191
 #, c-format
 msgid "High (%d%%)"
 msgstr "Fort (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:191
+#: ../src/photos/JfifSupport.vala:194
 #, c-format
 msgid "Maximum (%d%%)"
 msgstr "Maximum (%d%%)"
@@ -4345,37 +4593,37 @@ msgstr "Récupération des informations sur le compte..."
 msgid "Logging in..."
 msgstr "Connexion..."
 
-#: ../src/publishing/PublishingUI.vala:183
+#: ../src/publishing/PublishingUI.vala:185
 msgid "Publish Photos"
 msgstr "Publier les photos"
 
-#: ../src/publishing/PublishingUI.vala:184
+#: ../src/publishing/PublishingUI.vala:186
 msgid "Publish photos _to:"
 msgstr "Publier les photos _sur :"
 
-#: ../src/publishing/PublishingUI.vala:186
+#: ../src/publishing/PublishingUI.vala:188
 msgid "Publish Videos"
 msgstr "Publier les vidéos"
 
-#: ../src/publishing/PublishingUI.vala:187
+#: ../src/publishing/PublishingUI.vala:189
 msgid "Publish videos _to"
 msgstr "Publier les vidéos _sur"
 
-#: ../src/publishing/PublishingUI.vala:189
+#: ../src/publishing/PublishingUI.vala:191
 msgid "Publish Photos and Videos"
 msgstr "Publier des photos et des vidéos"
 
-#: ../src/publishing/PublishingUI.vala:190
+#: ../src/publishing/PublishingUI.vala:192
 msgid "Publish photos and videos _to"
 msgstr "Publier les photos et les vidéos _sur"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: ../src/publishing/PublishingUI.vala:383
+#: ../src/publishing/PublishingUI.vala:360
 msgid "Unable to publish"
 msgstr "Impossible de publier"
 
-#: ../src/publishing/PublishingUI.vala:384
+#: ../src/publishing/PublishingUI.vala:361
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -4393,123 +4641,139 @@ msgid "Saved Searches"
 msgstr "Recherches enregistrées"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:168
 msgid "contains"
 msgstr "contient"
 
 #. Ordering must correspond with Context
-#: ../src/searches/SavedSearchDialog.vala:170
-#: ../src/searches/SavedSearchDialog.vala:497
+#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:500
 msgid "is exactly"
 msgstr "vaut exactement"
 
-#: ../src/searches/SavedSearchDialog.vala:171
+#: ../src/searches/SavedSearchDialog.vala:170
 msgid "starts with"
 msgstr "commence par"
 
-#: ../src/searches/SavedSearchDialog.vala:172
+#: ../src/searches/SavedSearchDialog.vala:171
 msgid "ends with"
 msgstr "se termine par"
 
-#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:172
 msgid "does not contain"
 msgstr "ne contient pas"
 
-#: ../src/searches/SavedSearchDialog.vala:174
-#: ../src/searches/SavedSearchDialog.vala:501
+#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:504
 msgid "is not set"
 msgstr "n'est pas défini"
 
+#: ../src/searches/SavedSearchDialog.vala:174
+msgid "is set"
+msgstr "est défini"
+
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: ../src/searches/SavedSearchDialog.vala:245
-#: ../src/searches/SavedSearchDialog.vala:376
-#: ../src/searches/SavedSearchDialog.vala:441
+#: ../src/searches/SavedSearchDialog.vala:248
+#: ../src/searches/SavedSearchDialog.vala:379
+#: ../src/searches/SavedSearchDialog.vala:444
 msgid "is"
 msgstr "est"
 
-#: ../src/searches/SavedSearchDialog.vala:246
+#: ../src/searches/SavedSearchDialog.vala:249
 msgid "is not"
 msgstr "n'est pas"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:252
+#: ../src/searches/SavedSearchDialog.vala:255
 msgid "any photo"
 msgstr "toute photo"
 
-#: ../src/searches/SavedSearchDialog.vala:253
+#: ../src/searches/SavedSearchDialog.vala:256
 msgid "a raw photo"
 msgstr "une photo brute"
 
-#: ../src/searches/SavedSearchDialog.vala:254
+#: ../src/searches/SavedSearchDialog.vala:257
 msgid "a video"
 msgstr "une vidéo"
 
-#: ../src/searches/SavedSearchDialog.vala:308
+#: ../src/searches/SavedSearchDialog.vala:311
 msgid "has"
 msgstr "a"
 
-#: ../src/searches/SavedSearchDialog.vala:309
+#: ../src/searches/SavedSearchDialog.vala:312
 msgid "has no"
 msgstr "n'a pas"
 
-#: ../src/searches/SavedSearchDialog.vala:314
+#: ../src/searches/SavedSearchDialog.vala:317
 msgid "modifications"
 msgstr "modifications"
 
-#: ../src/searches/SavedSearchDialog.vala:315
+#: ../src/searches/SavedSearchDialog.vala:318
 msgid "internal modifications"
 msgstr "modifications internes"
 
-#: ../src/searches/SavedSearchDialog.vala:316
+#: ../src/searches/SavedSearchDialog.vala:319
 msgid "external modifications"
 msgstr "modifications externes"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:370
+#: ../src/searches/SavedSearchDialog.vala:373
 msgid "flagged"
 msgstr "marquée"
 
-#: ../src/searches/SavedSearchDialog.vala:371
+#: ../src/searches/SavedSearchDialog.vala:374
 msgid "not flagged"
 msgstr "non marquée"
 
-#: ../src/searches/SavedSearchDialog.vala:434
+#: ../src/searches/SavedSearchDialog.vala:437
 msgid "and higher"
 msgstr "et plus"
 
-#: ../src/searches/SavedSearchDialog.vala:435
+#: ../src/searches/SavedSearchDialog.vala:438
 msgid "only"
 msgstr "précisément"
 
-#: ../src/searches/SavedSearchDialog.vala:436
+#: ../src/searches/SavedSearchDialog.vala:439
 msgid "and lower"
 msgstr "et moins"
 
-#: ../src/searches/SavedSearchDialog.vala:498
+#: ../src/searches/SavedSearchDialog.vala:501
 msgid "is after"
 msgstr "est après"
 
-#: ../src/searches/SavedSearchDialog.vala:499
+#: ../src/searches/SavedSearchDialog.vala:502
 msgid "is before"
 msgstr "est avant"
 
-#: ../src/searches/SavedSearchDialog.vala:500
+#: ../src/searches/SavedSearchDialog.vala:503
 msgid "is between"
 msgstr "est entre"
 
-#: ../src/searches/SavedSearchDialog.vala:513
+#: ../src/searches/SavedSearchDialog.vala:516
 msgid "and"
 msgstr "et"
 
-#: ../src/searches/SavedSearchDialog.vala:720
+#: ../src/searches/SavedSearchDialog.vala:695
+msgid "Search"
+msgstr "Rechercher"
+
+#: ../src/searches/SavedSearchDialog.vala:700
+msgid "Cancel"
+msgstr "Annuler"
+
+#: ../src/searches/SavedSearchDialog.vala:701
+msgid "OK"
+msgstr "Valider"
+
+#: ../src/searches/SavedSearchDialog.vala:719
 msgid "any"
 msgstr "n'importe quel"
 
-#: ../src/searches/SavedSearchDialog.vala:721
+#: ../src/searches/SavedSearchDialog.vala:720
 msgid "all"
 msgstr "toutes"
 
-#: ../src/searches/SavedSearchDialog.vala:722
+#: ../src/searches/SavedSearchDialog.vala:721
 msgid "none"
 msgstr "aucune"
 
@@ -4553,7 +4817,7 @@ msgstr "État de la photo"
 msgid "Date"
 msgstr "Date"
 
-#: ../src/sidebar/Tree.vala:199
+#: ../src/sidebar/Tree.vala:186
 msgid "New _Tag..."
 msgstr "Nouvelle é_tiquette…"
 
@@ -4578,186 +4842,195 @@ msgid "Tags"
 msgstr "Étiquettes"
 
 #: ../ui/set_background_dialog.glade.h:1
-msgid "Set as Desktop Slideshow"
-msgstr "Définir comme diaporama d'écran"
+msgid "Set as Desktop Background"
+msgstr "Définir comme fond d'écran"
 
 #: ../ui/set_background_dialog.glade.h:2
-msgid "Generate desktop background slideshow"
-msgstr "Générer un diaporama de fond d'écran"
+#: ../ui/set_background_slideshow_dialog.glade.h:6
+msgid "Use for Desktop"
+msgstr "Utiliser pour le bureau"
 
 #: ../ui/set_background_dialog.glade.h:3
+#: ../ui/set_background_slideshow_dialog.glade.h:7
+msgid "Use for Lock Screen"
+msgstr "Utiliser pour l'écran de vérouillage"
+
+#: ../ui/set_background_slideshow_dialog.glade.h:1
+msgid "Set as Desktop Slideshow"
+msgstr "Définir comme diaporama d'écran"
+
+#: ../ui/set_background_slideshow_dialog.glade.h:2
 msgid "Show each photo for"
 msgstr "Afficher chaque photos pendant"
 
-#: ../ui/set_background_dialog.glade.h:4
+#: ../ui/set_background_slideshow_dialog.glade.h:3
 msgid "period of time"
 msgstr "intervalle de temps"
 
-#: ../ui/set_background_dialog.glade.h:5
+#: ../ui/set_background_slideshow_dialog.glade.h:4
+msgid "Generate desktop background slideshow"
+msgstr "Générer un diaporama de fond d'écran"
+
+#: ../ui/set_background_slideshow_dialog.glade.h:5
 msgid "How long each photo is shown on the desktop background"
 msgstr "Durée d'affichage des photos en fond d'écran"
 
 #: ../ui/shotwell.glade.h:1
-msgid "Search"
-msgstr "Rechercher"
-
-#: ../ui/shotwell.glade.h:2
 msgid "_Name of search:"
 msgstr "_Nom de la recherche :"
 
-#: ../ui/shotwell.glade.h:3
+#: ../ui/shotwell.glade.h:2
 msgid "_Match"
 msgstr "_Rechercher"
 
-#: ../ui/shotwell.glade.h:4
+#: ../ui/shotwell.glade.h:3
 msgid "of the following:"
 msgstr "parmi ce qui suit :"
 
-#: ../ui/shotwell.glade.h:5
+#: ../ui/shotwell.glade.h:4
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Taille de l'image imprimée</b>"
 
-#: ../ui/shotwell.glade.h:6
+#: ../ui/shotwell.glade.h:5
 msgid "Use a _standard size:"
 msgstr "Utiliser une taille _standard :"
 
-#: ../ui/shotwell.glade.h:7
+#: ../ui/shotwell.glade.h:6
 msgid "Use a c_ustom size:"
 msgstr "Utiliser une taille _personnalisée :"
 
-#: ../ui/shotwell.glade.h:8
+#: ../ui/shotwell.glade.h:7
 msgid "_Match photo aspect ratio"
 msgstr "_Conserver les proportions de la photo"
 
-#: ../ui/shotwell.glade.h:9
+#: ../ui/shotwell.glade.h:8
 msgid "_Autosize:"
 msgstr "Taille _automatique :"
 
-#: ../ui/shotwell.glade.h:10
+#: ../ui/shotwell.glade.h:9
 msgid "<b>Titles</b>"
 msgstr "<b>Titres</b>"
 
-#: ../ui/shotwell.glade.h:11
+#: ../ui/shotwell.glade.h:10
 msgid "Print image _title"
 msgstr "Imprimer le _titre de l'image"
 
-#: ../ui/shotwell.glade.h:12
+#: ../ui/shotwell.glade.h:11
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Résolution en pixels</b>"
 
-#: ../ui/shotwell.glade.h:13
+#: ../ui/shotwell.glade.h:12
 msgid "_Output photo at:"
 msgstr "_Imprimer la photo à :"
 
-#: ../ui/shotwell.glade.h:14
+#: ../ui/shotwell.glade.h:13
 msgid "pixels per inch"
 msgstr "pixels par pouce"
 
-#: ../ui/shotwell.glade.h:16
+#: ../ui/shotwell.glade.h:15
 msgid "Shotwell Preferences"
 msgstr "Préférences de Shotwell"
 
-#: ../ui/shotwell.glade.h:17
+#: ../ui/shotwell.glade.h:16
 msgid "white"
 msgstr "blanc"
 
-#: ../ui/shotwell.glade.h:18
+#: ../ui/shotwell.glade.h:17
 msgid "black"
 msgstr "noir"
 
-#: ../ui/shotwell.glade.h:20
+#: ../ui/shotwell.glade.h:19
 msgid "_Watch library directory for new files"
 msgstr "_Détecter les nouveaux fichiers dans le dossier de la photothèque"
 
-#: ../ui/shotwell.glade.h:21
+#: ../ui/shotwell.glade.h:20
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: ../ui/shotwell.glade.h:22
+#: ../ui/shotwell.glade.h:21
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr ""
 "Écrire les étiquettes, titres et autres _métadonnées dans les fichiers des "
 "photos"
 
-#: ../ui/shotwell.glade.h:23
+#: ../ui/shotwell.glade.h:22
 msgid "Display"
 msgstr "Affichage"
 
-#: ../ui/shotwell.glade.h:24
+#: ../ui/shotwell.glade.h:23
 msgid "_Import photos to:"
 msgstr "_Importer les photos dans :"
 
-#: ../ui/shotwell.glade.h:25
+#: ../ui/shotwell.glade.h:24
 msgid "_Background:"
 msgstr "_Arrière-plan :"
 
-#: ../ui/shotwell.glade.h:26
+#: ../ui/shotwell.glade.h:25
 msgid "Importing"
 msgstr "Importation"
 
-#: ../ui/shotwell.glade.h:27
+#: ../ui/shotwell.glade.h:26
 msgid "_Directory structure:"
 msgstr "Structure de _dossier :"
 
-#: ../ui/shotwell.glade.h:28
+#: ../ui/shotwell.glade.h:27
 msgid "_Pattern:"
 msgstr "_Modèle :"
 
-#: ../ui/shotwell.glade.h:29
+#: ../ui/shotwell.glade.h:28
 msgid "Example:"
 msgstr "Exemple :"
 
-#: ../ui/shotwell.glade.h:30
+#: ../ui/shotwell.glade.h:29
 msgid "R_ename imported files to lowercase"
 msgstr "R_enommer les fichiers importés en minuscules"
 
-#: ../ui/shotwell.glade.h:31
+#: ../ui/shotwell.glade.h:30
 msgid "RAW Developer"
 msgstr "Révélateur RAW"
 
-#: ../ui/shotwell.glade.h:32
+#: ../ui/shotwell.glade.h:31
 msgid "De_fault:"
 msgstr "Par dé_faut :"
 
-#: ../ui/shotwell.glade.h:34
+#: ../ui/shotwell.glade.h:33
 msgid "E_xternal photo editor:"
 msgstr "Éditeur d'image e_xterne :"
 
-#: ../ui/shotwell.glade.h:35
+#: ../ui/shotwell.glade.h:34
 msgid "External _RAW editor:"
 msgstr "Éditeur _RAW externe :"
 
-#: ../ui/shotwell.glade.h:36
+#: ../ui/shotwell.glade.h:35
 msgid "External Editors"
 msgstr "Éditeurs externes"
 
-#: ../ui/shotwell.glade.h:37
+#: ../ui/shotwell.glade.h:36
 msgid "Plugins"
 msgstr "Greffons"
 
-#: ../ui/shotwell.glade.h:38
+#: ../ui/shotwell.glade.h:37
 msgid "_Delay:"
 msgstr "_Délai :"
 
-#: ../ui/shotwell.glade.h:39
+#: ../ui/shotwell.glade.h:38
 msgid "_Transition effect:"
 msgstr "Effet de _transition :"
 
-#: ../ui/shotwell.glade.h:40
+#: ../ui/shotwell.glade.h:39
 msgid "Transition d_elay:"
 msgstr "Déla_i de transition :"
 
-#: ../ui/shotwell.glade.h:41
+#: ../ui/shotwell.glade.h:40
 msgid "Show t_itle"
 msgstr "Afficher le t_itre"
 
-#: ../ui/shotwell.glade.h:42
+#: ../ui/shotwell.glade.h:41
 msgid "seconds"
 msgstr "secondes"
 
-#: ../ui/shotwell.glade.h:43
-msgid "_Login"
-msgstr "_Se connecter"
+#~ msgid "Import media _from:"
+#~ msgstr "Importer du contenu à _partir de :"
 
 #~ msgid "Only _Remove"
 #~ msgstr "_Enlever seulement"
diff --git a/po/he.po b/po/he.po
index aaa3ad3..1716a95 100644
--- a/po/he.po
+++ b/po/he.po
@@ -12,642 +12,1420 @@
 # lsbeeler <lucas@yorba.org>, 2011
 # Amiad B <amiad@hatul.info>, 2011
 # Yaron Shahrabani <sh.yaron@gmail.com>, 2011-2012
-#, fuzzy
+# Yosef Or Boczko <yoseforb@gnome.org>, 2015.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
-"Report-Msgid-Bugs-To: shotwell@yorba.org\n"
-"POT-Creation-Date: 2013-09-20 11:55-0700\n"
-"PO-Revision-Date: 2013-09-24 20:50+0000\n"
-"Last-Translator: yoseforb <yoseforb@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/shotwell/language/"
-"he/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 03:38+0200\n"
+"PO-Revision-Date: 2015-03-13 04:20+0200\n"
+"Last-Translator: Yosef Or Boczko <yoseforb@gnome.org>\n"
+"Language-Team: עברית <>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural= (n!=1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
-#: src/Event.vala:737
-#, c-format
-msgid "Event %s"
-msgstr "האירוע %s"
+#: ../plugins/common/RESTSupport.vala:424
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
+msgid "A temporary file needed for publishing is unavailable"
+msgstr "קובץ זמני הנדרש להפקה אינו זמין"
 
-#: src/camera/Branch.vala:87
-msgid "Cameras"
-msgstr "מצלמות"
+#: ../plugins/common/RESTSupport.vala:1138
+msgid ""
+"You have already logged in and out of a Google service during this Shotwell "
+"session.\n"
+"\n"
+"To continue publishing to Google services, quit and restart Shotwell, then "
+"try publishing again."
+msgstr ""
+"כבר התחברת ומחוץ לשרתי Google תחת הפעלת Shotwell.\n"
+"\n"
+"בכדי להמשיך לפרסם על שרתי Google, יש לצאת ולהפעיל מחדש את Shotwell, ואחר "
+"לנסות לפרסם שוב."
 
-#: src/camera/Branch.vala:101 src/camera/ImportPage.vala:711
-#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:300
-#: src/MediaPage.vala:425
-msgid "Camera"
-msgstr "מצלמה"
+#: ../plugins/common/Resources.vala:9
+msgid "Visit the Shotwell home page"
+msgstr "ביקור באתר של Shotwell"
 
-#: src/camera/ImportPage.vala:312 src/Properties.vala:227
-#, c-format
-msgid "RAW+JPEG"
-msgstr "RAW+JPEG"
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
+msgid "translator-credits"
+msgstr ""
+"ירון שהרבני <sh.yaron@gmail.com>\n"
+"יוסף אור בוצ׳קו <yoseforb@gnome.org>"
+
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:32
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:34
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:32
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
+#: ../src/Resources.vala:27
+msgid "Copyright 2009-2015 Yorba Foundation"
+msgstr "כל הזכויות שמורות 2009‏-2015 לעמותת יורבה"
+
+#: ../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 ""
+"ברוך בואך לשרות ייבוא הספריה של F-Spot.\n"
+"\n"
+"אנא בחר ספריה לייבוא, או ע\"י בחירת אחת הספריות שאותרו ע\"י Shotwell או ע\"י "
+"בחירת קובץ מסד נתונים של F-Spot."
 
-#: src/camera/ImportPage.vala:459
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:58
 msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
-msgstr "לא ניתן לנתק את המצלמה.  יש לנסות לנתק את המצלמה ממנהל הקבצים."
+"Welcome to the F-Spot library import service.\n"
+"\n"
+"Please select an F-Spot database file."
+msgstr ""
+"ברוך בואך לשרות ייבוא הספריה של F-Spot.\n"
+"\n"
+"אנא בחר קובץ מסד נתונים של F-Spot."
 
-#: src/camera/ImportPage.vala:776
-msgid "Hide photos already imported"
-msgstr "הסתרת תמונות שכבר יובאו"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
+msgid "Manually select an F-Spot database file to import:"
+msgstr "בחר באופן ידני קובץ מסד נתונים של F-Spot לטעינה:"
 
-#: src/camera/ImportPage.vala:777
-msgid "Only display photos that have not been imported"
-msgstr "יש להציג תמונות שלא יובאו בלבד"
+#: ../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 ""
+"אין אפשרות לפתוח את קובץ מסד הנתונים של F-Spot: הקובץ לא קיים או שאינו קובץ "
+"מסד נתונים"
 
-#: src/camera/ImportPage.vala:845
-msgid "Starting import, please wait..."
-msgstr "הייבוא מתחיל, נא להמתין..."
+#: ../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 ""
+"אין אפשרות לפתוח את קובץ מסד הנתונים של F-Spot: גרסת הקובץ אינה נתמכת ע\"י "
+"Shotwell"
 
-#: src/camera/ImportPage.vala:872 src/MediaPage.vala:436
-msgid "_Titles"
-msgstr "_כותרות"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading tags table"
+msgstr ""
+"אין אפשרות לפתוח את קובץ מסד הנתונים של F-Spot: חלה שגיאה בעת טעינת טבלת "
+"התגיות"
 
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:437
-msgid "Display the title of each photo"
-msgstr "הצגת הכותרת של כל תמונה"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:68
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading photos "
+"table"
+msgstr ""
+"אין אפשרות לפתוח את קובץ מסד הנתונים של F-Spot: חלה שגיאה בעת טעינת טבלת "
+"התמונות."
 
-#: src/camera/ImportPage.vala:884
-msgid "Import _Selected"
-msgstr "יבוא ה_נבחרות"
+#: ../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 ""
+"Shotwell מצא %d תמונות בספריית F-Spot והן מיובאות כרגע.תמונות כפולות יזוהו "
+"ויוסרו באופן אוטומטי.\n"
+"\n"
+"באפשרותך לסגור חלונית זו ולהתחיל להשתמש ב-Shotwell בזמן שהייבוא מתבצע ברקע."
 
-#: src/camera/ImportPage.vala:885
-msgid "Import the selected photos into your library"
-msgstr "יבוא התמונות הנבחרות לספרייה שלך"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
+#, c-format
+msgid "F-Spot library: %s"
+msgstr "ספריית F-Spot: %s"
 
-#: src/camera/ImportPage.vala:890
-msgid "Import _All"
-msgstr "יבוא ה_כול"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
+msgid "Preparing to import"
+msgstr "מתכונן לייבוא"
 
-#: src/camera/ImportPage.vala:891
-msgid "Import all the photos into your library"
-msgstr "יבוא כל התמונות לספרייה שלך"
+#: ../plugins/shotwell-data-imports/shotwell-data-imports.vala:22
+msgid "Core Data Import Services"
+msgstr "שרותי ייבוא מידע בסיסי"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+msgid "Gallery3 publishing module"
+msgstr "‏Gallery3 מודול פרסום"
 
-#: src/camera/ImportPage.vala:1012
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
 msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
-msgstr "על Shotwell לנתק את המצלמה ממערכת הקבצים כדי לגשת אליה.  האם להמשיך?"
+"You are not currently logged into your Gallery.\n"
+"\n"
+"You must have already signed up for a Gallery3 account to complete the login "
+"process."
+msgstr ""
+"נכון לעכשיו לא נכנסת לשירות Gallery.\n"
+"\n"
+"כדי להמשיך אמור להיות ברשותך חשבון Gallery3."
 
-#: src/camera/ImportPage.vala:1018
-msgid "_Unmount"
-msgstr "_ניתוק"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: ../src/MediaPage.vala:435 ../src/photos/RawSupport.vala:300
+msgid "Shotwell"
+msgstr "Shotwell"
 
-#: src/camera/ImportPage.vala:1023
-msgid "Please unmount the camera."
-msgstr "נא לנתק את מערכת הקבצים של המצלמה."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+msgid "Shotwell default directory"
+msgstr "תיקיית בררת מחדל עבור Shotwell"
 
-#: src/camera/ImportPage.vala:1028
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:801
+#, c-format
 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."
+"\n"
+"\n"
+"The file \"%s\" may not be supported by or may be too large for this "
+"instance of Gallery3."
 msgstr ""
-"המצלמה נעולה על ידי יישום אחר.  Shotwell יכולה לגשת למצלמה רק כאשר אינה "
-"נעולה.  נא לסגור כל יישום אחר המשתמש במצלמה ולנסות שוב."
+"\n"
+"\n"
+"\n"
+"הקובץ „%s” עשוי שלא להיתמך או להיות גדול מדי עבור שלב זה של Gallery3."
 
-#: src/camera/ImportPage.vala:1038
-msgid "Please close any other application using the camera."
-msgstr "נא לסגור כל יישום אחר המשתמש במצלמה."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:802
+msgid ""
+"\n"
+"Note that Gallery3 only supports the video types that Flowplayer does."
+msgstr ""
+"\n"
+"יש לשים לב כי Gallery3 תומך בסוגי וידאו אשר Flowplayer תומך."
 
-#: src/camera/ImportPage.vala:1043
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
 #, c-format
 msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
+msgstr "קובץ הנדרש לפרסום אינו זמין. הפרסום ל־%s לא יכול להמשך."
+
+#. populate any widgets whose contents are
+#. programmatically-generated
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
+#, c-format
+msgid "Publishing to %s as %s."
+msgstr "פרסום ל־%s כ־%s."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
+msgid ""
+"Enter the URL for your Gallery3 site and the username and password (or API "
+"key) for your Gallery3 account."
 msgstr ""
-"לא ניתן לקבל את התצוגות המקדימות מהמצלמה:\n"
-"%s"
+"יש להזין את הכתובת עבור אתר ה־Gallery3 שלך ואת שם המשתמש והססמה (או מפתח "
+"API) עבור חשבון ה־Gallery3 שלך."
 
-#: src/camera/ImportPage.vala:1060
-msgid "Unmounting..."
-msgstr "מתבצע ניתוק..."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
+msgid ""
+"The username and password or API key were incorrect. To try again, re-enter "
+"your username and password below."
+msgstr ""
+"שם המשתמש והססמה או מפתח ה־API שגויים. יש לנסות שוב, להזין מחדש את שם המשתמש "
+"והססמה שלך להלן."
 
-#: src/camera/ImportPage.vala:1166
-msgid "Fetching photo information"
-msgstr "פרטי התמונה מתקבלים"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
+msgid ""
+"The URL entered does not appear to be the main directory of a Gallery3 "
+"instance. Please make sure you typed it correctly and it does not have any "
+"trailing components (e.g., index.php)."
+msgstr ""
+"הכתובת שהוזנה אינה מופיעה בתיקייה הראשית של מופע Gallery3. יש לוודא כי הזנת "
+"אותה כראוי והיא אינה מכילה רכיבים נגררים (כמו index.php)."
 
-#: src/camera/ImportPage.vala:1521
-#, c-format
-msgid "Fetching preview for %s"
-msgstr "התצוגה המקדימה עבור %s מתקבלת"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
+msgid "Unrecognized User"
+msgstr "משתמש לא מוכר"
 
-#: src/camera/ImportPage.vala:1637
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "לא ניתן לנעול את המצלמה: %s"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
+msgid " Site Not Found"
+msgstr "האתר לא נמצא"
 
-#: src/camera/ImportPage.vala:1722
-#, c-format
-msgid "Delete this photo from camera?"
-msgid_plural "Delete these %d photos from camera?"
-msgstr[0] "האם למחוק תמונה זו מהמצלמה?"
-msgstr[1] "האם למחוק %d תמונות אלה מהמצלמה?"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
+msgid "Copyright (C) 2013 rajce.net"
+msgstr "כל הזכויות שמורות (C) 2013 rajce."
 
-#: src/camera/ImportPage.vala:1725
-#, c-format
-msgid "Delete this video from camera?"
-msgid_plural "Delete these %d videos from camera?"
-msgstr[0] "האם למחוק קטע וידאו זה מהמצלמה?"
-msgstr[1] "האם למחוק %d קטעי וידאו אלה?"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
+msgid "An error message occurred when publishing to Rajce. Please try again."
+msgstr "אירעה שגיאה בעת הפרסום ל־Rajce. נא לנסות שוב."
 
-#: src/camera/ImportPage.vala:1728
-#, c-format
-msgid "Delete this photo/video from camera?"
-msgid_plural "Delete these %d photos/videos from camera?"
-msgstr[0] "האם למחוק תמונה/וידאו אלו  מהמצלמה?"
-msgstr[1] "האם למחוק %d תמונות/קטעי וידאו אלו מהמצלמה?"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
+msgid "Enter email and password associated with your Rajce account."
+msgstr "נא להזין את כתובת הדוא״ל והססמה של חשבון ה־Rajce שלך."
 
-#: src/camera/ImportPage.vala:1731
-#, c-format
-msgid "Delete these files from camera?"
-msgid_plural "Delete these %d files from camera?"
-msgstr[0] "האם למחוק קובץ זה מהמצלמה?"
-msgstr[1] "האם למחוק %d קבצים אלה מהמצלמה?"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
+msgid "Invalid email and/or password. Please try again"
+msgstr "כתובת דוא״ל ו/או ססמה שגויים. נא לנסות שנית"
 
-#: src/camera/ImportPage.vala:1739 src/Dialogs.vala:1328
-msgid "_Keep"
-msgstr "_שמירה"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
+msgid "Invalid User Email or Password"
+msgstr "שם משתמש דוא״ל או ססמה שגויים"
 
-#: src/camera/ImportPage.vala:1758
-msgid "Removing photos/videos from camera"
-msgstr "התמונות/קטעי הווידאו מוסרים מהמצלמה"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:890
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:2
+msgid "_Email address"
+msgstr "כתובת _דוא״ל"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:891
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
+msgid "_Password"
+msgstr "_ססמה"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
+msgid "_Remember"
+msgstr "_זכירת ססמה"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
+msgid "Login"
+msgstr "כניסה"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:5
+msgid "_Hide album"
+msgstr "ה_סתרת אלבום"
 
-#: src/camera/ImportPage.vala:1762
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, 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] "לא ניתן למחוק %d תמונות/קטעי וידאו מהמצלמה עקב שגיאות."
+msgid "You are logged into Rajce as %s."
+msgstr "נכנסת ל־Rajce בשם %s."
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2623
-msgid "S_lideshow"
-msgstr "מ_צגת"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
+msgid "Photos will appear in:"
+msgstr "התמונות יופיעו תחת:"
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2624
-msgid "Play a slideshow"
-msgstr "הפעלת מצגת"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
+msgid "An _existing album:"
+msgstr "אלבום _קיים:"
 
-#: src/CollectionPage.vala:456
-msgid "Export Photo/Video"
-msgstr "יצוא תמונות/קטעי וידאו"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
+msgid "A _new album named:"
+msgstr "_אלבום חדש בשם:"
 
-#: src/CollectionPage.vala:456
-msgid "Export Photos/Videos"
-msgstr "יצוא תמונות/קטעי וידאו"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:6
+msgid "Open target _album in browser"
+msgstr "פתיחת ידע ה_אלבום בדפדפן"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:8
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
+msgid "_Publish"
+msgstr "_פרסום"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:58 src/PhotoPage.vala:3196
-msgid "Export Photo"
-msgstr "יצוא תמונות"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
+msgid "_Logout"
+msgstr "י_ציאה"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:87
-msgid "Export Photos"
-msgstr "יצוא תמונות"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "כל הזכויות שמורות 2012 ל־BJA Electronics"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Rotating"
-msgstr "סיבוב"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
+msgid "500 x 375 pixels"
+msgstr "500‎ × 375 פיקסלים"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Undoing Rotate"
-msgstr "ביטול הסיבוב"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
+msgid "1024 x 768 pixels"
+msgstr "1024‎ × 768 פיקסלים"
 
-#: src/CollectionPage.vala:570
-msgid "Flipping Horizontally"
-msgstr "היפוך אופקי"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
+msgid "1280 x 853 pixels"
+msgstr "1280‎ × 853 פיקסלים"
 
-#: src/CollectionPage.vala:571
-msgid "Undoing Flip Horizontally"
-msgstr "ביטול היפוך אופקי"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:310
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:320
+#, c-format
+msgid "'%s' isn't a valid response to an OAuth authentication request"
+msgstr "'%s' אינו פלט תקין לבקשת אימות מסוג OAuth"
 
-#: src/CollectionPage.vala:580
-msgid "Flipping Vertically"
-msgstr "היפוך אנכי"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:558
+msgid ""
+"TumblrPublisher: start( ): can't start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( )‎: אינו ניתן לאתחול, כיוון שמנשק זה אינו ניתן לאתחול "
+"מחדש."
 
-#: src/CollectionPage.vala:581
-msgid "Undoing Flip Vertically"
-msgstr "ביטול היפוך אנכי"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "נא להזין את שם המשתמש והססמה של חשבון ה־Tumblr שלך"
 
-#: src/searches/SearchBoolean.vala:157
-msgid "Any text"
-msgstr " כלשהו"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
+msgid "Username and/or password invalid. Please try again"
+msgstr "שם המשתמש ו/או הססמה אינם נכונים. נא לנסות שנית"
 
-#: src/searches/SearchBoolean.vala:160
-msgid "Title"
-msgstr "כותרת"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:617
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
+msgid "Invalid User Name or Password"
+msgstr "שם משתמש או ססמה שגויים"
 
-#: src/searches/SearchBoolean.vala:163
-msgid "Tag"
-msgstr "תגית"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:636
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "טעינת המנשק נכשלה: %s"
 
-#: src/searches/SearchBoolean.vala:166
-msgid "Comment"
-msgstr "הערה"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:739
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"נכנסת לחשבונך ב־Tumblr בשם %s.\n"
+"\n"
 
-#: src/searches/SearchBoolean.vala:169
-msgid "Event name"
-msgstr "שם האירוע"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
+msgstr "כל הזכויות שמורות 2010+ ל־Evgeniy Polyakov‏ <zbr@ioremap.net>"
 
-#: src/searches/SearchBoolean.vala:172
-msgid "File name"
-msgstr "שם הקובץ"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:25
+msgid "Visit the Yandex.Fotki web site"
+msgstr "ביקור באתר Yandex.Fotki"
 
-#: src/searches/SearchBoolean.vala:175
-msgid "Media type"
-msgstr "סוג המדיה"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:632
+msgid "You are not currently logged into Yandex.Fotki."
+msgstr "לא נכנסת לשירות Yandex.Fotki."
 
-#: src/searches/SearchBoolean.vala:178
-msgid "Flag state"
-msgstr "מצב הדגלון"
+#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+msgid "Shotwell Extra Publishing Services"
+msgstr "שירותי פרסום נוספים של Shotwell"
 
-#: src/searches/SearchBoolean.vala:181
-msgid "Photo state"
-msgstr "מצב תמונה"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
+msgid "Go _Back"
+msgstr "_חזרה"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1003
-msgid "Rating"
-msgstr "דירוג"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
+#: ../ui/shotwell.glade.h:42
+msgid "_Login"
+msgstr "_התחברות"
 
-#: src/searches/SearchBoolean.vala:187
-msgid "Date"
-msgstr "תאריך"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
+msgid "Intro message replaced at runtime"
+msgstr "הודעת פתיחה הוחלפה בזמן ריצה"
 
-#: src/searches/SavedSearchDialog.vala:169
-msgid "contains"
-msgstr "מכיל"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
+msgid "_Gallery3 URL:"
+msgstr "כתובת _Gallery3:"
 
-#: src/searches/SavedSearchDialog.vala:170
-#: src/searches/SavedSearchDialog.vala:497
-msgid "is exactly"
-msgstr "הוא בדיוק"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
+msgid "_User name:"
+msgstr "שם _משתמש:"
 
-#: src/searches/SavedSearchDialog.vala:171
-msgid "starts with"
-msgstr "מתחיל ב־"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
+msgid "_Password:"
+msgstr "_ססמה:"
 
-#: src/searches/SavedSearchDialog.vala:172
-msgid "ends with"
-msgstr "מסתיים ב־"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:7
+msgid "API _Key:"
+msgstr "_מפתח API:"
 
-#: src/searches/SavedSearchDialog.vala:173
-msgid "does not contain"
-msgstr "אינו מכיל"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
+msgid "or"
+msgstr "או"
 
-#: src/searches/SavedSearchDialog.vala:174
-#: src/searches/SavedSearchDialog.vala:501
-msgid "is not set"
-msgstr "לא מוגדר"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
+msgid "A _new album"
+msgstr "אלבום _חדש"
 
-#: src/searches/SavedSearchDialog.vala:245
-#: src/searches/SavedSearchDialog.vala:376
-#: src/searches/SavedSearchDialog.vala:441
-msgid "is"
-msgstr "הוא"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
+msgid "An _existing album"
+msgstr "אלבום _קיים"
 
-#: src/searches/SavedSearchDialog.vala:246
-msgid "is not"
-msgstr "אינו"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
+msgid "_Remove location, tag and camera-identifying data before uploading"
+msgstr "ה_סרת מידע אודות מיקום, תג או מזהה מצלמה לפני העלאה"
 
-#: src/searches/SavedSearchDialog.vala:252
-msgid "any photo"
-msgstr "כל תמונה שהיא"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
+msgid "'Publishing to $url as $username' (populated in application code)"
+msgstr "'פרסום ע־$url בשם $usernamr' (מאוכלס בקוד יישום)"
 
-#: src/searches/SavedSearchDialog.vala:253
-msgid "a raw photo"
-msgstr "תמונה גולמית"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
+msgid "Scaling constraint:"
+msgstr "אילוץ שמירת יחס:"
 
-#: src/searches/SavedSearchDialog.vala:254
-msgid "a video"
-msgstr "וידאו"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
+msgid "pixels"
+msgstr "פיקסלים"
 
-#: src/searches/SavedSearchDialog.vala:308
-msgid "has"
-msgstr "יש"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
+#: ../src/Dimensions.vala:17
+msgid "Original size"
+msgstr "הגודל המקורי"
 
-#: src/searches/SavedSearchDialog.vala:309
-msgid "has no"
-msgstr "אין"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:10
+#: ../src/Dimensions.vala:20
+msgid "Width or height"
+msgstr "רוחב או גובה"
 
-#: src/searches/SavedSearchDialog.vala:314
-msgid "modifications"
-msgstr "שינויים"
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
+#: ../ui/shotwell.glade.h:14
+msgid "label"
+msgstr "תווית"
 
-#: src/searches/SavedSearchDialog.vala:315
-msgid "internal modifications"
-msgstr "שינויים פנימיים"
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
+msgid "Blogs:"
+msgstr "בלוגים:"
 
-#: src/searches/SavedSearchDialog.vala:316
-msgid "external modifications"
-msgstr "שינויים חיצוניים"
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:1
+msgid "Photo _size:"
+msgstr "_גודל תמונה:"
 
-#: src/searches/SavedSearchDialog.vala:370
-msgid "flagged"
-msgstr "מסומן בדגלון"
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
+msgid "you are logged in rajce as $name"
+msgstr "נכנסת ל־rajce בשם $name"
 
-#: src/searches/SavedSearchDialog.vala:371
-msgid "not flagged"
-msgstr "לא מסומן בדגלון"
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
+msgid "$mediatype will appear in"
+msgstr "$mediatype יופיעו בתוך"
 
-#: src/searches/SavedSearchDialog.vala:434
-msgid "and higher"
-msgstr "ומעלה"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
+msgid "_Albums (or write new):"
+msgstr "_אלבומים (או כתיבת חדש):"
 
-#: src/searches/SavedSearchDialog.vala:435
-msgid "only"
-msgstr "בלבד"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:2
+msgid "Access _type:"
+msgstr "_סוג הגישה"
 
-#: src/searches/SavedSearchDialog.vala:436
-msgid "and lower"
-msgstr "ומטה"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
+msgid "Disable _comments"
+msgstr "נטרול הה_ערות"
 
-#: src/searches/SavedSearchDialog.vala:498
-msgid "is after"
-msgstr "הוא לאחר"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:4
+msgid "_Forbid downloading original photo"
+msgstr "_איסור הורדת התמונה המקורית"
 
-#: src/searches/SavedSearchDialog.vala:499
-msgid "is before"
-msgstr "הוא לפני"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
+msgid "Public"
+msgstr "ציבורי"
 
-#: src/searches/SavedSearchDialog.vala:500
-msgid "is between"
-msgstr "הוא בין"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:8
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1181
+msgid "Friends"
+msgstr "חברים"
 
-#: src/searches/SavedSearchDialog.vala:513
-msgid "and"
-msgstr "וגם"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:9
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
+msgid "Private"
+msgstr "פרטי"
 
-#: src/searches/SavedSearchDialog.vala:720
-msgid "any"
-msgstr "כלשהו"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:59
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1127
+msgid "Shotwell Connect"
+msgstr "Shotwell Connect"
 
-#: src/searches/SavedSearchDialog.vala:721
-msgid "all"
-msgstr "הכול"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:63
+msgid ""
+"You are not currently logged into Facebook.\n"
+"\n"
+"If you don't yet have a Facebook account, you can create one during the "
+"login process. During login, Shotwell Connect may ask you for permission to "
+"upload photos and publish to your feed. These permissions are required for "
+"Shotwell Connect to function."
+msgstr ""
+"נכון לעכשיו לא ביצעת כניסה לחשבון ה־Facebook שלך.\n"
+"\n"
+"אם עדיין אין לך חשבון Facebook, באפשרותך ליצור אחד במהלך הכניסה. במשך תהליך "
+"הכניסה, Shotwell Connect עלול לבקש את רשותך להעלות תמונות ולפרסם אותן בהזנה "
+"שלך. הרשאות אלו נחוצות כדי ש־Shotwell Connect יוכל לתפקד."
 
-#: src/searches/SavedSearchDialog.vala:722
-msgid "none"
-msgstr "אף אחד מאלה"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:65
+msgid ""
+"You have already logged in and out of Facebook during this Shotwell "
+"session.\n"
+"To continue publishing to Facebook, quit and restart Shotwell, then try "
+"publishing again."
+msgstr ""
+"כבר יצאת מ־Facebook במהלך הפעלה זו של Shotwell.\n"
+"כדי להמשיך לפרסם ל־Facebook, עליך לצאת ולהפעיל מחדש את Shotwell ואז לנסות "
+"לפרסם שוב."
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "החיפושים השמורים"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:86
+msgid "Standard (720 pixels)"
+msgstr "רגיל (720 פיקסלים)"
 
-#: src/searches/Branch.vala:77 src/library/LibraryWindow.vala:346
-#: src/sidebar/Tree.vala:195
-msgid "Ne_w Saved Search..."
-msgstr "חיפוש _שמור חדש..."
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:89
+msgid "Large (2048 pixels)"
+msgstr "גדול (2048 פיקסלים)"
 
-#: src/main.vala:54
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:254
+msgid "Testing connection to Facebook..."
+msgstr "החיבור ל־Facebook נבדק..."
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:347
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
+msgid "Creating album..."
+msgstr "אלבום נוצר..."
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:374
+msgid ""
+"A file required for publishing is unavailable. Publishing to Facebook can't "
+"continue."
+msgstr ""
+"קובץ הנדרש להעלאת התוכן אינו זמין. העלאת התוכן ל-Facebook לא תוכל להתבצע."
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1019
 #, 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."
+"You are logged into Facebook as %s.\n"
+"\n"
 msgstr ""
-"ספריית התמונות שלך אינה נתמכת בגרסה זו של Shotwell. נראה כי הספרייה נוצרה "
-"באמצעות Shotwell %s (סכמה %d). גרסה זו הנה %s (סכמה %d). נא להשתמש בגרסה "
-"העדכנית ביותר של Shotwell."
+"נכנסת ל־Facebook בשם %s.\n"
+"\n"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1020
+msgid "Where would you like to publish the selected photos?"
+msgstr "להיכן ברצונך לפרסם את התמונות הנבחרות?"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1021
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
+msgid "Upload _size:"
+msgstr "גודל הה_עלאה:"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
+msgid "Just me"
+msgstr "רק לי"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+msgid "Everyone"
+msgstr "כולם"
+
+#: ../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 ""
+"לא נכנסת ל־Flickr.\n"
+"\n"
+"יש ללחוץ על כניסה כדי להיכנס ל־Flickr בדפדפן שלך.  יהיה עליך לאמת את "
+"Shotwell Connect כדי לקשר אל חשבון ה־Flickr שלך."
 
-#: src/main.vala:59
+#: ../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 ""
+"כבר נכנסת ויצאת מ־Flick במהלך הפעלה זו של Shotwell.\n"
+"כדי להמשיך לפרסם ל־Flickr, עליך לצאת ולהפעיל מחדש את Shotwell ואז לנסות "
+"לפרסם שוב."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:375
+msgid "Preparing for login..."
+msgstr "בהכנות לכניסה..."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:444
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:595
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can't "
+"continue."
+msgstr ""
+"קובץ הנדרש להעלאת התוכן אינו זמין. העלאת התוכן ל-Flickr לא תוכל להתבצע."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:457
+msgid "Verifying authorization..."
+msgstr "האימות בווידוא..."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1153
 #, 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"
+"You are logged into Flickr as %s.\n"
+"\n"
 msgstr ""
-"לא עלה בידי Shotwell לשדרג את ספריית התמונות שלך מגרסה %s (סכמה%d) לגרסה %s "
-"(סכמה %d).  למידע נוסף ניתן לבקר באתר הוויקי של Shotwell בכתובת %s"
+"נכנסת ל־Flickr בשם %s.\n"
+"\n"
 
-#: src/main.vala:65
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
 #, 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."
+"Your free Flickr account limits how much data you can upload per month.\n"
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"חשבונך הפטור מתשלום ב־Flickr מגביל את כמות המידע שניתן להעלות בחודש.\n"
+"החודש, נותרו לך %d מגה בתים במכסת ההעלאה שלך."
+msgstr[1] ""
+"חשבונך הפטור מתשלום ב־Flickr מגביל את כמות המידע שניתן להעלות בחודש.\n"
+"החודש, נותרו לך %d מגה בתים במכסת ההעלאה שלך."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
+msgid "Your Flickr Pro account entitles you to unlimited uploads."
+msgstr "חשבון ה־Flickr Pro שלך מזכה אותך בכמויות העלאה בלתי מוגבלות."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
+msgid "Photos _visible to:"
+msgstr "התמונות _גלויות לעיני:"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+msgid "Videos _visible to:"
+msgstr "קטעי הווי_דאו גלוים לעיני:"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
+msgid "Photos and videos _visible to:"
+msgstr "הת_מונות וקטעי הווידאו גלויים לעיני:"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+msgid "Friends & family only"
+msgstr "חברים ומשפחה בלבד"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
+msgid "Family only"
+msgstr "רק משפחה"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
+msgid "Friends only"
+msgstr "רק חברים"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
+msgid "2048 x 1536 pixels"
+msgstr "2048 x‏ 1536 פיקסלים"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
+msgid "4096 x 3072 pixels"
+msgstr "4096 x‏ 3072 פיקסלים"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:58
+msgid ""
+"You are not currently logged into Picasa Web Albums.\n"
+"\n"
+"Click Login to log into Picasa Web Albums in your Web browser. You will have "
+"to authorize Shotwell Connect to link to your Picasa Web Albums account."
 msgstr ""
-"ספריית התמונות שלך אינה תואמת לגרסה זו של Shotwell.  נראה כי ספרייה זו נוצרה "
-"על ידי Shotwell %s (סכמה%d).  גרסה זו הנה %s (סכמה %d).  נא לפנות את ספריית "
-"התמונות שלך על ידי מחיקת %s ויבוא התמונות שלך מחדש."
+"אינך מחובר לאתר Picasa Web Albums.\n"
+"\n"
+"הקלק על התחבר בכדי להכנס לחשבונך ב-Picasa Web Albums בדפדפן שלך. תצטרך לאשר "
+"ל-Shotwell להתחבר על מנת לקשר לחשבון Picasa Web Albums שלך."
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:361
+msgid ""
+"A file required for publishing is unavailable. Publishing to Picasa can't "
+"continue."
+msgstr ""
+"קובץ הנדרש להעלאת התוכן אינו זמין. העלאת התוכן ל-Picasa לא תוכל להתבצע."
 
-#: src/main.vala:71
+#. populate any widgets whose contents are programmatically-generated.
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:659
 #, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
-msgstr "אירעה שגיאה בלתי ידועה בעת הניסיון לאימות מסד הנתונים של Shotwell: %s"
+msgid "You are logged into Picasa Web Albums as %s."
+msgstr "נכנסת ל־Picasa Web Albums בשם %s."
 
-#: src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "Loading Shotwell"
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:665
+msgid "Videos will appear in:"
+msgstr "קטעי הווידאו יופיעו בתוך:"
 
-#: src/main.vala:294
-msgid "Path to Shotwell's private data"
-msgstr "הנתיב לנתונים הפרטיים של Shotwell"
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
+msgid "Small (640 x 480 pixels)"
+msgstr "קטנה (640 x‏ 480 פיקסלים)"
 
-#: src/main.vala:294
-msgid "DIRECTORY"
-msgstr "DIRECTORY"
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:747
+msgid "Medium (1024 x 768 pixels)"
+msgstr "בינונית (1024 x‏ 768 פיקסלים)"
 
-#: src/main.vala:298
-msgid "Do not monitor library directory at runtime for changes"
-msgstr "אין לבדוק מה השינויים בתיקיות בזמן פעולת התכנית"
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:748
+msgid "Recommended (1600 x 1200 pixels)"
+msgstr "מומלצת (1600 x‏ 1200 פיקסלים)"
 
-#: src/main.vala:302
-msgid "Don't display startup progress meter"
-msgstr "אין להציג מד התקדמות בזמן ההפעלה"
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:749
+msgid "Google+ (2048 x 1536 pixels)"
+msgstr "Google+ (2048 x 1536 פיקסלים)"
 
-#: src/main.vala:306
-msgid "Show the application's version"
-msgstr "הצגת גרסת היישום"
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:750
+#: ../src/editing_tools/EditingTools.vala:756
+msgid "Original Size"
+msgstr "הגודל המקורי"
 
-#: src/main.vala:338
-msgid "[FILE]"
-msgstr "[FILE]"
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
+#, c-format
+msgid "Creating album %s..."
+msgstr "מייצר אלבום %s…"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:917
+msgid "An error message occurred when publishing to Piwigo. Please try again."
+msgstr "אירעה שגיאה בעת הפרסום לפיוויגו. נא לנסות שוב."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:998
+msgid ""
+"Enter the URL of your Piwigo photo library as well as the username and "
+"password associated with your Piwigo account for that library."
+msgstr ""
+"הזן את כתובת האתר של ספריית התמונות Piwigo שלך וכן את שם המשתמש והסיסמה "
+"לגישה לחשבון -Piwigo שלך עבור ספריה זו."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:999
+msgid ""
+"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
+"entered"
+msgstr ""
+"Shotwell אינו יכול להתחבר לספריית התמונות Piwigo. אנא בדוק את כתובת האתר "
+"שהזנת"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+msgid "Invalid URL"
+msgstr "כתובת אתר לא תקינה"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+msgid "Admins, Family, Friends, Contacts"
+msgstr "מנהלי מערכת, משפחה, חברים, אנשי קשר"
 
-#: src/main.vala:342
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+msgid "Admins, Family, Friends"
+msgstr "מנהלי מערכת, משפחה, חברים"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+msgid "Admins, Family"
+msgstr "מנהלי מערכת, משפחה"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+msgid "Admins"
+msgstr "מנהלי מערכת"
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:57
+msgid ""
+"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 ""
+"נכון לעכשיו לא נכנסת לשירות YouTube.\n"
+"\n"
+"כדי להמשיך אמור להיות ברשותך חשבון Google המוגדר לשימוש בשילוב YouTube. ניתן "
+"להגדיר את רוב החשבונות על ידי שימוש בדפדפן האינטרנט שלך כדי להיכנס ל־YouTube "
+"לפחות פעם אחת."
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
+msgid ""
+"A file required for publishing is unavailable. Publishing to Youtube can't "
+"continue."
+msgstr ""
+"קובץ הנדרש להעלאת התוכן אינו זמין. העלאת התוכן ל-Youtube לא תוכל להתבצע."
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:461
 #, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgid "You are logged into YouTube as %s."
+msgstr "נכנסת ל־YouTube בשם %s."
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:463
+#, c-format
+msgid "Videos will appear in '%s'"
+msgstr "קטעי הווידאו יופיעו בתוך '%s'"
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:495
+msgid "Public listed"
+msgstr "הצגה ציבורית"
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
+msgid "Public unlisted"
+msgstr "לא מוצג לכלל הציבור"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
+msgid "Publish to an e_xisting album:"
+msgstr "פרסום לאלבום _קיים:"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:2
+msgid "Create a _new album named:"
+msgstr "יצירת אלבום _חדש בשם:"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
+msgid "Videos and new photo albums _visible to:"
+msgstr "קטעי הווידאו והתמונות החדשים _גלויים לעיני:"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:5
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:8
+msgid ""
+"_Remove location, camera, and other identifying information before uploading"
+msgstr "ה_סרת נתונים אודות מיקום, מצלמה ומידע מזהה אחר לפני העלאה"
+
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
+msgid ""
+"Enter the confirmation number which appears after you log into Flickr in "
+"your Web browser."
+msgstr "נא להזין את מספר האימות שמופיע לאחר הכניסה ל־Flickr בדפדפן שלך."
+
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
+msgid "Authorization _Number:"
+msgstr "מספר ה_אימות:"
+
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:3
+#: ../src/Dialogs.vala:131
+msgid "Con_tinue"
+msgstr "המ_שך"
+
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
+msgid "L_ist album in public gallery"
+msgstr "ה_צגת האלבום בגלריה ציבורית"
+
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
+msgid "Photo _size preset:"
+msgstr "ערכת _גודל התמונה:"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
+msgid "_URL of your Piwigo photo library"
+msgstr "_כתובת של ספריית התמונות שלך ב־Piwigo"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
+msgid "User _name"
+msgstr "_שם משתמש"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
+msgid "_Remember Password"
+msgstr "_זכור ססמה"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
+msgid "An _existing category:"
+msgstr "_קטגוריה קיימת:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:4
+msgid "Photos will be _visible by:"
+msgstr "התמונות יהיו זמינות _עד:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:5
+msgid "Photo size:"
+msgstr "גודל התמונה:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:6
+msgid "within category:"
+msgstr "בתוך קטגוריה:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
+msgid "Album comment:"
+msgstr "הערת אלבום:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
+msgid "_If a title is set and comment unset, use title as comment"
+msgstr "_אם כותרת נקבעה והערת חסרה, הכותרת תשמש כהערה"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:10
+msgid "_Do no upload tags"
+msgstr "_לא להעלות תגים"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
+msgid "Logout"
+msgstr "התנתקות"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
+#: ../src/Resources.vala:303
+msgid "Publish"
+msgstr "פרסום"
+
+#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
+msgid "Core Publishing Services"
+msgstr "שירותי פרסום של הליבה"
+
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
+msgid "Video privacy _setting:"
+msgstr "הגדרות ה_פרטיות של הווידאו:"
+
+#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+msgid "Blinds"
+msgstr "תריסים"
+
+#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+msgid "Chess"
+msgstr "שח מט"
+
+#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+msgid "Circle"
+msgstr "עיגול"
+
+#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+msgid "Circles"
+msgstr "עיגולים"
+
+#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+msgid "Clock"
+msgstr "שעון"
+
+#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+msgid "Crumble"
+msgstr "התפוררות"
+
+#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+msgid "Fade"
+msgstr "עמעום"
+
+#: ../plugins/shotwell-transitions/SlideEffect.vala:20
+msgid "Slide"
+msgstr "שקופית"
+
+#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
+msgid "Squares"
+msgstr "ריבועים"
+
+#: ../plugins/shotwell-transitions/StripesEffect.vala:20
+msgid "Stripes"
+msgstr "פסים"
+
+#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
+msgid "Core Slideshow Transitions"
+msgstr "מעברי ליבה של מצגות"
+
+#: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
 msgstr ""
-"Run '%s --help' to see a full list of available command line options.\n"
+"כל הזכויות שמורות 2010 למקסים קרטשב, כל הזכויות שמורות 2011-2015 לעמותת יורבה"
 
-#: src/Properties.vala:84
-msgid "Today"
-msgstr "היום"
+#: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
+#, c-format
+msgid "Unable to create cache directory %s: %s"
+msgstr "אין אפשרות לייצר את ספריית המטמון %s: %s"
 
-#: src/Properties.vala:86
-msgid "Yesterday"
-msgstr "אתמול"
+#: ../src/AppDirs.vala:58 ../src/AppDirs.vala:88
+#, c-format
+msgid "Unable to create data directory %s: %s"
+msgstr "לא ניתן ליצור את תיקייה הנתונים %s:‏ %s"
 
-#: src/Properties.vala:340 src/Dialogs.vala:1273
-msgid "Title:"
-msgstr "כותרת:"
+#. If XDG yarfed, use ~/Pictures
+#: ../src/AppDirs.vala:152
+msgid "Pictures"
+msgstr "תמונות"
 
-#: src/Properties.vala:343
-msgid "Items:"
-msgstr "פריטים:"
+#: ../src/AppDirs.vala:190
+#, c-format
+msgid "Unable to create temporary directory %s: %s"
+msgstr "לא ניתן ליצור את התיקייה הזמנית %s:‏ %s"
 
-#: src/Properties.vala:346
+#: ../src/AppDirs.vala:207 ../src/AppDirs.vala:223
 #, c-format
-msgid "%d Event"
-msgid_plural "%d Events"
-msgstr[0] "אירוע אחד"
-msgstr[1] "%d אירועים"
+msgid "Unable to create data subdirectory %s: %s"
+msgstr "לא ניתן ליצור את תת־תיקיית הנתונים %s: ‏%s"
+
+#: ../src/AppWindow.vala:53
+msgid "Pin Toolbar"
+msgstr "הצמדת סרגל הכלים"
 
-#: src/Properties.vala:353 src/events/EventDirectoryItem.vala:87
+#: ../src/AppWindow.vala:54
+msgid "Pin the toolbar open"
+msgstr "הצמדת סרגל הכלים שיישאר פתוח"
+
+#: ../src/AppWindow.vala:59
+msgid "Leave fullscreen"
+msgstr "יציאה ממסך מלא"
+
+#: ../src/AppWindow.vala:525
+msgid "_Contents"
+msgstr "_תכנים"
+
+#: ../src/AppWindow.vala:530
+msgid "_Frequently Asked Questions"
+msgstr "שאלות _נפוצות"
+
+#: ../src/AppWindow.vala:535
+msgid "_Report a Problem..."
+msgstr "_דווח על בעיה..."
+
+#: ../src/AppWindow.vala:634 ../src/AppWindow.vala:655
+#: ../src/AppWindow.vala:672 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
+#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441 ../src/Resources.vala:162
+#: ../src/data_imports/DataImportsUI.vala:374
+#: ../src/publishing/PublishingUI.vala:475
+msgid "_Cancel"
+msgstr "_ביטול"
+
+#: ../src/AppWindow.vala:682
 #, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] "תמונה אחת"
-msgstr[1] "%d תמונות"
+msgid ""
+"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
+"continue.\n"
+"\n"
+"%s"
+msgstr ""
+"אירעה שגיאה קריטית בעת הגישה לספרייה של Shotwell. ‏Shotwell לא תוכל להמשיך.\n"
+"\n"
+"%s"
 
-#: src/Properties.vala:355 src/events/EventDirectoryItem.vala:85
+#: ../src/AppWindow.vala:702
+msgid "Visit the Yorba web site"
+msgstr "ביקור באתר של Yorba"
+
+#: ../src/AppWindow.vala:714
 #, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] "קטע וידאו אחד"
-msgstr[1] "%d קטעי וידאו"
+msgid "Unable to display help: %s"
+msgstr "לא ניתן להציג את העזרה: %s"
 
-#: src/Properties.vala:377
-msgid "Date:"
-msgstr "תאריך:"
+#: ../src/AppWindow.vala:722
+#, c-format
+msgid "Unable to navigate to bug database: %s"
+msgstr "אין אפשרות לגלוש למסד נתוני התקלות: %s"
 
-#: src/Properties.vala:381
-msgid "Time:"
-msgstr "שעה:"
+#: ../src/AppWindow.vala:730
+#, c-format
+msgid "Unable to display FAQ: %s"
+msgstr "לא ניתן להציג את השאלות הנפוצות: %s"
 
-#: src/Properties.vala:384 src/Properties.vala:389
-msgid "From:"
-msgstr "מ־:"
+#: ../src/BatchImport.vala:26
+msgid "Success"
+msgstr "הצלחה"
 
-#: src/Properties.vala:385 src/Properties.vala:390
-msgid "To:"
-msgstr "עד:"
+#: ../src/BatchImport.vala:29
+msgid "File error"
+msgstr "שגיאת קובץ"
 
-#: src/Properties.vala:395 src/editing_tools/EditingTools.vala:1850
-msgid "Size:"
-msgstr "גודל:"
+#: ../src/BatchImport.vala:32
+msgid "Unable to decode file"
+msgstr "לא ניתן לפענח את הקובץ"
 
-#: src/Properties.vala:404
-msgid "Duration:"
-msgstr "משך:"
+#: ../src/BatchImport.vala:35
+msgid "Database error"
+msgstr "שגיאת מסד נתונים"
+
+#: ../src/BatchImport.vala:38
+msgid "User aborted import"
+msgstr "המשתמש ביטל את היבוא"
+
+#: ../src/BatchImport.vala:41
+msgid "Not a file"
+msgstr "לא קובץ"
+
+#: ../src/BatchImport.vala:44
+msgid "File already exists in database"
+msgstr "הקובץ כבר קיים במסד הנתונים"
 
-#: src/Properties.vala:404
+#: ../src/BatchImport.vala:47
+msgid "Unsupported file format"
+msgstr "מבנה הקובץ אינו נתמך"
+
+#: ../src/BatchImport.vala:50
+msgid "Not an image file"
+msgstr "לא קובץ תמונה"
+
+#: ../src/BatchImport.vala:53
+msgid "Disk failure"
+msgstr "שגיאה בכונן"
+
+#: ../src/BatchImport.vala:56
+msgid "Disk full"
+msgstr "הכונן מלא"
+
+#: ../src/BatchImport.vala:59
+msgid "Camera error"
+msgstr "שגיאת מצלמה"
+
+#: ../src/BatchImport.vala:62
+msgid "File write error"
+msgstr "שגיאת כתיבה לקובץ"
+
+#: ../src/BatchImport.vala:65
+msgid "Corrupt image file"
+msgstr "קובץ תמונה מושחת"
+
+#: ../src/BatchImport.vala:68
 #, c-format
-msgid "%.1f seconds"
-msgstr "%.1f שניות"
+msgid "Imported failed (%d)"
+msgstr "המיובאות כשלו (%d)"
 
-#: src/Properties.vala:408
-msgid "Developer:"
-msgstr "מתכנת:"
+#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
+msgid "S_lideshow"
+msgstr "מ_צגת"
 
-#: src/Properties.vala:436 src/Properties.vala:440 src/Properties.vala:447
-#: src/editing_tools/EditingTools.vala:2218
-msgid "Exposure:"
-msgstr "חשיפה:"
+#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
+msgid "Play a slideshow"
+msgstr "הפעלת מצגת"
 
-#: src/Properties.vala:585
-msgid "Location:"
-msgstr "מיקום:"
+#: ../src/CollectionPage.vala:456
+msgid "Export Photo/Video"
+msgstr "יצוא תמונות/קטעי וידאו"
 
-#: src/Properties.vala:588
-msgid "File size:"
-msgstr "גודל הקובץ:"
+#: ../src/CollectionPage.vala:456
+msgid "Export Photos/Videos"
+msgstr "יצוא תמונות/קטעי וידאו"
 
-#: src/Properties.vala:592
-msgid "Current Development:"
-msgstr "פיתוח נוכחי:"
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
+#: ../src/PhotoPage.vala:3211
+msgid "Export Photo"
+msgstr "יצוא תמונות"
 
-#: src/Properties.vala:594
-msgid "Original dimensions:"
-msgstr "הממדים המקוריים:"
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:87
+msgid "Export Photos"
+msgstr "יצוא תמונות"
 
-#: src/Properties.vala:597
-msgid "Camera make:"
-msgstr "יצרן המצלמה:"
+#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+msgid "Rotating"
+msgstr "סיבוב"
 
-#: src/Properties.vala:600
-msgid "Camera model:"
-msgstr "דגם המצלמה:"
+#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+msgid "Undoing Rotate"
+msgstr "ביטול הסיבוב"
 
-#: src/Properties.vala:603
-msgid "Flash:"
-msgstr "מבזק:"
+#: ../src/CollectionPage.vala:570
+msgid "Flipping Horizontally"
+msgstr "היפוך אופקי"
 
-#: src/Properties.vala:605
-msgid "Focal length:"
-msgstr "אורך מוקדי:"
+#: ../src/CollectionPage.vala:571
+msgid "Undoing Flip Horizontally"
+msgstr "ביטול היפוך אופקי"
 
-#: src/Properties.vala:608
-msgid "Exposure date:"
-msgstr "תאריך החשיפה:"
+#: ../src/CollectionPage.vala:580
+msgid "Flipping Vertically"
+msgstr "היפוך אנכי"
 
-#: src/Properties.vala:611
-msgid "Exposure time:"
-msgstr "זמן החשיפה:"
+#: ../src/CollectionPage.vala:581
+msgid "Undoing Flip Vertically"
+msgstr "ביטול היפוך אנכי"
 
-#: src/Properties.vala:614
-msgid "Exposure bias:"
-msgstr "הטיית חשיפה:"
+#: ../src/Commands.vala:733
+msgid "Reverting"
+msgstr "שחזור"
 
-#: src/Properties.vala:616
-msgid "GPS latitude:"
-msgstr "קו רוחב GPS:"
+#: ../src/Commands.vala:733
+msgid "Undoing Revert"
+msgstr "ביטול השחזור"
 
-#: src/Properties.vala:619
-msgid "GPS longitude:"
-msgstr "קו אורך GPS:"
+#: ../src/Commands.vala:777
+msgid "Enhancing"
+msgstr "שיפור"
 
-#: src/Properties.vala:622
-msgid "Artist:"
-msgstr "אמן:"
+#: ../src/Commands.vala:777
+msgid "Undoing Enhance"
+msgstr "ביטול השיפור"
 
-#: src/Properties.vala:624
-msgid "Copyright:"
-msgstr "זכויות יוצרים:"
+#: ../src/Commands.vala:853
+msgid "Applying Color Transformations"
+msgstr "החלת שינויי צבע"
 
-#: src/Properties.vala:626
-msgid "Software:"
-msgstr "תכנה:"
+#: ../src/Commands.vala:853
+msgid "Undoing Color Transformations"
+msgstr "ביטול שינויי צבע"
 
-#: src/Properties.vala:630 src/Dialogs.vala:1288
-msgid "Comment:"
-msgstr "הערה:"
+#: ../src/Commands.vala:1003
+msgid "Creating New Event"
+msgstr "יצירת אירוע חדש"
 
-#: src/Properties.vala:639
-msgid "Extended Information"
-msgstr "פרטים מורחבים"
+#: ../src/Commands.vala:1004
+msgid "Removing Event"
+msgstr "הסרת האירוע"
 
-#: src/Dialogs.vala:16
+#: ../src/Commands.vala:1013
+msgid "Moving Photos to New Event"
+msgstr "העברת תמונות לאירוע חדש"
+
+#: ../src/Commands.vala:1014
+msgid "Setting Photos to Previous Event"
+msgstr "הגדרת התמונות לאירוע הקודם"
+
+#: ../src/Commands.vala:1071
+msgid "Merging"
+msgstr "מיזוג"
+
+#: ../src/Commands.vala:1072
+msgid "Unmerging"
+msgstr "ביטול המיזוג"
+
+#: ../src/Commands.vala:1081
+msgid "Duplicating photos"
+msgstr "התמונות משוכפלות"
+
+#: ../src/Commands.vala:1081
+msgid "Removing duplicated photos"
+msgstr "הסרת תמונות משוכפלות"
+
+#: ../src/Commands.vala:1104
+#, 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] "לא ניתן לשכפל %d תמונות עקב שגיאות בקבצים"
+
+#: ../src/Commands.vala:1191
+msgid "Restoring previous rating"
+msgstr "הדירוג הקודם משוחזר"
+
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+msgid "Increasing ratings"
+msgstr "הדירוגים עולים"
+
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+msgid "Decreasing ratings"
+msgstr "הדירוגים יורדים"
+
+#: ../src/Commands.vala:1252
+msgid "Setting RAW developer"
+msgstr "הגדרת מתכנת RAW"
+
+#: ../src/Commands.vala:1252
+msgid "Restoring previous RAW developer"
+msgstr "מתכנת ה־RAW הקודם משוחזר"
+
+#: ../src/Commands.vala:1253
+msgid "Set Developer"
+msgstr "הגדרת מתכנת"
+
+#: ../src/Commands.vala:1343
+msgid "Original photo could not be adjusted."
+msgstr "לא ניתן להתאים את התמונה המקורית."
+
+#: ../src/Commands.vala:1364
+msgid "Adjusting Date and Time"
+msgstr "התאריך והשעה מכוונים"
+
+#: ../src/Commands.vala:1364
+msgid "Undoing Date and Time Adjustment"
+msgstr "כיוון התאריך והשעה מבוטלים"
+
+#: ../src/Commands.vala:1395
+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:1397 ../src/Commands.vala:1421
+msgid "Time Adjustment Error"
+msgstr "שגיאה בכיוון הזמן"
+
+#: ../src/Commands.vala:1419
+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:1633 ../src/Commands.vala:1656
+msgid "Create Tag"
+msgstr "יצירת תגית"
+
+#: ../src/Commands.vala:1691
+#, c-format
+msgid "Move Tag \"%s\""
+msgstr "העברת התגית „%s“"
+
+#: ../src/Commands.vala:2343
+msgid "Move Photos to Trash"
+msgstr "העברת תמונות לאשפה"
+
+#: ../src/Commands.vala:2343
+msgid "Restore Photos from Trash"
+msgstr "שחזור תמונות מהאשפה"
+
+#: ../src/Commands.vala:2344
+msgid "Move the photos to the Shotwell trash"
+msgstr "העברת התמונות לאשפה של Shotwell"
+
+#: ../src/Commands.vala:2344
+msgid "Restore the photos back to the Shotwell library"
+msgstr "שחזור תמונות מהאשפה של Shotwell"
+
+#: ../src/Commands.vala:2363
+msgid "Moving Photos to Trash"
+msgstr "תמונות מועברות לאשפה"
+
+#: ../src/Commands.vala:2363
+msgid "Restoring Photos From Trash"
+msgstr "תמונות משוחזרות מהאשפה"
+
+#: ../src/Commands.vala:2449
+msgid "Flag selected photos"
+msgstr "סימון התמונה הנבחרת בדגל"
+
+#: ../src/Commands.vala:2450
+msgid "Unflag selected photos"
+msgstr "ביטול הדגל לתמונה הנבחרת"
+
+#: ../src/Commands.vala:2451
+msgid "Flagging selected photos"
+msgstr "סימון תמונות נבחרות"
+
+#: ../src/Commands.vala:2452
+msgid "Unflagging selected photos"
+msgstr "ביטול סימון תמונות נבחרות"
+
+#: ../src/Commands.vala:2459
+msgid "Flag"
+msgstr "סימון בדגל"
+
+#: ../src/Commands.vala:2459
+msgid "Unflag"
+msgstr "ביטול הדגל"
+
+#: ../src/DesktopIntegration.vala:121
+#, c-format
+msgid "Unable to launch Nautilus Send-To: %s"
+msgstr "לא ניתן לטעון את Nautilus Send-To: ‏%s"
+
+#: ../src/DesktopIntegration.vala:129
+msgid "Send To"
+msgstr "שליחה אל"
+
+#: ../src/DesktopIntegration.vala:174
+#, c-format
+msgid "Unable to export background to %s: %s"
+msgstr "לא ניתן לייצא את הרקע אל %s:‏ %s"
+
+#: ../src/DesktopIntegration.vala:311
+#, c-format
+msgid "Unable to prepare desktop slideshow: %s"
+msgstr "לא ניתן להכין את מצגת שולחן העבודה: %s"
+
+#: ../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] "פעולה זו תסיר את התגית \"%s\" מתמונה %d. להמשיך?"
 msgstr[1] "פעולה זו תסיר את התגית \"%s\" מ־%d תמונות. להמשיך?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1361
-#: src/Dialogs.vala:1384 src/data_imports/DataImportsUI.vala:399
-#: src/AppWindow.vala:615 src/AppWindow.vala:636 src/AppWindow.vala:653
-#: src/publishing/PublishingUI.vala:498
-msgid "_Cancel"
-msgstr "_ביטול"
-
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1329
-#: src/Resources.vala:330 src/Resources.vala:378 src/Resources.vala:643
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
+#: ../src/Resources.vala:163 ../src/Resources.vala:369
+#: ../src/Resources.vala:417 ../src/Resources.vala:682
 msgid "_Delete"
 msgstr "מ_חיקה"
 
-#: src/Dialogs.vala:25
+#: ../src/Dialogs.vala:25
 #, c-format
 msgid "This will remove the saved search \"%s\".  Continue?"
 msgstr "פעולה זו תסיר את החיפוש השמור \"%s\".  להמשיך?"
 
-#: src/Dialogs.vala:35
-#, c-format
+#: ../src/Dialogs.vala:35
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
 "Shotwell"
@@ -657,15 +1435,20 @@ msgid_plural ""
 msgstr[0] "החלפת מפתחים תבטל את כל השינויים שביצעת בתמונה זו ב-Shotwell."
 msgstr[1] "החלפת מפתחים תבטל את כל השינויים שביצעת בתמונות אלו ב-Shotwell."
 
-#: src/Dialogs.vala:39
+#: ../src/Dialogs.vala:39
 msgid "_Switch Developer"
 msgstr "ה_חלף מפתח"
 
-#: src/Dialogs.vala:58
+#: ../src/Dialogs.vala:58
 msgid "Export Video"
 msgstr "יצוא וידאו"
 
-#: src/Dialogs.vala:115
+#. Ticket #3023
+#. Attempt to replace the system error with something friendlier
+#. if we can't copy an image over for editing in an external tool.
+#. Did we fail because we can't write to this directory?
+#. Yes - display an alternate error message here.
+#: ../src/Dialogs.vala:115
 #, c-format
 msgid ""
 "Shotwell couldn't create a file for editing this photo because you do not "
@@ -674,7 +1457,7 @@ msgstr ""
 "אין באפשרות Shotwell ליצור קובץ לעריכת תמונה זו כיוון שאין לך הרשאות לכתוב "
 "אל %s."
 
-#: src/Dialogs.vala:124
+#: ../src/Dialogs.vala:124
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -682,7 +1465,7 @@ msgstr ""
 "לא ניתן לייצא את התמונה הבאה עקב שגיאת קובץ.\n"
 "\n"
 
-#: src/Dialogs.vala:130
+#: ../src/Dialogs.vala:130
 msgid ""
 "\n"
 "\n"
@@ -692,98 +1475,113 @@ msgstr ""
 "\n"
 "האם ברצונך להמשיך ביצוא?"
 
-#: src/Dialogs.vala:131
-msgid "Con_tinue"
-msgstr "המ_שך"
-
-#: src/Dialogs.vala:147
+#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
+#. aren't formats so much as they are operating modes that determine specific formats.
+#. Hereafter we'll refer to these as "special formats."
+#: ../src/Dialogs.vala:147
 msgid "Unmodified"
 msgstr "ללא שינוי"
 
-#: src/Dialogs.vala:148
+#: ../src/Dialogs.vala:148
 msgid "Current"
 msgstr "נוכחי"
 
-#: src/Dialogs.vala:212
+#. layout controls
+#: ../src/Dialogs.vala:213
 msgid "_Format:"
 msgstr "מ_בנה:"
 
-#: src/Dialogs.vala:215
+#: ../src/Dialogs.vala:216
 msgid "_Quality:"
 msgstr "_איכות:"
 
-#: src/Dialogs.vala:218
+#: ../src/Dialogs.vala:219
 msgid "_Scaling constraint:"
 msgstr "_אילוץ שמירת יחס:"
 
-#: src/Dialogs.vala:221
-msgid " _pixels"
-msgstr " _פיקסלים"
+#: ../src/Dialogs.vala:222
+msgid "_Pixels:"
+msgstr "_פיקסלים:"
 
-#: src/Dialogs.vala:229
+#: ../src/Dialogs.vala:225
 msgid "Export metadata"
 msgstr "יצוא נתוני העל"
 
-#: src/Dialogs.vala:465
+#: ../src/Dialogs.vala:459
 msgid "Save Details..."
-msgstr "שמירת הפרטים..."
+msgstr "שמירת הפרטים…"
 
-#: src/Dialogs.vala:466
+#: ../src/Dialogs.vala:460
 msgid "Save Details"
 msgstr "שמירת הפרטים"
 
-#: src/Dialogs.vala:481
+#: ../src/Dialogs.vala:475
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(ועוד %d)\n"
 
-#: src/Dialogs.vala:534
+#: ../src/Dialogs.vala:528
 msgid "Import Results Report"
 msgstr "יבוא דוח התוצאות"
 
-#: src/Dialogs.vala:538
+#: ../src/Dialogs.vala:532
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "התבצע ניסיון לייבוא של קובץ אחד (%d)."
 msgstr[1] "התבצע ניסיון לייבוא של %d קבצים"
 
-#: src/Dialogs.vala:541
+#: ../src/Dialogs.vala:535
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
 msgstr[0] "מתוכם, קובץ אחד (%d) יובא בהצלחה."
 msgstr[1] "מתוכם, %d קבצים יובאו בהצלחה."
 
-#: src/Dialogs.vala:553
+#.
+#. Duplicates
+#.
+#: ../src/Dialogs.vala:547
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "קובצי וידאו/תמונות כפולים לא יובאו:"
 
-#: src/Dialogs.vala:557
+#: ../src/Dialogs.vala:551
 msgid "duplicates existing media item"
 msgstr "משכפל פריט מדיה קיים"
 
-#: src/Dialogs.vala:568
+#.
+#. Files Not Imported Due to Camera Errors
+#.
+#: ../src/Dialogs.vala:562
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "תמונות/סרטי וידאו לא יובאו עקב שגיאות מצלמה:"
 
-#: src/Dialogs.vala:571 src/Dialogs.vala:586 src/Dialogs.vala:601
-#: src/Dialogs.vala:617 src/Dialogs.vala:632 src/Dialogs.vala:646
+#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
+#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
 msgid "error message:"
 msgstr "הודעת שגיאה:"
 
-#: src/Dialogs.vala:582
+#.
+#. Files Not Imported Because They Weren't Recognized as Photos or Videos
+#.
+#: ../src/Dialogs.vala:576
 msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgstr "הקבצים לא יובאו כיוון שלא זוהו כתמונות או כסרטי וידאו:"
 
-#: src/Dialogs.vala:597
+#.
+#. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
+#.
+#: ../src/Dialogs.vala:591
 msgid ""
 "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
 "Understands:"
 msgstr ""
 "התמונות/סרטי הווידאו לא יובאו כיוון שהן במבנה שאין ל־Shotwell אפשרות להבין:"
 
-#: src/Dialogs.vala:612
+#.
+#. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
+#.
+#: ../src/Dialogs.vala:606
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
 "Library:"
@@ -791,7 +1589,7 @@ msgstr ""
 "התמונות/סרטי הווידאו לא יובאו כיוון ש־Shotwell נכשל בהעתקתם לספרייה הפנימית "
 "שלו:"
 
-#: src/Dialogs.vala:616
+#: ../src/Dialogs.vala:610
 #, c-format
 msgid ""
 "couldn't copy %s\n"
@@ -800,43 +1598,49 @@ msgstr ""
 "לא ניתן להעתיק את %s\n"
 "\tאל %s"
 
-#: src/Dialogs.vala:628
+#.
+#. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
+#.
+#: ../src/Dialogs.vala:622
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
-msgstr ""
+msgstr "תמונות/סרטי וידאו שלא יובאו עקב היותם מושחתים:"
 
-#: src/Dialogs.vala:643
+#.
+#. Photos/Videos Not Imported for Other Reasons
+#.
+#: ../src/Dialogs.vala:637
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "התמונות/סרטי הווידאו לא יובאו עקב סיבות שונות:"
 
-#: src/Dialogs.vala:663
+#: ../src/Dialogs.vala:657
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "תמונה משוכפלת אחת לא יובאה:\n"
 msgstr[1] "%d תמונות משוכפלות לא יובאו:\n"
 
-#: src/Dialogs.vala:666
+#: ../src/Dialogs.vala:660
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "קטע וידאו משוכפל אחד לא יובא:\n"
 msgstr[1] "%d קטעי וידאו משוכפלים לא יובאו:\n"
 
-#: src/Dialogs.vala:669
+#: ../src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "תמונה משוכפלת או קטע וידאו משוכפל לא יובאו:\n"
 msgstr[1] "%d תמונות/קטעי וידאו משוכפלים לא יובאו:\n"
 
-#: src/Dialogs.vala:683
+#: ../src/Dialogs.vala:677
 #, 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] "אירע כשל ביבוא אחת התמונות עקב שגיאת חומרה או קובץ:\n"
 msgstr[1] "אירע כשל ביבוא %d מהתמונות עקב שגיאת חומרה או קובץ:\n"
 
-#: src/Dialogs.vala:686
+#: ../src/Dialogs.vala:680
 #, 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"
@@ -844,7 +1648,7 @@ msgstr[0] "אירע כשל ביבוא אחד מקטעי הווידאו עקב ש
 msgstr[1] ""
 "אירע כשל ביבוא %d מהתמונות או מקטעי הווידאו עקב שגיאת חומרה או קובץ:\n"
 
-#: src/Dialogs.vala:689
+#: ../src/Dialogs.vala:683
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -853,14 +1657,14 @@ msgstr[0] ""
 "אירע כשל ביבוא אחת התמונות/אחד מקטעי הווידאו עקב שגיאת חומרה או קובץ:\n"
 msgstr[1] "אירע כשל ביבוא %d מהתמונות/קטעי הווידאו עקב שגיאת חומרה או קובץ:\n"
 
-#: src/Dialogs.vala:692
+#: ../src/Dialogs.vala:686
 #, 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] "יבוא של אחד הקבצים כשל עקב שגיאה בקובץ או בחומרה:\n"
 msgstr[1] "יבוא של %d מהקבצים נכשל עקב שגיאה בקובץ או בחומרה:\n"
 
-#: src/Dialogs.vala:706
+#: ../src/Dialogs.vala:700
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -874,7 +1678,7 @@ msgstr[1] ""
 "היבוא של %d התמונות נכשל כיוון שהתיקייה בה נמצאת ספריית התמונות אינה ניתנת "
 "לכתיבה:\n"
 
-#: src/Dialogs.vala:709
+#: ../src/Dialogs.vala:703
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -888,7 +1692,7 @@ msgstr[1] ""
 "היבוא של %d קטעי הווידאו נכשל כיוון שהתיקייה בה נמצאת ספריית התמונות אינה "
 "ניתנת לכתיבה:\n"
 
-#: src/Dialogs.vala:712
+#: ../src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -903,7 +1707,7 @@ msgstr[1] ""
 "היבוא של %d מהתמונות/מקטעי הווידאו נכשל כיוון שהתיקייה בה נמצאת ספריית "
 "התמונות אינה ניתנת לכתיבה:\n"
 
-#: src/Dialogs.vala:715
+#: ../src/Dialogs.vala:709
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -915,197 +1719,220 @@ msgstr[0] ""
 msgstr[1] ""
 "יבוא %d מהקבצים נכשל כיוון שתיקיית ספריית התמונות סגורה בפני כתיבה:\n"
 
-#: src/Dialogs.vala:729
+#: ../src/Dialogs.vala:723
 #, 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] "אירע כשל ביבוא אחת מהתמונות עקב שגיאה במצלמה:\n"
 msgstr[1] "אירע כשל ביבוא %d מהתמונות עקב שגיאה במצלמה:\n"
 
-#: src/Dialogs.vala:732
+#: ../src/Dialogs.vala:726
 #, 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] "אירע כשל ביבוא אחד מקטעי הווידאו עקב שגיאה במצלמה:\n"
 msgstr[1] "אירע כשל ביבוא %d מקטעי הווידאו עקב שגיאה במצלמה:\n"
 
-#: src/Dialogs.vala:735
+#: ../src/Dialogs.vala:729
 #, 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] "אירע כשל ביבוא אחת מהתמונות/אחד מקטעי הווידאו עקב שגיאה במצלמה:\n"
 msgstr[1] "אירע כשל ביבוא %d מהתמונות/קטעי הווידאו עקב שגיאה במצלמה:\n"
 
-#: src/Dialogs.vala:738
+#: ../src/Dialogs.vala:732
 #, 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] "יבוא אחד הקבצים נכשל עקב שגיאת מצלמה:\n"
 msgstr[1] "יבוא %d מהקבצים נכשל עקב שגיאת מצלמה:\n"
 
-#: src/Dialogs.vala:752
+#: ../src/Dialogs.vala:746
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ייבוא תמונה אחת נכשל היות והיא מושחתת:\n"
+msgstr[1] "ייבוא %d קבצים נכשל עקב היותם מושחתים:\n"
 
-#: src/Dialogs.vala:755
+#: ../src/Dialogs.vala:749
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ייבוא סרט וידאו אחד נכשל היות והיה מושחת:\n"
+msgstr[1] "ייבוא %d סרטי וידאו נכשל עקב היותם מושחתים:\n"
 
-#: src/Dialogs.vala:758
+#: ../src/Dialogs.vala:752
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ייבוא תמונה/סרט וידאו נכשל עקב היותו מושחת:\n"
+msgstr[1] "ייבוא %d תמונות/סרטי וידאו נכשל עקב היותם מושחתים:\n"
 
-#: src/Dialogs.vala:761
+#: ../src/Dialogs.vala:755
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ייבוא קובץ אחד נכשל עקב היותו מושחת:\n"
+msgstr[1] "ייבוא %d קבצים נכשל עקב היותם מושחתים:\n"
 
-#: src/Dialogs.vala:778
+#. we have no notion of "unsupported" video files right now in Shotwell (all
+#. standard container formats are supported, it's just that the streams in them
+#. might or might not be interpretable), so this message does not need to be
+#. media specific
+#: ../src/Dialogs.vala:772
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
 msgstr[0] "בוצע דילוג על תמונה אחת שאינה נתמכת:\n"
 msgstr[1] "בוצע דילוג על %d תמונות שאינן נתמכות:\n"
 
-#: src/Dialogs.vala:793
+#. we have no notion of "non-video" video files right now in Shotwell, so this
+#. message doesn't need to be media specific
+#: ../src/Dialogs.vala:787
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "בוצע דילוג על קובץ אחד שאינו תמונה.\n"
 msgstr[1] "בוצע דילוג על %d קבצים שאינם תמונה.\n"
 
-#: src/Dialogs.vala:804
+#: ../src/Dialogs.vala:798
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "בוצע דילוג על תמונה אחת עקב ביטול המשתמש:\n"
 msgstr[1] "בוצע דילוג על %d תמונות עקב ביטול המשתמש:\n"
 
-#: src/Dialogs.vala:807
+#: ../src/Dialogs.vala:801
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "בוצע דילוג על וידאו אחד עקב ביטול המשתמש:\n"
 msgstr[1] "בוצע דילוג על %d קטעי וידאו עקב ביטול המשתמש:\n"
 
-#: src/Dialogs.vala:810
+#: ../src/Dialogs.vala:804
 #, 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] "בוצע דילוג על תמונה אחת/וידאו אחד עקב ביטול המשתמש:\n"
 msgstr[1] "בוצע דילוג על %d תמונות/קטעי וידאו עקב ביטול המשתמש:\n"
 
-#: src/Dialogs.vala:813
+#: ../src/Dialogs.vala:807
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "קובץ אחד נפסח עקב ביטול המשתמש:\n"
 msgstr[1] "%d קבצים נפסחו עקב ביטול המשתמש:\n"
 
-#: src/Dialogs.vala:827
+#: ../src/Dialogs.vala:821
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "תמונה אחת יובאה בהצלחה.\n"
 msgstr[1] "%d תמונות יובאו בהצלחה.\n"
 
-#: src/Dialogs.vala:830
+#: ../src/Dialogs.vala:824
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "קטע וידאו אחד יובא בהצלחה.\n"
 msgstr[1] "%d קטעי וידאו יובאו בהצלחה.\n"
 
-#: src/Dialogs.vala:833
+#: ../src/Dialogs.vala:827
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
 msgstr[0] "תמונה אחת/וידאו אחד יובאו בהצלחה.\n"
 msgstr[1] "%d תמונות/קטעי וידאו יובאו בהצלחה.\n"
 
-#: src/Dialogs.vala:849
+#. if no media items were imported at all (i.e. an empty directory attempted), need to at least
+#. report that nothing was imported
+#: ../src/Dialogs.vala:843
 msgid "No photos or videos imported.\n"
 msgstr "לא יובאו כלל תמונות או קטעי וידאו.\n"
 
-#: src/Dialogs.vala:856 src/Dialogs.vala:875
+#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
 msgid "Import Complete"
 msgstr "היבוא הושלם"
 
-#: src/Dialogs.vala:1103
+#: ../src/Dialogs.vala:1155
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "שנייה אחת"
 msgstr[1] "%d שניות"
 
-#: src/Dialogs.vala:1106
+#: ../src/Dialogs.vala:1158
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "דקה אחת"
 msgstr[1] "%d דקות"
 
-#: src/Dialogs.vala:1110
+#: ../src/Dialogs.vala:1162
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "שעה אחת"
 msgstr[1] "%d שעות"
 
-#: src/Dialogs.vala:1113
+#: ../src/Dialogs.vala:1165
 msgid "1 day"
 msgstr "יום אחד"
 
-#: src/Dialogs.vala:1263 src/Resources.vala:205
+#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
 msgid "Rename Event"
 msgstr "שינוי שם האירוע"
 
-#: src/Dialogs.vala:1263
+#: ../src/Dialogs.vala:1315
 msgid "Name:"
 msgstr "שם:"
 
-#: src/Dialogs.vala:1273 src/Resources.vala:274
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
 msgid "Edit Title"
 msgstr "עריכת הכותרת"
 
-#: src/Dialogs.vala:1287 src/Resources.vala:280
+#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
+msgid "Title:"
+msgstr "כותרת:"
+
+#. Dialog title
+#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
 msgid "Edit Event Comment"
-msgstr ""
+msgstr "עריכת הערות האירוע"
 
-#: src/Dialogs.vala:1287
+#: ../src/Dialogs.vala:1344
 msgid "Edit Photo/Video Comment"
-msgstr ""
+msgstr "עריכת הערות תמונה/וידאו"
 
-#: src/Dialogs.vala:1304
-msgid "_Trash File"
-msgid_plural "_Trash Files"
-msgstr[0] "שליחת קובץ ל_אשפה"
-msgstr[1] "שליחת קבצים ל_אשפה"
+#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
+msgid "Comment:"
+msgstr "הערה:"
 
-#: src/Dialogs.vala:1308
-msgid "Only _Remove"
-msgstr "ה_סרה בלבד"
+#: ../src/Dialogs.vala:1361
+msgid "Remove and _Trash File"
+msgid_plural "Remove and _Trash Files"
+msgstr[0] "הסרת קובץ והשלכתו לא_שפה"
+msgstr[1] "הסרת קבצים והשלכתם לא_שפה"
 
-#: src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1365
+msgid "_Remove From Library"
+msgstr "ה_סרה מהספרייה"
+
+#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
+msgid "_Keep"
+msgstr "_שמירה"
+
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edit?"
 msgstr "האם לשחזר עריכות חיצוניות?"
 
-#: src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edits?"
 msgstr "האם לבטל את העריכות החיצוניות?"
 
-#: src/Dialogs.vala:1353
+#: ../src/Dialogs.vala:1410
 #, c-format
 msgid "This will destroy all changes made to the external file.  Continue?"
 msgid_plural ""
@@ -1113,87 +1940,87 @@ msgid_plural ""
 msgstr[0] "פעולה זו תשמיד את כל השינויים שבוצעו בקובץ החיצוני. להמשיך?"
 msgstr[1] "פעולה זו תשמיד את כל השינויים שבוצעו ב־%d קבצים חיצוניים. להמשיך?"
 
-#: src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edit"
 msgstr "_ביטול העריכות החיצונית"
 
-#: src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edits"
 msgstr "בי_טול העריכות החיצוניות"
 
-#: src/Dialogs.vala:1378
+#: ../src/Dialogs.vala:1435
 #, 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] "פעולה זו תסיר %d תמונות מהספרייה.  להמשיך?"
 
-#: src/Dialogs.vala:1385
+#: ../src/Dialogs.vala:1442 ../src/Resources.vala:178
 msgid "_Remove"
 msgstr "ה_סרה"
 
-#: src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photo From Library"
 msgstr "הסרת תמונות מהספרייה"
 
-#: src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photos From Library"
 msgstr "הסרת תמונות מהספרייה"
 
-#: src/Dialogs.vala:1479
+#: ../src/Dialogs.vala:1536
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1626
+#: ../src/Dialogs.vala:1688
 msgid "AM"
 msgstr "AM"
 
-#: src/Dialogs.vala:1627
+#: ../src/Dialogs.vala:1689
 msgid "PM"
 msgstr "PM"
 
-#: src/Dialogs.vala:1628
+#: ../src/Dialogs.vala:1690
 msgid "24 Hr"
 msgstr "24 שעות"
 
-#: src/Dialogs.vala:1643
+#: ../src/Dialogs.vala:1705
 msgid "_Shift photos/videos by the same amount"
 msgstr "ה_זחת התמונות/קטעי הווידאו באותו האופן"
 
-#: src/Dialogs.vala:1648
+#: ../src/Dialogs.vala:1710
 msgid "Set _all photos/videos to this time"
 msgstr "ה_גדרת כל התמונות/קטעי הווידאו למועד זה"
 
-#: src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo file"
 msgstr "שנה את קובץ התמונה ה_מקורית"
 
-#: src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo files"
 msgstr "שנה את קבצי התמונה ה_מקורית"
 
-#: src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original file"
 msgstr "_שינוי הקבצים המקוריים"
 
-#: src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original files"
 msgstr "_שינוי קובצי המקור"
 
-#: src/Dialogs.vala:1744
+#: ../src/Dialogs.vala:1806
 msgid "Original: "
 msgstr "מקור:"
 
-#: src/Dialogs.vala:1745
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d/%m/%Y, %H:%M:%S"
 
-#: src/Dialogs.vala:1746
+#: ../src/Dialogs.vala:1808
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d/%m/%Y, %I:%M:%S %p"
 
-#: src/Dialogs.vala:1835
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -1202,7 +2029,7 @@ msgstr ""
 "זמן החשיפה יוארך ב־\n"
 "%d %s, %d %s, %d %sו־ %d %s."
 
-#: src/Dialogs.vala:1836
+#: ../src/Dialogs.vala:1898
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -1211,31 +2038,31 @@ msgstr ""
 "זמן החשיפה יוקדם ב־\n"
 "%d %s, %d %s, %d %sו־ %d %s."
 
-#: src/Dialogs.vala:1838
+#: ../src/Dialogs.vala:1900
 msgid "day"
 msgid_plural "days"
 msgstr[0] "יום"
 msgstr[1] "ימים"
 
-#: src/Dialogs.vala:1839
+#: ../src/Dialogs.vala:1901
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "שעה"
 msgstr[1] "שעות"
 
-#: src/Dialogs.vala:1840
+#: ../src/Dialogs.vala:1902
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "דקה"
 msgstr[1] "דקות"
 
-#: src/Dialogs.vala:1841
+#: ../src/Dialogs.vala:1903
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "שנייה"
 msgstr[1] "שניות"
 
-#: src/Dialogs.vala:1885
+#: ../src/Dialogs.vala:1947
 #, c-format
 msgid ""
 "\n"
@@ -1254,87 +2081,91 @@ msgstr[1] ""
 "\n"
 "ו־%d נוספים."
 
-#: src/Dialogs.vala:1907 src/Dialogs.vala:1934
+#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
 msgid "Tags (separated by commas):"
 msgstr "תגיות (מופרדות בפסיקים):"
 
-#: src/Dialogs.vala:2014
+#: ../src/Dialogs.vala:2076
 msgid "Welcome!"
 msgstr "ברוך בואך!"
 
-#: src/Dialogs.vala:2021
-#, c-format
+#: ../src/Dialogs.vala:2083
 msgid "Welcome to Shotwell!"
 msgstr "ברוך בואך ל־Shotwell!"
 
-#: src/Dialogs.vala:2025
-#, c-format
+#: ../src/Dialogs.vala:2087
 msgid "To get started, import photos in any of these ways:"
 msgstr "כדי להתחיל יש לייבא תמונות באחת מהדרכים הבאות:"
 
-#: src/Dialogs.vala:2044
+#: ../src/Dialogs.vala:2106
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "יש לבחור ב<span weight=\"bold\">קובץ %s יבוא מתיקייה</span>"
 
-#: src/Dialogs.vala:2045
+#: ../src/Dialogs.vala:2107
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "לגרור ולהשליך תמונות לחלון של Shotwell"
 
-#: src/Dialogs.vala:2046
+#: ../src/Dialogs.vala:2108
 msgid "Connect a camera to your computer and import"
 msgstr "לחבר מצלמה למחשב שלך ולייבא ממנה"
 
-#: src/Dialogs.vala:2056
+#: ../src/Dialogs.vala:2118
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "י_בוא תמונות מתיקיית ה־%s שלך"
 
-#: src/Dialogs.vala:2063
+#: ../src/Dialogs.vala:2125
 msgid "You can also import photos in any of these ways:"
 msgstr "ניתן לייבא תמונות בכל אחת מהדרכים הבאות:"
 
-#: src/Dialogs.vala:2073
+#: ../src/Dialogs.vala:2135
 msgid "_Don't show this message again"
 msgstr "_אין להציג הודעה זו שוב"
 
-#: src/Dialogs.vala:2108
+#: ../src/Dialogs.vala:2170
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "יבוא תמונות מספריית ה־%s שלך"
 
-#: src/Dialogs.vala:2252 src/Dialogs.vala:2256
+#. We're installed system-wide, so use the system help.
+#. We're being run from the build directory; we'll have to handle clicks to this
+#. link manually ourselves, due to a limitation ghelp: URIs.
+#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
 msgid "(Help)"
 msgstr "(עזרה)"
 
-#: src/Dialogs.vala:2265
+#: ../src/Dialogs.vala:2324
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "שנה%sחודש%sיום"
 
-#: src/Dialogs.vala:2267
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth"
 msgstr "שנה%sחודש"
 
-#: src/Dialogs.vala:2269
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "שנה%sחודש-יום"
 
-#: src/Dialogs.vala:2271
+#: ../src/Dialogs.vala:2330
 msgid "Year-Month-Day"
 msgstr "שנה-חודש-יום"
 
-#: src/Dialogs.vala:2272 src/editing_tools/EditingTools.vala:777
+#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "התאמה אישית"
 
-#: src/Dialogs.vala:2509
+#. Invalid pattern.
+#: ../src/Dialogs.vala:2568
 msgid "Invalid pattern"
 msgstr "התבנית שגויה"
 
-#: src/Dialogs.vala:2612
+#. This function is used to determine whether or not files should be copied or linked when imported.
+#. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
+#: ../src/Dialogs.vala:2670
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -1342,31 +2173,31 @@ msgstr ""
 "באפשרות Shotwell להעתיק את התמונות לספרייה שלך או לייבא את התמונות מבלי "
 "להעתיק אותן."
 
-#: src/Dialogs.vala:2617
+#: ../src/Dialogs.vala:2675
 msgid "Co_py Photos"
 msgstr "ה_עתקת תמונות"
 
-#: src/Dialogs.vala:2618
+#: ../src/Dialogs.vala:2676
 msgid "_Import in Place"
 msgstr "יבוא ל_כאן"
 
-#: src/Dialogs.vala:2619
+#: ../src/Dialogs.vala:2677
 msgid "Import to Library"
 msgstr "יבוא לספרייה"
 
-#: src/Dialogs.vala:2629 src/PhotoPage.vala:3075
+#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
 msgid "Remove From Library"
 msgstr "הסרה מהספרייה"
 
-#: src/Dialogs.vala:2630 src/PhotoPage.vala:3075
+#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
 msgid "Removing Photo From Library"
 msgstr "הסרת תמונות מהספרייה"
 
-#: src/Dialogs.vala:2630
+#: ../src/Dialogs.vala:2688
 msgid "Removing Photos From Library"
 msgstr "התמונות מוסרות מהתיקייה"
 
-#: src/Dialogs.vala:2644
+#: ../src/Dialogs.vala:2702
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -1389,7 +2220,7 @@ msgstr[1] ""
 "\n"
 "לא ניתן לבטל פעולה זו."
 
-#: src/Dialogs.vala:2648
+#: ../src/Dialogs.vala:2706
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -1412,7 +2243,7 @@ msgstr[1] ""
 "\n"
 "לא ניתן לבטל פעולה זו."
 
-#: src/Dialogs.vala:2652
+#: ../src/Dialogs.vala:2710
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -1435,7 +2266,7 @@ msgstr[1] ""
 "\n"
 "לא ניתן לבטל פעולה זו."
 
-#: src/Dialogs.vala:2684
+#: ../src/Dialogs.vala:2742
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -1447,614 +2278,392 @@ msgstr[1] ""
 "לא ניתן להעביר %d תמונות/קטעי וידאו לאשפה של שולחן העבודה שלך.  האם למחוק "
 "קבצים אלו?"
 
-#: src/Dialogs.vala:2701
+#. Alert the user that the files were not removed.
+#: ../src/Dialogs.vala:2759
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
 msgstr[0] "לא ניתן למחוק את התמונה או את הווידאו."
 msgstr[1] "לא ניתן למחוק %d תמונות/קטעי וידאו."
 
-#: src/folders/Branch.vala:141
-msgid "Folders"
-msgstr "תיקיות"
+#: ../src/Dimensions.vala:23
+msgid "Width"
+msgstr "רוחב"
 
-#: src/tags/Branch.vala:127
-msgid "Tags"
-msgstr "תגיות"
+#: ../src/Dimensions.vala:26
+msgid "Height"
+msgstr "גובה"
 
-#: src/BatchImport.vala:26
-msgid "Success"
-msgstr "הצלחה"
+#. verify this is a directory
+#: ../src/DirectoryMonitor.vala:889
+#, c-format
+msgid "Unable to monitor %s: Not a directory (%s)"
+msgstr "לא ניתן לעקוב אחר %s: לא תיקייה (%s)"
 
-#: src/BatchImport.vala:29
-msgid "File error"
-msgstr "שגיאת קובץ"
+#. if no name, pretty up the start time
+#: ../src/Event.vala:751
+#, c-format
+msgid "Event %s"
+msgstr "האירוע %s"
 
-#: src/BatchImport.vala:32
-msgid "Unable to decode file"
-msgstr "לא ניתן לפענח את הקובץ"
+#: ../src/Exporter.vala:232
+#, c-format
+msgid "Unable to generate a temporary file for %s: %s"
+msgstr "לא ניתן ליצור את הקובץ הזמני עבור %s:‏ %s"
 
-#: src/BatchImport.vala:35
-msgid "Database error"
-msgstr "שגיאת מסד נתונים"
+#: ../src/Exporter.vala:299
+msgid "Exporting"
+msgstr "יצוא"
 
-#: src/BatchImport.vala:38
-msgid "User aborted import"
-msgstr "המשתמש ביטל את היבוא"
+#: ../src/Exporter.vala:317
+#, c-format
+msgid "File %s already exists.  Replace?"
+msgstr "הקובץ %s כבר קיים.  להחליף?"
 
-#: src/BatchImport.vala:41
-msgid "Not a file"
-msgstr "לא קובץ"
+#: ../src/Exporter.vala:319
+msgid "_Skip"
+msgstr "_דילוג"
 
-#: src/BatchImport.vala:44
-msgid "File already exists in database"
-msgstr "הקובץ כבר קיים במסד הנתונים"
+#: ../src/Exporter.vala:319
+msgid "_Replace"
+msgstr "ה_חלפה"
 
-#: src/BatchImport.vala:47
-msgid "Unsupported file format"
-msgstr "מבנה הקובץ אינו נתמך"
+#: ../src/Exporter.vala:319
+msgid "Replace _All"
+msgstr "החלפת ה_כול"
 
-#: src/BatchImport.vala:50
-msgid "Not an image file"
-msgstr "לא קובץ תמונה"
+#: ../src/Exporter.vala:319
+msgid "Export"
+msgstr "יצוא"
 
-#: src/BatchImport.vala:53
-msgid "Disk failure"
-msgstr "שגיאה בכונן"
+#: ../src/MediaMonitor.vala:400
+#, c-format
+msgid "Unable to process monitoring updates: %s"
+msgstr "לא ניתן לעבד את עדכוני המעקב: %s"
 
-#: src/BatchImport.vala:56
-msgid "Disk full"
-msgstr "הכונן מלא"
+#: ../src/MediaPage.vala:158
+msgid "Adjust the size of the thumbnails"
+msgstr "התאמת גודל התמונות הממוזערות"
 
-#: src/BatchImport.vala:59
-msgid "Camera error"
-msgstr "שגיאת מצלמה"
+#: ../src/MediaPage.vala:340 ../src/PhotoPage.vala:2593
+#: ../src/Resources.vala:188 ../src/direct/DirectPhotoPage.vala:174
+msgid "Zoom _In"
+msgstr "הת_קרבות"
 
-#: src/BatchImport.vala:62
-msgid "File write error"
-msgstr "שגיאת כתיבה לקובץ"
+#: ../src/MediaPage.vala:341
+msgid "Increase the magnification of the thumbnails"
+msgstr "הגדלת רמת התקריב בתמונות הממוזערות"
 
-#: src/BatchImport.vala:65
-msgid "Corrupt image file"
-msgstr ""
+#: ../src/MediaPage.vala:346 ../src/PhotoPage.vala:2599
+#: ../src/Resources.vala:189 ../src/direct/DirectPhotoPage.vala:180
+msgid "Zoom _Out"
+msgstr "התר_חקות"
+
+#: ../src/MediaPage.vala:347
+msgid "Decrease the magnification of the thumbnails"
+msgstr "הקטנת רמת התקריב בתמונות הממוזערות"
+
+#: ../src/MediaPage.vala:414
+msgid "Sort _Photos"
+msgstr "_סידור תמונות"
+
+#: ../src/MediaPage.vala:423
+msgid "_Play Video"
+msgstr "נגינת _וידאו"
+
+#: ../src/MediaPage.vala:424
+msgid "Open the selected videos in the system video player"
+msgstr "פתיחת קטעי הווידאו הנבחרים בנגן הווידאו של המערכת"
+
+#: ../src/MediaPage.vala:428 ../src/PhotoPage.vala:2642
+msgid "_Developer"
+msgstr "מ_תכנת"
+
+#: ../src/MediaPage.vala:440 ../src/camera/Branch.vala:99
+#: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
+#: ../src/photos/RawSupport.vala:303
+msgid "Camera"
+msgstr "מצלמה"
 
-#: src/BatchImport.vala:68
+#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:874
+msgid "_Titles"
+msgstr "_כותרות"
+
+#: ../src/MediaPage.vala:452 ../src/camera/ImportPage.vala:875
+msgid "Display the title of each photo"
+msgstr "הצגת הכותרת של כל תמונה"
+
+#: ../src/MediaPage.vala:457 ../src/events/EventsDirectoryPage.vala:130
+msgid "_Comments"
+msgstr "ה_ערות"
+
+#: ../src/MediaPage.vala:458
+msgid "Display the comment of each photo"
+msgstr "יש להציג הערה זו עבור כל תמונה"
+
+#: ../src/MediaPage.vala:469 ../src/library/LibraryWindow.vala:375
+msgid "Ta_gs"
+msgstr "ת_גיות"
+
+#: ../src/MediaPage.vala:470
+msgid "Display each photo's tags"
+msgstr "הצגת התגיות עבור כל תמונה"
+
+#: ../src/MediaPage.vala:486
+msgid "By _Title"
+msgstr "לפי _כותרת"
+
+#: ../src/MediaPage.vala:487
+msgid "Sort photos by title"
+msgstr "סידור התמונות לפי כותרת"
+
+#: ../src/MediaPage.vala:492
+msgid "By Exposure _Date"
+msgstr "לפי תאריך _חשיפה"
+
+#: ../src/MediaPage.vala:493
+msgid "Sort photos by exposure date"
+msgstr "דירוג התמונות לפי תאריך החשיפה"
+
+#: ../src/MediaPage.vala:498
+msgid "By _Rating"
+msgstr "לפי _דירוג"
+
+#: ../src/MediaPage.vala:499
+msgid "Sort photos by rating"
+msgstr "סידור התמונות לפי דירוג"
+
+#: ../src/MediaPage.vala:504
+msgid "By _Filename"
+msgstr "לפי _שם קובץ"
+
+#: ../src/MediaPage.vala:505
+msgid "Sort photos by filename"
+msgstr "מיון תמונות לפי שמות קבצים"
+
+#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:421
+msgid "_Ascending"
+msgstr "_עולה"
+
+#: ../src/MediaPage.vala:516 ../src/library/LibraryWindow.vala:422
+msgid "Sort photos in an ascending order"
+msgstr "סידור התמונות בסדר עולה"
+
+#: ../src/MediaPage.vala:521 ../src/library/LibraryWindow.vala:428
+msgid "D_escending"
+msgstr "_יורד"
+
+#: ../src/MediaPage.vala:522 ../src/library/LibraryWindow.vala:429
+msgid "Sort photos in a descending order"
+msgstr "סידור התמונות בסדר יורד"
+
+#: ../src/MediaPage.vala:723
 #, c-format
-msgid "Imported failed (%d)"
-msgstr "המיובאות כשלו (%d)"
+msgid ""
+"Shotwell was unable to play the selected video:\n"
+"%s"
+msgstr ""
+"לא הייתה באפשרות Shotwell לנגן את הווידאו הבא:\n"
+"%s"
+
+#: ../src/Page.vala:1263
+msgid "No photos/videos"
+msgstr "אין תמונות/קטעי וידאו"
 
-#: src/Photo.vala:3656
+#: ../src/Page.vala:1267
+msgid "No photos/videos found"
+msgstr "לא נמצאו תמונות/קטעי וידאו"
+
+#: ../src/Page.vala:2565
+msgid "Photos cannot be exported to this directory."
+msgstr "לא ניתן לייצא תמונות לתיקייה זו."
+
+#: ../src/Photo.vala:3753
 msgid "modified"
 msgstr "השתנתה"
 
-#: src/PhotoPage.vala:532
+#. previous button
+#: ../src/PhotoPage.vala:533
 msgid "Previous photo"
 msgstr "התמונה הקודמת"
 
-#: src/PhotoPage.vala:537
+#. next button
+#: ../src/PhotoPage.vala:539
 msgid "Next photo"
 msgstr "התמונה הבאה"
 
-#: src/PhotoPage.vala:1844
+#: ../src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "קובץ המקור לתמונה חסר: %s"
 
-#: src/PhotoPage.vala:2404 src/library/LibraryWindow.vala:360
-#: src/direct/DirectPhotoPage.vala:165
+#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
+#: ../src/library/LibraryWindow.vala:359
 msgid "_View"
 msgstr "ת_צוגה"
 
-#: src/PhotoPage.vala:2408 src/direct/DirectPhotoPage.vala:81
+#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
 msgid "T_ools"
 msgstr "_כלים"
 
-#: src/PhotoPage.vala:2413 src/direct/DirectPhotoPage.vala:86
+#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
 msgid "_Previous Photo"
 msgstr "התמונה ה_קודמת"
 
-#: src/PhotoPage.vala:2414 src/direct/DirectPhotoPage.vala:87
+#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
 msgid "Previous Photo"
 msgstr "התמונה הקודמת"
 
-#: src/PhotoPage.vala:2419 src/direct/DirectPhotoPage.vala:92
+#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
 msgid "_Next Photo"
 msgstr "התמונה ה_באה"
 
-#: src/PhotoPage.vala:2420 src/direct/DirectPhotoPage.vala:93
+#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
 msgid "Next Photo"
 msgstr "התמונה הבאה"
 
-#: src/PhotoPage.vala:2583 src/direct/DirectPhotoPage.vala:174
-#: src/MediaPage.vala:325
-msgid "Zoom _In"
-msgstr "הת_קרבות"
-
-#: src/PhotoPage.vala:2584 src/direct/DirectPhotoPage.vala:175
+#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
 msgid "Increase the magnification of the photo"
 msgstr "התקרבות לתמונה"
 
-#: src/PhotoPage.vala:2589 src/direct/DirectPhotoPage.vala:180
-#: src/MediaPage.vala:331
-msgid "Zoom _Out"
-msgstr "התר_חקות"
-
-#: src/PhotoPage.vala:2590 src/direct/DirectPhotoPage.vala:181
+#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
 msgid "Decrease the magnification of the photo"
 msgstr "התרחקות מהתמונה"
 
-#: src/PhotoPage.vala:2595 src/direct/DirectPhotoPage.vala:186
+#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
 msgid "Fit to _Page"
 msgstr "ה_תאמה לעמוד"
 
-#: src/PhotoPage.vala:2596 src/direct/DirectPhotoPage.vala:187
+#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
 msgid "Zoom the photo to fit on the screen"
 msgstr "הגדרת תקריב התמונה כך שתוצג במלואה במסך"
 
-#: src/PhotoPage.vala:2601 src/direct/DirectPhotoPage.vala:192
+#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
+#, no-c-format
 msgid "Zoom _100%"
 msgstr "תקריב _100%"
 
-#: src/PhotoPage.vala:2602 src/direct/DirectPhotoPage.vala:193
-#, fuzzy, c-format
+#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
+#, no-c-format
 msgid "Zoom the photo to 100% magnification"
-msgstr "הגדרת התקריב לכדי הגדלה של 100%"
+msgstr "הגדרת תקריב התמונה לכדי הגדלה של 100%"
 
-#: src/PhotoPage.vala:2607 src/direct/DirectPhotoPage.vala:198
+#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
+#, no-c-format
 msgid "Zoom _200%"
 msgstr "תקריב _200%"
 
-#: src/PhotoPage.vala:2608 src/direct/DirectPhotoPage.vala:199
-#, fuzzy, c-format
+#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
+#, no-c-format
 msgid "Zoom the photo to 200% magnification"
-msgstr "הגדרת התקריב לכדי הגדלה של 200%"
+msgstr "הגדרת תקריב התמונה לכדי הגדלה של 200%"
 
-#: src/PhotoPage.vala:2628 src/MediaPage.vala:413
-msgid "_Developer"
-msgstr "מ_תכנת"
-
-#: src/PhotoPage.vala:3216
+#: ../src/PhotoPage.vala:3231
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "לא ניתן לייצא את %s:‏ %s"
 
-#: src/data_imports/DataImportsPluginHost.vala:65
-#: src/data_imports/DataImportsPluginHost.vala:78
-#, c-format
-msgid "%s Database"
-msgstr "מסד נתונים %s"
-
-#: 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 "הייבוא מהמיקום %s לא יכול להימשך עקב השגיאה שאירעה:"
-
-#: src/data_imports/DataImportsPluginHost.vala:151
-msgid "To try importing from another service, select one from the above menu."
-msgstr "כדי לנסות לייבוא משירות אחר, נא לבחור באחר מהתפריט שלהלן."
-
-#: src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr "יבוא נתונים"
-
-#: 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 ""
-"אין לך שום תוספי יבוא נתונים פעילים.\n"
-"\n"
-"על מנת להשתמש בתכונת הייבוא מתוך יישום צריך שיהיה לך לפחות תוסף אחד של יבוא "
-"נתונים פעיל. ניתן להפעיל תוספים בדו־שיח ההעדפות."
-
-#: src/data_imports/DataImportsUI.vala:100
-msgid "Database file:"
-msgstr "קובץ מסד נתונים:"
-
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:899
-msgid "_Import"
-msgstr "י_בוא"
-
-#: src/data_imports/DataImportsUI.vala:216
-msgid "Import From Application"
-msgstr "יבוא מיישום"
-
-#: src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "יבוא מדיה מהמי_קום:"
-
-#: src/data_imports/DataImportsUI.vala:394
-#: src/publishing/PublishingUI.vala:493
-msgid "_Close"
-msgstr "_סגירה"
-
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:182
-msgid "Settings"
-msgstr "הגדרות"
-
-#: src/SlideshowPage.vala:141 src/Screensaver.vala:18
-msgid "Slideshow"
-msgstr "מצגת"
-
-#: src/SlideshowPage.vala:161
-msgid "Back"
-msgstr "הקודמת"
-
-#: src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "מעבר לתמונה הקודמת"
-
-#: src/SlideshowPage.vala:168 src/SlideshowPage.vala:273
-msgid "Pause"
-msgstr "השהייה"
-
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:274
-msgid "Pause the slideshow"
-msgstr "השהיית המצגת"
-
-#: src/SlideshowPage.vala:175
-msgid "Next"
-msgstr "הבאה"
-
-#: src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "מעבר לתמונה הבאה"
-
-#: src/SlideshowPage.vala:183
-msgid "Change slideshow settings"
-msgstr "שינוי הגדרות המצגת"
-
-#: src/SlideshowPage.vala:237
-msgid "All photo source files are missing."
-msgstr "כל קובצי המקור של התמונות חסרים."
-
-#: src/SlideshowPage.vala:269
-msgid "Play"
-msgstr "הצגה"
-
-#: src/SlideshowPage.vala:270
-msgid "Continue the slideshow"
-msgstr "המשך בהצגת המצגת"
-
-#: src/Commands.vala:733
-msgid "Reverting"
-msgstr "שחזור"
-
-#: src/Commands.vala:733
-msgid "Undoing Revert"
-msgstr "ביטול השחזור"
-
-#: src/Commands.vala:777
-msgid "Enhancing"
-msgstr "שיפור"
-
-#: src/Commands.vala:777
-msgid "Undoing Enhance"
-msgstr "ביטול השיפור"
-
-#: src/Commands.vala:845
-msgid "Applying Color Transformations"
-msgstr ""
-
-#: src/Commands.vala:845
-msgid "Undoing Color Transformations"
-msgstr ""
-
-#: src/Commands.vala:995
-msgid "Creating New Event"
-msgstr "יצירת אירוע חדש"
-
-#: src/Commands.vala:996
-msgid "Removing Event"
-msgstr "הסרת האירוע"
-
-#: src/Commands.vala:1005
-msgid "Moving Photos to New Event"
-msgstr "העברת תמונות לאירוע חדש"
-
-#: src/Commands.vala:1006
-msgid "Setting Photos to Previous Event"
-msgstr "הגדרת התמונות לאירוע הקודם"
-
-#: src/Commands.vala:1063
-msgid "Merging"
-msgstr "מיזוג"
-
-#: src/Commands.vala:1064
-msgid "Unmerging"
-msgstr "ביטול המיזוג"
-
-#: src/Commands.vala:1073
-msgid "Duplicating photos"
-msgstr "התמונות משוכפלות"
-
-#: src/Commands.vala:1073
-msgid "Removing duplicated photos"
-msgstr "הסרת תמונות משוכפלות"
-
-#: src/Commands.vala:1096
-#, 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] "לא ניתן לשכפל %d תמונות עקב שגיאות בקבצים"
-
-#: src/Commands.vala:1183
-msgid "Restoring previous rating"
-msgstr "הדירוג הקודם משוחזר"
-
-#: src/Commands.vala:1193 src/Commands.vala:1194
-msgid "Increasing ratings"
-msgstr "הדירוגים עולים"
-
-#: src/Commands.vala:1193 src/Commands.vala:1194
-msgid "Decreasing ratings"
-msgstr "הדירוגים יורדים"
-
-#: src/Commands.vala:1244
-msgid "Setting RAW developer"
-msgstr "הגדרת מתכנת RAW"
-
-#: src/Commands.vala:1244
-msgid "Restoring previous RAW developer"
-msgstr "מתכנת ה־RAW הקודם משוחזר"
-
-#: src/Commands.vala:1245
-msgid "Set Developer"
-msgstr "הגדרת מתכנת"
-
-#: src/Commands.vala:1335
-msgid "Original photo could not be adjusted."
-msgstr "לא ניתן להתאים את התמונה המקורית."
-
-#: src/Commands.vala:1356
-msgid "Adjusting Date and Time"
-msgstr "התאריך והשעה מכוונים"
-
-#: src/Commands.vala:1356
-msgid "Undoing Date and Time Adjustment"
-msgstr "כיוון התאריך והשעה מבוטלים"
-
-#: src/Commands.vala:1387
-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:1389 src/Commands.vala:1413
-msgid "Time Adjustment Error"
-msgstr "שגיאה בכיוון הזמן"
-
-#: src/Commands.vala:1411
-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:1625 src/Commands.vala:1648
-msgid "Create Tag"
-msgstr "יצירת תגית"
-
-#: src/Commands.vala:1683
-#, c-format
-msgid "Move Tag \"%s\""
-msgstr "העברת התגית „%s“"
-
-#: src/Commands.vala:2335
-msgid "Move Photos to Trash"
-msgstr "העברת תמונות לאשפה"
-
-#: src/Commands.vala:2335
-msgid "Restore Photos from Trash"
-msgstr "שחזור תמונות מהאשפה"
-
-#: src/Commands.vala:2336
-msgid "Move the photos to the Shotwell trash"
-msgstr "העברת התמונות לאשפה של Shotwell"
-
-#: src/Commands.vala:2336
-msgid "Restore the photos back to the Shotwell library"
-msgstr "שחזור תמונות מהאשפה של Shotwell"
-
-#: src/Commands.vala:2355
-msgid "Moving Photos to Trash"
-msgstr "תמונות מועברות לאשפה"
-
-#: src/Commands.vala:2355
-msgid "Restoring Photos From Trash"
-msgstr "תמונות משוחזרות מהאשפה"
-
-#: src/Commands.vala:2441
-msgid "Flag selected photos"
-msgstr "סימון התמונה הנבחרת בדגל"
-
-#: src/Commands.vala:2442
-msgid "Unflag selected photos"
-msgstr "ביטול הדגל לתמונה הנבחרת"
-
-#: src/Commands.vala:2443
-msgid "Flagging selected photos"
-msgstr ""
-
-#: src/Commands.vala:2444
-msgid "Unflagging selected photos"
-msgstr ""
-
-#: src/Commands.vala:2451
-msgid "Flag"
-msgstr "סימון בדגל"
-
-#: src/Commands.vala:2451
-msgid "Unflag"
-msgstr "ביטול הדגל"
-
-#: src/photos/RawSupport.vala:134
-msgid "RAW"
-msgstr "RAW"
-
-#: src/photos/RawSupport.vala:297 src/MediaPage.vala:420
-msgid "Shotwell"
-msgstr "Shotwell"
-
-#: src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr "BMP"
-
-#: src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
-
-#: src/photos/JfifSupport.vala:182
-#, c-format
-msgid "Low (%d%%)"
-msgstr "נמוכה (%d%%)"
-
-#: src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "בינונית (%d%%)"
-
-#: src/photos/JfifSupport.vala:188
-#, c-format
-msgid "High (%d%%)"
-msgstr "גבוהה (%d%%)"
-
-#: src/photos/JfifSupport.vala:191
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "מרבית (%d%%)"
-
-#: src/photos/PngSupport.vala:30
-msgid "PNG"
-msgstr "PNG"
-
-#: src/photos/TiffSupport.vala:86
-msgid "TIFF"
-msgstr "TIFF"
-
-#: src/Page.vala:1268
-msgid "No photos/videos"
-msgstr "אין תמונות/קטעי וידאו"
-
-#: src/Page.vala:1272
-msgid "No photos/videos found"
-msgstr "לא נמצאו תמונות/קטעי וידאו"
-
-#: src/Page.vala:2569
-msgid "Photos cannot be exported to this directory."
-msgstr "לא ניתן לייצא תמונות לתיקייה זו."
-
-#: src/MediaMonitor.vala:400
-#, c-format
-msgid "Unable to process monitoring updates: %s"
-msgstr "לא ניתן לעבד את עדכוני המעקב: %s"
-
-#: src/Printing.vala:255
+#: ../src/Printing.vala:255
 msgid "Fill the entire page"
 msgstr "מילוי העמוד כולו"
 
-#: src/Printing.vala:256
+#: ../src/Printing.vala:256
 msgid "2 images per page"
 msgstr "2 תמונות בעמוד"
 
-#: src/Printing.vala:257
+#: ../src/Printing.vala:257
 msgid "4 images per page"
 msgstr "4 תמונות בעמוד"
 
-#: src/Printing.vala:258
+#: ../src/Printing.vala:258
 msgid "6 images per page"
 msgstr "6 תמונות בעמוד"
 
-#: src/Printing.vala:259
+#: ../src/Printing.vala:259
 msgid "8 images per page"
 msgstr "8 תמונות בעמוד"
 
-#: src/Printing.vala:260
+#: ../src/Printing.vala:260
 msgid "16 images per page"
 msgstr "16 תמונות בעמוד"
 
-#: src/Printing.vala:261
+#: ../src/Printing.vala:261
 msgid "32 images per page"
 msgstr "32 תמונות בעמוד"
 
-#: src/Printing.vala:348
+#: ../src/Printing.vala:348
 msgid "in."
 msgstr "אינ׳"
 
-#: src/Printing.vala:349
+#: ../src/Printing.vala:349
 msgid "cm"
 msgstr "ס״מ"
 
-#: src/Printing.vala:817 src/editing_tools/EditingTools.vala:757
+#: ../src/Printing.vala:817 ../src/editing_tools/EditingTools.vala:761
 msgid "Wallet (2 x 3 in.)"
 msgstr "ארנק (2 x‏ 3 אינטש)"
 
-#: src/Printing.vala:820 src/editing_tools/EditingTools.vala:758
+#: ../src/Printing.vala:820 ../src/editing_tools/EditingTools.vala:762
 msgid "Notecard (3 x 5 in.)"
 msgstr "כרטיסייה (3 x‏ 5 אינטש)"
 
-#: src/Printing.vala:823 src/editing_tools/EditingTools.vala:759
+#: ../src/Printing.vala:823 ../src/editing_tools/EditingTools.vala:763
 msgid "4 x 6 in."
 msgstr "4 x‏ 6 אינטש"
 
-#: src/Printing.vala:826 src/editing_tools/EditingTools.vala:760
+#: ../src/Printing.vala:826 ../src/editing_tools/EditingTools.vala:764
 msgid "5 x 7 in."
 msgstr "5 x‏ 7 אינטש"
 
-#: src/Printing.vala:829 src/editing_tools/EditingTools.vala:761
+#: ../src/Printing.vala:829 ../src/editing_tools/EditingTools.vala:765
 msgid "8 x 10 in."
 msgstr "8 x‏ 10 אינטש"
 
-#: src/Printing.vala:832 src/editing_tools/EditingTools.vala:763
+#: ../src/Printing.vala:832 ../src/editing_tools/EditingTools.vala:767
 msgid "11 x 14 in."
 msgstr "11 x‏ 14 אינטש"
 
-#: src/Printing.vala:835 src/editing_tools/EditingTools.vala:765
+#: ../src/Printing.vala:835 ../src/editing_tools/EditingTools.vala:769
 msgid "16 x 20 in."
 msgstr "‏16 x‏ 20 אינטש"
 
-#: src/Printing.vala:841 src/editing_tools/EditingTools.vala:767
+#: ../src/Printing.vala:841 ../src/editing_tools/EditingTools.vala:771
 msgid "Metric Wallet (9 x 13 cm)"
 msgstr "9 x‏ 13 ס״מ"
 
-#: src/Printing.vala:844 src/editing_tools/EditingTools.vala:768
+#: ../src/Printing.vala:844 ../src/editing_tools/EditingTools.vala:772
 msgid "Postcard (10 x 15 cm)"
 msgstr "גלויה (10 x‏ 15 ס״מ)"
 
-#: src/Printing.vala:847 src/editing_tools/EditingTools.vala:769
+#: ../src/Printing.vala:847 ../src/editing_tools/EditingTools.vala:773
 msgid "13 x 18 cm"
 msgstr "13 x‏ 18 ס״מ"
 
-#: src/Printing.vala:850 src/editing_tools/EditingTools.vala:770
+#: ../src/Printing.vala:850 ../src/editing_tools/EditingTools.vala:774
 msgid "18 x 24 cm"
 msgstr "18 x‏ 24 ס״מ"
 
-#: src/Printing.vala:853 src/editing_tools/EditingTools.vala:772
+#: ../src/Printing.vala:853 ../src/editing_tools/EditingTools.vala:776
 msgid "20 x 30 cm"
 msgstr "20 x‏ 30 ס״מ"
 
-#: src/Printing.vala:856 src/editing_tools/EditingTools.vala:773
+#: ../src/Printing.vala:856 ../src/editing_tools/EditingTools.vala:777
 msgid "24 x 40 cm"
 msgstr "24 x‏ 40 ס״מ"
 
-#: src/Printing.vala:859 src/editing_tools/EditingTools.vala:774
+#: ../src/Printing.vala:859 ../src/editing_tools/EditingTools.vala:778
 msgid "30 x 40 cm"
 msgstr "30 x‏ 40 ס״מ"
 
-#: src/Printing.vala:875
+#: ../src/Printing.vala:875
 msgid "Image Settings"
 msgstr "הגדרות התמונה"
 
-#: src/Printing.vala:888
+#: ../src/Printing.vala:888
 msgid "Printing..."
 msgstr "הדפסה..."
 
-#: src/Printing.vala:908 src/Printing.vala:1111
+#: ../src/Printing.vala:908 ../src/Printing.vala:1111
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -2065,1522 +2674,1893 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
-msgstr "לא ניתן לפתוח/ליצור מסד נתוני תמונות %s: קוד השגיאה %d"
+#: ../src/Properties.vala:84
+msgid "Today"
+msgstr "היום"
 
-#: src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
-msgstr ""
-"לא ניתן לכתוב אל קובץ מסד נתוני התמונות:\n"
-" %s"
+#: ../src/Properties.vala:86
+msgid "Yesterday"
+msgstr "אתמול"
 
-#: src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
-msgstr ""
-"אירעה שגיאה במהלך הגישה לקובץ מסד הנתונים:\n"
-" %s\n"
-"\n"
-"השגיאה הייתה: \n"
-"%s"
+#: ../src/Properties.vala:227 ../src/camera/ImportPage.vala:312
+msgid "RAW+JPEG"
+msgstr "RAW+JPEG"
 
-#: src/VideoSupport.vala:464
-msgid "Export Videos"
-msgstr "יצוא קטעי וידאו"
+#: ../src/Properties.vala:343
+msgid "Items:"
+msgstr "פריטים:"
 
-#: src/DesktopIntegration.vala:118
+#: ../src/Properties.vala:346
 #, c-format
-msgid "Unable to launch Nautilus Send-To: %s"
-msgstr "לא ניתן לטעון את Nautilus Send-To: ‏%s"
-
-#: src/DesktopIntegration.vala:126
-msgid "Send To"
-msgstr "שליחה אל"
+msgid "%d Event"
+msgid_plural "%d Events"
+msgstr[0] "אירוע אחד"
+msgstr[1] "%d אירועים"
 
-#: src/DesktopIntegration.vala:171
+#: ../src/Properties.vala:353 ../src/events/EventDirectoryItem.vala:87
 #, c-format
-msgid "Unable to export background to %s: %s"
-msgstr "לא ניתן לייצא את הרקע אל %s:‏ %s"
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] "תמונה אחת"
+msgstr[1] "%d תמונות"
 
-#: src/DesktopIntegration.vala:299
+#: ../src/Properties.vala:355 ../src/events/EventDirectoryItem.vala:85
 #, c-format
-msgid "Unable to prepare desktop slideshow: %s"
-msgstr "לא ניתן להכין את מצגת שולחן העבודה: %s"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:587
-#: src/SearchFilter.vala:588 src/SearchFilter.vala:990
-msgid "Flagged"
-msgstr "סימון בדגל"
-
-#: src/library/TrashPage.vala:8
-msgid "Trash"
-msgstr "סל האשפה"
-
-#: src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "סל האשפה ריק"
-
-#: src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "מחיקה"
-
-#: src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-msgstr "התמונות נמחקות"
-
-#: src/library/OfflinePage.vala:8
-msgid "Missing Files"
-msgstr "קבצים חסרים"
-
-#: src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "מחיקה..."
-
-#: src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "היבוא האחרון"
-
-#: src/library/LibraryWindow.vala:301
-msgid "_Import From Folder..."
-msgstr "י_בוא מתיקייה..."
-
-#: src/library/LibraryWindow.vala:302
-msgid "Import photos from disk to library"
-msgstr "יבוא תמונות מהכונן לספרייה"
-
-#: src/library/LibraryWindow.vala:309
-msgid "Import From _Application..."
-msgstr "ייבוא מ_יישום..."
-
-#: src/library/LibraryWindow.vala:313
-msgid "Sort _Events"
-msgstr "מיון _אירועים"
-
-#: src/library/LibraryWindow.vala:323
-msgid "Empty T_rash"
-msgstr "פינוי ה_אשפה"
-
-#: src/library/LibraryWindow.vala:324
-msgid "Delete all photos in the trash"
-msgstr "מחיקת כל התמונות באשפה"
-
-#: src/library/LibraryWindow.vala:329
-msgid "View Eve_nt for Photo"
-msgstr "צפייה ב_אירוע עבור תמונה"
-
-#: src/library/LibraryWindow.vala:334
-msgid "_Find"
-msgstr "_חיפוש"
-
-#: src/library/LibraryWindow.vala:335
-msgid "Find photos and videos by search criteria"
-msgstr "חיפוש תמונות וקטעי וידאו לפי קריטריונים של חיפוש"
-
-#: src/library/LibraryWindow.vala:352 src/direct/DirectPhotoPage.vala:46
-msgid "_File"
-msgstr "_קובץ"
-
-#: src/library/LibraryWindow.vala:356 src/direct/DirectPhotoPage.vala:73
-msgid "_Edit"
-msgstr "ע_ריכה"
-
-#: src/library/LibraryWindow.vala:364 src/direct/DirectPhotoPage.vala:77
-msgid "_Photo"
-msgstr "_תמונה"
-
-#: src/library/LibraryWindow.vala:368
-msgid "_Photos"
-msgstr "_תמונות"
-
-#: src/library/LibraryWindow.vala:372
-msgid "Even_ts"
-msgstr "_אירועים"
-
-#: src/library/LibraryWindow.vala:376 src/MediaPage.vala:454
-msgid "Ta_gs"
-msgstr "ת_גיות"
-
-#: src/library/LibraryWindow.vala:380 src/direct/DirectPhotoPage.vala:169
-msgid "_Help"
-msgstr "ע_זרה"
-
-#: src/library/LibraryWindow.vala:391
-msgid "_Basic Information"
-msgstr "פרטים _בסיסיים"
-
-#: src/library/LibraryWindow.vala:392
-msgid "Display basic information for the selection"
-msgstr "הצגת פרטים בסיסיים עבור הבחירה"
-
-#: src/library/LibraryWindow.vala:397
-msgid "E_xtended Information"
-msgstr "_פרטים מורחבים"
-
-#: src/library/LibraryWindow.vala:398
-msgid "Display extended information for the selection"
-msgstr "הצגת פרטים מורחבים עבור הבחירה"
-
-#: src/library/LibraryWindow.vala:403
-msgid "_Search Bar"
-msgstr "_סרגל חיפוש"
-
-#: src/library/LibraryWindow.vala:404
-msgid "Display the search bar"
-msgstr "הצגת סרגל החיפוש"
-
-#: src/library/LibraryWindow.vala:409
-msgid "S_idebar"
-msgstr "סרגל _צד"
-
-#: src/library/LibraryWindow.vala:410
-msgid "Display the sidebar"
-msgstr "הצגת סרגל הצד"
-
-#: src/library/LibraryWindow.vala:422 src/MediaPage.vala:494
-msgid "_Ascending"
-msgstr "_עולה"
-
-#: src/library/LibraryWindow.vala:423 src/MediaPage.vala:495
-msgid "Sort photos in an ascending order"
-msgstr "סידור התמונות בסדר עולה"
-
-#: src/library/LibraryWindow.vala:429 src/MediaPage.vala:500
-msgid "D_escending"
-msgstr "_יורד"
-
-#: src/library/LibraryWindow.vala:430 src/MediaPage.vala:501
-msgid "Sort photos in a descending order"
-msgstr "סידור התמונות בסדר יורד"
+msgid "%d Video"
+msgid_plural "%d Videos"
+msgstr[0] "קטע וידאו אחד"
+msgstr[1] "%d קטעי וידאו"
 
-#: src/library/LibraryWindow.vala:668
-msgid "Import From Folder"
-msgstr "יבוא מתיקייה"
+#. display only one date if start and end are the same
+#: ../src/Properties.vala:377
+msgid "Date:"
+msgstr "תאריך:"
 
-#: src/library/LibraryWindow.vala:737
-msgid "Empty Trash"
-msgstr "פינוי האשפה"
+#. display only one time if start and end are the same
+#: ../src/Properties.vala:381
+msgid "Time:"
+msgstr "שעה:"
 
-#: src/library/LibraryWindow.vala:737
-msgid "Emptying Trash..."
-msgstr "האשפה מתרוקנת..."
+#. display time range
+#. display date range
+#: ../src/Properties.vala:384 ../src/Properties.vala:389
+msgid "From:"
+msgstr "מ־:"
 
-#: src/library/LibraryWindow.vala:896
-msgid "Shotwell is configured to import photos to your home directory.\n"
-msgstr "Shotwell מוגדרת לייבא תמונות לתיקיית הבית שלך.\n"
+#: ../src/Properties.vala:385 ../src/Properties.vala:390
+msgid "To:"
+msgstr "עד:"
 
-#: src/library/LibraryWindow.vala:899
-msgid "Library Location"
-msgstr "מיקום הספרייה"
+#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1890
+msgid "Size:"
+msgstr "גודל:"
 
-#: src/library/LibraryWindow.vala:912
-msgid "Photos cannot be imported from this directory."
-msgstr "לא ניתן לייבא תמונות לתיקייה זו."
+#: ../src/Properties.vala:404
+msgid "Duration:"
+msgstr "משך:"
 
-#: src/library/LibraryWindow.vala:1200
+#: ../src/Properties.vala:404
 #, c-format
-msgid "%s (%d%%)"
-msgstr "%s (%d%%)"
-
-#: src/library/LibraryWindow.vala:1244 src/library/LibraryWindow.vala:1255
-msgid "Updating library..."
-msgstr "הספרייה מתעדכנת..."
-
-#: src/library/LibraryWindow.vala:1261
-msgid "Preparing to auto-import photos..."
-msgstr "בהכנות ליבוא תמונות באופן אוטומטי...."
-
-#: src/library/LibraryWindow.vala:1266
-msgid "Auto-importing photos..."
-msgstr "התמונות מיובאות אוטומטית..."
-
-#: src/library/LibraryWindow.vala:1274
-msgid "Writing metadata to files..."
-msgstr "נתוני העל נכתבים לקבצים..."
-
-#: src/library/Branch.vala:37
-msgid "Library"
-msgstr "ספרייה"
+msgid "%.1f seconds"
+msgstr "%.1f שניות"
 
-#: src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "מתבצע יבוא..."
+#: ../src/Properties.vala:408
+msgid "Developer:"
+msgstr "מתכנת:"
 
-#: src/library/ImportQueuePage.vala:66
-msgid "_Stop Import"
-msgstr "ע_צירת היבוא"
+#. fit both on the top line, emit and move on
+#: ../src/Properties.vala:436 ../src/Properties.vala:440
+#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2258
+msgid "Exposure:"
+msgstr "חשיפה:"
 
-#: src/library/ImportQueuePage.vala:67
-msgid "Stop importing photos"
-msgstr "עצירת יבוא התמונות"
+#. nothing special to be done for now for Events
+#: ../src/Properties.vala:583
+msgid "Location:"
+msgstr "מיקום:"
 
-#: src/library/ImportQueuePage.vala:123
-msgid "Preparing to import..."
-msgstr "בהכנות ליבוא..."
+#: ../src/Properties.vala:586
+msgid "File size:"
+msgstr "גודל הקובץ:"
 
-#: src/library/ImportQueuePage.vala:150
-#, c-format
-msgid "Imported %s"
-msgstr "יובאו %s"
+#: ../src/Properties.vala:590
+msgid "Current Development:"
+msgstr "פיתוח נוכחי:"
 
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:413
-msgid "_Save"
-msgstr "_שמירה"
+#: ../src/Properties.vala:592
+msgid "Original dimensions:"
+msgstr "הממדים המקוריים:"
 
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "שמירת התמונה"
+#: ../src/Properties.vala:595
+msgid "Camera make:"
+msgstr "יצרן המצלמה:"
 
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "שמירה _בשם..."
+#: ../src/Properties.vala:598
+msgid "Camera model:"
+msgstr "דגם המצלמה:"
 
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "שמירת תמונה בשם אחר"
+#: ../src/Properties.vala:601
+msgid "Flash:"
+msgstr "מבזק:"
 
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "הדפסת התמונה במדפסת המחוברת למחשב שלך"
+#: ../src/Properties.vala:603
+msgid "Focal length:"
+msgstr "אורך מוקדי:"
 
-#: src/direct/DirectPhotoPage.vala:223
-#, c-format
-msgid "%s does not exist."
-msgstr "%s אינו קיים."
+#: ../src/Properties.vala:606
+msgid "Exposure date:"
+msgstr "תאריך החשיפה:"
 
-#: src/direct/DirectPhotoPage.vala:225
-#, c-format
-msgid "%s is not a file."
-msgstr "%s אינו סוג קובץ."
+#: ../src/Properties.vala:609
+msgid "Exposure time:"
+msgstr "זמן החשיפה:"
 
-#: src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr ""
-"ל־%s אין תמיכה במבנה הקובץ\n"
-"%s."
+#: ../src/Properties.vala:612
+msgid "Exposure bias:"
+msgstr "הטיית חשיפה:"
 
-#: src/direct/DirectPhotoPage.vala:413
-msgid "_Save a Copy"
-msgstr "שמירת _עותק"
+#: ../src/Properties.vala:614
+msgid "GPS latitude:"
+msgstr "קו רוחב GPS:"
 
-#: src/direct/DirectPhotoPage.vala:416
-#, c-format
-msgid "Lose changes to %s?"
-msgstr "האם לאבד את השינויים לקובץ %s?"
+#: ../src/Properties.vala:617
+msgid "GPS longitude:"
+msgstr "קו אורך GPS:"
 
-#: src/direct/DirectPhotoPage.vala:417
-msgid "Close _without Saving"
-msgstr "סגירה _ללא שמירה"
+#: ../src/Properties.vala:620
+msgid "Artist:"
+msgstr "אמן:"
 
-#: src/direct/DirectPhotoPage.vala:450
-#, c-format
-msgid "Error while saving to %s: %s"
-msgstr "שגיאה בעת השמירה אל %s: ‏%s"
+#: ../src/Properties.vala:622
+msgid "Copyright:"
+msgstr "זכויות יוצרים:"
 
-#: src/direct/DirectPhotoPage.vala:478 src/direct/DirectPhotoPage.vala:499
-msgid "Save As"
-msgstr "שמירה בשם"
+#: ../src/Properties.vala:624
+msgid "Software:"
+msgstr "תכנה:"
 
-#: src/DirectoryMonitor.vala:889
-#, c-format
-msgid "Unable to monitor %s: Not a directory (%s)"
-msgstr "לא ניתן לעקוב אחר %s: לא תיקייה (%s)"
+#: ../src/Properties.vala:639
+msgid "Extended Information"
+msgstr "פרטים מורחבים"
 
-#: src/Resources.vala:17
+#: ../src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "מנהל תמונות"
 
-#: src/Resources.vala:18
+#: ../src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "מציג תמונות"
 
-#: src/Resources.vala:27 plugins/shotwell-publishing/YouTubePublishing.vala:32
-#: plugins/shotwell-publishing/FlickrPublishing.vala:34
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:32
-#: plugins/shotwell-publishing/PicasaPublishing.vala:32
-#: plugins/shotwell-publishing/FacebookPublishing.vala:32
-#: plugins/shotwell-data-imports/FSpotImporter.vala:34
-msgid "Copyright 2009-2013 Yorba Foundation"
-msgstr "כל הזכויות שמורות 2009‏-2013 לעמותת יורבה"
-
-#: src/Resources.vala:144
+#: ../src/Resources.vala:144
 msgid "Rotate _Right"
 msgstr "סיבוב _ימינה"
 
-#: src/Resources.vala:145 src/Resources.vala:150
+#: ../src/Resources.vala:145 ../src/Resources.vala:150
 msgid "Rotate"
 msgstr "סיבוב"
 
-#: src/Resources.vala:146
+#: ../src/Resources.vala:146
 msgid "Rotate Right"
 msgstr "סיבוב ימינה"
 
-#: src/Resources.vala:147
+#: ../src/Resources.vala:147
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "סיבוב התמונות ימינה (לחיצה על Ctrl כדי לסובב שמאלה)"
 
-#: src/Resources.vala:149
+#: ../src/Resources.vala:149
 msgid "Rotate _Left"
 msgstr "סיבוב _שמאלה"
 
-#: src/Resources.vala:151
+#: ../src/Resources.vala:151
 msgid "Rotate Left"
 msgstr "סיבוב שמאלה"
 
-#: src/Resources.vala:152
+#: ../src/Resources.vala:152
 msgid "Rotate the photos left"
 msgstr "סיבוב התמונה שמאלה"
 
-#: src/Resources.vala:154
+#: ../src/Resources.vala:154
 msgid "Flip Hori_zontally"
 msgstr "היפוך או_פקית"
 
-#: src/Resources.vala:155
+#: ../src/Resources.vala:155
 msgid "Flip Horizontally"
 msgstr "היפוך אופקי"
 
-#: src/Resources.vala:157
+#: ../src/Resources.vala:157
 msgid "Flip Verti_cally"
 msgstr "היפוך א_נכי"
 
-#: src/Resources.vala:158
+#: ../src/Resources.vala:158
 msgid "Flip Vertically"
 msgstr "היפוך אנכי"
 
-#: src/Resources.vala:160
+#: ../src/Resources.vala:160
+msgid "_About"
+msgstr "על _אודות"
+
+#: ../src/Resources.vala:161
+msgid "_Apply"
+msgstr "ה_חלה"
+
+#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
+#: ../src/library/LibraryWindow.vala:355
+msgid "_Edit"
+msgstr "ע_ריכה"
+
+#: ../src/Resources.vala:165
+msgid "_Forward"
+msgstr "ה_בא"
+
+#: ../src/Resources.vala:166
+msgid "Fulls_creen"
+msgstr "מ_סך מלא"
+
+#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
+#: ../src/library/LibraryWindow.vala:379
+msgid "_Help"
+msgstr "ע_זרה"
+
+#: ../src/Resources.vala:168
+msgid "Leave _Fullscreen"
+msgstr "יציאה ממסך מ_לא"
+
+#: ../src/Resources.vala:169 ../src/Resources.vala:371
+msgid "_New"
+msgstr "_חדש"
+
+#: ../src/Resources.vala:170
+msgid "_Next"
+msgstr "ה_בא"
+
+#: ../src/Resources.vala:171
+msgid "_OK"
+msgstr "_אישור"
+
+#: ../src/Resources.vala:172
+msgid "_Play"
+msgstr "_ניגון"
+
+#: ../src/Resources.vala:173 ../src/Resources.vala:325
+msgid "_Preferences"
+msgstr "ה_עדפות"
+
+#: ../src/Resources.vala:174
+msgid "_Previous"
+msgstr "ה_קודם"
+
+#: ../src/Resources.vala:175
+msgid "_Print"
+msgstr "ה_דפסה"
+
+#: ../src/Resources.vala:176
+msgid "_Quit"
+msgstr "י_ציאה"
+
+#: ../src/Resources.vala:177
+msgid "_Refresh"
+msgstr "ר_ענון"
+
+#: ../src/Resources.vala:179
+msgid "_Revert"
+msgstr "ה_יפוך"
+
+#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save"
+msgstr "_שמירה"
+
+#: ../src/Resources.vala:181
+msgid "Save _As"
+msgstr "שמירה _בשם"
+
+#: ../src/Resources.vala:182
+msgid "Sort _Ascending"
+msgstr "מיון בסדר _עולה"
+
+#: ../src/Resources.vala:183
+msgid "Sort _Descending"
+msgstr "מיון בסדר יו_רד"
+
+#: ../src/Resources.vala:184
+msgid "_Stop"
+msgstr "ע_צירה"
+
+#: ../src/Resources.vala:185
+msgid "_Undelete"
+msgstr "_ביטול מחיקה"
+
+#: ../src/Resources.vala:186
+msgid "_Normal Size"
+msgstr "גודל _רגיל"
+
+#: ../src/Resources.vala:187
+msgid "Best _Fit"
+msgstr "התאמה הטובה _ביותר"
+
+#: ../src/Resources.vala:191
 msgid "_Enhance"
 msgstr "_שיפור"
 
-#: src/Resources.vala:161
+#: ../src/Resources.vala:192
 msgid "Enhance"
 msgstr "שיפור"
 
-#: src/Resources.vala:162
+#: ../src/Resources.vala:193
 msgid "Automatically improve the photo's appearance"
 msgstr "שיפור חזות התמונה אוטומטית"
 
-#: src/Resources.vala:164
+#: ../src/Resources.vala:195
 msgid "_Copy Color Adjustments"
-msgstr ""
+msgstr "ה_עתקת התאמות צבאים"
 
-#: src/Resources.vala:165
+#: ../src/Resources.vala:196
 msgid "Copy Color Adjustments"
-msgstr ""
+msgstr "העתקת התאמות צבעים"
 
-#: src/Resources.vala:166
+#: ../src/Resources.vala:197
 msgid "Copy the color adjustments applied to the photo"
-msgstr ""
+msgstr "העתקת התאמות הצבעים החלים על התמונה"
 
-#: src/Resources.vala:168
+#: ../src/Resources.vala:199
 msgid "_Paste Color Adjustments"
-msgstr ""
+msgstr "ה_דבקת התאמות צבעים"
 
-#: src/Resources.vala:169
+#: ../src/Resources.vala:200
 msgid "Paste Color Adjustments"
-msgstr ""
+msgstr "הדבקת התאמות צבעים"
 
-#: src/Resources.vala:170
+#: ../src/Resources.vala:201
 msgid "Apply copied color adjustments to the selected photos"
-msgstr ""
+msgstr "החלת העתקת התאמות הצבעים לתמונות הנבחרות"
 
-#: src/Resources.vala:172
+#: ../src/Resources.vala:203
 msgid "_Crop"
 msgstr "_חיתוך"
 
-#: src/Resources.vala:173
+#: ../src/Resources.vala:204
 msgid "Crop"
 msgstr "חיתוך"
 
-#: src/Resources.vala:174
+#: ../src/Resources.vala:205
 msgid "Crop the photo's size"
 msgstr "חיתוך גודל התמונה"
 
-#: src/Resources.vala:176 src/editing_tools/StraightenTool.vala:100
+#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
 msgid "_Straighten"
 msgstr "יי_שור"
 
-#: src/Resources.vala:177
+#: ../src/Resources.vala:208
 msgid "Straighten"
 msgstr "יישור"
 
-#: src/Resources.vala:178
+#: ../src/Resources.vala:209
 msgid "Straighten the photo"
 msgstr "יישור התמונה"
 
-#: src/Resources.vala:180
+#: ../src/Resources.vala:211
 msgid "_Red-eye"
 msgstr "_עיניים אדומות"
 
-#: src/Resources.vala:181
+#: ../src/Resources.vala:212
 msgid "Red-eye"
 msgstr "עיניים אדומות"
 
-#: src/Resources.vala:182
+#: ../src/Resources.vala:213
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "הפחתת או העלמת אפקטים של עיניים אדומות בתמונה"
 
-#: src/Resources.vala:184
+#: ../src/Resources.vala:215
 msgid "_Adjust"
 msgstr "ה_תאמה"
 
-#: src/Resources.vala:185
+#: ../src/Resources.vala:216
 msgid "Adjust"
 msgstr "התאמה"
 
-#: src/Resources.vala:186
+#: ../src/Resources.vala:217
 msgid "Adjust the photo's color and tone"
 msgstr "התאמת גוון וצבע התמונה"
 
-#: src/Resources.vala:188
+#: ../src/Resources.vala:219
 msgid "Re_vert to Original"
 msgstr "_שחזור למקור"
 
-#: src/Resources.vala:189
+#: ../src/Resources.vala:220
 msgid "Revert to Original"
 msgstr "שחזור למקור"
 
-#: src/Resources.vala:191
+#: ../src/Resources.vala:222
 msgid "Revert External E_dits"
 msgstr "ביטול עריכות _חיצוניות"
 
-#: src/Resources.vala:192
+#: ../src/Resources.vala:223
 msgid "Revert to the master photo"
 msgstr "שחזור לתמונה הראשית"
 
-#: src/Resources.vala:194
+#: ../src/Resources.vala:225
 msgid "Set as _Desktop Background"
 msgstr "הגדרה כ_רקע שולחן העבודה"
 
-#: src/Resources.vala:195
+#: ../src/Resources.vala:226
 msgid "Set selected image to be the new desktop background"
 msgstr "הגדרת התמונה הנבחרת כרקע החדש לשולחן העבודה"
 
-#: src/Resources.vala:196
+#: ../src/Resources.vala:227
 msgid "Set as _Desktop Slideshow..."
 msgstr "הגדרה כ_מצגת שולחן העבודה..."
 
-#: src/Resources.vala:198
+#: ../src/Resources.vala:229
 msgid "_Undo"
 msgstr "_ביטול"
 
-#: src/Resources.vala:199
+#: ../src/Resources.vala:230
 msgid "Undo"
 msgstr "ביטול"
 
-#: src/Resources.vala:201
+#: ../src/Resources.vala:232
 msgid "_Redo"
 msgstr "ביצוע _חוזר"
 
-#: src/Resources.vala:202
+#: ../src/Resources.vala:233
 msgid "Redo"
 msgstr "ביצוע חוזר"
 
-#: src/Resources.vala:204
+#: ../src/Resources.vala:235
 msgid "Re_name Event..."
 msgstr "החלפת _שם האירוע..."
 
-#: src/Resources.vala:207
+#: ../src/Resources.vala:238
 msgid "Make _Key Photo for Event"
 msgstr "הגדרה לתמונה המיי_צגת לאירוע"
 
-#: src/Resources.vala:208
+#: ../src/Resources.vala:239
 msgid "Make Key Photo for Event"
 msgstr "הגדרה לתמונה המייצגת לאירוע"
 
-#: src/Resources.vala:210
+#: ../src/Resources.vala:241
 msgid "_New Event"
 msgstr "_אירוע חדש"
 
-#: src/Resources.vala:211
+#: ../src/Resources.vala:242
 msgid "New Event"
 msgstr "אירוע חדש"
 
-#: src/Resources.vala:213
+#: ../src/Resources.vala:244
 msgid "Move Photos"
 msgstr "העברת תמונות"
 
-#: src/Resources.vala:214
+#: ../src/Resources.vala:245
 msgid "Move photos to an event"
 msgstr "העברת תמונות לאירוע"
 
-#: src/Resources.vala:216
+#: ../src/Resources.vala:247
 msgid "_Merge Events"
 msgstr "מי_זוג אירועים"
 
-#: src/Resources.vala:217
+#: ../src/Resources.vala:248
 msgid "Merge"
 msgstr "מיזוג"
 
-#: src/Resources.vala:218
+#: ../src/Resources.vala:249
 msgid "Combine events into a single event"
 msgstr "חבר ארועים לארוע בודד"
 
-#: src/Resources.vala:220
+#: ../src/Resources.vala:251
 msgid "_Set Rating"
 msgstr "ה_גדרת דירוג"
 
-#: src/Resources.vala:221
+#: ../src/Resources.vala:252
 msgid "Set Rating"
 msgstr "הגדרת דירוג"
 
-#: src/Resources.vala:222
+#: ../src/Resources.vala:253
 msgid "Change the rating of your photo"
 msgstr "שינוי הדירוג לתמונה שלך"
 
-#: src/Resources.vala:224
+#: ../src/Resources.vala:255
 msgid "_Increase"
 msgstr "ה_גדלה"
 
-#: src/Resources.vala:225
+#: ../src/Resources.vala:256
 msgid "Increase Rating"
 msgstr "הגדלת הדירוג"
 
-#: src/Resources.vala:227
+#: ../src/Resources.vala:258
 msgid "_Decrease"
 msgstr "ה_פחתה"
 
-#: src/Resources.vala:228
+#: ../src/Resources.vala:259
 msgid "Decrease Rating"
 msgstr "הפחתת הדירוג"
 
-#: src/Resources.vala:230
+#: ../src/Resources.vala:261
 msgid "_Unrated"
 msgstr "_ללא דירוג"
 
-#: src/Resources.vala:231
+#: ../src/Resources.vala:262
 msgid "Unrated"
 msgstr "אין דירוג"
 
-#: src/Resources.vala:232
+#: ../src/Resources.vala:263
 msgid "Rate Unrated"
 msgstr "ביטול הדירוג"
 
-#: src/Resources.vala:233
+#: ../src/Resources.vala:264
 msgid "Setting as unrated"
 msgstr "הגדרה כלא מדורגת"
 
-#: src/Resources.vala:234
+#: ../src/Resources.vala:265
 msgid "Remove any ratings"
 msgstr "הסרת כל הדירוגים"
 
-#: src/Resources.vala:236
+#: ../src/Resources.vala:267
 msgid "_Rejected"
 msgstr "ד_חויהה"
 
-#: src/Resources.vala:237
+#: ../src/Resources.vala:268
 msgid "Rejected"
 msgstr "נדחה"
 
-#: src/Resources.vala:238
+#: ../src/Resources.vala:269
 msgid "Rate Rejected"
 msgstr "דירוג דחויה"
 
-#: src/Resources.vala:239
+#: ../src/Resources.vala:270
 msgid "Setting as rejected"
 msgstr "דרג כדחויה"
 
-#: src/Resources.vala:240
+#: ../src/Resources.vala:271
 msgid "Set rating to rejected"
 msgstr "הגדרת הדירוג לדחויה"
 
-#: src/Resources.vala:242
+#: ../src/Resources.vala:273
 msgid "Rejected _Only"
 msgstr "נדחות _בלבד"
 
-#: src/Resources.vala:243
+#: ../src/Resources.vala:274
 msgid "Rejected Only"
 msgstr "הנדחות בלבד"
 
-#: src/Resources.vala:244
+#: ../src/Resources.vala:275
 msgid "Show only rejected photos"
 msgstr "הצגות התמונות שנדחו בלבד"
 
-#: src/Resources.vala:246
+#: ../src/Resources.vala:277
 msgid "All + _Rejected"
 msgstr "הכול + _דחויות"
 
-#: src/Resources.vala:247 src/Resources.vala:248
+#: ../src/Resources.vala:278 ../src/Resources.vala:279
 msgid "Show all photos, including rejected"
 msgstr "הצגת כל התמונות, לרבות אלו שנדחו"
 
-#: src/Resources.vala:250
+#: ../src/Resources.vala:281
 msgid "_All Photos"
 msgstr "_כל התמונות"
 
-#: src/Resources.vala:251 src/Resources.vala:252
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:283 ../src/Resources.vala:285
 msgid "Show all photos"
 msgstr "הצגת כל התמונות"
 
-#: src/Resources.vala:254
+#: ../src/Resources.vala:287
 msgid "_Ratings"
 msgstr "_דירוגים"
 
-#: src/Resources.vala:255
+#: ../src/Resources.vala:288
 msgid "Display each photo's rating"
 msgstr "הצגת הדירוג של כל תמונה"
 
-#: src/Resources.vala:257
+#: ../src/Resources.vala:290
 msgid "_Filter Photos"
 msgstr "_סינון תמונות"
 
-#: src/Resources.vala:258
+#: ../src/Resources.vala:291
 msgid "Filter Photos"
 msgstr "סינון תמונות"
 
-#: src/Resources.vala:259
+#: ../src/Resources.vala:292
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "הגבלת מספר התמונות המוצגות בהתאם למסנן"
 
-#: src/Resources.vala:261
+#: ../src/Resources.vala:294
 msgid "_Duplicate"
 msgstr "_שכפול"
 
-#: src/Resources.vala:262
+#: ../src/Resources.vala:295
 msgid "Duplicate"
 msgstr "שכפול"
 
-#: src/Resources.vala:263
+#: ../src/Resources.vala:296
 msgid "Make a duplicate of the photo"
 msgstr "שכפול התמונה"
 
-#: src/Resources.vala:265
+#: ../src/Resources.vala:298
 msgid "_Export..."
 msgstr "י_צוא..."
 
-#: src/Resources.vala:267
+#: ../src/Resources.vala:300
 msgid "_Print..."
 msgstr "ה_דפסה..."
 
-#: src/Resources.vala:269
+#: ../src/Resources.vala:302
 msgid "Pu_blish..."
 msgstr "פ_רסום..."
 
-#: src/Resources.vala:270
-msgid "Publish"
-msgstr "פרסום"
-
-#: src/Resources.vala:271
+#: ../src/Resources.vala:304
 msgid "Publish to various websites"
 msgstr "פרסום למגוון של אתרים"
 
-#: src/Resources.vala:273
+#: ../src/Resources.vala:306
 msgid "Edit _Title..."
 msgstr "_עריכת הכותרת..."
 
-#: src/Resources.vala:276
+#: ../src/Resources.vala:310
 msgid "Edit _Comment..."
 msgstr "ע_ריכת ההערה..."
 
-#: src/Resources.vala:277
+#. Button label
+#: ../src/Resources.vala:312
 msgid "Edit Comment"
 msgstr "עריכת ההערה"
 
-#: src/Resources.vala:279
+#: ../src/Resources.vala:314
 msgid "Edit Event _Comment..."
-msgstr ""
+msgstr "עריכת ה_ערת אירוע…"
 
-#: src/Resources.vala:282
+#: ../src/Resources.vala:317
 msgid "_Adjust Date and Time..."
 msgstr "_כיוון התאריך והשעה..."
 
-#: src/Resources.vala:283
+#: ../src/Resources.vala:318
 msgid "Adjust Date and Time"
 msgstr "כיוון תאריך ושעה"
 
-#: src/Resources.vala:285
+#: ../src/Resources.vala:320
 msgid "Add _Tags..."
 msgstr "הוספת _תגיות..."
 
-#: src/Resources.vala:286
+#: ../src/Resources.vala:321
 msgid "_Add Tags..."
 msgstr "_הוסף תגיות..."
 
-#: src/Resources.vala:287 src/Resources.vala:318
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:323 ../src/Resources.vala:356
 msgid "Add Tags"
 msgstr "הוספת תגיות"
 
-#: src/Resources.vala:289
-msgid "_Preferences"
-msgstr "ה_עדפות"
-
-#: src/Resources.vala:291
+#: ../src/Resources.vala:327
 msgid "Open With E_xternal Editor"
 msgstr "פתיחה בעורך _חיצוני"
 
-#: src/Resources.vala:293
+#: ../src/Resources.vala:329
 msgid "Open With RA_W Editor"
 msgstr "פתיחה באמצעות _עורך RAW"
 
-#: src/Resources.vala:295
+#: ../src/Resources.vala:331
 msgid "Send _To..."
 msgstr "שליחה _אל..."
 
-#: src/Resources.vala:296
+#: ../src/Resources.vala:332
 msgid "Send T_o..."
 msgstr "_שלח ל..."
 
-#: src/Resources.vala:298
+#: ../src/Resources.vala:334
 msgid "_Find..."
-msgstr "חיפוש..."
+msgstr "_חיפוש…"
 
-#: src/Resources.vala:299
+#: ../src/Resources.vala:335
 msgid "Find"
 msgstr "חיפוש"
 
-#: src/Resources.vala:300
+#: ../src/Resources.vala:336
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "חיפוש תמונה על ידי הקלדת הטקסט המופיע בשמה או בתגיות שלה"
 
-#: src/Resources.vala:302
+#: ../src/Resources.vala:338
 msgid "_Flag"
 msgstr "סימון ב_דגל"
 
-#: src/Resources.vala:304
+#: ../src/Resources.vala:340
 msgid "Un_flag"
 msgstr "_ביטול הדגל"
 
-#: src/Resources.vala:307
+#: ../src/Resources.vala:343
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "לא ניתן להפעיל את העורך: %s"
 
-#: src/Resources.vala:312
+#: ../src/Resources.vala:348
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "הוספת התגית \"%s\""
 
-#: src/Resources.vala:314
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:351
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "הוספת התגיות \"%s\" ו \"%s\""
 
-#: src/Resources.vala:322
+#: ../src/Resources.vala:361
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "מ_חיקת התגית \"%s\""
 
-#: src/Resources.vala:326
+#: ../src/Resources.vala:365
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "מחיקת התגית \"%s\""
 
-#: src/Resources.vala:329
+#: ../src/Resources.vala:368
 msgid "Delete Tag"
 msgstr "מחיקת תגית"
 
-#: src/Resources.vala:332
-msgid "_New"
-msgstr "_חדש"
-
-#: src/Resources.vala:335
+#: ../src/Resources.vala:374
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "_שינוי שם התגית \"%s\"..."
 
-#: src/Resources.vala:339
+#: ../src/Resources.vala:378
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "שינוי שם התגית \"%s\" ל־\"%s\""
 
-#: src/Resources.vala:342
+#: ../src/Resources.vala:381
 msgid "_Rename..."
 msgstr "_שינוי שם..."
 
-#: src/Resources.vala:344
+#: ../src/Resources.vala:383
 msgid "Modif_y Tags..."
 msgstr "ה_חלפת תגיות..."
 
-#: src/Resources.vala:345
+#: ../src/Resources.vala:384
 msgid "Modify Tags"
 msgstr "החלפת התגיות"
 
-#: src/Resources.vala:348
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "תיוג התמונות בתור \"%s\""
 
-#: src/Resources.vala:348
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "תיוג תמונות בתור \"%s\""
 
-#: src/Resources.vala:352
+#: ../src/Resources.vala:391
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "תיוג התמונות הנבחרות בתור \"%s\""
 
-#: src/Resources.vala:353
+#: ../src/Resources.vala:392
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "תיוג התמונות הנבחרות בתור \"%s\""
 
-#: src/Resources.vala:357
+#: ../src/Resources.vala:396
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "הסרת התגית \"%s\" מתמו_נות"
 
-#: src/Resources.vala:358
+#: ../src/Resources.vala:397
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "הסרת התגית \"%s\" מה_תמונות"
 
-#: src/Resources.vala:362
+#: ../src/Resources.vala:401
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "הסרת התגית \"%s\" מתמונות"
 
-#: src/Resources.vala:363
+#: ../src/Resources.vala:402
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "הסרת התגית \"%s\" מהתמונות"
 
-#: src/Resources.vala:367
+#: ../src/Resources.vala:406
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr "לא ניתן לשנות את שם התגית ל־\"%s\" כיוון שהתגית כבר קיימת."
 
-#: src/Resources.vala:371
+#: ../src/Resources.vala:410
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr "לא ניתן לשנות את שם החיפוש ל־\"%s\" כיוון שהחיפוש כבר קיים."
 
-#: src/Resources.vala:374
+#: ../src/Resources.vala:413
 msgid "Saved Search"
 msgstr "חיפוש שנשמר"
 
-#: src/Resources.vala:376
+#: ../src/Resources.vala:415
 msgid "Delete Search"
 msgstr "מחיקת החיפוש"
 
-#: src/Resources.vala:379
+#: ../src/Resources.vala:418
 msgid "_Edit..."
 msgstr "ע_ריכה..."
 
-#: src/Resources.vala:380
+#: ../src/Resources.vala:419
 msgid "Re_name..."
 msgstr "_שינוי שם..."
 
-#: src/Resources.vala:383
+#: ../src/Resources.vala:422
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "שינוי שם החיפוש \"%s\" לשם \"%s\""
 
-#: src/Resources.vala:387
+#: ../src/Resources.vala:426
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "מחיקת החיפוש \"%s\""
 
-#: src/Resources.vala:545
+#: ../src/Resources.vala:584
 #, c-format
 msgid "Rate %s"
 msgstr "דירוג %s"
 
-#: src/Resources.vala:546
+#: ../src/Resources.vala:585
 #, c-format
 msgid "Set rating to %s"
 msgstr "הגדרת הדירוג ל־%s"
 
-#: src/Resources.vala:547
+#: ../src/Resources.vala:586
 #, c-format
 msgid "Setting rating to %s"
 msgstr "הדירוג מוגדר ל־%s"
 
-#: src/Resources.vala:549
+#: ../src/Resources.vala:588
 #, c-format
 msgid "Display %s"
 msgstr "הצגת %s"
 
-#: src/Resources.vala:550
+#: ../src/Resources.vala:589
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "יש להציג תמונות בדירוג %s בלבד"
 
-#: src/Resources.vala:551
+#: ../src/Resources.vala:590
 #, c-format
 msgid "%s or Better"
 msgstr "%s ומעלה"
 
-#: src/Resources.vala:552
+#: ../src/Resources.vala:591
 #, c-format
 msgid "Display %s or Better"
 msgstr "הצגת %s ומעלה"
 
-#: src/Resources.vala:553
+#: ../src/Resources.vala:592
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "רק תמונות בעלות דירוג של %s ומעלה"
 
-#: src/Resources.vala:644
+#: ../src/Resources.vala:683
 msgid "Remove the selected photos from the trash"
 msgstr "הסרת התמונות הנבחרות מהאשפה"
 
-#: src/Resources.vala:645
+#: ../src/Resources.vala:684
 msgid "Remove the selected photos from the library"
 msgstr "הסרת התמונות הנבחרות מהספרייה."
 
-#: src/Resources.vala:647
+#: ../src/Resources.vala:686
 msgid "_Restore"
 msgstr "_שחזור"
 
-#: src/Resources.vala:648
+#: ../src/Resources.vala:687
 msgid "Move the selected photos back into the library"
 msgstr "העברת התמונות הנבחרות בחזרה לספרייה"
 
-#: src/Resources.vala:650
+#: ../src/Resources.vala:689
 msgid "Show in File Mana_ger"
 msgstr "הצ_גה במנהל הקבצים"
 
-#: src/Resources.vala:651
+#: ../src/Resources.vala:690
 msgid "Open the selected photo's directory in the file manager"
 msgstr "פתיחת תיקיית התמונה הנבחרת במנהל הקבצים"
 
-#: src/Resources.vala:654
+#: ../src/Resources.vala:693
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "לא ניתן לפתוח במנהל הקבצים: %s"
 
-#: src/Resources.vala:657
+#: ../src/Resources.vala:696
 msgid "R_emove From Library"
 msgstr "ה_סרה מהספרייה"
 
-#: src/Resources.vala:659
+#: ../src/Resources.vala:698
 msgid "_Move to Trash"
 msgstr "ה_עברה לאשפה"
 
-#: src/Resources.vala:661
+#: ../src/Resources.vala:700
 msgid "Select _All"
 msgstr "בחירת ה_כול"
 
-#: src/Resources.vala:662
+#: ../src/Resources.vala:701
 msgid "Select all items"
 msgstr "בחירת כל הפריטים"
 
-#: src/Resources.vala:740
+#. ...precache the timestamp string...
+#. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:780
 msgid "%-I:%M %p"
-msgstr ""
+msgstr "%-I:%M %p"
 
-#: src/Resources.vala:741
+#. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:785
 msgid "%-I:%M:%S %p"
-msgstr ""
+msgstr "%-I:%M:%S %p"
 
-#: src/Resources.vala:742
+#. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:789
 msgid "%a %b %d, %Y"
 msgstr "%a ה־%b ב%d, %Y"
 
-#: src/Resources.vala:743 src/Resources.vala:745
+#. / Locale-specific starting date format for multi-date strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#. / Locale-specific calendar date format for multi-month strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:794 ../src/Resources.vala:804
 msgid "%a %b %d"
 msgstr "%a ה־%d ב%b"
 
-#: src/Resources.vala:744
+#. / Locale-specific ending date format for multi-date strings,
+#. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:799
 msgid "%d, %Y"
 msgstr "%d %Y"
 
-#: src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr "זווית:"
+#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
+msgid "Slideshow"
+msgstr "מצגת"
 
-#: src/editing_tools/StraightenTool.vala:102
-#: src/editing_tools/EditingTools.vala:2204
-msgid "_Reset"
-msgstr "_איפוס"
+#. Flagged label and toggle
+#: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
+#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
+msgid "Flagged"
+msgstr "סימון בדגל"
+
+#: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
+msgid "Photos"
+msgstr "תמונות"
+
+#: ../src/SearchFilter.vala:599 ../src/SearchFilter.vala:600
+msgid "Videos"
+msgstr "קטעי וידאו"
+
+#: ../src/SearchFilter.vala:605
+msgid "RAW Photos"
+msgstr "תמונות גולמיות (RAW)"
+
+#: ../src/SearchFilter.vala:606
+msgid "RAW photos"
+msgstr "תמונות גולמיות (RAW)"
+
+#: ../src/SearchFilter.vala:934
+#, c-format
+msgid "Error loading UI file %s: %s"
+msgstr "שגיאה בטעינת קובץ מנשק המשתמש %s: %s"
+
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: ../src/SearchFilter.vala:945
+msgid "Close"
+msgstr "סגירה"
+
+#. Type label and toggles
+#: ../src/SearchFilter.vala:951
+msgid "Type"
+msgstr "סוג"
+
+#. Rating label and button
+#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
+msgid "Rating"
+msgstr "דירוג"
+
+#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
+msgid "Settings"
+msgstr "הגדרות"
+
+#. Set up toolbar
+#. add toolbar buttons
+#: ../src/SlideshowPage.vala:160
+msgid "Back"
+msgstr "הקודמת"
+
+#: ../src/SlideshowPage.vala:162
+msgid "Go to the previous photo"
+msgstr "מעבר לתמונה הקודמת"
+
+#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
+msgid "Pause"
+msgstr "השהייה"
+
+#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
+msgid "Pause the slideshow"
+msgstr "השהיית המצגת"
+
+#: ../src/SlideshowPage.vala:174
+msgid "Next"
+msgstr "הבאה"
+
+#: ../src/SlideshowPage.vala:176
+msgid "Go to the next photo"
+msgstr "מעבר לתמונה הבאה"
 
-#: src/editing_tools/EditingTools.vala:661
+#: ../src/SlideshowPage.vala:184
+msgid "Change slideshow settings"
+msgstr "שינוי הגדרות המצגת"
+
+#. An entire slideshow set might be missing, so check for a loop.
+#: ../src/SlideshowPage.vala:238
+msgid "All photo source files are missing."
+msgstr "כל קובצי המקור של התמונות חסרים."
+
+#: ../src/SlideshowPage.vala:270
+msgid "Play"
+msgstr "הצגה"
+
+#: ../src/SlideshowPage.vala:271
+msgid "Continue the slideshow"
+msgstr "המשך בהצגת המצגת"
+
+#: ../src/Tag.vala:817
+msgid "untitled"
+msgstr "ללא שם"
+
+#. multiple videos
+#: ../src/VideoSupport.vala:489
+msgid "Export Videos"
+msgstr "יצוא קטעי וידאו"
+
+#: ../src/camera/Branch.vala:85
+msgid "Cameras"
+msgstr "מצלמות"
+
+#: ../src/camera/ImportPage.vala:459
+msgid ""
+"Unable to unmount camera.  Try unmounting the camera from the file manager."
+msgstr "לא ניתן לנתק את המצלמה.  יש לנסות לנתק את המצלמה ממנהל הקבצים."
+
+#. hide duplicates checkbox
+#: ../src/camera/ImportPage.vala:776
+msgid "Hide photos already imported"
+msgstr "הסתרת תמונות שכבר יובאו"
+
+#: ../src/camera/ImportPage.vala:777
+msgid "Only display photos that have not been imported"
+msgstr "יש להציג תמונות שלא יובאו בלבד"
+
+#. Ticket #3304 - Import page shouldn't display confusing message
+#. prior to import.
+#. TODO: replace this with approved text for "talking to camera,
+#. please wait" once new strings are being accepted.
+#: ../src/camera/ImportPage.vala:847
+msgid "Starting import, please wait..."
+msgstr "הייבוא מתחיל, נא להמתין..."
+
+#: ../src/camera/ImportPage.vala:886
+msgid "Import _Selected"
+msgstr "יבוא ה_נבחרות"
+
+#: ../src/camera/ImportPage.vala:887
+msgid "Import the selected photos into your library"
+msgstr "יבוא התמונות הנבחרות לספרייה שלך"
+
+#: ../src/camera/ImportPage.vala:892
+msgid "Import _All"
+msgstr "יבוא ה_כול"
+
+#: ../src/camera/ImportPage.vala:893
+msgid "Import all the photos into your library"
+msgstr "יבוא כל התמונות לספרייה שלך"
+
+#. it's mounted, offer to unmount for the user
+#: ../src/camera/ImportPage.vala:1014
+msgid ""
+"Shotwell needs to unmount the camera from the filesystem in order to access "
+"it.  Continue?"
+msgstr "על Shotwell לנתק את המצלמה ממערכת הקבצים כדי לגשת אליה.  האם להמשיך?"
+
+#: ../src/camera/ImportPage.vala:1020
+msgid "_Unmount"
+msgstr "_ניתוק"
+
+#: ../src/camera/ImportPage.vala:1025
+msgid "Please unmount the camera."
+msgstr "נא לנתק את מערכת הקבצים של המצלמה."
+
+#: ../src/camera/ImportPage.vala:1030
+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 ""
+"המצלמה נעולה על ידי יישום אחר.  Shotwell יכולה לגשת למצלמה רק כאשר אינה "
+"נעולה.  נא לסגור כל יישום אחר המשתמש במצלמה ולנסות שוב."
+
+#: ../src/camera/ImportPage.vala:1040
+msgid "Please close any other application using the camera."
+msgstr "נא לסגור כל יישום אחר המשתמש במצלמה."
+
+#: ../src/camera/ImportPage.vala:1045
+#, c-format
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
+msgstr ""
+"לא ניתן לקבל את התצוגות המקדימות מהמצלמה:\n"
+"%s"
+
+#: ../src/camera/ImportPage.vala:1062
+msgid "Unmounting..."
+msgstr "מתבצע ניתוק..."
+
+#: ../src/camera/ImportPage.vala:1168
+msgid "Fetching photo information"
+msgstr "פרטי התמונה מתקבלים"
+
+#: ../src/camera/ImportPage.vala:1523
+#, c-format
+msgid "Fetching preview for %s"
+msgstr "התצוגה המקדימה עבור %s מתקבלת"
+
+#: ../src/camera/ImportPage.vala:1639
+#, c-format
+msgid "Unable to lock camera: %s"
+msgstr "לא ניתן לנעול את המצלמה: %s"
+
+#: ../src/camera/ImportPage.vala:1724
+#, c-format
+msgid "Delete this photo from camera?"
+msgid_plural "Delete these %d photos from camera?"
+msgstr[0] "האם למחוק תמונה זו מהמצלמה?"
+msgstr[1] "האם למחוק %d תמונות אלה מהמצלמה?"
+
+#: ../src/camera/ImportPage.vala:1727
+#, c-format
+msgid "Delete this video from camera?"
+msgid_plural "Delete these %d videos from camera?"
+msgstr[0] "האם למחוק קטע וידאו זה מהמצלמה?"
+msgstr[1] "האם למחוק %d קטעי וידאו אלה?"
+
+#: ../src/camera/ImportPage.vala:1730
+#, c-format
+msgid "Delete this photo/video from camera?"
+msgid_plural "Delete these %d photos/videos from camera?"
+msgstr[0] "האם למחוק תמונה/וידאו אלו  מהמצלמה?"
+msgstr[1] "האם למחוק %d תמונות/קטעי וידאו אלו מהמצלמה?"
+
+#: ../src/camera/ImportPage.vala:1733
+#, c-format
+msgid "Delete these files from camera?"
+msgid_plural "Delete these %d files from camera?"
+msgstr[0] "האם למחוק קובץ זה מהמצלמה?"
+msgstr[1] "האם למחוק %d קבצים אלה מהמצלמה?"
+
+#: ../src/camera/ImportPage.vala:1760
+msgid "Removing photos/videos from camera"
+msgstr "התמונות/קטעי הווידאו מוסרים מהמצלמה"
+
+#: ../src/camera/ImportPage.vala:1764
+#, 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] "לא ניתן למחוק %d תמונות/קטעי וידאו מהמצלמה עקב שגיאות."
+
+#: ../src/data_imports/DataImports.vala:22
+msgid "Data Imports"
+msgstr "יבוא נתונים"
+
+#. Send an empty job to the queue to mark the end of the import
+#: ../src/data_imports/DataImportsPluginHost.vala:65
+#: ../src/data_imports/DataImportsPluginHost.vala:78
+#, c-format
+msgid "%s Database"
+msgstr "מסד נתונים %s"
+
+#: ../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 "הייבוא מהמיקום %s לא יכול להימשך עקב השגיאה שאירעה:"
+
+#: ../src/data_imports/DataImportsPluginHost.vala:151
+msgid "To try importing from another service, select one from the above menu."
+msgstr "כדי לנסות לייבוא משירות אחר, נא לבחור באחר מהתפריט שלהלן."
+
+#: ../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 ""
+"אין לך שום תוספי יבוא נתונים פעילים.\n"
+"\n"
+"על מנת להשתמש בתכונת הייבוא מתוך יישום צריך שיהיה לך לפחות תוסף אחד של יבוא "
+"נתונים פעיל. ניתן להפעיל תוספים בדו־שיח ההעדפות."
+
+#: ../src/data_imports/DataImportsUI.vala:100
+msgid "Database file:"
+msgstr "קובץ מסד נתונים:"
+
+#: ../src/data_imports/DataImportsUI.vala:112
+#: ../src/library/LibraryWindow.vala:898
+msgid "_Import"
+msgstr "י_בוא"
+
+#: ../src/data_imports/DataImportsUI.vala:217
+msgid "Import From Application"
+msgstr "יבוא מיישום"
+
+#: ../src/data_imports/DataImportsUI.vala:369
+#: ../src/publishing/PublishingUI.vala:470
+msgid "_Close"
+msgstr "_סגירה"
+
+#: ../src/db/DatabaseTable.vala:37
+#, c-format
+msgid "Unable to open/create photo database %s: error code %d"
+msgstr "לא ניתן לפתוח/ליצור מסד נתוני תמונות %s: קוד השגיאה %d"
+
+#: ../src/db/DatabaseTable.vala:46
+#, c-format
+msgid ""
+"Unable to write to photo database file:\n"
+" %s"
+msgstr ""
+"לא ניתן לכתוב אל קובץ מסד נתוני התמונות:\n"
+" %s"
+
+#: ../src/db/DatabaseTable.vala:48
+#, c-format
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
+msgstr ""
+"אירעה שגיאה במהלך הגישה לקובץ מסד הנתונים:\n"
+" %s\n"
+"\n"
+"השגיאה הייתה: \n"
+"%s"
+
+#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:351
+msgid "_File"
+msgstr "_קובץ"
+
+#: ../src/direct/DirectPhotoPage.vala:52
+msgid "Save photo"
+msgstr "שמירת התמונה"
+
+#: ../src/direct/DirectPhotoPage.vala:57
+msgid "Save _As..."
+msgstr "שמירה _בשם..."
+
+#: ../src/direct/DirectPhotoPage.vala:58
+msgid "Save photo with a different name"
+msgstr "שמירת תמונה בשם אחר"
+
+#: ../src/direct/DirectPhotoPage.vala:69
+msgid "Print the photo to a printer connected to your computer"
+msgstr "הדפסת התמונה במדפסת המחוברת למחשב שלך"
+
+#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:363
+msgid "_Photo"
+msgstr "_תמונה"
+
+#: ../src/direct/DirectPhotoPage.vala:227
+#, c-format
+msgid "%s does not exist."
+msgstr "%s אינו קיים."
+
+#: ../src/direct/DirectPhotoPage.vala:229
+#, c-format
+msgid "%s is not a file."
+msgstr "%s אינו סוג קובץ."
+
+#: ../src/direct/DirectPhotoPage.vala:231
+#, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
+msgstr ""
+"ל־%s אין תמיכה במבנה הקובץ\n"
+"%s."
+
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save a Copy"
+msgstr "שמירת _עותק"
+
+#: ../src/direct/DirectPhotoPage.vala:425
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "האם לאבד את השינויים לקובץ %s?"
+
+#: ../src/direct/DirectPhotoPage.vala:426
+msgid "Close _without Saving"
+msgstr "סגירה _ללא שמירה"
+
+#: ../src/direct/DirectPhotoPage.vala:459
+#, c-format
+msgid "Error while saving to %s: %s"
+msgstr "שגיאה בעת השמירה אל %s: ‏%s"
+
+#: ../src/direct/DirectPhotoPage.vala:487
+#: ../src/direct/DirectPhotoPage.vala:508
+msgid "Save As"
+msgstr "שמירה בשם"
+
+#: ../src/editing_tools/EditingTools.vala:665
 msgid "Return to current photo dimensions"
 msgstr "חזרה לממדי התמונה המקוריים"
 
-#: src/editing_tools/EditingTools.vala:664
+#: ../src/editing_tools/EditingTools.vala:668
 msgid "Set the crop for this photo"
 msgstr "הגדרת החיתוך לתמונה זו"
 
-#: src/editing_tools/EditingTools.vala:676
+#: ../src/editing_tools/EditingTools.vala:680
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "הטיית ריבוע החיתוך בין הגדרת כיווניות לאורך לבין הגדרת כיוונית לרוחב"
 
-#: src/editing_tools/EditingTools.vala:749
+#: ../src/editing_tools/EditingTools.vala:753
 msgid "Unconstrained"
 msgstr "ללא קיבוע"
 
-#: src/editing_tools/EditingTools.vala:750
+#: ../src/editing_tools/EditingTools.vala:754
 msgid "Square"
 msgstr "ריבוע"
 
-#: src/editing_tools/EditingTools.vala:751
+#: ../src/editing_tools/EditingTools.vala:755
 msgid "Screen"
 msgstr "מסך"
 
-#: src/editing_tools/EditingTools.vala:752
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
-msgid "Original Size"
-msgstr "הגודל המקורי"
-
-#: src/editing_tools/EditingTools.vala:753
-#: src/editing_tools/EditingTools.vala:756
-#: src/editing_tools/EditingTools.vala:766
-#: src/editing_tools/EditingTools.vala:776
+#: ../src/editing_tools/EditingTools.vala:757
+#: ../src/editing_tools/EditingTools.vala:760
+#: ../src/editing_tools/EditingTools.vala:770
+#: ../src/editing_tools/EditingTools.vala:780
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:754
+#: ../src/editing_tools/EditingTools.vala:758
 msgid "SD Video (4 : 3)"
 msgstr "וידאו SD‏ (4 : 3)"
 
-#: src/editing_tools/EditingTools.vala:755
+#: ../src/editing_tools/EditingTools.vala:759
 msgid "HD Video (16 : 9)"
 msgstr "וידאו HD‏ (16 : 9)"
 
-#: src/editing_tools/EditingTools.vala:762
+#: ../src/editing_tools/EditingTools.vala:766
 msgid "Letter (8.5 x 11 in.)"
 msgstr "Letter (8.5 x 11 אינץ')"
 
-#: src/editing_tools/EditingTools.vala:764
+#: ../src/editing_tools/EditingTools.vala:768
 msgid "Tabloid (11 x 17 in.)"
 msgstr "Tabloid (11 x 17 אינץ')"
 
-#: src/editing_tools/EditingTools.vala:771
+#: ../src/editing_tools/EditingTools.vala:775
 msgid "A4 (210 x 297 mm)"
 msgstr "A4 (210 x 297 מ\"מ)"
 
-#: src/editing_tools/EditingTools.vala:775
+#: ../src/editing_tools/EditingTools.vala:779
 msgid "A3 (297 x 420 mm)"
 msgstr "A3 (297 x 420 מ\"מ)"
 
-#: src/editing_tools/EditingTools.vala:1865
+#: ../src/editing_tools/EditingTools.vala:1905
 msgid "Close the red-eye tool"
 msgstr "סגירת הכלי לעיניים אדומות"
 
-#: src/editing_tools/EditingTools.vala:1868
+#: ../src/editing_tools/EditingTools.vala:1908
 msgid "Remove any red-eye effects in the selected region"
 msgstr "הסרת אפקטים של עין אדומה באזור הנבחר"
 
-#: src/editing_tools/EditingTools.vala:2226
+#: ../src/editing_tools/EditingTools.vala:2244
+#: ../src/editing_tools/StraightenTool.vala:102
+msgid "_Reset"
+msgstr "_איפוס"
+
+#: ../src/editing_tools/EditingTools.vala:2266
 msgid "Saturation:"
 msgstr "רוויה:"
 
-#: src/editing_tools/EditingTools.vala:2234
+#: ../src/editing_tools/EditingTools.vala:2274
 msgid "Tint:"
 msgstr "גוון:"
 
-#: src/editing_tools/EditingTools.vala:2243
+#: ../src/editing_tools/EditingTools.vala:2283
 msgid "Temperature:"
 msgstr "טמפרטורה:"
 
-#: src/editing_tools/EditingTools.vala:2251
+#: ../src/editing_tools/EditingTools.vala:2291
 msgid "Shadows:"
 msgstr "צללים:"
 
-#: src/editing_tools/EditingTools.vala:2259
+#: ../src/editing_tools/EditingTools.vala:2299
 msgid "Highlights:"
-msgstr ""
+msgstr "הדגשה:"
 
-#: src/editing_tools/EditingTools.vala:2313
+#: ../src/editing_tools/EditingTools.vala:2353
 msgid "Reset Colors"
 msgstr "איפוס הצבעים"
 
-#: src/editing_tools/EditingTools.vala:2313
+#: ../src/editing_tools/EditingTools.vala:2353
 msgid "Reset all color adjustments to original"
 msgstr "איפוס כל ההתאמות לצבע המקורי"
 
-#: src/editing_tools/EditingTools.vala:2665
+#: ../src/editing_tools/EditingTools.vala:2705
 msgid "Temperature"
 msgstr "טמפרטורה"
 
-#: src/editing_tools/EditingTools.vala:2678
+#: ../src/editing_tools/EditingTools.vala:2718
 msgid "Tint"
 msgstr "גוון"
 
-#: src/editing_tools/EditingTools.vala:2691
+#: ../src/editing_tools/EditingTools.vala:2731
 msgid "Saturation"
 msgstr "רוויה"
 
-#: src/editing_tools/EditingTools.vala:2704
+#: ../src/editing_tools/EditingTools.vala:2744
 msgid "Exposure"
 msgstr "חשיפה"
 
-#: src/editing_tools/EditingTools.vala:2717
+#: ../src/editing_tools/EditingTools.vala:2757
 msgid "Shadows"
 msgstr "צללים"
 
-#: src/editing_tools/EditingTools.vala:2730
+#: ../src/editing_tools/EditingTools.vala:2770
 msgid "Highlights"
-msgstr ""
+msgstr "הדגשות"
 
-#: src/editing_tools/EditingTools.vala:2740
+#: ../src/editing_tools/EditingTools.vala:2780
 msgid "Contrast Expansion"
 msgstr "הרחבת הניגודיות"
 
-#: src/AppWindow.vala:49
-msgid "Pin Toolbar"
-msgstr "הצמדת סרגל הכלים"
+#: ../src/editing_tools/StraightenTool.vala:99
+msgid "Angle:"
+msgstr "זווית:"
 
-#: src/AppWindow.vala:50
-msgid "Pin the toolbar open"
-msgstr "הצמדת סרגל הכלים שיישאר פתוח"
+#: ../src/events/EventDirectoryItem.vala:83
+#, c-format
+msgid "%d Photo/Video"
+msgid_plural "%d Photos/Videos"
+msgstr[0] "%d תמונות/קטעי וידאו"
+msgstr[1] "תמונה/וידאו %d"
 
-#: src/AppWindow.vala:53 src/AppWindow.vala:131
-msgid "Leave fullscreen"
-msgstr "יציאה ממסך מלא"
+#: ../src/events/EventPage.vala:129
+msgid "No Event"
+msgstr "אין אירועים"
 
-#: src/AppWindow.vala:130
-msgid "Leave _Fullscreen"
-msgstr "יציאה ממסך מ_לא"
+#: ../src/events/EventsDirectoryPage.vala:131
+msgid "Display the comment of each event"
+msgstr "הצגת הערה לכל אירוע"
 
-#: src/AppWindow.vala:491
-msgid "_Quit"
-msgstr "י_ציאה"
+#: ../src/events/EventsDirectoryPage.vala:155
+msgid "No events"
+msgstr "אין אירועים"
 
-#: src/AppWindow.vala:496
-msgid "_About"
-msgstr "על _אודות"
+#: ../src/events/EventsDirectoryPage.vala:159
+msgid "No events found"
+msgstr "לא נמצאו אירועים"
 
-#: src/AppWindow.vala:501
-msgid "Fulls_creen"
-msgstr "מ_סך מלא"
+#: ../src/events/EventsDirectoryPage.vala:230
+msgid "Events"
+msgstr "אירועים"
 
-#: src/AppWindow.vala:506
-msgid "_Contents"
-msgstr "_תכנים"
+#: ../src/events/EventsDirectoryPage.vala:244
+msgid "Undated"
+msgstr "ללא תאריך"
 
-#: src/AppWindow.vala:511
-msgid "_Frequently Asked Questions"
-msgstr "שאלות _נפוצות"
+#: ../src/events/EventsDirectoryPage.vala:245
+msgid "%Y"
+msgstr "%Y"
 
-#: src/AppWindow.vala:516
-msgid "_Report a Problem..."
-msgstr "_דווח על בעיה..."
+#: ../src/events/EventsDirectoryPage.vala:246
+msgid "%B"
+msgstr "%B"
 
-#: src/AppWindow.vala:663
-#, c-format
-msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
-"continue.\n"
-"\n"
-"%s"
-msgstr ""
-"אירעה שגיאה קריטית בעת הגישה לספרייה של Shotwell. ‏Shotwell לא תוכל להמשיך.\n"
-"\n"
-"%s"
+#: ../src/folders/Branch.vala:141
+msgid "Folders"
+msgstr "תיקיות"
 
-#: src/AppWindow.vala:683 plugins/common/Resources.vala:9
-msgid "Visit the Yorba web site"
-msgstr "ביקור באתר של Yorba"
+#: ../src/library/Branch.vala:36 ../ui/shotwell.glade.h:32
+msgid "Library"
+msgstr "ספרייה"
 
-#: src/AppWindow.vala:686 plugins/common/Resources.vala:28
-msgid "translator-credits"
-msgstr "ירון שהרבני <sh.yaron@gmail.com>"
+#: ../src/library/ImportQueuePage.vala:8
+msgid "Importing..."
+msgstr "מתבצע יבוא..."
 
-#: src/AppWindow.vala:695
-#, c-format
-msgid "Unable to display help: %s"
-msgstr "לא ניתן להציג את העזרה: %s"
+#: ../src/library/ImportQueuePage.vala:67
+msgid "_Stop Import"
+msgstr "ע_צירת היבוא"
 
-#: src/AppWindow.vala:703
-#, c-format
-msgid "Unable to navigate to bug database: %s"
-msgstr "אין אפשרות לגלוש למסד נתוני התקלות: %s"
+#: ../src/library/ImportQueuePage.vala:68
+msgid "Stop importing photos"
+msgstr "עצירת יבוא התמונות"
+
+#: ../src/library/ImportQueuePage.vala:124
+msgid "Preparing to import..."
+msgstr "בהכנות ליבוא..."
 
-#: src/AppWindow.vala:711
+#: ../src/library/ImportQueuePage.vala:151
 #, c-format
-msgid "Unable to display FAQ: %s"
-msgstr "לא ניתן להציג את השאלות הנפוצות: %s"
+msgid "Imported %s"
+msgstr "יובאו %s"
 
-#: src/Tag.vala:817
-msgid "untitled"
-msgstr "ללא שם"
+#: ../src/library/LastImportPage.vala:8
+msgid "Last Import"
+msgstr "היבוא האחרון"
 
-#: src/Dimensions.vala:17
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1250
-msgid "Original size"
-msgstr "הגודל המקורי"
+#: ../src/library/LibraryWindow.vala:301
+msgid "_Import From Folder..."
+msgstr "י_בוא מתיקייה..."
 
-#: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "רוחב או גובה"
+#: ../src/library/LibraryWindow.vala:302
+msgid "Import photos from disk to library"
+msgstr "יבוא תמונות מהכונן לספרייה"
 
-#: src/Dimensions.vala:23
-msgid "Width"
-msgstr "רוחב"
+#: ../src/library/LibraryWindow.vala:309
+msgid "Import From _Application..."
+msgstr "ייבוא מ_יישום..."
 
-#: src/Dimensions.vala:26
-msgid "Height"
-msgstr "גובה"
+#: ../src/library/LibraryWindow.vala:313
+msgid "Sort _Events"
+msgstr "מיון _אירועים"
 
-#: src/MediaPage.vala:143
-msgid "Adjust the size of the thumbnails"
-msgstr "התאמת גודל התמונות הממוזערות"
+#: ../src/library/LibraryWindow.vala:323
+msgid "Empty T_rash"
+msgstr "פינוי ה_אשפה"
 
-#: src/MediaPage.vala:326
-msgid "Increase the magnification of the thumbnails"
-msgstr "הגדלת רמת התקריב בתמונות הממוזערות"
+#: ../src/library/LibraryWindow.vala:324
+msgid "Delete all photos in the trash"
+msgstr "מחיקת כל התמונות באשפה"
 
-#: src/MediaPage.vala:332
-msgid "Decrease the magnification of the thumbnails"
-msgstr "הקטנת רמת התקריב בתמונות הממוזערות"
+#: ../src/library/LibraryWindow.vala:329
+msgid "View Eve_nt for Photo"
+msgstr "צפייה ב_אירוע עבור תמונה"
 
-#: src/MediaPage.vala:399
-msgid "Sort _Photos"
-msgstr "_סידור תמונות"
+#: ../src/library/LibraryWindow.vala:333
+msgid "_Find"
+msgstr "_חיפוש"
 
-#: src/MediaPage.vala:408
-msgid "_Play Video"
-msgstr "נגינת _וידאו"
+#: ../src/library/LibraryWindow.vala:334
+msgid "Find photos and videos by search criteria"
+msgstr "חיפוש תמונות וקטעי וידאו לפי קריטריונים של חיפוש"
 
-#: src/MediaPage.vala:409
-msgid "Open the selected videos in the system video player"
-msgstr "פתיחת קטעי הווידאו הנבחרים בנגן הווידאו של המערכת"
+#: ../src/library/LibraryWindow.vala:345 ../src/searches/Branch.vala:77
+#: ../src/sidebar/Tree.vala:185
+msgid "Ne_w Saved Search..."
+msgstr "חיפוש _שמור חדש..."
 
-#: src/MediaPage.vala:442 src/events/EventsDirectoryPage.vala:130
-msgid "_Comments"
-msgstr "ה_ערות"
+#: ../src/library/LibraryWindow.vala:367
+msgid "_Photos"
+msgstr "_תמונות"
 
-#: src/MediaPage.vala:443
-msgid "Display the comment of each photo"
-msgstr "יש להציג הערה זו עבור כל תמונה"
+#: ../src/library/LibraryWindow.vala:371
+msgid "Even_ts"
+msgstr "_אירועים"
 
-#: src/MediaPage.vala:455
-msgid "Display each photo's tags"
-msgstr "הצגת התגיות עבור כל תמונה"
+#: ../src/library/LibraryWindow.vala:390
+msgid "_Basic Information"
+msgstr "פרטים _בסיסיים"
 
-#: src/MediaPage.vala:471
-msgid "By _Title"
-msgstr "לפי _כותרת"
+#: ../src/library/LibraryWindow.vala:391
+msgid "Display basic information for the selection"
+msgstr "הצגת פרטים בסיסיים עבור הבחירה"
 
-#: src/MediaPage.vala:472
-msgid "Sort photos by title"
-msgstr "סידור התמונות לפי כותרת"
+#: ../src/library/LibraryWindow.vala:396
+msgid "E_xtended Information"
+msgstr "_פרטים מורחבים"
 
-#: src/MediaPage.vala:477
-msgid "By Exposure _Date"
-msgstr "לפי תאריך _חשיפה"
+#: ../src/library/LibraryWindow.vala:397
+msgid "Display extended information for the selection"
+msgstr "הצגת פרטים מורחבים עבור הבחירה"
 
-#: src/MediaPage.vala:478
-msgid "Sort photos by exposure date"
-msgstr "דירוג התמונות לפי תאריך החשיפה"
+#: ../src/library/LibraryWindow.vala:402
+msgid "_Search Bar"
+msgstr "_סרגל חיפוש"
 
-#: src/MediaPage.vala:483
-msgid "By _Rating"
-msgstr "לפי _דירוג"
+#: ../src/library/LibraryWindow.vala:403
+msgid "Display the search bar"
+msgstr "הצגת סרגל החיפוש"
 
-#: src/MediaPage.vala:484
-msgid "Sort photos by rating"
-msgstr "סידור התמונות לפי דירוג"
+#: ../src/library/LibraryWindow.vala:408
+msgid "S_idebar"
+msgstr "סרגל _צד"
+
+#: ../src/library/LibraryWindow.vala:409
+msgid "Display the sidebar"
+msgstr "הצגת סרגל הצד"
+
+#: ../src/library/LibraryWindow.vala:667
+msgid "Import From Folder"
+msgstr "יבוא מתיקייה"
+
+#: ../src/library/LibraryWindow.vala:736
+msgid "Empty Trash"
+msgstr "פינוי האשפה"
 
-#: src/MediaPage.vala:702
+#: ../src/library/LibraryWindow.vala:736
+msgid "Emptying Trash..."
+msgstr "האשפה מתרוקנת..."
+
+#: ../src/library/LibraryWindow.vala:895
 #, c-format
 msgid ""
-"Shotwell was unable to play the selected video:\n"
-"%s"
+"Shotwell is configured to import photos to your home directory.\n"
+"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
+"span>.\n"
+"Do you want to continue importing photos?"
 msgstr ""
-"לא הייתה באפשרות Shotwell לנגן את הווידאו הבא:\n"
-"%s"
+"‏Shotwell מוגדר לייבא תמונות לתיקיית הבית שלך.\n"
+"אנו ממליצים לשנות זאת ב<span weight=\"bold\">עריכה %s העדפות</span>.\n"
+"האם ברצונך להמשיך בייבוא התמונות?"
+
+#: ../src/library/LibraryWindow.vala:898 ../ui/shotwell.glade.h:18
+msgid "Library Location"
+msgstr "מיקום הספרייה"
+
+#. TODO: Specify which directory/file.
+#: ../src/library/LibraryWindow.vala:911
+msgid "Photos cannot be imported from this directory."
+msgstr "לא ניתן לייבא תמונות לתיקייה זו."
 
-#: src/events/EventDirectoryItem.vala:83
+#: ../src/library/LibraryWindow.vala:1199
 #, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] "%d תמונות/קטעי וידאו"
-msgstr[1] "תמונה/וידאו %d"
+msgid "%s (%d%%)"
+msgstr "%s (%d%%)"
 
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "הצגת הערה לכל אירוע"
+#: ../src/library/LibraryWindow.vala:1243
+#: ../src/library/LibraryWindow.vala:1254
+msgid "Updating library..."
+msgstr "הספרייה מתעדכנת..."
 
-#: src/events/EventsDirectoryPage.vala:155
-msgid "No events"
-msgstr "אין אירועים"
+#: ../src/library/LibraryWindow.vala:1260
+msgid "Preparing to auto-import photos..."
+msgstr "בהכנות ליבוא תמונות באופן אוטומטי...."
 
-#: src/events/EventsDirectoryPage.vala:159
-msgid "No events found"
-msgstr "לא נמצאו אירועים"
+#: ../src/library/LibraryWindow.vala:1265
+msgid "Auto-importing photos..."
+msgstr "התמונות מיובאות אוטומטית..."
 
-#: src/events/EventsDirectoryPage.vala:230
-msgid "Events"
-msgstr "אירועים"
+#: ../src/library/LibraryWindow.vala:1273
+msgid "Writing metadata to files..."
+msgstr "נתוני העל נכתבים לקבצים..."
 
-#: src/events/EventsDirectoryPage.vala:244
-msgid "Undated"
-msgstr "ללא תאריך"
+#: ../src/library/OfflinePage.vala:8
+msgid "Missing Files"
+msgstr "קבצים חסרים"
 
-#: src/events/EventsDirectoryPage.vala:245
-msgid "%Y"
-msgstr "%Y"
+#: ../src/library/OfflinePage.vala:106
+msgid "Deleting..."
+msgstr "מחיקה..."
 
-#: src/events/EventsDirectoryPage.vala:246
-msgid "%B"
-msgstr "%B"
+#: ../src/library/TrashPage.vala:8
+msgid "Trash"
+msgstr "סל האשפה"
 
-#: src/events/EventPage.vala:129
-msgid "No Event"
-msgstr "אין אירועים"
+#: ../src/library/TrashPage.vala:108
+msgid "Trash is empty"
+msgstr "סל האשפה ריק"
 
-#: src/AppDirs.vala:48 src/AppDirs.vala:99
-#, c-format
-msgid "Unable to create cache directory %s: %s"
-msgstr "אין אפשרות לייצר את ספריית המטמון %s: %s"
+#: ../src/library/TrashPage.vala:112
+msgid "Delete"
+msgstr "מחיקה"
+
+#: ../src/library/TrashPage.vala:113
+msgid "Deleting Photos"
+msgstr "התמונות נמחקות"
 
-#: src/AppDirs.vala:58 src/AppDirs.vala:88
+#: ../src/main.vala:54
 #, c-format
-msgid "Unable to create data directory %s: %s"
-msgstr "לא ניתן ליצור את תיקייה הנתונים %s:‏ %s"
+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 ""
+"ספריית התמונות שלך אינה נתמכת בגרסה זו של Shotwell. נראה כי הספרייה נוצרה "
+"באמצעות Shotwell %s (סכמה %d). גרסה זו הנה %s (סכמה %d). נא להשתמש בגרסה "
+"העדכנית ביותר של Shotwell."
 
-#: src/AppDirs.vala:152
-msgid "Pictures"
-msgstr "תמונות"
+#: ../src/main.vala:59
+#, 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 ""
+"לא עלה בידי Shotwell לשדרג את ספריית התמונות שלך מגרסה %s (סכמה%d) לגרסה %s "
+"(סכמה %d).  למידע נוסף ניתן לבקר באתר הוויקי של Shotwell בכתובת %s"
 
-#: src/AppDirs.vala:190
+#: ../src/main.vala:65
 #, c-format
-msgid "Unable to create temporary directory %s: %s"
-msgstr "לא ניתן ליצור את התיקייה הזמנית %s:‏ %s"
+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 ""
+"ספריית התמונות שלך אינה תואמת לגרסה זו של Shotwell.  נראה כי ספרייה זו נוצרה "
+"על ידי Shotwell %s (סכמה%d).  גרסה זו הנה %s (סכמה %d).  נא לפנות את ספריית "
+"התמונות שלך על ידי מחיקת %s ויבוא התמונות שלך מחדש."
 
-#: src/AppDirs.vala:207 src/AppDirs.vala:223
+#: ../src/main.vala:71
 #, c-format
-msgid "Unable to create data subdirectory %s: %s"
-msgstr "לא ניתן ליצור את תת־תיקיית הנתונים %s: ‏%s"
+msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgstr "אירעה שגיאה בלתי ידועה בעת הניסיון לאימות מסד הנתונים של Shotwell: %s"
 
-#: src/slideshow/TransitionEffects.vala:98
-msgid "(None)"
-msgstr "(אין)"
+#: ../src/main.vala:104
+msgid "Loading Shotwell"
+msgstr "Loading Shotwell"
 
-#: src/slideshow/TransitionEffects.vala:287
-msgid "None"
-msgstr "אין"
+#: ../src/main.vala:294
+msgid "Path to Shotwell's private data"
+msgstr "הנתיב לנתונים הפרטיים של Shotwell"
 
-#: src/slideshow/TransitionEffects.vala:339
-msgid "Random"
-msgstr "אקראי"
+#: ../src/main.vala:294
+msgid "DIRECTORY"
+msgstr "DIRECTORY"
 
-#: src/slideshow/Slideshow.vala:22
-msgid "Slideshow Transitions"
-msgstr "מעברים במצגת"
+#: ../src/main.vala:298
+msgid "Do not monitor library directory at runtime for changes"
+msgstr "אין לבדוק מה השינויים בתיקיות בזמן פעולת התכנית"
 
-#: src/Exporter.vala:232
+#: ../src/main.vala:302
+msgid "Don't display startup progress meter"
+msgstr "אין להציג מד התקדמות בזמן ההפעלה"
+
+#: ../src/main.vala:306
+msgid "Show the application's version"
+msgstr "הצגת גרסת היישום"
+
+#. init GTK (valac has already called g_threads_init())
+#: ../src/main.vala:338
+msgid "[FILE]"
+msgstr "[FILE]"
+
+#: ../src/main.vala:342
 #, c-format
-msgid "Unable to generate a temporary file for %s: %s"
-msgstr "לא ניתן ליצור את הקובץ הזמני עבור %s:‏ %s"
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Run '%s --help' to see a full list of available command line options.\n"
 
-#: src/Exporter.vala:299
-msgid "Exporting"
-msgstr "יצוא"
+#: ../src/photos/BmpSupport.vala:32
+msgid "BMP"
+msgstr "BMP"
 
-#: src/Exporter.vala:317
+#: ../src/photos/JfifSupport.vala:84
+msgid "JPEG"
+msgstr "JPEG"
+
+#: ../src/photos/JfifSupport.vala:185
 #, c-format
-msgid "File %s already exists.  Replace?"
-msgstr "הקובץ %s כבר קיים.  להחליף?"
+msgid "Low (%d%%)"
+msgstr "נמוכה (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "_Skip"
-msgstr "_דילוג"
+#: ../src/photos/JfifSupport.vala:188
+#, c-format
+msgid "Medium (%d%%)"
+msgstr "בינונית (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "_Replace"
-msgstr "ה_חלפה"
+#: ../src/photos/JfifSupport.vala:191
+#, c-format
+msgid "High (%d%%)"
+msgstr "גבוהה (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "Replace _All"
-msgstr "החלפת ה_כול"
+#: ../src/photos/JfifSupport.vala:194
+#, c-format
+msgid "Maximum (%d%%)"
+msgstr "מרבית (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "Export"
-msgstr "יצוא"
+#: ../src/photos/PngSupport.vala:30
+msgid "PNG"
+msgstr "PNG"
 
-#: src/SearchFilter.vala:593 src/SearchFilter.vala:594
-msgid "Photos"
-msgstr "תמונות"
+#: ../src/photos/RawSupport.vala:134
+msgid "RAW"
+msgstr "RAW"
 
-#: src/SearchFilter.vala:599 src/SearchFilter.vala:600
-msgid "Videos"
-msgstr "קטעי וידאו"
+#: ../src/photos/TiffSupport.vala:86
+msgid "TIFF"
+msgstr "TIFF"
 
-#: src/SearchFilter.vala:605
-msgid "RAW Photos"
-msgstr "תמונות גולמיות (RAW)"
+#: ../src/publishing/Publishing.vala:16
+msgid "Publishing"
+msgstr "פרסום"
 
-#: src/SearchFilter.vala:606
-msgid "RAW photos"
-msgstr "תמונות גולמיות (RAW)"
+#: ../src/publishing/PublishingPluginHost.vala:11
+msgid "Preparing for upload"
+msgstr "בהכנה להעלאה"
 
-#: src/SearchFilter.vala:952
+#: ../src/publishing/PublishingPluginHost.vala:12
 #, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "שגיאה בטעינת קובץ מנשק המשתמש %s: %s"
+msgid "Uploading %d of %d"
+msgstr "%d נשלחו מתוך %d"
 
-#: src/SearchFilter.vala:969
-msgid "Type"
-msgstr "סוג"
+#: ../src/publishing/PublishingPluginHost.vala:81
+#, c-format
+msgid "Publishing to %s can't continue because an error occurred:"
+msgstr "לא ניתן להמשיך בפרסום אל %s כיוון שאירעה שגיאה:"
 
-#: src/publishing/Publishing.vala:16
-msgid "Publishing"
-msgstr "פרסום"
+#: ../src/publishing/PublishingPluginHost.vala:84
+msgid "To try publishing to another service, select one from the above menu."
+msgstr "כדי לנסות לפרסם לשירות אחד, יש לבחור באחד מהתפריט שלהלן."
 
-#: src/publishing/PublishingUI.vala:105
+#: ../src/publishing/PublishingUI.vala:105
 msgid "The selected photos/videos were successfully published."
 msgstr "התמונה/וידאו הנבחרים פורסמו בהצלחה."
 
-#: src/publishing/PublishingUI.vala:107
+#: ../src/publishing/PublishingUI.vala:107
 msgid "The selected videos were successfully published."
 msgstr "קטעי הווידאו פורסמו בהצלחה."
 
-#: src/publishing/PublishingUI.vala:109
+#: ../src/publishing/PublishingUI.vala:109
 msgid "The selected photos were successfully published."
 msgstr "התמונות הנבחרות פורסמו בהצלחה."
 
-#: src/publishing/PublishingUI.vala:112
+#: ../src/publishing/PublishingUI.vala:112
 msgid "The selected video was successfully published."
 msgstr "קטע הווידאו הנבחר פורסם בהצלחה."
 
-#: src/publishing/PublishingUI.vala:114
+#: ../src/publishing/PublishingUI.vala:114
 msgid "The selected photo was successfully published."
 msgstr "התמונה הנבחרת פורסמה בהצלחה."
 
-#: src/publishing/PublishingUI.vala:122
+#: ../src/publishing/PublishingUI.vala:122
 msgid "Fetching account information..."
 msgstr "פרטי החשבון מתקבלים..."
 
-#: src/publishing/PublishingUI.vala:128
+#: ../src/publishing/PublishingUI.vala:128
 msgid "Logging in..."
 msgstr "בהליכי כניסה..."
 
-#: src/publishing/PublishingUI.vala:183
+#: ../src/publishing/PublishingUI.vala:185
 msgid "Publish Photos"
 msgstr "פרסום תמונות"
 
-#: src/publishing/PublishingUI.vala:184
+#: ../src/publishing/PublishingUI.vala:186
 msgid "Publish photos _to:"
 msgstr "פרסום תמונות _אל:"
 
-#: src/publishing/PublishingUI.vala:186
+#: ../src/publishing/PublishingUI.vala:188
 msgid "Publish Videos"
 msgstr "פרסום קטעי וידאו"
 
-#: src/publishing/PublishingUI.vala:187
+#: ../src/publishing/PublishingUI.vala:189
 msgid "Publish videos _to"
 msgstr "פרסום קטעי וידאו _אל:"
 
-#: src/publishing/PublishingUI.vala:189
+#: ../src/publishing/PublishingUI.vala:191
 msgid "Publish Photos and Videos"
 msgstr "פרסום תמונות וקטעי וידאו"
 
-#: src/publishing/PublishingUI.vala:190
+#: ../src/publishing/PublishingUI.vala:192
 msgid "Publish photos and videos _to"
 msgstr "פרסום תמונות וקטעי וידאו _אל:"
 
-#: src/publishing/PublishingUI.vala:383
+#. There are no enabled publishing services that accept this media type,
+#. warn the user.
+#: ../src/publishing/PublishingUI.vala:360
 msgid "Unable to publish"
 msgstr "לא ניתן לפרסם"
 
-#: src/publishing/PublishingUI.vala:384
+#: ../src/publishing/PublishingUI.vala:361
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -3592,961 +4572,413 @@ msgstr ""
 "לשרות הנדרש. על מנת לתקן זאת, בחר באפשרות <b>ערוך העדפות %s</b> והפעל את אחד "
 "או יותר מתוספי ההעלאה בלשונית <b>תוספים</b>."
 
-#: src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr "בהכנה להעלאה"
-
-#: src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
-msgstr "%d נשלחו מתוך %d"
-
-#: src/publishing/PublishingPluginHost.vala:81
-#, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
-msgstr "לא ניתן להמשיך בפרסום אל %s כיוון שאירעה שגיאה:"
-
-#: src/publishing/PublishingPluginHost.vala:84
-msgid "To try publishing to another service, select one from the above menu."
-msgstr "כדי לנסות לפרסם לשירות אחד, יש לבחור באחד מהתפריט שלהלן."
-
-#: src/sidebar/Tree.vala:199
-msgid "New _Tag..."
-msgstr "תגית _חדשה..."
-
-#: plugins/common/RESTSupport.vala:424
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:971
-#, fuzzy
-msgid "A temporary file needed for publishing is unavailable"
-msgstr ""
-"קובץ זמני הנדרש להפקה אינו זמין"
-
-#: plugins/common/RESTSupport.vala:1138
-msgid ""
-"You have already logged in and out of a Google service during this Shotwell "
-"session.\n"
-"\n"
-"To continue publishing to Google services, quit and restart Shotwell, then "
-"try publishing again."
-msgstr ""
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:57
-msgid ""
-"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 ""
-"נכון לעכשיו לא נכנסת לשירות YouTube.\n"
-"\n"
-"כדי להמשיך אמור להיות ברשותך חשבון Google המוגדר לשימוש בשילוב YouTube. ניתן "
-"להגדיר את רוב החשבונות על ידי שימוש בדפדפן האינטרנט שלך כדי להיכנס ל־YouTube "
-"לפחות פעם אחת."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:362
-msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
-"continue."
-msgstr ""
-"קובץ הנדרש להעלאת התוכן אינו זמין. העלאת התוכן ל-Youtube לא תוכל להתבצע."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:461
-#, c-format
-msgid "You are logged into YouTube as %s."
-msgstr "נכנסת ל־YouTube בשם %s."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:463
-#, c-format
-msgid "Videos will appear in '%s'"
-msgstr "קטעי הווידאו יופיעו בתוך '%s'"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:495
-msgid "Public listed"
-msgstr "הצגה ציבורית"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
-msgid "Public unlisted"
-msgstr "לא מוצג לכלל הציבור"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
-msgid "Private"
-msgstr "פרטי"
-
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr "שירותי פרסום של הליבה"
-
-#: 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 ""
-"לא נכנסת ל־Flickr.\n"
-"\n"
-"יש ללחוץ על כניסה כדי להיכנס ל־Flickr בדפדפן שלך.  יהיה עליך לאמת את "
-"Shotwell Connect כדי לקשר אל חשבון ה־Flickr שלך."
-
-#: 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 ""
-"כבר נכנסת ויצאת מ־Flick במהלך הפעלה זו של Shotwell.\n"
-"כדי להמשיך לפרסם ל־Flickr, עליך לצאת ולהפעיל מחדש את Shotwell ואז לנסות "
-"לפרסם שוב."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:375
-msgid "Preparing for login..."
-msgstr "בהכנות לכניסה..."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:595
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can't "
-"continue."
-msgstr ""
-"קובץ הנדרש להעלאת התוכן אינו זמין. העלאת התוכן ל-Flickr לא תוכל להתבצע."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "האימות בווידוא..."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1153
-#, c-format
-msgid ""
-"You are logged into Flickr as %s.\n"
-"\n"
-msgstr ""
-"נכנסת ל־Flickr בשם %s.\n"
-"\n"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
-#, 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 ""
-"חשבונך הפטור מתשלום ב־Flickr מגביל את כמות המידע שניתן להעלות בחודש.\n"
-"החודש, נותרו לך %d מגה בתים במכסת ההעלאה שלך."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1157
-msgid "Your Flickr Pro account entitles you to unlimited uploads."
-msgstr "חשבון ה־Flickr Pro שלך מזכה אותך בכמויות העלאה בלתי מוגבלות."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1162
-msgid "Photos _visible to:"
-msgstr "התמונות _גלויות לעיני:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
-msgid "Videos _visible to:"
-msgstr "קטעי הווי_דאו גלוים לעיני:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1167
-msgid "Photos and videos _visible to:"
-msgstr "הת_מונות וקטעי הווידאו גלויים לעיני:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1234
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1182
-msgid "Everyone"
-msgstr "כולם"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
-msgid "Friends & family only"
-msgstr "חברים ומשפחה בלבד"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-msgid "Family only"
-msgstr "רק משפחה"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
-msgid "Friends only"
-msgstr "רק חברים"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1180
-msgid "Just me"
-msgstr "רק לי"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1229
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1246
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-#, fuzzy
-msgid "500 x 375 pixels"
-msgstr ""
-"500‎ × 375 פיקסלים"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1230
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1247
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:108
-#, fuzzy
-msgid "1024 x 768 pixels"
-msgstr ""
-"1024‎ × 768 פיקסלים"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1248
-msgid "2048 x 1536 pixels"
-msgstr "2048 x‏ 1536 פיקסלים"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1249
-msgid "4096 x 3072 pixels"
-msgstr "4096 x‏ 3072 פיקסלים"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:746
-#, c-format
-msgid "Creating album %s..."
-msgstr "מייצר אלבום %s…"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:917
-msgid "An error message occurred when publishing to Piwigo. Please try again."
-msgstr "אירעה שגיאה בעת הפרסום לפיוויגו. נא לנסות שוב."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:998
-msgid ""
-"Enter the URL of your Piwigo photo library as well as the username and "
-"password associated with your Piwigo account for that library."
-msgstr ""
-"הזן את כתובת האתר של ספריית התמונות Piwigo שלך וכן את שם המשתמש והסיסמה "
-"לגישה לחשבון -Piwigo שלך עבור ספריה זו."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:999
-msgid ""
-"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
-"entered"
-msgstr ""
-"Shotwell אינו יכול להתחבר לספריית התמונות Piwigo. אנא בדוק את כתובת האתר "
-"שהזנת"
+#: ../src/searches/Branch.vala:68
+msgid "Saved Searches"
+msgstr "החיפושים השמורים"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1000
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:590
-#, fuzzy
-msgid "Username and/or password invalid. Please try again"
-msgstr ""
-"שם המשתמש ו/או הססמה אינם נכונים. נא לנסות שנית"
+#. Ordering must correspond with SearchConditionText.Context
+#: ../src/searches/SavedSearchDialog.vala:168
+msgid "contains"
+msgstr "מכיל"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1032
-#, c-format
-msgid "Invalid URL"
-msgstr "כתובת אתר לא תקינה"
+#. Ordering must correspond with Context
+#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:500
+msgid "is exactly"
+msgstr "הוא בדיוק"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1037
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:620
-#, fuzzy, c-format
-msgid "Invalid User Name or Password"
-msgstr ""
-"שם משתמש או ססמה שגויים"
+#: ../src/searches/SavedSearchDialog.vala:170
+msgid "starts with"
+msgstr "מתחיל ב־"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1127
-#: plugins/shotwell-publishing/PicasaPublishing.vala:59
-#: plugins/shotwell-publishing/FacebookPublishing.vala:61
-msgid "Shotwell Connect"
-msgstr "Shotwell Connect"
+#: ../src/searches/SavedSearchDialog.vala:171
+msgid "ends with"
+msgstr "מסתיים ב־"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1235
-msgid "Admins, Family, Friends, Contacts"
-msgstr "מנהלי מערכת, משפחה, חברים, אנשי קשר"
+#: ../src/searches/SavedSearchDialog.vala:172
+msgid "does not contain"
+msgstr "אינו מכיל"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1236
-msgid "Admins, Family, Friends"
-msgstr "מנהלי מערכת, משפחה, חברים"
+#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:504
+msgid "is not set"
+msgstr "לא מוגדר"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1237
-msgid "Admins, Family"
-msgstr "מנהלי מערכת, משפחה"
+#: ../src/searches/SavedSearchDialog.vala:174
+msgid "is set"
+msgstr "מוגדר"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1238
-msgid "Admins"
-msgstr "מנהלי מערכת"
+#. Ordering must correspond with SearchConditionMediaType.Context
+#: ../src/searches/SavedSearchDialog.vala:248
+#: ../src/searches/SavedSearchDialog.vala:379
+#: ../src/searches/SavedSearchDialog.vala:444
+msgid "is"
+msgstr "הוא"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:58
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have "
-"to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
-"אינך מחובר לאתר Picasa Web Albums.\n"
-"\n"
-"הקלק על התחבר בכדי להכנס לחשבונך ב-Picasa Web Albums בדפדפן שלך. תצטרך לאשר "
-"ל-Shotwell להתחבר על מנת לקשר לחשבון Picasa Web Albums שלך."
+#: ../src/searches/SavedSearchDialog.vala:249
+msgid "is not"
+msgstr "אינו"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:361
-msgid ""
-"A file required for publishing is unavailable. Publishing to Picasa can't "
-"continue."
-msgstr ""
-"קובץ הנדרש להעלאת התוכן אינו זמין. העלאת התוכן ל-Picasa לא תוכל להתבצע."
+#. Ordering must correspond with SearchConditionMediaType.MediaType
+#: ../src/searches/SavedSearchDialog.vala:255
+msgid "any photo"
+msgstr "כל תמונה שהיא"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
-#: plugins/shotwell-publishing/FacebookPublishing.vala:347
-msgid "Creating album..."
-msgstr "אלבום נוצר..."
+#: ../src/searches/SavedSearchDialog.vala:256
+msgid "a raw photo"
+msgstr "תמונה גולמית"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:659
-#, c-format
-msgid "You are logged into Picasa Web Albums as %s."
-msgstr "נכנסת ל־Picasa Web Albums בשם %s."
+#: ../src/searches/SavedSearchDialog.vala:257
+msgid "a video"
+msgstr "וידאו"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
-msgid "Videos will appear in:"
-msgstr "קטעי הווידאו יופיעו בתוך:"
+#: ../src/searches/SavedSearchDialog.vala:311
+msgid "has"
+msgstr "יש"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:670
-msgid "Photos will appear in:"
-msgstr "התמונות יופיעו תחת:"
+#: ../src/searches/SavedSearchDialog.vala:312
+msgid "has no"
+msgstr "אין"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "קטנה (640 x‏ 480 פיקסלים)"
+#: ../src/searches/SavedSearchDialog.vala:317
+msgid "modifications"
+msgstr "שינויים"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "בינונית (1024 x‏ 768 פיקסלים)"
+#: ../src/searches/SavedSearchDialog.vala:318
+msgid "internal modifications"
+msgstr "שינויים פנימיים"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "מומלצת (1600 x‏ 1200 פיקסלים)"
+#: ../src/searches/SavedSearchDialog.vala:319
+msgid "external modifications"
+msgstr "שינויים חיצוניים"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Google+ (2048 x 1536 פיקסלים)"
+#. Ordering must correspond with SearchConditionFlagged.State
+#: ../src/searches/SavedSearchDialog.vala:373
+msgid "flagged"
+msgstr "מסומן בדגלון"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:63
-msgid ""
-"You are not currently logged into Facebook.\n"
-"\n"
-"If you don't yet have a Facebook account, you can create one during the "
-"login process. During login, Shotwell Connect may ask you for permission to "
-"upload photos and publish to your feed. These permissions are required for "
-"Shotwell Connect to function."
-msgstr ""
-"נכון לעכשיו לא ביצעת כניסה לחשבון ה־Facebook שלך.\n"
-"\n"
-"אם עדיין אין לך חשבון Facebook, באפשרותך ליצור אחד במהלך הכניסה. במשך תהליך "
-"הכניסה, Shotwell Connect עלול לבקש את רשותך להעלות תמונות ולפרסם אותן בהזנה "
-"שלך. הרשאות אלו נחוצות כדי ש־Shotwell Connect יוכל לתפקד."
+#: ../src/searches/SavedSearchDialog.vala:374
+msgid "not flagged"
+msgstr "לא מסומן בדגלון"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:65
-msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"כבר יצאת מ־Facebook במהלך הפעלה זו של Shotwell.\n"
-"כדי להמשיך לפרסם ל־Facebook, עליך לצאת ולהפעיל מחדש את Shotwell ואז לנסות "
-"לפרסם שוב."
+#: ../src/searches/SavedSearchDialog.vala:437
+msgid "and higher"
+msgstr "ומעלה"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:86
-msgid "Standard (720 pixels)"
-msgstr "רגיל (720 פיקסלים)"
+#: ../src/searches/SavedSearchDialog.vala:438
+msgid "only"
+msgstr "בלבד"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:89
-msgid "Large (2048 pixels)"
-msgstr "גדול (2048 פיקסלים)"
+#: ../src/searches/SavedSearchDialog.vala:439
+msgid "and lower"
+msgstr "ומטה"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:254
-msgid "Testing connection to Facebook..."
-msgstr "החיבור ל־Facebook נבדק..."
+#: ../src/searches/SavedSearchDialog.vala:501
+msgid "is after"
+msgstr "הוא לאחר"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:374
-msgid ""
-"A file required for publishing is unavailable. Publishing to Facebook can't "
-"continue."
-msgstr ""
-"קובץ הנדרש להעלאת התוכן אינו זמין. העלאת התוכן ל-Facebook לא תוכל להתבצע."
+#: ../src/searches/SavedSearchDialog.vala:502
+msgid "is before"
+msgstr "הוא לפני"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1019
-#, c-format
-msgid ""
-"You are logged into Facebook as %s.\n"
-"\n"
-msgstr ""
-"נכנסת ל־Facebook בשם %s.\n"
-"\n"
+#: ../src/searches/SavedSearchDialog.vala:503
+msgid "is between"
+msgstr "הוא בין"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1020
-msgid "Where would you like to publish the selected photos?"
-msgstr "להיכן ברצונך לפרסם את התמונות הנבחרות?"
+#: ../src/searches/SavedSearchDialog.vala:516
+msgid "and"
+msgstr "וגם"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1021
-msgid "Upload _size:"
-msgstr "גודל הה_עלאה:"
+#: ../src/searches/SavedSearchDialog.vala:695
+msgid "Search"
+msgstr "חיפוש"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1181
-msgid "Friends"
-msgstr "חברים"
+#: ../src/searches/SavedSearchDialog.vala:700
+msgid "Cancel"
+msgstr "ביטול"
 
-#: plugins/shotwell-transitions/CrumbleEffect.vala:20
-msgid "Crumble"
-msgstr "התפוררות"
+#: ../src/searches/SavedSearchDialog.vala:701
+msgid "OK"
+msgstr "אישור"
 
-#: plugins/shotwell-transitions/ChessEffect.vala:20
-msgid "Chess"
-msgstr "שח מט"
+#: ../src/searches/SavedSearchDialog.vala:719
+msgid "any"
+msgstr "כלשהו"
 
-#: plugins/shotwell-transitions/CirclesEffect.vala:20
-msgid "Circles"
-msgstr "עיגולים"
+#: ../src/searches/SavedSearchDialog.vala:720
+msgid "all"
+msgstr "הכול"
 
-#: plugins/shotwell-transitions/BlindsEffect.vala:20
-msgid "Blinds"
-msgstr "תריסים"
+#: ../src/searches/SavedSearchDialog.vala:721
+msgid "none"
+msgstr "אף אחד מאלה"
 
-#: plugins/shotwell-transitions/StripesEffect.vala:20
-msgid "Stripes"
-msgstr "פסים"
+#: ../src/searches/SearchBoolean.vala:157
+msgid "Any text"
+msgstr " כלשהו"
 
-#: plugins/shotwell-transitions/ClockEffect.vala:20
-msgid "Clock"
-msgstr "שעון"
+#: ../src/searches/SearchBoolean.vala:160
+msgid "Title"
+msgstr "כותרת"
 
-#: plugins/shotwell-transitions/CircleEffect.vala:20
-msgid "Circle"
-msgstr "עיגול"
+#: ../src/searches/SearchBoolean.vala:163
+msgid "Tag"
+msgstr "תגית"
 
-#: plugins/shotwell-transitions/shotwell-transitions.vala:28
-msgid "Core Slideshow Transitions"
-msgstr "מעברי ליבה של מצגות"
+#: ../src/searches/SearchBoolean.vala:166
+msgid "Comment"
+msgstr "הערה"
 
-#: plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
-msgstr ""
-"כל הזכויות שמורות 2010 למקסים קרטשב, כל הזכויות שמורות 2011-2013 לעמותת יורבה"
+#: ../src/searches/SearchBoolean.vala:169
+msgid "Event name"
+msgstr "שם האירוע"
 
-#: plugins/shotwell-transitions/SlideEffect.vala:20
-msgid "Slide"
-msgstr "שקופית"
+#: ../src/searches/SearchBoolean.vala:172
+msgid "File name"
+msgstr "שם הקובץ"
 
-#: plugins/shotwell-transitions/FadeEffect.vala:20
-msgid "Fade"
-msgstr "עמעום"
+#: ../src/searches/SearchBoolean.vala:175
+msgid "Media type"
+msgstr "סוג המדיה"
 
-#: plugins/shotwell-transitions/SquaresEffect.vala:20
-msgid "Squares"
-msgstr "ריבועים"
+#: ../src/searches/SearchBoolean.vala:178
+msgid "Flag state"
+msgstr "מצב הדגלון"
 
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "שרותי ייבוא מידע בסיסי"
+#: ../src/searches/SearchBoolean.vala:181
+msgid "Photo state"
+msgstr "מצב תמונה"
 
-#: 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 ""
-"ברוך בואך לשרות ייבוא הספריה של F-Spot.\n"
-"\n"
-"אנא בחר ספריה לייבוא, או ע\"י בחירת אחת הספריות שאותרו ע\"י Shotwell או ע\"י "
-"בחירת קובץ מסד נתונים של F-Spot."
+#: ../src/searches/SearchBoolean.vala:187
+msgid "Date"
+msgstr "תאריך"
 
-#: 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 ""
-"ברוך בואך לשרות ייבוא הספריה של F-Spot.\n"
-"\n"
-"אנא בחר קובץ מסד נתונים של F-Spot."
+#: ../src/sidebar/Tree.vala:189
+msgid "New _Tag..."
+msgstr "תגית _חדשה..."
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid "Manually select an F-Spot database file to import:"
-msgstr "בחר באופן ידני קובץ מסד נתונים של F-Spot לטעינה:"
+#: ../src/slideshow/Slideshow.vala:22
+msgid "Slideshow Transitions"
+msgstr "מעברים במצגת"
 
-#: 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 ""
-"אין אפשרות לפתוח את קובץ מסד הנתונים של F-Spot: הקובץ לא קיים או שאינו קובץ "
-"מסד נתונים"
+#: ../src/slideshow/TransitionEffects.vala:98
+msgid "(None)"
+msgstr "(אין)"
 
-#: 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 ""
-"אין אפשרות לפתוח את קובץ מסד הנתונים של F-Spot: גרסת הקובץ אינה נתמכת ע\"י "
-"Shotwell"
+#: ../src/slideshow/TransitionEffects.vala:287
+msgid "None"
+msgstr "אין"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"אין אפשרות לפתוח את קובץ מסד הנתונים של F-Spot: חלה שגיאה בעת טעינת טבלת "
-"התגיות"
+#: ../src/slideshow/TransitionEffects.vala:339
+msgid "Random"
+msgstr "אקראי"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"אין אפשרות לפתוח את קובץ מסד הנתונים של F-Spot: חלה שגיאה בעת טעינת טבלת "
-"התמונות."
+#: ../src/tags/Branch.vala:127
+msgid "Tags"
+msgstr "תגיות"
 
-#: 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 ""
-"Shotwell מצא %d תמונות בספריית F-Spot והן מיובאות כרגע.תמונות כפולות יזוהו "
-"ויוסרו באופן אוטומטי.\n"
-"\n"
-"באפשרותך לסגור חלונית זו ולהתחיל להשתמש ב-Shotwell בזמן שהייבוא מתבצע ברקע."
+#: ../ui/set_background_dialog.glade.h:1
+msgid "Set as Desktop Background"
+msgstr "הגדרה כרקע שולחן העבודה"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:84
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "ספריית F-Spot: %s"
+#: ../ui/set_background_dialog.glade.h:2
+#: ../ui/set_background_slideshow_dialog.glade.h:6
+msgid "Use for Desktop"
+msgstr "שימוש עבור שולחן העבודה"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:416
-msgid "Preparing to import"
-msgstr "מתכונן לייבוא"
+#: ../ui/set_background_dialog.glade.h:3
+#: ../ui/set_background_slideshow_dialog.glade.h:7
+msgid "Use for Lock Screen"
+msgstr "שימוש עבור מסך הנעילה"
 
-#: ui/set_background_dialog.glade:14
+#: ../ui/set_background_slideshow_dialog.glade.h:1
 msgid "Set as Desktop Slideshow"
 msgstr "הגדרה כמצגת שולחן העבודה"
 
-#: ui/set_background_dialog.glade:55
-msgid "Generate desktop background slideshow"
-msgstr "יצירת מצגת לרקע שולחן העבודה"
-
-#: ui/set_background_dialog.glade:82
+#: ../ui/set_background_slideshow_dialog.glade.h:2
 msgid "Show each photo for"
 msgstr "הצגת כל תמונה למשך"
 
-#: ui/set_background_dialog.glade:94
+#: ../ui/set_background_slideshow_dialog.glade.h:3
 msgid "period of time"
 msgstr "משך הזמן"
 
-#: ui/set_background_dialog.glade:116
+#: ../ui/set_background_slideshow_dialog.glade.h:4
+msgid "Generate desktop background slideshow"
+msgstr "יצירת מצגת לרקע שולחן העבודה"
+
+#: ../ui/set_background_slideshow_dialog.glade.h:5
 msgid "How long each photo is shown on the desktop background"
 msgstr "כמה זמן תופיע כל תמונה ברקע שולחן העבודה"
 
-#: ui/shotwell.glade:7
-msgid "Search"
-msgstr "חיפוש"
-
-#: ui/shotwell.glade:47
+#: ../ui/shotwell.glade.h:1
 msgid "_Name of search:"
 msgstr "_שם החיפוש:"
 
-#: ui/shotwell.glade:108
+#: ../ui/shotwell.glade.h:2
 msgid "_Match"
 msgstr "ה_תאמה"
 
-#: ui/shotwell.glade:137
+#: ../ui/shotwell.glade.h:3
 msgid "of the following:"
 msgstr "מהבאים:"
 
-#: ui/shotwell.glade:218
+#: ../ui/shotwell.glade.h:4
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>גודל התמונה המודפסת</b>"
 
-#: ui/shotwell.glade:235
+#: ../ui/shotwell.glade.h:5
 msgid "Use a _standard size:"
 msgstr "שימוש בגודל _רגיל:"
 
-#: ui/shotwell.glade:278
+#: ../ui/shotwell.glade.h:6
 msgid "Use a c_ustom size:"
 msgstr "שימוש בגודל _מותאם אישית:"
 
-#: ui/shotwell.glade:368
+#: ../ui/shotwell.glade.h:7
 msgid "_Match photo aspect ratio"
 msgstr "התאמת _יחס התצוגה של התמונה"
 
-#: ui/shotwell.glade:392
+#: ../ui/shotwell.glade.h:8
 msgid "_Autosize:"
 msgstr "_גודל אוטומטי:"
 
-#: ui/shotwell.glade:432
+#: ../ui/shotwell.glade.h:9
 msgid "<b>Titles</b>"
 msgstr "<b>כותרות</b>"
 
-#: ui/shotwell.glade:449
+#: ../ui/shotwell.glade.h:10
 msgid "Print image _title"
 msgstr "הדפסת _כותרת התמונה"
 
-#: ui/shotwell.glade:493
+#: ../ui/shotwell.glade.h:11
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>רזולוציית הפיקסלים</b>"
 
-#: ui/shotwell.glade:513
+#: ../ui/shotwell.glade.h:12
 msgid "_Output photo at:"
 msgstr "_פלט התמונה תחת:"
 
-#: ui/shotwell.glade:548
+#: ../ui/shotwell.glade.h:13
 msgid "pixels per inch"
 msgstr "פיקסלים לאינטש"
 
-#: ui/shotwell.glade:581 ui/shotwell.glade:623
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:27
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:27
-#, fuzzy
-msgid "label"
-msgstr ""
-"תווית"
-
-#: ui/shotwell.glade:719
+#: ../ui/shotwell.glade.h:15
 msgid "Shotwell Preferences"
 msgstr "Shotwell העדפות"
 
-#: ui/shotwell.glade:796
+#: ../ui/shotwell.glade.h:16
 msgid "white"
 msgstr "לבן"
 
-#: ui/shotwell.glade:823
+#: ../ui/shotwell.glade.h:17
 msgid "black"
 msgstr "שחור"
 
-#: ui/shotwell.glade:871
+#: ../ui/shotwell.glade.h:19
 msgid "_Watch library directory for new files"
 msgstr "מ_עקב אחר התיקייה של הספרייה לגילוי קבצים חדשים"
 
-#: ui/shotwell.glade:900
+#: ../ui/shotwell.glade.h:20
 msgid "Metadata"
 msgstr "נתוני על"
 
-#: ui/shotwell.glade:920
+#: ../ui/shotwell.glade.h:21
 msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "ניתן לכתוב תגיות, כותרות ונתוני על נוספים לקובצי תמונה"
+msgstr "ניתן לכתוב תגיות, כותרות ונתוני _על נוספים לקובצי תמונה"
 
-#: ui/shotwell.glade:946
+#: ../ui/shotwell.glade.h:22
 msgid "Display"
 msgstr "תצוגה"
 
-#: ui/shotwell.glade:967
+#: ../ui/shotwell.glade.h:23
 msgid "_Import photos to:"
 msgstr "י_בוא תמונות אל:"
 
-#: ui/shotwell.glade:990
+#: ../ui/shotwell.glade.h:24
 msgid "_Background:"
 msgstr "_רקע:"
 
-#: ui/shotwell.glade:1013
+#: ../ui/shotwell.glade.h:25
 msgid "Importing"
 msgstr "בהליכי יבוא"
 
-#: ui/shotwell.glade:1036
+#: ../ui/shotwell.glade.h:26
 msgid "_Directory structure:"
 msgstr "מבנה ה_תיקיות:"
 
-#: ui/shotwell.glade:1075
+#: ../ui/shotwell.glade.h:27
 msgid "_Pattern:"
 msgstr "ת_בנית:"
 
-#: ui/shotwell.glade:1157
+#: ../ui/shotwell.glade.h:28
 msgid "Example:"
 msgstr "דוגמה:"
 
-#: ui/shotwell.glade:1174
+#: ../ui/shotwell.glade.h:29
 msgid "R_ename imported files to lowercase"
 msgstr "שי_נוי שמות כל הקבצים המיובאים לאותיות קטנות"
 
-#: ui/shotwell.glade:1203
+#: ../ui/shotwell.glade.h:30
 msgid "RAW Developer"
 msgstr "מתכנת ה־RAW"
 
-#: ui/shotwell.glade:1238
+#: ../ui/shotwell.glade.h:31
 msgid "De_fault:"
 msgstr "_ברירת מחדל"
 
-#: ui/shotwell.glade:1292
+#: ../ui/shotwell.glade.h:33
 msgid "E_xternal photo editor:"
 msgstr "עורך תמונות _חיצוני:"
 
-#: ui/shotwell.glade:1308
+#: ../ui/shotwell.glade.h:34
 msgid "External _RAW editor:"
 msgstr "עורך RAW _חיצוני:"
 
-#: ui/shotwell.glade:1373
+#: ../ui/shotwell.glade.h:35
 msgid "External Editors"
 msgstr "עורכים חיצוניים"
 
-#: ui/shotwell.glade:1400
+#: ../ui/shotwell.glade.h:36
 msgid "Plugins"
 msgstr "תוספים"
 
-#: ui/shotwell.glade:1469
+#: ../ui/shotwell.glade.h:37
 msgid "_Delay:"
 msgstr "ה_שהיה:"
 
-#: ui/shotwell.glade:1485
+#: ../ui/shotwell.glade.h:38
 msgid "_Transition effect:"
 msgstr "_אפקט מעבר:"
 
-#: ui/shotwell.glade:1501
+#: ../ui/shotwell.glade.h:39
 msgid "Transition d_elay:"
 msgstr "ה_שהיית המעבר:"
 
-#: ui/shotwell.glade:1513
+#: ../ui/shotwell.glade.h:40
 msgid "Show t_itle"
 msgstr "הצג _כותרת"
 
-#: ui/shotwell.glade:1603 ui/shotwell.glade:1616
+#: ../ui/shotwell.glade.h:41
 msgid "seconds"
 msgstr "שניות"
 
-#: ui/shotwell.glade:1696
-msgid "_Login"
-msgstr "_כניסה"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:21
-msgid ""
-" (text depends on fb username and is modified in the app - \n"
-"anything put into this field won't display)"
-msgstr ""
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:39
-msgid "Publish to an e_xisting album:"
-msgstr "פרסום לאלבום _קיים:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:57
-msgid "Create a _new album named:"
-msgstr "יצירת אלבום _חדש בשם:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:139
-msgid "Videos and new photo albums _visible to:"
-msgstr "קטעי הווידאו והתמונות החדשים _גלויים לעיני:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:175
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:102
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:178
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:226
-msgid ""
-"_Remove location, camera, and other identifying information before uploading"
-msgstr ""
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:197
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:137
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:229
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:99
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:115
-msgid "_Logout"
-msgstr "י_ציאה"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:212
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:153
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:243
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:115
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:129
-msgid "_Publish"
-msgstr "_פרסום"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:16
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr "נא להזין את מספר האימות שמופיע לאחר הכניסה ל־Flickr בדפדפן שלך."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:37
-msgid "Authorization _Number:"
-msgstr "מספר ה_אימות:"
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:19
-msgid ""
-"You are logged into Flickr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-msgstr ""
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:44
-msgid "_visibility label (populated in the code)"
-msgstr ""
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:61
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:60
-msgid "Photo _size:"
-msgstr "_גודל תמונה:"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:18
-msgid ""
-"'you are logged in as $name'\n"
-"(populated in the application code)"
-msgstr ""
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:75
-msgid "An _existing album:"
-msgstr "אלבום _קיים:"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:94
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:52
-msgid "A _new album named:"
-msgstr "_אלבום חדש בשם:"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:113
-msgid "L_ist album in public gallery"
-msgstr "ה_צגת האלבום בגלריה ציבורית"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:134
-msgid ""
-"$mediatype will appear in\n"
-"(populated in code)"
-msgstr ""
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:150
-msgid "Photo _size preset:"
-msgstr "ערכת _גודל התמונה:"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:49
-msgid "_URL of your Piwigo photo library"
-msgstr "_כתובת של ספריית התמונות שלך ב־Piwigo"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:59
-msgid "User _name"
-msgstr "_שם משתמש"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:73
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:59
-msgid "_Password"
-msgstr "_ססמה"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:130
-msgid "_Remember Password"
-msgstr "_זכור ססמה"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:151
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:107
-msgid "Login"
-msgstr "כניסה"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:40
-msgid "An _existing category:"
-msgstr "_קטגוריה קיימת:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:121
-msgid "Photos will be _visible by:"
-msgstr "התמונות יהיו זמינות _עד:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:149
-msgid "Photo size:"
-msgstr "גודל התמונה:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:176
-msgid "within category:"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:210
-msgid "Album comment:"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:242
-msgid "_If a title is set and comment unset, use title as comment"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:258
-msgid "_Do no upload tags"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:278
-msgid "Logout"
-msgstr "התנתקות"
-
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:55
-msgid "Video privacy _setting:"
-msgstr "הגדרות ה_פרטיות של הווידאו:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:38
-msgid "Copyright 2012 BJA Electronics"
-msgstr "כל הזכויות שמורות 2012 ל־BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:109
-msgid "1280 x 853 pixels"
-msgstr "1280‎ × 853 פיקסלים"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:313
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:323
-#, c-format
-msgid "'%s' isn't a valid response to an OAuth authentication request"
-msgstr "'%s' אינו פלט תקין לבקשת אימות מסוג OAuth"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:561
-msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( )‎: אינו ניתן לאתחול, כיוון שמנשק זה אינו ניתן לאתחול "
-"מחדש."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:589
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr "נא להזין את שם המשתמש והססמה של חשבון ה־Tumblr שלך"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:639
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:760
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "טעינת המנשק נכשלה: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:742
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"נכנסת לחשבונך ב־Tumblr בשם %s.\n"
-"\n"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:24
-msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-msgstr "כל הזכויות שמורות 2010+ ל־Evgeniy Polyakov‏ <zbr@ioremap.net>"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:27
-msgid "Visit the Yandex.Fotki web site"
-msgstr "ביקור באתר Yandex.Fotki"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:635
-msgid "You are not currently logged into Yandex.Fotki."
-msgstr "לא נכנסת לשירות Yandex.Fotki."
-
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:49
-msgid "_Email address"
-msgstr "כתובת _דוא״ל"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:19
-msgid ""
-"You are logged into Tumblr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-msgstr ""
-"נכנסת לחשבון ה־Tumblr בשם (name).\n"
-"\n"
-"(תווית זו נקבעת בתוך הקוד, \n"
-"ולכן שינויים כאן לא יוצגו)"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:43
-msgid "Blogs:"
-msgstr "בלוגים:"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:24
-msgid "_Albums (or write new):"
-msgstr "_אלבומים (או כתיבת חדש):"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:38
-msgid "Access _type:"
-msgstr "_סוג הגישה"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:81
-msgid "Disable _comments"
-msgstr "נטרול הה_ערות"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:96
-msgid "_Forbid downloading original photo"
-msgstr "_איסור הורדת התמונה המקורית"
+#~ msgid "Only _Remove"
+#~ msgstr "ה_סרה בלבד"
+
+#~ msgid "Import media _from:"
+#~ msgstr "יבוא מדיה מהמי_קום:"
+
+#~ msgid "Shotwell is configured to import photos to your home directory.\n"
+#~ msgstr "Shotwell מוגדרת לייבא תמונות לתיקיית הבית שלך.\n"
+
+#~ msgid ""
+#~ "You are logged into Tumblr as (name).\n"
+#~ "\n"
+#~ "(this label's string is populated and set inside the code, \n"
+#~ "so changes made here will not display)"
+#~ msgstr ""
+#~ "נכנסת לחשבון ה־Tumblr בשם (name).\n"
+#~ "\n"
+#~ "(תווית זו נקבעת בתוך הקוד, \n"
+#~ "ולכן שינויים כאן לא יוצגו)"
diff --git a/po/hu.po b/po/hu.po
index e92e9b8..50fd51e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: shotwell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2014-10-06 22:50+0000\n"
-"PO-Revision-Date: 2014-10-09 01:02+0200\n"
+"POT-Creation-Date: 2014-09-26 23:14+0000\n"
+"PO-Revision-Date: 2014-10-08 23:08+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <openscope at googlegroups dot com>\n"
 "Language: hu\n"
@@ -168,6 +168,12 @@ msgid "Gallery3 publishing module"
 msgstr "Gallery3 közzétételi modul"
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
+#| msgid ""
+#| "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."
 msgid ""
 "You are not currently logged into your Gallery.\n"
 "\n"
@@ -184,6 +190,7 @@ msgid "Shotwell"
 msgstr "Shotwell"
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+#| msgid "Shotwell Preferences"
 msgid "Shotwell default directory"
 msgstr "Shotwell alapértelmezett könyvtár"
 
@@ -206,30 +213,48 @@ msgid ""
 "Note that Gallery3 only supports the video types that Flowplayer does."
 msgstr ""
 "\n"
-"Ne feledje, hogy a Gallery3 csak a Flowplayer által támogatott "
-"videotípusokat támogatja."
+"Ne feledje, hogy a Gallery3 csak a Flowplayer által támogatott videotípusokat "
+"támogatja."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1774
-msgid "A file required for publishing is unavailable. Publishing to "
-msgstr "Egy, a közzétételhez szükséges fájl nem érhető el. A közzététel ide: "
+#, c-format
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Picasa can't "
+#| "continue."
+msgid ""
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
+msgstr ""
+"Egy, a közzétételhez szükséges fájl nem érhető el. A közzététel nem "
+"folytatódhat ide: %s."
 
 #. populate any widgets whose contents are
 #. programmatically-generated
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
 #, c-format
+#| msgid "Publish Photos and Videos"
 msgid "Publishing to %s as %s."
 msgstr "Közzététel ide: %s, mint %s."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1816
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Flickr can't "
+#| "continue."
+msgid "A file required for publishing is unavailable. Publishing to "
+msgstr "Egy, a közzétételhez szükséges fájl nem érhető el. A közzététel ide: "
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+#| msgid ""
+#| "Enter the URL of your Piwigo photo library as well as the username and "
+#| "password associated with your Piwigo account for that library."
 msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
 msgstr ""
-"Adja meg a Gallery3 oldalának URL-címét, valamint az ahhoz tartozó Gallery3 "
-"fiókjának felhasználónevét és jelszavát (vagy API kulcsát)."
+"Adja meg a Gallery3 oldalának URL-címét, valamint az ahhoz tartozó "
+"Gallery3 fiókjának felhasználónevét és jelszavát (vagy API kulcsát)."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
 msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
@@ -237,21 +262,21 @@ msgstr ""
 "A felhasználónév és a jelszó vagy API kulcs helytelen. Az újrapróbálkozáshoz "
 "adja meg újra a felhasználónevét és jelszavát alább."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
 msgid ""
 "The URL entered does not appear to be the main directory of a Gallery3 "
 "instance. Please make sure you typed it correctly and it does not have any "
 "trailing components (e.g., index.php)."
 msgstr ""
-"A megadott URL nem tűnik egy Gallery3 telepítés gyökérkönyvtárának. "
-"Győződjön meg róla, hogy helyesen írta, és nem tartalmaz záró összetevőket "
-"(például: index.php)."
+"A megadott URL nem tűnik egy Gallery3 telepítés gyökérkönyvtárának. Győződjön "
+"meg róla, hogy helyesen írta, és nem tartalmaz záró összetevőket (például: "
+"index.php)."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1871
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
 msgid "Unrecognized User"
 msgstr "Ismeretlen felhasználó"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1876
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
 msgid " Site Not Found"
 msgstr " Az oldal nem található"
 
@@ -260,18 +285,23 @@ msgid "Copyright (C) 2013 rajce.net"
 msgstr "Copyright (C) 2013 rajce.net"
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
+#| msgid ""
+#| "An error message occurred when publishing to Piwigo. Please try again."
 msgid "An error message occurred when publishing to Rajce. Please try again."
 msgstr "Hibaüzenet érkezett a Rajce-n való közzététel során. Próbálja újra."
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
+#| msgid "Enter the username and password associated with your Tumblr account."
 msgid "Enter email and password associated with your Rajce account."
 msgstr "Adja meg a Rajce fiókjához tartozó e-mail címet és jelszót."
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
+#| msgid "Username and/or password invalid. Please try again"
 msgid "Invalid email and/or password. Please try again"
 msgstr "Érvénytelen e-mail cím és/vagy jelszó, próbálja újra."
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
+#| msgid "Invalid User Name or Password"
 msgid "Invalid User Email or Password"
 msgstr "Érvénytelen felhasználói e-mail cím vagy jelszó"
 
@@ -290,6 +320,7 @@ msgstr "_Jelszó"
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
 #: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
+#| msgid "_Remember Password"
 msgid "_Remember"
 msgstr "_Megjegyzés"
 
@@ -307,6 +338,9 @@ msgstr "_Album elrejtése"
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
+#| msgid ""
+#| "You are logged into Facebook as %s.\n"
+#| "\n"
 msgid "You are logged into Rajce as %s."
 msgstr "Bejelentkezett a Rajce-ra %s néven."
 
@@ -363,13 +397,13 @@ msgid "Copyright 2012 BJA Electronics"
 msgstr "Copyright 2012 BJA Electronics"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1229
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
 msgid "500 x 375 pixels"
 msgstr "500 x 375 képpont"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1230
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
 msgid "1024 x 768 pixels"
 msgstr "1024 x 768 képpont"
@@ -437,6 +471,7 @@ msgid "Shotwell Extra Publishing Services"
 msgstr "Shotwell extra közzétételi szolgáltatások"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
+#| msgid "Back"
 msgid "Go _Back"
 msgstr "_Vissza"
 
@@ -455,10 +490,12 @@ msgid "_Gallery3 URL:"
 msgstr "_Gallery3 URL:"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
+#| msgid "User _name"
 msgid "_User name:"
 msgstr "_Felhasználónév:"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
+#| msgid "_Password"
 msgid "_Password:"
 msgstr "_Jelszó:"
 
@@ -467,22 +504,29 @@ msgid "API _Key:"
 msgstr "API _kulcs:"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
+#| msgid "hour"
+#| msgid_plural "hours"
 msgid "or"
 msgstr "vagy"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
+#| msgid "A _new album named:"
 msgid "A _new album"
 msgstr "Új _album"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
+#| msgid "An _existing album:"
 msgid "An _existing album"
 msgstr "_Egy létező album"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
+#| msgid ""
+#| "_Remove location, camera, and other identifying information before "
+#| "uploading"
 msgid "_Remove location, tag and camera-identifying data before uploading"
 msgstr ""
-"_Hely-, címke- és a fényképezőgép azonosításra alkalmas adatok eltávolítása "
-"a feltöltés előtt"
+"_Hely-, címke- és a fényképezőgép azonosításra alkalmas adatok eltávolítása a "
+"feltöltés előtt"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
 #, fuzzy
@@ -493,15 +537,17 @@ msgid "'Publishing to $url as $username' (populated in application code)"
 msgstr "küldjünk bugot hogy ezt szedjék ki"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
+#| msgid "_Scaling constraint:"
 msgid "Scaling constraint:"
 msgstr "Méretezési megszorítás:"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
+#| msgid " _pixels"
 msgid "pixels"
 msgstr "képpont"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
 #: ../src/Dimensions.vala:17
 msgid "Original size"
@@ -529,10 +575,14 @@ msgid "Photo _size:"
 msgstr "Fénykép _mérete:"
 
 #: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
+#| msgid ""
+#| "You are logged into Facebook as %s.\n"
+#| "\n"
 msgid "you are logged in rajce as $name"
 msgstr "Bejelentkezett a Rajce-ra $name néven"
 
 #: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
+#| msgid "Videos will appear in:"
 msgid "$mediatype will appear in"
 msgstr "A $mediatype itt jelennek meg:"
 
@@ -643,12 +693,12 @@ msgid "Upload _size:"
 msgstr "Feltöltés _mérete:"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
 msgid "Just me"
 msgstr "Csak én"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
 msgid "Everyone"
 msgstr "Mindenki"
@@ -703,55 +753,58 @@ msgstr ""
 "Bejelentkezett a Flickr-re %s néven.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
 #, c-format
 #| msgid ""
 #| "Your free Flickr account limits how much data you can upload per month.\n"
-#| "This month you have %d megabyte remaining in your upload quota."
-#| msgid_plural ""
-#| "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."
+#| "This month, you have %d megabytes remaining in your upload quota."
 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 ""
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"Az ingyenes Flickr fiókja korlátozza a havonta feltölthető adatmennyiséget.\n"
+"Ebben a hónapban még %d megabájt feltöltésére van lehetősége."
+msgstr[1] ""
 "Az ingyenes Flickr fiókja korlátozza a havonta feltölthető adatmennyiséget.\n"
 "Ebben a hónapban még %d megabájt feltöltésére van lehetősége."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1157
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Az Ön Flickr Pro fiókja korlátlan feltöltést engedélyez."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1162
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
 msgid "Photos _visible to:"
 msgstr "A _fényképeket láthatja:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
 msgid "Videos _visible to:"
 msgstr "A _videókat láthatja:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
 msgid "Photos and videos _visible to:"
 msgstr "A _fényképeket/videókat láthatja:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
 msgid "Friends & family only"
 msgstr "Csak barátok és család"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
 msgid "Family only"
 msgstr "Csak család"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Friends only"
 msgstr "Csak barátok"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
 msgid "2048 x 1536 pixels"
 msgstr "2048 x 1536 képpont"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
 msgid "4096 x 3072 pixels"
 msgstr "4096 x 3072 képpont"
@@ -987,7 +1040,7 @@ msgid "Logout"
 msgstr "Kijelentkezés"
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:268
+#: ../src/Resources.vala:270
 msgid "Publish"
 msgstr "Közzététel"
 
@@ -1115,7 +1168,7 @@ msgstr "_Hiba jelentése…"
 
 #: ../src/AppWindow.vala:624 ../src/AppWindow.vala:645
 #: ../src/AppWindow.vala:662 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1417 ../src/Dialogs.vala:1440
+#: ../src/Dialogs.vala:1422 ../src/Dialogs.vala:1445
 #: ../src/data_imports/DataImportsUI.vala:399
 #: ../src/publishing/PublishingUI.vala:498
 msgid "_Cancel"
@@ -1462,9 +1515,9 @@ msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
 msgstr[0] "Ez eltávolítja a(z) „%s” címkét egy fényképről. Folytatja?"
 msgstr[1] "Ez eltávolítja a(z) „%s” címkét %d fényképről. Folytatja?"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1385
-#: ../src/Resources.vala:328 ../src/Resources.vala:376
-#: ../src/Resources.vala:641
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1390
+#: ../src/Resources.vala:336 ../src/Resources.vala:384
+#: ../src/Resources.vala:649
 msgid "_Delete"
 msgstr "_Törlés"
 
@@ -1948,49 +2001,52 @@ msgstr "Esemény átnevezése"
 msgid "Name:"
 msgstr "Név:"
 
-#: ../src/Dialogs.vala:1329 ../src/Resources.vala:272
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1330 ../src/Resources.vala:275
 msgid "Edit Title"
 msgstr "Cím szerkesztése"
 
-#: ../src/Dialogs.vala:1329 ../src/Properties.vala:340
+#: ../src/Dialogs.vala:1331 ../src/Properties.vala:340
 msgid "Title:"
 msgstr "Cím:"
 
-#: ../src/Dialogs.vala:1343 ../src/Resources.vala:278
+#. Dialog title
+#: ../src/Dialogs.vala:1347 ../src/Resources.vala:282
 msgid "Edit Event Comment"
 msgstr "Eseménymegjegyzés szerkesztése"
 
-#: ../src/Dialogs.vala:1343
+#: ../src/Dialogs.vala:1348
 msgid "Edit Photo/Video Comment"
 msgstr "Fotó/videó megjegyzés szerkesztése"
 
-#: ../src/Dialogs.vala:1344 ../src/Properties.vala:630
+#: ../src/Dialogs.vala:1349 ../src/Properties.vala:630
 msgid "Comment:"
 msgstr "Megjegyzés:"
 
-#: ../src/Dialogs.vala:1360
+#: ../src/Dialogs.vala:1365
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "_Fájl eltávolítása és a Kukába helyezése"
 msgstr[1] "_Fájlok eltávolítása és a Kukába helyezésük"
 
-#: ../src/Dialogs.vala:1364
+#: ../src/Dialogs.vala:1369
 msgid "_Remove From Library"
 msgstr "_Eltávolítás a gyűjteményből"
 
-#: ../src/Dialogs.vala:1384 ../src/camera/ImportPage.vala:1739
+#: ../src/Dialogs.vala:1389 ../src/camera/ImportPage.vala:1739
 msgid "_Keep"
 msgstr "_Megtartás"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1412
 msgid "Revert External Edit?"
 msgstr "Visszavonja a külső szerkesztést?"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1412
 msgid "Revert External Edits?"
 msgstr "Visszavonja a külső szerkesztéseket?"
 
-#: ../src/Dialogs.vala:1409
+#: ../src/Dialogs.vala:1414
 #, c-format
 msgid "This will destroy all changes made to the external file.  Continue?"
 msgid_plural ""
@@ -1999,87 +2055,87 @@ msgstr[0] "Ezzel a külső fájlon végzett minden változtatás elvész. Folyta
 msgstr[1] ""
 "Ezzel a külső %d fájlon végzett minden változtatás elvész. Folytatja?"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1418
 msgid "Re_vert External Edit"
 msgstr "Külső szerkesztés _visszavonása"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1418
 msgid "Re_vert External Edits"
 msgstr "Külső szerkesztések _visszavonása"
 
-#: ../src/Dialogs.vala:1434
+#: ../src/Dialogs.vala:1439
 #, 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] "Ezzel eltávolítja a fényképet a gyűjteményből. Folytatja?"
 msgstr[1] "Ezzel eltávolít %d fényképet a gyűjteményből. Folytatja?"
 
-#: ../src/Dialogs.vala:1441
+#: ../src/Dialogs.vala:1446
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1447
 msgid "Remove Photo From Library"
 msgstr "Fénykép eltávolítása a gyűjteményből"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1447
 msgid "Remove Photos From Library"
 msgstr "Fényképek eltávolítása a gyűjteményből"
 
-#: ../src/Dialogs.vala:1535
+#: ../src/Dialogs.vala:1540
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1682
+#: ../src/Dialogs.vala:1687
 msgid "AM"
 msgstr "DE"
 
-#: ../src/Dialogs.vala:1683
+#: ../src/Dialogs.vala:1688
 msgid "PM"
 msgstr "DU"
 
-#: ../src/Dialogs.vala:1684
+#: ../src/Dialogs.vala:1689
 msgid "24 Hr"
 msgstr "24 óra"
 
-#: ../src/Dialogs.vala:1699
+#: ../src/Dialogs.vala:1704
 msgid "_Shift photos/videos by the same amount"
 msgstr "Fotók/videók _eltolása azonos mennyiséggel"
 
-#: ../src/Dialogs.vala:1704
+#: ../src/Dialogs.vala:1709
 msgid "Set _all photos/videos to this time"
 msgstr "Min_den fotó/videó beállítása erre az időre"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1716
 msgid "_Modify original photo file"
 msgstr "Eredeti fényképfájl _módosítása"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1716
 msgid "_Modify original photo files"
 msgstr "Eredeti fényképfájlok _módosítása"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1719
 msgid "_Modify original file"
 msgstr "Eredeti fájl _módosítása"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1719
 msgid "_Modify original files"
 msgstr "Eredeti fájlok _módosítása"
 
-#: ../src/Dialogs.vala:1800
+#: ../src/Dialogs.vala:1805
 msgid "Original: "
 msgstr "Eredeti: "
 
-#: ../src/Dialogs.vala:1801
+#: ../src/Dialogs.vala:1806
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%Y. %m. %d., %k.%M.%S"
 
-#: ../src/Dialogs.vala:1802
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%Y. %m. %d., %l.%M.%S %p"
 
-#: ../src/Dialogs.vala:1891
+#: ../src/Dialogs.vala:1896
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -2088,7 +2144,7 @@ msgstr ""
 "A képek készítése előre lesz tolva ennyivel:\n"
 "%d %s, %d %s, %d %s, és %d %s."
 
-#: ../src/Dialogs.vala:1892
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2097,31 +2153,31 @@ msgstr ""
 "A képek készítése vissza lesz tolva ennyivel:\n"
 "%d %s, %d %s, %d %s, és %d %s."
 
-#: ../src/Dialogs.vala:1894
+#: ../src/Dialogs.vala:1899
 msgid "day"
 msgid_plural "days"
 msgstr[0] "nap"
 msgstr[1] "nap"
 
-#: ../src/Dialogs.vala:1895
+#: ../src/Dialogs.vala:1900
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "óra"
 msgstr[1] "óra"
 
-#: ../src/Dialogs.vala:1896
+#: ../src/Dialogs.vala:1901
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "perc"
 msgstr[1] "perc"
 
-#: ../src/Dialogs.vala:1897
+#: ../src/Dialogs.vala:1902
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "másodperc"
 msgstr[1] "másodperc"
 
-#: ../src/Dialogs.vala:1941
+#: ../src/Dialogs.vala:1946
 #, c-format
 msgid ""
 "\n"
@@ -2140,53 +2196,53 @@ msgstr[1] ""
 "\n"
 "És %d egyéb."
 
-#: ../src/Dialogs.vala:1963 ../src/Dialogs.vala:1990
+#: ../src/Dialogs.vala:1968 ../src/Dialogs.vala:1995
 msgid "Tags (separated by commas):"
 msgstr "Címkék (vesszővel elválasztva):"
 
-#: ../src/Dialogs.vala:2070
+#: ../src/Dialogs.vala:2075
 msgid "Welcome!"
 msgstr "Üdvözöljük!"
 
-#: ../src/Dialogs.vala:2077
+#: ../src/Dialogs.vala:2082
 msgid "Welcome to Shotwell!"
 msgstr "Üdvözöljük a Shotwellben!"
 
-#: ../src/Dialogs.vala:2081
+#: ../src/Dialogs.vala:2086
 msgid "To get started, import photos in any of these ways:"
 msgstr "Az alábbi módokon importálhatja fényképeit:"
 
-#: ../src/Dialogs.vala:2100
+#: ../src/Dialogs.vala:2105
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr ""
 "Válassza a <span weight=\"bold\">Fájl %s Importálás mappából</span> "
 "menüpontot"
 
-#: ../src/Dialogs.vala:2101
+#: ../src/Dialogs.vala:2106
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Húzza fényképeit a Shotwell ablakába"
 
-#: ../src/Dialogs.vala:2102
+#: ../src/Dialogs.vala:2107
 msgid "Connect a camera to your computer and import"
 msgstr ""
 "Csatlakoztasson egy fényképezőgépet a számítógéphez, és importálja a "
 "fényképeit"
 
-#: ../src/Dialogs.vala:2112
+#: ../src/Dialogs.vala:2117
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "Fényképek i_mportálása a(z) %s mappájából"
 
-#: ../src/Dialogs.vala:2119
+#: ../src/Dialogs.vala:2124
 msgid "You can also import photos in any of these ways:"
 msgstr "Fényképeket a következő módokon is importálhat:"
 
-#: ../src/Dialogs.vala:2129
+#: ../src/Dialogs.vala:2134
 msgid "_Don't show this message again"
 msgstr "_Ne jelenjen meg ez az üzenet többé"
 
-#: ../src/Dialogs.vala:2164
+#: ../src/Dialogs.vala:2169
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Fényképek importálása a(z) %s gyűjteményéből"
@@ -2194,41 +2250,41 @@ msgstr "Fényképek importálása a(z) %s gyűjteményéből"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2308 ../src/Dialogs.vala:2312
+#: ../src/Dialogs.vala:2313 ../src/Dialogs.vala:2317
 msgid "(Help)"
 msgstr "(Súgó)"
 
-#: ../src/Dialogs.vala:2321
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Év%sHónap%sNap"
 
-#: ../src/Dialogs.vala:2323
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth"
 msgstr "Év%sHónap"
 
-#: ../src/Dialogs.vala:2325
+#: ../src/Dialogs.vala:2330
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Év%sHónap-Nap"
 
-#: ../src/Dialogs.vala:2327
+#: ../src/Dialogs.vala:2332
 msgid "Year-Month-Day"
 msgstr "Év-Hónap-Nap"
 
-#: ../src/Dialogs.vala:2328 ../src/editing_tools/EditingTools.vala:781
+#: ../src/Dialogs.vala:2333 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Egyéni"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2565
+#: ../src/Dialogs.vala:2570
 msgid "Invalid pattern"
 msgstr "Érvénytelen minta"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: ../src/Dialogs.vala:2668
+#: ../src/Dialogs.vala:2673
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2236,31 +2292,31 @@ msgstr ""
 "A Shotwell átmásolhatja a fényképeket a gyűjtemény könyvtárába, vagy "
 "importálhatja azokat másolás nélkül is."
 
-#: ../src/Dialogs.vala:2673
+#: ../src/Dialogs.vala:2678
 msgid "Co_py Photos"
 msgstr "Fény_képek másolása"
 
-#: ../src/Dialogs.vala:2674
+#: ../src/Dialogs.vala:2679
 msgid "_Import in Place"
 msgstr "_Importálás"
 
-#: ../src/Dialogs.vala:2675
+#: ../src/Dialogs.vala:2680
 msgid "Import to Library"
 msgstr "Importálás a gyűjteménybe"
 
-#: ../src/Dialogs.vala:2685 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2690 ../src/PhotoPage.vala:3086
 msgid "Remove From Library"
 msgstr "Eltávolítás a gyűjteményből"
 
-#: ../src/Dialogs.vala:2686 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2691 ../src/PhotoPage.vala:3086
 msgid "Removing Photo From Library"
 msgstr "Fényképek eltávolítás a gyűjteményből"
 
-#: ../src/Dialogs.vala:2686
+#: ../src/Dialogs.vala:2691
 msgid "Removing Photos From Library"
 msgstr "Fényképek eltávolítása a gyűjteményből"
 
-#: ../src/Dialogs.vala:2700
+#: ../src/Dialogs.vala:2705
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -2283,7 +2339,7 @@ msgstr[1] ""
 "\n"
 "Ez a művelet nem vonható vissza."
 
-#: ../src/Dialogs.vala:2704
+#: ../src/Dialogs.vala:2709
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -2306,7 +2362,7 @@ msgstr[1] ""
 "\n"
 "Ez a művelet nem vonható vissza."
 
-#: ../src/Dialogs.vala:2708
+#: ../src/Dialogs.vala:2713
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -2329,7 +2385,7 @@ msgstr[1] ""
 "\n"
 "Ez a művelet nem vonható vissza."
 
-#: ../src/Dialogs.vala:2740
+#: ../src/Dialogs.vala:2745
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -2339,7 +2395,7 @@ msgstr[0] "%d fotó vagy videó nem helyezhető át a Kukába. Törli a fájlt?"
 msgstr[1] "%d fotó vagy videó nem helyezhető át a Kukába. Törli a fájlokat?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2757
+#: ../src/Dialogs.vala:2762
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -3187,347 +3243,353 @@ msgstr "Összes fénykép megjelenítése, a visszautasítottak is"
 msgid "_All Photos"
 msgstr "Öss_zes fénykép"
 
-#: ../src/Resources.vala:249 ../src/Resources.vala:250
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:250 ../src/Resources.vala:252
 msgid "Show all photos"
 msgstr "Összes fénykép megjelenítése"
 
-#: ../src/Resources.vala:252
+#: ../src/Resources.vala:254
 msgid "_Ratings"
 msgstr "É_rtékelések"
 
-#: ../src/Resources.vala:253
+#: ../src/Resources.vala:255
 msgid "Display each photo's rating"
 msgstr "A fényképek értékelésének megjelenítése"
 
-#: ../src/Resources.vala:255
+#: ../src/Resources.vala:257
 msgid "_Filter Photos"
 msgstr "_Fényképek szűrése"
 
-#: ../src/Resources.vala:256
+#: ../src/Resources.vala:258
 msgid "Filter Photos"
 msgstr "Fényképek szűrése"
 
-#: ../src/Resources.vala:257
+#: ../src/Resources.vala:259
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "A megjelenített fényképek számának korlátozása szűrővel"
 
-#: ../src/Resources.vala:259
+#: ../src/Resources.vala:261
 msgid "_Duplicate"
 msgstr "_Többszörözés"
 
-#: ../src/Resources.vala:260
+#: ../src/Resources.vala:262
 msgid "Duplicate"
 msgstr "Többszörözés"
 
-#: ../src/Resources.vala:261
+#: ../src/Resources.vala:263
 msgid "Make a duplicate of the photo"
 msgstr "Másolat készítése a fényképről"
 
-#: ../src/Resources.vala:263
+#: ../src/Resources.vala:265
 msgid "_Export..."
 msgstr "_Exportálás…"
 
-#: ../src/Resources.vala:265
+#: ../src/Resources.vala:267
 msgid "_Print..."
 msgstr "_Nyomtatás…"
 
-#: ../src/Resources.vala:267
+#: ../src/Resources.vala:269
 msgid "Pu_blish..."
 msgstr "Kö_zzététel…"
 
-#: ../src/Resources.vala:269
+#: ../src/Resources.vala:271
 msgid "Publish to various websites"
 msgstr "Közzététel különböző weboldalakon"
 
-#: ../src/Resources.vala:271
+#: ../src/Resources.vala:273
 msgid "Edit _Title..."
 msgstr "_Cím szerkesztése…"
 
-#: ../src/Resources.vala:274
+#: ../src/Resources.vala:277
 msgid "Edit _Comment..."
 msgstr "Megjegyzés s_zerkesztése…"
 
-#: ../src/Resources.vala:275
+#. Button label
+#: ../src/Resources.vala:279
 msgid "Edit Comment"
 msgstr "A megjegyzés szerkesztése"
 
-#: ../src/Resources.vala:277
+#: ../src/Resources.vala:281
 msgid "Edit Event _Comment..."
 msgstr "_Eseménymegjegyzés szerkesztése…"
 
-#: ../src/Resources.vala:280
+#: ../src/Resources.vala:284
 msgid "_Adjust Date and Time..."
 msgstr "_Dátum és idő módosítása…"
 
-#: ../src/Resources.vala:281
+#: ../src/Resources.vala:285
 msgid "Adjust Date and Time"
 msgstr "Dátum és idő módosítása"
 
-#: ../src/Resources.vala:283
+#: ../src/Resources.vala:287
 msgid "Add _Tags..."
 msgstr "_Címkék hozzáadása…"
 
-#: ../src/Resources.vala:284
+#: ../src/Resources.vala:288
 msgid "_Add Tags..."
 msgstr "Címkék hozzáadása…"
 
-#: ../src/Resources.vala:285 ../src/Resources.vala:316
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:290 ../src/Resources.vala:323
 msgid "Add Tags"
 msgstr "Címkék hozzáadása"
 
-#: ../src/Resources.vala:287
+#: ../src/Resources.vala:292
 msgid "_Preferences"
 msgstr "_Beállítások"
 
-#: ../src/Resources.vala:289
+#: ../src/Resources.vala:294
 msgid "Open With E_xternal Editor"
 msgstr "Megnyitás külső _szerkesztővel"
 
-#: ../src/Resources.vala:291
+#: ../src/Resources.vala:296
 msgid "Open With RA_W Editor"
 msgstr "Megnyitás RA_W szerkesztővel"
 
-#: ../src/Resources.vala:293
+#: ../src/Resources.vala:298
 msgid "Send _To..."
 msgstr "Kül_dés…"
 
-#: ../src/Resources.vala:294
+#: ../src/Resources.vala:299
 msgid "Send T_o..."
 msgstr "Küldés _célja…"
 
-#: ../src/Resources.vala:296
+#: ../src/Resources.vala:301
 msgid "_Find..."
 msgstr "_Keresés…"
 
-#: ../src/Resources.vala:297
+#: ../src/Resources.vala:302
 msgid "Find"
 msgstr "Keresés"
 
-#: ../src/Resources.vala:298
+#: ../src/Resources.vala:303
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Kép keresése a névben vagy a címkékben megjelenő szöveg beírásával"
 
-#: ../src/Resources.vala:300
+#: ../src/Resources.vala:305
 msgid "_Flag"
 msgstr "_Megjelölés"
 
-#: ../src/Resources.vala:302
+#: ../src/Resources.vala:307
 msgid "Un_flag"
 msgstr "Megjelölés _törlése"
 
-#: ../src/Resources.vala:305
+#: ../src/Resources.vala:310
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "A szerkesztő nem indítható el: %s"
 
-#: ../src/Resources.vala:310
+#: ../src/Resources.vala:315
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "„%s” címke hozzáadása"
 
-#: ../src/Resources.vala:312
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:318
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "„%s” és „%s” címke hozzáadása"
 
-#: ../src/Resources.vala:320
+#: ../src/Resources.vala:328
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "„%s” címke _törlése"
 
-#: ../src/Resources.vala:324
+#: ../src/Resources.vala:332
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "„%s” címke törlése"
 
-#: ../src/Resources.vala:327
+#: ../src/Resources.vala:335
 msgid "Delete Tag"
 msgstr "Címke törlése"
 
-#: ../src/Resources.vala:330
+#: ../src/Resources.vala:338
 msgid "_New"
 msgstr "Ú_j"
 
-#: ../src/Resources.vala:333
+#: ../src/Resources.vala:341
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "„%s” címke át_nevezése…"
 
-#: ../src/Resources.vala:337
+#: ../src/Resources.vala:345
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "„%s” címke átnevezése erre: „%s”"
 
-#: ../src/Resources.vala:340
+#: ../src/Resources.vala:348
 msgid "_Rename..."
 msgstr "Át_nevezés…"
 
-#: ../src/Resources.vala:342
+#: ../src/Resources.vala:350
 msgid "Modif_y Tags..."
 msgstr "Cí_mkék módosítása…"
 
-#: ../src/Resources.vala:343
+#: ../src/Resources.vala:351
 msgid "Modify Tags"
 msgstr "Címkék módosítása"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:354
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Fényképek címkézése ezzel: „%s”"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:354
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Fényképek címkézése ezzel: „%s”"
 
-#: ../src/Resources.vala:350
+#: ../src/Resources.vala:358
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "Kiválasztott fényképek címkézése ezzel: „%s”"
 
-#: ../src/Resources.vala:351
+#: ../src/Resources.vala:359
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "Kiválasztott fényképek címkézése ezzel: „%s”"
 
-#: ../src/Resources.vala:355
+#: ../src/Resources.vala:363
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "„%s” címke _eltávolítása a fényképről"
 
-#: ../src/Resources.vala:356
+#: ../src/Resources.vala:364
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "„%s” címke _eltávolítása a fényképekről"
 
-#: ../src/Resources.vala:360
+#: ../src/Resources.vala:368
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "„%s” címke eltávolítása a fényképről"
 
-#: ../src/Resources.vala:361
+#: ../src/Resources.vala:369
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "„%s” címke eltávolítása a fényképekről"
 
-#: ../src/Resources.vala:365
+#: ../src/Resources.vala:373
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr "A címke nem nevezhető át erre: „%s”, mert a címke már létezik."
 
-#: ../src/Resources.vala:369
+#: ../src/Resources.vala:377
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr "Nem lehet átnevezni a keresést erre: „%s”, mert a keresés már létezik."
 
-#: ../src/Resources.vala:372
+#: ../src/Resources.vala:380
 msgid "Saved Search"
 msgstr "Mentett keresés"
 
-#: ../src/Resources.vala:374
+#: ../src/Resources.vala:382
 msgid "Delete Search"
 msgstr "Keresés törlése"
 
-#: ../src/Resources.vala:377
+#: ../src/Resources.vala:385
 msgid "_Edit..."
 msgstr "S_zerkesztés…"
 
-#: ../src/Resources.vala:378
+#: ../src/Resources.vala:386
 msgid "Re_name..."
 msgstr "Át_nevezés…"
 
-#: ../src/Resources.vala:381
+#: ../src/Resources.vala:389
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "„%s” keresés átnevezése erre: „%s”"
 
-#: ../src/Resources.vala:385
+#: ../src/Resources.vala:393
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "„%s” keresés törlése"
 
-#: ../src/Resources.vala:543
+#: ../src/Resources.vala:551
 #, c-format
 msgid "Rate %s"
 msgstr "%s értékelés"
 
-#: ../src/Resources.vala:544
+#: ../src/Resources.vala:552
 #, c-format
 msgid "Set rating to %s"
 msgstr "Értékelés beállítása erre: %s"
 
-#: ../src/Resources.vala:545
+#: ../src/Resources.vala:553
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Értékelés beállítása erre: %s"
 
-#: ../src/Resources.vala:547
+#: ../src/Resources.vala:555
 #, c-format
 msgid "Display %s"
 msgstr "%s megjelenítése"
 
-#: ../src/Resources.vala:548
+#: ../src/Resources.vala:556
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Csak azon fényképek megjelenítése, amelyek értékelése %s"
 
-#: ../src/Resources.vala:549
+#: ../src/Resources.vala:557
 #, c-format
 msgid "%s or Better"
 msgstr "%s vagy jobb"
 
-#: ../src/Resources.vala:550
+#: ../src/Resources.vala:558
 #, c-format
 msgid "Display %s or Better"
 msgstr "%s vagy jobb megjelenítése"
 
-#: ../src/Resources.vala:551
+#: ../src/Resources.vala:559
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Csak azon fényképek mutatása, amelyek értékelése %s vagy jobb"
 
-#: ../src/Resources.vala:642
+#: ../src/Resources.vala:650
 msgid "Remove the selected photos from the trash"
 msgstr "Kijelölt fényképek eltávolítása a Kukából"
 
-#: ../src/Resources.vala:643
+#: ../src/Resources.vala:651
 msgid "Remove the selected photos from the library"
 msgstr "Kijelölt fényképek eltávolítása a gyűjteményből"
 
-#: ../src/Resources.vala:645
+#: ../src/Resources.vala:653
 msgid "_Restore"
 msgstr "_Visszaállítás"
 
-#: ../src/Resources.vala:646
+#: ../src/Resources.vala:654
 msgid "Move the selected photos back into the library"
 msgstr "Kijelölt fényképek visszaállítása a gyűjteménybe"
 
-#: ../src/Resources.vala:648
+#: ../src/Resources.vala:656
 msgid "Show in File Mana_ger"
 msgstr "_Megjelenítés a fájlkezelőben"
 
-#: ../src/Resources.vala:649
+#: ../src/Resources.vala:657
 msgid "Open the selected photo's directory in the file manager"
 msgstr "Kijelölt fénykép könyvtárának megnyitása a fájlkezelőben"
 
-#: ../src/Resources.vala:652
+#: ../src/Resources.vala:660
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Nem nyitható meg a fájlkezelőben: %s"
 
-#: ../src/Resources.vala:655
+#: ../src/Resources.vala:663
 msgid "R_emove From Library"
 msgstr "_Eltávolítás a gyűjteményből"
 
-#: ../src/Resources.vala:657
+#: ../src/Resources.vala:665
 msgid "_Move to Trash"
 msgstr "Á_thelyezés a Kukába"
 
-#: ../src/Resources.vala:659
+#: ../src/Resources.vala:667
 msgid "Select _All"
 msgstr "Összes _kijelölése"
 
-#: ../src/Resources.vala:660
+#: ../src/Resources.vala:668
 msgid "Select all items"
 msgstr "Minden elem kijelölése"
 
@@ -3535,20 +3597,20 @@ msgstr "Minden elem kijelölése"
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:741
+#: ../src/Resources.vala:749
 msgid "%-I:%M %p"
 msgstr "%H.%M"
 
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:746
+#: ../src/Resources.vala:754
 msgid "%-I:%M:%S %p"
 msgstr "%H.%M.%S"
 
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:750
+#: ../src/Resources.vala:758
 msgid "%a %b %d, %Y"
 msgstr "%Y. %b. %d., %a"
 
@@ -3558,14 +3620,14 @@ msgstr "%Y. %b. %d., %a"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:755 ../src/Resources.vala:765
+#: ../src/Resources.vala:763 ../src/Resources.vala:773
 msgid "%a %b %d"
 msgstr "%a. %b. %d"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:760
+#: ../src/Resources.vala:768
 msgid "%d, %Y"
 msgstr "%Y. %d."
 
@@ -4735,6 +4797,7 @@ msgid "Tags"
 msgstr "Címkék"
 
 #: ../ui/set_background_dialog.glade.h:1
+#| msgid "Set as _Desktop Background"
 msgid "Set as Desktop Background"
 msgstr "Beállítás asztalháttérként"
 
@@ -4924,13 +4987,6 @@ msgstr "_Cím megjelenítése"
 msgid "seconds"
 msgstr "másodperc"
 
-#~ msgid ""
-#~ "A file required for publishing is unavailable. Publishing to %s can't "
-#~ "continue."
-#~ msgstr ""
-#~ "Egy, a közzétételhez szükséges fájl nem érhető el. A közzététel nem "
-#~ "folytatódhat ide: %s."
-
 #~ msgid "Only _Remove"
 #~ msgstr "_Csak eltávolítás"
 
diff --git a/po/id.po b/po/id.po
index 58e4c3b..5238dd6 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,5 +1,4 @@
-# po/shotwell-core/shotwell.pot
-# PO message string template file for Shotwell Core Components
+# Indonesian translation for shotwell
 # Copyright (C) 2009-2013 Yorba Foundation
 # See COPYING for license.
 #
@@ -20,8 +19,8 @@ msgstr ""
 "Project-Id-Version: shotwell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2014-05-27 20:10+0000\n"
-"PO-Revision-Date: 2014-09-05 19:50+0700\n"
+"POT-Creation-Date: 2014-10-04 10:53+0000\n"
+"PO-Revision-Date: 2014-10-19 16:45+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
 "Language: id\n"
@@ -54,7 +53,7 @@ msgstr ""
 msgid "Visit the Shotwell home page"
 msgstr "Kunjungi laman serambi Shotwell"
 
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:691
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:695
 msgid "translator-credits"
 msgstr ""
 "Mohammad Anwari <mdamt@di.blankon.in>, 2010\n"
@@ -180,7 +179,7 @@ msgstr ""
 "Anda harus telah mendaftar akun Gallery3 untuk melengkapi proses log masuk."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: ../src/MediaPage.vala:420 ../src/photos/RawSupport.vala:297
+#: ../src/MediaPage.vala:420 ../src/photos/RawSupport.vala:300
 msgid "Shotwell"
 msgstr "Shotwell"
 
@@ -211,19 +210,27 @@ msgstr ""
 "Flowplayer."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1774
-msgid "A file required for publishing is unavailable. Publishing to "
+#, c-format
+msgid ""
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
 msgstr ""
-"Suatu berkas yang diperlukan untuk penerbitan tidak tersedia. Menerbitkan ke "
+"Sebuah berkas yang diperlukan untuk penerbitan tidak tersedia. Tak "
+"dapat lanjutkan menerbitkan ke %s."
 
 #. populate any widgets whose contents are
 #. programmatically-generated
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
 #, c-format
 msgid "Publishing to %s as %s."
 msgstr "Menerbitkan ke %s sebagai %s."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1816
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+msgid "A file required for publishing is unavailable. Publishing to "
+msgstr ""
+"Suatu berkas yang diperlukan untuk penerbitan tidak tersedia. Menerbitkan ke "
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
 msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
@@ -231,7 +238,7 @@ msgstr ""
 "Masukkan URL untuk situs Gallery3 dan nama pengguna serta sandi (atau kunci "
 "API) bagi akun Gallery3 Anda."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
 msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
@@ -239,7 +246,7 @@ msgstr ""
 "Nama pengguna dan sandi atau kunci API salah. Untuk mencoba lagi, masukkan "
 "lagi nama pengguna dan sandi di bawah."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
 msgid ""
 "The URL entered does not appear to be the main directory of a Gallery3 "
 "instance. Please make sure you typed it correctly and it does not have any "
@@ -249,11 +256,11 @@ msgstr ""
 "Gallery3. Harap pastikan bahwa Anda mengetikkannya dengan benar dan itu tak "
 "memiliki sebarang komponen ekor (mis., index.php)."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1871
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
 msgid "Unrecognized User"
 msgstr "Pengguna Tak Dikenal"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1876
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
 msgid " Site Not Found"
 msgstr "Situs Tak Ditemukan"
 
@@ -367,13 +374,13 @@ msgid "Copyright 2012 BJA Electronics"
 msgstr "Hak Cipta 2012 BJA Electronics"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1229
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
 msgid "500 x 375 pixels"
 msgstr "500 x 375 piksel"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1230
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
 msgid "1024 x 768 pixels"
 msgstr "1024 x 768 piksel"
@@ -502,7 +509,7 @@ msgid "pixels"
 msgstr "piksel"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
 #: ../src/Dimensions.vala:17
 msgid "Original size"
@@ -644,12 +651,12 @@ msgid "Upload _size:"
 msgstr "U_kuran unggah"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
 msgid "Just me"
 msgstr "Saya sendiri saja"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
 msgid "Everyone"
 msgstr "Semua orang"
@@ -701,50 +708,53 @@ msgstr ""
 "Anda sudah login ke Flickr atas nama %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
 #, 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 ""
-"Akun Flickr gratisan Anda membatasi besarnya data yang dapat Anda kirim "
-"dalam waktu sebulan.\n"
-"Untuk bulan ini, Anda punya jatah sekitar %d megabyte."
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"Akun Flickr gratis Anda membatasi besarnya data yang dapat Anda kirim "
+"per bulan.\n"
+"Bulan ini, Anda punya sisa jatah kuota unggah %d megabyte."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1157
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Anda memiliki akun Flickr Pro yang tidak memiliki batas pengiriman."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1162
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
 msgid "Photos _visible to:"
 msgstr "Foto ini dapat _dilihat oleh:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
 msgid "Videos _visible to:"
 msgstr "Video ini dapat _dilihat oleh:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
 msgid "Photos and videos _visible to:"
 msgstr "Foto dan video ini dapat _dilihat oleh:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
 msgid "Friends & family only"
 msgstr "Teman dan keluarga saja"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
 msgid "Family only"
 msgstr "Hanya keluarga"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Friends only"
 msgstr "Hanya teman"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
 msgid "2048 x 1536 pixels"
 msgstr "2048 x 1536 piksel"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
 msgid "4096 x 3072 pixels"
 msgstr "4096 x 3072 piksel"
@@ -973,7 +983,7 @@ msgid "Logout"
 msgstr "Catat keluar"
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:268
+#: ../src/Resources.vala:270
 msgid "Publish"
 msgstr "Kirim"
 
@@ -1075,39 +1085,39 @@ msgstr "Tinggalkan layar penuh"
 msgid "Leave _Fullscreen"
 msgstr "Layar _Biasa"
 
-#: ../src/AppWindow.vala:496
+#: ../src/AppWindow.vala:500
 msgid "_Quit"
 msgstr "_Keluar"
 
-#: ../src/AppWindow.vala:501
+#: ../src/AppWindow.vala:505
 msgid "_About"
 msgstr "Tent_ang"
 
-#: ../src/AppWindow.vala:506
+#: ../src/AppWindow.vala:510
 msgid "Fulls_creen"
 msgstr "Layar _Penuh"
 
-#: ../src/AppWindow.vala:511
+#: ../src/AppWindow.vala:515
 msgid "_Contents"
 msgstr "Daftar _Isi"
 
-#: ../src/AppWindow.vala:516
+#: ../src/AppWindow.vala:520
 msgid "_Frequently Asked Questions"
 msgstr "_Pertanyaan Sering Ditanyakan"
 
-#: ../src/AppWindow.vala:521
+#: ../src/AppWindow.vala:525
 msgid "_Report a Problem..."
 msgstr "Lapo_r Masalah..."
 
-#: ../src/AppWindow.vala:620 ../src/AppWindow.vala:641
-#: ../src/AppWindow.vala:658 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1417 ../src/Dialogs.vala:1440
+#: ../src/AppWindow.vala:624 ../src/AppWindow.vala:645
+#: ../src/AppWindow.vala:662 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
+#: ../src/Dialogs.vala:1422 ../src/Dialogs.vala:1445
 #: ../src/data_imports/DataImportsUI.vala:399
 #: ../src/publishing/PublishingUI.vala:498
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../src/AppWindow.vala:668
+#: ../src/AppWindow.vala:672
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
@@ -1120,21 +1130,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/AppWindow.vala:688
+#: ../src/AppWindow.vala:692
 msgid "Visit the Yorba web site"
 msgstr "Kunjungi situs Yorba"
 
-#: ../src/AppWindow.vala:700
+#: ../src/AppWindow.vala:704
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Pedoman penggunaan tidak dapat ditampilkan: %s"
 
-#: ../src/AppWindow.vala:708
+#: ../src/AppWindow.vala:712
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Gagal menavigasi basis data bug: %s"
 
-#: ../src/AppWindow.vala:716
+#: ../src/AppWindow.vala:720
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Gagal menampilkan FAQ: %s"
@@ -1217,7 +1227,7 @@ msgid "Export Photos/Videos"
 msgstr "Ekspor Foto-foto/Video-video"
 
 #: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3207
+#: ../src/PhotoPage.vala:3210
 msgid "Export Photo"
 msgstr "Ekspor Foto"
 
@@ -1265,157 +1275,157 @@ msgstr "Menajamkan gambar"
 msgid "Undoing Enhance"
 msgstr "Batalkan Penajaman Gambar"
 
-#: ../src/Commands.vala:845
+#: ../src/Commands.vala:853
 msgid "Applying Color Transformations"
 msgstr "Menerapkan Transformasi Warna"
 
-#: ../src/Commands.vala:845
+#: ../src/Commands.vala:853
 msgid "Undoing Color Transformations"
 msgstr "Membatalkan Transformasi Warna"
 
-#: ../src/Commands.vala:995
+#: ../src/Commands.vala:1003
 msgid "Creating New Event"
 msgstr "Buat Rangkaian Baru"
 
-#: ../src/Commands.vala:996
+#: ../src/Commands.vala:1004
 msgid "Removing Event"
 msgstr "Hapus Rangkaian"
 
-#: ../src/Commands.vala:1005
+#: ../src/Commands.vala:1013
 msgid "Moving Photos to New Event"
 msgstr "Memindahkan Semua Foto Ini ke Rangkaian Baru"
 
-#: ../src/Commands.vala:1006
+#: ../src/Commands.vala:1014
 msgid "Setting Photos to Previous Event"
 msgstr "Menandai Foto ke Rangkaian Sebelumnya"
 
-#: ../src/Commands.vala:1063
+#: ../src/Commands.vala:1071
 msgid "Merging"
 msgstr "Menggabungkan"
 
-#: ../src/Commands.vala:1064
+#: ../src/Commands.vala:1072
 msgid "Unmerging"
 msgstr "Membatalkan Penggabungan"
 
-#: ../src/Commands.vala:1073
+#: ../src/Commands.vala:1081
 msgid "Duplicating photos"
 msgstr "Gandakan foto"
 
-#: ../src/Commands.vala:1073
+#: ../src/Commands.vala:1081
 msgid "Removing duplicated photos"
 msgstr "Hapus foto ganda"
 
-#: ../src/Commands.vala:1096
+#: ../src/Commands.vala:1104
 #, 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] "Ada %d foto yang tidak dapat digandakan karena ada kesalahan teknis"
 
-#: ../src/Commands.vala:1183
+#: ../src/Commands.vala:1191
 msgid "Restoring previous rating"
 msgstr "Mengembalikan rating sebelumnya"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
 msgid "Increasing ratings"
 msgstr "Naikkan rating"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
 msgid "Decreasing ratings"
 msgstr "Turunkan rating"
 
-#: ../src/Commands.vala:1244
+#: ../src/Commands.vala:1252
 msgid "Setting RAW developer"
 msgstr "Atur RAW pengembang"
 
-#: ../src/Commands.vala:1244
+#: ../src/Commands.vala:1252
 msgid "Restoring previous RAW developer"
 msgstr "Mengembalikan pembangun RAW sebelumnya"
 
-#: ../src/Commands.vala:1245
+#: ../src/Commands.vala:1253
 msgid "Set Developer"
 msgstr "Atur Pengembang"
 
-#: ../src/Commands.vala:1335
+#: ../src/Commands.vala:1343
 msgid "Original photo could not be adjusted."
 msgstr "Foto asli tidak dapat diatur"
 
-#: ../src/Commands.vala:1356
+#: ../src/Commands.vala:1364
 msgid "Adjusting Date and Time"
 msgstr "Mengatur Tanggal dan Jam"
 
-#: ../src/Commands.vala:1356
+#: ../src/Commands.vala:1364
 msgid "Undoing Date and Time Adjustment"
 msgstr "Batalkan Pengaturan Tanggal dan Jam"
 
-#: ../src/Commands.vala:1387
+#: ../src/Commands.vala:1395
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
 msgstr[0] "Foto ini tidak dapat diatur"
 
-#: ../src/Commands.vala:1389 ../src/Commands.vala:1413
+#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
 msgid "Time Adjustment Error"
 msgstr "Tidak Dapat Mengatur Jam"
 
-#: ../src/Commands.vala:1411
+#: ../src/Commands.vala:1419
 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] "Jam asli pada foto ini tidak dapat dikembalikan"
 
-#: ../src/Commands.vala:1625 ../src/Commands.vala:1648
+#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
 msgid "Create Tag"
 msgstr "Buat Tanda"
 
-#: ../src/Commands.vala:1683
+#: ../src/Commands.vala:1691
 #, c-format
 msgid "Move Tag \"%s\""
 msgstr "Pindah Tag \"%s\""
 
-#: ../src/Commands.vala:2335
+#: ../src/Commands.vala:2343
 msgid "Move Photos to Trash"
 msgstr "Pindahkan Foto ke Tempat Pembuangan"
 
-#: ../src/Commands.vala:2335
+#: ../src/Commands.vala:2343
 msgid "Restore Photos from Trash"
 msgstr "Kembalikan Foto dari Tempat Pembuangan"
 
-#: ../src/Commands.vala:2336
+#: ../src/Commands.vala:2344
 msgid "Move the photos to the Shotwell trash"
 msgstr "Pindahkan foto-foto tersebut ke tempat pembuangan"
 
-#: ../src/Commands.vala:2336
+#: ../src/Commands.vala:2344
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Kembalikan foto-foto yang dibuang ke album"
 
-#: ../src/Commands.vala:2355
+#: ../src/Commands.vala:2363
 msgid "Moving Photos to Trash"
 msgstr "Pindahkan Foto ke Tempat Pembuangan"
 
-#: ../src/Commands.vala:2355
+#: ../src/Commands.vala:2363
 msgid "Restoring Photos From Trash"
 msgstr "Kembalikan Foto dari Tempat Pembuangan"
 
-#: ../src/Commands.vala:2441
+#: ../src/Commands.vala:2449
 msgid "Flag selected photos"
 msgstr "Tandai foto terpilih"
 
-#: ../src/Commands.vala:2442
+#: ../src/Commands.vala:2450
 msgid "Unflag selected photos"
 msgstr "Hapus tanda foto terpilih"
 
-#: ../src/Commands.vala:2443
+#: ../src/Commands.vala:2451
 msgid "Flagging selected photos"
 msgstr "Tandai foto terpilih"
 
-#: ../src/Commands.vala:2444
+#: ../src/Commands.vala:2452
 msgid "Unflagging selected photos"
 msgstr "Hapus tanda foto terpilih"
 
-#: ../src/Commands.vala:2451
+#: ../src/Commands.vala:2459
 msgid "Flag"
 msgstr "Tanda"
 
-#: ../src/Commands.vala:2451
+#: ../src/Commands.vala:2459
 msgid "Unflag"
 msgstr "Hapus Tanda"
 
@@ -1444,9 +1454,9 @@ 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] "Tanda \"%s\" akan dihapus dari %d foto. Teruskan?"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1385
-#: ../src/Resources.vala:328 ../src/Resources.vala:376
-#: ../src/Resources.vala:641
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1390
+#: ../src/Resources.vala:336 ../src/Resources.vala:384
+#: ../src/Resources.vala:649
 msgid "_Delete"
 msgstr "_Hapus"
 
@@ -1888,48 +1898,51 @@ msgstr "Ubah Nama Peristiwa"
 msgid "Name:"
 msgstr "Nama:"
 
-#: ../src/Dialogs.vala:1329 ../src/Resources.vala:272
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1330 ../src/Resources.vala:275
 msgid "Edit Title"
 msgstr "Sunting Judul"
 
-#: ../src/Dialogs.vala:1329 ../src/Properties.vala:340
+#: ../src/Dialogs.vala:1331 ../src/Properties.vala:340
 msgid "Title:"
 msgstr "Judul:"
 
-#: ../src/Dialogs.vala:1343 ../src/Resources.vala:278
+#. Dialog title
+#: ../src/Dialogs.vala:1347 ../src/Resources.vala:282
 msgid "Edit Event Comment"
 msgstr "Sunting Komentar Peristiwa"
 
-#: ../src/Dialogs.vala:1343
+#: ../src/Dialogs.vala:1348
 msgid "Edit Photo/Video Comment"
 msgstr "Sunting Komentar Foto/Video"
 
-#: ../src/Dialogs.vala:1344 ../src/Properties.vala:630
+#: ../src/Dialogs.vala:1349 ../src/Properties.vala:630
 msgid "Comment:"
 msgstr "Komentar:"
 
-#: ../src/Dialogs.vala:1360
+#: ../src/Dialogs.vala:1365
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Hapus dan _Buang Berkas"
 
-#: ../src/Dialogs.vala:1364
+#: ../src/Dialogs.vala:1369
 msgid "_Remove From Library"
 msgstr "Hapus Da_ri Pustaka"
 
-#: ../src/Dialogs.vala:1384 ../src/camera/ImportPage.vala:1739
+#: ../src/Dialogs.vala:1389 ../src/camera/ImportPage.vala:1739
 msgid "_Keep"
 msgstr "_Simpan"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1412
 msgid "Revert External Edit?"
 msgstr "Batalkan Penyuntingan Eksternal?"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1412
 msgid "Revert External Edits?"
 msgstr "Batalkan Penyuntingan Eksternal?"
 
-#: ../src/Dialogs.vala:1409
+#: ../src/Dialogs.vala:1414
 #, c-format
 msgid "This will destroy all changes made to the external file.  Continue?"
 msgid_plural ""
@@ -1938,86 +1951,86 @@ msgstr[0] ""
 "Jika proses ini diteruskan maka semua perubahan yang sudah Anda lakukan pada "
 "berkas %d foto eksternal tidak akan disimpan. Lanjutan?"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1418
 msgid "Re_vert External Edit"
 msgstr "_Batalkan Penyuntingan Eksternal"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1418
 msgid "Re_vert External Edits"
 msgstr "_Batalkan Penyuntingan Eksternal"
 
-#: ../src/Dialogs.vala:1434
+#: ../src/Dialogs.vala:1439
 #, 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] "%d foto akan dihapus dari album. Lanjutkan?"
 
-#: ../src/Dialogs.vala:1441
+#: ../src/Dialogs.vala:1446
 msgid "_Remove"
 msgstr "_Hapus"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1447
 msgid "Remove Photo From Library"
 msgstr "Hapus Foto Dari Album"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1447
 msgid "Remove Photos From Library"
 msgstr "Hapus Foto Dari Album"
 
-#: ../src/Dialogs.vala:1535
+#: ../src/Dialogs.vala:1540
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1682
+#: ../src/Dialogs.vala:1687
 msgid "AM"
 msgstr "Pagi"
 
-#: ../src/Dialogs.vala:1683
+#: ../src/Dialogs.vala:1688
 msgid "PM"
 msgstr "Siang/Malam"
 
-#: ../src/Dialogs.vala:1684
+#: ../src/Dialogs.vala:1689
 msgid "24 Hr"
 msgstr "24 Jam"
 
-#: ../src/Dialogs.vala:1699
+#: ../src/Dialogs.vala:1704
 msgid "_Shift photos/videos by the same amount"
 msgstr "Ge_ser foto/video dalam jumlah sama"
 
-#: ../src/Dialogs.vala:1704
+#: ../src/Dialogs.vala:1709
 msgid "Set _all photos/videos to this time"
 msgstr "Atur semu_a foto/video ke waktu ini"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1716
 msgid "_Modify original photo file"
 msgstr "_Modifikasi berkas asli foto"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1716
 msgid "_Modify original photo files"
 msgstr "_Modifikasi berkas asli foto"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1719
 msgid "_Modify original file"
 msgstr "Ubah pada _berkas foto aslinya"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1719
 msgid "_Modify original files"
 msgstr "Ubah pada _berkas foto aslinya"
 
-#: ../src/Dialogs.vala:1800
+#: ../src/Dialogs.vala:1805
 msgid "Original: "
 msgstr "Aslinya:"
 
-#: ../src/Dialogs.vala:1801
+#: ../src/Dialogs.vala:1806
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d/%m/%Y, %H:%M:%S"
 
-#: ../src/Dialogs.vala:1802
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d/%m/%Y, %I:%M:%S %p"
 
-#: ../src/Dialogs.vala:1891
+#: ../src/Dialogs.vala:1896
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -2026,7 +2039,7 @@ msgstr ""
 "Tanggal pengambilan gambar akan dimajukan\n"
 "%d %s, %d %s, %d %s, dan %d %s."
 
-#: ../src/Dialogs.vala:1892
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2035,27 +2048,27 @@ msgstr ""
 "Tanggal pengambilan gambar akan dimundurkan\n"
 "%d %s, %d %s, %d %s, dan %d %s."
 
-#: ../src/Dialogs.vala:1894
+#: ../src/Dialogs.vala:1899
 msgid "day"
 msgid_plural "days"
 msgstr[0] "hari"
 
-#: ../src/Dialogs.vala:1895
+#: ../src/Dialogs.vala:1900
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "jam"
 
-#: ../src/Dialogs.vala:1896
+#: ../src/Dialogs.vala:1901
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "menit"
 
-#: ../src/Dialogs.vala:1897
+#: ../src/Dialogs.vala:1902
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "detik"
 
-#: ../src/Dialogs.vala:1941
+#: ../src/Dialogs.vala:1946
 #, c-format
 msgid ""
 "\n"
@@ -2070,49 +2083,49 @@ msgstr[0] ""
 "\n"
 "Dan %d lainnya."
 
-#: ../src/Dialogs.vala:1963 ../src/Dialogs.vala:1990
+#: ../src/Dialogs.vala:1968 ../src/Dialogs.vala:1995
 msgid "Tags (separated by commas):"
 msgstr "Tanda (pisahkan dengan koma):"
 
-#: ../src/Dialogs.vala:2070
+#: ../src/Dialogs.vala:2075
 msgid "Welcome!"
 msgstr "Selamat Datang!"
 
-#: ../src/Dialogs.vala:2077
+#: ../src/Dialogs.vala:2082
 msgid "Welcome to Shotwell!"
 msgstr "Selamat Datang di Shotwell!"
 
-#: ../src/Dialogs.vala:2081
+#: ../src/Dialogs.vala:2086
 msgid "To get started, import photos in any of these ways:"
 msgstr "Silakan memulai dengan mengimpor foto melalui cara berikut:"
 
-#: ../src/Dialogs.vala:2100
+#: ../src/Dialogs.vala:2105
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Pilih <span weight=\"bold\">Berkas %s Impor Dari Folder</span>"
 
-#: ../src/Dialogs.vala:2101
+#: ../src/Dialogs.vala:2106
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Ambil dan letakkan foto ke jendela Shotwell"
 
-#: ../src/Dialogs.vala:2102
+#: ../src/Dialogs.vala:2107
 msgid "Connect a camera to your computer and import"
 msgstr "Sambungkan kamera ke komputer dan lakukan impor"
 
-#: ../src/Dialogs.vala:2112
+#: ../src/Dialogs.vala:2117
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Impor foto dari folder %s"
 
-#: ../src/Dialogs.vala:2119
+#: ../src/Dialogs.vala:2124
 msgid "You can also import photos in any of these ways:"
 msgstr "Anda juga dapat mengimpor foto dengan cara berikut"
 
-#: ../src/Dialogs.vala:2129
+#: ../src/Dialogs.vala:2134
 msgid "_Don't show this message again"
 msgstr "_Jangan tampilkan pesan ini pada masa mendatang"
 
-#: ../src/Dialogs.vala:2164
+#: ../src/Dialogs.vala:2169
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Impor foto dari %s pustakamu"
@@ -2120,41 +2133,41 @@ msgstr "Impor foto dari %s pustakamu"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2308 ../src/Dialogs.vala:2312
+#: ../src/Dialogs.vala:2313 ../src/Dialogs.vala:2317
 msgid "(Help)"
 msgstr "(Bantuan)"
 
-#: ../src/Dialogs.vala:2321
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Tahun%sBulan%sHari"
 
-#: ../src/Dialogs.vala:2323
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth"
 msgstr "Tahun%sBulan"
 
-#: ../src/Dialogs.vala:2325
+#: ../src/Dialogs.vala:2330
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Tahun%sBulan-Hari"
 
-#: ../src/Dialogs.vala:2327
+#: ../src/Dialogs.vala:2332
 msgid "Year-Month-Day"
 msgstr "Tahun-Bulan-Hari"
 
-#: ../src/Dialogs.vala:2328 ../src/editing_tools/EditingTools.vala:781
+#: ../src/Dialogs.vala:2333 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Bebas"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2565
+#: ../src/Dialogs.vala:2570
 msgid "Invalid pattern"
 msgstr "Pola tak sah"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: ../src/Dialogs.vala:2668
+#: ../src/Dialogs.vala:2673
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2162,31 +2175,31 @@ msgstr ""
 "Shotwell dapat menyalin foto foto ke folder album ataupun mengimpor tanpa "
 "menyalin"
 
-#: ../src/Dialogs.vala:2673
+#: ../src/Dialogs.vala:2678
 msgid "Co_py Photos"
 msgstr "Sa_lin Foto"
 
-#: ../src/Dialogs.vala:2674
+#: ../src/Dialogs.vala:2679
 msgid "_Import in Place"
 msgstr "_Impor di Lokasi"
 
-#: ../src/Dialogs.vala:2675
+#: ../src/Dialogs.vala:2680
 msgid "Import to Library"
 msgstr "Impor ke Album"
 
-#: ../src/Dialogs.vala:2685 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2690 ../src/PhotoPage.vala:3086
 msgid "Remove From Library"
 msgstr "Hapus Dari Album"
 
-#: ../src/Dialogs.vala:2686 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2691 ../src/PhotoPage.vala:3086
 msgid "Removing Photo From Library"
 msgstr "Hapus Foto dari Album"
 
-#: ../src/Dialogs.vala:2686
+#: ../src/Dialogs.vala:2691
 msgid "Removing Photos From Library"
 msgstr "Hapus Foto Dari Album"
 
-#: ../src/Dialogs.vala:2700
+#: ../src/Dialogs.vala:2705
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -2204,7 +2217,7 @@ msgstr[0] ""
 "\n"
 "(proses ini tidak dapat dikembalikan ke semula)"
 
-#: ../src/Dialogs.vala:2704
+#: ../src/Dialogs.vala:2709
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -2222,7 +2235,7 @@ msgstr[0] ""
 "\n"
 "(proses ini tidak dapat dikembalikan ke semula)"
 
-#: ../src/Dialogs.vala:2708
+#: ../src/Dialogs.vala:2713
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -2240,7 +2253,7 @@ msgstr[0] ""
 "\n"
 "(proses ini tidak dapat dikembalikan ke semula)"
 
-#: ../src/Dialogs.vala:2740
+#: ../src/Dialogs.vala:2745
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -2250,7 +2263,7 @@ msgstr[0] ""
 "Foto/video %d tidak dapat dipindahkan ke tempat pembuangan. Hapus berkas ini?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2757
+#: ../src/Dialogs.vala:2762
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -2351,7 +2364,7 @@ msgstr "_Developer"
 
 #: ../src/MediaPage.vala:425 ../src/camera/Branch.vala:101
 #: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
-#: ../src/photos/RawSupport.vala:300
+#: ../src/photos/RawSupport.vala:303
 msgid "Camera"
 msgstr "Kamera"
 
@@ -2436,11 +2449,11 @@ msgstr "Tidak ada foto/video"
 msgid "No photos/videos found"
 msgstr "Foto/video tidak ditemukan"
 
-#: ../src/Page.vala:2569
+#: ../src/Page.vala:2573
 msgid "Photos cannot be exported to this directory."
 msgstr "Foto tidak dapat diekspor ke direktori tersebut."
 
-#: ../src/Photo.vala:3656
+#: ../src/Photo.vala:3753
 msgid "modified"
 msgstr "berubah"
 
@@ -2520,7 +2533,7 @@ msgstr "Zum _200%"
 msgid "Zoom the photo to 200% magnification"
 msgstr "Zum foto ke perbesaran 200%"
 
-#: ../src/PhotoPage.vala:3227
+#: ../src/PhotoPage.vala:3230
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Proses ekspor %s gagal: %s"
@@ -3094,347 +3107,353 @@ msgstr "Tampilkan semua foto, termasuk yang ditolak"
 msgid "_All Photos"
 msgstr "Semu_a foto"
 
-#: ../src/Resources.vala:249 ../src/Resources.vala:250
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:250 ../src/Resources.vala:252
 msgid "Show all photos"
 msgstr "Tunjukkan semua foto"
 
-#: ../src/Resources.vala:252
+#: ../src/Resources.vala:254
 msgid "_Ratings"
 msgstr "_Rating"
 
-#: ../src/Resources.vala:253
+#: ../src/Resources.vala:255
 msgid "Display each photo's rating"
 msgstr "Tampilkan rating tiap foto"
 
-#: ../src/Resources.vala:255
+#: ../src/Resources.vala:257
 msgid "_Filter Photos"
 msgstr "_Saring Foto"
 
-#: ../src/Resources.vala:256
+#: ../src/Resources.vala:258
 msgid "Filter Photos"
 msgstr "Saring Foto"
 
-#: ../src/Resources.vala:257
+#: ../src/Resources.vala:259
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Batasi jumlah foto yang tampil berdasarkan penyaringan"
 
-#: ../src/Resources.vala:259
+#: ../src/Resources.vala:261
 msgid "_Duplicate"
 msgstr "_Gandakan"
 
-#: ../src/Resources.vala:260
+#: ../src/Resources.vala:262
 msgid "Duplicate"
 msgstr "Gandakan"
 
-#: ../src/Resources.vala:261
+#: ../src/Resources.vala:263
 msgid "Make a duplicate of the photo"
 msgstr "Gandakan foto-foto ini"
 
-#: ../src/Resources.vala:263
+#: ../src/Resources.vala:265
 msgid "_Export..."
 msgstr "_Ekspor..."
 
-#: ../src/Resources.vala:265
+#: ../src/Resources.vala:267
 msgid "_Print..."
 msgstr "_Cetak"
 
-#: ../src/Resources.vala:267
+#: ../src/Resources.vala:269
 msgid "Pu_blish..."
 msgstr "_Kirim..."
 
-#: ../src/Resources.vala:269
+#: ../src/Resources.vala:271
 msgid "Publish to various websites"
 msgstr "Kirim foto ini ke beragam situs"
 
-#: ../src/Resources.vala:271
+#: ../src/Resources.vala:273
 msgid "Edit _Title..."
 msgstr "Sun_ting Judul..."
 
-#: ../src/Resources.vala:274
+#: ../src/Resources.vala:277
 msgid "Edit _Comment..."
 msgstr "Sunting _Komentar..."
 
-#: ../src/Resources.vala:275
+#. Button label
+#: ../src/Resources.vala:279
 msgid "Edit Comment"
 msgstr "Sunting Komentar"
 
-#: ../src/Resources.vala:277
+#: ../src/Resources.vala:281
 msgid "Edit Event _Comment..."
 msgstr "Sunting _Komentar Peristiwa"
 
-#: ../src/Resources.vala:280
+#: ../src/Resources.vala:284
 msgid "_Adjust Date and Time..."
 msgstr "_Atur Jam dan Tanggal..."
 
-#: ../src/Resources.vala:281
+#: ../src/Resources.vala:285
 msgid "Adjust Date and Time"
 msgstr "Atur Jam dan Tanggal"
 
-#: ../src/Resources.vala:283
+#: ../src/Resources.vala:287
 msgid "Add _Tags..."
 msgstr "_Beri _Tanda..."
 
-#: ../src/Resources.vala:284
+#: ../src/Resources.vala:288
 msgid "_Add Tags..."
 msgstr "T_ambah Tag..."
 
-#: ../src/Resources.vala:285 ../src/Resources.vala:316
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:290 ../src/Resources.vala:323
 msgid "Add Tags"
 msgstr "Beri Tanda"
 
-#: ../src/Resources.vala:287
+#: ../src/Resources.vala:292
 msgid "_Preferences"
 msgstr "_Pengaturan"
 
-#: ../src/Resources.vala:289
+#: ../src/Resources.vala:294
 msgid "Open With E_xternal Editor"
 msgstr "Buka Oleh Penyunting E_ksternal"
 
-#: ../src/Resources.vala:291
+#: ../src/Resources.vala:296
 msgid "Open With RA_W Editor"
 msgstr "Buka Dengan Penyunting RA_W"
 
-#: ../src/Resources.vala:293
+#: ../src/Resources.vala:298
 msgid "Send _To..."
 msgstr "Kirim _Ke"
 
-#: ../src/Resources.vala:294
+#: ../src/Resources.vala:299
 msgid "Send T_o..."
 msgstr "Kirim _Ke..."
 
-#: ../src/Resources.vala:296
+#: ../src/Resources.vala:301
 msgid "_Find..."
 msgstr "_Cari"
 
-#: ../src/Resources.vala:297
+#: ../src/Resources.vala:302
 msgid "Find"
 msgstr "Cari"
 
-#: ../src/Resources.vala:298
+#: ../src/Resources.vala:303
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Cari foto dengan mengetikkan teks yang muncul di nama atau tanda"
 
-#: ../src/Resources.vala:300
+#: ../src/Resources.vala:305
 msgid "_Flag"
 msgstr "_Tanda"
 
-#: ../src/Resources.vala:302
+#: ../src/Resources.vala:307
 msgid "Un_flag"
 msgstr "Lepas _tanda"
 
-#: ../src/Resources.vala:305
+#: ../src/Resources.vala:310
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Program penyunting tidak dapat dijalankan: %s"
 
-#: ../src/Resources.vala:310
+#: ../src/Resources.vala:315
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "Beri Tanda \"%s\""
 
-#: ../src/Resources.vala:312
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:318
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "Beri Tanda \"%s\" dan \"%s\""
 
-#: ../src/Resources.vala:320
+#: ../src/Resources.vala:328
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "_Hapus Tanda \"%s\""
 
-#: ../src/Resources.vala:324
+#: ../src/Resources.vala:332
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "Hapus Tanda \"%s\""
 
-#: ../src/Resources.vala:327
+#: ../src/Resources.vala:335
 msgid "Delete Tag"
 msgstr "Hapus Tanda"
 
-#: ../src/Resources.vala:330
+#: ../src/Resources.vala:338
 msgid "_New"
 msgstr "_Baru"
 
-#: ../src/Resources.vala:333
+#: ../src/Resources.vala:341
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "Ganti _Nama Tanda \"%s\"..."
 
-#: ../src/Resources.vala:337
+#: ../src/Resources.vala:345
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "Ganti Nama Tanda \"%s\" menjadi \"%s\""
 
-#: ../src/Resources.vala:340
+#: ../src/Resources.vala:348
 msgid "_Rename..."
 msgstr "_Ganti nama"
 
-#: ../src/Resources.vala:342
+#: ../src/Resources.vala:350
 msgid "Modif_y Tags..."
 msgstr "_Ubah Tanda..."
 
-#: ../src/Resources.vala:343
+#: ../src/Resources.vala:351
 msgid "Modify Tags"
 msgstr "Ubah Tanda"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:354
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Tandai Foto Sebagai \"%s\""
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:354
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Tandai Foto Sebagai \"%s\""
 
-#: ../src/Resources.vala:350
+#: ../src/Resources.vala:358
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "Tandai foto terpilih sebagai \"%s\""
 
-#: ../src/Resources.vala:351
+#: ../src/Resources.vala:359
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "Tandai foto terpilih sebagai \"%s\""
 
-#: ../src/Resources.vala:355
+#: ../src/Resources.vala:363
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "Hapus Tanda \"%s\" Dari _Foto"
 
-#: ../src/Resources.vala:356
+#: ../src/Resources.vala:364
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "Hapus Tanda \"%s\" Dari _Foto"
 
-#: ../src/Resources.vala:360
+#: ../src/Resources.vala:368
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "Hapus Tanda \"%s\" Dari Foto"
 
-#: ../src/Resources.vala:361
+#: ../src/Resources.vala:369
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "Hapus Tanda \"%s\" Dari _Foto"
 
-#: ../src/Resources.vala:365
+#: ../src/Resources.vala:373
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr "Tanda tidak dapat diganti menjadi \"%s\" karena sudah ada."
 
-#: ../src/Resources.vala:369
+#: ../src/Resources.vala:377
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr "Gagal mengubah nama pencarian ke \"%s\" karena sudah ada "
 
-#: ../src/Resources.vala:372
+#: ../src/Resources.vala:380
 msgid "Saved Search"
 msgstr "Pencarian Tersimpan"
 
-#: ../src/Resources.vala:374
+#: ../src/Resources.vala:382
 msgid "Delete Search"
 msgstr "Hapus Pencarian"
 
-#: ../src/Resources.vala:377
+#: ../src/Resources.vala:385
 msgid "_Edit..."
 msgstr "_Sunting..."
 
-#: ../src/Resources.vala:378
+#: ../src/Resources.vala:386
 msgid "Re_name..."
 msgstr "Ganti _nama..."
 
-#: ../src/Resources.vala:381
+#: ../src/Resources.vala:389
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "Ubah Nama Pencarian \"%s\" ke \"%s\""
 
-#: ../src/Resources.vala:385
+#: ../src/Resources.vala:393
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "Hapus Pencarian \"%s\""
 
-#: ../src/Resources.vala:543
+#: ../src/Resources.vala:551
 #, c-format
 msgid "Rate %s"
 msgstr "Nilai %s"
 
-#: ../src/Resources.vala:544
+#: ../src/Resources.vala:552
 #, c-format
 msgid "Set rating to %s"
 msgstr "Atur nilai rating ke %s"
 
-#: ../src/Resources.vala:545
+#: ../src/Resources.vala:553
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Mengatur rating ke %s"
 
-#: ../src/Resources.vala:547
+#: ../src/Resources.vala:555
 #, c-format
 msgid "Display %s"
 msgstr "Tampilkan %s"
 
-#: ../src/Resources.vala:548
+#: ../src/Resources.vala:556
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Hanya tampilkan foto dengan rating %s"
 
-#: ../src/Resources.vala:549
+#: ../src/Resources.vala:557
 #, c-format
 msgid "%s or Better"
 msgstr "%s atau lebih baik"
 
-#: ../src/Resources.vala:550
+#: ../src/Resources.vala:558
 #, c-format
 msgid "Display %s or Better"
 msgstr "Tampilkan %s atau lebih baik"
 
-#: ../src/Resources.vala:551
+#: ../src/Resources.vala:559
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Hanya tampilkan foto dengan rating %s atau lebih baik"
 
-#: ../src/Resources.vala:642
+#: ../src/Resources.vala:650
 msgid "Remove the selected photos from the trash"
 msgstr "Hapus foto-foto terpilih dari tempat pembuangan"
 
-#: ../src/Resources.vala:643
+#: ../src/Resources.vala:651
 msgid "Remove the selected photos from the library"
 msgstr "Hapus foto-foto terpilih dari album"
 
-#: ../src/Resources.vala:645
+#: ../src/Resources.vala:653
 msgid "_Restore"
 msgstr "_Kembalikan"
 
-#: ../src/Resources.vala:646
+#: ../src/Resources.vala:654
 msgid "Move the selected photos back into the library"
 msgstr "Kembalikan foto-foto ke album"
 
-#: ../src/Resources.vala:648
+#: ../src/Resources.vala:656
 msgid "Show in File Mana_ger"
 msgstr "Lihat di Program Pengatur Berkas"
 
-#: ../src/Resources.vala:649
+#: ../src/Resources.vala:657
 msgid "Open the selected photo's directory in the file manager"
 msgstr "Buka direktori foto dengan program pengatur berkas"
 
-#: ../src/Resources.vala:652
+#: ../src/Resources.vala:660
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Program pengatur berkas tidak dapat dibuka: %s"
 
-#: ../src/Resources.vala:655
+#: ../src/Resources.vala:663
 msgid "R_emove From Library"
 msgstr "Hapus _Dari Album"
 
-#: ../src/Resources.vala:657
+#: ../src/Resources.vala:665
 msgid "_Move to Trash"
 msgstr "Pindahkan ke Tempat Pembuangan"
 
-#: ../src/Resources.vala:659
+#: ../src/Resources.vala:667
 msgid "Select _All"
 msgstr "Pilih semu_a"
 
-#: ../src/Resources.vala:660
+#: ../src/Resources.vala:668
 msgid "Select all items"
 msgstr "Pilih semua item"
 
@@ -3442,20 +3461,20 @@ msgstr "Pilih semua item"
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:741
+#: ../src/Resources.vala:749
 msgid "%-I:%M %p"
 msgstr "%-I:%M %p"
 
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:746
+#: ../src/Resources.vala:754
 msgid "%-I:%M:%S %p"
 msgstr "%-I:%M:%S %p"
 
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:750
+#: ../src/Resources.vala:758
 msgid "%a %b %d, %Y"
 msgstr "%a %d %b, %Y"
 
@@ -3465,14 +3484,14 @@ msgstr "%a %d %b, %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:755 ../src/Resources.vala:765
+#: ../src/Resources.vala:763 ../src/Resources.vala:773
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:760
+#: ../src/Resources.vala:768
 msgid "%d, %Y"
 msgstr "%d, %Y"
 
@@ -4110,7 +4129,7 @@ msgid "Find photos and videos by search criteria"
 msgstr "Cari foto dan video menurut kriteria pencarian"
 
 #: ../src/library/LibraryWindow.vala:346 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:195
+#: ../src/sidebar/Tree.vala:194
 msgid "Ne_w Saved Search..."
 msgstr "Pencarian Tersimpan B_aru"
 
@@ -4317,22 +4336,22 @@ msgstr "BMP"
 msgid "JPEG"
 msgstr "JPEG"
 
-#: ../src/photos/JfifSupport.vala:182
+#: ../src/photos/JfifSupport.vala:185
 #, c-format
 msgid "Low (%d%%)"
 msgstr "Rendah (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:185
+#: ../src/photos/JfifSupport.vala:188
 #, c-format
 msgid "Medium (%d%%)"
 msgstr "Sedang (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:188
+#: ../src/photos/JfifSupport.vala:191
 #, c-format
 msgid "High (%d%%)"
 msgstr "Tinggi (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:191
+#: ../src/photos/JfifSupport.vala:194
 #, c-format
 msgid "Maximum (%d%%)"
 msgstr "Maksimum (%d%%)"
@@ -4607,7 +4626,7 @@ msgstr "Status foto"
 msgid "Date"
 msgstr "Tanggal"
 
-#: ../src/sidebar/Tree.vala:199
+#: ../src/sidebar/Tree.vala:198
 msgid "New _Tag..."
 msgstr "_Tag Baru..."
 
@@ -4683,7 +4702,7 @@ msgstr "yang berikut ini:"
 
 #: ../ui/shotwell.glade.h:5
 msgid "<b>Printed Image Size</b>"
-msgstr "<b>Ukuran Foto Tercetak</b?"
+msgstr "<b>Ukuran Foto Tercetak</b>"
 
 #: ../ui/shotwell.glade.h:6
 msgid "Use a _standard size:"
diff --git a/po/kk.po b/po/kk.po
index d0610b1..ea5cf6e 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2014-10-11 10:02+0000\n"
-"PO-Revision-Date: 2014-10-22 08:53+0600\n"
+"POT-Creation-Date: 2015-03-15 14:32+0000\n"
+"PO-Revision-Date: 2015-03-15 22:53+0500\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh (http://www.transifex.com/projects/p/shotwell/language/"
 "kk/)\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.6.9\n"
+"X-Generator: Poedit 1.7.3\n"
 
 #: ../plugins/common/RESTSupport.vala:424
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
@@ -46,7 +46,7 @@ msgstr ""
 msgid "Visit the Shotwell home page"
 msgstr "Shotwell үй парағын шолу"
 
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:695
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
 msgid "translator-credits"
 msgstr "Baurzhan Muftakhidinov <baurthefirst@gmail.com>"
 
@@ -57,8 +57,8 @@ msgstr "Baurzhan Muftakhidinov <baurthefirst@gmail.com>"
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
 #: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
 #: ../src/Resources.vala:27
-msgid "Copyright 2009-2014 Yorba Foundation"
-msgstr "Copyright 2009-2014 Yorba Foundation"
+msgid "Copyright 2009-2015 Yorba Foundation"
+msgstr "Copyright 2009-2015 Yorba Foundation"
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:56
 msgid ""
@@ -138,7 +138,7 @@ msgstr ""
 msgid "F-Spot library: %s"
 msgstr "F-Spot жинағы: %s"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:416
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
 msgid "Preparing to import"
 msgstr "Импортқа дайындалу"
 
@@ -162,7 +162,7 @@ msgstr ""
 "Кіруді сәтті орындау үшін сізде Gallery3 тіркелгісі болуы тиіс."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: ../src/MediaPage.vala:420 ../src/photos/RawSupport.vala:300
+#: ../src/MediaPage.vala:435 ../src/photos/RawSupport.vala:300
 msgid "Shotwell"
 msgstr "Shotwell"
 
@@ -193,18 +193,23 @@ msgstr ""
 "қолдау бар. "
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1774
-msgid "A file required for publishing is unavailable. Publishing to "
-msgstr "Жариялау үшін керек файл қолжетерсіз. Қайда жариялау:"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+#, c-format
+msgid ""
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
+msgstr ""
+"Жариялау үшін керек файл қолжетерсіз. %s қызметіне жариялауды жалғастыру "
+"мүмкін емес."
 
 #. populate any widgets whose contents are
 #. programmatically-generated
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
 #, c-format
 msgid "Publishing to %s as %s."
 msgstr "%s қызметіне %s ретінде жариялау."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1816
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
 msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
@@ -212,7 +217,7 @@ msgstr ""
 "Gallery3 сайтыңыздың сілтемесін, және сіздің Gallery3 тіркелгіңіздің "
 "пайдаланушы атыңыз бен парольді (немесе API кілтін) көрсетіңіз."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
 msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
@@ -220,7 +225,7 @@ msgstr ""
 "Пайдаланушы аты мен пароль немесе API кілті дұрыс көрсетілмеді. Қайтадан "
 "көру үшін, төменде пайдаланушы атын мен пароліңізді қайта енгізіңіз."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
 msgid ""
 "The URL entered does not appear to be the main directory of a Gallery3 "
 "instance. Please make sure you typed it correctly and it does not have any "
@@ -229,11 +234,11 @@ msgstr ""
 "Енгізілген сілтеме Gallery3 орнатуының басты бумасына ұқсамайды. Оны дұрыс "
 "енгізілгенін және соңында артық сөздер (мыс. index.php) жоқтығын тесеріңіз."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1871
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
 msgid "Unrecognized User"
-msgstr "Пайдаланушы танылдмады"
+msgstr "Пайдаланушы танылмады"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1876
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
 msgid " Site Not Found"
 msgstr " Сайт табылмады"
 
@@ -346,13 +351,13 @@ msgid "Copyright 2012 BJA Electronics"
 msgstr "Copyright 2012 BJA Electronics"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1229
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
 msgid "500 x 375 pixels"
 msgstr "500 x 375 пиксель"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1230
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
 msgid "1024 x 768 pixels"
 msgstr "1024 x 768 пиксель"
@@ -424,7 +429,7 @@ msgid "Go _Back"
 msgstr "Ар_тқа"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
-#: ../ui/shotwell.glade.h:43
+#: ../ui/shotwell.glade.h:42
 msgid "_Login"
 msgstr "_Кіру"
 
@@ -480,7 +485,7 @@ msgid "pixels"
 msgstr "пиксель"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
 #: ../src/Dimensions.vala:17
 msgid "Original size"
@@ -494,7 +499,7 @@ msgstr "Ені не биіктігі"
 #: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
 #: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
 #: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
-#: ../ui/shotwell.glade.h:15
+#: ../ui/shotwell.glade.h:14
 msgid "label"
 msgstr "белгі"
 
@@ -622,12 +627,12 @@ msgid "Upload _size:"
 msgstr "Жүктеу ө_лшемі:"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
 msgid "Just me"
 msgstr "Тек мен"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
 msgid "Everyone"
 msgstr "Әркім"
@@ -680,50 +685,53 @@ msgstr ""
 "Сіз Flickr-ге %s ретінде кірдіңіз.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
 #, 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 ""
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
 "Сіздің тегін Flickr тіркелгісі бір айда қанша мәліметті жүктеуге болатынын "
 "шектеп отыр.\n"
 "Бұл айда, сізде шекке дейін қалған %d мегабайт бар."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1157
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Сіздің Flickr Pro тіркелгіңіз шектелмеген жүктеулерді мүмкін қылады."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1162
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
 msgid "Photos _visible to:"
 msgstr "Фотолар кі_мге көрінеді:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
 msgid "Videos _visible to:"
 msgstr "Видеолар кі_мге көрінеді:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
 msgid "Photos and videos _visible to:"
 msgstr "Фото мен видеолар кім_ге көрінеді:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
 msgid "Friends & family only"
 msgstr "Тек отбасы мен достар"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
 msgid "Family only"
 msgstr "Тек отбасы"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Friends only"
 msgstr "Тек достар"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
 msgid "2048 x 1536 pixels"
 msgstr "2048 x 1536 пиксель"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
 msgid "4096 x 3072 pixels"
 msgstr "4096 x 3072 пиксель"
@@ -956,7 +964,7 @@ msgid "Logout"
 msgstr "Шығу"
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:268
+#: ../src/Resources.vala:303
 msgid "Publish"
 msgstr "Жариялау"
 
@@ -1013,8 +1021,8 @@ msgid "Core Slideshow Transitions"
 msgstr "Слайдшоу арасында өту аралығы"
 
 #: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
-msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
 
 #: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
 #, c-format
@@ -1041,56 +1049,39 @@ msgstr "%s уақытша бумасын жасау мүмкін емес: %s"
 msgid "Unable to create data subdirectory %s: %s"
 msgstr "%s мәлімет ішкі бумасын жасау мүмкін емес: %s"
 
-#. restore pin state
-#: ../src/AppWindow.vala:52
+#: ../src/AppWindow.vala:53
 msgid "Pin Toolbar"
 msgstr "Панельді бекіту"
 
-#: ../src/AppWindow.vala:53
+#: ../src/AppWindow.vala:54
 msgid "Pin the toolbar open"
 msgstr "Панельді ашық түрінде бекіту"
 
-#: ../src/AppWindow.vala:57 ../src/AppWindow.vala:135
+#: ../src/AppWindow.vala:59
 msgid "Leave fullscreen"
 msgstr "Толық экраннан шығу"
 
-#: ../src/AppWindow.vala:134
-msgid "Leave _Fullscreen"
-msgstr "Т_олық экраннан шығу"
-
-#: ../src/AppWindow.vala:500
-msgid "_Quit"
-msgstr "_Шығу"
-
-#: ../src/AppWindow.vala:505
-msgid "_About"
-msgstr "О_сы туралы"
-
-#: ../src/AppWindow.vala:510
-msgid "Fulls_creen"
-msgstr "Т_олық экранға"
-
-#: ../src/AppWindow.vala:515
+#: ../src/AppWindow.vala:525
 msgid "_Contents"
 msgstr "Құра_масы"
 
-#: ../src/AppWindow.vala:520
+#: ../src/AppWindow.vala:530
 msgid "_Frequently Asked Questions"
 msgstr "_Жиі қойылатын сұрақтар"
 
-#: ../src/AppWindow.vala:525
+#: ../src/AppWindow.vala:535
 msgid "_Report a Problem..."
 msgstr "Мә_селе жөнінде хабарлау..."
 
-#: ../src/AppWindow.vala:624 ../src/AppWindow.vala:645
-#: ../src/AppWindow.vala:662 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1417 ../src/Dialogs.vala:1440
-#: ../src/data_imports/DataImportsUI.vala:399
-#: ../src/publishing/PublishingUI.vala:498
+#: ../src/AppWindow.vala:634 ../src/AppWindow.vala:655
+#: ../src/AppWindow.vala:672 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
+#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441 ../src/Resources.vala:162
+#: ../src/data_imports/DataImportsUI.vala:374
+#: ../src/publishing/PublishingUI.vala:475
 msgid "_Cancel"
 msgstr "Ба_с тарту"
 
-#: ../src/AppWindow.vala:672
+#: ../src/AppWindow.vala:682
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
@@ -1103,21 +1094,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/AppWindow.vala:692
+#: ../src/AppWindow.vala:702
 msgid "Visit the Yorba web site"
 msgstr "Yorba веб сайтын шолу"
 
-#: ../src/AppWindow.vala:704
+#: ../src/AppWindow.vala:714
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Көмек ақпаратын көрсету мүмкін емес: %s"
 
-#: ../src/AppWindow.vala:712
+#: ../src/AppWindow.vala:722
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Ақаулықтар дерекқорына өту мүмкін емес: %s"
 
-#: ../src/AppWindow.vala:720
+#: ../src/AppWindow.vala:730
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "ЖҚС көрсету мүмкін емес: %s"
@@ -1183,11 +1174,11 @@ msgstr "Зақымдалған сурет файлы"
 msgid "Imported failed (%d)"
 msgstr "Импорттау қатесі (%d)"
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2634
+#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
 msgid "S_lideshow"
 msgstr "С_лайдшоу"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2635
+#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
 msgid "Play a slideshow"
 msgstr "Слайдшоуды ойнату"
 
@@ -1200,7 +1191,7 @@ msgid "Export Photos/Videos"
 msgstr "Фото/видеоларды экспорттау"
 
 #: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3210
+#: ../src/PhotoPage.vala:3211
 msgid "Export Photo"
 msgstr "Фото(лар) экспорттау"
 
@@ -1427,9 +1418,9 @@ 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] "\"%s\" тегі %d фотодан өшіріледі. Жалғастыру керек пе?"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1385
-#: ../src/Resources.vala:328 ../src/Resources.vala:376
-#: ../src/Resources.vala:641
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
+#: ../src/Resources.vala:163 ../src/Resources.vala:369
+#: ../src/Resources.vala:417 ../src/Resources.vala:682
 msgid "_Delete"
 msgstr "Ө_шіру"
 
@@ -1501,50 +1492,50 @@ msgid "Current"
 msgstr "Ағымдағы"
 
 #. layout controls
-#: ../src/Dialogs.vala:212
+#: ../src/Dialogs.vala:213
 msgid "_Format:"
 msgstr "Пі_шімі:"
 
-#: ../src/Dialogs.vala:215
+#: ../src/Dialogs.vala:216
 msgid "_Quality:"
 msgstr "_Сапасы:"
 
-#: ../src/Dialogs.vala:218
+#: ../src/Dialogs.vala:219
 msgid "_Scaling constraint:"
 msgstr "_Масштабтау шегі:"
 
-#: ../src/Dialogs.vala:221
-msgid " _pixels"
-msgstr " _пиксель"
+#: ../src/Dialogs.vala:222
+msgid "_Pixels:"
+msgstr "П_иксель:"
 
-#: ../src/Dialogs.vala:229
+#: ../src/Dialogs.vala:225
 msgid "Export metadata"
 msgstr "Метаақпаратты экспорттау"
 
-#: ../src/Dialogs.vala:465
+#: ../src/Dialogs.vala:459
 msgid "Save Details..."
 msgstr "Ақпаратын сақтау..."
 
-#: ../src/Dialogs.vala:466
+#: ../src/Dialogs.vala:460
 msgid "Save Details"
 msgstr "Ақпаратын сақтау"
 
-#: ../src/Dialogs.vala:481
+#: ../src/Dialogs.vala:475
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(және тағы да %d)\n"
 
-#: ../src/Dialogs.vala:534
+#: ../src/Dialogs.vala:528
 msgid "Import Results Report"
 msgstr "Импорттау нәтижелері"
 
-#: ../src/Dialogs.vala:538
+#: ../src/Dialogs.vala:532
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "%d файлды импорттау талабы жасалды"
 
-#: ../src/Dialogs.vala:541
+#: ../src/Dialogs.vala:535
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -1553,37 +1544,37 @@ msgstr[0] "Осылардан, %d файл сәтті импортталды."
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:553
+#: ../src/Dialogs.vala:547
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Импортталмаған қайталанатын фото/видеолар:"
 
-#: ../src/Dialogs.vala:557
+#: ../src/Dialogs.vala:551
 msgid "duplicates existing media item"
 msgstr "бар болып тұрған медиа элементінің көшірмесі"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: ../src/Dialogs.vala:568
+#: ../src/Dialogs.vala:562
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Фото/видеолар камера қатесі салдарынан импортталмады:"
 
-#: ../src/Dialogs.vala:571 ../src/Dialogs.vala:586 ../src/Dialogs.vala:601
-#: ../src/Dialogs.vala:617 ../src/Dialogs.vala:632 ../src/Dialogs.vala:646
+#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
+#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
 msgid "error message:"
 msgstr "қате хабарламасы:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: ../src/Dialogs.vala:582
+#: ../src/Dialogs.vala:576
 msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgstr "Файлдар фото не видео ретінде танылмағандықтан импортталмады:"
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: ../src/Dialogs.vala:597
+#: ../src/Dialogs.vala:591
 msgid ""
 "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
 "Understands:"
@@ -1593,7 +1584,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: ../src/Dialogs.vala:612
+#: ../src/Dialogs.vala:606
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
 "Library:"
@@ -1601,7 +1592,7 @@ msgstr ""
 "Фото/видеолар Shotwell оларды өз жинағына көшіре алмаған себебінен "
 "импортталмады:"
 
-#: ../src/Dialogs.vala:616
+#: ../src/Dialogs.vala:610
 #, c-format
 msgid ""
 "couldn't copy %s\n"
@@ -1613,61 +1604,61 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: ../src/Dialogs.vala:628
+#: ../src/Dialogs.vala:622
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Фото/видеолар зақымдалған болғандықтан импортталмады:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: ../src/Dialogs.vala:643
+#: ../src/Dialogs.vala:637
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Фото/видеолар келесі себептермен импортталмады:"
 
-#: ../src/Dialogs.vala:663
+#: ../src/Dialogs.vala:657
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "%d қайталанатын фото импортталмаған:\n"
 
-#: ../src/Dialogs.vala:666
+#: ../src/Dialogs.vala:660
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "%d қайталанатын видео импортталмады:\n"
 
-#: ../src/Dialogs.vala:669
+#: ../src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "%d қайталанатын фото/видео импортталмады:\n"
 
-#: ../src/Dialogs.vala:683
+#: ../src/Dialogs.vala:677
 #, 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] "%d фото файл не құрылғылық қате салдарынан импортталмаған:\n"
 
-#: ../src/Dialogs.vala:686
+#: ../src/Dialogs.vala:680
 #, 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] "%d видео файл не құрылғылық қате салдарынан импортталмаған:\n"
 
-#: ../src/Dialogs.vala:689
+#: ../src/Dialogs.vala:683
 #, 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] "%d фото/видео файл не құрылғылық қате салдарынан импортталмады:\n"
 
-#: ../src/Dialogs.vala:692
+#: ../src/Dialogs.vala:686
 #, 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] "%d файл файлдық не құрылғылық қате салдарынан импортталмады:\n"
 
-#: ../src/Dialogs.vala:706
+#: ../src/Dialogs.vala:700
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -1677,7 +1668,7 @@ msgid_plural ""
 msgstr[0] ""
 "%d фотосуретті импорттау қате, өйткені фото жинақ бумасына жазу құқығы жоқ:\n"
 
-#: ../src/Dialogs.vala:709
+#: ../src/Dialogs.vala:703
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -1687,7 +1678,7 @@ msgid_plural ""
 msgstr[0] ""
 "%d видеоны импорттау қате, өйткені фото жинақ бумасына жазу құқығы жоқ:\n"
 
-#: ../src/Dialogs.vala:712
+#: ../src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1699,7 +1690,7 @@ msgstr[0] ""
 "%d фото/видеоны импорттау қате, өйткені фото жинақ бумасына жазу құқығы "
 "жоқ:\n"
 
-#: ../src/Dialogs.vala:715
+#: ../src/Dialogs.vala:709
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -1708,49 +1699,49 @@ msgid_plural ""
 "writable:\n"
 msgstr[0] "%d файл фото жинақ бумасына жазуға болмаған соң импортталмады:\n"
 
-#: ../src/Dialogs.vala:729
+#: ../src/Dialogs.vala:723
 #, 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] "%d фото камера қате салдарынан импортталмаған:\n"
 
-#: ../src/Dialogs.vala:732
+#: ../src/Dialogs.vala:726
 #, 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] "%d видео камера қате салдарынан импортталмады:\n"
 
-#: ../src/Dialogs.vala:735
+#: ../src/Dialogs.vala:729
 #, 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] "%d фото/видео камера қате салдарынан импортталмады:\n"
 
-#: ../src/Dialogs.vala:738
+#: ../src/Dialogs.vala:732
 #, 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] "%d файл камера қатесі салдарынан импортталмады:\n"
 
-#: ../src/Dialogs.vala:752
+#: ../src/Dialogs.vala:746
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
 msgstr[0] "%d фото зақымдалған болғандықтан импортталмады:\n"
 
-#: ../src/Dialogs.vala:755
+#: ../src/Dialogs.vala:749
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
 msgstr[0] "%d видео зақымдалған болғандықтан импортталмады:\n"
 
-#: ../src/Dialogs.vala:758
+#: ../src/Dialogs.vala:752
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
 msgstr[0] "%d фото/видео зақымдалған болғандықтан импортталмады:\n"
 
-#: ../src/Dialogs.vala:761
+#: ../src/Dialogs.vala:755
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
@@ -1760,7 +1751,7 @@ msgstr[0] "%d файл зақымдалған болғандықтан импо�
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: ../src/Dialogs.vala:778
+#: ../src/Dialogs.vala:772
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1768,49 +1759,49 @@ msgstr[0] "%d қолдауы жоқ фотодан аттап өттік:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: ../src/Dialogs.vala:793
+#: ../src/Dialogs.vala:787
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "%d сурет емес файлдан аттап өттік.\n"
 
-#: ../src/Dialogs.vala:804
+#: ../src/Dialogs.vala:798
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "%d фото пайдаланушы бас тарқан соң импортталмады:\n"
 
-#: ../src/Dialogs.vala:807
+#: ../src/Dialogs.vala:801
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "%d видео пайдаланушы бас тартқан соң импортталмады:\n"
 
-#: ../src/Dialogs.vala:810
+#: ../src/Dialogs.vala:804
 #, 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] "%d фото/видео пайдаланушы бас тартқан соң импортталмады:\n"
 
-#: ../src/Dialogs.vala:813
+#: ../src/Dialogs.vala:807
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "%d файл пайдаланушы бас тартқан соң аттап өтілді:\n"
 
-#: ../src/Dialogs.vala:827
+#: ../src/Dialogs.vala:821
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "%d фото сәтті импортталды.\n"
 
-#: ../src/Dialogs.vala:830
+#: ../src/Dialogs.vala:824
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "%d видео сәтті импортталды.\n"
 
-#: ../src/Dialogs.vala:833
+#: ../src/Dialogs.vala:827
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -1818,172 +1809,175 @@ msgstr[0] "%d фото/видео сәтті импортталды.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: ../src/Dialogs.vala:849
+#: ../src/Dialogs.vala:843
 msgid "No photos or videos imported.\n"
 msgstr "Ешбір фото не видео импортталмады.\n"
 
-#: ../src/Dialogs.vala:856 ../src/Dialogs.vala:875
+#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
 msgid "Import Complete"
 msgstr "Импорт аяқталды"
 
-#: ../src/Dialogs.vala:1161
+#: ../src/Dialogs.vala:1155
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d секунд"
 
-#: ../src/Dialogs.vala:1164
+#: ../src/Dialogs.vala:1158
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d минут"
 
-#: ../src/Dialogs.vala:1168
+#: ../src/Dialogs.vala:1162
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d сағат"
 
-#: ../src/Dialogs.vala:1171
+#: ../src/Dialogs.vala:1165
 msgid "1 day"
 msgstr "%d күн"
 
-#: ../src/Dialogs.vala:1319 ../src/Resources.vala:203
+#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
 msgid "Rename Event"
 msgstr "Оқиға атын ауыстыру"
 
-#: ../src/Dialogs.vala:1319
+#: ../src/Dialogs.vala:1315
 msgid "Name:"
 msgstr "Аты:"
 
-#: ../src/Dialogs.vala:1329 ../src/Resources.vala:272
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
 msgid "Edit Title"
 msgstr "Атауды түзету"
 
-#: ../src/Dialogs.vala:1329 ../src/Properties.vala:340
+#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
 msgid "Title:"
 msgstr "Атауы:"
 
-#: ../src/Dialogs.vala:1343 ../src/Resources.vala:278
+#. Dialog title
+#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
 msgid "Edit Event Comment"
 msgstr "Оқиға түсіндірмесін түзету"
 
-#: ../src/Dialogs.vala:1343
+#: ../src/Dialogs.vala:1344
 msgid "Edit Photo/Video Comment"
 msgstr "Фото/видео түсіндірмесін түзету"
 
-#: ../src/Dialogs.vala:1344 ../src/Properties.vala:630
+#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
 msgid "Comment:"
 msgstr "Түсіндірме:"
 
-#: ../src/Dialogs.vala:1360
+#: ../src/Dialogs.vala:1361
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Файл(дар)ды өшіру және қ_оқыс шелегіне тастау"
 
-#: ../src/Dialogs.vala:1364
+#: ../src/Dialogs.vala:1365
 msgid "_Remove From Library"
 msgstr "Жинақтан ө_шіру"
 
-#: ../src/Dialogs.vala:1384 ../src/camera/ImportPage.vala:1739
+#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
 msgid "_Keep"
 msgstr "Ұ_стау"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edit?"
 msgstr "Сыртқы түзетуді болдырмау керек пе?"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edits?"
 msgstr "Сыртқы түзетулерді болдырмау керек пе?"
 
-#: ../src/Dialogs.vala:1409
+#: ../src/Dialogs.vala:1410
 #, 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] "%d сыртқы файлға жасалған өзгерістер жоғалады. Жалғастыру керек пе?"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edit"
 msgstr "Сыр_тқы түзетуді болдырмау"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edits"
 msgstr "Сыр_тқы түзетулерді болдырмау керек пе?"
 
-#: ../src/Dialogs.vala:1434
+#: ../src/Dialogs.vala:1435
 #, 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] "Жинақтан %d фото өшіріледі. Жалғастыру керек пе?"
 
-#: ../src/Dialogs.vala:1441
+#: ../src/Dialogs.vala:1442 ../src/Resources.vala:178
 msgid "_Remove"
 msgstr "Өші_ру"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photo From Library"
 msgstr "Фотоны жинақтан өшіру"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photos From Library"
 msgstr "Фотоларды жинақтан өшіру"
 
-#: ../src/Dialogs.vala:1535
+#: ../src/Dialogs.vala:1536
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1682
+#: ../src/Dialogs.vala:1688
 msgid "AM"
 msgstr "AM"
 
-#: ../src/Dialogs.vala:1683
+#: ../src/Dialogs.vala:1689
 msgid "PM"
 msgstr "PM"
 
-#: ../src/Dialogs.vala:1684
+#: ../src/Dialogs.vala:1690
 msgid "24 Hr"
 msgstr "24 сағ"
 
-#: ../src/Dialogs.vala:1699
+#: ../src/Dialogs.vala:1705
 msgid "_Shift photos/videos by the same amount"
 msgstr "Бар_лық фото/видеоларды бірдей шамаға жылжыту"
 
-#: ../src/Dialogs.vala:1704
+#: ../src/Dialogs.vala:1710
 msgid "Set _all photos/videos to this time"
 msgstr "Б_арлық фото/видеоларды бұл уақытқа орнату"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo file"
 msgstr "Түпнұсқа фотосурет файлын тү_зету"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo files"
 msgstr "Түпнұсқа фотосурет файлдарын тү_зету"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original file"
 msgstr "_Бастапқы файлды түзету"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original files"
 msgstr "Баста_пқы файлдарды түзету"
 
-#: ../src/Dialogs.vala:1800
+#: ../src/Dialogs.vala:1806
 msgid "Original: "
 msgstr "Бастапқы:"
 
-#: ../src/Dialogs.vala:1801
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%m/%d/%Y, %H:%M:%S"
 
-#: ../src/Dialogs.vala:1802
+#: ../src/Dialogs.vala:1808
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%m/%d/%Y, %I:%M:%S %p"
 
-#: ../src/Dialogs.vala:1891
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -1992,7 +1986,7 @@ msgstr ""
 "Ұсталым уақыты алға келесі мәнге жылжытылады:\n"
 "%d %s, %d %s, %d %s, және %d %s."
 
-#: ../src/Dialogs.vala:1892
+#: ../src/Dialogs.vala:1898
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2001,27 +1995,27 @@ msgstr ""
 "Ұсталым уақыты артқа келесі мәнге жылжытылады:\n"
 "%d %s, %d %s, %d %s, және %d %s."
 
-#: ../src/Dialogs.vala:1894
+#: ../src/Dialogs.vala:1900
 msgid "day"
 msgid_plural "days"
 msgstr[0] "күн"
 
-#: ../src/Dialogs.vala:1895
+#: ../src/Dialogs.vala:1901
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "сағат"
 
-#: ../src/Dialogs.vala:1896
+#: ../src/Dialogs.vala:1902
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минут"
 
-#: ../src/Dialogs.vala:1897
+#: ../src/Dialogs.vala:1903
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "секунд"
 
-#: ../src/Dialogs.vala:1941
+#: ../src/Dialogs.vala:1947
 #, c-format
 msgid ""
 "\n"
@@ -2036,49 +2030,49 @@ msgstr[0] ""
 "\n"
 "Және %d басқа."
 
-#: ../src/Dialogs.vala:1963 ../src/Dialogs.vala:1990
+#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
 msgid "Tags (separated by commas):"
 msgstr "Тегтер (үтірмен ажыратылған):"
 
-#: ../src/Dialogs.vala:2070
+#: ../src/Dialogs.vala:2076
 msgid "Welcome!"
 msgstr "Қош келдіңіз!"
 
-#: ../src/Dialogs.vala:2077
+#: ../src/Dialogs.vala:2083
 msgid "Welcome to Shotwell!"
 msgstr "Shotwell қолданбасына қош келдіңіз!"
 
-#: ../src/Dialogs.vala:2081
+#: ../src/Dialogs.vala:2087
 msgid "To get started, import photos in any of these ways:"
 msgstr "Бастау үшін, фотоларды келесі жолдармен импорттай аласыз:"
 
-#: ../src/Dialogs.vala:2100
+#: ../src/Dialogs.vala:2106
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "<span weight=\"bold\">Файл %s Бумадан импорттау</span> таңдаңыз"
 
-#: ../src/Dialogs.vala:2101
+#: ../src/Dialogs.vala:2107
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Фотоларды Shotwell терезесіне тартып апарыңыз"
 
-#: ../src/Dialogs.vala:2102
+#: ../src/Dialogs.vala:2108
 msgid "Connect a camera to your computer and import"
 msgstr "Компьютеріңізге камераны жалғап, ипорттаңыз"
 
-#: ../src/Dialogs.vala:2112
+#: ../src/Dialogs.vala:2118
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "Фотоларды сіздің %s _бумаңыздан импорттау"
 
-#: ../src/Dialogs.vala:2119
+#: ../src/Dialogs.vala:2125
 msgid "You can also import photos in any of these ways:"
 msgstr "Оған қоса, фотоларды осы жолдармен импорттай аласыз:"
 
-#: ../src/Dialogs.vala:2129
+#: ../src/Dialogs.vala:2135
 msgid "_Don't show this message again"
 msgstr "Бұ_л хабарламаны келесіде көрсетпеу"
 
-#: ../src/Dialogs.vala:2164
+#: ../src/Dialogs.vala:2170
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Фотоларды сіздің %s жинағыңыздан импорттау"
@@ -2086,41 +2080,41 @@ msgstr "Фотоларды сіздің %s жинағыңыздан импорт
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2308 ../src/Dialogs.vala:2312
+#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
 msgid "(Help)"
 msgstr "(Көмек)"
 
-#: ../src/Dialogs.vala:2321
+#: ../src/Dialogs.vala:2324
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Жыл%sАй%sКүн"
 
-#: ../src/Dialogs.vala:2323
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth"
 msgstr "Жыл%sАй"
 
-#: ../src/Dialogs.vala:2325
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Жыл%sАй-Күн"
 
-#: ../src/Dialogs.vala:2327
+#: ../src/Dialogs.vala:2330
 msgid "Year-Month-Day"
 msgstr "Жыл-Ай-Күн"
 
-#: ../src/Dialogs.vala:2328 ../src/editing_tools/EditingTools.vala:781
+#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Таңдауыңызша"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2565
+#: ../src/Dialogs.vala:2568
 msgid "Invalid pattern"
 msgstr "Шаблон қате"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: ../src/Dialogs.vala:2668
+#: ../src/Dialogs.vala:2670
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2128,31 +2122,31 @@ msgstr ""
 "Shotwell фотоларды жинағыңызға көшіре алады, немесе көшірмесіз-ақ импорттай "
 "алады."
 
-#: ../src/Dialogs.vala:2673
+#: ../src/Dialogs.vala:2675
 msgid "Co_py Photos"
 msgstr "Фо_толарды көшіру"
 
-#: ../src/Dialogs.vala:2674
+#: ../src/Dialogs.vala:2676
 msgid "_Import in Place"
 msgstr "Кө_шірусіз импорттау"
 
-#: ../src/Dialogs.vala:2675
+#: ../src/Dialogs.vala:2677
 msgid "Import to Library"
 msgstr "Жинақ ішіне импорттау"
 
-#: ../src/Dialogs.vala:2685 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
 msgid "Remove From Library"
 msgstr "Жинақтан өшіру"
 
-#: ../src/Dialogs.vala:2686 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
 msgid "Removing Photo From Library"
 msgstr "Фото(лар) жинақтан өшіру"
 
-#: ../src/Dialogs.vala:2686
+#: ../src/Dialogs.vala:2688
 msgid "Removing Photos From Library"
 msgstr "Фотоларды жинақтан өшіру"
 
-#: ../src/Dialogs.vala:2700
+#: ../src/Dialogs.vala:2702
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -2170,7 +2164,7 @@ msgstr[0] ""
 "\n"
 "Бұл әрекетті болдырмау мүмкін емес болады."
 
-#: ../src/Dialogs.vala:2704
+#: ../src/Dialogs.vala:2706
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -2188,7 +2182,7 @@ msgstr[0] ""
 "\n"
 "Бұл әрекетті болдырмау мүмкін емес болады."
 
-#: ../src/Dialogs.vala:2708
+#: ../src/Dialogs.vala:2710
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -2206,7 +2200,7 @@ msgstr[0] ""
 "\n"
 "Бұл әрекетті болдырмау мүмкін емес болады."
 
-#: ../src/Dialogs.vala:2740
+#: ../src/Dialogs.vala:2742
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -2217,7 +2211,7 @@ msgstr[0] ""
 "керек пе?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2757
+#: ../src/Dialogs.vala:2759
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -2278,115 +2272,123 @@ msgstr "Экспорт"
 msgid "Unable to process monitoring updates: %s"
 msgstr "Жаңартуларды бақылау мүмкін емес: %s"
 
-#: ../src/MediaPage.vala:143
+#: ../src/MediaPage.vala:158
 msgid "Adjust the size of the thumbnails"
 msgstr "Кіші көріністердің өлшемдерін баптау"
 
-#: ../src/MediaPage.vala:325 ../src/PhotoPage.vala:2590
-#: ../src/direct/DirectPhotoPage.vala:174
+#: ../src/MediaPage.vala:340 ../src/PhotoPage.vala:2593
+#: ../src/Resources.vala:188 ../src/direct/DirectPhotoPage.vala:174
 msgid "Zoom _In"
 msgstr "Үлке_йту"
 
-#: ../src/MediaPage.vala:326
+#: ../src/MediaPage.vala:341
 msgid "Increase the magnification of the thumbnails"
 msgstr "Кіші көріністерді үлкейту"
 
-#: ../src/MediaPage.vala:331 ../src/PhotoPage.vala:2596
-#: ../src/direct/DirectPhotoPage.vala:180
+#: ../src/MediaPage.vala:346 ../src/PhotoPage.vala:2599
+#: ../src/Resources.vala:189 ../src/direct/DirectPhotoPage.vala:180
 msgid "Zoom _Out"
 msgstr "Кі_шірейту"
 
-#: ../src/MediaPage.vala:332
+#: ../src/MediaPage.vala:347
 msgid "Decrease the magnification of the thumbnails"
 msgstr "Кіші көріністерді кішірейту"
 
-#: ../src/MediaPage.vala:399
+#: ../src/MediaPage.vala:414
 msgid "Sort _Photos"
 msgstr "Фот_оларды сұрыптау"
 
-#: ../src/MediaPage.vala:408
+#: ../src/MediaPage.vala:423
 msgid "_Play Video"
 msgstr "Видеоны о_йнату"
 
-#: ../src/MediaPage.vala:409
+#: ../src/MediaPage.vala:424
 msgid "Open the selected videos in the system video player"
 msgstr "Таңдалған видеоларды жүйелік видео плеерінде ашу"
 
-#: ../src/MediaPage.vala:413 ../src/PhotoPage.vala:2639
+#: ../src/MediaPage.vala:428 ../src/PhotoPage.vala:2642
 msgid "_Developer"
 msgstr "Ө_ндіруші"
 
-#: ../src/MediaPage.vala:425 ../src/camera/Branch.vala:101
+#: ../src/MediaPage.vala:440 ../src/camera/Branch.vala:99
 #: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
 #: ../src/photos/RawSupport.vala:303
 msgid "Camera"
 msgstr "Камера"
 
-#: ../src/MediaPage.vala:436 ../src/camera/ImportPage.vala:872
+#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:874
 msgid "_Titles"
 msgstr "_Атаулар"
 
-#: ../src/MediaPage.vala:437 ../src/camera/ImportPage.vala:873
+#: ../src/MediaPage.vala:452 ../src/camera/ImportPage.vala:875
 msgid "Display the title of each photo"
 msgstr "Әр фотоның атауын көрсету"
 
-#: ../src/MediaPage.vala:442 ../src/events/EventsDirectoryPage.vala:130
+#: ../src/MediaPage.vala:457 ../src/events/EventsDirectoryPage.vala:130
 msgid "_Comments"
 msgstr "_Пікірлер"
 
-#: ../src/MediaPage.vala:443
+#: ../src/MediaPage.vala:458
 msgid "Display the comment of each photo"
 msgstr "Әр фотоның түсіндірмесін көрсету"
 
-#: ../src/MediaPage.vala:454 ../src/library/LibraryWindow.vala:376
+#: ../src/MediaPage.vala:469 ../src/library/LibraryWindow.vala:375
 msgid "Ta_gs"
 msgstr "Те_гтер"
 
-#: ../src/MediaPage.vala:455
+#: ../src/MediaPage.vala:470
 msgid "Display each photo's tags"
 msgstr "Әр фотоның тегтерін көрсету"
 
-#: ../src/MediaPage.vala:471
+#: ../src/MediaPage.vala:486
 msgid "By _Title"
 msgstr "А_тауы бойынша"
 
-#: ../src/MediaPage.vala:472
+#: ../src/MediaPage.vala:487
 msgid "Sort photos by title"
 msgstr "Фотоларды атаулары бойынша сұрыптау"
 
-#: ../src/MediaPage.vala:477
+#: ../src/MediaPage.vala:492
 msgid "By Exposure _Date"
 msgstr "Түсірілген _күні бойынша"
 
-#: ../src/MediaPage.vala:478
+#: ../src/MediaPage.vala:493
 msgid "Sort photos by exposure date"
 msgstr "Фотоларды түсірілген күні бойынша сұрыптау"
 
-#: ../src/MediaPage.vala:483
+#: ../src/MediaPage.vala:498
 msgid "By _Rating"
 msgstr "Ре_йтингі бойынша"
 
-#: ../src/MediaPage.vala:484
+#: ../src/MediaPage.vala:499
 msgid "Sort photos by rating"
 msgstr "Фотоларды рейтингі бойынша сұрыптау"
 
-#: ../src/MediaPage.vala:494 ../src/library/LibraryWindow.vala:422
+#: ../src/MediaPage.vala:504
+msgid "By _Filename"
+msgstr "_Файл аты бойынша"
+
+#: ../src/MediaPage.vala:505
+msgid "Sort photos by filename"
+msgstr "Фотоларды файл аты бойынша сұрыптау"
+
+#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:421
 msgid "_Ascending"
 msgstr "Өс_у ретімен"
 
-#: ../src/MediaPage.vala:495 ../src/library/LibraryWindow.vala:423
+#: ../src/MediaPage.vala:516 ../src/library/LibraryWindow.vala:422
 msgid "Sort photos in an ascending order"
 msgstr "Фотоларды өсу ретімен сұрыптау"
 
-#: ../src/MediaPage.vala:500 ../src/library/LibraryWindow.vala:429
+#: ../src/MediaPage.vala:521 ../src/library/LibraryWindow.vala:428
 msgid "D_escending"
 msgstr "К_ему ретімен"
 
-#: ../src/MediaPage.vala:501 ../src/library/LibraryWindow.vala:430
+#: ../src/MediaPage.vala:522 ../src/library/LibraryWindow.vala:429
 msgid "Sort photos in a descending order"
 msgstr "Фотоларды кему ретімен сұрыптау"
 
-#: ../src/MediaPage.vala:702
+#: ../src/MediaPage.vala:723
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -2395,15 +2397,15 @@ msgstr ""
 "Shotwell таңдалған видеоны ойната алмады:\n"
 "%s"
 
-#: ../src/Page.vala:1268
+#: ../src/Page.vala:1263
 msgid "No photos/videos"
 msgstr "Фото/видеолар жоқ"
 
-#: ../src/Page.vala:1272
+#: ../src/Page.vala:1267
 msgid "No photos/videos found"
 msgstr "Ешбір фото/видео табылмады"
 
-#: ../src/Page.vala:2573
+#: ../src/Page.vala:2565
 msgid "Photos cannot be exported to this directory."
 msgstr "Фотоларды бұл бумаға экспорттау мүмкін емес."
 
@@ -2412,82 +2414,82 @@ msgid "modified"
 msgstr "түрлендірілген"
 
 #. previous button
-#: ../src/PhotoPage.vala:532
+#: ../src/PhotoPage.vala:533
 msgid "Previous photo"
 msgstr "Алдыңғы фото"
 
 #. next button
-#: ../src/PhotoPage.vala:537
+#: ../src/PhotoPage.vala:539
 msgid "Next photo"
 msgstr "Келесі фото"
 
-#: ../src/PhotoPage.vala:1844
+#: ../src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Фотоның бастапқы файлы жоқ: %s"
 
-#: ../src/PhotoPage.vala:2411 ../src/direct/DirectPhotoPage.vala:165
-#: ../src/library/LibraryWindow.vala:360
+#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
+#: ../src/library/LibraryWindow.vala:359
 msgid "_View"
 msgstr "_Түрі"
 
-#: ../src/PhotoPage.vala:2415 ../src/direct/DirectPhotoPage.vala:81
+#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
 msgid "T_ools"
 msgstr "Са_ймандар"
 
-#: ../src/PhotoPage.vala:2420 ../src/direct/DirectPhotoPage.vala:86
+#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
 msgid "_Previous Photo"
 msgstr "Ал_дыңғы фото"
 
-#: ../src/PhotoPage.vala:2421 ../src/direct/DirectPhotoPage.vala:87
+#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
 msgid "Previous Photo"
 msgstr "Алдыңғы фото"
 
-#: ../src/PhotoPage.vala:2426 ../src/direct/DirectPhotoPage.vala:92
+#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
 msgid "_Next Photo"
 msgstr "К_елесі фото"
 
-#: ../src/PhotoPage.vala:2427 ../src/direct/DirectPhotoPage.vala:93
+#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
 msgid "Next Photo"
 msgstr "Келесі фото"
 
-#: ../src/PhotoPage.vala:2591 ../src/direct/DirectPhotoPage.vala:175
+#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
 msgid "Increase the magnification of the photo"
 msgstr "Фотоны үлкейту"
 
-#: ../src/PhotoPage.vala:2597 ../src/direct/DirectPhotoPage.vala:181
+#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
 msgid "Decrease the magnification of the photo"
 msgstr "Фотоны кішірейту"
 
-#: ../src/PhotoPage.vala:2602 ../src/direct/DirectPhotoPage.vala:186
+#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
 msgid "Fit to _Page"
 msgstr "Параққа сы_йдыру"
 
-#: ../src/PhotoPage.vala:2603 ../src/direct/DirectPhotoPage.vala:187
+#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
 msgid "Zoom the photo to fit on the screen"
 msgstr "Фотоны экранды толығымен алатындай етіп келтіру"
 
-#: ../src/PhotoPage.vala:2609 ../src/direct/DirectPhotoPage.vala:193
+#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
 #, no-c-format
 msgid "Zoom _100%"
 msgstr "Үлкейту - _100%"
 
-#: ../src/PhotoPage.vala:2611 ../src/direct/DirectPhotoPage.vala:195
+#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
 #, no-c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "Фотосуретті өлшемнің 100 дейін өзгерту"
 
-#: ../src/PhotoPage.vala:2617 ../src/direct/DirectPhotoPage.vala:201
+#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
 #, no-c-format
 msgid "Zoom _200%"
 msgstr "Үлкейту - _200%"
 
-#: ../src/PhotoPage.vala:2619 ../src/direct/DirectPhotoPage.vala:203
+#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
 #, no-c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "Фотосуретті өлшемнің 200 дейін өзгерту"
 
-#: ../src/PhotoPage.vala:3230
+#: ../src/PhotoPage.vala:3231
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "%s экспорттау мүмкін емес: %s"
@@ -2681,67 +2683,67 @@ msgid "Exposure:"
 msgstr "Экспозиция:"
 
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:585
+#: ../src/Properties.vala:583
 msgid "Location:"
 msgstr "Орналасуы:"
 
-#: ../src/Properties.vala:588
+#: ../src/Properties.vala:586
 msgid "File size:"
 msgstr "Файл өлшемі:"
 
-#: ../src/Properties.vala:592
+#: ../src/Properties.vala:590
 msgid "Current Development:"
 msgstr "Ағымдағы өндеуде:"
 
-#: ../src/Properties.vala:594
+#: ../src/Properties.vala:592
 msgid "Original dimensions:"
 msgstr "Бастапқы өлшемдері:"
 
-#: ../src/Properties.vala:597
+#: ../src/Properties.vala:595
 msgid "Camera make:"
 msgstr "Камера моделі:"
 
-#: ../src/Properties.vala:600
+#: ../src/Properties.vala:598
 msgid "Camera model:"
 msgstr "Камера моделі:"
 
-#: ../src/Properties.vala:603
+#: ../src/Properties.vala:601
 msgid "Flash:"
 msgstr "Жарқылдау:"
 
-#: ../src/Properties.vala:605
+#: ../src/Properties.vala:603
 msgid "Focal length:"
 msgstr "Фокустық қашықтығы:"
 
-#: ../src/Properties.vala:608
+#: ../src/Properties.vala:606
 msgid "Exposure date:"
 msgstr "Экспозиция күні:"
 
-#: ../src/Properties.vala:611
+#: ../src/Properties.vala:609
 msgid "Exposure time:"
 msgstr "Экспозиция уақыты:"
 
-#: ../src/Properties.vala:614
+#: ../src/Properties.vala:612
 msgid "Exposure bias:"
 msgstr "Экспозицияны келтіру:"
 
-#: ../src/Properties.vala:616
+#: ../src/Properties.vala:614
 msgid "GPS latitude:"
 msgstr "GPS ендігі:"
 
-#: ../src/Properties.vala:619
+#: ../src/Properties.vala:617
 msgid "GPS longitude:"
 msgstr "GPS бойлығы:"
 
-#: ../src/Properties.vala:622
+#: ../src/Properties.vala:620
 msgid "Artist:"
 msgstr "Орындаушы:"
 
-#: ../src/Properties.vala:624
+#: ../src/Properties.vala:622
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../src/Properties.vala:626
+#: ../src/Properties.vala:624
 msgid "Software:"
 msgstr "Бағд. қамтамасы:"
 
@@ -2757,654 +2759,755 @@ msgstr "Фотосуреттерді басқару қолданбасы"
 msgid "Photo Viewer"
 msgstr "Фотосуреттерді көрсету"
 
-#: ../src/Resources.vala:142
+#: ../src/Resources.vala:144
 msgid "Rotate _Right"
 msgstr "Оңғ_а бұру"
 
-#: ../src/Resources.vala:143 ../src/Resources.vala:148
+#: ../src/Resources.vala:145 ../src/Resources.vala:150
 msgid "Rotate"
 msgstr "Бұру"
 
-#: ../src/Resources.vala:144
+#: ../src/Resources.vala:146
 msgid "Rotate Right"
 msgstr "Оңға бұру"
 
-#: ../src/Resources.vala:145
+#: ../src/Resources.vala:147
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Фотосуреттерді оңға бұру (Солға бұру үшін Ctrl басыңыз)"
 
-#: ../src/Resources.vala:147
+#: ../src/Resources.vala:149
 msgid "Rotate _Left"
 msgstr "С_олға бұру"
 
-#: ../src/Resources.vala:149
+#: ../src/Resources.vala:151
 msgid "Rotate Left"
 msgstr "Солға бұру"
 
-#: ../src/Resources.vala:150
+#: ../src/Resources.vala:152
 msgid "Rotate the photos left"
 msgstr "Фотоларды солға бұру"
 
-#: ../src/Resources.vala:152
+#: ../src/Resources.vala:154
 msgid "Flip Hori_zontally"
 msgstr "Горизонта_лды айналдыру"
 
-#: ../src/Resources.vala:153
+#: ../src/Resources.vala:155
 msgid "Flip Horizontally"
 msgstr "Горизонталды айналдыру"
 
-#: ../src/Resources.vala:155
+#: ../src/Resources.vala:157
 msgid "Flip Verti_cally"
 msgstr "_Вертикалды айналдыру"
 
-#: ../src/Resources.vala:156
+#: ../src/Resources.vala:158
 msgid "Flip Vertically"
 msgstr "Вертикалды айналдыру"
 
-#: ../src/Resources.vala:158
+#: ../src/Resources.vala:160
+msgid "_About"
+msgstr "О_сы туралы"
+
+#: ../src/Resources.vala:161
+msgid "_Apply"
+msgstr "Іске _асыру"
+
+#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
+#: ../src/library/LibraryWindow.vala:355
+msgid "_Edit"
+msgstr "Тү_зету"
+
+#: ../src/Resources.vala:165
+msgid "_Forward"
+msgstr "А_лға"
+
+#: ../src/Resources.vala:166
+msgid "Fulls_creen"
+msgstr "Т_олық экранға"
+
+#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
+#: ../src/library/LibraryWindow.vala:379
+msgid "_Help"
+msgstr "_Көмек"
+
+#: ../src/Resources.vala:168
+msgid "Leave _Fullscreen"
+msgstr "Т_олық экраннан шығу"
+
+#: ../src/Resources.vala:169 ../src/Resources.vala:371
+msgid "_New"
+msgstr "Ж_аңа"
+
+#: ../src/Resources.vala:170
+msgid "_Next"
+msgstr "_Келесі"
+
+#: ../src/Resources.vala:171
+msgid "_OK"
+msgstr "_ОК"
+
+#: ../src/Resources.vala:172
+msgid "_Play"
+msgstr "Ой_нату"
+
+#: ../src/Resources.vala:173 ../src/Resources.vala:325
+msgid "_Preferences"
+msgstr "Ба_птаулар"
+
+#: ../src/Resources.vala:174
+msgid "_Previous"
+msgstr "Ал_дыңғы"
+
+#: ../src/Resources.vala:175
+msgid "_Print"
+msgstr "Бас_паға шығару"
+
+#: ../src/Resources.vala:176
+msgid "_Quit"
+msgstr "_Шығу"
+
+#: ../src/Resources.vala:177
+msgid "_Refresh"
+msgstr "Жаңар_ту"
+
+#: ../src/Resources.vala:179
+msgid "_Revert"
+msgstr "Қай_тару"
+
+#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save"
+msgstr "_Сақтау"
+
+#: ../src/Resources.vala:181
+msgid "Save _As"
+msgstr "Қала_йша сақтау"
+
+#: ../src/Resources.vala:182
+msgid "Sort _Ascending"
+msgstr "Өс_у ретімен сұрыптау"
+
+#: ../src/Resources.vala:183
+msgid "Sort _Descending"
+msgstr "К_ему ретімен сұрыптау"
+
+#: ../src/Resources.vala:184
+msgid "_Stop"
+msgstr "Тоқ_тату"
+
+#: ../src/Resources.vala:185
+msgid "_Undelete"
+msgstr "Ө_шірілгенді қалпына келтіру"
+
+#: ../src/Resources.vala:186
+msgid "_Normal Size"
+msgstr "Қалы_пты өлшемі"
+
+#: ../src/Resources.vala:187
+msgid "Best _Fit"
+msgstr "Жақ_сырақ сыю"
+
+#: ../src/Resources.vala:191
 msgid "_Enhance"
 msgstr "Жақсар_ту"
 
-#: ../src/Resources.vala:159
+#: ../src/Resources.vala:192
 msgid "Enhance"
 msgstr "Жақсарту"
 
-#: ../src/Resources.vala:160
+#: ../src/Resources.vala:193
 msgid "Automatically improve the photo's appearance"
 msgstr "Фото түрін автожақсарту"
 
-#: ../src/Resources.vala:162
+#: ../src/Resources.vala:195
 msgid "_Copy Color Adjustments"
 msgstr "Түстерді келтіруін _көшіріп алу"
 
-#: ../src/Resources.vala:163
+#: ../src/Resources.vala:196
 msgid "Copy Color Adjustments"
 msgstr "Түстерді келтіруін көшіріп алу"
 
-#: ../src/Resources.vala:164
+#: ../src/Resources.vala:197
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Фотосуретке іске асырылған түстерді келтіруін көшіріп алу"
 
-#: ../src/Resources.vala:166
+#: ../src/Resources.vala:199
 msgid "_Paste Color Adjustments"
 msgstr "Түстерді келтіруін кірі_стіру"
 
-#: ../src/Resources.vala:167
+#: ../src/Resources.vala:200
 msgid "Paste Color Adjustments"
 msgstr "Түстерді келтіруін кірістіру"
 
-#: ../src/Resources.vala:168
+#: ../src/Resources.vala:201
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Таңдалған фотоларға көшірілген түстерді келтіруін кірістіру"
 
-#: ../src/Resources.vala:170
+#: ../src/Resources.vala:203
 msgid "_Crop"
 msgstr "Қ_иып жіберу"
 
-#: ../src/Resources.vala:171
+#: ../src/Resources.vala:204
 msgid "Crop"
 msgstr "Қиып жіберу"
 
-#: ../src/Resources.vala:172
+#: ../src/Resources.vala:205
 msgid "Crop the photo's size"
 msgstr "Фотосуретті қиып жіберу"
 
-#: ../src/Resources.vala:174 ../src/editing_tools/StraightenTool.vala:100
+#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
 msgid "_Straighten"
 msgstr "Тура_лау"
 
-#: ../src/Resources.vala:175
+#: ../src/Resources.vala:208
 msgid "Straighten"
 msgstr "Туралау"
 
-#: ../src/Resources.vala:176
+#: ../src/Resources.vala:209
 msgid "Straighten the photo"
 msgstr "Фотосуретті туралау"
 
-#: ../src/Resources.vala:178
+#: ../src/Resources.vala:211
 msgid "_Red-eye"
 msgstr "Қы_зыл көздер"
 
-#: ../src/Resources.vala:179
+#: ../src/Resources.vala:212
 msgid "Red-eye"
 msgstr "Қызыл көздер"
 
-#: ../src/Resources.vala:180
+#: ../src/Resources.vala:213
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Фотодағы қызыл көздер эффектілерін жою"
 
-#: ../src/Resources.vala:182
+#: ../src/Resources.vala:215
 msgid "_Adjust"
 msgstr "К_елтіру"
 
-#: ../src/Resources.vala:183
+#: ../src/Resources.vala:216
 msgid "Adjust"
 msgstr "Келтіру"
 
-#: ../src/Resources.vala:184
+#: ../src/Resources.vala:217
 msgid "Adjust the photo's color and tone"
 msgstr "Фото түсін мен реңің келтіру"
 
-#: ../src/Resources.vala:186
+#: ../src/Resources.vala:219
 msgid "Re_vert to Original"
 msgstr "Бастапқ_ыға тастау"
 
-#: ../src/Resources.vala:187
+#: ../src/Resources.vala:220
 msgid "Revert to Original"
 msgstr "Бастапқы қалпына келтіру"
 
-#: ../src/Resources.vala:189
+#: ../src/Resources.vala:222
 msgid "Revert External E_dits"
 msgstr "Сыртқы тү_зетулерді болдырмау"
 
-#: ../src/Resources.vala:190
+#: ../src/Resources.vala:223
 msgid "Revert to the master photo"
 msgstr "Бас фотоға дейін тастау"
 
-#: ../src/Resources.vala:192
+#: ../src/Resources.vala:225
 msgid "Set as _Desktop Background"
 msgstr "Жұмыс үс_тел тұсқағазы ретінде орнату"
 
-#: ../src/Resources.vala:193
+#: ../src/Resources.vala:226
 msgid "Set selected image to be the new desktop background"
 msgstr "Таңдалған суретті жұмыс үстелінің тұсқағазы ретінде орнату"
 
-#: ../src/Resources.vala:194
+#: ../src/Resources.vala:227
 msgid "Set as _Desktop Slideshow..."
 msgstr "Жұмыс үс_тел слайдшоуы ретінде орнату..."
 
-#: ../src/Resources.vala:196
+#: ../src/Resources.vala:229
 msgid "_Undo"
 msgstr "Бол_дырмау"
 
-#: ../src/Resources.vala:197
+#: ../src/Resources.vala:230
 msgid "Undo"
 msgstr "Болдырмау"
 
-#: ../src/Resources.vala:199
+#: ../src/Resources.vala:232
 msgid "_Redo"
 msgstr "Қа_йталау"
 
-#: ../src/Resources.vala:200
+#: ../src/Resources.vala:233
 msgid "Redo"
 msgstr "Қайталау"
 
-#: ../src/Resources.vala:202
+#: ../src/Resources.vala:235
 msgid "Re_name Event..."
 msgstr "Оқ_иға атауын өзгерту..."
 
-#: ../src/Resources.vala:205
+#: ../src/Resources.vala:238
 msgid "Make _Key Photo for Event"
 msgstr "Оқиға үшін _негізгі фото жасау"
 
-#: ../src/Resources.vala:206
+#: ../src/Resources.vala:239
 msgid "Make Key Photo for Event"
 msgstr "Оқиға үшін негізгі фото жасау"
 
-#: ../src/Resources.vala:208
+#: ../src/Resources.vala:241
 msgid "_New Event"
 msgstr "_Жаңа оқиға"
 
-#: ../src/Resources.vala:209
+#: ../src/Resources.vala:242
 msgid "New Event"
 msgstr "Жаңа оқиға"
 
-#: ../src/Resources.vala:211
+#: ../src/Resources.vala:244
 msgid "Move Photos"
 msgstr "Фотоларды жылжыту"
 
-#: ../src/Resources.vala:212
+#: ../src/Resources.vala:245
 msgid "Move photos to an event"
 msgstr "Фотоларды оқиғаға жылжыту"
 
-#: ../src/Resources.vala:214
+#: ../src/Resources.vala:247
 msgid "_Merge Events"
 msgstr "_Оқиғаларды біріктіру"
 
-#: ../src/Resources.vala:215
+#: ../src/Resources.vala:248
 msgid "Merge"
 msgstr "Біріктіру"
 
-#: ../src/Resources.vala:216
+#: ../src/Resources.vala:249
 msgid "Combine events into a single event"
 msgstr "Оқиғаларды бір оқиғаға біріктіру"
 
-#: ../src/Resources.vala:218
+#: ../src/Resources.vala:251
 msgid "_Set Rating"
 msgstr "_Рейтингті орнату"
 
-#: ../src/Resources.vala:219
+#: ../src/Resources.vala:252
 msgid "Set Rating"
 msgstr "Рейтингті орнату"
 
-#: ../src/Resources.vala:220
+#: ../src/Resources.vala:253
 msgid "Change the rating of your photo"
 msgstr "Фотоңыздың рейтингін орнату"
 
-#: ../src/Resources.vala:222
+#: ../src/Resources.vala:255
 msgid "_Increase"
 msgstr "Ү_лкейту"
 
-#: ../src/Resources.vala:223
+#: ../src/Resources.vala:256
 msgid "Increase Rating"
 msgstr "Рейтингі үлкейту"
 
-#: ../src/Resources.vala:225
+#: ../src/Resources.vala:258
 msgid "_Decrease"
 msgstr "Кі_шірейту"
 
-#: ../src/Resources.vala:226
+#: ../src/Resources.vala:259
 msgid "Decrease Rating"
 msgstr "Рейтингі кішірейту"
 
-#: ../src/Resources.vala:228
+#: ../src/Resources.vala:261
 msgid "_Unrated"
 msgstr "Рейт_ингсіз"
 
-#: ../src/Resources.vala:229
+#: ../src/Resources.vala:262
 msgid "Unrated"
 msgstr "Рейтингсіз"
 
-#: ../src/Resources.vala:230
+#: ../src/Resources.vala:263
 msgid "Rate Unrated"
 msgstr "Рейтингсіз етіп белгілеу"
 
-#: ../src/Resources.vala:231
+#: ../src/Resources.vala:264
 msgid "Setting as unrated"
 msgstr "Рейтингсіз етіп белгілеу"
 
-#: ../src/Resources.vala:232
+#: ../src/Resources.vala:265
 msgid "Remove any ratings"
 msgstr "Бар рейтингілерді өшіру"
 
-#: ../src/Resources.vala:234
+#: ../src/Resources.vala:267
 msgid "_Rejected"
 msgstr "Та_йдырылған"
 
-#: ../src/Resources.vala:235
+#: ../src/Resources.vala:268
 msgid "Rejected"
 msgstr "Тайдырылған"
 
-#: ../src/Resources.vala:236
+#: ../src/Resources.vala:269
 msgid "Rate Rejected"
 msgstr "Тайдырылған етіп белгілеу"
 
-#: ../src/Resources.vala:237
+#: ../src/Resources.vala:270
 msgid "Setting as rejected"
 msgstr "Тайдырылған етіп белгілеу"
 
-#: ../src/Resources.vala:238
+#: ../src/Resources.vala:271
 msgid "Set rating to rejected"
 msgstr "Рейтингі тайдырылған етіп орнату"
 
-#: ../src/Resources.vala:240
+#: ../src/Resources.vala:273
 msgid "Rejected _Only"
 msgstr "Тек та_йдырылған"
 
-#: ../src/Resources.vala:241
+#: ../src/Resources.vala:274
 msgid "Rejected Only"
 msgstr "Тек тайдырылған"
 
-#: ../src/Resources.vala:242
+#: ../src/Resources.vala:275
 msgid "Show only rejected photos"
 msgstr "Тек тайдырылған фотоларды көрсету"
 
-#: ../src/Resources.vala:244
+#: ../src/Resources.vala:277
 msgid "All + _Rejected"
 msgstr "Барл_ығы + тайдырылған"
 
-#: ../src/Resources.vala:245 ../src/Resources.vala:246
+#: ../src/Resources.vala:278 ../src/Resources.vala:279
 msgid "Show all photos, including rejected"
 msgstr "Барлық фотоларды көрсету, тайдырылғандармен қоса"
 
-#: ../src/Resources.vala:248
+#: ../src/Resources.vala:281
 msgid "_All Photos"
 msgstr "_Барлық фотолар"
 
-#: ../src/Resources.vala:249 ../src/Resources.vala:250
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:283 ../src/Resources.vala:285
 msgid "Show all photos"
 msgstr "Барлық фотоларды көрсету"
 
-#: ../src/Resources.vala:252
+#: ../src/Resources.vala:287
 msgid "_Ratings"
 msgstr "Р_ейтингтер"
 
-#: ../src/Resources.vala:253
+#: ../src/Resources.vala:288
 msgid "Display each photo's rating"
 msgstr "Әр фотоның рейтингі көрсету"
 
-#: ../src/Resources.vala:255
+#: ../src/Resources.vala:290
 msgid "_Filter Photos"
 msgstr "Фотоларды сүз_гілеу"
 
-#: ../src/Resources.vala:256
+#: ../src/Resources.vala:291
 msgid "Filter Photos"
 msgstr "Фотоларды сүзгілеу"
 
-#: ../src/Resources.vala:257
+#: ../src/Resources.vala:292
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Көрсетілетін фотолардың санын сүзгі негізінде азайту"
 
-#: ../src/Resources.vala:259
+#: ../src/Resources.vala:294
 msgid "_Duplicate"
 msgstr "Кө_шірмесін жасау"
 
-#: ../src/Resources.vala:260
+#: ../src/Resources.vala:295
 msgid "Duplicate"
 msgstr "Көшірмесін жасау"
 
-#: ../src/Resources.vala:261
+#: ../src/Resources.vala:296
 msgid "Make a duplicate of the photo"
 msgstr "Фотоның көшірмесін жасау"
 
-#: ../src/Resources.vala:263
+#: ../src/Resources.vala:298
 msgid "_Export..."
 msgstr "_Экспорт..."
 
-#: ../src/Resources.vala:265
+#: ../src/Resources.vala:300
 msgid "_Print..."
 msgstr "Бас_паға шығару..."
 
-#: ../src/Resources.vala:267
+#: ../src/Resources.vala:302
 msgid "Pu_blish..."
 msgstr "Жари_ялау..."
 
-#: ../src/Resources.vala:269
+#: ../src/Resources.vala:304
 msgid "Publish to various websites"
 msgstr "Әртүрлі веб сайттарға жариялау"
 
-#: ../src/Resources.vala:271
+#: ../src/Resources.vala:306
 msgid "Edit _Title..."
 msgstr "Атауын _түзету..."
 
-#: ../src/Resources.vala:274
+#: ../src/Resources.vala:310
 msgid "Edit _Comment..."
 msgstr "Тү_сіндірмені түзету..."
 
-#: ../src/Resources.vala:275
+#. Button label
+#: ../src/Resources.vala:312
 msgid "Edit Comment"
 msgstr "Түсіндірмені түзету"
 
-#: ../src/Resources.vala:277
+#: ../src/Resources.vala:314
 msgid "Edit Event _Comment..."
 msgstr "Оқиға тү_сіндірмесін түзету..."
 
-#: ../src/Resources.vala:280
+#: ../src/Resources.vala:317
 msgid "_Adjust Date and Time..."
 msgstr "_Күн мен уақытын түзету..."
 
-#: ../src/Resources.vala:281
+#: ../src/Resources.vala:318
 msgid "Adjust Date and Time"
 msgstr "Күн мен уақытын түзету"
 
-#: ../src/Resources.vala:283
+#: ../src/Resources.vala:320
 msgid "Add _Tags..."
 msgstr "Тегтерді қ_осу..."
 
-#: ../src/Resources.vala:284
+#: ../src/Resources.vala:321
 msgid "_Add Tags..."
 msgstr "Тегтерді қ_осу..."
 
-#: ../src/Resources.vala:285 ../src/Resources.vala:316
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:323 ../src/Resources.vala:356
 msgid "Add Tags"
 msgstr "Тегтерді қосу"
 
-#: ../src/Resources.vala:287
-msgid "_Preferences"
-msgstr "Ба_птаулар"
-
-#: ../src/Resources.vala:289
+#: ../src/Resources.vala:327
 msgid "Open With E_xternal Editor"
 msgstr "Сыр_тқы түзетушісімен ашу"
 
-#: ../src/Resources.vala:291
+#: ../src/Resources.vala:329
 msgid "Open With RA_W Editor"
 msgstr "RAW түзетушісімен ашу"
 
-#: ../src/Resources.vala:293
+#: ../src/Resources.vala:331
 msgid "Send _To..."
 msgstr "Қа_йда жіберу..."
 
-#: ../src/Resources.vala:294
+#: ../src/Resources.vala:332
 msgid "Send T_o..."
 msgstr "Қа_йда жіберу..."
 
-#: ../src/Resources.vala:296
+#: ../src/Resources.vala:334
 msgid "_Find..."
 msgstr "_Табу..."
 
-#: ../src/Resources.vala:297
+#: ../src/Resources.vala:335
 msgid "Find"
 msgstr "Табу"
 
-#: ../src/Resources.vala:298
+#: ../src/Resources.vala:336
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Суретті оның аты не тегтеріндегі бар мәтін арқылы табу"
 
-#: ../src/Resources.vala:300
+#: ../src/Resources.vala:338
 msgid "_Flag"
 msgstr "_Жалауша орнату"
 
-#: ../src/Resources.vala:302
+#: ../src/Resources.vala:340
 msgid "Un_flag"
 msgstr "Жалау_шаны алып тастау"
 
-#: ../src/Resources.vala:305
+#: ../src/Resources.vala:343
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Түзетушіні жөнелту мүмкін емес: %s"
 
-#: ../src/Resources.vala:310
+#: ../src/Resources.vala:348
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "\"%s\" тегін қосу"
 
-#: ../src/Resources.vala:312
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:351
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "\"%s\" және \"%s\" тегтерін қосу"
 
-#: ../src/Resources.vala:320
+#: ../src/Resources.vala:361
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "\"%s\" те_гін өшіру"
 
-#: ../src/Resources.vala:324
+#: ../src/Resources.vala:365
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "\"%s\" тегін өшіру"
 
-#: ../src/Resources.vala:327
+#: ../src/Resources.vala:368
 msgid "Delete Tag"
 msgstr "Тегті өшіру"
 
-#: ../src/Resources.vala:330
-msgid "_New"
-msgstr "Ж_аңа"
-
-#: ../src/Resources.vala:333
+#: ../src/Resources.vala:374
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "\"%s\" тегінің атын ауыст_ыру..."
 
-#: ../src/Resources.vala:337
+#: ../src/Resources.vala:378
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "\"%s\" тегтің атын \"%s\" етіп орнату"
 
-#: ../src/Resources.vala:340
+#: ../src/Resources.vala:381
 msgid "_Rename..."
 msgstr "_Атын ауыстыру..."
 
-#: ../src/Resources.vala:342
+#: ../src/Resources.vala:383
 msgid "Modif_y Tags..."
 msgstr "Те_гтерді түзету..."
 
-#: ../src/Resources.vala:343
+#: ../src/Resources.vala:384
 msgid "Modify Tags"
 msgstr "Тегті түзету"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Фото(лар)ға \"%s\" тегін қосу"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Фотоларға \"%s\" тегін орнату"
 
-#: ../src/Resources.vala:350
+#: ../src/Resources.vala:391
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "Таңдалған фотоға \"%s\" тегін қосу"
 
-#: ../src/Resources.vala:351
+#: ../src/Resources.vala:392
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "Таңдалған фотоларға \"%s\" тегін орнату"
 
-#: ../src/Resources.vala:355
+#: ../src/Resources.vala:396
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "Фото(лар)дан \"%s\" тегін ө_шіру"
 
-#: ../src/Resources.vala:356
+#: ../src/Resources.vala:397
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "Фо_толардан \"%s\" тегін өшіру"
 
-#: ../src/Resources.vala:360
+#: ../src/Resources.vala:401
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "Фото(лар)дан \"%s\" тегін өшіру"
 
-#: ../src/Resources.vala:361
+#: ../src/Resources.vala:402
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "Фотолардан \"%s\" тегін өшіру"
 
-#: ../src/Resources.vala:365
+#: ../src/Resources.vala:406
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr ""
 "Тег үшін жаңа \"%s\" атауын орнату мүмкін емес, өйткені ондай тег бар болып "
 "тұр."
 
-#: ../src/Resources.vala:369
+#: ../src/Resources.vala:410
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr ""
 "Іздеудің атын \"%s\" етіп ауыстыру сәтсіз, өйткені іздеу бар болып тұр."
 
-#: ../src/Resources.vala:372
+#: ../src/Resources.vala:413
 msgid "Saved Search"
 msgstr "Сақталған іздеу"
 
-#: ../src/Resources.vala:374
+#: ../src/Resources.vala:415
 msgid "Delete Search"
 msgstr "Іздеуді өшіру"
 
-#: ../src/Resources.vala:377
+#: ../src/Resources.vala:418
 msgid "_Edit..."
 msgstr "Тү_зету..."
 
-#: ../src/Resources.vala:378
+#: ../src/Resources.vala:419
 msgid "Re_name..."
 msgstr "Ат_ын ауыстыру..."
 
-#: ../src/Resources.vala:381
+#: ../src/Resources.vala:422
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "\"%s\" іздеудің атын \"%s\" етіп ауыстыру"
 
-#: ../src/Resources.vala:385
+#: ../src/Resources.vala:426
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "\"%s\" іздеуін өшіру"
 
-#: ../src/Resources.vala:543
+#: ../src/Resources.vala:584
 #, c-format
 msgid "Rate %s"
 msgstr "%s етіп баға беру"
 
-#: ../src/Resources.vala:544
+#: ../src/Resources.vala:585
 #, c-format
 msgid "Set rating to %s"
 msgstr "Рейтингін %s етіп орнату"
 
-#: ../src/Resources.vala:545
+#: ../src/Resources.vala:586
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Рейтинг %s етіп орнатылуда"
 
-#: ../src/Resources.vala:547
+#: ../src/Resources.vala:588
 #, c-format
 msgid "Display %s"
 msgstr "Көрсету %s"
 
-#: ../src/Resources.vala:548
+#: ../src/Resources.vala:589
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Тек қана рейтингі %s болатын фотоларды көрсету"
 
-#: ../src/Resources.vala:549
+#: ../src/Resources.vala:590
 #, c-format
 msgid "%s or Better"
 msgstr "%s не жақсырақ"
 
-#: ../src/Resources.vala:550
+#: ../src/Resources.vala:591
 #, c-format
 msgid "Display %s or Better"
 msgstr "%s не жақсырақ көрсету"
 
-#: ../src/Resources.vala:551
+#: ../src/Resources.vala:592
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Тек қана рейтингі %s не одан жақсы болатын фотоларды көрсету"
 
-#: ../src/Resources.vala:642
+#: ../src/Resources.vala:683
 msgid "Remove the selected photos from the trash"
 msgstr "Таңдалған фотоларды қоқыс шелегінен өшіру"
 
-#: ../src/Resources.vala:643
+#: ../src/Resources.vala:684
 msgid "Remove the selected photos from the library"
 msgstr "Таңдалған фотоларды жинақтан өшіру"
 
-#: ../src/Resources.vala:645
+#: ../src/Resources.vala:686
 msgid "_Restore"
 msgstr "Қал_пына келтіру"
 
-#: ../src/Resources.vala:646
+#: ../src/Resources.vala:687
 msgid "Move the selected photos back into the library"
 msgstr "Таңдалған фотоларды жинаққа қайта апару"
 
-#: ../src/Resources.vala:648
+#: ../src/Resources.vala:689
 msgid "Show in File Mana_ger"
 msgstr "Файлдар басқарушысында көрсету"
 
-#: ../src/Resources.vala:649
+#: ../src/Resources.vala:690
 msgid "Open the selected photo's directory in the file manager"
 msgstr "Таңдалған фотоның бумасын файлдар басқарушысында ашу"
 
-#: ../src/Resources.vala:652
+#: ../src/Resources.vala:693
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Файлдар басқарушысында ашу сәтсіз: %s"
 
-#: ../src/Resources.vala:655
+#: ../src/Resources.vala:696
 msgid "R_emove From Library"
 msgstr "Ж_инақтан өшіру"
 
-#: ../src/Resources.vala:657
+#: ../src/Resources.vala:698
 msgid "_Move to Trash"
 msgstr "Қоқы_с шелегіне тастау"
 
-#: ../src/Resources.vala:659
+#: ../src/Resources.vala:700
 msgid "Select _All"
 msgstr "Б_арлығын таңдау"
 
-#: ../src/Resources.vala:660
+#: ../src/Resources.vala:701
 msgid "Select all items"
 msgstr "Барлық нәрсені таңдау"
 
@@ -3412,20 +3515,20 @@ msgstr "Барлық нәрсені таңдау"
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:741
+#: ../src/Resources.vala:780
 msgid "%-I:%M %p"
 msgstr "%-I:%M %p"
 
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:746
+#: ../src/Resources.vala:785
 msgid "%-I:%M:%S %p"
 msgstr "%-I:%M:%S %p"
 
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:750
+#: ../src/Resources.vala:789
 msgid "%a %b %d, %Y"
 msgstr "%a %b %d, %Y"
 
@@ -3435,14 +3538,14 @@ msgstr "%a %b %d, %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:755 ../src/Resources.vala:765
+#: ../src/Resources.vala:794 ../src/Resources.vala:804
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:760
+#: ../src/Resources.vala:799
 msgid "%d, %Y"
 msgstr "%d, %Y"
 
@@ -3452,7 +3555,7 @@ msgstr "Слайдшоу"
 
 #. Flagged label and toggle
 #: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
-#: ../src/SearchFilter.vala:990 ../src/library/FlaggedPage.vala:8
+#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
 msgid "Flagged"
 msgstr "Жалауша бар"
 
@@ -3472,28 +3575,37 @@ msgstr "RAW фотосуреттері"
 msgid "RAW photos"
 msgstr "RAW фотосуреттері"
 
-#: ../src/SearchFilter.vala:952
+#: ../src/SearchFilter.vala:934
 #, c-format
 msgid "Error loading UI file %s: %s"
 msgstr "UI %s файлын жүктеу қатесі: %s"
 
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: ../src/SearchFilter.vala:945
+msgid "Close"
+msgstr "Жабу"
+
 #. Type label and toggles
-#: ../src/SearchFilter.vala:969
+#: ../src/SearchFilter.vala:951
 msgid "Type"
 msgstr "Түрі"
 
 #. Rating label and button
-#: ../src/SearchFilter.vala:1003 ../src/searches/SearchBoolean.vala:184
+#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
 msgid "Rating"
 msgstr "Рейтинг"
 
-#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:182
+#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
 msgid "Settings"
 msgstr "Баптаулар"
 
 #. Set up toolbar
 #. add toolbar buttons
-#: ../src/SlideshowPage.vala:161
+#: ../src/SlideshowPage.vala:160
 msgid "Back"
 msgstr "Артқа"
 
@@ -3501,15 +3613,15 @@ msgstr "Артқа"
 msgid "Go to the previous photo"
 msgstr "Алдыңғы фотоға өту"
 
-#: ../src/SlideshowPage.vala:168 ../src/SlideshowPage.vala:273
+#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
 msgid "Pause"
 msgstr "Аялдату"
 
-#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:274
+#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
 msgid "Pause the slideshow"
 msgstr "Слайдшоуды аялдату"
 
-#: ../src/SlideshowPage.vala:175
+#: ../src/SlideshowPage.vala:174
 msgid "Next"
 msgstr "Келесі"
 
@@ -3517,20 +3629,20 @@ msgstr "Келесі"
 msgid "Go to the next photo"
 msgstr "Келесі фотоға өту"
 
-#: ../src/SlideshowPage.vala:183
+#: ../src/SlideshowPage.vala:184
 msgid "Change slideshow settings"
 msgstr "Слайдшоу баптауларын өзгерту"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: ../src/SlideshowPage.vala:237
+#: ../src/SlideshowPage.vala:238
 msgid "All photo source files are missing."
 msgstr "Барлық фотолардың бастапқы файлдары жоқ."
 
-#: ../src/SlideshowPage.vala:269
+#: ../src/SlideshowPage.vala:270
 msgid "Play"
 msgstr "Ойнату"
 
-#: ../src/SlideshowPage.vala:270
+#: ../src/SlideshowPage.vala:271
 msgid "Continue the slideshow"
 msgstr "Слайдшоуды жалғастыру"
 
@@ -3539,11 +3651,11 @@ msgid "untitled"
 msgstr "атаусыз"
 
 #. multiple videos
-#: ../src/VideoSupport.vala:486
+#: ../src/VideoSupport.vala:489
 msgid "Export Videos"
 msgstr "Видеоларды экспорттау"
 
-#: ../src/camera/Branch.vala:87
+#: ../src/camera/Branch.vala:85
 msgid "Cameras"
 msgstr "Камералар"
 
@@ -3567,28 +3679,28 @@ msgstr "Тек импортталмаған фотоларды көрсету"
 #. prior to import.
 #. TODO: replace this with approved text for "talking to camera,
 #. please wait" once new strings are being accepted.
-#: ../src/camera/ImportPage.vala:845
+#: ../src/camera/ImportPage.vala:847
 msgid "Starting import, please wait..."
 msgstr "Импортты бастау, күте тұрыңыз..."
 
-#: ../src/camera/ImportPage.vala:884
+#: ../src/camera/ImportPage.vala:886
 msgid "Import _Selected"
 msgstr "Таңд_алғанды импорттау"
 
-#: ../src/camera/ImportPage.vala:885
+#: ../src/camera/ImportPage.vala:887
 msgid "Import the selected photos into your library"
 msgstr "Таңдалған фотоларды жинағыңызға импорттау"
 
-#: ../src/camera/ImportPage.vala:890
+#: ../src/camera/ImportPage.vala:892
 msgid "Import _All"
 msgstr "Барл_ығын импорттау"
 
-#: ../src/camera/ImportPage.vala:891
+#: ../src/camera/ImportPage.vala:893
 msgid "Import all the photos into your library"
 msgstr "Барлық фотоларды жинағыңызға импорттау"
 
 #. it's mounted, offer to unmount for the user
-#: ../src/camera/ImportPage.vala:1012
+#: ../src/camera/ImportPage.vala:1014
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it.  Continue?"
@@ -3596,15 +3708,15 @@ msgstr ""
 "Shotwell камераға қолын жеткізу үшін оны алдымен тіркеуден босату керек. "
 "Жалғастыру керек пе?"
 
-#: ../src/camera/ImportPage.vala:1018
+#: ../src/camera/ImportPage.vala:1020
 msgid "_Unmount"
 msgstr "_Тіркеуден босату"
 
-#: ../src/camera/ImportPage.vala:1023
+#: ../src/camera/ImportPage.vala:1025
 msgid "Please unmount the camera."
 msgstr "Камераны тіркеуден босатыңыз."
 
-#: ../src/camera/ImportPage.vala:1028
+#: ../src/camera/ImportPage.vala:1030
 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 "
@@ -3614,11 +3726,11 @@ msgstr ""
 "ғана қолын жеткізе алады. Камераны қолданып тұрған барлық қолданбалады "
 "жабыңыз да, әрекетті қайталап көріңіз."
 
-#: ../src/camera/ImportPage.vala:1038
+#: ../src/camera/ImportPage.vala:1040
 msgid "Please close any other application using the camera."
 msgstr "Камераны қолданып тұрған барлық қолданбалады жабыңыз."
 
-#: ../src/camera/ImportPage.vala:1043
+#: ../src/camera/ImportPage.vala:1045
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -3627,53 +3739,53 @@ msgstr ""
 "Камерадан алдын-ала қарауды алу мүмкін емес:\n"
 "%s"
 
-#: ../src/camera/ImportPage.vala:1060
+#: ../src/camera/ImportPage.vala:1062
 msgid "Unmounting..."
 msgstr "Тіркеуден босатылуда..."
 
-#: ../src/camera/ImportPage.vala:1166
+#: ../src/camera/ImportPage.vala:1168
 msgid "Fetching photo information"
 msgstr "Фото ақпаратын алу"
 
-#: ../src/camera/ImportPage.vala:1521
+#: ../src/camera/ImportPage.vala:1523
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "%s үшін алдын-ала қарауды алу"
 
-#: ../src/camera/ImportPage.vala:1637
+#: ../src/camera/ImportPage.vala:1639
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Камераны блоктау мүмкін емес: %s"
 
-#: ../src/camera/ImportPage.vala:1722
+#: ../src/camera/ImportPage.vala:1724
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "Камерадан бұл %d фотоны өшіру керек пе?"
 
-#: ../src/camera/ImportPage.vala:1725
+#: ../src/camera/ImportPage.vala:1727
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] "Камерадан бұл %d видеоны өшіру керек пе?"
 
-#: ../src/camera/ImportPage.vala:1728
+#: ../src/camera/ImportPage.vala:1730
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "Камерадан бұл %d фото/видеоны өшіру керек пе?"
 
-#: ../src/camera/ImportPage.vala:1731
+#: ../src/camera/ImportPage.vala:1733
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] "Бұл %d файлды камерадан өшіру керек пе?"
 
-#: ../src/camera/ImportPage.vala:1758
+#: ../src/camera/ImportPage.vala:1760
 msgid "Removing photos/videos from camera"
 msgstr "Камерадан фотолар/видеоларды өшіру"
 
-#: ../src/camera/ImportPage.vala:1762
+#: ../src/camera/ImportPage.vala:1764
 #, 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."
@@ -3720,20 +3832,16 @@ msgid "Database file:"
 msgstr "Дерекқор файлы:"
 
 #: ../src/data_imports/DataImportsUI.vala:112
-#: ../src/library/LibraryWindow.vala:899
+#: ../src/library/LibraryWindow.vala:898
 msgid "_Import"
 msgstr "И_мпорттау"
 
-#: ../src/data_imports/DataImportsUI.vala:216
+#: ../src/data_imports/DataImportsUI.vala:217
 msgid "Import From Application"
 msgstr "Қолданбадан импорттау"
 
-#: ../src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "Мульт_имедияны қайдан импорттау:"
-
-#: ../src/data_imports/DataImportsUI.vala:394
-#: ../src/publishing/PublishingUI.vala:493
+#: ../src/data_imports/DataImportsUI.vala:369
+#: ../src/publishing/PublishingUI.vala:470
 msgid "_Close"
 msgstr "_Жабу"
 
@@ -3766,15 +3874,10 @@ msgstr ""
 "Қате: \n"
 "%s"
 
-#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:352
+#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:351
 msgid "_File"
 msgstr "_Файл"
 
-#: ../src/direct/DirectPhotoPage.vala:51
-#: ../src/direct/DirectPhotoPage.vala:417
-msgid "_Save"
-msgstr "_Сақтау"
-
 #: ../src/direct/DirectPhotoPage.vala:52
 msgid "Save photo"
 msgstr "Фотоны сақтау"
@@ -3791,19 +3894,10 @@ msgstr "Фотоны басқа атауымен сақтау"
 msgid "Print the photo to a printer connected to your computer"
 msgstr "Фотоны компьютеріңізге жалғанған принтерден басып шығару"
 
-#: ../src/direct/DirectPhotoPage.vala:73 ../src/library/LibraryWindow.vala:356
-msgid "_Edit"
-msgstr "Тү_зету"
-
-#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:364
+#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:363
 msgid "_Photo"
 msgstr "_Фото"
 
-#: ../src/direct/DirectPhotoPage.vala:169
-#: ../src/library/LibraryWindow.vala:380
-msgid "_Help"
-msgstr "_Көмек"
-
 #: ../src/direct/DirectPhotoPage.vala:227
 #, c-format
 msgid "%s does not exist."
@@ -3823,26 +3917,26 @@ msgstr ""
 "%s келесі үшін файл пішімін қолдамайды:\n"
 "%s."
 
-#: ../src/direct/DirectPhotoPage.vala:417
+#: ../src/direct/DirectPhotoPage.vala:422
 msgid "_Save a Copy"
 msgstr "Кө_шірмесін сақтау"
 
-#: ../src/direct/DirectPhotoPage.vala:420
+#: ../src/direct/DirectPhotoPage.vala:425
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "%s үшін өзгерістерді жоғалту керек пе?"
 
-#: ../src/direct/DirectPhotoPage.vala:421
+#: ../src/direct/DirectPhotoPage.vala:426
 msgid "Close _without Saving"
 msgstr "Сақтамай-ақ _жабу"
 
-#: ../src/direct/DirectPhotoPage.vala:454
+#: ../src/direct/DirectPhotoPage.vala:459
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "%s ішіне сақтау қатесі: %s"
 
-#: ../src/direct/DirectPhotoPage.vala:482
-#: ../src/direct/DirectPhotoPage.vala:503
+#: ../src/direct/DirectPhotoPage.vala:487
+#: ../src/direct/DirectPhotoPage.vala:508
 msgid "Save As"
 msgstr "Қалайша сақтау"
 
@@ -4016,7 +4110,7 @@ msgstr "%B"
 msgid "Folders"
 msgstr "Бумалар"
 
-#: ../src/library/Branch.vala:37 ../ui/shotwell.glade.h:33
+#: ../src/library/Branch.vala:36 ../ui/shotwell.glade.h:32
 msgid "Library"
 msgstr "Жинақ"
 
@@ -4024,19 +4118,19 @@ msgstr "Жинақ"
 msgid "Importing..."
 msgstr "Импорттау..."
 
-#: ../src/library/ImportQueuePage.vala:66
+#: ../src/library/ImportQueuePage.vala:67
 msgid "_Stop Import"
 msgstr "_Импортты тоқтату"
 
-#: ../src/library/ImportQueuePage.vala:67
+#: ../src/library/ImportQueuePage.vala:68
 msgid "Stop importing photos"
 msgstr "Фотолар импортын тоқтату"
 
-#: ../src/library/ImportQueuePage.vala:123
+#: ../src/library/ImportQueuePage.vala:124
 msgid "Preparing to import..."
 msgstr "Импортқа дайындау..."
 
-#: ../src/library/ImportQueuePage.vala:150
+#: ../src/library/ImportQueuePage.vala:151
 #, c-format
 msgid "Imported %s"
 msgstr "Импортталды %s"
@@ -4073,72 +4167,72 @@ msgstr "Қоқыс шелегінен барлық фотоларды өшіру
 msgid "View Eve_nt for Photo"
 msgstr "Фото ү_шін оқиғаны қарау"
 
-#: ../src/library/LibraryWindow.vala:334
+#: ../src/library/LibraryWindow.vala:333
 msgid "_Find"
 msgstr "Т_абу"
 
-#: ../src/library/LibraryWindow.vala:335
+#: ../src/library/LibraryWindow.vala:334
 msgid "Find photos and videos by search criteria"
 msgstr "Фото мен видеоларды іздеу шартына сәйкес табу"
 
-#: ../src/library/LibraryWindow.vala:346 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:194
+#: ../src/library/LibraryWindow.vala:345 ../src/searches/Branch.vala:77
+#: ../src/sidebar/Tree.vala:185
 msgid "Ne_w Saved Search..."
 msgstr "Ж_аңа сақталған іздеу..."
 
-#: ../src/library/LibraryWindow.vala:368
+#: ../src/library/LibraryWindow.vala:367
 msgid "_Photos"
 msgstr "Фо_толар"
 
-#: ../src/library/LibraryWindow.vala:372
+#: ../src/library/LibraryWindow.vala:371
 msgid "Even_ts"
 msgstr "Оқ_иғалар"
 
-#: ../src/library/LibraryWindow.vala:391
+#: ../src/library/LibraryWindow.vala:390
 msgid "_Basic Information"
 msgstr "Не_гізгі ақпарат"
 
-#: ../src/library/LibraryWindow.vala:392
+#: ../src/library/LibraryWindow.vala:391
 msgid "Display basic information for the selection"
 msgstr "Таңдалғаны үшін негізгі ақпаратты көрсету"
 
-#: ../src/library/LibraryWindow.vala:397
+#: ../src/library/LibraryWindow.vala:396
 msgid "E_xtended Information"
 msgstr "Кеңе_йтілген ақпарат"
 
-#: ../src/library/LibraryWindow.vala:398
+#: ../src/library/LibraryWindow.vala:397
 msgid "Display extended information for the selection"
 msgstr "Таңдалғаны үшін кеңейтілген ақпаратты көрсету"
 
-#: ../src/library/LibraryWindow.vala:403
+#: ../src/library/LibraryWindow.vala:402
 msgid "_Search Bar"
 msgstr "Ізд_еу өрісі"
 
-#: ../src/library/LibraryWindow.vala:404
+#: ../src/library/LibraryWindow.vala:403
 msgid "Display the search bar"
 msgstr "Іздеу өрісін көрсету"
 
-#: ../src/library/LibraryWindow.vala:409
+#: ../src/library/LibraryWindow.vala:408
 msgid "S_idebar"
 msgstr "Бү_йір панелі"
 
-#: ../src/library/LibraryWindow.vala:410
+#: ../src/library/LibraryWindow.vala:409
 msgid "Display the sidebar"
 msgstr "Бүйір панелін көрсету"
 
-#: ../src/library/LibraryWindow.vala:668
+#: ../src/library/LibraryWindow.vala:667
 msgid "Import From Folder"
 msgstr "Бумадан импорттау"
 
-#: ../src/library/LibraryWindow.vala:737
+#: ../src/library/LibraryWindow.vala:736
 msgid "Empty Trash"
 msgstr "Қоқыс шелегін тазарту"
 
-#: ../src/library/LibraryWindow.vala:737
+#: ../src/library/LibraryWindow.vala:736
 msgid "Emptying Trash..."
 msgstr "Қоқыс шелегі тазартылуда..."
 
-#: ../src/library/LibraryWindow.vala:896
+#: ../src/library/LibraryWindow.vala:895
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4151,34 +4245,34 @@ msgstr ""
 "ұсынамыз.\n"
 "Фотоларды импорттауды жалғастыру керек пе?"
 
-#: ../src/library/LibraryWindow.vala:899 ../ui/shotwell.glade.h:19
+#: ../src/library/LibraryWindow.vala:898 ../ui/shotwell.glade.h:18
 msgid "Library Location"
 msgstr "Жинақтың орналасуы"
 
 #. TODO: Specify which directory/file.
-#: ../src/library/LibraryWindow.vala:912
+#: ../src/library/LibraryWindow.vala:911
 msgid "Photos cannot be imported from this directory."
 msgstr "Фотоларды бұл бумадан импорттау мүмкін емес."
 
-#: ../src/library/LibraryWindow.vala:1200
+#: ../src/library/LibraryWindow.vala:1199
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: ../src/library/LibraryWindow.vala:1244
-#: ../src/library/LibraryWindow.vala:1255
+#: ../src/library/LibraryWindow.vala:1243
+#: ../src/library/LibraryWindow.vala:1254
 msgid "Updating library..."
 msgstr "Жинақты жаңарту..."
 
-#: ../src/library/LibraryWindow.vala:1261
+#: ../src/library/LibraryWindow.vala:1260
 msgid "Preparing to auto-import photos..."
 msgstr "Фотоларды автоимпорттауды дайындау..."
 
-#: ../src/library/LibraryWindow.vala:1266
+#: ../src/library/LibraryWindow.vala:1265
 msgid "Auto-importing photos..."
 msgstr "Фотоларды автоимпорттау..."
 
-#: ../src/library/LibraryWindow.vala:1274
+#: ../src/library/LibraryWindow.vala:1273
 msgid "Writing metadata to files..."
 msgstr "Файлдарға метаақпаратты жазу..."
 
@@ -4371,37 +4465,37 @@ msgstr "Тіркелгі ақпараты алынуда..."
 msgid "Logging in..."
 msgstr "Жүйеге кіру..."
 
-#: ../src/publishing/PublishingUI.vala:183
+#: ../src/publishing/PublishingUI.vala:185
 msgid "Publish Photos"
 msgstr "Фотоларды жариялау"
 
-#: ../src/publishing/PublishingUI.vala:184
+#: ../src/publishing/PublishingUI.vala:186
 msgid "Publish photos _to:"
 msgstr "Фотоларды жари_ялау орны:"
 
-#: ../src/publishing/PublishingUI.vala:186
+#: ../src/publishing/PublishingUI.vala:188
 msgid "Publish Videos"
 msgstr "Видеоларды жариялау"
 
-#: ../src/publishing/PublishingUI.vala:187
+#: ../src/publishing/PublishingUI.vala:189
 msgid "Publish videos _to"
 msgstr "Видеоларды жари_ялау орны:"
 
-#: ../src/publishing/PublishingUI.vala:189
+#: ../src/publishing/PublishingUI.vala:191
 msgid "Publish Photos and Videos"
 msgstr "Фото мен видеоларды жариялау"
 
-#: ../src/publishing/PublishingUI.vala:190
+#: ../src/publishing/PublishingUI.vala:192
 msgid "Publish photos and videos _to"
 msgstr "Фото мен видеоларды жари_ялау орны:"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: ../src/publishing/PublishingUI.vala:383
+#: ../src/publishing/PublishingUI.vala:360
 msgid "Unable to publish"
 msgstr "Жариялау мүмкін емес"
 
-#: ../src/publishing/PublishingUI.vala:384
+#: ../src/publishing/PublishingUI.vala:361
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -4419,123 +4513,139 @@ msgid "Saved Searches"
 msgstr "Сақталған іздеулер"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:168
 msgid "contains"
 msgstr "құрамында бар"
 
 #. Ordering must correspond with Context
-#: ../src/searches/SavedSearchDialog.vala:170
-#: ../src/searches/SavedSearchDialog.vala:497
+#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:500
 msgid "is exactly"
 msgstr "дәл сәйкес"
 
-#: ../src/searches/SavedSearchDialog.vala:171
+#: ../src/searches/SavedSearchDialog.vala:170
 msgid "starts with"
 msgstr "басталады"
 
-#: ../src/searches/SavedSearchDialog.vala:172
+#: ../src/searches/SavedSearchDialog.vala:171
 msgid "ends with"
 msgstr "аяқталады"
 
-#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:172
 msgid "does not contain"
 msgstr "құрамында жоқ"
 
-#: ../src/searches/SavedSearchDialog.vala:174
-#: ../src/searches/SavedSearchDialog.vala:501
+#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:504
 msgid "is not set"
 msgstr "орнатылмаған"
 
+#: ../src/searches/SavedSearchDialog.vala:174
+msgid "is set"
+msgstr "орнатылған"
+
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: ../src/searches/SavedSearchDialog.vala:245
-#: ../src/searches/SavedSearchDialog.vala:376
-#: ../src/searches/SavedSearchDialog.vala:441
+#: ../src/searches/SavedSearchDialog.vala:248
+#: ../src/searches/SavedSearchDialog.vala:379
+#: ../src/searches/SavedSearchDialog.vala:444
 msgid "is"
 msgstr "екен"
 
-#: ../src/searches/SavedSearchDialog.vala:246
+#: ../src/searches/SavedSearchDialog.vala:249
 msgid "is not"
 msgstr "емес"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:252
+#: ../src/searches/SavedSearchDialog.vala:255
 msgid "any photo"
 msgstr "кез-келген фото"
 
-#: ../src/searches/SavedSearchDialog.vala:253
+#: ../src/searches/SavedSearchDialog.vala:256
 msgid "a raw photo"
 msgstr "raw фото"
 
-#: ../src/searches/SavedSearchDialog.vala:254
+#: ../src/searches/SavedSearchDialog.vala:257
 msgid "a video"
 msgstr "видео"
 
-#: ../src/searches/SavedSearchDialog.vala:308
+#: ../src/searches/SavedSearchDialog.vala:311
 msgid "has"
 msgstr "бар"
 
-#: ../src/searches/SavedSearchDialog.vala:309
+#: ../src/searches/SavedSearchDialog.vala:312
 msgid "has no"
 msgstr "жоқ"
 
-#: ../src/searches/SavedSearchDialog.vala:314
+#: ../src/searches/SavedSearchDialog.vala:317
 msgid "modifications"
 msgstr "өзгертулер"
 
-#: ../src/searches/SavedSearchDialog.vala:315
+#: ../src/searches/SavedSearchDialog.vala:318
 msgid "internal modifications"
 msgstr "ішкі өзгертулер"
 
-#: ../src/searches/SavedSearchDialog.vala:316
+#: ../src/searches/SavedSearchDialog.vala:319
 msgid "external modifications"
 msgstr "сыртқы өзгертулер"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:370
+#: ../src/searches/SavedSearchDialog.vala:373
 msgid "flagged"
 msgstr "жалаушасы бар"
 
-#: ../src/searches/SavedSearchDialog.vala:371
+#: ../src/searches/SavedSearchDialog.vala:374
 msgid "not flagged"
 msgstr "жалаушасы жоқ"
 
-#: ../src/searches/SavedSearchDialog.vala:434
+#: ../src/searches/SavedSearchDialog.vala:437
 msgid "and higher"
 msgstr "және көбірек"
 
-#: ../src/searches/SavedSearchDialog.vala:435
+#: ../src/searches/SavedSearchDialog.vala:438
 msgid "only"
 msgstr "тек"
 
-#: ../src/searches/SavedSearchDialog.vala:436
+#: ../src/searches/SavedSearchDialog.vala:439
 msgid "and lower"
 msgstr "және азырақ"
 
-#: ../src/searches/SavedSearchDialog.vala:498
+#: ../src/searches/SavedSearchDialog.vala:501
 msgid "is after"
 msgstr "кейін"
 
-#: ../src/searches/SavedSearchDialog.vala:499
+#: ../src/searches/SavedSearchDialog.vala:502
 msgid "is before"
 msgstr "дейін"
 
-#: ../src/searches/SavedSearchDialog.vala:500
+#: ../src/searches/SavedSearchDialog.vala:503
 msgid "is between"
 msgstr "арасында"
 
-#: ../src/searches/SavedSearchDialog.vala:513
+#: ../src/searches/SavedSearchDialog.vala:516
 msgid "and"
 msgstr "және"
 
-#: ../src/searches/SavedSearchDialog.vala:720
+#: ../src/searches/SavedSearchDialog.vala:695
+msgid "Search"
+msgstr "Іздеу"
+
+#: ../src/searches/SavedSearchDialog.vala:700
+msgid "Cancel"
+msgstr "Бас тарту"
+
+#: ../src/searches/SavedSearchDialog.vala:701
+msgid "OK"
+msgstr "ОК"
+
+#: ../src/searches/SavedSearchDialog.vala:719
 msgid "any"
 msgstr "кез-келген"
 
-#: ../src/searches/SavedSearchDialog.vala:721
+#: ../src/searches/SavedSearchDialog.vala:720
 msgid "all"
 msgstr "барлығы"
 
-#: ../src/searches/SavedSearchDialog.vala:722
+#: ../src/searches/SavedSearchDialog.vala:721
 msgid "none"
 msgstr "ешнәрсе"
 
@@ -4579,7 +4689,7 @@ msgstr "Фотосурет күйі"
 msgid "Date"
 msgstr "Күн"
 
-#: ../src/sidebar/Tree.vala:198
+#: ../src/sidebar/Tree.vala:189
 msgid "New _Tag..."
 msgstr "Жаңа _тег..."
 
@@ -4638,167 +4748,162 @@ msgid "How long each photo is shown on the desktop background"
 msgstr "Әр фото жұмыс үстелдің түсқағазы ретінде тұратын уақыты"
 
 #: ../ui/shotwell.glade.h:1
-msgid "Search"
-msgstr "Іздеу"
-
-#: ../ui/shotwell.glade.h:2
 msgid "_Name of search:"
 msgstr "Ізд_еудің аты:"
 
-#: ../ui/shotwell.glade.h:3
+#: ../ui/shotwell.glade.h:2
 msgid "_Match"
 msgstr "_Сәйкес"
 
-#: ../ui/shotwell.glade.h:4
+#: ../ui/shotwell.glade.h:3
 msgid "of the following:"
 msgstr "келесінің:"
 
-#: ../ui/shotwell.glade.h:5
+#: ../ui/shotwell.glade.h:4
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Басылып шығарылатын сурет өлшемі</b>"
 
-#: ../ui/shotwell.glade.h:6
+#: ../ui/shotwell.glade.h:5
 msgid "Use a _standard size:"
 msgstr "Қалы_пты өлшемді қолдану:"
 
-#: ../ui/shotwell.glade.h:7
+#: ../ui/shotwell.glade.h:6
 msgid "Use a c_ustom size:"
 msgstr "Таңдау_ыңызша өлшемді қолдану:"
 
-#: ../ui/shotwell.glade.h:8
+#: ../ui/shotwell.glade.h:7
 msgid "_Match photo aspect ratio"
 msgstr "_Фото жақтарының қатынасын сақтау"
 
-#: ../ui/shotwell.glade.h:9
+#: ../ui/shotwell.glade.h:8
 msgid "_Autosize:"
 msgstr "_Автоөлшем:"
 
-#: ../ui/shotwell.glade.h:10
+#: ../ui/shotwell.glade.h:9
 msgid "<b>Titles</b>"
 msgstr "<b>Атаулар</b>"
 
-#: ../ui/shotwell.glade.h:11
+#: ../ui/shotwell.glade.h:10
 msgid "Print image _title"
 msgstr "Сурет ат_ауын да баспаға шығару"
 
-#: ../ui/shotwell.glade.h:12
+#: ../ui/shotwell.glade.h:11
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Пиксель шешімділігі</b>"
 
-#: ../ui/shotwell.glade.h:13
+#: ../ui/shotwell.glade.h:12
 msgid "_Output photo at:"
 msgstr "Фото_ны қайда сақтау:"
 
-#: ../ui/shotwell.glade.h:14
+#: ../ui/shotwell.glade.h:13
 msgid "pixels per inch"
 msgstr "дюймге пиксель"
 
-#: ../ui/shotwell.glade.h:16
+#: ../ui/shotwell.glade.h:15
 msgid "Shotwell Preferences"
 msgstr "Shotwell баптаулары"
 
-#: ../ui/shotwell.glade.h:17
+#: ../ui/shotwell.glade.h:16
 msgid "white"
 msgstr "ақ"
 
-#: ../ui/shotwell.glade.h:18
+#: ../ui/shotwell.glade.h:17
 msgid "black"
 msgstr "қара"
 
-#: ../ui/shotwell.glade.h:20
+#: ../ui/shotwell.glade.h:19
 msgid "_Watch library directory for new files"
 msgstr "Жинақ бу_масын жаңа файлдарға бақылау"
 
-#: ../ui/shotwell.glade.h:21
+#: ../ui/shotwell.glade.h:20
 msgid "Metadata"
 msgstr "Метаақпарат"
 
-#: ../ui/shotwell.glade.h:22
+#: ../ui/shotwell.glade.h:21
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "Фото файлдарына тег, атау және басқа ме_таақпаратты жазу"
 
-#: ../ui/shotwell.glade.h:23
+#: ../ui/shotwell.glade.h:22
 msgid "Display"
 msgstr "Көрсету"
 
-#: ../ui/shotwell.glade.h:24
+#: ../ui/shotwell.glade.h:23
 msgid "_Import photos to:"
 msgstr "Фотоларды қа_йда импорттау:"
 
-#: ../ui/shotwell.glade.h:25
+#: ../ui/shotwell.glade.h:24
 msgid "_Background:"
 msgstr "_Фон:"
 
-#: ../ui/shotwell.glade.h:26
+#: ../ui/shotwell.glade.h:25
 msgid "Importing"
 msgstr "Импорттау"
 
-#: ../ui/shotwell.glade.h:27
+#: ../ui/shotwell.glade.h:26
 msgid "_Directory structure:"
 msgstr "Бу_ма құрылысы:"
 
-#: ../ui/shotwell.glade.h:28
+#: ../ui/shotwell.glade.h:27
 msgid "_Pattern:"
 msgstr "_Шаблон:"
 
-#: ../ui/shotwell.glade.h:29
+#: ../ui/shotwell.glade.h:28
 msgid "Example:"
 msgstr "Мысалы:"
 
-#: ../ui/shotwell.glade.h:30
+#: ../ui/shotwell.glade.h:29
 msgid "R_ename imported files to lowercase"
 msgstr "Имп_ортталатын файлдар аттарын төменгі регистрге келтіру"
 
-#: ../ui/shotwell.glade.h:31
+#: ../ui/shotwell.glade.h:30
 msgid "RAW Developer"
 msgstr "RAW өндіруші"
 
-#: ../ui/shotwell.glade.h:32
+#: ../ui/shotwell.glade.h:31
 msgid "De_fault:"
 msgstr "Ба_стапқы:"
 
-#: ../ui/shotwell.glade.h:34
+#: ../ui/shotwell.glade.h:33
 msgid "E_xternal photo editor:"
 msgstr "С_ыртқы фото түзетушісі:"
 
-#: ../ui/shotwell.glade.h:35
+#: ../ui/shotwell.glade.h:34
 msgid "External _RAW editor:"
 msgstr "С_ыртқы RAW түзетушісі:"
 
-#: ../ui/shotwell.glade.h:36
+#: ../ui/shotwell.glade.h:35
 msgid "External Editors"
 msgstr "Сыртқы түзетушілер"
 
-#: ../ui/shotwell.glade.h:37
+#: ../ui/shotwell.glade.h:36
 msgid "Plugins"
 msgstr "Плагиндер"
 
-#: ../ui/shotwell.glade.h:38
+#: ../ui/shotwell.glade.h:37
 msgid "_Delay:"
 msgstr "_Аралық:"
 
-#: ../ui/shotwell.glade.h:39
+#: ../ui/shotwell.glade.h:38
 msgid "_Transition effect:"
 msgstr "Алма_су эффекті:"
 
-#: ../ui/shotwell.glade.h:40
+#: ../ui/shotwell.glade.h:39
 msgid "Transition d_elay:"
 msgstr "Алмасу ара_лығы:"
 
-#: ../ui/shotwell.glade.h:41
+#: ../ui/shotwell.glade.h:40
 msgid "Show t_itle"
 msgstr "А_тауын көрсету"
 
-#: ../ui/shotwell.glade.h:42
+#: ../ui/shotwell.glade.h:41
 msgid "seconds"
 msgstr "секунд"
 
-#~ msgid ""
-#~ "A file required for publishing is unavailable. Publishing to %s can't "
-#~ "continue."
-#~ msgstr ""
-#~ "Жариялау үшін керек файл қолжетерсіз. %s қызметіне жариялауды жалғастыру "
-#~ "мүмкін емес."
+#~ msgid "A file required for publishing is unavailable. Publishing to "
+#~ msgstr "Жариялау үшін керек файл қолжетерсіз. Қайда жариялау:"
+
+#~ msgid "Import media _from:"
+#~ msgstr "Мульт_имедияны қайдан импорттау:"
 
 #~ msgid "Only _Remove"
 #~ msgstr "Тек ө_шіру"
diff --git a/po/kn.po b/po/kn.po
index 72a61cd..8c76b34 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -58,7 +58,7 @@ msgstr "Shotwell ಚಿತ್ರ ವೀಕ್ಷಕ"
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"
 msgstr ""
-"ಆಲ್ಬಮ್;ಕ್ಯಾಮೆರಾ;ಕ್ಯಾಮೆರಾಗಳು;ಓರಣಗೊಳಿಸು;ಸಂಪಾದಿಸು;ಉತ್ತಮಗೊಳಿಸು;ರಫ್ತು;ಗ್ಯಾಲರಿ;ಚಿತ್ರ;ಚಿತ್ರಗಳು;ಆಮದು;ಜೋಡಿಸು;ಫೋಟೊ;ಫೋಟೊಗ್ರಫಿಗಳು;ಫೋಟೊಗಳು;ಫೋಟೊಗ್ರಫಿ;ಮುದ್ರಿಸು;ಪ್ರಕಟಿಸು;ತಿರುಗಿಸು;ಹಂಚು;ಟ್ಯಾಗ್‌ಗಳು;ವೀಡಿಯೊ;facebook;flickr;picasa;youtube;piwigo"
+"ಆಲ್ಬಮ್;ಕ್ಯಾಮೆರಾ;ಕ್ಯಾಮೆರಾಗಳು;ಓರಣಗೊಳಿಸು;ಸಂಪಾದಿಸು;ಉತ್ತಮಗೊಳಿಸು;ರಫ್ತು;ಗ್ಯಾಲರಿ;ಚಿತ್ರ;ಚಿತ್ರಗಳು;ಆಮದು;ಜೋಡಿಸು;ಫೋಟೊ;ಫೋಟೊಗ್ರಫಿಗಳು;ಫೋಟೊಗಳು;ಫೋಟೊಗ್ರಫಿ;ಮುದ್ರಿಸು;ಪ್ರಕಟಿಸು;ತಿರುಗಿಸು;ಹಂಚು;ಟ್ಯಾಗ್‌ಗಳು;ವೀಡಿಯೊ;facebook;flickr;picasa;youtube;piwigo;"
 
 #: src/db/DatabaseTable.vala:37
 #, c-format
diff --git a/po/ko.po b/po/ko.po
index 67ab5d3..5d98bf2 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -10,639 +10,1411 @@
 # boram <boramism@gmail.com>, 2011-2012
 # verayin <vera@yorba.org>, 2011
 # lsbeeler <lucas@yorba.org>, 2011
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
-"Report-Msgid-Bugs-To: shotwell@yorba.org\n"
-"POT-Creation-Date: 2013-09-20 11:55-0700\n"
-"PO-Revision-Date: 2013-10-01 16:28+0000\n"
-"Last-Translator: boram <boramism@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
+"POT-Creation-Date: 2015-03-12 11:55+0000\n"
+"PO-Revision-Date: 2015-03-12 23:24+0900\n"
+"Last-Translator: Kim Boram <boramism@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/shotwell/language/"
 "ko/)\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: src/Event.vala:737
-#, c-format
-msgid "Event %s"
-msgstr "이벤트 %s"
+#: ../plugins/common/RESTSupport.vala:424
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
+msgid "A temporary file needed for publishing is unavailable"
+msgstr "업로드에 필요한 임시 파일을 사용할 수 없습니다."
 
-#: src/camera/Branch.vala:87
-msgid "Cameras"
-msgstr "카메라"
+#: ../plugins/common/RESTSupport.vala:1138
+msgid ""
+"You have already logged in and out of a Google service during this Shotwell "
+"session.\n"
+"\n"
+"To continue publishing to Google services, quit and restart Shotwell, then "
+"try publishing again."
+msgstr ""
+"이 샷웰 세션 사용 중 이미 구글 서비스에 로그인 후 로그아웃 했습니다.\n"
+"계속 구글 서비스로 업로드하시려면, 샷웰을 다시 시작한 후 업로드하십시오."
 
-#: src/camera/Branch.vala:101 src/camera/ImportPage.vala:711
-#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:300
-#: src/MediaPage.vala:425
-msgid "Camera"
-msgstr "카메라"
+#: ../plugins/common/Resources.vala:9
+msgid "Visit the Shotwell home page"
+msgstr "샷웰 홈페이지 방문"
 
-#: src/camera/ImportPage.vala:312 src/Properties.vala:227
-#, c-format
-msgid "RAW+JPEG"
-msgstr "RAW+JPEG"
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
+msgid "translator-credits"
+msgstr "Kim, Boram <boramism@gmail.com>"
 
-#: src/camera/ImportPage.vala:459
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:32
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:34
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:32
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
+#: ../src/Resources.vala:27
+msgid "Copyright 2009-2015 Yorba Foundation"
+msgstr "Copyright 2009-2015 Yorba Foundation"
+
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:56
 msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
+"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 ""
-"카메라를 마운트 해제할 수 없습니다. 카메라를 파일 관리자에서 마운트 해제해 보"
-"십시오."
+"F-Spot 라이브러리 가져오기 서비스 사용을 환영합니다.\n"
+"\n"
+"샷웰이 발견한 라이브러리를 선택하거나 F-Spot 데이터베이스 파일을 선택하십시"
+"오."
 
-#: src/camera/ImportPage.vala:776
-msgid "Hide photos already imported"
-msgstr "이미 가져온 사진 감추기"
+#: ../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 ""
+"F-Spot 라이브러리 가져오기 서비스 사용을 환영합니다.\n"
+"\n"
+"F-Spot 데이터베이스 파일을 선택하십시오."
 
-#: src/camera/ImportPage.vala:777
-msgid "Only display photos that have not been imported"
-msgstr "이전에 가져오지 않은 사진만 표시합니다"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
+msgid "Manually select an F-Spot database file to import:"
+msgstr "가져올 F-Spot 데이터베이스 파일 직접 선택:"
 
-#: src/camera/ImportPage.vala:845
-msgid "Starting import, please wait..."
-msgstr "가져오기를 시작합니다. 기다려 주십시오..."
+#: ../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 ""
+"선택한 F-Spot 데이터베이스 파일을 열 수 없습니다: 파일이 없거나 F-Spot 데이터"
+"베이스 파일이 아닙니다."
 
-#: src/camera/ImportPage.vala:872 src/MediaPage.vala:436
-msgid "_Titles"
-msgstr "제목(_T)"
+#: ../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 ""
+"선택한 F-Spot 데이터베이스 파일을 열 수 없습니다: 샷웰이 이 버전의 F-Spot 데"
+"이터베이스 파일을 지원하지 않습니다."
 
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:437
-msgid "Display the title of each photo"
-msgstr "각 사진의 제목을 표시합니다"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading tags table"
+msgstr ""
+"선택한 F-Spot 데이터베이스 파일을 읽을 수 없습니다: 태그 테이블을 읽던 중 오"
+"류가 발생했습니다."
 
-#: src/camera/ImportPage.vala:884
-msgid "Import _Selected"
-msgstr "선택한 것 가져오기(_S)"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:68
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading photos "
+"table"
+msgstr ""
+"선택한 F-Spot 데이터베이스 파일을 읽을 수 없습니다: 사진 테이블을 읽던 중 오"
+"류가 발생했습니다."
 
-#: src/camera/ImportPage.vala:885
-msgid "Import the selected photos into your library"
-msgstr "선택한 사진을 라이브러리로 가져옵니다"
+#: ../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 ""
+"샷웰이 F-Spot 라이브러리에서 %d매의 사진을 발견했으며 지금 가져오고 있습니"
+"다. 중복된 파일은 자동으로 검출한 후 제거합니다.\n"
+"\n"
+"가져오기 작업은 백그라운드에서 계속되기 때문에 이 대화 상자를 닫은 후 샷웰을 "
+"계속 사용할 수 있습니다."
 
-#: src/camera/ImportPage.vala:890
-msgid "Import _All"
-msgstr "모두 가져오기(_A)"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
+#, c-format
+msgid "F-Spot library: %s"
+msgstr "F-Spot 라이브러리: %s"
 
-#: src/camera/ImportPage.vala:891
-msgid "Import all the photos into your library"
-msgstr "모든 사진을 라이브러리로 가져옵니다"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
+msgid "Preparing to import"
+msgstr "가져오기 준비 중"
+
+#: ../plugins/shotwell-data-imports/shotwell-data-imports.vala:22
+msgid "Core Data Import Services"
+msgstr "핵심 데이터 가져오기 서비스"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+msgid "Gallery3 publishing module"
+msgstr "갤러리 3 업로드 모듈"
 
-#: src/camera/ImportPage.vala:1012
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
 msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
+"You are not currently logged into your Gallery.\n"
+"\n"
+"You must have already signed up for a Gallery3 account to complete the login "
+"process."
 msgstr ""
-"샷웰이 카메라에 접근하려면 파일 시스템에서 카메라를 마운트 해제해야 합니다. "
-"계속하시겠습니까?"
+"현재 갤러리에 로그인하지 않았습니다.\n"
+"\n"
+"로그인 과정을 끝내려면 갤러리 3 계정을 만들어야 합니다."
 
-#: src/camera/ImportPage.vala:1018
-msgid "_Unmount"
-msgstr "마운트 해제(_U)"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: ../src/MediaPage.vala:435 ../src/photos/RawSupport.vala:300
+msgid "Shotwell"
+msgstr "샷웰"
 
-#: src/camera/ImportPage.vala:1023
-msgid "Please unmount the camera."
-msgstr "카메라를 마운트 해제해 주십시오."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+msgid "Shotwell default directory"
+msgstr "샷웰 기본 디렉터리"
 
-#: src/camera/ImportPage.vala:1028
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:801
+#, c-format
 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."
+"\n"
+"\n"
+"The file \"%s\" may not be supported by or may be too large for this "
+"instance of Gallery3."
 msgstr ""
-"다른 프로그램이 카메라를 사용하고 있습니다. 다른 프로그램이 사용 중이면 샷웰"
-"이 카메라에 접근할 수 없습니다. 카메라를 사용 중인 다른 프로그램을 닫으신 후 "
-"다시 시도하십시오."
+"\n"
+"\n"
+"파일 \"%s\"은(는) 갤러리 3이 지원하지 않거나 처리하기에는 크기가 너무 큽니다."
 
-#: src/camera/ImportPage.vala:1038
-msgid "Please close any other application using the camera."
-msgstr "카메라를 사용 중인 다른 프로그램을 닫으세요."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:802
+msgid ""
+"\n"
+"Note that Gallery3 only supports the video types that Flowplayer does."
+msgstr ""
+"\n"
+"갤러리 3은 플로우플레이어가 지원하는 비디오만 지원합니다."
 
-#: src/camera/ImportPage.vala:1043
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
 #, c-format
 msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
 msgstr ""
-"카메라에서 미리 보기를 가져올 수 없습니다:\n"
-"%s"
+"업로드에 필요한 파일을 사용할 수 없습니다. %s(으)로 계속 업로드할 수 없습니"
+"다."
 
-#: src/camera/ImportPage.vala:1060
-msgid "Unmounting..."
-msgstr "마운트 해제 중..."
+#. populate any widgets whose contents are
+#. programmatically-generated
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
+#, c-format
+msgid "Publishing to %s as %s."
+msgstr "%s에 %s(으)로 업로드합니다."
 
-#: src/camera/ImportPage.vala:1166
-msgid "Fetching photo information"
-msgstr "사진 정보 가져오기"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
+msgid ""
+"Enter the URL for your Gallery3 site and the username and password (or API "
+"key) for your Gallery3 account."
+msgstr ""
+"갤러리 3 사이트 주소와 갤러리 3 사이트 계정의 사용자 이름과 암호(또는 API 키)"
+"를 입력하십시오."
 
-#: src/camera/ImportPage.vala:1521
-#, c-format
-msgid "Fetching preview for %s"
-msgstr "%s의 미리 보기 가져오는 중"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
+msgid ""
+"The username and password or API key were incorrect. To try again, re-enter "
+"your username and password below."
+msgstr ""
+"사용자 이름과 암호 또는 API 키가 올바르지 않습니다. 아래에 사용자 이름과 암호"
+"를 다시 입력하십시오."
 
-#: src/camera/ImportPage.vala:1637
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "카메라를 잠글 수 없습니다: %s"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
+msgid ""
+"The URL entered does not appear to be the main directory of a Gallery3 "
+"instance. Please make sure you typed it correctly and it does not have any "
+"trailing components (e.g., index.php)."
+msgstr ""
+"입력한 주소는 갤러리 3 인스턴스의 주 디렉터리가 아닌 듯합니다. 주소를 올바로 "
+"입력했는지 그리고 'index.php'와 같은 필요 없는 부분이 있는지 확인하십시오."
 
-#: src/camera/ImportPage.vala:1722
-#, c-format
-msgid "Delete this photo from camera?"
-msgid_plural "Delete these %d photos from camera?"
-msgstr[0] "이 사진 %d매를 카메라에서 지우시겠습니까?"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
+msgid "Unrecognized User"
+msgstr "인식할 수 없는 사용자"
 
-#: src/camera/ImportPage.vala:1725
-#, c-format
-msgid "Delete this video from camera?"
-msgid_plural "Delete these %d videos from camera?"
-msgstr[0] "카메라에서 비디오 %d편을 지우시겠습니까?"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
+msgid " Site Not Found"
+msgstr "사이트를 찾을 수 없음"
 
-#: src/camera/ImportPage.vala:1728
-#, c-format
-msgid "Delete this photo/video from camera?"
-msgid_plural "Delete these %d photos/videos from camera?"
-msgstr[0] "카메라에서 사진/비디오 %d개를 지우시겠습니까?"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
+msgid "Copyright (C) 2013 rajce.net"
+msgstr "Copyright (C) 2013 rajce.net"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
+msgid "An error message occurred when publishing to Rajce. Please try again."
+msgstr "Rajce 계정으로 업로드하는 중 오류가 발생했습니다. 다시 시도하십시오."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
+msgid "Enter email and password associated with your Rajce account."
+msgstr "Rajce 계정의 전자 메일 주소와 암호를 입력하십시오."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
+msgid "Invalid email and/or password. Please try again"
+msgstr "전자 메일 주소나 암호가 올바르지 않습니다. 다시 시도하십시오."
 
-#: src/camera/ImportPage.vala:1731
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
+msgid "Invalid User Email or Password"
+msgstr "올바르지 않은 전자 메일 주소나 암호"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:890
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:2
+msgid "_Email address"
+msgstr "전자 메일 주소(_E)"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:891
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
+msgid "_Password"
+msgstr "암호(_P)"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
+msgid "_Remember"
+msgstr "암호 저장(_R)"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
+msgid "Login"
+msgstr "로그인"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:5
+msgid "_Hide album"
+msgstr "앨범 숨기기(_H)"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
-msgid "Delete these files from camera?"
-msgid_plural "Delete these %d files from camera?"
-msgstr[0] "파일 %d개를 카메라에서 삭제하시겠습니까?"
+msgid "You are logged into Rajce as %s."
+msgstr "Rajce 계정에 %s(으)로 로그인했습니다."
 
-#: src/camera/ImportPage.vala:1739 src/Dialogs.vala:1328
-msgid "_Keep"
-msgstr "유지(_K)"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
+msgid "Photos will appear in:"
+msgstr "사진이 나타나는 시간:"
 
-#: src/camera/ImportPage.vala:1758
-msgid "Removing photos/videos from camera"
-msgstr "카메라에서 사진/비디오에서 제거는 중입니다"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
+msgid "An _existing album:"
+msgstr "이미 존재하는 앨범에 업로드(_E):"
 
-#: src/camera/ImportPage.vala:1762
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
+msgid "A _new album named:"
+msgstr "다음 이름의 앨범 만들기(_N):"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:6
+msgid "Open target _album in browser"
+msgstr "대상 앨범을 브라우저로 열기(_A)"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:8
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
+msgid "_Publish"
+msgstr "업로드(_P)"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
+msgid "_Logout"
+msgstr "로그아웃(_L)"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Copyright 2012 BJA Electronics"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
+msgid "500 x 375 pixels"
+msgstr "500 x 375 픽셀"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
+msgid "1024 x 768 pixels"
+msgstr "1024 x 768 픽셀"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
+msgid "1280 x 853 pixels"
+msgstr "1280 x 853 픽셀"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:310
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:320
 #, 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] "오류로 인하여 사진/비디오 %d개를 카메라에서 지울 수 없습니다."
+msgid "'%s' isn't a valid response to an OAuth authentication request"
+msgstr "'%s'이(가) OAuth 인증 요청에 올바른 응답을 보내지 않습니다."
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2623
-msgid "S_lideshow"
-msgstr "슬라이드 쇼(_L)"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:558
+msgid ""
+"TumblrPublisher: start( ): can't start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( ): 시작할 수 없습니다;이 업로드 도구를 다시 시작할 "
+"수 없습니다."
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2624
-msgid "Play a slideshow"
-msgstr "슬라이드 쇼 시작"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "Tumblr 계정의 사용자 이름과 암호를 입력하십시오."
 
-#: src/CollectionPage.vala:456
-msgid "Export Photo/Video"
-msgstr "사진/비디오 내보내기"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
+msgid "Username and/or password invalid. Please try again"
+msgstr "사용자 이름 또는 암호가 올바르지 않습니다. 다시 시도하십시오."
 
-#: src/CollectionPage.vala:456
-msgid "Export Photos/Videos"
-msgstr "사진/비디오 내보내기"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:617
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
+msgid "Invalid User Name or Password"
+msgstr "사용자 이름 또는 암호가 올바르지 않습니다."
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:58 src/PhotoPage.vala:3196
-msgid "Export Photo"
-msgstr "사진 내보내기"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:636
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "UI를 불러올 수 없음: %s"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:87
-msgid "Export Photos"
-msgstr "사진 내보내기"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:739
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"%s 계정으로 Tumblr에 로그인했습니다..\n"
+"\n"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Rotating"
-msgstr "회전"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
+msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Undoing Rotate"
-msgstr "회전 취소"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:25
+msgid "Visit the Yandex.Fotki web site"
+msgstr "Yandex.Fotki 웹사이트 방문"
 
-#: src/CollectionPage.vala:570
-msgid "Flipping Horizontally"
-msgstr "좌우로 뒤집기"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:632
+msgid "You are not currently logged into Yandex.Fotki."
+msgstr "Yandex.Fotki에 로그인하지 않았습니다."
 
-#: src/CollectionPage.vala:571
-msgid "Undoing Flip Horizontally"
-msgstr "좌우로 뒤집기 취소"
+#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+msgid "Shotwell Extra Publishing Services"
+msgstr "샷웰 기타 업로드 서비스"
 
-#: src/CollectionPage.vala:580
-msgid "Flipping Vertically"
-msgstr "상하 뒤집기"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
+msgid "Go _Back"
+msgstr "뒤로 이동(_B)"
 
-#: src/CollectionPage.vala:581
-msgid "Undoing Flip Vertically"
-msgstr "상하로 뒤집기 취소"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
+#: ../ui/shotwell.glade.h:42
+msgid "_Login"
+msgstr "로그인(_L)"
 
-#: src/searches/SearchBoolean.vala:157
-msgid "Any text"
-msgstr "모든 텍스트"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
+msgid "Intro message replaced at runtime"
+msgstr "런타임이 교체한 시작 메시지"
 
-#: src/searches/SearchBoolean.vala:160
-msgid "Title"
-msgstr "제목"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
+msgid "_Gallery3 URL:"
+msgstr "갤러리 3 주소(_G):"
 
-#: src/searches/SearchBoolean.vala:163
-msgid "Tag"
-msgstr "태그"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
+msgid "_User name:"
+msgstr "사용자 이름(_U):"
 
-#: src/searches/SearchBoolean.vala:166
-msgid "Comment"
-msgstr "설명"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
+msgid "_Password:"
+msgstr "암호(_P):"
 
-#: src/searches/SearchBoolean.vala:169
-msgid "Event name"
-msgstr "이벤트 이름"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:7
+msgid "API _Key:"
+msgstr "API 키(_K):"
 
-#: src/searches/SearchBoolean.vala:172
-msgid "File name"
-msgstr "파일 이름"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
+msgid "or"
+msgstr "또는"
 
-#: src/searches/SearchBoolean.vala:175
-msgid "Media type"
-msgstr "미디어 형식"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
+msgid "A _new album"
+msgstr "새 앨범(_N)"
 
-#: src/searches/SearchBoolean.vala:178
-msgid "Flag state"
-msgstr "표시 상태"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
+msgid "An _existing album"
+msgstr "이미 존재하는 앨범(_E)"
 
-#: src/searches/SearchBoolean.vala:181
-msgid "Photo state"
-msgstr "사진 상태"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
+msgid "_Remove location, tag and camera-identifying data before uploading"
+msgstr "업로드 전에 위치, 카메라 등의 개인을 식별할 수 있는 정보를 제거(_R)"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1003
-msgid "Rating"
-msgstr "평점"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
+msgid "'Publishing to $url as $username' (populated in application code)"
+msgstr "'$url 계정에 $username(으)로 업로드'(프로그램 코드가 혼잡함)"
 
-#: src/searches/SearchBoolean.vala:187
-msgid "Date"
-msgstr "날짜"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
+msgid "Scaling constraint:"
+msgstr "크기 조정 제한:"
 
-#: src/searches/SavedSearchDialog.vala:169
-msgid "contains"
-msgstr "포함"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
+msgid "pixels"
+msgstr "픽셀"
 
-#: src/searches/SavedSearchDialog.vala:170
-#: src/searches/SavedSearchDialog.vala:497
-msgid "is exactly"
-msgstr "정확하게 일치"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
+#: ../src/Dimensions.vala:17
+msgid "Original size"
+msgstr "원본 크기"
 
-#: src/searches/SavedSearchDialog.vala:171
-msgid "starts with"
-msgstr "다음으로 시작"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:10
+#: ../src/Dimensions.vala:20
+msgid "Width or height"
+msgstr "너비와 높이"
 
-#: src/searches/SavedSearchDialog.vala:172
-msgid "ends with"
-msgstr "다음으로 끝남"
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
+#: ../ui/shotwell.glade.h:14
+msgid "label"
+msgstr "라벨"
 
-#: src/searches/SavedSearchDialog.vala:173
-msgid "does not contain"
-msgstr "포함하지 않음"
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
+msgid "Blogs:"
+msgstr "블로그:"
 
-#: src/searches/SavedSearchDialog.vala:174
-#: src/searches/SavedSearchDialog.vala:501
-msgid "is not set"
-msgstr "설정하지 않음"
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:1
+msgid "Photo _size:"
+msgstr "사진 크기(_S):"
 
-#: src/searches/SavedSearchDialog.vala:245
-#: src/searches/SavedSearchDialog.vala:376
-#: src/searches/SavedSearchDialog.vala:441
-msgid "is"
-msgstr "같음"
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
+msgid "you are logged in rajce as $name"
+msgstr "Rajce 계정에 $name(으)로 로그인했습니다."
 
-#: src/searches/SavedSearchDialog.vala:246
-msgid "is not"
-msgstr "같지 않음"
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
+msgid "$mediatype will appear in"
+msgstr "$잠시 뒤 미디어 형식이 나타납니다."
 
-#: src/searches/SavedSearchDialog.vala:252
-msgid "any photo"
-msgstr "모든 사진"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
+msgid "_Albums (or write new):"
+msgstr "앨범(또는 새 것 만들기)(_A):"
 
-#: src/searches/SavedSearchDialog.vala:253
-msgid "a raw photo"
-msgstr "RAW 사진"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:2
+msgid "Access _type:"
+msgstr "접근 형식(_T):"
 
-#: src/searches/SavedSearchDialog.vala:254
-msgid "a video"
-msgstr "비디오"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
+msgid "Disable _comments"
+msgstr "설명 감추기(_C)"
 
-#: src/searches/SavedSearchDialog.vala:308
-msgid "has"
-msgstr "다음 항목이 있음"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:4
+msgid "_Forbid downloading original photo"
+msgstr "원본 사진 다운로드를 허용하지 않음(_F)"
 
-#: src/searches/SavedSearchDialog.vala:309
-msgid "has no"
-msgstr "다음 항목이 있음"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
+msgid "Public"
+msgstr "공개"
 
-#: src/searches/SavedSearchDialog.vala:314
-msgid "modifications"
-msgstr "수정"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:8
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1181
+msgid "Friends"
+msgstr "친구"
 
-#: src/searches/SavedSearchDialog.vala:315
-msgid "internal modifications"
-msgstr "내부 수정"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:9
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
+msgid "Private"
+msgstr "개인"
 
-#: src/searches/SavedSearchDialog.vala:316
-msgid "external modifications"
-msgstr "외부 수정"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:59
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1127
+msgid "Shotwell Connect"
+msgstr "샷웰 접속"
 
-#: src/searches/SavedSearchDialog.vala:370
-msgid "flagged"
-msgstr "표시함"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:63
+msgid ""
+"You are not currently logged into Facebook.\n"
+"\n"
+"If you don't yet have a Facebook account, you can create one during the "
+"login process. During login, Shotwell Connect may ask you for permission to "
+"upload photos and publish to your feed. These permissions are required for "
+"Shotwell Connect to function."
+msgstr ""
+"현재 페이스 북에 로그인하지 않았습니다.\n"
+"\n"
+"페이스 북 계정이 아직 없는 경우 로그인 과정 중 만드실 수 있습니다. 로그인 중 "
+"샷웰 연결이 사진을 업로드하거나 피드에 업로드할 권한을 요구할 수 있습니다. "
+"이 권한은 샷웰 연결이 동작하는데 필요합니다."
 
-#: src/searches/SavedSearchDialog.vala:371
-msgid "not flagged"
-msgstr "표시하지 않음"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:65
+msgid ""
+"You have already logged in and out of Facebook during this Shotwell "
+"session.\n"
+"To continue publishing to Facebook, quit and restart Shotwell, then try "
+"publishing again."
+msgstr ""
+"이 샷웰 세션에서는 이미 페이스 북에 로그인과 로그아웃을 하셨습니다.\n"
+"계속 페이스 북에 업로드하시려면, 샷웰을 다시 시작한 후 업로드하십시오."
 
-#: src/searches/SavedSearchDialog.vala:434
-msgid "and higher"
-msgstr "이상인 것"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:86
+msgid "Standard (720 pixels)"
+msgstr "표준(720 pixels)"
 
-#: src/searches/SavedSearchDialog.vala:435
-msgid "only"
-msgstr "일치하는 것"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:89
+msgid "Large (2048 pixels)"
+msgstr "큼(2048 pixels)"
 
-#: src/searches/SavedSearchDialog.vala:436
-msgid "and lower"
-msgstr "이하인 것"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:254
+msgid "Testing connection to Facebook..."
+msgstr "페이스북 연결을 확인하는 중..."
 
-#: src/searches/SavedSearchDialog.vala:498
-msgid "is after"
-msgstr "다음 값 다음"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:347
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
+msgid "Creating album..."
+msgstr "앨범 만드는 중..."
 
-#: src/searches/SavedSearchDialog.vala:499
-msgid "is before"
-msgstr "다음 값 전"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:374
+msgid ""
+"A file required for publishing is unavailable. Publishing to Facebook can't "
+"continue."
+msgstr ""
+"업로드에 필요한 파일을 사용할 수 없습니다. 페이스북으로 계속 업로드할 수 없습"
+"니다."
 
-#: src/searches/SavedSearchDialog.vala:500
-msgid "is between"
-msgstr "다음 값 사이"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1019
+#, c-format
+msgid ""
+"You are logged into Facebook as %s.\n"
+"\n"
+msgstr "페이스 북에 %s(으)로 로그인했습니다.\n"
 
-#: src/searches/SavedSearchDialog.vala:513
-msgid "and"
-msgstr "그리고"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1020
+msgid "Where would you like to publish the selected photos?"
+msgstr "선택한 사진을 어디로 업로드하시겠습니까?"
 
-#: src/searches/SavedSearchDialog.vala:720
-msgid "any"
-msgstr "일부 일치"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1021
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
+msgid "Upload _size:"
+msgstr "업로드 크기(_S):"
 
-#: src/searches/SavedSearchDialog.vala:721
-msgid "all"
-msgstr "모두 일치"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
+msgid "Just me"
+msgstr "나만"
 
-#: src/searches/SavedSearchDialog.vala:722
-msgid "none"
-msgstr "없음"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+msgid "Everyone"
+msgstr "모두"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "저장한 검색"
+#: ../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 ""
+"플리커 서비스에 로그인하지 않았습니다.\n"
+"\n"
+"웹 브라우저로 Flickr 사이트를 여신 후 로그인을 클릭하십시오. 샷웰이 플리커 계"
+"정 링크에 접근하는 것을 허용해야 합니다."
 
-#: src/searches/Branch.vala:77 src/library/LibraryWindow.vala:346
-#: src/sidebar/Tree.vala:195
-msgid "Ne_w Saved Search..."
-msgstr "새 저장한 검색(_W)..."
+#: ../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 ""
+"이 샷웰 세션 사용 중 이미 Flickr에 로그인 후 로그아웃 하셨습니다.\n"
+"계속 플리커로 업로드하시려면, 샷웰을 끝낸 후 다시 시작하여 업로드하십시오."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:375
+msgid "Preparing for login..."
+msgstr "로그인 준비 중..."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:444
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:595
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can't "
+"continue."
+msgstr ""
+"업로드에 필요한 파일을 사용할 수 없습니다. 플리커로 계속 업로드할 수 없습니"
+"다."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:457
+msgid "Verifying authorization..."
+msgstr "인증 확인 중..."
 
-#: src/main.vala:54
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1153
 #, 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."
+"You are logged into Flickr as %s.\n"
+"\n"
 msgstr ""
-"사진 라이브러리가 이 버전의 샷웰과는 호환되지 않습니다. 이 라이브러리는 샷웰 "
-"%s (schema %d)(으)로 만들어진 것으로 보이지만 이 프로그램의 버전은 %s "
-"(schema %d)입니다. 최신 버전의 샷웰을 사용하십시오."
+"플리커에 %s(으)로 로그인했습니다.\n"
+"\n"
 
-#: src/main.vala:59
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
 #, 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"
+"Your free Flickr account limits how much data you can upload per month.\n"
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"플리커 무료 계정은 한 달에 업로드할 수 있는 데이터에 제한이 있습니다.\n"
+"이 달에 업로드할 수 있는 데이터는 %d 메가바이트가 남아있습니다."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
+msgid "Your Flickr Pro account entitles you to unlimited uploads."
+msgstr "플리커 프로 계정은 업로드에 제한이 없습니다."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
+msgid "Photos _visible to:"
+msgstr "사진을 보여줄 사람(_V):"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+msgid "Videos _visible to:"
+msgstr "비디오를 보여줄 사람(_V):"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
+msgid "Photos and videos _visible to:"
+msgstr "사진과 비디오를 보여줄 사람(_V):"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+msgid "Friends & family only"
+msgstr "가족과 친구만"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
+msgid "Family only"
+msgstr "가족만"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
+msgid "Friends only"
+msgstr "친구만"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
+msgid "2048 x 1536 pixels"
+msgstr "2048 x 1536 픽셀"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
+msgid "4096 x 3072 pixels"
+msgstr "4096 x 3072 픽셀"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:58
+msgid ""
+"You are not currently logged into Picasa Web Albums.\n"
+"\n"
+"Click Login to log into Picasa Web Albums in your Web browser. You will have "
+"to authorize Shotwell Connect to link to your Picasa Web Albums account."
 msgstr ""
-"샷웰이 사진 라이브러리를 버전 %s (schema %d)에서 %s (schema %d)(으)로 업그레"
-"이드 할 수 없습니다. 더 많은 정보는 %s에 있는 샷웰 위키에서 찾을 수 있습니다."
+"현재 피카사 웹 앨범에 로그인하지 않았습니다.\n"
+"\n"
+"웹 브라우저에서 로그인을 클릭하여 피카사 웹 앨범으로 로그인합니다. 피카사 웹 "
+"앨범 계정에 연결하려면 샷웰 연결을 승인해야 합니다."
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:361
+msgid ""
+"A file required for publishing is unavailable. Publishing to Picasa can't "
+"continue."
+msgstr ""
+"업로드에 필요한 파일을 사용할 수 없습니다. 피카사로 계속 업로드할 수 없습니"
+"다."
+
+#. populate any widgets whose contents are programmatically-generated.
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:659
+#, c-format
+msgid "You are logged into Picasa Web Albums as %s."
+msgstr "피카사 웹 앨범에 %s(으)로 로그인 했습니다."
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:665
+msgid "Videos will appear in:"
+msgstr "비디오가 나타나는 시간:"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
+msgid "Small (640 x 480 pixels)"
+msgstr "작게(640 x 480 픽셀)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:747
+msgid "Medium (1024 x 768 pixels)"
+msgstr "중간(1024 x 768 픽셀)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:748
+msgid "Recommended (1600 x 1200 pixels)"
+msgstr "추천(1600 x 1200 픽셀)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:749
+msgid "Google+ (2048 x 1536 pixels)"
+msgstr "구글+(2048 x 1536 픽셀)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:750
+#: ../src/editing_tools/EditingTools.vala:756
+msgid "Original Size"
+msgstr "원본 크기"
 
-#: src/main.vala:65
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
 #, c-format
+msgid "Creating album %s..."
+msgstr "앨범 %s 만드는 중..."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:917
+msgid "An error message occurred when publishing to Piwigo. Please try again."
+msgstr "피위고로 사진을 업로드 하던 중 오류가 발생했습니다. 다시 시도하십시오."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:998
 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."
+"Enter the URL of your Piwigo photo library as well as the username and "
+"password associated with your Piwigo account for that library."
 msgstr ""
-"사진 라이브러리가 이 버전의 샷웰과는 호환되지 않습니다. 이 라이브러리는 샷웰 "
-"%s (schema %d)(으)로 만들어진 것으로 보이지만 이 프로그램의 버전은 %s "
-"(schema %d)입니다. %s(을)를 지우셔서 라이브러리를 지우신 후 사진을 다시 가져"
-"오십시오."
+"피위고 사진 라이브러리 주소와 이 계정의 라이브러리를 사용할 수 있는 사용자 이"
+"름 및 암호를 입력하십시오."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:999
+msgid ""
+"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
+"entered"
+msgstr ""
+"샷웰이 피위고 사진 라이브러리에 접근할 수 없습니다. 입력한 주소를 확인하십시"
+"오."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+msgid "Invalid URL"
+msgstr "올바르지 않은 주소"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+msgid "Admins, Family, Friends, Contacts"
+msgstr "관리자, 가족, 친구, 연락처"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+msgid "Admins, Family, Friends"
+msgstr "관리자, 가족, 친구"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+msgid "Admins, Family"
+msgstr "관리자, 가족"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+msgid "Admins"
+msgstr "관리자"
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:57
+msgid ""
+"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 ""
+"현재 유튜브에 로그인하지 않았습니다.\n"
+"\n"
+"계속 하시려면 구글 계정 등록이 되어있어야 하고 유튜브를 사용할 수 있도록 설정"
+"해야 합니다. 웹 브라우저를 이용하여 한번 이상 유튜브 사이트에 로그인 하시면 "
+"대부분의 계정을 설정할 수 있습니다."
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
+msgid ""
+"A file required for publishing is unavailable. Publishing to Youtube can't "
+"continue."
+msgstr ""
+"업로드에 필요한 파일을 사용할 수 없습니다. 유튜브로 계속 업로드할 수 없습니"
+"다."
 
-#: src/main.vala:71
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:461
 #, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
-msgstr "샷웰 데이터베이스 확인 시도 중 알 수 없는 오류가 발생했습니다: %s"
+msgid "You are logged into YouTube as %s."
+msgstr "유튜브에 %s(으)로 로그인했습니다."
 
-#: src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "샷웰 불러오는 중"
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:463
+#, c-format
+msgid "Videos will appear in '%s'"
+msgstr "'%s' 안에 비디오가 나타납니다."
 
-#: src/main.vala:294
-msgid "Path to Shotwell's private data"
-msgstr "샷웰 개인 정보 저장 경로"
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:495
+msgid "Public listed"
+msgstr "목록에 있는 것 공개"
 
-#: src/main.vala:294
-msgid "DIRECTORY"
-msgstr "디렉터리"
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
+msgid "Public unlisted"
+msgstr "목록에 없는 것 공개"
 
-#: src/main.vala:298
-msgid "Do not monitor library directory at runtime for changes"
-msgstr "시작할 때 라이브러리 디렉터리에 바뀐 점이 있는지 확인하지 않기"
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
+msgid "Publish to an e_xisting album:"
+msgstr "이미 존재하는 앨범에 업로드(_X):"
 
-#: src/main.vala:302
-msgid "Don't display startup progress meter"
-msgstr "시작 진행 상태 표시하지 않기"
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:2
+msgid "Create a _new album named:"
+msgstr "다음 이름을 가진 새 앨범 만들기(_N):"
 
-#: src/main.vala:306
-msgid "Show the application's version"
-msgstr "프로그램 버전 보이기"
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
+msgid "Videos and new photo albums _visible to:"
+msgstr "사진과 비디오를 보여줄 사람(_V):"
 
-#: src/main.vala:338
-msgid "[FILE]"
-msgstr "[파일]"
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:5
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:8
+msgid ""
+"_Remove location, camera, and other identifying information before uploading"
+msgstr "업로드 전에 위치, 카메라 등의 개인을 식별할 수 있는 정보를 제거(_R)"
+
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
+msgid ""
+"Enter the confirmation number which appears after you log into Flickr in "
+"your Web browser."
+msgstr "웹 브라우저로 플리커에 로그인한 후 나타나는 확인 번호를 입력하십시오."
+
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
+msgid "Authorization _Number:"
+msgstr "인증 번호(_N):"
+
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:3
+#: ../src/Dialogs.vala:131
+msgid "Con_tinue"
+msgstr "계속(_T):"
+
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
+msgid "L_ist album in public gallery"
+msgstr "공개 갤러리에 있는 앨범 목록 보이기(_I)"
+
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
+msgid "Photo _size preset:"
+msgstr "사진 크기 프리셋(_S):"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
+msgid "_URL of your Piwigo photo library"
+msgstr "피위고 사진 라이브러리 주소(_U)"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
+msgid "User _name"
+msgstr "사용자 이름(_N)"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
+msgid "_Remember Password"
+msgstr "암호 저장(_R)"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
+msgid "An _existing category:"
+msgstr "이미 존재하는 분류에 업로드(_E):"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:4
+msgid "Photos will be _visible by:"
+msgstr "사진을 보여줄 사람(_V):"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:5
+msgid "Photo size:"
+msgstr "사진 크기:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:6
+msgid "within category:"
+msgstr "업로드할 분류:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
+msgid "Album comment:"
+msgstr "앨범 설명:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
+msgid "_If a title is set and comment unset, use title as comment"
+msgstr "사진 제목은 설정했지만 설명이 없으면 제목을 설명으로 사용합니다(_I)"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:10
+msgid "_Do no upload tags"
+msgstr "업로드 태그를 사용하지 않음(_D)"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
+msgid "Logout"
+msgstr "로그아웃"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
+#: ../src/Resources.vala:303
+msgid "Publish"
+msgstr "사진 업로드"
+
+#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
+msgid "Core Publishing Services"
+msgstr "핵심 업로드 서비스"
+
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
+msgid "Video privacy _setting:"
+msgstr "비디오 사생활 설정(_S):"
+
+#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+msgid "Blinds"
+msgstr "블라인드"
+
+#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+msgid "Chess"
+msgstr "체스판 무늬"
+
+#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+msgid "Circle"
+msgstr "동그라미"
+
+#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+msgid "Circles"
+msgstr "여러 개의 동그라미"
+
+#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+msgid "Clock"
+msgstr "시계 효과"
+
+#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+msgid "Crumble"
+msgstr "부서지는 효과"
+
+#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+msgid "Fade"
+msgstr "사라지는 효과"
+
+#: ../plugins/shotwell-transitions/SlideEffect.vala:20
+msgid "Slide"
+msgstr "슬라이드"
+
+#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
+msgid "Squares"
+msgstr "여러 사각형"
+
+#: ../plugins/shotwell-transitions/StripesEffect.vala:20
+msgid "Stripes"
+msgstr "줄무늬"
+
+#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
+msgid "Core Slideshow Transitions"
+msgstr "핵심 슬라이드 쇼 전환 효과"
 
-#: src/main.vala:342
+#: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+
+#: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
 #, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"사용 가능한 명령 줄 옵션을 모두 보려면 '%s --help' 명령어를 실행하십시오.\n"
+msgid "Unable to create cache directory %s: %s"
+msgstr "캐시 디렉터리 %s을(를) 만들 수 없습니다: %s"
 
-#: src/Properties.vala:84
-msgid "Today"
-msgstr "오늘"
+#: ../src/AppDirs.vala:58 ../src/AppDirs.vala:88
+#, c-format
+msgid "Unable to create data directory %s: %s"
+msgstr "데이터 디렉터리 %1$s을(를) 만들 수 없습니다: %2$s"
 
-#: src/Properties.vala:86
-msgid "Yesterday"
-msgstr "어제"
+#. If XDG yarfed, use ~/Pictures
+#: ../src/AppDirs.vala:152
+msgid "Pictures"
+msgstr "사진"
 
-#: src/Properties.vala:340 src/Dialogs.vala:1273
-msgid "Title:"
-msgstr "제목:"
+#: ../src/AppDirs.vala:190
+#, c-format
+msgid "Unable to create temporary directory %s: %s"
+msgstr "임시 디렉터리 %1$s을(를) 만들 수 없습니다: %2$s"
 
-#: src/Properties.vala:343
-msgid "Items:"
-msgstr "항목:"
+#: ../src/AppDirs.vala:207 ../src/AppDirs.vala:223
+#, c-format
+msgid "Unable to create data subdirectory %s: %s"
+msgstr "데이터 하위 디렉터리 %1$s을(를) 만들 수 없습니다: %2$s"
+
+#: ../src/AppWindow.vala:53
+msgid "Pin Toolbar"
+msgstr "도구 모음 고정"
+
+#: ../src/AppWindow.vala:54
+msgid "Pin the toolbar open"
+msgstr "열린 도구 모음 고정"
+
+#: ../src/AppWindow.vala:59
+msgid "Leave fullscreen"
+msgstr "전체 화면 나가기"
+
+#: ../src/AppWindow.vala:525
+msgid "_Contents"
+msgstr "차례(_C)"
+
+#: ../src/AppWindow.vala:530
+msgid "_Frequently Asked Questions"
+msgstr "자주 하는 질문(_F)"
+
+#: ../src/AppWindow.vala:535
+msgid "_Report a Problem..."
+msgstr "문제 보고(_R)..."
+
+#: ../src/AppWindow.vala:634 ../src/AppWindow.vala:655
+#: ../src/AppWindow.vala:672 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
+#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441 ../src/Resources.vala:162
+#: ../src/data_imports/DataImportsUI.vala:374
+#: ../src/publishing/PublishingUI.vala:475
+msgid "_Cancel"
+msgstr "취소(_C)"
 
-#: src/Properties.vala:346
+#: ../src/AppWindow.vala:682
 #, c-format
-msgid "%d Event"
-msgid_plural "%d Events"
-msgstr[0] "이벤트 %d개"
+msgid ""
+"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
+"continue.\n"
+"\n"
+"%s"
+msgstr ""
+"샷웰 라이브러리에 접근하던 중 치명적인 오류가 발생했습니다.샷웰을 계속 실행"
+"할 수 없습니다.\n"
+"\n"
+"%s"
+
+#: ../src/AppWindow.vala:702
+msgid "Visit the Yorba web site"
+msgstr "제작자 웹 사이트 방문"
 
-#: src/Properties.vala:353 src/events/EventDirectoryItem.vala:87
+#: ../src/AppWindow.vala:714
 #, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] "사진 %d장"
+msgid "Unable to display help: %s"
+msgstr "도움말을 표시할 수 없습니다: %s"
 
-#: src/Properties.vala:355 src/events/EventDirectoryItem.vala:85
+#: ../src/AppWindow.vala:722
 #, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] "비디오 %d편"
+msgid "Unable to navigate to bug database: %s"
+msgstr "버그 데이터베이스로 이동할 수 없음: %s"
 
-#: src/Properties.vala:377
-msgid "Date:"
-msgstr "날짜:"
+#: ../src/AppWindow.vala:730
+#, c-format
+msgid "Unable to display FAQ: %s"
+msgstr "자주 하는 질문을 표시할 수 없습니다: %s"
 
-#: src/Properties.vala:381
-msgid "Time:"
-msgstr "시간:"
+#: ../src/BatchImport.vala:26
+msgid "Success"
+msgstr "성공"
 
-#: src/Properties.vala:384 src/Properties.vala:389
-msgid "From:"
-msgstr "시작:"
+#: ../src/BatchImport.vala:29
+msgid "File error"
+msgstr "파일 오류"
 
-#: src/Properties.vala:385 src/Properties.vala:390
-msgid "To:"
-msgstr "끝:"
+#: ../src/BatchImport.vala:32
+msgid "Unable to decode file"
+msgstr "파일을 해석할 수 없습니다"
 
-#: src/Properties.vala:395 src/editing_tools/EditingTools.vala:1850
-msgid "Size:"
-msgstr "크기:"
+#: ../src/BatchImport.vala:35
+msgid "Database error"
+msgstr "데이터베이스 오류"
 
-#: src/Properties.vala:404
-msgid "Duration:"
-msgstr "재생 시간:"
+#: ../src/BatchImport.vala:38
+msgid "User aborted import"
+msgstr "사용자가 가져오기를 취소했습니다"
+
+#: ../src/BatchImport.vala:41
+msgid "Not a file"
+msgstr "파일 아님"
+
+#: ../src/BatchImport.vala:44
+msgid "File already exists in database"
+msgstr "파일이 데이터베이스에 이미 존재함"
+
+#: ../src/BatchImport.vala:47
+msgid "Unsupported file format"
+msgstr "지원하지 않는 파일 형식"
+
+#: ../src/BatchImport.vala:50
+msgid "Not an image file"
+msgstr "이미지 파일 아님"
+
+#: ../src/BatchImport.vala:53
+msgid "Disk failure"
+msgstr "디스크 오류"
+
+#: ../src/BatchImport.vala:56
+msgid "Disk full"
+msgstr "디스크 꽉 참"
+
+#: ../src/BatchImport.vala:59
+msgid "Camera error"
+msgstr "카메라 오류"
+
+#: ../src/BatchImport.vala:62
+msgid "File write error"
+msgstr "파일 쓰기 오류"
+
+#: ../src/BatchImport.vala:65
+msgid "Corrupt image file"
+msgstr "문제가 있는 이미지 파일"
 
-#: src/Properties.vala:404
+#: ../src/BatchImport.vala:68
 #, c-format
-msgid "%.1f seconds"
-msgstr "%.1f 초"
+msgid "Imported failed (%d)"
+msgstr "가져오기 실패(%d)"
 
-#: src/Properties.vala:408
-msgid "Developer:"
-msgstr "편집 프로그램:"
+#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
+msgid "S_lideshow"
+msgstr "슬라이드 쇼(_L)"
 
-#: src/Properties.vala:436 src/Properties.vala:440 src/Properties.vala:447
-#: src/editing_tools/EditingTools.vala:2218
-msgid "Exposure:"
-msgstr "노출:"
+#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
+msgid "Play a slideshow"
+msgstr "슬라이드 쇼 시작"
 
-#: src/Properties.vala:585
-msgid "Location:"
-msgstr "위치:"
+#: ../src/CollectionPage.vala:456
+msgid "Export Photo/Video"
+msgstr "사진/비디오 내보내기"
 
-#: src/Properties.vala:588
-msgid "File size:"
-msgstr "파일 크기:"
+#: ../src/CollectionPage.vala:456
+msgid "Export Photos/Videos"
+msgstr "사진/비디오 내보내기"
 
-#: src/Properties.vala:592
-msgid "Current Development:"
-msgstr "현재 편집 프로그램:"
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
+#: ../src/PhotoPage.vala:3211
+msgid "Export Photo"
+msgstr "사진 내보내기"
 
-#: src/Properties.vala:594
-msgid "Original dimensions:"
-msgstr "원래 크기:"
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:87
+msgid "Export Photos"
+msgstr "사진 내보내기"
 
-#: src/Properties.vala:597
-msgid "Camera make:"
-msgstr "카메라 제조사:"
+#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+msgid "Rotating"
+msgstr "회전"
 
-#: src/Properties.vala:600
-msgid "Camera model:"
-msgstr "카메라 모델:"
+#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+msgid "Undoing Rotate"
+msgstr "회전 취소"
 
-#: src/Properties.vala:603
-msgid "Flash:"
-msgstr "플래시:"
+#: ../src/CollectionPage.vala:570
+msgid "Flipping Horizontally"
+msgstr "좌우로 뒤집기"
 
-#: src/Properties.vala:605
-msgid "Focal length:"
-msgstr "초점 거리:"
+#: ../src/CollectionPage.vala:571
+msgid "Undoing Flip Horizontally"
+msgstr "좌우로 뒤집기 취소"
 
-#: src/Properties.vala:608
-msgid "Exposure date:"
-msgstr "촬영 날짜:"
+#: ../src/CollectionPage.vala:580
+msgid "Flipping Vertically"
+msgstr "상하 뒤집기"
 
-#: src/Properties.vala:611
-msgid "Exposure time:"
-msgstr "촬영 시간:"
+#: ../src/CollectionPage.vala:581
+msgid "Undoing Flip Vertically"
+msgstr "상하로 뒤집기 취소"
 
-#: src/Properties.vala:614
-msgid "Exposure bias:"
-msgstr "노출 보정:"
+#: ../src/Commands.vala:733
+msgid "Reverting"
+msgstr "되돌리기"
 
-#: src/Properties.vala:616
-msgid "GPS latitude:"
-msgstr "GPS 위도:"
+#: ../src/Commands.vala:733
+msgid "Undoing Revert"
+msgstr "되돌리기 취소"
 
-#: src/Properties.vala:619
-msgid "GPS longitude:"
-msgstr "GPS 경도:"
+#: ../src/Commands.vala:777
+msgid "Enhancing"
+msgstr "화질 높이기"
 
-#: src/Properties.vala:622
-msgid "Artist:"
-msgstr "아티스트:"
+#: ../src/Commands.vala:777
+msgid "Undoing Enhance"
+msgstr "화질 높이기 취소"
 
-#: src/Properties.vala:624
-msgid "Copyright:"
-msgstr "저작권:"
+#: ../src/Commands.vala:853
+msgid "Applying Color Transformations"
+msgstr "색 변환을 적용하는 중"
 
-#: src/Properties.vala:626
-msgid "Software:"
-msgstr "소프트웨어:"
+#: ../src/Commands.vala:853
+msgid "Undoing Color Transformations"
+msgstr "색 전환을 취소하는 중"
 
-#: src/Properties.vala:630 src/Dialogs.vala:1288
-msgid "Comment:"
-msgstr "설명:"
+#: ../src/Commands.vala:1003
+msgid "Creating New Event"
+msgstr "새 이벤트 만들기"
 
-#: src/Properties.vala:639
-msgid "Extended Information"
-msgstr "확장 정보"
+#: ../src/Commands.vala:1004
+msgid "Removing Event"
+msgstr "이벤트 제거"
+
+#: ../src/Commands.vala:1013
+msgid "Moving Photos to New Event"
+msgstr "사진 새 이벤트로 옮기기"
+
+#: ../src/Commands.vala:1014
+msgid "Setting Photos to Previous Event"
+msgstr "사진을 이전 이벤트로 설정"
+
+#: ../src/Commands.vala:1071
+msgid "Merging"
+msgstr "합치기"
+
+#: ../src/Commands.vala:1072
+msgid "Unmerging"
+msgstr "합치기 취소"
+
+#: ../src/Commands.vala:1081
+msgid "Duplicating photos"
+msgstr "사진 복제"
+
+#: ../src/Commands.vala:1081
+msgid "Removing duplicated photos"
+msgstr "복제한 사진 삭제"
+
+#: ../src/Commands.vala:1104
+#, 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] "파일 오류로 사진 %d매를 복제할 수 없습니다"
+
+#: ../src/Commands.vala:1191
+msgid "Restoring previous rating"
+msgstr "이전 평점으로 되돌리기"
+
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+msgid "Increasing ratings"
+msgstr "평점 높이기"
+
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+msgid "Decreasing ratings"
+msgstr "평점 낮추기"
+
+#: ../src/Commands.vala:1252
+msgid "Setting RAW developer"
+msgstr "RAW 편집 프로그램 설정"
+
+#: ../src/Commands.vala:1252
+msgid "Restoring previous RAW developer"
+msgstr "이전 RAW 편집 프로그램 되돌리기"
+
+#: ../src/Commands.vala:1253
+msgid "Set Developer"
+msgstr "편집 프로그램 설정"
+
+#: ../src/Commands.vala:1343
+msgid "Original photo could not be adjusted."
+msgstr "원본 사진은 조정할 수 없습니다."
+
+#: ../src/Commands.vala:1364
+msgid "Adjusting Date and Time"
+msgstr "날짜와 시간 조정"
+
+#: ../src/Commands.vala:1364
+msgid "Undoing Date and Time Adjustment"
+msgstr "날짜 시간 조정 취소"
+
+#: ../src/Commands.vala:1395
+msgid "One original photo could not be adjusted."
+msgid_plural "The following original photos could not be adjusted."
+msgstr[0] "원본 사진은 조정할 수 없습니다."
+
+#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
+msgid "Time Adjustment Error"
+msgstr "시간 조정 오류"
+
+#: ../src/Commands.vala:1419
+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] "다음 사진 파일에 적용한 시간 조정은 취소할 수 없습니다."
+
+#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
+msgid "Create Tag"
+msgstr "태그 만들기"
+
+#: ../src/Commands.vala:1691
+#, c-format
+msgid "Move Tag \"%s\""
+msgstr "태그 \"%s\" 이동"
+
+#: ../src/Commands.vala:2343
+msgid "Move Photos to Trash"
+msgstr "사진 휴지통으로 보내기"
+
+#: ../src/Commands.vala:2343
+msgid "Restore Photos from Trash"
+msgstr "휴지통에 있는 사진 되살리기"
+
+#: ../src/Commands.vala:2344
+msgid "Move the photos to the Shotwell trash"
+msgstr "사진을 샷웰 휴지통으로 옮깁니다"
+
+#: ../src/Commands.vala:2344
+msgid "Restore the photos back to the Shotwell library"
+msgstr "휴지통에 있는 사진을 샷웰 라이브러리로 다시 가져옵니다"
+
+#: ../src/Commands.vala:2363
+msgid "Moving Photos to Trash"
+msgstr "사진을 휴지통으로 보내기"
 
-#: src/Dialogs.vala:16
+#: ../src/Commands.vala:2363
+msgid "Restoring Photos From Trash"
+msgstr "휴지통에 있는 사진 되살리기"
+
+#: ../src/Commands.vala:2449
+msgid "Flag selected photos"
+msgstr "선택한 사진 표시"
+
+#: ../src/Commands.vala:2450
+msgid "Unflag selected photos"
+msgstr "선택한 사진 표시 제거"
+
+#: ../src/Commands.vala:2451
+msgid "Flagging selected photos"
+msgstr "선택한 사진 표시"
+
+#: ../src/Commands.vala:2452
+msgid "Unflagging selected photos"
+msgstr "선택한 사진 표시 제거"
+
+#: ../src/Commands.vala:2459
+msgid "Flag"
+msgstr "표시"
+
+#: ../src/Commands.vala:2459
+msgid "Unflag"
+msgstr "표시 제거"
+
+#: ../src/DesktopIntegration.vala:121
+#, c-format
+msgid "Unable to launch Nautilus Send-To: %s"
+msgstr "노틸러스 보내기를 실행할 수 없습니다: %s"
+
+#: ../src/DesktopIntegration.vala:129
+msgid "Send To"
+msgstr "보내기"
+
+#: ../src/DesktopIntegration.vala:174
+#, c-format
+msgid "Unable to export background to %s: %s"
+msgstr "배경을 %s(으)로 내보낼 수 없습니다: %s"
+
+#: ../src/DesktopIntegration.vala:311
+#, c-format
+msgid "Unable to prepare desktop slideshow: %s"
+msgstr "데스크톱 슬라이드 쇼를 준비할 수 없습니다: %s"
+
+#: ../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] "태그 \"%s\"(을)를 %d장의 사진에서 제거합니다. 계속하시겠습니까?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1361
-#: src/Dialogs.vala:1384 src/data_imports/DataImportsUI.vala:399
-#: src/AppWindow.vala:615 src/AppWindow.vala:636 src/AppWindow.vala:653
-#: src/publishing/PublishingUI.vala:498
-msgid "_Cancel"
-msgstr "취소(_C)"
-
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1329
-#: src/Resources.vala:330 src/Resources.vala:378 src/Resources.vala:643
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
+#: ../src/Resources.vala:163 ../src/Resources.vala:369
+#: ../src/Resources.vala:417 ../src/Resources.vala:682
 msgid "_Delete"
 msgstr "삭제(_D)"
 
-#: src/Dialogs.vala:25
+#: ../src/Dialogs.vala:25
 #, c-format
 msgid "This will remove the saved search \"%s\".  Continue?"
 msgstr "검색 \"%s\"을(를) 제거합니다. 계속하시겠습니까?"
 
-#: src/Dialogs.vala:35
-#, c-format
+#: ../src/Dialogs.vala:35
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
 "Shotwell"
@@ -651,15 +1423,20 @@ msgid_plural ""
 "Shotwell"
 msgstr[0] "편집 프로그램을 전환하면 사진에 샷웰이 바꾼 내용을 모두 취소합니다."
 
-#: src/Dialogs.vala:39
+#: ../src/Dialogs.vala:39
 msgid "_Switch Developer"
 msgstr "편집 프로그램 전환(_S)"
 
-#: src/Dialogs.vala:58
+#: ../src/Dialogs.vala:58
 msgid "Export Video"
 msgstr "비디오 내보내기"
 
-#: src/Dialogs.vala:115
+#. Ticket #3023
+#. Attempt to replace the system error with something friendlier
+#. if we can't copy an image over for editing in an external tool.
+#. Did we fail because we can't write to this directory?
+#. Yes - display an alternate error message here.
+#: ../src/Dialogs.vala:115
 #, c-format
 msgid ""
 "Shotwell couldn't create a file for editing this photo because you do not "
@@ -668,7 +1445,7 @@ msgstr ""
 "%s에 쓸 수 있는 권한이 없기 때문에 이 사진을 편집할 때 사용하는 파일을 만들 "
 "수 없습니다."
 
-#: src/Dialogs.vala:124
+#: ../src/Dialogs.vala:124
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -676,7 +1453,7 @@ msgstr ""
 "파일 오류로 다음 사진을 내보낼 수 없습니다.\n"
 "\n"
 
-#: src/Dialogs.vala:130
+#: ../src/Dialogs.vala:130
 msgid ""
 "\n"
 "\n"
@@ -686,95 +1463,110 @@ msgstr ""
 "\n"
 "계속 내보내시겠습니까?"
 
-#: src/Dialogs.vala:131
-msgid "Con_tinue"
-msgstr "계속(_T):"
-
-#: src/Dialogs.vala:147
+#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
+#. aren't formats so much as they are operating modes that determine specific formats.
+#. Hereafter we'll refer to these as "special formats."
+#: ../src/Dialogs.vala:147
 msgid "Unmodified"
 msgstr "바꾸지 않음"
 
-#: src/Dialogs.vala:148
+#: ../src/Dialogs.vala:148
 msgid "Current"
 msgstr "현재"
 
-#: src/Dialogs.vala:212
+#. layout controls
+#: ../src/Dialogs.vala:213
 msgid "_Format:"
 msgstr "형식(_F):"
 
-#: src/Dialogs.vala:215
+#: ../src/Dialogs.vala:216
 msgid "_Quality:"
 msgstr "화질(_Q):"
 
-#: src/Dialogs.vala:218
+#: ../src/Dialogs.vala:219
 msgid "_Scaling constraint:"
 msgstr "크기 조정 제한(_S):"
 
-#: src/Dialogs.vala:221
-msgid " _pixels"
-msgstr "픽셀(_P)"
+#: ../src/Dialogs.vala:222
+msgid "_Pixels:"
+msgstr "픽셀(_P):"
 
-#: src/Dialogs.vala:229
+#: ../src/Dialogs.vala:225
 msgid "Export metadata"
 msgstr "메타 정보 내보내기"
 
-#: src/Dialogs.vala:465
+#: ../src/Dialogs.vala:459
 msgid "Save Details..."
 msgstr "자세한 내용 저장..."
 
-#: src/Dialogs.vala:466
+#: ../src/Dialogs.vala:460
 msgid "Save Details"
 msgstr "자세한 내용 저장"
 
-#: src/Dialogs.vala:481
+#: ../src/Dialogs.vala:475
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(그리고 %d개 더)\n"
 
-#: src/Dialogs.vala:534
+#: ../src/Dialogs.vala:528
 msgid "Import Results Report"
 msgstr "결과 보고서 가져오기"
 
-#: src/Dialogs.vala:538
+#: ../src/Dialogs.vala:532
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "파일 %d개를 가져옵니다."
 
-#: src/Dialogs.vala:541
+#: ../src/Dialogs.vala:535
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
 msgstr[0] "그 중 파일 %d개를 가져왔습니다."
 
-#: src/Dialogs.vala:553
+#.
+#. Duplicates
+#.
+#: ../src/Dialogs.vala:547
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "가져오지 않은 사진 또는 비디오 복제:"
 
-#: src/Dialogs.vala:557
+#: ../src/Dialogs.vala:551
 msgid "duplicates existing media item"
 msgstr "이미 존재하는 미디어 항목 복제"
 
-#: src/Dialogs.vala:568
+#.
+#. Files Not Imported Due to Camera Errors
+#.
+#: ../src/Dialogs.vala:562
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "카메라 오류로 사진 또는 비디오를 가지고 오지 않았습니다:"
 
-#: src/Dialogs.vala:571 src/Dialogs.vala:586 src/Dialogs.vala:601
-#: src/Dialogs.vala:617 src/Dialogs.vala:632 src/Dialogs.vala:646
+#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
+#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
 msgid "error message:"
 msgstr "오류 메시지:"
 
-#: src/Dialogs.vala:582
+#.
+#. Files Not Imported Because They Weren't Recognized as Photos or Videos
+#.
+#: ../src/Dialogs.vala:576
 msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgstr "파일을 사진이나 비디오로 인식할 수 없어 가지고 오지 않았습니다:"
 
-#: src/Dialogs.vala:597
+#.
+#. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
+#.
+#: ../src/Dialogs.vala:591
 msgid ""
 "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
 "Understands:"
 msgstr "샷웰이 파일 형식을 인식할 수 없어 가지고 오지 않았습니다:"
 
-#: src/Dialogs.vala:612
+#.
+#. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
+#.
+#: ../src/Dialogs.vala:606
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
 "Library:"
@@ -782,7 +1574,7 @@ msgstr ""
 "샷웰이 파일을 라이브러리로 복사할 수 없어 사진이나 비디오로 인식할 수 없어 가"
 "지고 오지 않았습니다:"
 
-#: src/Dialogs.vala:616
+#: ../src/Dialogs.vala:610
 #, c-format
 msgid ""
 "couldn't copy %s\n"
@@ -791,45 +1583,51 @@ msgstr ""
 "%s을(를)\n"
 "\t%s(으)로 복사할 수 없음"
 
-#: src/Dialogs.vala:628
+#.
+#. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
+#.
+#: ../src/Dialogs.vala:622
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "파일 이름에 문제가 있어 사진/비디오를 가져오지 않았습니다:"
 
-#: src/Dialogs.vala:643
+#.
+#. Photos/Videos Not Imported for Other Reasons
+#.
+#: ../src/Dialogs.vala:637
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "다른 이유로 사진 또는 비디오를 가지고 오지 않았습니다:"
 
-#: src/Dialogs.vala:663
+#: ../src/Dialogs.vala:657
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "중복된 사진 %d매를 가져오지 않았습니다:\n"
 
-#: src/Dialogs.vala:666
+#: ../src/Dialogs.vala:660
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "중복된 비디오 %d편을 가져오지 않았습니다:\n"
 
-#: src/Dialogs.vala:669
+#: ../src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "중복된 사진/비디오 %d개를 가져오지 않았습니다:\n"
 
-#: src/Dialogs.vala:683
+#: ../src/Dialogs.vala:677
 #, 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] "파일 또는 하드웨어 오류로 사진 %d매를 가져오지 못했습니다:\n"
 
-#: src/Dialogs.vala:686
+#: ../src/Dialogs.vala:680
 #, 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] "파일 또는 하드웨어 오류로 비디오 %d편을 가져오지 못했습니다:\n"
 
-#: src/Dialogs.vala:689
+#: ../src/Dialogs.vala:683
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -837,13 +1635,13 @@ msgid_plural ""
 msgstr[0] ""
 "파일 또는 하드웨어 오류로 %d장의 사진/비디오를 가져오지 못했습니다:\n"
 
-#: src/Dialogs.vala:692
+#: ../src/Dialogs.vala:686
 #, 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] "하드웨어 오류로 파일 %d개를 가져올 수 없습니다:\n"
 
-#: src/Dialogs.vala:706
+#: ../src/Dialogs.vala:700
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -853,7 +1651,7 @@ msgid_plural ""
 msgstr[0] ""
 "사진 라이브러리 폴더에 기록할 수 없어 사진 %d매를 가져오지 못했습니다:\n"
 
-#: src/Dialogs.vala:709
+#: ../src/Dialogs.vala:703
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -863,7 +1661,7 @@ msgid_plural ""
 msgstr[0] ""
 "사진 라이브러리 폴더에 기록할 수 없어 비디오 %d편을 가져오지 못했습니다:\n"
 
-#: src/Dialogs.vala:712
+#: ../src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -875,7 +1673,7 @@ msgstr[0] ""
 "사진 라이브러리 폴더에 기록할 수 없어 사진/비디오 %d개를 가져오지 못했습니"
 "다:\n"
 
-#: src/Dialogs.vala:715
+#: ../src/Dialogs.vala:709
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -885,176 +1683,199 @@ msgid_plural ""
 msgstr[0] ""
 "사진 라이브러리 폴더에 기록할 수 없어 파일 %d개를 가져오지 못했습니다:\n"
 
-#: src/Dialogs.vala:729
+#: ../src/Dialogs.vala:723
 #, 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] "카메라 오류로 사진 %d매를 가져오지 못했습니다:\n"
 
-#: src/Dialogs.vala:732
+#: ../src/Dialogs.vala:726
 #, 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] "카메라 오류로 비디오 %d편을 가져오지 못했습니다:\n"
 
-#: src/Dialogs.vala:735
+#: ../src/Dialogs.vala:729
 #, 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] "카메라 오류로 사진/비디오 %d개를 가져오지 못했습니다:\n"
 
-#: src/Dialogs.vala:738
+#: ../src/Dialogs.vala:732
 #, 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] "카메라 오류로 파일 %d개를 가져올 수 없습니다:\n"
 
-#: src/Dialogs.vala:752
+#: ../src/Dialogs.vala:746
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
 msgstr[0] "파일 이름에 문제가 있어 사진 %d매를 가져올 수 없습니다:\n"
 
-#: src/Dialogs.vala:755
+#: ../src/Dialogs.vala:749
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
 msgstr[0] "파일 이름에 문제가 있어 비디오 %d편을 가져올 수 없습니다:\n"
 
-#: src/Dialogs.vala:758
+#: ../src/Dialogs.vala:752
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
 msgstr[0] "파일 이름에 문제가 있어 사진/비디오 %d개를 가져올 수 없습니다:\n"
 
-#: src/Dialogs.vala:761
+#: ../src/Dialogs.vala:755
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
 msgstr[0] "파일 이름에 문제가 있어 파일 %d개를 가져올 수 없습니다:\n"
 
-#: src/Dialogs.vala:778
+#. we have no notion of "unsupported" video files right now in Shotwell (all
+#. standard container formats are supported, it's just that the streams in them
+#. might or might not be interpretable), so this message does not need to be
+#. media specific
+#: ../src/Dialogs.vala:772
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
 msgstr[0] "%d매의 지원하지 않는 사진을 건너 뛰었습니다:\n"
 
-#: src/Dialogs.vala:793
+#. we have no notion of "non-video" video files right now in Shotwell, so this
+#. message doesn't need to be media specific
+#: ../src/Dialogs.vala:787
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "그림이 아닌 파일 %d개를 건너 뛰었습니다.\n"
 
-#: src/Dialogs.vala:804
+#: ../src/Dialogs.vala:798
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "사용자의 요청으로 사진 %d매를 건너 뛰었습니다:\n"
 
-#: src/Dialogs.vala:807
+#: ../src/Dialogs.vala:801
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "사용자의 요청으로 사진 %d매를 건너 뛰었습니다:\n"
 
-#: src/Dialogs.vala:810
+#: ../src/Dialogs.vala:804
 #, 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] "사용자의 요청으로 사진/비디오 %d개를 건너 뛰었습니다:\n"
 
-#: src/Dialogs.vala:813
+#: ../src/Dialogs.vala:807
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "사용자가 취소하여 파일 %d개를 건너뛰었습니다:\n"
 
-#: src/Dialogs.vala:827
+#: ../src/Dialogs.vala:821
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "사진 %d매를 성공적으로 가져왔습니다.\n"
 
-#: src/Dialogs.vala:830
+#: ../src/Dialogs.vala:824
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "비디오 %d편을 성공적으로 가져왔습니다.\n"
 
-#: src/Dialogs.vala:833
+#: ../src/Dialogs.vala:827
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
 msgstr[0] "사진/비디오 %d개를 성공적으로 가져왔습니다.\n"
 
-#: src/Dialogs.vala:849
+#. if no media items were imported at all (i.e. an empty directory attempted), need to at least
+#. report that nothing was imported
+#: ../src/Dialogs.vala:843
 msgid "No photos or videos imported.\n"
 msgstr "가져온 사진 또는 비디오가 없습니다.\n"
 
-#: src/Dialogs.vala:856 src/Dialogs.vala:875
+#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
 msgid "Import Complete"
 msgstr "가져오기 완료"
 
-#: src/Dialogs.vala:1103
+#: ../src/Dialogs.vala:1155
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "%d 초"
+msgstr[0] "%d초"
 
-#: src/Dialogs.vala:1106
+#: ../src/Dialogs.vala:1158
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "%d 분"
+msgstr[0] "%d분"
 
-#: src/Dialogs.vala:1110
+#: ../src/Dialogs.vala:1162
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "%d 시간"
+msgstr[0] "%d시간"
 
-#: src/Dialogs.vala:1113
+#: ../src/Dialogs.vala:1165
 msgid "1 day"
 msgstr "1 일"
 
-#: src/Dialogs.vala:1263 src/Resources.vala:205
+#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
 msgid "Rename Event"
 msgstr "이벤트 이름 바꾸기"
 
-#: src/Dialogs.vala:1263
+#: ../src/Dialogs.vala:1315
 msgid "Name:"
 msgstr "이름:"
 
-#: src/Dialogs.vala:1273 src/Resources.vala:274
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
 msgid "Edit Title"
 msgstr "제목 편집"
 
-#: src/Dialogs.vala:1287 src/Resources.vala:280
+#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
+msgid "Title:"
+msgstr "제목:"
+
+#. Dialog title
+#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
 msgid "Edit Event Comment"
 msgstr "이벤트 설명 편집"
 
-#: src/Dialogs.vala:1287
+#: ../src/Dialogs.vala:1344
 msgid "Edit Photo/Video Comment"
 msgstr "사진/비디오 설명 편집"
 
-#: src/Dialogs.vala:1304
-msgid "_Trash File"
-msgid_plural "_Trash Files"
-msgstr[0] "휴지통에 버리기(_T)"
+#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
+msgid "Comment:"
+msgstr "설명:"
+
+#: ../src/Dialogs.vala:1361
+msgid "Remove and _Trash File"
+msgid_plural "Remove and _Trash Files"
+msgstr[0] "제거한 후 휴지통에 버리기(_T)"
 
-#: src/Dialogs.vala:1308
-msgid "Only _Remove"
+#: ../src/Dialogs.vala:1365
+msgid "_Remove From Library"
 msgstr "라이브러리에서 제거(_R)"
 
-#: src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
+msgid "_Keep"
+msgstr "유지(_K)"
+
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edit?"
 msgstr "외부 편집 프로그램으로 한 편집을 되돌리시겠습니까?"
 
-#: src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edits?"
 msgstr "외부 편집 프로그램으로 한 편집을 되돌리시겠습니까?"
 
-#: src/Dialogs.vala:1353
+#: ../src/Dialogs.vala:1410
 #, c-format
 msgid "This will destroy all changes made to the external file.  Continue?"
 msgid_plural ""
@@ -1062,86 +1883,86 @@ msgid_plural ""
 msgstr[0] ""
 "외부 파일에 적용한 바뀐 내용 %d개를 모두 취소합니다. 계속하시겠습니까?"
 
-#: src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edit"
 msgstr "외부 편집 프로그램으로 한 편집 되돌리기(_V)"
 
-#: src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edits"
 msgstr "외부 편집 프로그램으로 한 편집 되돌리기(_V)"
 
-#: src/Dialogs.vala:1378
+#: ../src/Dialogs.vala:1435
 #, 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] "라이브러리에서 사진 %d매를 제거합니다. 계속하시겠습니까?"
 
-#: src/Dialogs.vala:1385
+#: ../src/Dialogs.vala:1442 ../src/Resources.vala:178
 msgid "_Remove"
 msgstr "제거(_R)"
 
-#: src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photo From Library"
 msgstr "라이브러리에서 사진 제거"
 
-#: src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photos From Library"
 msgstr "사진 라이브러리에서 제거"
 
-#: src/Dialogs.vala:1479
+#: ../src/Dialogs.vala:1536
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1626
+#: ../src/Dialogs.vala:1688
 msgid "AM"
 msgstr "오전"
 
-#: src/Dialogs.vala:1627
+#: ../src/Dialogs.vala:1689
 msgid "PM"
 msgstr "오후"
 
-#: src/Dialogs.vala:1628
+#: ../src/Dialogs.vala:1690
 msgid "24 Hr"
 msgstr "24시간"
 
-#: src/Dialogs.vala:1643
+#: ../src/Dialogs.vala:1705
 msgid "_Shift photos/videos by the same amount"
 msgstr "같은 크기의 사진/비디오 옮기기(_S)"
 
-#: src/Dialogs.vala:1648
+#: ../src/Dialogs.vala:1710
 msgid "Set _all photos/videos to this time"
 msgstr "모든 사진/비디오를 이 시간으로 설정(_A)"
 
-#: src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo file"
 msgstr "원본 사진 파일 수정(_M)"
 
-#: src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo files"
 msgstr "원본 사진 파일 수정(_M)"
 
-#: src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original file"
 msgstr "원본 파일 수정(_M)"
 
-#: src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original files"
 msgstr "원본 파일 수정(_M)"
 
-#: src/Dialogs.vala:1744
+#: ../src/Dialogs.vala:1806
 msgid "Original: "
 msgstr "원본:"
 
-#: src/Dialogs.vala:1745
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%Y/%m/%d, %H:%M:%S"
 
-#: src/Dialogs.vala:1746
+#: ../src/Dialogs.vala:1808
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%Y/%m/%d, %p %I:%M:%S"
 
-#: src/Dialogs.vala:1835
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -1150,7 +1971,7 @@ msgstr ""
 "촬영 시간을 %d %s, %d %s, %d %s, %d %s\n"
 "전으로 바꿉니다."
 
-#: src/Dialogs.vala:1836
+#: ../src/Dialogs.vala:1898
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -1159,27 +1980,27 @@ msgstr ""
 "촬영 시간을 %d %s, %d %s, %d %s, %d %s\n"
 "후로 바꿉니다."
 
-#: src/Dialogs.vala:1838
+#: ../src/Dialogs.vala:1900
 msgid "day"
 msgid_plural "days"
 msgstr[0] "일"
 
-#: src/Dialogs.vala:1839
+#: ../src/Dialogs.vala:1901
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "시"
 
-#: src/Dialogs.vala:1840
+#: ../src/Dialogs.vala:1902
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "분"
 
-#: src/Dialogs.vala:1841
+#: ../src/Dialogs.vala:1903
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "초"
 
-#: src/Dialogs.vala:1885
+#: ../src/Dialogs.vala:1947
 #, c-format
 msgid ""
 "\n"
@@ -1194,87 +2015,91 @@ msgstr[0] ""
 "\n"
 "그리고 다른 %d개."
 
-#: src/Dialogs.vala:1907 src/Dialogs.vala:1934
+#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
 msgid "Tags (separated by commas):"
 msgstr "태그(쉼표로 구분):"
 
-#: src/Dialogs.vala:2014
+#: ../src/Dialogs.vala:2076
 msgid "Welcome!"
 msgstr "환영합니다!"
 
-#: src/Dialogs.vala:2021
-#, c-format
+#: ../src/Dialogs.vala:2083
 msgid "Welcome to Shotwell!"
 msgstr "샷웰 사용을 환영합니다!"
 
-#: src/Dialogs.vala:2025
-#, c-format
+#: ../src/Dialogs.vala:2087
 msgid "To get started, import photos in any of these ways:"
 msgstr "시작 하시려면, 다음 중 하나의 방법으로 사진을 가져오십시오:"
 
-#: src/Dialogs.vala:2044
+#: ../src/Dialogs.vala:2106
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "<span weight=\"bold\">폴더에서 가져오기 %s</span> 선택"
 
-#: src/Dialogs.vala:2045
+#: ../src/Dialogs.vala:2107
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "샷웰 창으로 사진 끌어다 놓기"
 
-#: src/Dialogs.vala:2046
+#: ../src/Dialogs.vala:2108
 msgid "Connect a camera to your computer and import"
 msgstr "컴퓨터에 카메라를 연결한 후 가져오기"
 
-#: src/Dialogs.vala:2056
+#: ../src/Dialogs.vala:2118
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "%s 폴더에서 사진 가져오기(_I)"
 
-#: src/Dialogs.vala:2063
+#: ../src/Dialogs.vala:2125
 msgid "You can also import photos in any of these ways:"
 msgstr "다음 중 하나의 방법으로도 사진을 가져올 수 있습니다:"
 
-#: src/Dialogs.vala:2073
+#: ../src/Dialogs.vala:2135
 msgid "_Don't show this message again"
 msgstr "이 메시지 표시하지 않기(_D)"
 
-#: src/Dialogs.vala:2108
+#: ../src/Dialogs.vala:2170
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "라이브러리 %s에서 사진 가져오기"
 
-#: src/Dialogs.vala:2252 src/Dialogs.vala:2256
+#. We're installed system-wide, so use the system help.
+#. We're being run from the build directory; we'll have to handle clicks to this
+#. link manually ourselves, due to a limitation ghelp: URIs.
+#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
 msgid "(Help)"
 msgstr "(도움말)"
 
-#: src/Dialogs.vala:2265
+#: ../src/Dialogs.vala:2324
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "연%s월%s일"
 
-#: src/Dialogs.vala:2267
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth"
 msgstr "연%s월"
 
-#: src/Dialogs.vala:2269
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "연%s월-일"
 
-#: src/Dialogs.vala:2271
+#: ../src/Dialogs.vala:2330
 msgid "Year-Month-Day"
 msgstr "연-월-일"
 
-#: src/Dialogs.vala:2272 src/editing_tools/EditingTools.vala:777
+#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "사용자 설정"
 
-#: src/Dialogs.vala:2509
+#. Invalid pattern.
+#: ../src/Dialogs.vala:2568
 msgid "Invalid pattern"
 msgstr "부적절한 패턴"
 
-#: src/Dialogs.vala:2612
+#. This function is used to determine whether or not files should be copied or linked when imported.
+#. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
+#: ../src/Dialogs.vala:2670
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -1282,31 +2107,31 @@ msgstr ""
 "샷웰은 사진을 라이브러리 폴더로 복사할 수 있고 사진을 복사하지 않고 가져올 수"
 "도 있습니다."
 
-#: src/Dialogs.vala:2617
+#: ../src/Dialogs.vala:2675
 msgid "Co_py Photos"
 msgstr "사진 복사(_P)"
 
-#: src/Dialogs.vala:2618
+#: ../src/Dialogs.vala:2676
 msgid "_Import in Place"
 msgstr "복사하지 않고 가져오기(_I)"
 
-#: src/Dialogs.vala:2619
+#: ../src/Dialogs.vala:2677
 msgid "Import to Library"
 msgstr "라이브러리로 가져오기"
 
-#: src/Dialogs.vala:2629 src/PhotoPage.vala:3075
+#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
 msgid "Remove From Library"
 msgstr "라이브러리에서 제거"
 
-#: src/Dialogs.vala:2630 src/PhotoPage.vala:3075
+#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
 msgid "Removing Photo From Library"
 msgstr "사진을 라이브러리에서 제거하는 중"
 
-#: src/Dialogs.vala:2630
+#: ../src/Dialogs.vala:2688
 msgid "Removing Photos From Library"
 msgstr "사진을 라이브러리에서 제거하는 중"
 
-#: src/Dialogs.vala:2644
+#: ../src/Dialogs.vala:2702
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -1324,7 +2149,7 @@ msgstr[0] ""
 "\n"
 "이 동작은 취소할 수 없습니다."
 
-#: src/Dialogs.vala:2648
+#: ../src/Dialogs.vala:2706
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -1342,7 +2167,7 @@ msgstr[0] ""
 "\n"
 "이 동작은 취소할 수 없습니다."
 
-#: src/Dialogs.vala:2652
+#: ../src/Dialogs.vala:2710
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -1359,7 +2184,7 @@ msgstr[0] ""
 "로 옮기시겠습니까?\n"
 "이 동작은 취소할 수 없습니다."
 
-#: src/Dialogs.vala:2684
+#: ../src/Dialogs.vala:2742
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -1369,611 +2194,391 @@ msgstr[0] ""
 "사진/비디오 %d개를 데스크톱 휴지통으로 옮길 수 없습니다.이 파일을 삭제하시겠"
 "습니까?"
 
-#: src/Dialogs.vala:2701
+#. Alert the user that the files were not removed.
+#: ../src/Dialogs.vala:2759
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
 msgstr[0] "사진/비디오 %d개를 삭제할 수 없습니다."
 
-#: src/folders/Branch.vala:141
-msgid "Folders"
-msgstr "폴더"
+#: ../src/Dimensions.vala:23
+msgid "Width"
+msgstr "너비"
 
-#: src/tags/Branch.vala:127
-msgid "Tags"
-msgstr "태그"
+#: ../src/Dimensions.vala:26
+msgid "Height"
+msgstr "높이"
 
-#: src/BatchImport.vala:26
-msgid "Success"
-msgstr "성공"
+#. verify this is a directory
+#: ../src/DirectoryMonitor.vala:889
+#, c-format
+msgid "Unable to monitor %s: Not a directory (%s)"
+msgstr "%1$s을(를) 감시할 수 없습니다: 디렉터리 아님(%2$s)"
 
-#: src/BatchImport.vala:29
-msgid "File error"
-msgstr "파일 오류"
+#. if no name, pretty up the start time
+#: ../src/Event.vala:751
+#, c-format
+msgid "Event %s"
+msgstr "이벤트 %s"
 
-#: src/BatchImport.vala:32
-msgid "Unable to decode file"
-msgstr "파일을 해석할 수 없습니다"
+#: ../src/Exporter.vala:232
+#, c-format
+msgid "Unable to generate a temporary file for %s: %s"
+msgstr "%s의 임시 파일을 만들 수 없습니다: %s"
 
-#: src/BatchImport.vala:35
-msgid "Database error"
-msgstr "데이터베이스 오류"
+#: ../src/Exporter.vala:299
+msgid "Exporting"
+msgstr "내보내는 중"
 
-#: src/BatchImport.vala:38
-msgid "User aborted import"
-msgstr "사용자가 가져오기를 취소했습니다"
+#: ../src/Exporter.vala:317
+#, c-format
+msgid "File %s already exists.  Replace?"
+msgstr "파일 %s(이)가 이미 존재합니다. 바꾸시겠습니까?"
 
-#: src/BatchImport.vala:41
-msgid "Not a file"
-msgstr "파일 아님"
+#: ../src/Exporter.vala:319
+msgid "_Skip"
+msgstr "건너 뛰기(_S)"
 
-#: src/BatchImport.vala:44
-msgid "File already exists in database"
-msgstr "파일이 데이터베이스에 이미 존재함"
+#: ../src/Exporter.vala:319
+msgid "_Replace"
+msgstr "바꾸기(_R)"
 
-#: src/BatchImport.vala:47
-msgid "Unsupported file format"
-msgstr "지원하지 않는 파일 형식"
+#: ../src/Exporter.vala:319
+msgid "Replace _All"
+msgstr "모두 바꾸기(_A)"
 
-#: src/BatchImport.vala:50
-msgid "Not an image file"
-msgstr "이미지 파일 아님"
+#: ../src/Exporter.vala:319
+msgid "Export"
+msgstr "내보내기"
 
-#: src/BatchImport.vala:53
-msgid "Disk failure"
-msgstr "디스크 오류"
+#: ../src/MediaMonitor.vala:400
+#, c-format
+msgid "Unable to process monitoring updates: %s"
+msgstr "감시 업데이트를 처리할 수 없습니다: %s"
 
-#: src/BatchImport.vala:56
-msgid "Disk full"
-msgstr "디스크 꽉 참"
+#: ../src/MediaPage.vala:158
+msgid "Adjust the size of the thumbnails"
+msgstr "섬네일 크기를 조정합니다"
 
-#: src/BatchImport.vala:59
-msgid "Camera error"
-msgstr "카메라 오류"
+#: ../src/MediaPage.vala:340 ../src/PhotoPage.vala:2593
+#: ../src/Resources.vala:188 ../src/direct/DirectPhotoPage.vala:174
+msgid "Zoom _In"
+msgstr "확대(_I)"
 
-#: src/BatchImport.vala:62
-msgid "File write error"
-msgstr "파일 쓰기 오류"
+#: ../src/MediaPage.vala:341
+msgid "Increase the magnification of the thumbnails"
+msgstr "섬네일을 확대합니다"
 
-#: src/BatchImport.vala:65
-msgid "Corrupt image file"
-msgstr "문제가 있는 이미지 파일"
+#: ../src/MediaPage.vala:346 ../src/PhotoPage.vala:2599
+#: ../src/Resources.vala:189 ../src/direct/DirectPhotoPage.vala:180
+msgid "Zoom _Out"
+msgstr "축소(_O)"
+
+#: ../src/MediaPage.vala:347
+msgid "Decrease the magnification of the thumbnails"
+msgstr "섬네일을 축소합니다"
+
+#: ../src/MediaPage.vala:414
+msgid "Sort _Photos"
+msgstr "사진 정렬(_P)"
+
+#: ../src/MediaPage.vala:423
+msgid "_Play Video"
+msgstr "비디오 재생(_P)"
+
+#: ../src/MediaPage.vala:424
+msgid "Open the selected videos in the system video player"
+msgstr "시스템의 비디오 재생 프로그램으로 선택한 비디오 열기"
+
+#: ../src/MediaPage.vala:428 ../src/PhotoPage.vala:2642
+msgid "_Developer"
+msgstr "편집 프로그램(_D)"
+
+#: ../src/MediaPage.vala:440 ../src/camera/Branch.vala:99
+#: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
+#: ../src/photos/RawSupport.vala:303
+msgid "Camera"
+msgstr "카메라"
+
+#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:874
+msgid "_Titles"
+msgstr "제목(_T)"
 
-#: src/BatchImport.vala:68
+#: ../src/MediaPage.vala:452 ../src/camera/ImportPage.vala:875
+msgid "Display the title of each photo"
+msgstr "각 사진의 제목을 표시합니다"
+
+#: ../src/MediaPage.vala:457 ../src/events/EventsDirectoryPage.vala:130
+msgid "_Comments"
+msgstr "설명(_C)"
+
+#: ../src/MediaPage.vala:458
+msgid "Display the comment of each photo"
+msgstr "각 사진의 설명 표시"
+
+#: ../src/MediaPage.vala:469 ../src/library/LibraryWindow.vala:375
+msgid "Ta_gs"
+msgstr "태그(_G)"
+
+#: ../src/MediaPage.vala:470
+msgid "Display each photo's tags"
+msgstr "각 사진의 태그를 표시합니다"
+
+#: ../src/MediaPage.vala:486
+msgid "By _Title"
+msgstr "제목 순으로(_T)"
+
+#: ../src/MediaPage.vala:487
+msgid "Sort photos by title"
+msgstr "사진을 제목 순으로 정렬합니다"
+
+#: ../src/MediaPage.vala:492
+msgid "By Exposure _Date"
+msgstr "촬영 날짜 순(_D)"
+
+#: ../src/MediaPage.vala:493
+msgid "Sort photos by exposure date"
+msgstr "사진을 촬영 날짜 순으로 정렬합니다"
+
+#: ../src/MediaPage.vala:498
+msgid "By _Rating"
+msgstr "평점으로(_R)"
+
+#: ../src/MediaPage.vala:499
+msgid "Sort photos by rating"
+msgstr "평점 순으로 사진 정렬"
+
+#: ../src/MediaPage.vala:504
+msgid "By _Filename"
+msgstr "파일 이름으로(_F)"
+
+#: ../src/MediaPage.vala:505
+msgid "Sort photos by filename"
+msgstr "사진을 파일 이름 순으로 정렬합니다"
+
+#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:421
+msgid "_Ascending"
+msgstr "오름차순(_A)"
+
+#: ../src/MediaPage.vala:516 ../src/library/LibraryWindow.vala:422
+msgid "Sort photos in an ascending order"
+msgstr "사진을 오름차순으로 정렬합니다"
+
+#: ../src/MediaPage.vala:521 ../src/library/LibraryWindow.vala:428
+msgid "D_escending"
+msgstr "내림차순(_E)"
+
+#: ../src/MediaPage.vala:522 ../src/library/LibraryWindow.vala:429
+msgid "Sort photos in a descending order"
+msgstr "사진을 내림차순으로 정렬합니다"
+
+#: ../src/MediaPage.vala:723
 #, c-format
-msgid "Imported failed (%d)"
-msgstr "가져오기 실패(%d)"
+msgid ""
+"Shotwell was unable to play the selected video:\n"
+"%s"
+msgstr ""
+"샷웰이 선택한 비디오를 재생할 수 없습니다:\n"
+"%s"
+
+#: ../src/Page.vala:1263
+msgid "No photos/videos"
+msgstr "사진/비디오가 없음"
+
+#: ../src/Page.vala:1267
+msgid "No photos/videos found"
+msgstr "사진/비디오를 찾을 수 없습니다"
+
+#: ../src/Page.vala:2565
+msgid "Photos cannot be exported to this directory."
+msgstr "사진을 이 디렉터리로 내보낼 수 없습니다."
 
-#: src/Photo.vala:3656
+#: ../src/Photo.vala:3753
 msgid "modified"
 msgstr "수정함"
 
-#: src/PhotoPage.vala:532
+#. previous button
+#: ../src/PhotoPage.vala:533
 msgid "Previous photo"
 msgstr "이전 사진"
 
-#: src/PhotoPage.vala:537
+#. next button
+#: ../src/PhotoPage.vala:539
 msgid "Next photo"
 msgstr "다음 사진"
 
-#: src/PhotoPage.vala:1844
+#: ../src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "사진 파일을 찾을 수 없습니다: %s"
 
-#: src/PhotoPage.vala:2404 src/library/LibraryWindow.vala:360
-#: src/direct/DirectPhotoPage.vala:165
+#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
+#: ../src/library/LibraryWindow.vala:359
 msgid "_View"
 msgstr "보기(_V)"
 
-#: src/PhotoPage.vala:2408 src/direct/DirectPhotoPage.vala:81
+#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
 msgid "T_ools"
 msgstr "도구(_O)"
 
-#: src/PhotoPage.vala:2413 src/direct/DirectPhotoPage.vala:86
+#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
 msgid "_Previous Photo"
 msgstr "이전 사진(_P)"
 
-#: src/PhotoPage.vala:2414 src/direct/DirectPhotoPage.vala:87
+#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
 msgid "Previous Photo"
 msgstr "이전 사진"
 
-#: src/PhotoPage.vala:2419 src/direct/DirectPhotoPage.vala:92
+#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
 msgid "_Next Photo"
 msgstr "다음 사진(_N)"
 
-#: src/PhotoPage.vala:2420 src/direct/DirectPhotoPage.vala:93
+#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
 msgid "Next Photo"
 msgstr "다음 사진"
 
-#: src/PhotoPage.vala:2583 src/direct/DirectPhotoPage.vala:174
-#: src/MediaPage.vala:325
-msgid "Zoom _In"
-msgstr "확대(_I)"
-
-#: src/PhotoPage.vala:2584 src/direct/DirectPhotoPage.vala:175
+#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
 msgid "Increase the magnification of the photo"
 msgstr "사진 확대 배율 늘리기"
 
-#: src/PhotoPage.vala:2589 src/direct/DirectPhotoPage.vala:180
-#: src/MediaPage.vala:331
-msgid "Zoom _Out"
-msgstr "축소(_O)"
-
-#: src/PhotoPage.vala:2590 src/direct/DirectPhotoPage.vala:181
+#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
 msgid "Decrease the magnification of the photo"
 msgstr "사진 확대 배율 줄이기"
 
-#: src/PhotoPage.vala:2595 src/direct/DirectPhotoPage.vala:186
+#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
 msgid "Fit to _Page"
 msgstr "페이지에 맞추기(_P)"
 
-#: src/PhotoPage.vala:2596 src/direct/DirectPhotoPage.vala:187
+#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
 msgid "Zoom the photo to fit on the screen"
 msgstr "화면에 꼭 맞게 사진을 확대합니다"
 
-#: src/PhotoPage.vala:2601 src/direct/DirectPhotoPage.vala:192
+#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
+#, no-c-format
 msgid "Zoom _100%"
 msgstr "원본 크기로 확대(_1)"
 
-#: src/PhotoPage.vala:2602 src/direct/DirectPhotoPage.vala:193
-#, c-format
+#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
+#, no-c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "사진을 원본 크기로 확대합니다"
 
-#: src/PhotoPage.vala:2607 src/direct/DirectPhotoPage.vala:198
+#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
+#, no-c-format
 msgid "Zoom _200%"
 msgstr "원본 두 배 크기로 확대(_2)"
 
-#: src/PhotoPage.vala:2608 src/direct/DirectPhotoPage.vala:199
-#, c-format
+#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
+#, no-c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "사진을 원본 두 배 크기로 확대합니다"
 
-#: src/PhotoPage.vala:2628 src/MediaPage.vala:413
-msgid "_Developer"
-msgstr "편집 프로그램(_D)"
-
-#: src/PhotoPage.vala:3216
+#: ../src/PhotoPage.vala:3231
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "%s(을)를 내보낼 수 없습니다: %s"
 
-#: src/data_imports/DataImportsPluginHost.vala:65
-#: src/data_imports/DataImportsPluginHost.vala:78
-#, c-format
-msgid "%s Database"
-msgstr "%s 데이터 베이스"
-
-#: 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 "오류로 인해 %s에서 가져올 수 없습니다:"
-
-#: src/data_imports/DataImportsPluginHost.vala:151
-msgid "To try importing from another service, select one from the above menu."
-msgstr "다른 서비스에서 가져오려면 위 메뉴에서 하나를 선택해주십시오."
-
-#: src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr "데이터 가져오기"
-
-#: 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 ""
-"사용하고 있는 데이터 가져오기 플러그인이 없습니다.\n"
-"\n"
-"프로그램에서 가져오기 기능을 사용하려면 최소 하나 이상의 데이터 가져오기 플러"
-"그인을 사용해야 합니다. 플러그인은 기본 설정 대화 상자에서 사용하도록 설정할 "
-"수 있습니다."
-
-#: src/data_imports/DataImportsUI.vala:100
-msgid "Database file:"
-msgstr "데이터베이스 파일:"
-
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:899
-msgid "_Import"
-msgstr "가져오기(_I)"
-
-#: src/data_imports/DataImportsUI.vala:216
-msgid "Import From Application"
-msgstr "프로그램에서 가져오기"
-
-#: src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "프로그램에서 미디어 가져오기(_F):"
-
-#: src/data_imports/DataImportsUI.vala:394
-#: src/publishing/PublishingUI.vala:493
-msgid "_Close"
-msgstr "닫기(_C)"
-
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:182
-msgid "Settings"
-msgstr "설정"
-
-#: src/SlideshowPage.vala:141 src/Screensaver.vala:18
-msgid "Slideshow"
-msgstr "슬라이드 쇼"
-
-#: src/SlideshowPage.vala:161
-msgid "Back"
-msgstr "뒤로"
-
-#: src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "이전 사진으로 이동합니다"
-
-#: src/SlideshowPage.vala:168 src/SlideshowPage.vala:273
-msgid "Pause"
-msgstr "일시 중지"
-
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:274
-msgid "Pause the slideshow"
-msgstr "슬라이드 쇼 일시 정지"
-
-#: src/SlideshowPage.vala:175
-msgid "Next"
-msgstr "다음"
-
-#: src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "다음 사진으로 이동합니다"
-
-#: src/SlideshowPage.vala:183
-msgid "Change slideshow settings"
-msgstr "슬라이드 쇼 설정을 바꿉니다"
-
-#: src/SlideshowPage.vala:237
-msgid "All photo source files are missing."
-msgstr "모든 사진 파일을 찾을 수 없습니다."
-
-#: src/SlideshowPage.vala:269
-msgid "Play"
-msgstr "재생"
-
-#: src/SlideshowPage.vala:270
-msgid "Continue the slideshow"
-msgstr "슬라이드 쇼 계속하기"
-
-#: src/Commands.vala:733
-msgid "Reverting"
-msgstr "되돌리기"
-
-#: src/Commands.vala:733
-msgid "Undoing Revert"
-msgstr "되돌리기 취소"
-
-#: src/Commands.vala:777
-msgid "Enhancing"
-msgstr "화질 높이기"
-
-#: src/Commands.vala:777
-msgid "Undoing Enhance"
-msgstr "화질 높이기 취소"
-
-#: src/Commands.vala:845
-msgid "Applying Color Transformations"
-msgstr "색 변환을 적용하는 중"
-
-#: src/Commands.vala:845
-msgid "Undoing Color Transformations"
-msgstr "색 전환을 취소하는 중"
-
-#: src/Commands.vala:995
-msgid "Creating New Event"
-msgstr "새 이벤트 만들기"
-
-#: src/Commands.vala:996
-msgid "Removing Event"
-msgstr "이벤트 제거"
-
-#: src/Commands.vala:1005
-msgid "Moving Photos to New Event"
-msgstr "사진 새 이벤트로 옮기기"
-
-#: src/Commands.vala:1006
-msgid "Setting Photos to Previous Event"
-msgstr "사진을 이전 이벤트로 설정"
-
-#: src/Commands.vala:1063
-msgid "Merging"
-msgstr "합치기"
-
-#: src/Commands.vala:1064
-msgid "Unmerging"
-msgstr "합치기 취소"
-
-#: src/Commands.vala:1073
-msgid "Duplicating photos"
-msgstr "사진 복제"
-
-#: src/Commands.vala:1073
-msgid "Removing duplicated photos"
-msgstr "복제한 사진 삭제"
-
-#: src/Commands.vala:1096
-#, 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] "파일 오류로 사진 %d매를 복제할 수 없습니다"
-
-#: src/Commands.vala:1183
-msgid "Restoring previous rating"
-msgstr "이전 평점으로 되돌리기"
-
-#: src/Commands.vala:1193 src/Commands.vala:1194
-msgid "Increasing ratings"
-msgstr "평점 높이기"
-
-#: src/Commands.vala:1193 src/Commands.vala:1194
-msgid "Decreasing ratings"
-msgstr "평점 낮추기"
-
-#: src/Commands.vala:1244
-msgid "Setting RAW developer"
-msgstr "RAW 편집 프로그램 설정"
-
-#: src/Commands.vala:1244
-msgid "Restoring previous RAW developer"
-msgstr "이전 RAW 편집 프로그램 되돌리기"
-
-#: src/Commands.vala:1245
-msgid "Set Developer"
-msgstr "편집 프로그램 설정"
-
-#: src/Commands.vala:1335
-msgid "Original photo could not be adjusted."
-msgstr "원본 사진은 조정할 수 없습니다."
-
-#: src/Commands.vala:1356
-msgid "Adjusting Date and Time"
-msgstr "날짜와 시간 조정"
-
-#: src/Commands.vala:1356
-msgid "Undoing Date and Time Adjustment"
-msgstr "날짜 시간 조정 취소"
-
-#: src/Commands.vala:1387
-msgid "One original photo could not be adjusted."
-msgid_plural "The following original photos could not be adjusted."
-msgstr[0] "원본 사진은 조정할 수 없습니다."
-
-#: src/Commands.vala:1389 src/Commands.vala:1413
-msgid "Time Adjustment Error"
-msgstr "시간 조정 오류"
-
-#: src/Commands.vala:1411
-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] "다음 사진 파일에 적용한 시간 조정은 취소할 수 없습니다."
-
-#: src/Commands.vala:1625 src/Commands.vala:1648
-msgid "Create Tag"
-msgstr "태그 만들기"
-
-#: src/Commands.vala:1683
-#, c-format
-msgid "Move Tag \"%s\""
-msgstr "태그 \"%s\" 이동"
-
-#: src/Commands.vala:2335
-msgid "Move Photos to Trash"
-msgstr "사진 휴지통으로 보내기"
-
-#: src/Commands.vala:2335
-msgid "Restore Photos from Trash"
-msgstr "휴지통에 있는 사진 되살리기"
-
-#: src/Commands.vala:2336
-msgid "Move the photos to the Shotwell trash"
-msgstr "사진을 샷웰 휴지통으로 옮깁니다"
-
-#: src/Commands.vala:2336
-msgid "Restore the photos back to the Shotwell library"
-msgstr "휴지통에 있는 사진을 샷웰 라이브러리로 다시 가져옵니다"
-
-#: src/Commands.vala:2355
-msgid "Moving Photos to Trash"
-msgstr "사진을 휴지통으로 보내기"
-
-#: src/Commands.vala:2355
-msgid "Restoring Photos From Trash"
-msgstr "휴지통에 있는 사진 되살리기"
-
-#: src/Commands.vala:2441
-msgid "Flag selected photos"
-msgstr "선택한 사진 표시"
-
-#: src/Commands.vala:2442
-msgid "Unflag selected photos"
-msgstr "선택한 사진 표시 제거"
-
-#: src/Commands.vala:2443
-msgid "Flagging selected photos"
-msgstr "선택한 사진 표시"
-
-#: src/Commands.vala:2444
-msgid "Unflagging selected photos"
-msgstr "선택한 사진 표시 제거"
-
-#: src/Commands.vala:2451
-msgid "Flag"
-msgstr "표시"
-
-#: src/Commands.vala:2451
-msgid "Unflag"
-msgstr "표시 제거"
-
-#: src/photos/RawSupport.vala:134
-msgid "RAW"
-msgstr "RAW"
-
-#: src/photos/RawSupport.vala:297 src/MediaPage.vala:420
-msgid "Shotwell"
-msgstr "샷웰"
-
-#: src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr "BPM"
-
-#: src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
-
-#: src/photos/JfifSupport.vala:182
-#, c-format
-msgid "Low (%d%%)"
-msgstr "낮음(%d%%)"
-
-#: src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "중간(%d%%)"
-
-#: src/photos/JfifSupport.vala:188
-#, c-format
-msgid "High (%d%%)"
-msgstr "높음(%d%%)"
-
-#: src/photos/JfifSupport.vala:191
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "최대(%d%%)"
-
-#: src/photos/PngSupport.vala:30
-msgid "PNG"
-msgstr "PNG"
-
-#: src/photos/TiffSupport.vala:86
-msgid "TIFF"
-msgstr "TIFF"
-
-#: src/Page.vala:1268
-msgid "No photos/videos"
-msgstr "사진/비디오가 없음"
-
-#: src/Page.vala:1272
-msgid "No photos/videos found"
-msgstr "사진/비디오를 찾을 수 없습니다"
-
-#: src/Page.vala:2569
-msgid "Photos cannot be exported to this directory."
-msgstr "사진을 이 디렉터리로 내보낼 수 없습니다."
-
-#: src/MediaMonitor.vala:400
-#, c-format
-msgid "Unable to process monitoring updates: %s"
-msgstr "감시 업데이트를 처리할 수 없습니다: %s"
-
-#: src/Printing.vala:255
+#: ../src/Printing.vala:255
 msgid "Fill the entire page"
 msgstr "전체 페이지 채우기(_F)"
 
-#: src/Printing.vala:256
+#: ../src/Printing.vala:256
 msgid "2 images per page"
 msgstr "페이지 당 2장의 사진"
 
-#: src/Printing.vala:257
+#: ../src/Printing.vala:257
 msgid "4 images per page"
 msgstr "페이지 당 4장의 사진"
 
-#: src/Printing.vala:258
+#: ../src/Printing.vala:258
 msgid "6 images per page"
 msgstr "페이지 당 6장의 사진"
 
-#: src/Printing.vala:259
+#: ../src/Printing.vala:259
 msgid "8 images per page"
 msgstr "페이지 당 8장의 사진"
 
-#: src/Printing.vala:260
+#: ../src/Printing.vala:260
 msgid "16 images per page"
 msgstr "페이지 당 16장의 사진"
 
-#: src/Printing.vala:261
+#: ../src/Printing.vala:261
 msgid "32 images per page"
 msgstr "페이지 당 32장의 사진"
 
-#: src/Printing.vala:348
+#: ../src/Printing.vala:348
 msgid "in."
 msgstr "인치."
 
-#: src/Printing.vala:349
+#: ../src/Printing.vala:349
 msgid "cm"
 msgstr "센티미터"
 
-#: src/Printing.vala:817 src/editing_tools/EditingTools.vala:757
+#: ../src/Printing.vala:817 ../src/editing_tools/EditingTools.vala:761
 msgid "Wallet (2 x 3 in.)"
 msgstr "지갑(2 x 3 인치)"
 
-#: src/Printing.vala:820 src/editing_tools/EditingTools.vala:758
+#: ../src/Printing.vala:820 ../src/editing_tools/EditingTools.vala:762
 msgid "Notecard (3 x 5 in.)"
 msgstr "노트 카드(3 x 5 인치)"
 
-#: src/Printing.vala:823 src/editing_tools/EditingTools.vala:759
+#: ../src/Printing.vala:823 ../src/editing_tools/EditingTools.vala:763
 msgid "4 x 6 in."
 msgstr "4 x 6 인치"
 
-#: src/Printing.vala:826 src/editing_tools/EditingTools.vala:760
+#: ../src/Printing.vala:826 ../src/editing_tools/EditingTools.vala:764
 msgid "5 x 7 in."
 msgstr "5 x 7 인치"
 
-#: src/Printing.vala:829 src/editing_tools/EditingTools.vala:761
+#: ../src/Printing.vala:829 ../src/editing_tools/EditingTools.vala:765
 msgid "8 x 10 in."
 msgstr "8 x 10 인치"
 
-#: src/Printing.vala:832 src/editing_tools/EditingTools.vala:763
+#: ../src/Printing.vala:832 ../src/editing_tools/EditingTools.vala:767
 msgid "11 x 14 in."
 msgstr "11 x 14 인치"
 
-#: src/Printing.vala:835 src/editing_tools/EditingTools.vala:765
+#: ../src/Printing.vala:835 ../src/editing_tools/EditingTools.vala:769
 msgid "16 x 20 in."
 msgstr "16 x 20 인치"
 
-#: src/Printing.vala:841 src/editing_tools/EditingTools.vala:767
+#: ../src/Printing.vala:841 ../src/editing_tools/EditingTools.vala:771
 msgid "Metric Wallet (9 x 13 cm)"
 msgstr "Metric Wallet(9 x 13 cm)"
 
-#: src/Printing.vala:844 src/editing_tools/EditingTools.vala:768
+#: ../src/Printing.vala:844 ../src/editing_tools/EditingTools.vala:772
 msgid "Postcard (10 x 15 cm)"
 msgstr "엽서(10 x 15 cm)"
 
-#: src/Printing.vala:847 src/editing_tools/EditingTools.vala:769
+#: ../src/Printing.vala:847 ../src/editing_tools/EditingTools.vala:773
 msgid "13 x 18 cm"
 msgstr "13 x 18 cm"
 
-#: src/Printing.vala:850 src/editing_tools/EditingTools.vala:770
+#: ../src/Printing.vala:850 ../src/editing_tools/EditingTools.vala:774
 msgid "18 x 24 cm"
 msgstr "18 x 24 cm"
 
-#: src/Printing.vala:853 src/editing_tools/EditingTools.vala:772
+#: ../src/Printing.vala:853 ../src/editing_tools/EditingTools.vala:776
 msgid "20 x 30 cm"
 msgstr "20 x 30 cm"
 
-#: src/Printing.vala:856 src/editing_tools/EditingTools.vala:773
+#: ../src/Printing.vala:856 ../src/editing_tools/EditingTools.vala:777
 msgid "24 x 40 cm"
 msgstr "24 x 40 cm"
 
-#: src/Printing.vala:859 src/editing_tools/EditingTools.vala:774
+#: ../src/Printing.vala:859 ../src/editing_tools/EditingTools.vala:778
 msgid "30 x 40 cm"
 msgstr "30 x 40 cm"
 
-#: src/Printing.vala:875
+#: ../src/Printing.vala:875
 msgid "Image Settings"
 msgstr "이미지 설정"
 
-#: src/Printing.vala:888
+#: ../src/Printing.vala:888
 msgid "Printing..."
 msgstr "인쇄..."
 
-#: src/Printing.vala:908 src/Printing.vala:1111
+#: ../src/Printing.vala:908 ../src/Printing.vala:1111
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -1984,1522 +2589,1892 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
-msgstr "사진 데이터 베이스 %s을(를) 만들 수 없습니다: 오류 코드 %d"
+#: ../src/Properties.vala:84
+msgid "Today"
+msgstr "오늘"
 
-#: src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
-msgstr ""
-"사진 데이터베이스 파일에 쓸 수 없습니다:\n"
-"%s"
+#: ../src/Properties.vala:86
+msgid "Yesterday"
+msgstr "어제"
 
-#: src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
-msgstr ""
-"데이터베이스 파일에 접근할 수 없습니다:\n"
-" %s\n"
-"\n"
-"오류: \n"
-"%s"
+#: ../src/Properties.vala:227 ../src/camera/ImportPage.vala:312
+msgid "RAW+JPEG"
+msgstr "RAW+JPEG"
 
-#: src/VideoSupport.vala:464
-msgid "Export Videos"
-msgstr "비디오 내보내기"
+#: ../src/Properties.vala:343
+msgid "Items:"
+msgstr "항목:"
 
-#: src/DesktopIntegration.vala:118
+#: ../src/Properties.vala:346
 #, c-format
-msgid "Unable to launch Nautilus Send-To: %s"
-msgstr "노틸러스 보내기를 실행할 수 없습니다: %s"
-
-#: src/DesktopIntegration.vala:126
-msgid "Send To"
-msgstr "보내기"
+msgid "%d Event"
+msgid_plural "%d Events"
+msgstr[0] "이벤트 %d개"
 
-#: src/DesktopIntegration.vala:171
+#: ../src/Properties.vala:353 ../src/events/EventDirectoryItem.vala:87
 #, c-format
-msgid "Unable to export background to %s: %s"
-msgstr "배경을 %s(으)로 내보낼 수 없습니다: %s"
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] "사진 %d장"
 
-#: src/DesktopIntegration.vala:299
+#: ../src/Properties.vala:355 ../src/events/EventDirectoryItem.vala:85
 #, c-format
-msgid "Unable to prepare desktop slideshow: %s"
-msgstr "데스크톱 슬라이드 쇼를 준비할 수 없습니다: %s"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:587
-#: src/SearchFilter.vala:588 src/SearchFilter.vala:990
-msgid "Flagged"
-msgstr "표시함"
-
-#: src/library/TrashPage.vala:8
-msgid "Trash"
-msgstr "휴지통"
-
-#: src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "휴지통이 비어있습니다"
-
-#: src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "삭제"
-
-#: src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-msgstr "사진 삭제"
-
-#: src/library/OfflinePage.vala:8
-msgid "Missing Files"
-msgstr "찾을 수 없는 파일"
-
-#: src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "삭제하는 중..."
-
-#: src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "최근 가져온 항목"
-
-#: src/library/LibraryWindow.vala:301
-msgid "_Import From Folder..."
-msgstr "폴더에서 가져오기(_I)..."
-
-#: src/library/LibraryWindow.vala:302
-msgid "Import photos from disk to library"
-msgstr "사진을 디스크에서 라이브러리로 가져옵니다"
-
-#: src/library/LibraryWindow.vala:309
-msgid "Import From _Application..."
-msgstr "프로그램에서 가져오기(_A)..."
-
-#: src/library/LibraryWindow.vala:313
-msgid "Sort _Events"
-msgstr "이벤트 정렬(_E)"
-
-#: src/library/LibraryWindow.vala:323
-msgid "Empty T_rash"
-msgstr "휴지통 비우기(_R)"
-
-#: src/library/LibraryWindow.vala:324
-msgid "Delete all photos in the trash"
-msgstr "휴지통 안의 모든 사진을 지움"
-
-#: src/library/LibraryWindow.vala:329
-msgid "View Eve_nt for Photo"
-msgstr "사진 이벤트 보기(_N)"
-
-#: src/library/LibraryWindow.vala:334
-msgid "_Find"
-msgstr "찾기(_F)"
-
-#: src/library/LibraryWindow.vala:335
-msgid "Find photos and videos by search criteria"
-msgstr "검색 기준에 따라 사진과 비디오를 찾아봅니다"
-
-#: src/library/LibraryWindow.vala:352 src/direct/DirectPhotoPage.vala:46
-msgid "_File"
-msgstr "파일(_F)"
-
-#: src/library/LibraryWindow.vala:356 src/direct/DirectPhotoPage.vala:73
-msgid "_Edit"
-msgstr "편집(_E)"
-
-#: src/library/LibraryWindow.vala:364 src/direct/DirectPhotoPage.vala:77
-msgid "_Photo"
-msgstr "사진(_P)"
-
-#: src/library/LibraryWindow.vala:368
-msgid "_Photos"
-msgstr "사진(_P)"
-
-#: src/library/LibraryWindow.vala:372
-msgid "Even_ts"
-msgstr "이벤트(_T)"
-
-#: src/library/LibraryWindow.vala:376 src/MediaPage.vala:454
-msgid "Ta_gs"
-msgstr "태그(_G)"
-
-#: src/library/LibraryWindow.vala:380 src/direct/DirectPhotoPage.vala:169
-msgid "_Help"
-msgstr "도움말(_H)"
-
-#: src/library/LibraryWindow.vala:391
-msgid "_Basic Information"
-msgstr "기본 정보(_B)"
-
-#: src/library/LibraryWindow.vala:392
-msgid "Display basic information for the selection"
-msgstr "선택한 사진의 기본 정보를 표시합니다"
-
-#: src/library/LibraryWindow.vala:397
-msgid "E_xtended Information"
-msgstr "확장 정보(_X)"
-
-#: src/library/LibraryWindow.vala:398
-msgid "Display extended information for the selection"
-msgstr "선택한 사진의 확장 정보를 표시합니다"
-
-#: src/library/LibraryWindow.vala:403
-msgid "_Search Bar"
-msgstr "검색 표시줄(_S)"
-
-#: src/library/LibraryWindow.vala:404
-msgid "Display the search bar"
-msgstr "검색 표시줄 표시"
-
-#: src/library/LibraryWindow.vala:409
-msgid "S_idebar"
-msgstr "사이드바(_I)"
-
-#: src/library/LibraryWindow.vala:410
-msgid "Display the sidebar"
-msgstr "사이드바 표시"
-
-#: src/library/LibraryWindow.vala:422 src/MediaPage.vala:494
-msgid "_Ascending"
-msgstr "오름차순(_A)"
-
-#: src/library/LibraryWindow.vala:423 src/MediaPage.vala:495
-msgid "Sort photos in an ascending order"
-msgstr "사진을 오름차순으로 정렬합니다"
-
-#: src/library/LibraryWindow.vala:429 src/MediaPage.vala:500
-msgid "D_escending"
-msgstr "내림차순(_E)"
-
-#: src/library/LibraryWindow.vala:430 src/MediaPage.vala:501
-msgid "Sort photos in a descending order"
-msgstr "사진을 내림차순으로 정렬합니다"
+msgid "%d Video"
+msgid_plural "%d Videos"
+msgstr[0] "비디오 %d편"
 
-#: src/library/LibraryWindow.vala:668
-msgid "Import From Folder"
-msgstr "폴더에서 가져오기"
+#. display only one date if start and end are the same
+#: ../src/Properties.vala:377
+msgid "Date:"
+msgstr "날짜:"
 
-#: src/library/LibraryWindow.vala:737
-msgid "Empty Trash"
-msgstr "휴지통 비우기"
+#. display only one time if start and end are the same
+#: ../src/Properties.vala:381
+msgid "Time:"
+msgstr "시간:"
 
-#: src/library/LibraryWindow.vala:737
-msgid "Emptying Trash..."
-msgstr "휴지통을 비우는 중..."
+#. display time range
+#. display date range
+#: ../src/Properties.vala:384 ../src/Properties.vala:389
+msgid "From:"
+msgstr "시작:"
 
-#: src/library/LibraryWindow.vala:896
-msgid "Shotwell is configured to import photos to your home directory.\n"
-msgstr "샷웰이 사진을 사용자 홈 디렉터리로 가져오도록 설정했습니다.\n"
+#: ../src/Properties.vala:385 ../src/Properties.vala:390
+msgid "To:"
+msgstr "끝:"
 
-#: src/library/LibraryWindow.vala:899
-msgid "Library Location"
-msgstr "라이브러리 위치"
+#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1890
+msgid "Size:"
+msgstr "크기:"
 
-#: src/library/LibraryWindow.vala:912
-msgid "Photos cannot be imported from this directory."
-msgstr "이 디렉터리에서 사진을 가져올 수 없습니다."
+#: ../src/Properties.vala:404
+msgid "Duration:"
+msgstr "재생 시간:"
 
-#: src/library/LibraryWindow.vala:1200
+#: ../src/Properties.vala:404
 #, c-format
-msgid "%s (%d%%)"
-msgstr "%s (%d%%)"
-
-#: src/library/LibraryWindow.vala:1244 src/library/LibraryWindow.vala:1255
-msgid "Updating library..."
-msgstr "라이브러리 업데이트 중..."
-
-#: src/library/LibraryWindow.vala:1261
-msgid "Preparing to auto-import photos..."
-msgstr "사진을 자동으로 가져올 준비를 하는 중..."
-
-#: src/library/LibraryWindow.vala:1266
-msgid "Auto-importing photos..."
-msgstr "사진을 자동으로 가져오는 중..."
-
-#: src/library/LibraryWindow.vala:1274
-msgid "Writing metadata to files..."
-msgstr "파일에 메타 정보 쓰는 중..."
-
-#: src/library/Branch.vala:37
-msgid "Library"
-msgstr "라이브러리"
+msgid "%.1f seconds"
+msgstr "%.1f초"
 
-#: src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "가져오는 중..."
+#: ../src/Properties.vala:408
+msgid "Developer:"
+msgstr "편집 프로그램:"
 
-#: src/library/ImportQueuePage.vala:66
-msgid "_Stop Import"
-msgstr "가져오기 중지(_S)"
+#. fit both on the top line, emit and move on
+#: ../src/Properties.vala:436 ../src/Properties.vala:440
+#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2258
+msgid "Exposure:"
+msgstr "노출:"
 
-#: src/library/ImportQueuePage.vala:67
-msgid "Stop importing photos"
-msgstr "사진 가져오기를 중지합니다"
+#. nothing special to be done for now for Events
+#: ../src/Properties.vala:583
+msgid "Location:"
+msgstr "위치:"
 
-#: src/library/ImportQueuePage.vala:123
-msgid "Preparing to import..."
-msgstr "가져오기 준비 중..."
+#: ../src/Properties.vala:586
+msgid "File size:"
+msgstr "파일 크기:"
 
-#: src/library/ImportQueuePage.vala:150
-#, c-format
-msgid "Imported %s"
-msgstr "%s 가져옴"
+#: ../src/Properties.vala:590
+msgid "Current Development:"
+msgstr "현재 편집 프로그램:"
 
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:413
-msgid "_Save"
-msgstr "저장(_S)"
+#: ../src/Properties.vala:592
+msgid "Original dimensions:"
+msgstr "원래 크기:"
 
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "사진 저장"
+#: ../src/Properties.vala:595
+msgid "Camera make:"
+msgstr "카메라 제조사:"
 
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "다른 이름으로 저장(_A)..."
+#: ../src/Properties.vala:598
+msgid "Camera model:"
+msgstr "카메라 모델:"
 
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "사진을 다른 이름으로 저장합니다"
+#: ../src/Properties.vala:601
+msgid "Flash:"
+msgstr "플래시:"
 
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "컴퓨터와 연결한 프린터로 사진을 인쇄합니다"
+#: ../src/Properties.vala:603
+msgid "Focal length:"
+msgstr "초점 거리:"
 
-#: src/direct/DirectPhotoPage.vala:223
-#, c-format
-msgid "%s does not exist."
-msgstr "%s(이)가 존재하지 않습니다."
+#: ../src/Properties.vala:606
+msgid "Exposure date:"
+msgstr "촬영 날짜:"
 
-#: src/direct/DirectPhotoPage.vala:225
-#, c-format
-msgid "%s is not a file."
-msgstr "%s(은)는 파일이 아닙니다."
+#: ../src/Properties.vala:609
+msgid "Exposure time:"
+msgstr "촬영 시간:"
 
-#: src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr ""
-"%s(이)가 다음의 파일 형식을 지원하지 않습니다\n"
-"%s."
+#: ../src/Properties.vala:612
+msgid "Exposure bias:"
+msgstr "노출 보정:"
 
-#: src/direct/DirectPhotoPage.vala:413
-msgid "_Save a Copy"
-msgstr "사본 저장(_S)"
+#: ../src/Properties.vala:614
+msgid "GPS latitude:"
+msgstr "GPS 위도:"
 
-#: src/direct/DirectPhotoPage.vala:416
-#, c-format
-msgid "Lose changes to %s?"
-msgstr "%sd에 바뀐 점을 버리시겠습니까?"
+#: ../src/Properties.vala:617
+msgid "GPS longitude:"
+msgstr "GPS 경도:"
 
-#: src/direct/DirectPhotoPage.vala:417
-msgid "Close _without Saving"
-msgstr "저장하지 않고 닫기(_W)"
+#: ../src/Properties.vala:620
+msgid "Artist:"
+msgstr "아티스트:"
 
-#: src/direct/DirectPhotoPage.vala:450
-#, c-format
-msgid "Error while saving to %s: %s"
-msgstr "%s(으)로 저장하는 중 오류 발생: %s"
+#: ../src/Properties.vala:622
+msgid "Copyright:"
+msgstr "저작권:"
 
-#: src/direct/DirectPhotoPage.vala:478 src/direct/DirectPhotoPage.vala:499
-msgid "Save As"
-msgstr "다른 이름으로 저장"
+#: ../src/Properties.vala:624
+msgid "Software:"
+msgstr "소프트웨어:"
 
-#: src/DirectoryMonitor.vala:889
-#, c-format
-msgid "Unable to monitor %s: Not a directory (%s)"
-msgstr "%1$s을(를) 감시할 수 없습니다: 디렉터리 아님(%2$s)"
+#: ../src/Properties.vala:639
+msgid "Extended Information"
+msgstr "확장 정보"
 
-#: src/Resources.vala:17
+#: ../src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "사진 관리자"
 
-#: src/Resources.vala:18
+#: ../src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "사진 보기"
 
-#: src/Resources.vala:27 plugins/shotwell-publishing/YouTubePublishing.vala:32
-#: plugins/shotwell-publishing/FlickrPublishing.vala:34
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:32
-#: plugins/shotwell-publishing/PicasaPublishing.vala:32
-#: plugins/shotwell-publishing/FacebookPublishing.vala:32
-#: plugins/shotwell-data-imports/FSpotImporter.vala:34
-msgid "Copyright 2009-2013 Yorba Foundation"
-msgstr "Copyright 2009-2013 Yorba Foundation"
-
-#: src/Resources.vala:144
+#: ../src/Resources.vala:144
 msgid "Rotate _Right"
 msgstr "오른쪽으로 회전(_R)"
 
-#: src/Resources.vala:145 src/Resources.vala:150
+#: ../src/Resources.vala:145 ../src/Resources.vala:150
 msgid "Rotate"
 msgstr "회전"
 
-#: src/Resources.vala:146
+#: ../src/Resources.vala:146
 msgid "Rotate Right"
 msgstr "오른쪽으로 회전"
 
-#: src/Resources.vala:147
+#: ../src/Resources.vala:147
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "사진을 오른쪽으로 회전(컨트롤을 누르면 왼쪽으로 회전)"
 
-#: src/Resources.vala:149
+#: ../src/Resources.vala:149
 msgid "Rotate _Left"
 msgstr "왼쪽으로 회전(_L)"
 
-#: src/Resources.vala:151
+#: ../src/Resources.vala:151
 msgid "Rotate Left"
 msgstr "왼쪽으로 회전"
 
-#: src/Resources.vala:152
+#: ../src/Resources.vala:152
 msgid "Rotate the photos left"
 msgstr "사진을 왼쪽으로 회전합니다"
 
-#: src/Resources.vala:154
+#: ../src/Resources.vala:154
 msgid "Flip Hori_zontally"
 msgstr "좌우로 뒤집기(_Z)"
 
-#: src/Resources.vala:155
+#: ../src/Resources.vala:155
 msgid "Flip Horizontally"
 msgstr "좌우로 뒤집기"
 
-#: src/Resources.vala:157
+#: ../src/Resources.vala:157
 msgid "Flip Verti_cally"
 msgstr "상하로 뒤집기(_C)"
 
-#: src/Resources.vala:158
+#: ../src/Resources.vala:158
 msgid "Flip Vertically"
 msgstr "상하로 뒤집기"
 
-#: src/Resources.vala:160
+#: ../src/Resources.vala:160
+msgid "_About"
+msgstr "정보(_A)"
+
+#: ../src/Resources.vala:161
+msgid "_Apply"
+msgstr "적용(_A)"
+
+#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
+#: ../src/library/LibraryWindow.vala:355
+msgid "_Edit"
+msgstr "편집(_E)"
+
+#: ../src/Resources.vala:165
+msgid "_Forward"
+msgstr "앞으로(_F)"
+
+#: ../src/Resources.vala:166
+msgid "Fulls_creen"
+msgstr "전체 화면(_C)"
+
+#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
+#: ../src/library/LibraryWindow.vala:379
+msgid "_Help"
+msgstr "도움말(_H)"
+
+#: ../src/Resources.vala:168
+msgid "Leave _Fullscreen"
+msgstr "전체 화면 나가기(_F)"
+
+#: ../src/Resources.vala:169 ../src/Resources.vala:371
+msgid "_New"
+msgstr "새 항목(_N)"
+
+#: ../src/Resources.vala:170
+msgid "_Next"
+msgstr "다음(_N)"
+
+#: ../src/Resources.vala:171
+msgid "_OK"
+msgstr "확인(_O)"
+
+#: ../src/Resources.vala:172
+msgid "_Play"
+msgstr "재생(_P)"
+
+#: ../src/Resources.vala:173 ../src/Resources.vala:325
+msgid "_Preferences"
+msgstr "기본 설정(_P)"
+
+#: ../src/Resources.vala:174
+msgid "_Previous"
+msgstr "이전(_P)"
+
+#: ../src/Resources.vala:175
+msgid "_Print"
+msgstr "인쇄(_P)"
+
+#: ../src/Resources.vala:176
+msgid "_Quit"
+msgstr "끝내기(_Q)"
+
+#: ../src/Resources.vala:177
+msgid "_Refresh"
+msgstr "새로 고침(_R)"
+
+#: ../src/Resources.vala:179
+msgid "_Revert"
+msgstr "되돌리기(_R)"
+
+#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save"
+msgstr "저장(_S)"
+
+#: ../src/Resources.vala:181
+msgid "Save _As"
+msgstr "다른 이름으로 저장(_A)"
+
+#: ../src/Resources.vala:182
+msgid "Sort _Ascending"
+msgstr "오름차순 정렬 (_A)"
+
+#: ../src/Resources.vala:183
+msgid "Sort _Descending"
+msgstr "내림차순 정렬(_D)"
+
+#: ../src/Resources.vala:184
+msgid "_Stop"
+msgstr "멈춤(_S)"
+
+#: ../src/Resources.vala:185
+msgid "_Undelete"
+msgstr "삭제 취소(_U)"
+
+#: ../src/Resources.vala:186
+msgid "_Normal Size"
+msgstr "보통 크기(_N)"
+
+#: ../src/Resources.vala:187
+msgid "Best _Fit"
+msgstr "화면에 맞추기(_F)"
+
+#: ../src/Resources.vala:191
 msgid "_Enhance"
 msgstr "화질 강화(_E)"
 
-#: src/Resources.vala:161
+#: ../src/Resources.vala:192
 msgid "Enhance"
 msgstr "화질 강화"
 
-#: src/Resources.vala:162
+#: ../src/Resources.vala:193
 msgid "Automatically improve the photo's appearance"
 msgstr "사진의 화질을 자동으로 개선합니다"
 
-#: src/Resources.vala:164
+#: ../src/Resources.vala:195
 msgid "_Copy Color Adjustments"
 msgstr "색 조절 복사(_C)"
 
-#: src/Resources.vala:165
+#: ../src/Resources.vala:196
 msgid "Copy Color Adjustments"
 msgstr "색 조절 복사"
 
-#: src/Resources.vala:166
+#: ../src/Resources.vala:197
 msgid "Copy the color adjustments applied to the photo"
 msgstr "사진에 적용한 색 조절 복사"
 
-#: src/Resources.vala:168
+#: ../src/Resources.vala:199
 msgid "_Paste Color Adjustments"
 msgstr "색 조절 붙여넣기(_P)"
 
-#: src/Resources.vala:169
+#: ../src/Resources.vala:200
 msgid "Paste Color Adjustments"
 msgstr "색 조절 붙여넣기"
 
-#: src/Resources.vala:170
+#: ../src/Resources.vala:201
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "선택한 사진에 복사한 색 조정을 적용합니다."
 
-#: src/Resources.vala:172
+#: ../src/Resources.vala:203
 msgid "_Crop"
 msgstr "잘라내기(_C)"
 
-#: src/Resources.vala:173
+#: ../src/Resources.vala:204
 msgid "Crop"
 msgstr "잘라내기"
 
-#: src/Resources.vala:174
+#: ../src/Resources.vala:205
 msgid "Crop the photo's size"
 msgstr "사진을 잘라냅니다"
 
-#: src/Resources.vala:176 src/editing_tools/StraightenTool.vala:100
+#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
 msgid "_Straighten"
 msgstr "바로잡기(_S)"
 
-#: src/Resources.vala:177
+#: ../src/Resources.vala:208
 msgid "Straighten"
 msgstr "바로잡기"
 
-#: src/Resources.vala:178
+#: ../src/Resources.vala:209
 msgid "Straighten the photo"
 msgstr "사진 바로잡기"
 
-#: src/Resources.vala:180
+#: ../src/Resources.vala:211
 msgid "_Red-eye"
 msgstr "적목 현상(_R)"
 
-#: src/Resources.vala:181
+#: ../src/Resources.vala:212
 msgid "Red-eye"
 msgstr "적목"
 
-#: src/Resources.vala:182
+#: ../src/Resources.vala:213
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "사진의 적목 현상을 줄이거나 제거합니다"
 
-#: src/Resources.vala:184
+#: ../src/Resources.vala:215
 msgid "_Adjust"
 msgstr "조정(_A)"
 
-#: src/Resources.vala:185
+#: ../src/Resources.vala:216
 msgid "Adjust"
 msgstr "조정"
 
-#: src/Resources.vala:186
+#: ../src/Resources.vala:217
 msgid "Adjust the photo's color and tone"
 msgstr "사진의 색과 색조를 조정합니다"
 
-#: src/Resources.vala:188
+#: ../src/Resources.vala:219
 msgid "Re_vert to Original"
 msgstr "원래 이미지로 돌려놓기(_V)"
 
-#: src/Resources.vala:189
+#: ../src/Resources.vala:220
 msgid "Revert to Original"
 msgstr "원래 이미지로 돌려놓기"
 
-#: src/Resources.vala:191
+#: ../src/Resources.vala:222
 msgid "Revert External E_dits"
 msgstr "외부 편집기로 편집한 것 되돌리기(_D)"
 
-#: src/Resources.vala:192
+#: ../src/Resources.vala:223
 msgid "Revert to the master photo"
 msgstr "마스터 사진으로 되돌리기"
 
-#: src/Resources.vala:194
+#: ../src/Resources.vala:225
 msgid "Set as _Desktop Background"
 msgstr "데스크톱 배경 화면으로 설정(_D)"
 
-#: src/Resources.vala:195
+#: ../src/Resources.vala:226
 msgid "Set selected image to be the new desktop background"
 msgstr "선택한 그림을 새 데스크톱 배경으로 설정합니다"
 
-#: src/Resources.vala:196
+#: ../src/Resources.vala:227
 msgid "Set as _Desktop Slideshow..."
 msgstr "데스크톱 슬라이드 쇼로 설정(_D)..."
 
-#: src/Resources.vala:198
+#: ../src/Resources.vala:229
 msgid "_Undo"
 msgstr "실행 취소(_U)"
 
-#: src/Resources.vala:199
+#: ../src/Resources.vala:230
 msgid "Undo"
 msgstr "실행 취소"
 
-#: src/Resources.vala:201
+#: ../src/Resources.vala:232
 msgid "_Redo"
 msgstr "다시 실행(_R)"
 
-#: src/Resources.vala:202
+#: ../src/Resources.vala:233
 msgid "Redo"
 msgstr "다시 실행"
 
-#: src/Resources.vala:204
+#: ../src/Resources.vala:235
 msgid "Re_name Event..."
 msgstr "이벤트 이름 바꾸기(_N)..."
 
-#: src/Resources.vala:207
+#: ../src/Resources.vala:238
 msgid "Make _Key Photo for Event"
 msgstr "이벤트 대표 사진으로 사용(_K)"
 
-#: src/Resources.vala:208
+#: ../src/Resources.vala:239
 msgid "Make Key Photo for Event"
 msgstr "이 사진을 이벤트를 대표하는 사진으로 사용합니다"
 
-#: src/Resources.vala:210
+#: ../src/Resources.vala:241
 msgid "_New Event"
 msgstr "새 이벤트(_N)"
 
-#: src/Resources.vala:211
+#: ../src/Resources.vala:242
 msgid "New Event"
 msgstr "새 이벤트"
 
-#: src/Resources.vala:213
+#: ../src/Resources.vala:244
 msgid "Move Photos"
 msgstr "사진 이동"
 
-#: src/Resources.vala:214
+#: ../src/Resources.vala:245
 msgid "Move photos to an event"
 msgstr "사진을 이벤트로 옮기기"
 
-#: src/Resources.vala:216
+#: ../src/Resources.vala:247
 msgid "_Merge Events"
 msgstr "이벤트 합치기(_M)"
 
-#: src/Resources.vala:217
+#: ../src/Resources.vala:248
 msgid "Merge"
 msgstr "합치기"
 
-#: src/Resources.vala:218
+#: ../src/Resources.vala:249
 msgid "Combine events into a single event"
 msgstr "이벤트를 단일 이벤트로 합치기"
 
-#: src/Resources.vala:220
+#: ../src/Resources.vala:251
 msgid "_Set Rating"
 msgstr "평점 설정(_S)"
 
-#: src/Resources.vala:221
+#: ../src/Resources.vala:252
 msgid "Set Rating"
 msgstr "평점 설정"
 
-#: src/Resources.vala:222
+#: ../src/Resources.vala:253
 msgid "Change the rating of your photo"
 msgstr "사진의 평점을 바꿉니다"
 
-#: src/Resources.vala:224
+#: ../src/Resources.vala:255
 msgid "_Increase"
 msgstr "높이기(_I)"
 
-#: src/Resources.vala:225
+#: ../src/Resources.vala:256
 msgid "Increase Rating"
 msgstr "평점 높이기"
 
-#: src/Resources.vala:227
+#: ../src/Resources.vala:258
 msgid "_Decrease"
 msgstr "낮추기(_D)"
 
-#: src/Resources.vala:228
+#: ../src/Resources.vala:259
 msgid "Decrease Rating"
 msgstr "평점 낮추기"
 
-#: src/Resources.vala:230
+#: ../src/Resources.vala:261
 msgid "_Unrated"
 msgstr "평점 없음(_U)"
 
-#: src/Resources.vala:231
+#: ../src/Resources.vala:262
 msgid "Unrated"
 msgstr "평점 지정 안 함"
 
-#: src/Resources.vala:232
+#: ../src/Resources.vala:263
 msgid "Rate Unrated"
 msgstr "평점 없는 것으로 설정"
 
-#: src/Resources.vala:233
+#: ../src/Resources.vala:264
 msgid "Setting as unrated"
 msgstr "평점 없는 것으로 설정"
 
-#: src/Resources.vala:234
+#: ../src/Resources.vala:265
 msgid "Remove any ratings"
 msgstr "모든 평점 제거"
 
-#: src/Resources.vala:236
+#: ../src/Resources.vala:267
 msgid "_Rejected"
 msgstr "등급 외(_R)"
 
-#: src/Resources.vala:237
+#: ../src/Resources.vala:268
 msgid "Rejected"
 msgstr "등급 외"
 
-#: src/Resources.vala:238
+#: ../src/Resources.vala:269
 msgid "Rate Rejected"
 msgstr "등급 외로 평점 매기기"
 
-#: src/Resources.vala:239
+#: ../src/Resources.vala:270
 msgid "Setting as rejected"
 msgstr "등급 외 사진으로 설정"
 
-#: src/Resources.vala:240
+#: ../src/Resources.vala:271
 msgid "Set rating to rejected"
 msgstr "등급 외 사진에 평점 설정"
 
-#: src/Resources.vala:242
+#: ../src/Resources.vala:273
 msgid "Rejected _Only"
 msgstr "등급 외 사진만(_O)"
 
-#: src/Resources.vala:243
+#: ../src/Resources.vala:274
 msgid "Rejected Only"
 msgstr "등급 외 사진만"
 
-#: src/Resources.vala:244
+#: ../src/Resources.vala:275
 msgid "Show only rejected photos"
 msgstr "등급 외 사진만 보입니다"
 
-#: src/Resources.vala:246
+#: ../src/Resources.vala:277
 msgid "All + _Rejected"
 msgstr "모두 + 등급 외 사진(_R)"
 
-#: src/Resources.vala:247 src/Resources.vala:248
+#: ../src/Resources.vala:278 ../src/Resources.vala:279
 msgid "Show all photos, including rejected"
-msgstr "등급 외 사진을 포함한 모든 사진 보기"
+msgstr "등급 외 사진까지 모든 사진 보기"
 
-#: src/Resources.vala:250
+#: ../src/Resources.vala:281
 msgid "_All Photos"
 msgstr "모든 사진(_A)"
 
-#: src/Resources.vala:251 src/Resources.vala:252
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:283 ../src/Resources.vala:285
 msgid "Show all photos"
 msgstr "모든 사진 보기"
 
-#: src/Resources.vala:254
+#: ../src/Resources.vala:287
 msgid "_Ratings"
 msgstr "평점(_R)"
 
-#: src/Resources.vala:255
+#: ../src/Resources.vala:288
 msgid "Display each photo's rating"
 msgstr "각 사진의 평점을 표시합니다"
 
-#: src/Resources.vala:257
+#: ../src/Resources.vala:290
 msgid "_Filter Photos"
 msgstr "사진 거르기(_F)"
 
-#: src/Resources.vala:258
+#: ../src/Resources.vala:291
 msgid "Filter Photos"
 msgstr "사진 거르기"
 
-#: src/Resources.vala:259
+#: ../src/Resources.vala:292
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "필터에 따라 표시할 사진의 수를 제한합니다"
 
-#: src/Resources.vala:261
+#: ../src/Resources.vala:294
 msgid "_Duplicate"
 msgstr "복제(_D)"
 
-#: src/Resources.vala:262
+#: ../src/Resources.vala:295
 msgid "Duplicate"
 msgstr "복제"
 
-#: src/Resources.vala:263
+#: ../src/Resources.vala:296
 msgid "Make a duplicate of the photo"
 msgstr "이 사진을 복제합니다"
 
-#: src/Resources.vala:265
+#: ../src/Resources.vala:298
 msgid "_Export..."
 msgstr "내보내기(_E)..."
 
-#: src/Resources.vala:267
+#: ../src/Resources.vala:300
 msgid "_Print..."
 msgstr "인쇄(_P)..."
 
-#: src/Resources.vala:269
+#: ../src/Resources.vala:302
 msgid "Pu_blish..."
 msgstr "사진 업로드(_B)..."
 
-#: src/Resources.vala:270
-msgid "Publish"
-msgstr "사진 업로드"
-
-#: src/Resources.vala:271
+#: ../src/Resources.vala:304
 msgid "Publish to various websites"
 msgstr "다양한 웹 사이트로 업로드합니다"
 
-#: src/Resources.vala:273
+#: ../src/Resources.vala:306
 msgid "Edit _Title..."
 msgstr "제목 편집(_T)..."
 
-#: src/Resources.vala:276
+#: ../src/Resources.vala:310
 msgid "Edit _Comment..."
 msgstr "설명 편집(_C)..."
 
-#: src/Resources.vala:277
+#. Button label
+#: ../src/Resources.vala:312
 msgid "Edit Comment"
 msgstr "설명 편집"
 
-#: src/Resources.vala:279
+#: ../src/Resources.vala:314
 msgid "Edit Event _Comment..."
 msgstr "이벤트 설명 편집(_C)..."
 
-#: src/Resources.vala:282
+#: ../src/Resources.vala:317
 msgid "_Adjust Date and Time..."
 msgstr "시간과 날짜 조정(_A)..."
 
-#: src/Resources.vala:283
+#: ../src/Resources.vala:318
 msgid "Adjust Date and Time"
 msgstr "시간과 날짜 조정"
 
-#: src/Resources.vala:285
+#: ../src/Resources.vala:320
 msgid "Add _Tags..."
 msgstr "태그 추가(_T)..."
 
-#: src/Resources.vala:286
+#: ../src/Resources.vala:321
 msgid "_Add Tags..."
 msgstr "태그 추가(_A)..."
 
-#: src/Resources.vala:287 src/Resources.vala:318
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:323 ../src/Resources.vala:356
 msgid "Add Tags"
 msgstr "태그 추가"
 
-#: src/Resources.vala:289
-msgid "_Preferences"
-msgstr "기본 설정(_P)"
-
-#: src/Resources.vala:291
+#: ../src/Resources.vala:327
 msgid "Open With E_xternal Editor"
 msgstr "외부 편집기로 열기(_X)"
 
-#: src/Resources.vala:293
+#: ../src/Resources.vala:329
 msgid "Open With RA_W Editor"
 msgstr "RAW 편집기로 열기(_W)"
 
-#: src/Resources.vala:295
+#: ../src/Resources.vala:331
 msgid "Send _To..."
 msgstr "보내기(_T)..."
 
-#: src/Resources.vala:296
+#: ../src/Resources.vala:332
 msgid "Send T_o..."
 msgstr "보내기(_O)..."
 
-#: src/Resources.vala:298
+#: ../src/Resources.vala:334
 msgid "_Find..."
 msgstr "찾기(_F)..."
 
-#: src/Resources.vala:299
+#: ../src/Resources.vala:335
 msgid "Find"
 msgstr "찾기"
 
-#: src/Resources.vala:300
+#: ../src/Resources.vala:336
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "이름이나 태그를 나타내는 텍스트를 입력하여 사진을 찾습니다"
 
-#: src/Resources.vala:302
+#: ../src/Resources.vala:338
 msgid "_Flag"
 msgstr "표시(_F)"
 
-#: src/Resources.vala:304
+#: ../src/Resources.vala:340
 msgid "Un_flag"
 msgstr "표시 제거(_F)"
 
-#: src/Resources.vala:307
+#: ../src/Resources.vala:343
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "편집기를 실행할 수 없습니다: %s"
 
-#: src/Resources.vala:312
+#: ../src/Resources.vala:348
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "태그 \"%s\" 추가"
 
-#: src/Resources.vala:314
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:351
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "태그 \"%s\"과(와) \"%s\" 추가"
 
-#: src/Resources.vala:322
+#: ../src/Resources.vala:361
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "태그 \"%s\" 삭제(_D)"
 
-#: src/Resources.vala:326
+#: ../src/Resources.vala:365
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "태그 \"%s\"(을)를 삭제합니다"
 
-#: src/Resources.vala:329
+#: ../src/Resources.vala:368
 msgid "Delete Tag"
 msgstr "태그 삭제"
 
-#: src/Resources.vala:332
-msgid "_New"
-msgstr "새 항목(_N)"
-
-#: src/Resources.vala:335
+#: ../src/Resources.vala:374
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "태그 \"%s\" 이름 바꾸기(_N)..."
 
-#: src/Resources.vala:339
+#: ../src/Resources.vala:378
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "태그 이름을 \"%s\"에서 \"%s\"(으)로 바꿉니다."
 
-#: src/Resources.vala:342
+#: ../src/Resources.vala:381
 msgid "_Rename..."
 msgstr "이름 바꾸기(_R)..."
 
-#: src/Resources.vala:344
+#: ../src/Resources.vala:383
 msgid "Modif_y Tags..."
 msgstr "태그 수정(_Y)..."
 
-#: src/Resources.vala:345
+#: ../src/Resources.vala:384
 msgid "Modify Tags"
 msgstr "태그 수정"
 
-#: src/Resources.vala:348
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "사진에 \"%s\" 태그를 붙입니다"
 
-#: src/Resources.vala:348
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "사진에 \"%s\"태그를 붙입니다"
 
-#: src/Resources.vala:352
+#: ../src/Resources.vala:391
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "선택한 사진에 \"%s\"태그를 붙입니다"
 
-#: src/Resources.vala:353
+#: ../src/Resources.vala:392
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "선택한 사진에 \"%s\"태그를 붙입니다"
 
-#: src/Resources.vala:357
+#: ../src/Resources.vala:396
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "사진에서 \"%s\" 태그를 제거합니다(_P)"
 
-#: src/Resources.vala:358
+#: ../src/Resources.vala:397
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "사진에서 \"%s\" 태그를 제거합니다(_P)"
 
-#: src/Resources.vala:362
+#: ../src/Resources.vala:401
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "사진에서 \"%s\" 태그를 제거합니다"
 
-#: src/Resources.vala:363
+#: ../src/Resources.vala:402
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "사진에서 \"%s\" 태그를 제거합니다"
 
-#: src/Resources.vala:367
+#: ../src/Resources.vala:406
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr "태그가 이미 존재하기 때문에 태그 이름을 \"%s\"(으)로 바꿀 수 없습니다."
 
-#: src/Resources.vala:371
+#: ../src/Resources.vala:410
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr "검색이 이미 존재하기 때문에 검색  \"%s\"의 이름을 바꿀 수 없습니다."
 
-#: src/Resources.vala:374
+#: ../src/Resources.vala:413
 msgid "Saved Search"
 msgstr "저장한 검색 결과"
 
-#: src/Resources.vala:376
+#: ../src/Resources.vala:415
 msgid "Delete Search"
 msgstr "검색 삭제"
 
-#: src/Resources.vala:379
+#: ../src/Resources.vala:418
 msgid "_Edit..."
 msgstr "편집(_E)..."
 
-#: src/Resources.vala:380
+#: ../src/Resources.vala:419
 msgid "Re_name..."
 msgstr "이름 바꾸기(_N)..."
 
-#: src/Resources.vala:383
+#: ../src/Resources.vala:422
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "검색  \"%s\"의 이름을  \"%s\"(으)로 바꾸기"
 
-#: src/Resources.vala:387
+#: ../src/Resources.vala:426
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "검색  \"%s\" 삭제"
 
-#: src/Resources.vala:545
+#: ../src/Resources.vala:584
 #, c-format
 msgid "Rate %s"
 msgstr "%s의 평점"
 
-#: src/Resources.vala:546
+#: ../src/Resources.vala:585
 #, c-format
 msgid "Set rating to %s"
 msgstr "%s에 평점 설정"
 
-#: src/Resources.vala:547
+#: ../src/Resources.vala:586
 #, c-format
 msgid "Setting rating to %s"
 msgstr "%s의 평점 설정"
 
-#: src/Resources.vala:549
+#: ../src/Resources.vala:588
 #, c-format
 msgid "Display %s"
 msgstr "%s 표시"
 
-#: src/Resources.vala:550
+#: ../src/Resources.vala:589
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "평점이 %s 인 사진만 보기"
 
-#: src/Resources.vala:551
+#: ../src/Resources.vala:590
 #, c-format
 msgid "%s or Better"
 msgstr "%s 또는 그 이상인 것"
 
-#: src/Resources.vala:552
+#: ../src/Resources.vala:591
 #, c-format
 msgid "Display %s or Better"
 msgstr "%s 또는 그 이상인 것 표시"
 
-#: src/Resources.vala:553
+#: ../src/Resources.vala:592
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "평점이 %s이거나 그 이상인 사진만 보기"
 
-#: src/Resources.vala:644
+#: ../src/Resources.vala:683
 msgid "Remove the selected photos from the trash"
 msgstr "선택한 사진을 휴지통에서 제거합니다"
 
-#: src/Resources.vala:645
+#: ../src/Resources.vala:684
 msgid "Remove the selected photos from the library"
 msgstr "선택한 사진을 라이브러리에서 제거합니다"
 
-#: src/Resources.vala:647
+#: ../src/Resources.vala:686
 msgid "_Restore"
 msgstr "복구(_R)"
 
-#: src/Resources.vala:648
+#: ../src/Resources.vala:687
 msgid "Move the selected photos back into the library"
 msgstr "선택한 사진을 라이브러리 안으로 이동합니다"
 
-#: src/Resources.vala:650
+#: ../src/Resources.vala:689
 msgid "Show in File Mana_ger"
 msgstr "파일 관리자로 보이기(_G)"
 
-#: src/Resources.vala:651
+#: ../src/Resources.vala:690
 msgid "Open the selected photo's directory in the file manager"
 msgstr "선택한 사진이 있는 디렉터리를 파일 관리자로 열어봅니다"
 
-#: src/Resources.vala:654
+#: ../src/Resources.vala:693
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "파일 관리자로 열 수 없습니다: %s"
 
-#: src/Resources.vala:657
+#: ../src/Resources.vala:696
 msgid "R_emove From Library"
 msgstr "라이브러리에서 제거(_E)"
 
-#: src/Resources.vala:659
+#: ../src/Resources.vala:698
 msgid "_Move to Trash"
 msgstr "휴지통에 버리기(_M)"
 
-#: src/Resources.vala:661
+#: ../src/Resources.vala:700
 msgid "Select _All"
 msgstr "모두 선택(_A)"
 
-#: src/Resources.vala:662
+#: ../src/Resources.vala:701
 msgid "Select all items"
 msgstr "모든 항목 선택"
 
-#: src/Resources.vala:740
+#. ...precache the timestamp string...
+#. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:780
 msgid "%-I:%M %p"
 msgstr "%p %-I:%M"
 
-#: src/Resources.vala:741
+#. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:785
 msgid "%-I:%M:%S %p"
 msgstr "%p %-I:%M:%S"
 
-#: src/Resources.vala:742
+#. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:789
 msgid "%a %b %d, %Y"
 msgstr "%Y년 %b %d일 (%a)"
 
-#: src/Resources.vala:743 src/Resources.vala:745
+#. / Locale-specific starting date format for multi-date strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#. / Locale-specific calendar date format for multi-month strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:794 ../src/Resources.vala:804
 msgid "%a %b %d"
 msgstr "%b %d일 (%a)"
 
-#: src/Resources.vala:744
+#. / Locale-specific ending date format for multi-date strings,
+#. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:799
 msgid "%d, %Y"
 msgstr "%Y년 %d일"
 
-#: src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr "각도:"
+#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
+msgid "Slideshow"
+msgstr "슬라이드 쇼"
 
-#: src/editing_tools/StraightenTool.vala:102
-#: src/editing_tools/EditingTools.vala:2204
-msgid "_Reset"
-msgstr "되돌리기(_R)"
+#. Flagged label and toggle
+#: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
+#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
+msgid "Flagged"
+msgstr "표시함"
 
-#: src/editing_tools/EditingTools.vala:661
+#: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
+msgid "Photos"
+msgstr "사진"
+
+#: ../src/SearchFilter.vala:599 ../src/SearchFilter.vala:600
+msgid "Videos"
+msgstr "비디오"
+
+#: ../src/SearchFilter.vala:605
+msgid "RAW Photos"
+msgstr "RAW 사진"
+
+#: ../src/SearchFilter.vala:606
+msgid "RAW photos"
+msgstr "RAW 사진"
+
+#: ../src/SearchFilter.vala:934
+#, c-format
+msgid "Error loading UI file %s: %s"
+msgstr "UI 파일 %s을(를) 불러올 수 없습니다: %s"
+
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: ../src/SearchFilter.vala:945
+msgid "Close"
+msgstr "닫기"
+
+#. Type label and toggles
+#: ../src/SearchFilter.vala:951
+msgid "Type"
+msgstr "형식"
+
+#. Rating label and button
+#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
+msgid "Rating"
+msgstr "평점"
+
+#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
+msgid "Settings"
+msgstr "설정"
+
+#. Set up toolbar
+#. add toolbar buttons
+#: ../src/SlideshowPage.vala:160
+msgid "Back"
+msgstr "뒤로"
+
+#: ../src/SlideshowPage.vala:162
+msgid "Go to the previous photo"
+msgstr "이전 사진으로 이동합니다"
+
+#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
+msgid "Pause"
+msgstr "일시 중지"
+
+#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
+msgid "Pause the slideshow"
+msgstr "슬라이드 쇼 일시 정지"
+
+#: ../src/SlideshowPage.vala:174
+msgid "Next"
+msgstr "다음"
+
+#: ../src/SlideshowPage.vala:176
+msgid "Go to the next photo"
+msgstr "다음 사진으로 이동합니다"
+
+#: ../src/SlideshowPage.vala:184
+msgid "Change slideshow settings"
+msgstr "슬라이드 쇼 설정을 바꿉니다"
+
+#. An entire slideshow set might be missing, so check for a loop.
+#: ../src/SlideshowPage.vala:238
+msgid "All photo source files are missing."
+msgstr "모든 사진 파일을 찾을 수 없습니다."
+
+#: ../src/SlideshowPage.vala:270
+msgid "Play"
+msgstr "재생"
+
+#: ../src/SlideshowPage.vala:271
+msgid "Continue the slideshow"
+msgstr "슬라이드 쇼 계속하기"
+
+#: ../src/Tag.vala:817
+msgid "untitled"
+msgstr "제목 없음"
+
+#. multiple videos
+#: ../src/VideoSupport.vala:489
+msgid "Export Videos"
+msgstr "비디오 내보내기"
+
+#: ../src/camera/Branch.vala:85
+msgid "Cameras"
+msgstr "카메라"
+
+#: ../src/camera/ImportPage.vala:459
+msgid ""
+"Unable to unmount camera.  Try unmounting the camera from the file manager."
+msgstr ""
+"카메라를 마운트 해제할 수 없습니다. 카메라를 파일 관리자에서 마운트 해제해 보"
+"십시오."
+
+#. hide duplicates checkbox
+#: ../src/camera/ImportPage.vala:776
+msgid "Hide photos already imported"
+msgstr "이미 가져온 사진 감추기"
+
+#: ../src/camera/ImportPage.vala:777
+msgid "Only display photos that have not been imported"
+msgstr "이전에 가져오지 않은 사진만 표시합니다"
+
+#. Ticket #3304 - Import page shouldn't display confusing message
+#. prior to import.
+#. TODO: replace this with approved text for "talking to camera,
+#. please wait" once new strings are being accepted.
+#: ../src/camera/ImportPage.vala:847
+msgid "Starting import, please wait..."
+msgstr "가져오기를 시작합니다. 기다려 주십시오..."
+
+#: ../src/camera/ImportPage.vala:886
+msgid "Import _Selected"
+msgstr "선택한 것 가져오기(_S)"
+
+#: ../src/camera/ImportPage.vala:887
+msgid "Import the selected photos into your library"
+msgstr "선택한 사진을 라이브러리로 가져옵니다"
+
+#: ../src/camera/ImportPage.vala:892
+msgid "Import _All"
+msgstr "모두 가져오기(_A)"
+
+#: ../src/camera/ImportPage.vala:893
+msgid "Import all the photos into your library"
+msgstr "모든 사진을 라이브러리로 가져옵니다"
+
+#. it's mounted, offer to unmount for the user
+#: ../src/camera/ImportPage.vala:1014
+msgid ""
+"Shotwell needs to unmount the camera from the filesystem in order to access "
+"it.  Continue?"
+msgstr ""
+"샷웰이 카메라에 접근하려면 파일 시스템에서 카메라를 마운트 해제해야 합니다. "
+"계속하시겠습니까?"
+
+#: ../src/camera/ImportPage.vala:1020
+msgid "_Unmount"
+msgstr "마운트 해제(_U)"
+
+#: ../src/camera/ImportPage.vala:1025
+msgid "Please unmount the camera."
+msgstr "카메라를 마운트 해제해 주십시오."
+
+#: ../src/camera/ImportPage.vala:1030
+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/camera/ImportPage.vala:1040
+msgid "Please close any other application using the camera."
+msgstr "카메라를 사용 중인 다른 프로그램을 닫으세요."
+
+#: ../src/camera/ImportPage.vala:1045
+#, c-format
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
+msgstr ""
+"카메라에서 미리 보기를 가져올 수 없습니다:\n"
+"%s"
+
+#: ../src/camera/ImportPage.vala:1062
+msgid "Unmounting..."
+msgstr "마운트 해제 중..."
+
+#: ../src/camera/ImportPage.vala:1168
+msgid "Fetching photo information"
+msgstr "사진 정보 가져오기"
+
+#: ../src/camera/ImportPage.vala:1523
+#, c-format
+msgid "Fetching preview for %s"
+msgstr "%s의 미리 보기 가져오는 중"
+
+#: ../src/camera/ImportPage.vala:1639
+#, c-format
+msgid "Unable to lock camera: %s"
+msgstr "카메라를 잠글 수 없습니다: %s"
+
+#: ../src/camera/ImportPage.vala:1724
+#, c-format
+msgid "Delete this photo from camera?"
+msgid_plural "Delete these %d photos from camera?"
+msgstr[0] "이 사진 %d매를 카메라에서 지우시겠습니까?"
+
+#: ../src/camera/ImportPage.vala:1727
+#, c-format
+msgid "Delete this video from camera?"
+msgid_plural "Delete these %d videos from camera?"
+msgstr[0] "카메라에서 비디오 %d편을 지우시겠습니까?"
+
+#: ../src/camera/ImportPage.vala:1730
+#, c-format
+msgid "Delete this photo/video from camera?"
+msgid_plural "Delete these %d photos/videos from camera?"
+msgstr[0] "카메라에서 사진/비디오 %d개를 지우시겠습니까?"
+
+#: ../src/camera/ImportPage.vala:1733
+#, c-format
+msgid "Delete these files from camera?"
+msgid_plural "Delete these %d files from camera?"
+msgstr[0] "파일 %d개를 카메라에서 삭제하시겠습니까?"
+
+#: ../src/camera/ImportPage.vala:1760
+msgid "Removing photos/videos from camera"
+msgstr "카메라에서 사진/비디오에서 제거는 중입니다"
+
+#: ../src/camera/ImportPage.vala:1764
+#, 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] "오류로 인하여 사진/비디오 %d개를 카메라에서 지울 수 없습니다."
+
+#: ../src/data_imports/DataImports.vala:22
+msgid "Data Imports"
+msgstr "데이터 가져오기"
+
+#. Send an empty job to the queue to mark the end of the import
+#: ../src/data_imports/DataImportsPluginHost.vala:65
+#: ../src/data_imports/DataImportsPluginHost.vala:78
+#, c-format
+msgid "%s Database"
+msgstr "%s 데이터 베이스"
+
+#: ../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 "오류로 인해 %s에서 가져올 수 없습니다:"
+
+#: ../src/data_imports/DataImportsPluginHost.vala:151
+msgid "To try importing from another service, select one from the above menu."
+msgstr "다른 서비스에서 가져오려면 위 메뉴에서 하나를 선택하십시오."
+
+#: ../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 ""
+"사용하고 있는 데이터 가져오기 플러그인이 없습니다.\n"
+"\n"
+"프로그램에서 가져오기 기능을 사용하려면 최소 하나 이상의 데이터 가져오기 플러"
+"그인을 사용해야 합니다. 플러그인은 기본 설정 대화 상자에서 사용하도록 설정할 "
+"수 있습니다."
+
+#: ../src/data_imports/DataImportsUI.vala:100
+msgid "Database file:"
+msgstr "데이터베이스 파일:"
+
+#: ../src/data_imports/DataImportsUI.vala:112
+#: ../src/library/LibraryWindow.vala:898
+msgid "_Import"
+msgstr "가져오기(_I)"
+
+#: ../src/data_imports/DataImportsUI.vala:217
+msgid "Import From Application"
+msgstr "프로그램에서 가져오기"
+
+#: ../src/data_imports/DataImportsUI.vala:369
+#: ../src/publishing/PublishingUI.vala:470
+msgid "_Close"
+msgstr "닫기(_C)"
+
+#: ../src/db/DatabaseTable.vala:37
+#, c-format
+msgid "Unable to open/create photo database %s: error code %d"
+msgstr "사진 데이터 베이스 %s을(를) 만들 수 없습니다: 오류 코드 %d"
+
+#: ../src/db/DatabaseTable.vala:46
+#, c-format
+msgid ""
+"Unable to write to photo database file:\n"
+" %s"
+msgstr ""
+"사진 데이터베이스 파일에 쓸 수 없습니다:\n"
+"%s"
+
+#: ../src/db/DatabaseTable.vala:48
+#, c-format
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
+msgstr ""
+"데이터베이스 파일에 접근할 수 없습니다:\n"
+" %s\n"
+"\n"
+"오류: \n"
+"%s"
+
+#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:351
+msgid "_File"
+msgstr "파일(_F)"
+
+#: ../src/direct/DirectPhotoPage.vala:52
+msgid "Save photo"
+msgstr "사진 저장"
+
+#: ../src/direct/DirectPhotoPage.vala:57
+msgid "Save _As..."
+msgstr "다른 이름으로 저장(_A)..."
+
+#: ../src/direct/DirectPhotoPage.vala:58
+msgid "Save photo with a different name"
+msgstr "사진을 다른 이름으로 저장합니다"
+
+#: ../src/direct/DirectPhotoPage.vala:69
+msgid "Print the photo to a printer connected to your computer"
+msgstr "컴퓨터와 연결한 프린터로 사진을 인쇄합니다"
+
+#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:363
+msgid "_Photo"
+msgstr "사진(_P)"
+
+#: ../src/direct/DirectPhotoPage.vala:227
+#, c-format
+msgid "%s does not exist."
+msgstr "%s(이)가 없습니다."
+
+#: ../src/direct/DirectPhotoPage.vala:229
+#, c-format
+msgid "%s is not a file."
+msgstr "%s(은)는 파일이 아닙니다."
+
+#: ../src/direct/DirectPhotoPage.vala:231
+#, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
+msgstr ""
+"%s(이)가 다음의 파일 형식을 지원하지 않습니다\n"
+"%s."
+
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save a Copy"
+msgstr "사본 저장(_S)"
+
+#: ../src/direct/DirectPhotoPage.vala:425
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "%sd에 바뀐 점을 버리시겠습니까?"
+
+#: ../src/direct/DirectPhotoPage.vala:426
+msgid "Close _without Saving"
+msgstr "저장하지 않고 닫기(_W)"
+
+#: ../src/direct/DirectPhotoPage.vala:459
+#, c-format
+msgid "Error while saving to %s: %s"
+msgstr "%s(으)로 저장하는 중 오류 발생: %s"
+
+#: ../src/direct/DirectPhotoPage.vala:487
+#: ../src/direct/DirectPhotoPage.vala:508
+msgid "Save As"
+msgstr "다른 이름으로 저장"
+
+#: ../src/editing_tools/EditingTools.vala:665
 msgid "Return to current photo dimensions"
 msgstr "현재 사진 크기로 되돌리기"
 
-#: src/editing_tools/EditingTools.vala:664
+#: ../src/editing_tools/EditingTools.vala:668
 msgid "Set the crop for this photo"
 msgstr "이 사진을 얼마나 잘라낼지 설정"
 
-#: src/editing_tools/EditingTools.vala:676
+#: ../src/editing_tools/EditingTools.vala:680
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "사진 줄이기 사각형을 가로 세로 방향으로 돌립니다"
 
-#: src/editing_tools/EditingTools.vala:749
+#: ../src/editing_tools/EditingTools.vala:753
 msgid "Unconstrained"
 msgstr "자르지 않음"
 
-#: src/editing_tools/EditingTools.vala:750
+#: ../src/editing_tools/EditingTools.vala:754
 msgid "Square"
 msgstr "정사각형"
 
-#: src/editing_tools/EditingTools.vala:751
+#: ../src/editing_tools/EditingTools.vala:755
 msgid "Screen"
 msgstr "화면"
 
-#: src/editing_tools/EditingTools.vala:752
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
-msgid "Original Size"
-msgstr "원본 크기"
-
-#: src/editing_tools/EditingTools.vala:753
-#: src/editing_tools/EditingTools.vala:756
-#: src/editing_tools/EditingTools.vala:766
-#: src/editing_tools/EditingTools.vala:776
+#: ../src/editing_tools/EditingTools.vala:757
+#: ../src/editing_tools/EditingTools.vala:760
+#: ../src/editing_tools/EditingTools.vala:770
+#: ../src/editing_tools/EditingTools.vala:780
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:754
+#: ../src/editing_tools/EditingTools.vala:758
 msgid "SD Video (4 : 3)"
 msgstr "SD 비디오(4 : 3)"
 
-#: src/editing_tools/EditingTools.vala:755
+#: ../src/editing_tools/EditingTools.vala:759
 msgid "HD Video (16 : 9)"
 msgstr "HD 비디오(16 : 9)"
 
-#: src/editing_tools/EditingTools.vala:762
+#: ../src/editing_tools/EditingTools.vala:766
 msgid "Letter (8.5 x 11 in.)"
 msgstr "편지(8.5 x 11 인치)"
 
-#: src/editing_tools/EditingTools.vala:764
+#: ../src/editing_tools/EditingTools.vala:768
 msgid "Tabloid (11 x 17 in.)"
 msgstr "타블로이(11 x 17 인치)"
 
-#: src/editing_tools/EditingTools.vala:771
+#: ../src/editing_tools/EditingTools.vala:775
 msgid "A4 (210 x 297 mm)"
 msgstr "A4 (210 x 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:775
+#: ../src/editing_tools/EditingTools.vala:779
 msgid "A3 (297 x 420 mm)"
 msgstr "A3 (297 x 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1865
+#: ../src/editing_tools/EditingTools.vala:1905
 msgid "Close the red-eye tool"
 msgstr "적목 현상 제거 도구 닫기"
 
-#: src/editing_tools/EditingTools.vala:1868
+#: ../src/editing_tools/EditingTools.vala:1908
 msgid "Remove any red-eye effects in the selected region"
 msgstr "선택한 범위 안의 모든 적목 현상 제거"
 
-#: src/editing_tools/EditingTools.vala:2226
+#: ../src/editing_tools/EditingTools.vala:2244
+#: ../src/editing_tools/StraightenTool.vala:102
+msgid "_Reset"
+msgstr "되돌리기(_R)"
+
+#: ../src/editing_tools/EditingTools.vala:2266
 msgid "Saturation:"
 msgstr "채도:"
 
-#: src/editing_tools/EditingTools.vala:2234
+#: ../src/editing_tools/EditingTools.vala:2274
 msgid "Tint:"
 msgstr "색조:"
 
-#: src/editing_tools/EditingTools.vala:2243
+#: ../src/editing_tools/EditingTools.vala:2283
 msgid "Temperature:"
 msgstr "온도:"
 
-#: src/editing_tools/EditingTools.vala:2251
+#: ../src/editing_tools/EditingTools.vala:2291
 msgid "Shadows:"
 msgstr "그림자:"
 
-#: src/editing_tools/EditingTools.vala:2259
+#: ../src/editing_tools/EditingTools.vala:2299
 msgid "Highlights:"
 msgstr "강조:"
 
-#: src/editing_tools/EditingTools.vala:2313
+#: ../src/editing_tools/EditingTools.vala:2353
 msgid "Reset Colors"
 msgstr "색 되돌리기"
 
-#: src/editing_tools/EditingTools.vala:2313
+#: ../src/editing_tools/EditingTools.vala:2353
 msgid "Reset all color adjustments to original"
 msgstr "모든 색 조정을 원래대로 되돌립니다"
 
-#: src/editing_tools/EditingTools.vala:2665
+#: ../src/editing_tools/EditingTools.vala:2705
 msgid "Temperature"
 msgstr "온도"
 
-#: src/editing_tools/EditingTools.vala:2678
+#: ../src/editing_tools/EditingTools.vala:2718
 msgid "Tint"
 msgstr "색조"
 
-#: src/editing_tools/EditingTools.vala:2691
+#: ../src/editing_tools/EditingTools.vala:2731
 msgid "Saturation"
 msgstr "채도"
 
-#: src/editing_tools/EditingTools.vala:2704
+#: ../src/editing_tools/EditingTools.vala:2744
 msgid "Exposure"
 msgstr "노출"
 
-#: src/editing_tools/EditingTools.vala:2717
+#: ../src/editing_tools/EditingTools.vala:2757
 msgid "Shadows"
 msgstr "그림자"
 
-#: src/editing_tools/EditingTools.vala:2730
+#: ../src/editing_tools/EditingTools.vala:2770
 msgid "Highlights"
 msgstr "강조"
 
-#: src/editing_tools/EditingTools.vala:2740
+#: ../src/editing_tools/EditingTools.vala:2780
 msgid "Contrast Expansion"
 msgstr "대비 확장"
 
-#: src/AppWindow.vala:49
-msgid "Pin Toolbar"
-msgstr "도구 모음 고정"
+#: ../src/editing_tools/StraightenTool.vala:99
+msgid "Angle:"
+msgstr "각도:"
 
-#: src/AppWindow.vala:50
-msgid "Pin the toolbar open"
-msgstr "열린 도구 모음 고정"
+#: ../src/events/EventDirectoryItem.vala:83
+#, c-format
+msgid "%d Photo/Video"
+msgid_plural "%d Photos/Videos"
+msgstr[0] "사진/비디오 %d개"
 
-#: src/AppWindow.vala:53 src/AppWindow.vala:131
-msgid "Leave fullscreen"
-msgstr "전체 화면 나가기"
+#: ../src/events/EventPage.vala:129
+msgid "No Event"
+msgstr "이벤트 없음"
 
-#: src/AppWindow.vala:130
-msgid "Leave _Fullscreen"
-msgstr "전체 화면 나가기(_F)"
+#: ../src/events/EventsDirectoryPage.vala:131
+msgid "Display the comment of each event"
+msgstr "각 이벤트의 설명 표시"
 
-#: src/AppWindow.vala:491
-msgid "_Quit"
-msgstr "끝내기(_Q)"
+#: ../src/events/EventsDirectoryPage.vala:155
+msgid "No events"
+msgstr "이벤트 없음"
 
-#: src/AppWindow.vala:496
-msgid "_About"
-msgstr "정보(_A)"
+#: ../src/events/EventsDirectoryPage.vala:159
+msgid "No events found"
+msgstr "이벤트가 없습니다"
 
-#: src/AppWindow.vala:501
-msgid "Fulls_creen"
-msgstr "전체 화면(_C)"
+#: ../src/events/EventsDirectoryPage.vala:230
+msgid "Events"
+msgstr "이벤트"
 
-#: src/AppWindow.vala:506
-msgid "_Contents"
-msgstr "차례(_C)"
+#: ../src/events/EventsDirectoryPage.vala:244
+msgid "Undated"
+msgstr "업데이트 함"
 
-#: src/AppWindow.vala:511
-msgid "_Frequently Asked Questions"
-msgstr "자주 하는 질문(_F)"
+#: ../src/events/EventsDirectoryPage.vala:245
+msgid "%Y"
+msgstr "%Y"
 
-#: src/AppWindow.vala:516
-msgid "_Report a Problem..."
-msgstr "문제 보고(_R)..."
+#: ../src/events/EventsDirectoryPage.vala:246
+msgid "%B"
+msgstr "%B"
 
-#: src/AppWindow.vala:663
-#, c-format
-msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
-"continue.\n"
-"\n"
-"%s"
-msgstr ""
-"샷웰 라이브러리에 접근하던 중 치명적인 오류가 발생했습니다.샷웰을 계속 실행"
-"할 수 없습니다.\n"
-"\n"
-"%s"
+#: ../src/folders/Branch.vala:141
+msgid "Folders"
+msgstr "폴더"
 
-#: src/AppWindow.vala:683 plugins/common/Resources.vala:9
-msgid "Visit the Yorba web site"
-msgstr "제작자 웹 사이트 방문"
+#: ../src/library/Branch.vala:36 ../ui/shotwell.glade.h:32
+msgid "Library"
+msgstr "라이브러리"
 
-#: src/AppWindow.vala:686 plugins/common/Resources.vala:28
-msgid "translator-credits"
-msgstr "Kim, Boram <boramism@gmail.com>"
+#: ../src/library/ImportQueuePage.vala:8
+msgid "Importing..."
+msgstr "가져오는 중..."
 
-#: src/AppWindow.vala:695
-#, c-format
-msgid "Unable to display help: %s"
-msgstr "도움말을 표시할 수 없습니다: %s"
+#: ../src/library/ImportQueuePage.vala:67
+msgid "_Stop Import"
+msgstr "가져오기 중지(_S)"
 
-#: src/AppWindow.vala:703
-#, c-format
-msgid "Unable to navigate to bug database: %s"
-msgstr "버그 데이터베이스로 이동할 수 없음: %s"
+#: ../src/library/ImportQueuePage.vala:68
+msgid "Stop importing photos"
+msgstr "사진 가져오기를 중지합니다"
+
+#: ../src/library/ImportQueuePage.vala:124
+msgid "Preparing to import..."
+msgstr "가져오기 준비 중..."
 
-#: src/AppWindow.vala:711
+#: ../src/library/ImportQueuePage.vala:151
 #, c-format
-msgid "Unable to display FAQ: %s"
-msgstr "자주 하는 질문을 표시할 수 없습니다: %s"
+msgid "Imported %s"
+msgstr "%s 가져옴"
 
-#: src/Tag.vala:817
-msgid "untitled"
-msgstr "제목 없음"
+#: ../src/library/LastImportPage.vala:8
+msgid "Last Import"
+msgstr "최근 가져온 항목"
 
-#: src/Dimensions.vala:17
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1250
-msgid "Original size"
-msgstr "원본 크기"
+#: ../src/library/LibraryWindow.vala:301
+msgid "_Import From Folder..."
+msgstr "폴더에서 가져오기(_I)..."
 
-#: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "너비와 높이"
+#: ../src/library/LibraryWindow.vala:302
+msgid "Import photos from disk to library"
+msgstr "사진을 디스크에서 라이브러리로 가져옵니다"
 
-#: src/Dimensions.vala:23
-msgid "Width"
-msgstr "너비"
+#: ../src/library/LibraryWindow.vala:309
+msgid "Import From _Application..."
+msgstr "프로그램에서 가져오기(_A)..."
 
-#: src/Dimensions.vala:26
-msgid "Height"
-msgstr "높이"
+#: ../src/library/LibraryWindow.vala:313
+msgid "Sort _Events"
+msgstr "이벤트 정렬(_E)"
 
-#: src/MediaPage.vala:143
-msgid "Adjust the size of the thumbnails"
-msgstr "섬네일 크기를 조정합니다"
+#: ../src/library/LibraryWindow.vala:323
+msgid "Empty T_rash"
+msgstr "휴지통 비우기(_R)"
 
-#: src/MediaPage.vala:326
-msgid "Increase the magnification of the thumbnails"
-msgstr "섬네일을 확대합니다"
+#: ../src/library/LibraryWindow.vala:324
+msgid "Delete all photos in the trash"
+msgstr "휴지통 안의 모든 사진을 지움"
 
-#: src/MediaPage.vala:332
-msgid "Decrease the magnification of the thumbnails"
-msgstr "섬네일을 축소합니다"
+#: ../src/library/LibraryWindow.vala:329
+msgid "View Eve_nt for Photo"
+msgstr "사진 이벤트 보기(_N)"
 
-#: src/MediaPage.vala:399
-msgid "Sort _Photos"
-msgstr "사진 정렬(_P)"
+#: ../src/library/LibraryWindow.vala:333
+msgid "_Find"
+msgstr "찾기(_F)"
 
-#: src/MediaPage.vala:408
-msgid "_Play Video"
-msgstr "비디오 재생(_P)"
+#: ../src/library/LibraryWindow.vala:334
+msgid "Find photos and videos by search criteria"
+msgstr "검색 기준에 따라 사진과 비디오를 찾아봅니다"
 
-#: src/MediaPage.vala:409
-msgid "Open the selected videos in the system video player"
-msgstr "시스템의 비디오 재생 프로그램으로 선택한 비디오 열기"
+#: ../src/library/LibraryWindow.vala:345 ../src/searches/Branch.vala:77
+#: ../src/sidebar/Tree.vala:185
+msgid "Ne_w Saved Search..."
+msgstr "새 저장한 검색(_W)..."
 
-#: src/MediaPage.vala:442 src/events/EventsDirectoryPage.vala:130
-msgid "_Comments"
-msgstr "설명(_C)"
+#: ../src/library/LibraryWindow.vala:367
+msgid "_Photos"
+msgstr "사진(_P)"
 
-#: src/MediaPage.vala:443
-msgid "Display the comment of each photo"
-msgstr "각 사진의 설명 표시"
+#: ../src/library/LibraryWindow.vala:371
+msgid "Even_ts"
+msgstr "이벤트(_T)"
 
-#: src/MediaPage.vala:455
-msgid "Display each photo's tags"
-msgstr "각 사진의 태그를 표시합니다"
+#: ../src/library/LibraryWindow.vala:390
+msgid "_Basic Information"
+msgstr "기본 정보(_B)"
 
-#: src/MediaPage.vala:471
-msgid "By _Title"
-msgstr "제목 순으로(_T)"
+#: ../src/library/LibraryWindow.vala:391
+msgid "Display basic information for the selection"
+msgstr "선택한 사진의 기본 정보를 표시합니다"
 
-#: src/MediaPage.vala:472
-msgid "Sort photos by title"
-msgstr "사진을 제목 순으로 정렬합니다"
+#: ../src/library/LibraryWindow.vala:396
+msgid "E_xtended Information"
+msgstr "확장 정보(_X)"
 
-#: src/MediaPage.vala:477
-msgid "By Exposure _Date"
-msgstr "촬영 날짜 순(_D)"
+#: ../src/library/LibraryWindow.vala:397
+msgid "Display extended information for the selection"
+msgstr "선택한 사진의 확장 정보를 표시합니다"
 
-#: src/MediaPage.vala:478
-msgid "Sort photos by exposure date"
-msgstr "사진을 촬영 날짜 순으로 정렬합니다"
+#: ../src/library/LibraryWindow.vala:402
+msgid "_Search Bar"
+msgstr "검색 표시줄(_S)"
 
-#: src/MediaPage.vala:483
-msgid "By _Rating"
-msgstr "평점으로(_R)"
+#: ../src/library/LibraryWindow.vala:403
+msgid "Display the search bar"
+msgstr "검색 표시줄 표시"
 
-#: src/MediaPage.vala:484
-msgid "Sort photos by rating"
-msgstr "평점 순으로 사진 정렬"
+#: ../src/library/LibraryWindow.vala:408
+msgid "S_idebar"
+msgstr "사이드바(_I)"
+
+#: ../src/library/LibraryWindow.vala:409
+msgid "Display the sidebar"
+msgstr "사이드바 표시"
+
+#: ../src/library/LibraryWindow.vala:667
+msgid "Import From Folder"
+msgstr "폴더에서 가져오기"
+
+#: ../src/library/LibraryWindow.vala:736
+msgid "Empty Trash"
+msgstr "휴지통 비우기"
+
+#: ../src/library/LibraryWindow.vala:736
+msgid "Emptying Trash..."
+msgstr "휴지통을 비우는 중..."
 
-#: src/MediaPage.vala:702
+#: ../src/library/LibraryWindow.vala:895
 #, c-format
 msgid ""
-"Shotwell was unable to play the selected video:\n"
-"%s"
+"Shotwell is configured to import photos to your home directory.\n"
+"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
+"span>.\n"
+"Do you want to continue importing photos?"
 msgstr ""
-"샷웰이 선택한 비디오를 재생할 수 없습니다:\n"
-"%s"
+"샷웰이 사진을 가져올 때 홈 디렉터리로 가져오도록 설정했습니다.\n"
+"이 설정을 <span weight=\"bold\">편집 %s 기본 설정</span>에서 바꾸는 것을 추천"
+"합니다.\n"
+"계속 사진을 가져옵니까?"
+
+#: ../src/library/LibraryWindow.vala:898 ../ui/shotwell.glade.h:18
+msgid "Library Location"
+msgstr "라이브러리 위치"
+
+#. TODO: Specify which directory/file.
+#: ../src/library/LibraryWindow.vala:911
+msgid "Photos cannot be imported from this directory."
+msgstr "이 디렉터리에서 사진을 가져올 수 없습니다."
 
-#: src/events/EventDirectoryItem.vala:83
+#: ../src/library/LibraryWindow.vala:1199
 #, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] "사진/비디오 %d개"
+msgid "%s (%d%%)"
+msgstr "%s (%d%%)"
 
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "각 이벤트의 설명 표시"
+#: ../src/library/LibraryWindow.vala:1243
+#: ../src/library/LibraryWindow.vala:1254
+msgid "Updating library..."
+msgstr "라이브러리 업데이트 중..."
 
-#: src/events/EventsDirectoryPage.vala:155
-msgid "No events"
-msgstr "이벤트 없음"
+#: ../src/library/LibraryWindow.vala:1260
+msgid "Preparing to auto-import photos..."
+msgstr "사진을 자동으로 가져올 준비를 하는 중..."
 
-#: src/events/EventsDirectoryPage.vala:159
-msgid "No events found"
-msgstr "이벤트가 없습니다"
+#: ../src/library/LibraryWindow.vala:1265
+msgid "Auto-importing photos..."
+msgstr "사진을 자동으로 가져오는 중..."
 
-#: src/events/EventsDirectoryPage.vala:230
-msgid "Events"
-msgstr "이벤트"
+#: ../src/library/LibraryWindow.vala:1273
+msgid "Writing metadata to files..."
+msgstr "파일에 메타 정보 쓰는 중..."
 
-#: src/events/EventsDirectoryPage.vala:244
-msgid "Undated"
-msgstr "업데이트 함"
+#: ../src/library/OfflinePage.vala:8
+msgid "Missing Files"
+msgstr "찾을 수 없는 파일"
 
-#: src/events/EventsDirectoryPage.vala:245
-msgid "%Y"
-msgstr "%Y"
+#: ../src/library/OfflinePage.vala:106
+msgid "Deleting..."
+msgstr "삭제하는 중..."
 
-#: src/events/EventsDirectoryPage.vala:246
-msgid "%B"
-msgstr "%B"
+#: ../src/library/TrashPage.vala:8
+msgid "Trash"
+msgstr "휴지통"
 
-#: src/events/EventPage.vala:129
-msgid "No Event"
-msgstr "이벤트 없음"
+#: ../src/library/TrashPage.vala:108
+msgid "Trash is empty"
+msgstr "휴지통이 비어있습니다"
 
-#: src/AppDirs.vala:48 src/AppDirs.vala:99
-#, c-format
-msgid "Unable to create cache directory %s: %s"
-msgstr "캐시 디렉터리 %s을(를) 만들 수 없습니다: %s"
+#: ../src/library/TrashPage.vala:112
+msgid "Delete"
+msgstr "삭제"
 
-#: src/AppDirs.vala:58 src/AppDirs.vala:88
+#: ../src/library/TrashPage.vala:113
+msgid "Deleting Photos"
+msgstr "사진 삭제"
+
+#: ../src/main.vala:54
 #, c-format
-msgid "Unable to create data directory %s: %s"
-msgstr "데이터 디렉터리 %1$s을(를) 만들 수 없습니다: %2$s"
+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 ""
+"사진 라이브러리가 이 버전의 샷웰과는 호환되지 않습니다. 이 라이브러리는 샷웰 "
+"%s (schema %d)(으)로 만들어진 것으로 보이지만 이 프로그램의 버전은 %s "
+"(schema %d)입니다. 최신 버전의 샷웰을 사용하십시오."
 
-#: src/AppDirs.vala:152
-msgid "Pictures"
-msgstr "사진"
+#: ../src/main.vala:59
+#, 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 ""
+"샷웰이 사진 라이브러리를 버전 %s (schema %d)에서 %s (schema %d)(으)로 업그레"
+"이드 할 수 없습니다. 더 많은 정보는 %s에 있는 샷웰 위키에서 찾을 수 있습니다."
 
-#: src/AppDirs.vala:190
+#: ../src/main.vala:65
 #, c-format
-msgid "Unable to create temporary directory %s: %s"
-msgstr "임시 디렉터리 %1$s을(를) 만들 수 없습니다: %2$s"
+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 ""
+"사진 라이브러리가 이 버전의 샷웰과는 호환되지 않습니다. 이 라이브러리는 샷웰 "
+"%s (schema %d)(으)로 만들어진 것으로 보이지만 이 프로그램의 버전은 %s "
+"(schema %d)입니다. %s(을)를 지우셔서 라이브러리를 지우신 후 사진을 다시 가져"
+"오십시오."
 
-#: src/AppDirs.vala:207 src/AppDirs.vala:223
+#: ../src/main.vala:71
 #, c-format
-msgid "Unable to create data subdirectory %s: %s"
-msgstr "데이터 하위 디렉터리 %1$s을(를) 만들 수 없습니다: %2$s"
+msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgstr "샷웰 데이터베이스 확인 시도 중 알 수 없는 오류가 발생했습니다: %s"
 
-#: src/slideshow/TransitionEffects.vala:98
-msgid "(None)"
-msgstr "(없음)"
+#: ../src/main.vala:104
+msgid "Loading Shotwell"
+msgstr "샷웰 불러오는 중"
 
-#: src/slideshow/TransitionEffects.vala:287
-msgid "None"
-msgstr "없음"
+#: ../src/main.vala:294
+msgid "Path to Shotwell's private data"
+msgstr "샷웰 개인 정보 저장 경로"
 
-#: src/slideshow/TransitionEffects.vala:339
-msgid "Random"
-msgstr "임의"
+#: ../src/main.vala:294
+msgid "DIRECTORY"
+msgstr "디렉터리"
 
-#: src/slideshow/Slideshow.vala:22
-msgid "Slideshow Transitions"
-msgstr "슬라이드 쇼 전환 효과"
+#: ../src/main.vala:298
+msgid "Do not monitor library directory at runtime for changes"
+msgstr "시작할 때 라이브러리 디렉터리에 바뀐 점이 있는지 확인하지 않기"
+
+#: ../src/main.vala:302
+msgid "Don't display startup progress meter"
+msgstr "시작 진행 상태 표시하지 않기"
+
+#: ../src/main.vala:306
+msgid "Show the application's version"
+msgstr "프로그램 버전 보이기"
+
+#. init GTK (valac has already called g_threads_init())
+#: ../src/main.vala:338
+msgid "[FILE]"
+msgstr "[파일]"
 
-#: src/Exporter.vala:232
+#: ../src/main.vala:342
 #, c-format
-msgid "Unable to generate a temporary file for %s: %s"
-msgstr "%s의 임시 파일을 만들 수 없습니다: %s"
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"사용 가능한 명령 줄 옵션을 모두 보려면 '%s --help' 명령어를 실행하십시오.\n"
 
-#: src/Exporter.vala:299
-msgid "Exporting"
-msgstr "내보내는 중"
+#: ../src/photos/BmpSupport.vala:32
+msgid "BMP"
+msgstr "BPM"
+
+#: ../src/photos/JfifSupport.vala:84
+msgid "JPEG"
+msgstr "JPEG"
 
-#: src/Exporter.vala:317
+#: ../src/photos/JfifSupport.vala:185
 #, c-format
-msgid "File %s already exists.  Replace?"
-msgstr "파일 %s(이)가 이미 존재합니다. 바꾸시겠습니까?"
+msgid "Low (%d%%)"
+msgstr "낮음(%d%%)"
 
-#: src/Exporter.vala:319
-msgid "_Skip"
-msgstr "건너 뛰기(_S)"
+#: ../src/photos/JfifSupport.vala:188
+#, c-format
+msgid "Medium (%d%%)"
+msgstr "중간(%d%%)"
 
-#: src/Exporter.vala:319
-msgid "_Replace"
-msgstr "바꾸기(_R)"
+#: ../src/photos/JfifSupport.vala:191
+#, c-format
+msgid "High (%d%%)"
+msgstr "높음(%d%%)"
 
-#: src/Exporter.vala:319
-msgid "Replace _All"
-msgstr "모두 바꾸기(_A)"
+#: ../src/photos/JfifSupport.vala:194
+#, c-format
+msgid "Maximum (%d%%)"
+msgstr "최대(%d%%)"
 
-#: src/Exporter.vala:319
-msgid "Export"
-msgstr "내보내기"
+#: ../src/photos/PngSupport.vala:30
+msgid "PNG"
+msgstr "PNG"
 
-#: src/SearchFilter.vala:593 src/SearchFilter.vala:594
-msgid "Photos"
-msgstr "사진"
+#: ../src/photos/RawSupport.vala:134
+msgid "RAW"
+msgstr "RAW"
 
-#: src/SearchFilter.vala:599 src/SearchFilter.vala:600
-msgid "Videos"
-msgstr "비디오"
+#: ../src/photos/TiffSupport.vala:86
+msgid "TIFF"
+msgstr "TIFF"
 
-#: src/SearchFilter.vala:605
-msgid "RAW Photos"
-msgstr "RAW 사진"
+#: ../src/publishing/Publishing.vala:16
+msgid "Publishing"
+msgstr "업로드 중"
 
-#: src/SearchFilter.vala:606
-msgid "RAW photos"
-msgstr "RAW 사진"
+#: ../src/publishing/PublishingPluginHost.vala:11
+msgid "Preparing for upload"
+msgstr "업로드 준비 중"
 
-#: src/SearchFilter.vala:952
+#: ../src/publishing/PublishingPluginHost.vala:12
 #, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "UI 파일 %s을(를) 불러올 수 없습니다: %s"
+msgid "Uploading %d of %d"
+msgstr "전체 %2$d개 가운데 %1$d개 업로드 중"
 
-#: src/SearchFilter.vala:969
-msgid "Type"
-msgstr "형식"
+#: ../src/publishing/PublishingPluginHost.vala:81
+#, c-format
+msgid "Publishing to %s can't continue because an error occurred:"
+msgstr "오류가 발생하여 %s(으)로 업로드할 수 없습니다:"
 
-#: src/publishing/Publishing.vala:16
-msgid "Publishing"
-msgstr "업로드 중 "
+#: ../src/publishing/PublishingPluginHost.vala:84
+msgid "To try publishing to another service, select one from the above menu."
+msgstr "위 메뉴에서 하나를 선택하여 다른 서비스로 업로드하십시오."
 
-#: src/publishing/PublishingUI.vala:105
+#: ../src/publishing/PublishingUI.vala:105
 msgid "The selected photos/videos were successfully published."
 msgstr "선택하신 사진/비디오를 성공적으로 업로드했습니다."
 
-#: src/publishing/PublishingUI.vala:107
+#: ../src/publishing/PublishingUI.vala:107
 msgid "The selected videos were successfully published."
 msgstr "선택하신 비디오를 성공적으로 업로드했습니다."
 
-#: src/publishing/PublishingUI.vala:109
+#: ../src/publishing/PublishingUI.vala:109
 msgid "The selected photos were successfully published."
 msgstr "선택하신 사진을 성공적으로 업로드했습니다."
 
-#: src/publishing/PublishingUI.vala:112
+#: ../src/publishing/PublishingUI.vala:112
 msgid "The selected video was successfully published."
 msgstr "선택하신 비디오를 성공적으로 업로드했습니다."
 
-#: src/publishing/PublishingUI.vala:114
+#: ../src/publishing/PublishingUI.vala:114
 msgid "The selected photo was successfully published."
 msgstr "선택하신 사진을 성공적으로 업로드했습니다."
 
-#: src/publishing/PublishingUI.vala:122
+#: ../src/publishing/PublishingUI.vala:122
 msgid "Fetching account information..."
 msgstr "계정 정보 가져오는 중..."
 
-#: src/publishing/PublishingUI.vala:128
+#: ../src/publishing/PublishingUI.vala:128
 msgid "Logging in..."
 msgstr "로그인 중..."
 
-#: src/publishing/PublishingUI.vala:183
+#: ../src/publishing/PublishingUI.vala:185
 msgid "Publish Photos"
 msgstr "사진 업로드"
 
-#: src/publishing/PublishingUI.vala:184
+#: ../src/publishing/PublishingUI.vala:186
 msgid "Publish photos _to:"
 msgstr "사진을 업로드할 곳(_T):"
 
-#: src/publishing/PublishingUI.vala:186
+#: ../src/publishing/PublishingUI.vala:188
 msgid "Publish Videos"
 msgstr "비디오 업로드"
 
-#: src/publishing/PublishingUI.vala:187
+#: ../src/publishing/PublishingUI.vala:189
 msgid "Publish videos _to"
 msgstr "다음에 비디오 업로드(_T):"
 
-#: src/publishing/PublishingUI.vala:189
+#: ../src/publishing/PublishingUI.vala:191
 msgid "Publish Photos and Videos"
 msgstr "사진과 비디오 업로드"
 
-#: src/publishing/PublishingUI.vala:190
+#: ../src/publishing/PublishingUI.vala:192
 msgid "Publish photos and videos _to"
 msgstr "다음에 사진과 비디오 업로드(_T)"
 
-#: src/publishing/PublishingUI.vala:383
+#. There are no enabled publishing services that accept this media type,
+#. warn the user.
+#: ../src/publishing/PublishingUI.vala:360
 msgid "Unable to publish"
 msgstr "사진을 업로드 할 수 없음"
 
-#: src/publishing/PublishingUI.vala:384
+#: ../src/publishing/PublishingUI.vala:361
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -3509,973 +4484,446 @@ msgid ""
 msgstr ""
 "알맞은 업로드 플러그인을 사용하고 있지 않아 선택한 항목을 업로드할 수 없습니"
 "다.이 문제를 해결하려면 <b>편접 %s 기본 설정</b>을 선택한 뒤 <b>플러그인</b> "
-"탭에서사용할 플러그인을 선택해주십시오."
-
-#: src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr "업로드 준비 중"
-
-#: src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
-msgstr "전체 %2$d개 가운데 %1$d개 업로드 중"
-
-#: src/publishing/PublishingPluginHost.vala:81
-#, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
-msgstr "오류가 발생하여 %s(으)로 업로드할 수 없습니다:"
-
-#: src/publishing/PublishingPluginHost.vala:84
-msgid "To try publishing to another service, select one from the above menu."
-msgstr "위 메뉴에서 하나를 선택하여 다른 서비스로 업로드하십시오."
-
-#: src/sidebar/Tree.vala:199
-msgid "New _Tag..."
-msgstr "새 태그(_T)..."
-
-#: plugins/common/RESTSupport.vala:424
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:971
-#, fuzzy
-msgid "A temporary file needed for publishing is unavailable"
-msgstr ""
-"업로드에 필요한 임시 파일을 사용할 수 없습니다 "
-
-#: plugins/common/RESTSupport.vala:1138
-msgid ""
-"You have already logged in and out of a Google service during this Shotwell "
-"session.\n"
-"\n"
-"To continue publishing to Google services, quit and restart Shotwell, then "
-"try publishing again."
-msgstr ""
-"이 샷웰 세션 사용 중 이미 구글 서비스에 로그인 후 로그아웃 하셨습니다.\n"
-"계속 구글 서비스로 업로드하시려면, 샷웰을 끝낸 후 다시 시작한 후업로드하십시"
-"오."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:57
-msgid ""
-"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 ""
-"현재 유튜브에 로그인하지 않았습니다.\n"
-"\n"
-"계속 하시려면 구글 계정 등록이 되어있어야 하고 유튜브를 사용할 수 있도록 설정"
-"해야 합니다. 웹 브라우저를 이용하여 한번 이상 유튜브 사이트에 로그인 하시면 "
-"대부분의 계정을 설정할 수 있습니다."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:362
-msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
-"continue."
-msgstr ""
-"업로드에 필요한 파일을 사용할 수 없습니다. 유튜브로 계속 업로드할 수 없습니"
-"다."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:461
-#, c-format
-msgid "You are logged into YouTube as %s."
-msgstr "유튜브에 %s(으)로 로그인했습니다."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:463
-#, c-format
-msgid "Videos will appear in '%s'"
-msgstr "'%s' 안에 비디오가 나타납니다."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:495
-msgid "Public listed"
-msgstr "목록에 있는 것 공개"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
-msgid "Public unlisted"
-msgstr "목록에 없는 것 공개"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
-msgid "Private"
-msgstr "개인"
-
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr "핵심 업로드 서비스"
-
-#: 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 ""
-"플리커 서비스에 로그인하지 않았습니다.\n"
-"\n"
-"웹 브라우저로 Flickr 사이트를 여신 후 로그인을 클릭해주십시오. 샷웰이 플리커 "
-"계정 링크에 접근하는 것을 허용해야 합니다."
-
-#: 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 ""
-"이 샷웰 세션 사용 중 이미 Flickr에 로그인 후 로그아웃 하셨습니다.\n"
-"계속 플리커로 업로드하시려면, 샷웰을 끝낸 후 다시 시작하여 업로드하십시오."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:375
-msgid "Preparing for login..."
-msgstr "로그인 준비 중..."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:595
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can't "
-"continue."
-msgstr ""
-"업로드에 필요한 파일을 사용할 수 없습니다. 플리커로 계속 업로드할 수 없습니"
-"다."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "인증 확인 중..."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1153
-#, c-format
-msgid ""
-"You are logged into Flickr as %s.\n"
-"\n"
-msgstr ""
-"플리커에 %s(으)로 로그인했습니다.\n"
-"\n"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
-#, 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 ""
-"플리커 무료 계정은 한 달에 업로드할 수 있는 데이터에 제한이 있습니다.\n"
-"이 달에 업로드할 수 있는 데이터는 %d 메가바이트가 남아있습니다."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1157
-msgid "Your Flickr Pro account entitles you to unlimited uploads."
-msgstr "플리커 프로 계정은 업로드에 제한이 없습니다."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1162
-msgid "Photos _visible to:"
-msgstr "사진을 보여줄 사람(_V):"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
-msgid "Videos _visible to:"
-msgstr "비디오를 보여줄 사람(_V):"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1167
-msgid "Photos and videos _visible to:"
-msgstr "사진과 비디오를 보여줄 사람(_V):"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1234
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1182
-msgid "Everyone"
-msgstr "모두"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
-msgid "Friends & family only"
-msgstr "가족과 친구만"
+"탭에서사용할 플러그인을 선택하십시오."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-msgid "Family only"
-msgstr "가족만 "
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
-msgid "Friends only"
-msgstr "친구만"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1180
-msgid "Just me"
-msgstr "나만"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1229
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1246
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "500 x 375 pixels"
-msgstr "500 x 375 픽셀"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1230
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1247
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:108
-msgid "1024 x 768 pixels"
-msgstr "1024 x 768 픽셀"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1248
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 픽셀"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1249
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 픽셀"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:746
-#, c-format
-msgid "Creating album %s..."
-msgstr "앨범 %s 만드는 중..."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:917
-msgid "An error message occurred when publishing to Piwigo. Please try again."
-msgstr ""
-"피위고로 사진을 업로드 하던 중 오류가 발생했습니다. 다시 시도해주십시오."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:998
-msgid ""
-"Enter the URL of your Piwigo photo library as well as the username and "
-"password associated with your Piwigo account for that library."
-msgstr ""
-"피위고 사진 라이브러리 주소와 이 계정의 라이브러리를 사용할 수 있는 사용자 이"
-"름 및 암호를 입력하십시오."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:999
-msgid ""
-"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
-"entered"
-msgstr ""
-"샷웰이 피위고 사진 라이브러리에 접근할 수 없습니다. 입력한 주소를 확인하십시"
-"오."
+#: ../src/searches/Branch.vala:68
+msgid "Saved Searches"
+msgstr "저장한 검색"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1000
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:590
-#, fuzzy
-msgid "Username and/or password invalid. Please try again"
-msgstr ""
-"사용자 이름이나 암호 혹은 모든 항목이 올바르지 않습니다. 다시 시도해주십시오."
+#. Ordering must correspond with SearchConditionText.Context
+#: ../src/searches/SavedSearchDialog.vala:168
+msgid "contains"
+msgstr "포함"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1032
-#, c-format
-msgid "Invalid URL"
-msgstr "올바르지 않은 주소"
+#. Ordering must correspond with Context
+#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:500
+msgid "is exactly"
+msgstr "정확하게 일치"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1037
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:620
-#, c-format
-msgid "Invalid User Name or Password"
-msgstr "사용자 이름 또는 암호가 올바르지 않습니다."
+#: ../src/searches/SavedSearchDialog.vala:170
+msgid "starts with"
+msgstr "다음으로 시작"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1127
-#: plugins/shotwell-publishing/PicasaPublishing.vala:59
-#: plugins/shotwell-publishing/FacebookPublishing.vala:61
-msgid "Shotwell Connect"
-msgstr "샷웰 접속"
+#: ../src/searches/SavedSearchDialog.vala:171
+msgid "ends with"
+msgstr "다음으로 끝남"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1235
-msgid "Admins, Family, Friends, Contacts"
-msgstr "관리자, 가족, 친구, 연락처"
+#: ../src/searches/SavedSearchDialog.vala:172
+msgid "does not contain"
+msgstr "포함하지 않음"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1236
-msgid "Admins, Family, Friends"
-msgstr "관리자, 가족, 친구 "
+#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:504
+msgid "is not set"
+msgstr "설정하지 않음"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1237
-msgid "Admins, Family"
-msgstr "관리자, 가족"
+#: ../src/searches/SavedSearchDialog.vala:174
+msgid "is set"
+msgstr "설정"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1238
-msgid "Admins"
-msgstr "관리자"
+#. Ordering must correspond with SearchConditionMediaType.Context
+#: ../src/searches/SavedSearchDialog.vala:248
+#: ../src/searches/SavedSearchDialog.vala:379
+#: ../src/searches/SavedSearchDialog.vala:444
+msgid "is"
+msgstr "같음"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:58
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have "
-"to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
-"현재 피카사 웹 앨범에 로그인하지 않았습니다.\n"
-"\n"
-"웹 브라우저에서 로그인을 클릭하여 피카사 웹 앨범으로 로그인합니다. 피카사 웹 "
-"앨범 계정에 연결하려면 샷웰 연결을 승인해야 합니다."
+#: ../src/searches/SavedSearchDialog.vala:249
+msgid "is not"
+msgstr "같지 않음"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:361
-msgid ""
-"A file required for publishing is unavailable. Publishing to Picasa can't "
-"continue."
-msgstr ""
-"업로드에 필요한 파일을 사용할 수 없습니다. 피카사로 계속 업로드할 수 없습니"
-"다."
+#. Ordering must correspond with SearchConditionMediaType.MediaType
+#: ../src/searches/SavedSearchDialog.vala:255
+msgid "any photo"
+msgstr "모든 사진"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
-#: plugins/shotwell-publishing/FacebookPublishing.vala:347
-msgid "Creating album..."
-msgstr "앨범 만드는 중..."
+#: ../src/searches/SavedSearchDialog.vala:256
+msgid "a raw photo"
+msgstr "RAW 사진"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:659
-#, c-format
-msgid "You are logged into Picasa Web Albums as %s."
-msgstr "피카사 웹 앨범에 %s(으)로 로그인 했습니다."
+#: ../src/searches/SavedSearchDialog.vala:257
+msgid "a video"
+msgstr "비디오"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
-msgid "Videos will appear in:"
-msgstr "비디오가 나타나는 시간:"
+#: ../src/searches/SavedSearchDialog.vala:311
+msgid "has"
+msgstr "다음 항목이 있음"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:670
-msgid "Photos will appear in:"
-msgstr "사진이 나타나는 시간:"
+#: ../src/searches/SavedSearchDialog.vala:312
+msgid "has no"
+msgstr "다음 항목이 있음"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "작게(640 x 480 픽셀)"
+#: ../src/searches/SavedSearchDialog.vala:317
+msgid "modifications"
+msgstr "수정"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "중간(1024 x 768 픽셀)"
+#: ../src/searches/SavedSearchDialog.vala:318
+msgid "internal modifications"
+msgstr "내부 수정"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "추천(1600 x 1200 픽셀)"
+#: ../src/searches/SavedSearchDialog.vala:319
+msgid "external modifications"
+msgstr "외부 수정"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "구글+(2048 x 1536 픽셀)"
+#. Ordering must correspond with SearchConditionFlagged.State
+#: ../src/searches/SavedSearchDialog.vala:373
+msgid "flagged"
+msgstr "표시함"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:63
-msgid ""
-"You are not currently logged into Facebook.\n"
-"\n"
-"If you don't yet have a Facebook account, you can create one during the "
-"login process. During login, Shotwell Connect may ask you for permission to "
-"upload photos and publish to your feed. These permissions are required for "
-"Shotwell Connect to function."
-msgstr ""
-"현재 페이스 북에 로그인하지 않았습니다.\n"
-"\n"
-"페이스 북 계정이 아직 없는 경우 로그인 과정 중 만드실 수 있습니다. 로그인 중 "
-"샷웰 연결이 사진을 업로드하거나 피드에 업로드할 권한을 요구할 수 있습니다. "
-"이 권한은 샷웰 연결이 동작하는데 필요합니다."
+#: ../src/searches/SavedSearchDialog.vala:374
+msgid "not flagged"
+msgstr "표시하지 않음"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:65
-msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"이 샷웰 세션에서는 이미 페이스 북에 로그인과 로그아웃을 하셨습니다.\n"
-"계속 페이스 북에 업로드하시려면, 샷웰을 다시 시작한 후 업로드하십시오."
+#: ../src/searches/SavedSearchDialog.vala:437
+msgid "and higher"
+msgstr "이상인 것"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:86
-msgid "Standard (720 pixels)"
-msgstr "표준(720 pixels)"
+#: ../src/searches/SavedSearchDialog.vala:438
+msgid "only"
+msgstr "일치하는 것"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:89
-msgid "Large (2048 pixels)"
-msgstr "큼(2048 pixels)"
+#: ../src/searches/SavedSearchDialog.vala:439
+msgid "and lower"
+msgstr "이하인 것"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:254
-msgid "Testing connection to Facebook..."
-msgstr "페이스북 연결을 확인하는 중..."
+#: ../src/searches/SavedSearchDialog.vala:501
+msgid "is after"
+msgstr "다음 값 다음"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:374
-msgid ""
-"A file required for publishing is unavailable. Publishing to Facebook can't "
-"continue."
-msgstr ""
-"업로드에 필요한 파일을 사용할 수 없습니다. 페이스북으로 계속 업로드할 수 없습"
-"니다."
+#: ../src/searches/SavedSearchDialog.vala:502
+msgid "is before"
+msgstr "다음 값 전"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1019
-#, c-format
-msgid ""
-"You are logged into Facebook as %s.\n"
-"\n"
-msgstr "페이스 북에 %s(으)로 로그인했습니다.\n"
+#: ../src/searches/SavedSearchDialog.vala:503
+msgid "is between"
+msgstr "다음 값 사이"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1020
-msgid "Where would you like to publish the selected photos?"
-msgstr "선택한 사진을 어디로 업로드하시겠습니까?"
+#: ../src/searches/SavedSearchDialog.vala:516
+msgid "and"
+msgstr "그리고"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1021
-msgid "Upload _size:"
-msgstr "업로드 크기(_S):"
+#: ../src/searches/SavedSearchDialog.vala:695
+msgid "Search"
+msgstr "검색"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1181
-msgid "Friends"
-msgstr "친구"
+#: ../src/searches/SavedSearchDialog.vala:700
+msgid "Cancel"
+msgstr "취소"
 
-#: plugins/shotwell-transitions/CrumbleEffect.vala:20
-msgid "Crumble"
-msgstr "부서지는 효과"
+#: ../src/searches/SavedSearchDialog.vala:701
+msgid "OK"
+msgstr "확인"
 
-#: plugins/shotwell-transitions/ChessEffect.vala:20
-msgid "Chess"
-msgstr "체스판 무늬"
+#: ../src/searches/SavedSearchDialog.vala:719
+msgid "any"
+msgstr "일부 일치"
 
-#: plugins/shotwell-transitions/CirclesEffect.vala:20
-msgid "Circles"
-msgstr "여러 개의 동그라미"
+#: ../src/searches/SavedSearchDialog.vala:720
+msgid "all"
+msgstr "모두 일치"
 
-#: plugins/shotwell-transitions/BlindsEffect.vala:20
-msgid "Blinds"
-msgstr "블라인드"
+#: ../src/searches/SavedSearchDialog.vala:721
+msgid "none"
+msgstr "없음"
 
-#: plugins/shotwell-transitions/StripesEffect.vala:20
-msgid "Stripes"
-msgstr "줄무늬"
+#: ../src/searches/SearchBoolean.vala:157
+msgid "Any text"
+msgstr "모든 텍스트"
 
-#: plugins/shotwell-transitions/ClockEffect.vala:20
-msgid "Clock"
-msgstr "시계 효과"
+#: ../src/searches/SearchBoolean.vala:160
+msgid "Title"
+msgstr "제목"
 
-#: plugins/shotwell-transitions/CircleEffect.vala:20
-msgid "Circle"
-msgstr "동그라미"
+#: ../src/searches/SearchBoolean.vala:163
+msgid "Tag"
+msgstr "태그"
 
-#: plugins/shotwell-transitions/shotwell-transitions.vala:28
-msgid "Core Slideshow Transitions"
-msgstr "핵심 슬라이드 쇼 전환 효과 잼-전이: EOF "
+#: ../src/searches/SearchBoolean.vala:166
+msgid "Comment"
+msgstr "설명"
 
-#: plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
-msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
+#: ../src/searches/SearchBoolean.vala:169
+msgid "Event name"
+msgstr "이벤트 이름"
 
-#: plugins/shotwell-transitions/SlideEffect.vala:20
-msgid "Slide"
-msgstr "슬라이드"
+#: ../src/searches/SearchBoolean.vala:172
+msgid "File name"
+msgstr "파일 이름"
 
-#: plugins/shotwell-transitions/FadeEffect.vala:20
-msgid "Fade"
-msgstr "사라지는 효과"
+#: ../src/searches/SearchBoolean.vala:175
+msgid "Media type"
+msgstr "미디어 형식"
 
-#: plugins/shotwell-transitions/SquaresEffect.vala:20
-msgid "Squares"
-msgstr "여러 사각형"
+#: ../src/searches/SearchBoolean.vala:178
+msgid "Flag state"
+msgstr "표시 상태"
 
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "핵심 데이터 가져오기 서비스"
+#: ../src/searches/SearchBoolean.vala:181
+msgid "Photo state"
+msgstr "사진 상태"
 
-#: 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 ""
-"F-Spot 라이브러리 가져오기 서비스 사용을 환영합니다.\n"
-"\n"
-"샷웰이 발견한 라이브러리를 선택하거나 F-Spot 데이터베이스 파일을 선택해주십시"
-"오."
+#: ../src/searches/SearchBoolean.vala:187
+msgid "Date"
+msgstr "날짜"
 
-#: 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 ""
-"F-Spot 라이브러리 가져오기 서비스 사용을 환영합니다.\n"
-"\n"
-"F-Spot 데이터베이스 파일을 선택해주십시오."
+#: ../src/sidebar/Tree.vala:189
+msgid "New _Tag..."
+msgstr "새 태그(_T)..."
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid "Manually select an F-Spot database file to import:"
-msgstr "가져올 F-Spot 데이터베이스 파일 직접 선택:"
+#: ../src/slideshow/Slideshow.vala:22
+msgid "Slideshow Transitions"
+msgstr "슬라이드 쇼 전환 효과"
 
-#: 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 ""
-"선택한 F-Spot 데이터베이스 파일을 열 수 없습니다: 파일이 존재하지 않거나 F-"
-"Spot 데이터베이스 파일이 아닙니다."
+#: ../src/slideshow/TransitionEffects.vala:98
+msgid "(None)"
+msgstr "(없음)"
 
-#: 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 ""
-"선택한 F-Spot 데이터베이스 파일을 열 수 없습니다: 샷웰이 이 버전의 F-Spot 데"
-"이터베이스 파일을 지원하지 않습니다."
+#: ../src/slideshow/TransitionEffects.vala:287
+msgid "None"
+msgstr "없음"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"선택한 F-Spot 데이터베이스 파일을 읽을 수 없습니다: 태그 테이블을 읽던 중 오"
-"류가 발생했습니다."
+#: ../src/slideshow/TransitionEffects.vala:339
+msgid "Random"
+msgstr "임의"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"선택한 F-Spot 데이터베이스 파일을 읽을 수 없습니다: 사진 테이블을 읽던 중 오"
-"류가 발생했습니다."
+#: ../src/tags/Branch.vala:127
+msgid "Tags"
+msgstr "태그"
 
-#: 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 ""
-"샷웰이 F-Spot 라이브러리에서 %d매의 사진을 발견했으며 지금 가져오고 있습니"
-"다. 중복된 파일은 자동으로 검출한 후 제거합니다.\n"
-"\n"
-"가져오기 작업은 백그라운드에서 계속되기 때문에 이 대화 상자를 닫은 후 샷웰을 "
-"계속 사용할 수 있습니다."
+#: ../ui/set_background_dialog.glade.h:1
+msgid "Set as Desktop Background"
+msgstr "데스크톱 배경 화면으로 설정"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:84
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "F-Spot 라이브러리: %s"
+#: ../ui/set_background_dialog.glade.h:2
+#: ../ui/set_background_slideshow_dialog.glade.h:6
+msgid "Use for Desktop"
+msgstr "데스크톱에 사용"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:416
-msgid "Preparing to import"
-msgstr "가져오기 준비 중 "
+#: ../ui/set_background_dialog.glade.h:3
+#: ../ui/set_background_slideshow_dialog.glade.h:7
+msgid "Use for Lock Screen"
+msgstr "잠금 화면에 사용"
 
-#: ui/set_background_dialog.glade:14
+#: ../ui/set_background_slideshow_dialog.glade.h:1
 msgid "Set as Desktop Slideshow"
 msgstr "데스크톱 슬라이드 쇼로 설정"
 
-#: ui/set_background_dialog.glade:55
-msgid "Generate desktop background slideshow"
-msgstr "데스크톱 배경 슬라이드 쇼 만들기"
-
-#: ui/set_background_dialog.glade:82
+#: ../ui/set_background_slideshow_dialog.glade.h:2
 msgid "Show each photo for"
 msgstr "각 사진을 표시할 시간"
 
-#: ui/set_background_dialog.glade:94
+#: ../ui/set_background_slideshow_dialog.glade.h:3
 msgid "period of time"
 msgstr "시간"
 
-#: ui/set_background_dialog.glade:116
+#: ../ui/set_background_slideshow_dialog.glade.h:4
+msgid "Generate desktop background slideshow"
+msgstr "데스크톱 배경 슬라이드 쇼 만들기"
+
+#: ../ui/set_background_slideshow_dialog.glade.h:5
 msgid "How long each photo is shown on the desktop background"
 msgstr "각 그림이 데스크톱 배경에 얼마나 오래 표시될지 설정합니다"
 
-#: ui/shotwell.glade:7
-msgid "Search"
-msgstr "검색"
-
-#: ui/shotwell.glade:47
+#: ../ui/shotwell.glade.h:1
 msgid "_Name of search:"
 msgstr "검색 이름(_N):"
 
-#: ui/shotwell.glade:108
+#: ../ui/shotwell.glade.h:2
 msgid "_Match"
 msgstr "일치(_M)"
 
-#: ui/shotwell.glade:137
+#: ../ui/shotwell.glade.h:3
 msgid "of the following:"
 msgstr "조건:"
 
-#: ui/shotwell.glade:218
+#: ../ui/shotwell.glade.h:4
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>인쇄한 사진 크기</b>"
 
-#: ui/shotwell.glade:235
+#: ../ui/shotwell.glade.h:5
 msgid "Use a _standard size:"
 msgstr "표준 크기 사용(_S):"
 
-#: ui/shotwell.glade:278
+#: ../ui/shotwell.glade.h:6
 msgid "Use a c_ustom size:"
 msgstr "사용자 설정 크기 사용(_U):"
 
-#: ui/shotwell.glade:368
+#: ../ui/shotwell.glade.h:7
 msgid "_Match photo aspect ratio"
 msgstr "사진 비율 맞추기(_M)"
 
-#: ui/shotwell.glade:392
+#: ../ui/shotwell.glade.h:8
 msgid "_Autosize:"
 msgstr "자동으로 크기 조정(_A):"
 
-#: ui/shotwell.glade:432
+#: ../ui/shotwell.glade.h:9
 msgid "<b>Titles</b>"
 msgstr "<b>제목</b>"
 
-#: ui/shotwell.glade:449
+#: ../ui/shotwell.glade.h:10
 msgid "Print image _title"
 msgstr "이미지 제목 인쇄(_T)"
 
-#: ui/shotwell.glade:493
+#: ../ui/shotwell.glade.h:11
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>픽셀 해상도</b>"
 
-#: ui/shotwell.glade:513
+#: ../ui/shotwell.glade.h:12
 msgid "_Output photo at:"
 msgstr "인쇄할 사진 해상도(_O):"
 
-#: ui/shotwell.glade:548
+#: ../ui/shotwell.glade.h:13
 msgid "pixels per inch"
 msgstr "PPI"
 
-#: ui/shotwell.glade:581 ui/shotwell.glade:623
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:27
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:27
-#, fuzzy
-msgid "label"
-msgstr ""
-"이름표"
-
-#: ui/shotwell.glade:719
+#: ../ui/shotwell.glade.h:15
 msgid "Shotwell Preferences"
 msgstr "샷웰 기본 설정"
 
-#: ui/shotwell.glade:796
+#: ../ui/shotwell.glade.h:16
 msgid "white"
 msgstr "흰색"
 
-#: ui/shotwell.glade:823
+#: ../ui/shotwell.glade.h:17
 msgid "black"
 msgstr "검정"
 
-#: ui/shotwell.glade:871
+#: ../ui/shotwell.glade.h:19
 msgid "_Watch library directory for new files"
 msgstr "라이브러리 감시해 디렉터리에 있는 새 파일 찾기(_W)"
 
-#: ui/shotwell.glade:900
+#: ../ui/shotwell.glade.h:20
 msgid "Metadata"
 msgstr "메타 데이터"
 
-#: ui/shotwell.glade:920
+#: ../ui/shotwell.glade.h:21
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "태그, 제목 그리고 다른 메타 데이터를 사진 파일에 기록합니다(_M)"
 
-#: ui/shotwell.glade:946
+#: ../ui/shotwell.glade.h:22
 msgid "Display"
 msgstr "표시"
 
-#: ui/shotwell.glade:967
+#: ../ui/shotwell.glade.h:23
 msgid "_Import photos to:"
 msgstr "다음 위치로 사진 가져오기(_I):"
 
-#: ui/shotwell.glade:990
+#: ../ui/shotwell.glade.h:24
 msgid "_Background:"
 msgstr "배경(_B):"
 
-#: ui/shotwell.glade:1013
+#: ../ui/shotwell.glade.h:25
 msgid "Importing"
 msgstr "가져오기"
 
-#: ui/shotwell.glade:1036
+#: ../ui/shotwell.glade.h:26
 msgid "_Directory structure:"
 msgstr "디렉터리 구조(_D):"
 
-#: ui/shotwell.glade:1075
+#: ../ui/shotwell.glade.h:27
 msgid "_Pattern:"
 msgstr "패턴(_P):"
 
-#: ui/shotwell.glade:1157
+#: ../ui/shotwell.glade.h:28
 msgid "Example:"
 msgstr "예제:"
 
-#: ui/shotwell.glade:1174
+#: ../ui/shotwell.glade.h:29
 msgid "R_ename imported files to lowercase"
 msgstr "가져온 파일 이름을 소문자로 바꿉니다(_E)"
 
-#: ui/shotwell.glade:1203
+#: ../ui/shotwell.glade.h:30
 msgid "RAW Developer"
 msgstr "RAW 편집 프로그램"
 
-#: ui/shotwell.glade:1238
+#: ../ui/shotwell.glade.h:31
 msgid "De_fault:"
 msgstr "기본값(_F):"
 
-#: ui/shotwell.glade:1292
+#: ../ui/shotwell.glade.h:33
 msgid "E_xternal photo editor:"
 msgstr "외부 사진 편집기(_X):"
 
-#: ui/shotwell.glade:1308
+#: ../ui/shotwell.glade.h:34
 msgid "External _RAW editor:"
 msgstr "외부 RAW 편집 프로그램(_R):"
 
-#: ui/shotwell.glade:1373
+#: ../ui/shotwell.glade.h:35
 msgid "External Editors"
 msgstr "외부 편집 프로그램"
 
-#: ui/shotwell.glade:1400
+#: ../ui/shotwell.glade.h:36
 msgid "Plugins"
 msgstr "플러그인"
 
-#: ui/shotwell.glade:1469
+#: ../ui/shotwell.glade.h:37
 msgid "_Delay:"
 msgstr "지연 시간(_D):"
 
-#: ui/shotwell.glade:1485
+#: ../ui/shotwell.glade.h:38
 msgid "_Transition effect:"
 msgstr "전환 효과(_T):"
 
-#: ui/shotwell.glade:1501
+#: ../ui/shotwell.glade.h:39
 msgid "Transition d_elay:"
 msgstr "전환 지연 시간(_E):"
 
-#: ui/shotwell.glade:1513
+#: ../ui/shotwell.glade.h:40
 msgid "Show t_itle"
 msgstr "제목 표시(_I)"
 
-#: ui/shotwell.glade:1603 ui/shotwell.glade:1616
+#: ../ui/shotwell.glade.h:41
 msgid "seconds"
 msgstr "초"
 
-#: ui/shotwell.glade:1696
-msgid "_Login"
-msgstr "로그인(_L)"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:21
-msgid ""
-" (text depends on fb username and is modified in the app - \n"
-"anything put into this field won't display)"
-msgstr ""
-"(텍스트는 페이스북 사용자 이름에 의존하며 프로그램에서 수정했습니다 - \n"
-"이 항목에 입력하는 모든 내용은 표시하지 않습니다)"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:39
-msgid "Publish to an e_xisting album:"
-msgstr "이미 존재하는 앨범에 업로드(_X):"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:57
-msgid "Create a _new album named:"
-msgstr "다음 이름을 가진 새 앨범 만들기(_N):"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:139
-msgid "Videos and new photo albums _visible to:"
-msgstr "사진과 비디오를 보여줄 사람(_V):"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:175
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:102
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:178
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:226
-msgid ""
-"_Remove location, camera, and other identifying information before uploading"
-msgstr "업로드 전에 위치, 카메라 등의 개인을 식별할 수 있는 정보를 제거(_R)"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:197
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:137
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:229
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:99
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:115
-msgid "_Logout"
-msgstr "로그아웃(_L)"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:212
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:153
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:243
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:115
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:129
-msgid "_Publish"
-msgstr "업로드(_P)"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:16
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"웹 브라우저로 플리커에 로그인한 후 나타나는 확인 번호를 입력해주십시오."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:37
-msgid "Authorization _Number:"
-msgstr "인증 번호(_N):"
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:19
-msgid ""
-"You are logged into Flickr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-msgstr ""
-"플리커에 (name)(으)로 로그인했습니다.\n"
-"\n"
-"(이 레이블의 문자열은 혼잡한 상태이며 코드 내부에 설정되어 있습니다, \n"
-"그러므로 여기서 만든 모든 바뀐 내용은 표시되지 않습니다)"
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:44
-msgid "_visibility label (populated in the code)"
-msgstr "사진 표시 라벨(_V)(코드가 혼잡합니다)"
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:61
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:60
-msgid "Photo _size:"
-msgstr "사진 크기(_S):"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:18
-msgid ""
-"'you are logged in as $name'\n"
-"(populated in the application code)"
-msgstr ""
-"$name(으)로 로그인했습니다.\n"
-"(프로그램 코드가 혼잡합니다)"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:75
-msgid "An _existing album:"
-msgstr "이미 존재하는 앨범에 업로드(_E):"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:94
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:52
-msgid "A _new album named:"
-msgstr "다음 이름의 앨범 만들기(_N):"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:113
-msgid "L_ist album in public gallery"
-msgstr "공개 갤러리에 있는 앨범 목록 보이기(_I)"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:134
-msgid ""
-"$mediatype will appear in\n"
-"(populated in code)"
-msgstr ""
-"$mediatype이(가) 잠시 후 나타납니다\n"
-"(코드가 혼잡합니다)"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:150
-msgid "Photo _size preset:"
-msgstr "사진 크기 프리셋(_S):"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:49
-msgid "_URL of your Piwigo photo library"
-msgstr "피위고 사진 라이브러리 주소(_U)"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:59
-msgid "User _name"
-msgstr "사용자 이름(_N)"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:73
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:59
-msgid "_Password"
-msgstr "암호(_P)"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:130
-msgid "_Remember Password"
-msgstr "암호 저장(_R)"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:151
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:107
-msgid "Login"
-msgstr "로그인"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:40
-msgid "An _existing category:"
-msgstr "이미 존재하는 분류에 업로드(_E):"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:121
-msgid "Photos will be _visible by:"
-msgstr "사진을 보여줄 사람(_V):"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:149
-msgid "Photo size:"
-msgstr "사진 크기:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:176
-msgid "within category:"
-msgstr "업로드할 분류:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:210
-msgid "Album comment:"
-msgstr "앨범 설명:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:242
-msgid "_If a title is set and comment unset, use title as comment"
-msgstr "사진 제목은 설정했지만 설명이 없으면 제목을 설명으로 사용합니다(_I)"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:258
-msgid "_Do no upload tags"
-msgstr "업로드 태그를 사용하지 않음(_D)"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:278
-msgid "Logout"
-msgstr "로그아웃"
-
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:55
-msgid "Video privacy _setting:"
-msgstr "비디오 사생활 설정(_S):"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:38
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:109
-msgid "1280 x 853 pixels"
-msgstr "1280 x 853 픽셀"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:313
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:323
-#, c-format
-msgid "'%s' isn't a valid response to an OAuth authentication request"
-msgstr "'%s'이(가) OAuth 인증 요청에 올바른 응답을 보내지 않습니다 "
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:561
-msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): 시작할 수 없습니다; 이 업로드 도구를 다시 시작할 "
-"수 없습니다."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:589
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr "Tumblr 계정을 사용할 수 있는 사용자 이름과 암호를 입력해주십시오."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:639
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:760
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "UI를 불러올 수 없음: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:742
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"%s 계정으로 Tumblr에 로그인했습니다..\n"
-"\n"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:24
-msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:27
-msgid "Visit the Yandex.Fotki web site"
-msgstr "Yandex.Fotki 웹사이트 방문"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:635
-msgid "You are not currently logged into Yandex.Fotki."
-msgstr "Yandex.Fotki에 로그인하지 않았습니다."
-
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:49
-msgid "_Email address"
-msgstr "전자 메일 주소(_E)"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:19
-msgid ""
-"You are logged into Tumblr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-msgstr ""
-"(name)으로 Tumblr에 로그인했습니다.\n"
-"\n"
-"(이 라벨의 문자열이 배치되어 코드 내부에 설정되기 때문에 \n"
-"여기에서 바꾼 내용은 표시하지 않습니다)"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:43
-msgid "Blogs:"
-msgstr "블로그:"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:24
-msgid "_Albums (or write new):"
-msgstr "앨범(또는 새 것 만들기)(_A):"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:38
-msgid "Access _type:"
-msgstr "접근 형식(_T):"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:81
-msgid "Disable _comments"
-msgstr "설명 감추기(_C)"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:96
-msgid "_Forbid downloading original photo"
-msgstr "원본 사진 다운로드를 허용하지 않음(_F)"
+#~ msgid "A file required for publishing is unavailable. Publishing to "
+#~ msgstr "다음 사이트에 업로드할 파일을 사용할 수 없습니다."
+
+#~ msgid "Import media _from:"
+#~ msgstr "프로그램에서 미디어 가져오기(_F):"
+
+#~ msgid "Only _Remove"
+#~ msgstr "라이브러리에서 제거(_R)"
+
+#~ msgid "Shotwell is configured to import photos to your home directory.\n"
+#~ msgstr "샷웰이 사진을 사용자 홈 디렉터리로 가져오도록 설정했습니다.\n"
+
+#~ msgid ""
+#~ " (text depends on fb username and is modified in the app - \n"
+#~ "anything put into this field won't display)"
+#~ msgstr ""
+#~ "(텍스트는 페이스북 사용자 이름에 의존하며 프로그램에서 수정했습니다 - \n"
+#~ "이 항목에 입력하는 모든 내용은 표시하지 않습니다)"
+
+#~ msgid ""
+#~ "You are logged into Flickr as (name).\n"
+#~ "\n"
+#~ "(this label's string is populated and set inside the code, \n"
+#~ "so changes made here will not display)"
+#~ msgstr ""
+#~ "플리커에 (name)(으)로 로그인했습니다.\n"
+#~ "\n"
+#~ "(이 레이블의 문자열은 혼잡한 상태이며 코드 내부에 설정되어 있습니다, \n"
+#~ "그러므로 여기서 만든 모든 바뀐 내용은 표시되지 않습니다)"
+
+#~ msgid "_visibility label (populated in the code)"
+#~ msgstr "사진 표시 라벨(_V)(코드가 혼잡합니다)"
+
+#~ msgid ""
+#~ "$mediatype will appear in\n"
+#~ "(populated in code)"
+#~ msgstr ""
+#~ "$mediatype이(가) 잠시 후 나타납니다\n"
+#~ "(코드가 혼잡합니다)"
+
+#~ msgid ""
+#~ "You are logged into Tumblr as (name).\n"
+#~ "\n"
+#~ "(this label's string is populated and set inside the code, \n"
+#~ "so changes made here will not display)"
+#~ msgstr ""
+#~ "(name)으로 Tumblr에 로그인했습니다.\n"
+#~ "\n"
+#~ "(이 라벨의 문자열이 배치되어 코드 내부에 설정되기 때문에 \n"
+#~ "여기에서 바꾼 내용은 표시하지 않습니다)"
diff --git a/po/pl.po b/po/pl.po
index 6f1e908..dab138a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,14 +6,14 @@
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 # verayin <vera@yorba.org>, 2011.
 # lsbeeler <lucas@yorba.org>, 2011.
-# Piotr Drąg <piotrdrag@gmail.com>, 2011-2014.
-# Aviary.pl <gnomepl@aviary.pl>, 2014.
+# Piotr Drąg <piotrdrag@gmail.com>, 2011-2015.
+# Aviary.pl <gnomepl@aviary.pl>, 2014-2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-29 18:21+0200\n"
-"PO-Revision-Date: 2014-05-29 18:23+0200\n"
+"POT-Creation-Date: 2015-03-22 16:34+0100\n"
+"PO-Revision-Date: 2015-03-22 16:35+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -48,13 +48,13 @@ msgstr ""
 msgid "Visit the Shotwell home page"
 msgstr "Witryna programu Shotwell"
 
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:688
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
 msgid "translator-credits"
 msgstr ""
 "verayin <vera@yorba.org>, 2011\n"
 "lsbeeler <lucas@yorba.org>, 2011\n"
-"Piotr Drąg <piotrdrag@gmail.com>, 2011-2014\n"
-"Aviary.pl <gnomepl@aviary.pl>, 2014"
+"Piotr Drąg <piotrdrag@gmail.com>, 2011-2015\n"
+"Aviary.pl <gnomepl@aviary.pl>, 2014-2015"
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:32
@@ -63,8 +63,8 @@ msgstr ""
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
 #: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
 #: ../src/Resources.vala:27
-msgid "Copyright 2009-2014 Yorba Foundation"
-msgstr "Copyright 2009-2014 Fundacja Yorba"
+msgid "Copyright 2009-2015 Yorba Foundation"
+msgstr "Copyright 2009-2015 Fundacja Yorba"
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:56
 msgid ""
@@ -145,7 +145,7 @@ msgstr ""
 msgid "F-Spot library: %s"
 msgstr "Kolekcja programu F-Spot: %s"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:416
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
 msgid "Preparing to import"
 msgstr "Przygotowywanie importu"
 
@@ -169,7 +169,7 @@ msgstr ""
 "Należy już posiadać konto w serwisie Gallery3, aby ukończyć proces logowania."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: ../src/MediaPage.vala:420 ../src/photos/RawSupport.vala:297
+#: ../src/MediaPage.vala:435 ../src/photos/RawSupport.vala:300
 msgid "Shotwell"
 msgstr "Shotwell"
 
@@ -200,18 +200,23 @@ msgstr ""
 "obsługiwane przez oprogramowanie Flowplayer."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1774
-msgid "A file required for publishing is unavailable. Publishing to "
-msgstr "Plik wymagany do publikowania jest niedostępny. Publikowanie w "
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+#, c-format
+msgid ""
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
+msgstr ""
+"Plik wymagany do publikowania jest niedostępny. Nie można kontynuować "
+"publikowania do serwisu %s."
 
 #. populate any widgets whose contents are
 #. programmatically-generated
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
 #, c-format
 msgid "Publishing to %s as %s."
 msgstr "Publikowanie w %s jako użytkownik %s."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1816
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
 msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
@@ -219,7 +224,7 @@ msgstr ""
 "Proszę podać adres URL witryny Gallery3 oraz nazwę użytkownika i hasło (lub "
 "klucz API) dla konta w serwisie Gallery3."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
 msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
@@ -227,7 +232,7 @@ msgstr ""
 "Niepoprawna nazwa użytkownika i hasło lub klucz API. Proszę spróbować "
 "ponownie, wpisując nazwę użytkownika i hasło poniżej."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
 msgid ""
 "The URL entered does not appear to be the main directory of a Gallery3 "
 "instance. Please make sure you typed it correctly and it does not have any "
@@ -237,11 +242,11 @@ msgstr ""
 "upewnić, że wpisano go poprawnie i nie zawiera żadnych dodatkowych części "
 "końcowych (np. index.php)."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1871
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
 msgid "Unrecognized User"
 msgstr "Nierozpoznany użytkownik"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1876
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
 msgid " Site Not Found"
 msgstr " Nie odnaleziono witryny"
 
@@ -355,13 +360,13 @@ msgid "Copyright 2012 BJA Electronics"
 msgstr "Copyright 2012 BJA Electronics"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1229
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
 msgid "500 x 375 pixels"
 msgstr "500x375 pikseli"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1230
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
 msgid "1024 x 768 pixels"
 msgstr "1024x768 pikseli"
@@ -435,7 +440,7 @@ msgid "Go _Back"
 msgstr "_Wstecz"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
-#: ../ui/shotwell.glade.h:43
+#: ../ui/shotwell.glade.h:42
 msgid "_Login"
 msgstr "Za_loguj"
 
@@ -492,7 +497,7 @@ msgid "pixels"
 msgstr "piksele"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
 #: ../src/Dimensions.vala:17
 msgid "Original size"
@@ -506,7 +511,7 @@ msgstr "Szerokość lub wysokość"
 #: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
 #: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
 #: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
-#: ../ui/shotwell.glade.h:15
+#: ../ui/shotwell.glade.h:14
 msgid "label"
 msgstr "etykieta"
 
@@ -636,12 +641,12 @@ msgid "Upload _size:"
 msgstr "_Rozmiar wysyłania:"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
 msgid "Just me"
 msgstr "Tylko dla mnie"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
 msgid "Everyone"
 msgstr "Wszystkich"
@@ -696,50 +701,61 @@ msgstr ""
 "Zalogowano w serwisie Flickr jako użytkownik %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
 #, 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 ""
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"Darmowe konto w serwisie Flickr ogranicza ilość przesyłanych danych na "
+"miesiąc.\n"
+"W tym miesiącu pozostało %d megabajt."
+msgstr[1] ""
+"Darmowe konto w serwisie Flickr ogranicza ilość przesyłanych danych na "
+"miesiąc.\n"
+"W tym miesiącu pozostało %d megabajty."
+msgstr[2] ""
 "Darmowe konto w serwisie Flickr ogranicza ilość przesyłanych danych na "
 "miesiąc.\n"
 "W tym miesiącu pozostało %d megabajtów."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1157
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Konto Flickr Pro umożliwia nieograniczone wysyłanie."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1162
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
 msgid "Photos _visible to:"
 msgstr "Zdjęcia _widoczne dla:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
 msgid "Videos _visible to:"
 msgstr "Nagrania wideo _widoczne dla:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
 msgid "Photos and videos _visible to:"
 msgstr "Zdjęcia i nagrania wideo _widoczne dla:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
 msgid "Friends & family only"
 msgstr "Tylko przyjaciół i rodziny"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
 msgid "Family only"
 msgstr "Tylko rodzina"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Friends only"
 msgstr "Tylko przyjaciele"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
 msgid "2048 x 1536 pixels"
 msgstr "2048x1536 pikseli"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
 msgid "4096 x 3072 pixels"
 msgstr "4096x3072 piksele"
@@ -977,7 +993,7 @@ msgid "Logout"
 msgstr "Wyloguj"
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:268
+#: ../src/Resources.vala:303
 msgid "Publish"
 msgstr "Opublikuj"
 
@@ -1034,8 +1050,8 @@ msgid "Core Slideshow Transitions"
 msgstr "Główne przejścia pokazu slajdów"
 
 #: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
-msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Fundacja Yorba"
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Fundacja Yorba"
 
 #: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
 #, c-format
@@ -1062,56 +1078,39 @@ msgstr "Nie można utworzyć katalogu tymczasowego %s: %s"
 msgid "Unable to create data subdirectory %s: %s"
 msgstr "Nie można utworzyć podkatalogu danych %s: %s"
 
-#. restore pin state
-#: ../src/AppWindow.vala:52
+#: ../src/AppWindow.vala:53
 msgid "Pin Toolbar"
 msgstr "Przypnij pasek narzędziowy"
 
-#: ../src/AppWindow.vala:53
+#: ../src/AppWindow.vala:54
 msgid "Pin the toolbar open"
 msgstr "Przypina pasek narzędziowy"
 
-#: ../src/AppWindow.vala:57 ../src/AppWindow.vala:135
+#: ../src/AppWindow.vala:59
 msgid "Leave fullscreen"
 msgstr "Opuszcza pełny ekran"
 
-#: ../src/AppWindow.vala:134
-msgid "Leave _Fullscreen"
-msgstr "Opuść p_ełny ekran"
-
-#: ../src/AppWindow.vala:493
-msgid "_Quit"
-msgstr "Za_kończ"
-
-#: ../src/AppWindow.vala:498
-msgid "_About"
-msgstr "_O programie"
-
-#: ../src/AppWindow.vala:503
-msgid "Fulls_creen"
-msgstr "_Pełny ekran"
-
-#: ../src/AppWindow.vala:508
+#: ../src/AppWindow.vala:525
 msgid "_Contents"
 msgstr "_Spis treści"
 
-#: ../src/AppWindow.vala:513
+#: ../src/AppWindow.vala:530
 msgid "_Frequently Asked Questions"
 msgstr "Naj_częściej zadawane pytania"
 
-#: ../src/AppWindow.vala:518
+#: ../src/AppWindow.vala:535
 msgid "_Report a Problem..."
 msgstr "_Zgłoś problem..."
 
-#: ../src/AppWindow.vala:617 ../src/AppWindow.vala:638
-#: ../src/AppWindow.vala:655 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1417 ../src/Dialogs.vala:1440
-#: ../src/data_imports/DataImportsUI.vala:399
-#: ../src/publishing/PublishingUI.vala:498
+#: ../src/AppWindow.vala:634 ../src/AppWindow.vala:655
+#: ../src/AppWindow.vala:672 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
+#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441 ../src/Resources.vala:162
+#: ../src/data_imports/DataImportsUI.vala:374
+#: ../src/publishing/PublishingUI.vala:475
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../src/AppWindow.vala:665
+#: ../src/AppWindow.vala:682
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
@@ -1124,21 +1123,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/AppWindow.vala:685
+#: ../src/AppWindow.vala:702
 msgid "Visit the Yorba web site"
 msgstr "Witryna Fundacji Yorba"
 
-#: ../src/AppWindow.vala:697
+#: ../src/AppWindow.vala:714
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Nie można wyświetlić pomocy: %s"
 
-#: ../src/AppWindow.vala:705
+#: ../src/AppWindow.vala:722
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Nie można przejść do bazy danych błędów: %s"
 
-#: ../src/AppWindow.vala:713
+#: ../src/AppWindow.vala:730
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Nie można wyświetlić dokumentu FAQ: %s"
@@ -1204,11 +1203,11 @@ msgstr "Uszkodzony plik obrazu"
 msgid "Imported failed (%d)"
 msgstr "Zaimportowanie się nie powiodło (%d)"
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2634
+#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
 msgid "S_lideshow"
 msgstr "Pokaz s_lajdów"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2635
+#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
 msgid "Play a slideshow"
 msgstr "Odtwarza pokaz slajdów"
 
@@ -1221,7 +1220,7 @@ msgid "Export Photos/Videos"
 msgstr "Eksport zdjęć/nagrań wideo"
 
 #: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3207
+#: ../src/PhotoPage.vala:3211
 msgid "Export Photo"
 msgstr "Eksport zdjęcia"
 
@@ -1269,47 +1268,47 @@ msgstr "Ulepszanie"
 msgid "Undoing Enhance"
 msgstr "Cofanie ulepszania"
 
-#: ../src/Commands.vala:845
+#: ../src/Commands.vala:853
 msgid "Applying Color Transformations"
 msgstr "Zastosowywanie przekształceń kolorów"
 
-#: ../src/Commands.vala:845
+#: ../src/Commands.vala:853
 msgid "Undoing Color Transformations"
 msgstr "Cofanie przekształceń kolorów"
 
-#: ../src/Commands.vala:995
+#: ../src/Commands.vala:1003
 msgid "Creating New Event"
 msgstr "Tworzenie nowego wydarzenia"
 
-#: ../src/Commands.vala:996
+#: ../src/Commands.vala:1004
 msgid "Removing Event"
 msgstr "Usuwanie wydarzenia"
 
-#: ../src/Commands.vala:1005
+#: ../src/Commands.vala:1013
 msgid "Moving Photos to New Event"
 msgstr "Przenoszenie zdjęć do nowego wydarzenia"
 
-#: ../src/Commands.vala:1006
+#: ../src/Commands.vala:1014
 msgid "Setting Photos to Previous Event"
 msgstr "Ustawianie zdjęć do poprzedniego wydarzenia"
 
-#: ../src/Commands.vala:1063
+#: ../src/Commands.vala:1071
 msgid "Merging"
 msgstr "Łączenie"
 
-#: ../src/Commands.vala:1064
+#: ../src/Commands.vala:1072
 msgid "Unmerging"
 msgstr "Cofanie łączenia"
 
-#: ../src/Commands.vala:1073
+#: ../src/Commands.vala:1081
 msgid "Duplicating photos"
 msgstr "Tworzenie duplikatów zdjęć"
 
-#: ../src/Commands.vala:1073
+#: ../src/Commands.vala:1081
 msgid "Removing duplicated photos"
 msgstr "Usuwanie duplikatów zdjęć"
 
-#: ../src/Commands.vala:1096
+#: ../src/Commands.vala:1104
 #, c-format
 msgid "Unable to duplicate one photo due to a file error"
 msgid_plural "Unable to duplicate %d photos due to file errors"
@@ -1317,54 +1316,54 @@ msgstr[0] "Nie można utworzyć duplikatu zdjęcia z powodu błędu pliku"
 msgstr[1] "Nie można utworzyć duplikatu %d zdjęć z powodu błędów plików"
 msgstr[2] "Nie można utworzyć duplikatu %d zdjęć z powodu błędów plików"
 
-#: ../src/Commands.vala:1183
+#: ../src/Commands.vala:1191
 msgid "Restoring previous rating"
 msgstr "Przywracanie poprzedniej oceny"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
 msgid "Increasing ratings"
 msgstr "Zwiększanie ocen"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
 msgid "Decreasing ratings"
 msgstr "Zmniejszanie ocen"
 
-#: ../src/Commands.vala:1244
+#: ../src/Commands.vala:1252
 msgid "Setting RAW developer"
 msgstr "Ustawianie wywoływacza RAW"
 
-#: ../src/Commands.vala:1244
+#: ../src/Commands.vala:1252
 msgid "Restoring previous RAW developer"
 msgstr "Przywracanie poprzedniego wywoływacza RAW"
 
-#: ../src/Commands.vala:1245
+#: ../src/Commands.vala:1253
 msgid "Set Developer"
 msgstr "Ustaw wywoływacz"
 
-#: ../src/Commands.vala:1335
+#: ../src/Commands.vala:1343
 msgid "Original photo could not be adjusted."
 msgstr "Nie można dostosować pierwotnego zdjęcia."
 
-#: ../src/Commands.vala:1356
+#: ../src/Commands.vala:1364
 msgid "Adjusting Date and Time"
 msgstr "Dostosowywanie daty i czasu"
 
-#: ../src/Commands.vala:1356
+#: ../src/Commands.vala:1364
 msgid "Undoing Date and Time Adjustment"
 msgstr "Cofanie dostosowania daty i czasu"
 
-#: ../src/Commands.vala:1387
+#: ../src/Commands.vala:1395
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
 msgstr[0] "Nie można dostosować jednego pierwotnego zdjęcia."
 msgstr[1] "Nie można dostosować poniższych pierwotnych zdjęć."
 msgstr[2] "Nie można dostosować poniższych pierwotnych zdjęć."
 
-#: ../src/Commands.vala:1389 ../src/Commands.vala:1413
+#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
 msgid "Time Adjustment Error"
 msgstr "Błąd dostosowania czasu"
 
-#: ../src/Commands.vala:1411
+#: ../src/Commands.vala:1419
 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."
@@ -1372,60 +1371,60 @@ msgstr[0] "Nie można cofnąć dostosowania czasu na poniższym pliku zdjęcia."
 msgstr[1] "Nie można cofnąć dostosowania czasu na poniższych plikach zdjęć."
 msgstr[2] "Nie można cofnąć dostosowania czasu na poniższych plikach zdjęć."
 
-#: ../src/Commands.vala:1625 ../src/Commands.vala:1648
+#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
 msgid "Create Tag"
 msgstr "Utwórz etykietę"
 
-#: ../src/Commands.vala:1683
+#: ../src/Commands.vala:1691
 #, c-format
 msgid "Move Tag \"%s\""
 msgstr "Przenieś etykietę \"%s\""
 
-#: ../src/Commands.vala:2335
+#: ../src/Commands.vala:2343
 msgid "Move Photos to Trash"
 msgstr "Przenieś zdjęcia do kosza"
 
-#: ../src/Commands.vala:2335
+#: ../src/Commands.vala:2343
 msgid "Restore Photos from Trash"
 msgstr "Przywróć zdjęcia z kosza"
 
-#: ../src/Commands.vala:2336
+#: ../src/Commands.vala:2344
 msgid "Move the photos to the Shotwell trash"
 msgstr "Przenosi zdjęcia do kosza programu Shotwell"
 
-#: ../src/Commands.vala:2336
+#: ../src/Commands.vala:2344
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Przywraca zdjęcia z powrotem do kolekcji programu Shotwell"
 
-#: ../src/Commands.vala:2355
+#: ../src/Commands.vala:2363
 msgid "Moving Photos to Trash"
 msgstr "Przenoszenie zdjęć do kosza"
 
-#: ../src/Commands.vala:2355
+#: ../src/Commands.vala:2363
 msgid "Restoring Photos From Trash"
 msgstr "Przywracanie zdjęć z kosza"
 
-#: ../src/Commands.vala:2441
+#: ../src/Commands.vala:2449
 msgid "Flag selected photos"
 msgstr "Dodaje flagę do wybranych zdjęć"
 
-#: ../src/Commands.vala:2442
+#: ../src/Commands.vala:2450
 msgid "Unflag selected photos"
 msgstr "Usuwa flagę z wybranych zdjęć"
 
-#: ../src/Commands.vala:2443
+#: ../src/Commands.vala:2451
 msgid "Flagging selected photos"
 msgstr "Oznaczanie zaznaczonych zdjęć flagą"
 
-#: ../src/Commands.vala:2444
+#: ../src/Commands.vala:2452
 msgid "Unflagging selected photos"
 msgstr "Cofanie oznaczeń zdjęć flagą"
 
-#: ../src/Commands.vala:2451
+#: ../src/Commands.vala:2459
 msgid "Flag"
 msgstr "Dodaj flagę"
 
-#: ../src/Commands.vala:2451
+#: ../src/Commands.vala:2459
 msgid "Unflag"
 msgstr "Usuń flagę"
 
@@ -1456,9 +1455,9 @@ msgstr[0] "Etykieta \"%s\" zostanie usunięta ze zdjęcia. Kontynuować?"
 msgstr[1] "Etykieta \"%s\" zostanie usunięta z %d zdjęć. Kontynuować?"
 msgstr[2] "Etykieta \"%s\" zostanie usunięta z %d zdjęć. Kontynuować?"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1385
-#: ../src/Resources.vala:328 ../src/Resources.vala:376
-#: ../src/Resources.vala:641
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
+#: ../src/Resources.vala:163 ../src/Resources.vala:369
+#: ../src/Resources.vala:417 ../src/Resources.vala:682
 msgid "_Delete"
 msgstr "_Usuń"
 
@@ -1536,44 +1535,44 @@ msgid "Current"
 msgstr "Bieżące"
 
 #. layout controls
-#: ../src/Dialogs.vala:212
+#: ../src/Dialogs.vala:213
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../src/Dialogs.vala:215
+#: ../src/Dialogs.vala:216
 msgid "_Quality:"
 msgstr "_Jakość:"
 
-#: ../src/Dialogs.vala:218
+#: ../src/Dialogs.vala:219
 msgid "_Scaling constraint:"
 msgstr "Ograniczenie _skalowania:"
 
-#: ../src/Dialogs.vala:221
-msgid " _pixels"
-msgstr " pi_ksele"
+#: ../src/Dialogs.vala:222
+msgid "_Pixels:"
+msgstr "_Piksele:"
 
-#: ../src/Dialogs.vala:229
+#: ../src/Dialogs.vala:225
 msgid "Export metadata"
 msgstr "Wyeksportuj metadane"
 
-#: ../src/Dialogs.vala:465
+#: ../src/Dialogs.vala:459
 msgid "Save Details..."
 msgstr "Zapisz szczegóły..."
 
-#: ../src/Dialogs.vala:466
+#: ../src/Dialogs.vala:460
 msgid "Save Details"
 msgstr "Zapisz szczegóły"
 
-#: ../src/Dialogs.vala:481
+#: ../src/Dialogs.vala:475
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(oraz %d więcej)\n"
 
-#: ../src/Dialogs.vala:534
+#: ../src/Dialogs.vala:528
 msgid "Import Results Report"
 msgstr "Zaimportuj raport o wynikach"
 
-#: ../src/Dialogs.vala:538
+#: ../src/Dialogs.vala:532
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
@@ -1581,7 +1580,7 @@ msgstr[0] "Spróbowano zaimportować %d plik."
 msgstr[1] "Spróbowano zaimportować %d pliki."
 msgstr[2] "Spróbowano zaimportować %d plików."
 
-#: ../src/Dialogs.vala:541
+#: ../src/Dialogs.vala:535
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -1592,30 +1591,30 @@ msgstr[2] "%d plik zostało pomyślnie zaimportowanych."
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:553
+#: ../src/Dialogs.vala:547
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Niezaimportowane duplikaty zdjęć/nagrań wideo:"
 
-#: ../src/Dialogs.vala:557
+#: ../src/Dialogs.vala:551
 msgid "duplicates existing media item"
 msgstr "duplikuje istniejący element multimedialny"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: ../src/Dialogs.vala:568
+#: ../src/Dialogs.vala:562
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Niezaimportowane zdjęcia/nagrania wideo z powodu błędów aparatu:"
 
-#: ../src/Dialogs.vala:571 ../src/Dialogs.vala:586 ../src/Dialogs.vala:601
-#: ../src/Dialogs.vala:617 ../src/Dialogs.vala:632 ../src/Dialogs.vala:646
+#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
+#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
 msgid "error message:"
 msgstr "komunikat błędu:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: ../src/Dialogs.vala:582
+#: ../src/Dialogs.vala:576
 msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgstr ""
 "Niezaimportowane pliki, ponieważ nie zostały rozpoznane jako zdjęcia lub "
@@ -1624,7 +1623,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: ../src/Dialogs.vala:597
+#: ../src/Dialogs.vala:591
 msgid ""
 "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
 "Understands:"
@@ -1635,7 +1634,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: ../src/Dialogs.vala:612
+#: ../src/Dialogs.vala:606
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
 "Library:"
@@ -1643,7 +1642,7 @@ msgstr ""
 "Niezaimportowane pliki, ponieważ program Shotwell nie mógł skopiować ich do "
 "kolekcji:"
 
-#: ../src/Dialogs.vala:616
+#: ../src/Dialogs.vala:610
 #, c-format
 msgid ""
 "couldn't copy %s\n"
@@ -1655,18 +1654,18 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: ../src/Dialogs.vala:628
+#: ../src/Dialogs.vala:622
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Nie zaimportowano zdjęć/nagrań wideo, ponieważ pliki są uszkodzone:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: ../src/Dialogs.vala:643
+#: ../src/Dialogs.vala:637
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Niezaimportowane pliki z innego powodu:"
 
-#: ../src/Dialogs.vala:663
+#: ../src/Dialogs.vala:657
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
@@ -1674,7 +1673,7 @@ msgstr[0] "Jeden duplikat zdjęcia nie został zaimportowany:\n"
 msgstr[1] "%d duplikaty zdjęć nie zostały zaimportowane:\n"
 msgstr[2] "%d duplikatów zdjęć nie zostało zaimportowanych:\n"
 
-#: ../src/Dialogs.vala:666
+#: ../src/Dialogs.vala:660
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
@@ -1682,7 +1681,7 @@ msgstr[0] "Jeden duplikat nagrania wideo nie został zaimportowany:\n"
 msgstr[1] "%d duplikaty nagrań wideo nie zostały zaimportowane:\n"
 msgstr[2] "%d duplikatów nagrań wideo nie zostało zaimportowanych:\n"
 
-#: ../src/Dialogs.vala:669
+#: ../src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
@@ -1690,7 +1689,7 @@ msgstr[0] "Jeden duplikat zdjęcia/nagrania wideo nie został zaimportowany:\n"
 msgstr[1] "%d duplikaty zdjęć/nagrań wideo nie zostały zaimportowane:\n"
 msgstr[2] "%d duplikatów zdjęć/nagrań wideo nie zostało zaimportowanych:\n"
 
-#: ../src/Dialogs.vala:683
+#: ../src/Dialogs.vala:677
 #, 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"
@@ -1702,7 +1701,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Zaimportowanie %d zdjęć się nie powiodło z powodu błędu pliku lub sprzętu:\n"
 
-#: ../src/Dialogs.vala:686
+#: ../src/Dialogs.vala:680
 #, 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"
@@ -1716,7 +1715,7 @@ msgstr[2] ""
 "Zaimportowanie %d nagrań wideo się nie powiodło z powodu błędu pliku lub "
 "sprzętu:\n"
 
-#: ../src/Dialogs.vala:689
+#: ../src/Dialogs.vala:683
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -1731,7 +1730,7 @@ msgstr[2] ""
 "Zaimportowanie %d zdjęć/nagrań wideo się nie powiodło z powodu błędu pliku "
 "lub sprzętu:\n"
 
-#: ../src/Dialogs.vala:692
+#: ../src/Dialogs.vala:686
 #, 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"
@@ -1743,7 +1742,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Zaimportowanie %d plików się nie powiodło z powodu błędu pliku lub sprzętu:\n"
 
-#: ../src/Dialogs.vala:706
+#: ../src/Dialogs.vala:700
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -1760,7 +1759,7 @@ msgstr[2] ""
 "Zaimportowanie %d zdjęć się nie powiodło, ponieważ katalog kolekcji zdjęć "
 "nie jest zapisywalny:\n"
 
-#: ../src/Dialogs.vala:709
+#: ../src/Dialogs.vala:703
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -1777,7 +1776,7 @@ msgstr[2] ""
 "Zaimportowanie %d nagrań wideo się nie powiodło, ponieważ katalog kolekcji "
 "zdjęć nie jest zapisywalny:\n"
 
-#: ../src/Dialogs.vala:712
+#: ../src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1795,7 +1794,7 @@ msgstr[2] ""
 "Zaimportowanie %d zdjęć/nagrań wideo się nie powiodło, ponieważ katalog "
 "kolekcji zdjęć nie jest zapisywalny:\n"
 
-#: ../src/Dialogs.vala:715
+#: ../src/Dialogs.vala:709
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -1812,7 +1811,7 @@ msgstr[2] ""
 "Zaimportowanie %d plików się nie powiodło, ponieważ katalog kolekcji zdjęć "
 "nie jest zapisywalny:\n"
 
-#: ../src/Dialogs.vala:729
+#: ../src/Dialogs.vala:723
 #, 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"
@@ -1821,7 +1820,7 @@ msgstr[0] ""
 msgstr[1] "Zaimportowanie %d zdjęć się nie powiodło z powodu błędu aparatu:\n"
 msgstr[2] "Zaimportowanie %d zdjęć się nie powiodło z powodu błędu aparatu:\n"
 
-#: ../src/Dialogs.vala:732
+#: ../src/Dialogs.vala:726
 #, 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"
@@ -1833,7 +1832,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Zaimportowanie %d nagrań wideo się nie powiodło z powodu błędu aparatu:\n"
 
-#: ../src/Dialogs.vala:735
+#: ../src/Dialogs.vala:729
 #, 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"
@@ -1847,7 +1846,7 @@ msgstr[2] ""
 "Zaimportowanie %d zdjęć/nagrań wideo się nie powiodło z powodu błędu "
 "aparatu:\n"
 
-#: ../src/Dialogs.vala:738
+#: ../src/Dialogs.vala:732
 #, 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"
@@ -1856,7 +1855,7 @@ msgstr[0] ""
 msgstr[1] "Zaimportowanie %d plików się nie powiodło z powodu błędu aparatu:\n"
 msgstr[2] "Zaimportowanie %d plików się nie powiodło z powodu błędu aparatu:\n"
 
-#: ../src/Dialogs.vala:752
+#: ../src/Dialogs.vala:746
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
@@ -1868,7 +1867,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Zaimportowanie %d zdjęć się nie powiodło, ponieważ są one uszkodzone:\n"
 
-#: ../src/Dialogs.vala:755
+#: ../src/Dialogs.vala:749
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
@@ -1882,7 +1881,7 @@ msgstr[2] ""
 "Zaimportowanie %d nagrań wideo się nie powiodło, ponieważ są one "
 "uszkodzone:\n"
 
-#: ../src/Dialogs.vala:758
+#: ../src/Dialogs.vala:752
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
@@ -1896,7 +1895,7 @@ msgstr[2] ""
 "Zaimportowanie %d zdjęć/nagrań wideo się nie powiodło, ponieważ są one "
 "uszkodzone:\n"
 
-#: ../src/Dialogs.vala:761
+#: ../src/Dialogs.vala:755
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
@@ -1911,7 +1910,7 @@ msgstr[2] ""
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: ../src/Dialogs.vala:778
+#: ../src/Dialogs.vala:772
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1921,7 +1920,7 @@ msgstr[2] "Pominięto %d nieobsługiwanych zdjęć:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: ../src/Dialogs.vala:793
+#: ../src/Dialogs.vala:787
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
@@ -1929,7 +1928,7 @@ msgstr[0] "Pominięto jeden plik nie będący obrazem.\n"
 msgstr[1] "Pominięto %d pliki nie będące obrazami.\n"
 msgstr[2] "Pominięto %d plików nie będących obrazami.\n"
 
-#: ../src/Dialogs.vala:804
+#: ../src/Dialogs.vala:798
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
@@ -1937,7 +1936,7 @@ msgstr[0] "Pominięto jedno zdjęcie z powodu anulowania przez użytkownika:\n"
 msgstr[1] "Pominięto %d zdjęcia z powodu anulowania przez użytkownika:\n"
 msgstr[2] "Pominięto %d zdjęć z powodu anulowania przez użytkownika:\n"
 
-#: ../src/Dialogs.vala:807
+#: ../src/Dialogs.vala:801
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
@@ -1947,7 +1946,7 @@ msgstr[1] ""
 "Pominięto %d nagrania wideo z powodu anulowania przez użytkownika:\n"
 msgstr[2] "Pominięto %d nagrań wideo z powodu anulowania przez użytkownika:\n"
 
-#: ../src/Dialogs.vala:810
+#: ../src/Dialogs.vala:804
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
@@ -1959,7 +1958,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Pominięto %d zdjęć/nagrań wideo z powodu anulowania przez użytkownika:\n"
 
-#: ../src/Dialogs.vala:813
+#: ../src/Dialogs.vala:807
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
@@ -1967,7 +1966,7 @@ msgstr[0] "Pominięto jeden plik z powodu anulowania na żądanie użytkownika:\
 msgstr[1] "Pominięto %d pliki z powodu anulowania na żądanie użytkownika:\n"
 msgstr[2] "Pominięto %d plików z powodu anulowania na żądanie użytkownika:\n"
 
-#: ../src/Dialogs.vala:827
+#: ../src/Dialogs.vala:821
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
@@ -1975,7 +1974,7 @@ msgstr[0] "Jedno zdjęcie zostało pomyślnie zaimportowane.\n"
 msgstr[1] "%d zdjęcia zostały pomyślnie zaimportowane.\n"
 msgstr[2] "%d zdjęć zostało pomyślnie zaimportowanych.\n"
 
-#: ../src/Dialogs.vala:830
+#: ../src/Dialogs.vala:824
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
@@ -1983,7 +1982,7 @@ msgstr[0] "Jedno nagranie wideo zostało pomyślnie zaimportowane.\n"
 msgstr[1] "%d nagrania wideo zostały pomyślnie zaimportowane.\n"
 msgstr[2] "%d nagrań wideo zostało pomyślnie zaimportowanych.\n"
 
-#: ../src/Dialogs.vala:833
+#: ../src/Dialogs.vala:827
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -1993,15 +1992,15 @@ msgstr[2] "%d zdjęć/nagrań wideo zostało pomyślnie zaimportowanych.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: ../src/Dialogs.vala:849
+#: ../src/Dialogs.vala:843
 msgid "No photos or videos imported.\n"
 msgstr "Nie zaimportowano żadnych zdjęć lub nagrań wideo.\n"
 
-#: ../src/Dialogs.vala:856 ../src/Dialogs.vala:875
+#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
 msgid "Import Complete"
 msgstr "Ukończono importowanie"
 
-#: ../src/Dialogs.vala:1161
+#: ../src/Dialogs.vala:1155
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -2009,7 +2008,7 @@ msgstr[0] "%d sekunda"
 msgstr[1] "%d sekundy"
 msgstr[2] "%d sekund"
 
-#: ../src/Dialogs.vala:1164
+#: ../src/Dialogs.vala:1158
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2017,7 +2016,7 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: ../src/Dialogs.vala:1168
+#: ../src/Dialogs.vala:1162
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -2025,62 +2024,65 @@ msgstr[0] "%d godzina"
 msgstr[1] "%d godziny"
 msgstr[2] "%d godzin"
 
-#: ../src/Dialogs.vala:1171
+#: ../src/Dialogs.vala:1165
 msgid "1 day"
 msgstr "dzień"
 
-#: ../src/Dialogs.vala:1319 ../src/Resources.vala:203
+#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
 msgid "Rename Event"
 msgstr "Zmień nazwę wydarzenia"
 
-#: ../src/Dialogs.vala:1319
+#: ../src/Dialogs.vala:1315
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: ../src/Dialogs.vala:1329 ../src/Resources.vala:272
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
 msgid "Edit Title"
 msgstr "Modyfikacja tytułu"
 
-#: ../src/Dialogs.vala:1329 ../src/Properties.vala:340
+#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: ../src/Dialogs.vala:1343 ../src/Resources.vala:278
+#. Dialog title
+#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
 msgid "Edit Event Comment"
 msgstr "Modyfikuj komentarz wydarzenia"
 
-#: ../src/Dialogs.vala:1343
+#: ../src/Dialogs.vala:1344
 msgid "Edit Photo/Video Comment"
 msgstr "Modyfikuj komentarz zdjęcia/nagrania wideo"
 
-#: ../src/Dialogs.vala:1344 ../src/Properties.vala:630
+#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
 msgid "Comment:"
 msgstr "Komentarz:"
 
-#: ../src/Dialogs.vala:1360
+#: ../src/Dialogs.vala:1361
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "_Przenieś plik do kosza"
 msgstr[1] "_Przenieś pliki do kosza"
 msgstr[2] "_Przenieś pliki do kosza"
 
-#: ../src/Dialogs.vala:1364
+#: ../src/Dialogs.vala:1365
 msgid "_Remove From Library"
 msgstr "_Usuń z kolekcji"
 
-#: ../src/Dialogs.vala:1384 ../src/camera/ImportPage.vala:1739
+#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
 msgid "_Keep"
 msgstr "_Zatrzymaj"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edit?"
 msgstr "Odwrócić zewnętrzną modyfikację?"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edits?"
 msgstr "Odwrócić zewnętrzne modyfikacje?"
 
-#: ../src/Dialogs.vala:1409
+#: ../src/Dialogs.vala:1410
 #, c-format
 msgid "This will destroy all changes made to the external file.  Continue?"
 msgid_plural ""
@@ -2094,15 +2096,15 @@ msgstr[2] ""
 "Unieważni to wszystkie zmiany wprowadzone do %d zewnętrznych plików. "
 "Kontynuować?"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edit"
 msgstr "Od_wróć zewnętrzną modyfikację"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edits"
 msgstr "Od_wróć zewnętrzne modyfikacje"
 
-#: ../src/Dialogs.vala:1434
+#: ../src/Dialogs.vala:1435
 #, c-format
 msgid "This will remove the photo from the library.  Continue?"
 msgid_plural "This will remove %d photos from the library.  Continue?"
@@ -2110,72 +2112,72 @@ msgstr[0] "Zdjęcie zostanie usunięte z kolekcji. Kontynuować?"
 msgstr[1] "%d zdjęcia zostaną usunięte z kolekcji. Kontynuować?"
 msgstr[2] "%d zdjęć zostaną usuniętych z kolekcji. Kontynuować?"
 
-#: ../src/Dialogs.vala:1441
+#: ../src/Dialogs.vala:1442 ../src/Resources.vala:178
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photo From Library"
 msgstr "Usuwanie zdjęcia z kolekcji"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photos From Library"
 msgstr "Usuwanie zdjęć z kolekcji"
 
-#: ../src/Dialogs.vala:1535
+#: ../src/Dialogs.vala:1536
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1682
+#: ../src/Dialogs.vala:1688
 msgid "AM"
 msgstr "AM"
 
-#: ../src/Dialogs.vala:1683
+#: ../src/Dialogs.vala:1689
 msgid "PM"
 msgstr "PM"
 
-#: ../src/Dialogs.vala:1684
+#: ../src/Dialogs.vala:1690
 msgid "24 Hr"
 msgstr "24-godzinny"
 
-#: ../src/Dialogs.vala:1699
+#: ../src/Dialogs.vala:1705
 msgid "_Shift photos/videos by the same amount"
 msgstr "Prze_suń zdjęcia/nagrania wideo o tą samą wartość"
 
-#: ../src/Dialogs.vala:1704
+#: ../src/Dialogs.vala:1710
 msgid "Set _all photos/videos to this time"
 msgstr "Ust_aw wszystkie zdjęcia/nagrania wideo na ten czas"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo file"
 msgstr "_Modyfikuj oryginalny plik zdjęcia"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo files"
 msgstr "_Modyfikuj oryginalny pliki zdjęć"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original file"
 msgstr "_Modyfikuj pierwotny plik"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original files"
 msgstr "_Modyfikuj pierwotne pliki"
 
-#: ../src/Dialogs.vala:1800
+#: ../src/Dialogs.vala:1806
 msgid "Original: "
 msgstr "Oryginał: "
 
-#: ../src/Dialogs.vala:1801
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d %b %Y, %H∶%M∶%S"
 
-#: ../src/Dialogs.vala:1802
+#: ../src/Dialogs.vala:1808
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d %b %Y, %I∶%M∶%S %p"
 
-#: ../src/Dialogs.vala:1891
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -2184,7 +2186,7 @@ msgstr ""
 "Czas ekspozycji zostanie przesunięty do przodu o\n"
 "%d %s, %d %s, %d %s i %d %s."
 
-#: ../src/Dialogs.vala:1892
+#: ../src/Dialogs.vala:1898
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2193,35 +2195,35 @@ msgstr ""
 "Czas ekspozycji zostanie przesunięty do tyłu o\n"
 "%d %s, %d %s, %d %s i %d %s."
 
-#: ../src/Dialogs.vala:1894
+#: ../src/Dialogs.vala:1900
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dzień"
 msgstr[1] "dni"
 msgstr[2] "dni"
 
-#: ../src/Dialogs.vala:1895
+#: ../src/Dialogs.vala:1901
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "godzina"
 msgstr[1] "godziny"
 msgstr[2] "godzin"
 
-#: ../src/Dialogs.vala:1896
+#: ../src/Dialogs.vala:1902
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
 msgstr[1] "minuty"
 msgstr[2] "minut"
 
-#: ../src/Dialogs.vala:1897
+#: ../src/Dialogs.vala:1903
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekunda"
 msgstr[1] "sekundy"
 msgstr[2] "sekund"
 
-#: ../src/Dialogs.vala:1941
+#: ../src/Dialogs.vala:1947
 #, c-format
 msgid ""
 "\n"
@@ -2244,50 +2246,50 @@ msgstr[2] ""
 "\n"
 "Oraz %d innych."
 
-#: ../src/Dialogs.vala:1963 ../src/Dialogs.vala:1990
+#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
 msgid "Tags (separated by commas):"
 msgstr "Etykiety (oddzielone przecinkami):"
 
-#: ../src/Dialogs.vala:2070
+#: ../src/Dialogs.vala:2076
 msgid "Welcome!"
 msgstr "Witaj"
 
-#: ../src/Dialogs.vala:2077
+#: ../src/Dialogs.vala:2083
 msgid "Welcome to Shotwell!"
 msgstr "Witaj w programie Shotwell"
 
-#: ../src/Dialogs.vala:2081
+#: ../src/Dialogs.vala:2087
 msgid "To get started, import photos in any of these ways:"
 msgstr ""
 "Aby rozpocząć, należy zaimportować zdjęcia na jeden z poniższych sposobów:"
 
-#: ../src/Dialogs.vala:2100
+#: ../src/Dialogs.vala:2106
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Wybranie <span weight=\"bold\">Plik %s Zaimportuj z katalogu</span>"
 
-#: ../src/Dialogs.vala:2101
+#: ../src/Dialogs.vala:2107
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Przeniesienie zdjęć do okna programu Shotwell"
 
-#: ../src/Dialogs.vala:2102
+#: ../src/Dialogs.vala:2108
 msgid "Connect a camera to your computer and import"
 msgstr "Połączenie aparatu do komputera i zaimportowanie"
 
-#: ../src/Dialogs.vala:2112
+#: ../src/Dialogs.vala:2118
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Zaimportuj zdjęcia z katalogu %s"
 
-#: ../src/Dialogs.vala:2119
+#: ../src/Dialogs.vala:2125
 msgid "You can also import photos in any of these ways:"
 msgstr "Można także zaimportować zdjęcia na jeden z poniższych sposobów:"
 
-#: ../src/Dialogs.vala:2129
+#: ../src/Dialogs.vala:2135
 msgid "_Don't show this message again"
 msgstr "_Bez wyświetlania tego komunikatu ponownie"
 
-#: ../src/Dialogs.vala:2164
+#: ../src/Dialogs.vala:2170
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Import zdjęć z kolekcji programu %s"
@@ -2295,41 +2297,41 @@ msgstr "Import zdjęć z kolekcji programu %s"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2308 ../src/Dialogs.vala:2312
+#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
 msgid "(Help)"
 msgstr "(Pomoc)"
 
-#: ../src/Dialogs.vala:2321
+#: ../src/Dialogs.vala:2324
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Rok%smiesiąc%sdzień"
 
-#: ../src/Dialogs.vala:2323
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth"
 msgstr "Rok%smiesiąc"
 
-#: ../src/Dialogs.vala:2325
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Rok%smiesiąc-dzień"
 
-#: ../src/Dialogs.vala:2327
+#: ../src/Dialogs.vala:2330
 msgid "Year-Month-Day"
 msgstr "Rok-miesiąc-dzień"
 
-#: ../src/Dialogs.vala:2328 ../src/editing_tools/EditingTools.vala:781
+#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Własny"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2565
+#: ../src/Dialogs.vala:2568
 msgid "Invalid pattern"
 msgstr "Nieprawidłowy wzór"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: ../src/Dialogs.vala:2668
+#: ../src/Dialogs.vala:2670
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2337,31 +2339,31 @@ msgstr ""
 "Program Shotwell może skopiować zdjęcia do katalogu kolekcji lub może "
 "zaimportować je bez tworzenia ich kopii."
 
-#: ../src/Dialogs.vala:2673
+#: ../src/Dialogs.vala:2675
 msgid "Co_py Photos"
 msgstr "_Skopiowanie zdjęć"
 
-#: ../src/Dialogs.vala:2674
+#: ../src/Dialogs.vala:2676
 msgid "_Import in Place"
 msgstr "_Zaimportowanie"
 
-#: ../src/Dialogs.vala:2675
+#: ../src/Dialogs.vala:2677
 msgid "Import to Library"
 msgstr "Zaimportuj do kolekcji"
 
-#: ../src/Dialogs.vala:2685 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
 msgid "Remove From Library"
 msgstr "Usuń z kolekcji"
 
-#: ../src/Dialogs.vala:2686 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
 msgid "Removing Photo From Library"
 msgstr "Usuwanie zdjęcia z kolekcji"
 
-#: ../src/Dialogs.vala:2686
+#: ../src/Dialogs.vala:2688
 msgid "Removing Photos From Library"
 msgstr "Usuwanie zdjęć z kolekcji"
 
-#: ../src/Dialogs.vala:2700
+#: ../src/Dialogs.vala:2702
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -2389,7 +2391,7 @@ msgstr[2] ""
 "\n"
 "Tej czynności nie można cofnąć."
 
-#: ../src/Dialogs.vala:2704
+#: ../src/Dialogs.vala:2706
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -2417,7 +2419,7 @@ msgstr[2] ""
 "\n"
 "Tej czynności nie można cofnąć."
 
-#: ../src/Dialogs.vala:2708
+#: ../src/Dialogs.vala:2710
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -2445,7 +2447,7 @@ msgstr[2] ""
 "\n"
 "Tej czynności nie można cofnąć."
 
-#: ../src/Dialogs.vala:2740
+#: ../src/Dialogs.vala:2742
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -2459,7 +2461,7 @@ msgstr[2] ""
 "Nie można przenieść %d zdjęć lub nagrań wideo do kosza. Usunąć te pliki?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2757
+#: ../src/Dialogs.vala:2759
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -2522,115 +2524,123 @@ msgstr "Eksport"
 msgid "Unable to process monitoring updates: %s"
 msgstr "Nie można przetworzyć aktualizacji monitorowania: %s"
 
-#: ../src/MediaPage.vala:143
+#: ../src/MediaPage.vala:158
 msgid "Adjust the size of the thumbnails"
 msgstr "Dopasowuje rozmiar miniatur"
 
-#: ../src/MediaPage.vala:325 ../src/PhotoPage.vala:2590
-#: ../src/direct/DirectPhotoPage.vala:174
+#: ../src/MediaPage.vala:340 ../src/PhotoPage.vala:2593
+#: ../src/Resources.vala:188 ../src/direct/DirectPhotoPage.vala:174
 msgid "Zoom _In"
 msgstr "Pow_iększ"
 
-#: ../src/MediaPage.vala:326
+#: ../src/MediaPage.vala:341
 msgid "Increase the magnification of the thumbnails"
 msgstr "Zwiększa powiększenie miniatur"
 
-#: ../src/MediaPage.vala:331 ../src/PhotoPage.vala:2596
-#: ../src/direct/DirectPhotoPage.vala:180
+#: ../src/MediaPage.vala:346 ../src/PhotoPage.vala:2599
+#: ../src/Resources.vala:189 ../src/direct/DirectPhotoPage.vala:180
 msgid "Zoom _Out"
 msgstr "P_omniejsz"
 
-#: ../src/MediaPage.vala:332
+#: ../src/MediaPage.vala:347
 msgid "Decrease the magnification of the thumbnails"
 msgstr "Zmniejsza powiększenie miniatur"
 
-#: ../src/MediaPage.vala:399
+#: ../src/MediaPage.vala:414
 msgid "Sort _Photos"
 msgstr "_Uporządkuj zdjęcia"
 
-#: ../src/MediaPage.vala:408
+#: ../src/MediaPage.vala:423
 msgid "_Play Video"
 msgstr "_Odtwórz nagranie wideo"
 
-#: ../src/MediaPage.vala:409
+#: ../src/MediaPage.vala:424
 msgid "Open the selected videos in the system video player"
 msgstr "Otwiera wybrane nagrania wideo w systemowym odtwarzaczu filmów"
 
-#: ../src/MediaPage.vala:413 ../src/PhotoPage.vala:2639
+#: ../src/MediaPage.vala:428 ../src/PhotoPage.vala:2642
 msgid "_Developer"
 msgstr "_Wywoływacz"
 
-#: ../src/MediaPage.vala:425 ../src/camera/Branch.vala:101
+#: ../src/MediaPage.vala:440 ../src/camera/Branch.vala:99
 #: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
-#: ../src/photos/RawSupport.vala:300
+#: ../src/photos/RawSupport.vala:303
 msgid "Camera"
 msgstr "Aparat"
 
-#: ../src/MediaPage.vala:436 ../src/camera/ImportPage.vala:872
+#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:874
 msgid "_Titles"
 msgstr "_Tytuły"
 
-#: ../src/MediaPage.vala:437 ../src/camera/ImportPage.vala:873
+#: ../src/MediaPage.vala:452 ../src/camera/ImportPage.vala:875
 msgid "Display the title of each photo"
 msgstr "Wyświetla tytuł każdego zdjęcia"
 
-#: ../src/MediaPage.vala:442 ../src/events/EventsDirectoryPage.vala:130
+#: ../src/MediaPage.vala:457 ../src/events/EventsDirectoryPage.vala:130
 msgid "_Comments"
 msgstr "_Komentarze"
 
-#: ../src/MediaPage.vala:443
+#: ../src/MediaPage.vala:458
 msgid "Display the comment of each photo"
 msgstr "Wyświetla komentarz każdego zdjęcia"
 
-#: ../src/MediaPage.vala:454 ../src/library/LibraryWindow.vala:376
+#: ../src/MediaPage.vala:469 ../src/library/LibraryWindow.vala:360
 msgid "Ta_gs"
 msgstr "_Etykiety"
 
-#: ../src/MediaPage.vala:455
+#: ../src/MediaPage.vala:470
 msgid "Display each photo's tags"
 msgstr "Wyświetla etykiety każdego zdjęcia"
 
-#: ../src/MediaPage.vala:471
+#: ../src/MediaPage.vala:486
 msgid "By _Title"
 msgstr "Według _tytułu"
 
-#: ../src/MediaPage.vala:472
+#: ../src/MediaPage.vala:487
 msgid "Sort photos by title"
 msgstr "Porządkuje zdjęcia według tytułu"
 
-#: ../src/MediaPage.vala:477
+#: ../src/MediaPage.vala:492
 msgid "By Exposure _Date"
 msgstr "We_dług daty ekspozycji"
 
-#: ../src/MediaPage.vala:478
+#: ../src/MediaPage.vala:493
 msgid "Sort photos by exposure date"
 msgstr "Porządkuje zdjęcia według daty ekspozycji"
 
-#: ../src/MediaPage.vala:483
+#: ../src/MediaPage.vala:498
 msgid "By _Rating"
 msgstr "Według _oceny"
 
-#: ../src/MediaPage.vala:484
+#: ../src/MediaPage.vala:499
 msgid "Sort photos by rating"
 msgstr "Porządkuje zdjęcia według oceny"
 
-#: ../src/MediaPage.vala:494 ../src/library/LibraryWindow.vala:422
+#: ../src/MediaPage.vala:504
+msgid "By _Filename"
+msgstr "Według _nazw plików"
+
+#: ../src/MediaPage.vala:505
+msgid "Sort photos by filename"
+msgstr "Porządkuje zdjęcia według nazw plików"
+
+#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:406
 msgid "_Ascending"
 msgstr "_Rosnąco"
 
-#: ../src/MediaPage.vala:495 ../src/library/LibraryWindow.vala:423
+#: ../src/MediaPage.vala:516 ../src/library/LibraryWindow.vala:407
 msgid "Sort photos in an ascending order"
 msgstr "Porządkuje zdjęcia w porządku rosnącym"
 
-#: ../src/MediaPage.vala:500 ../src/library/LibraryWindow.vala:429
+#: ../src/MediaPage.vala:521 ../src/library/LibraryWindow.vala:413
 msgid "D_escending"
 msgstr "Mal_ejąco"
 
-#: ../src/MediaPage.vala:501 ../src/library/LibraryWindow.vala:430
+#: ../src/MediaPage.vala:522 ../src/library/LibraryWindow.vala:414
 msgid "Sort photos in a descending order"
 msgstr "Porządkuje zdjęcia w porządku malejącym"
 
-#: ../src/MediaPage.vala:702
+#: ../src/MediaPage.vala:723
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -2639,99 +2649,99 @@ msgstr ""
 "Program Shotwell nie może odtworzyć wybranego nagrania wideo:\n"
 "%s"
 
-#: ../src/Page.vala:1268
+#: ../src/Page.vala:1263
 msgid "No photos/videos"
 msgstr "Brak zdjęć/nagrań wideo"
 
-#: ../src/Page.vala:1272
+#: ../src/Page.vala:1267
 msgid "No photos/videos found"
 msgstr "Nie odnaleziono zdjęć/nagrań wideo"
 
-#: ../src/Page.vala:2569
+#: ../src/Page.vala:2565
 msgid "Photos cannot be exported to this directory."
 msgstr "Nie można eksportować zdjęć do tego katalogu."
 
-#: ../src/Photo.vala:3656
+#: ../src/Photo.vala:3753
 msgid "modified"
 msgstr "zmodyfikowany"
 
 #. previous button
-#: ../src/PhotoPage.vala:532
+#: ../src/PhotoPage.vala:533
 msgid "Previous photo"
 msgstr "Poprzednie zdjęcie"
 
 #. next button
-#: ../src/PhotoPage.vala:537
+#: ../src/PhotoPage.vala:539
 msgid "Next photo"
 msgstr "Następne zdjęcie"
 
-#: ../src/PhotoPage.vala:1844
+#: ../src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Brak pliku źródłowego zdjęcia: %s"
 
-#: ../src/PhotoPage.vala:2411 ../src/direct/DirectPhotoPage.vala:165
-#: ../src/library/LibraryWindow.vala:360
+#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
+#: ../src/library/LibraryWindow.vala:344
 msgid "_View"
 msgstr "_Widok"
 
-#: ../src/PhotoPage.vala:2415 ../src/direct/DirectPhotoPage.vala:81
+#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
 msgid "T_ools"
 msgstr "_Narzędzia"
 
-#: ../src/PhotoPage.vala:2420 ../src/direct/DirectPhotoPage.vala:86
+#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
 msgid "_Previous Photo"
 msgstr "_Poprzednie zdjęcie"
 
-#: ../src/PhotoPage.vala:2421 ../src/direct/DirectPhotoPage.vala:87
+#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
 msgid "Previous Photo"
 msgstr "Poprzednie zdjęcie"
 
-#: ../src/PhotoPage.vala:2426 ../src/direct/DirectPhotoPage.vala:92
+#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
 msgid "_Next Photo"
 msgstr "_Następne zdjęcie"
 
-#: ../src/PhotoPage.vala:2427 ../src/direct/DirectPhotoPage.vala:93
+#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
 msgid "Next Photo"
 msgstr "Następne zdjęcie"
 
-#: ../src/PhotoPage.vala:2591 ../src/direct/DirectPhotoPage.vala:175
+#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
 msgid "Increase the magnification of the photo"
 msgstr "Zwiększa powiększenie zdjęcia"
 
-#: ../src/PhotoPage.vala:2597 ../src/direct/DirectPhotoPage.vala:181
+#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
 msgid "Decrease the magnification of the photo"
 msgstr "Zmniejsza powiększenie zdjęcia"
 
-#: ../src/PhotoPage.vala:2602 ../src/direct/DirectPhotoPage.vala:186
+#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
 msgid "Fit to _Page"
 msgstr "Dopasowanie do _strony"
 
-#: ../src/PhotoPage.vala:2603 ../src/direct/DirectPhotoPage.vala:187
+#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
 msgid "Zoom the photo to fit on the screen"
 msgstr "Powiększa zdjęcie, aby pasowało do ekranu"
 
-#: ../src/PhotoPage.vala:2609 ../src/direct/DirectPhotoPage.vala:193
+#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
 #, no-c-format
 msgid "Zoom _100%"
 msgstr "Powiększenie _100%"
 
-#: ../src/PhotoPage.vala:2611 ../src/direct/DirectPhotoPage.vala:195
+#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
 #, no-c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "Powiększa zdjęcie do 100%"
 
-#: ../src/PhotoPage.vala:2617 ../src/direct/DirectPhotoPage.vala:201
+#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
 #, no-c-format
 msgid "Zoom _200%"
 msgstr "Powiększenie _200%"
 
-#: ../src/PhotoPage.vala:2619 ../src/direct/DirectPhotoPage.vala:203
+#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
 #, no-c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "Powiększa zdjęcie do 200%"
 
-#: ../src/PhotoPage.vala:3227
+#: ../src/PhotoPage.vala:3231
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Nie można wyeksportować: %s: %s"
@@ -2931,67 +2941,67 @@ msgid "Exposure:"
 msgstr "Ekspozycja:"
 
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:585
+#: ../src/Properties.vala:583
 msgid "Location:"
 msgstr "Położenie:"
 
-#: ../src/Properties.vala:588
+#: ../src/Properties.vala:586
 msgid "File size:"
 msgstr "Rozmiar pliku:"
 
-#: ../src/Properties.vala:592
+#: ../src/Properties.vala:590
 msgid "Current Development:"
 msgstr "Bieżący wywoływacz:"
 
-#: ../src/Properties.vala:594
+#: ../src/Properties.vala:592
 msgid "Original dimensions:"
 msgstr "Wymiary pierwotne:"
 
-#: ../src/Properties.vala:597
+#: ../src/Properties.vala:595
 msgid "Camera make:"
 msgstr "Producent aparatu:"
 
-#: ../src/Properties.vala:600
+#: ../src/Properties.vala:598
 msgid "Camera model:"
 msgstr "Model aparatu:"
 
-#: ../src/Properties.vala:603
+#: ../src/Properties.vala:601
 msgid "Flash:"
 msgstr "Lampa błyskowa:"
 
-#: ../src/Properties.vala:605
+#: ../src/Properties.vala:603
 msgid "Focal length:"
 msgstr "Odległość ogniskowa:"
 
-#: ../src/Properties.vala:608
+#: ../src/Properties.vala:606
 msgid "Exposure date:"
 msgstr "Data ekspozycji:"
 
-#: ../src/Properties.vala:611
+#: ../src/Properties.vala:609
 msgid "Exposure time:"
 msgstr "Czas ekspozycji:"
 
-#: ../src/Properties.vala:614
+#: ../src/Properties.vala:612
 msgid "Exposure bias:"
 msgstr "Wpływ na ekspozycję:"
 
-#: ../src/Properties.vala:616
+#: ../src/Properties.vala:614
 msgid "GPS latitude:"
 msgstr "Szerokość geograficzna GPS:"
 
-#: ../src/Properties.vala:619
+#: ../src/Properties.vala:617
 msgid "GPS longitude:"
 msgstr "Długość geograficzna GPS:"
 
-#: ../src/Properties.vala:622
+#: ../src/Properties.vala:620
 msgid "Artist:"
 msgstr "Artysta:"
 
-#: ../src/Properties.vala:624
+#: ../src/Properties.vala:622
 msgid "Copyright:"
 msgstr "Prawa autorskie:"
 
-#: ../src/Properties.vala:626
+#: ../src/Properties.vala:624
 msgid "Software:"
 msgstr "Oprogramowanie:"
 
@@ -3007,657 +3017,758 @@ msgstr "Menedżer zdjęć"
 msgid "Photo Viewer"
 msgstr "Przeglądarka zdjęć"
 
-#: ../src/Resources.vala:142
+#: ../src/Resources.vala:144
 msgid "Rotate _Right"
 msgstr "Obróć w p_rawo"
 
-#: ../src/Resources.vala:143 ../src/Resources.vala:148
+#: ../src/Resources.vala:145 ../src/Resources.vala:150
 msgid "Rotate"
 msgstr "Obróć"
 
-#: ../src/Resources.vala:144
+#: ../src/Resources.vala:146
 msgid "Rotate Right"
 msgstr "Obróć w prawo"
 
-#: ../src/Resources.vala:145
+#: ../src/Resources.vala:147
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Obraca zdjęcia w prawo (naciśnięcie klawisza Ctrl obraca w lewo)"
 
-#: ../src/Resources.vala:147
+#: ../src/Resources.vala:149
 msgid "Rotate _Left"
 msgstr "Obróć w _lewo"
 
-#: ../src/Resources.vala:149
+#: ../src/Resources.vala:151
 msgid "Rotate Left"
 msgstr "Obróć w lewo"
 
-#: ../src/Resources.vala:150
+#: ../src/Resources.vala:152
 msgid "Rotate the photos left"
 msgstr "Obraca zdjęcia w lewo"
 
-#: ../src/Resources.vala:152
+#: ../src/Resources.vala:154
 msgid "Flip Hori_zontally"
 msgstr "Odwróć po_ziomo"
 
-#: ../src/Resources.vala:153
+#: ../src/Resources.vala:155
 msgid "Flip Horizontally"
 msgstr "Odwróć poziomo"
 
-#: ../src/Resources.vala:155
+#: ../src/Resources.vala:157
 msgid "Flip Verti_cally"
 msgstr "Odwróć pi_onowo"
 
-#: ../src/Resources.vala:156
+#: ../src/Resources.vala:158
 msgid "Flip Vertically"
 msgstr "Odwróć pionowo"
 
-#: ../src/Resources.vala:158
+#: ../src/Resources.vala:160
+msgid "_About"
+msgstr "_O programie"
+
+#: ../src/Resources.vala:161
+msgid "_Apply"
+msgstr "_Zastosuj"
+
+#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
+#: ../src/library/LibraryWindow.vala:340
+msgid "_Edit"
+msgstr "_Edycja"
+
+#: ../src/Resources.vala:165
+msgid "_Forward"
+msgstr "_Dalej"
+
+#: ../src/Resources.vala:166
+msgid "Fulls_creen"
+msgstr "_Pełny ekran"
+
+#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
+#: ../src/library/LibraryWindow.vala:364
+msgid "_Help"
+msgstr "Pomo_c"
+
+#: ../src/Resources.vala:168
+msgid "Leave _Fullscreen"
+msgstr "Opuść p_ełny ekran"
+
+#: ../src/Resources.vala:169 ../src/Resources.vala:371
+msgid "_New"
+msgstr "_Nowa"
+
+#: ../src/Resources.vala:170
+msgid "_Next"
+msgstr "_Dalej"
+
+#: ../src/Resources.vala:171
+msgid "_OK"
+msgstr "_OK"
+
+#: ../src/Resources.vala:172
+msgid "_Play"
+msgstr "_Odtwórz"
+
+#: ../src/Resources.vala:173 ../src/Resources.vala:325
+msgid "_Preferences"
+msgstr "_Preferencje"
+
+#: ../src/Resources.vala:174
+msgid "_Previous"
+msgstr "_Wstecz"
+
+#: ../src/Resources.vala:175
+msgid "_Print"
+msgstr "Wy_drukuj"
+
+#: ../src/Resources.vala:176
+msgid "_Quit"
+msgstr "Za_kończ"
+
+#: ../src/Resources.vala:177
+msgid "_Refresh"
+msgstr "_Odśwież"
+
+#: ../src/Resources.vala:179
+msgid "_Revert"
+msgstr "P_rzywróć"
+
+#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save"
+msgstr "Zapi_sz"
+
+#: ../src/Resources.vala:181
+msgid "Save _As"
+msgstr "Z_apisz jako"
+
+#: ../src/Resources.vala:182
+msgid "Sort _Ascending"
+msgstr "Porządkowanie _rosnąco"
+
+#: ../src/Resources.vala:183
+msgid "Sort _Descending"
+msgstr "Porządkowanie mal_ejąco"
+
+#: ../src/Resources.vala:184
+msgid "_Stop"
+msgstr "_Zatrzymaj"
+
+#: ../src/Resources.vala:185
+msgid "_Undelete"
+msgstr "_Cofnij usunięcie"
+
+#: ../src/Resources.vala:186
+msgid "_Normal Size"
+msgstr "Z_wykły rozmiar"
+
+#: ../src/Resources.vala:187
+msgid "Best _Fit"
+msgstr "_Najlepsze dopasowanie"
+
+#: ../src/Resources.vala:191
 msgid "_Enhance"
 msgstr "Ul_epsz"
 
-#: ../src/Resources.vala:159
+#: ../src/Resources.vala:192
 msgid "Enhance"
 msgstr "Ulepsz"
 
-#: ../src/Resources.vala:160
+#: ../src/Resources.vala:193
 msgid "Automatically improve the photo's appearance"
 msgstr "Automatycznie ulepsza wygląd zdjęcia"
 
-#: ../src/Resources.vala:162
+#: ../src/Resources.vala:195
 msgid "_Copy Color Adjustments"
 msgstr "S_kopiuj dostosowania kolorów"
 
-#: ../src/Resources.vala:163
+#: ../src/Resources.vala:196
 msgid "Copy Color Adjustments"
 msgstr "Skopiuj dostosowania kolorów"
 
-#: ../src/Resources.vala:164
+#: ../src/Resources.vala:197
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Kopiuje dostosowania kolorów zastosowane na zdjęciu"
 
-#: ../src/Resources.vala:166
+#: ../src/Resources.vala:199
 msgid "_Paste Color Adjustments"
 msgstr "_Wklej dostosowania kolorów"
 
-#: ../src/Resources.vala:167
+#: ../src/Resources.vala:200
 msgid "Paste Color Adjustments"
 msgstr "Wklej dostosowania kolorów"
 
-#: ../src/Resources.vala:168
+#: ../src/Resources.vala:201
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Wkleja sopiowane dostosowania kolorów zastosowane na zdjęciu"
 
-#: ../src/Resources.vala:170
+#: ../src/Resources.vala:203
 msgid "_Crop"
 msgstr "Przyt_nij"
 
-#: ../src/Resources.vala:171
+#: ../src/Resources.vala:204
 msgid "Crop"
 msgstr "Przytnij"
 
-#: ../src/Resources.vala:172
+#: ../src/Resources.vala:205
 msgid "Crop the photo's size"
 msgstr "Przycina rozmiar zdjęcia"
 
-#: ../src/Resources.vala:174 ../src/editing_tools/StraightenTool.vala:100
+#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
 msgid "_Straighten"
 msgstr "_Wyrównaj"
 
-#: ../src/Resources.vala:175
+#: ../src/Resources.vala:208
 msgid "Straighten"
 msgstr "Wyrównaj"
 
-#: ../src/Resources.vala:176
+#: ../src/Resources.vala:209
 msgid "Straighten the photo"
 msgstr "Wyrównuje zdjęcie"
 
-#: ../src/Resources.vala:178
+#: ../src/Resources.vala:211
 msgid "_Red-eye"
 msgstr "_Czerwone oczy"
 
-#: ../src/Resources.vala:179
+#: ../src/Resources.vala:212
 msgid "Red-eye"
 msgstr "Czerwone oczy"
 
-#: ../src/Resources.vala:180
+#: ../src/Resources.vala:213
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Zmniejsza lub usuwa wszystkie efekty czerwonych oczu na zdjęciu"
 
-#: ../src/Resources.vala:182
+#: ../src/Resources.vala:215
 msgid "_Adjust"
 msgstr "_Dopasuj"
 
-#: ../src/Resources.vala:183
+#: ../src/Resources.vala:216
 msgid "Adjust"
 msgstr "Dopasuj"
 
-#: ../src/Resources.vala:184
+#: ../src/Resources.vala:217
 msgid "Adjust the photo's color and tone"
 msgstr "Dopasowuje kolor i tonację zdjęcia"
 
-#: ../src/Resources.vala:186
+#: ../src/Resources.vala:219
 msgid "Re_vert to Original"
 msgstr "Przy_wróć pierwotne"
 
-#: ../src/Resources.vala:187
+#: ../src/Resources.vala:220
 msgid "Revert to Original"
 msgstr "Przywróć pierwotne"
 
-#: ../src/Resources.vala:189
+#: ../src/Resources.vala:222
 msgid "Revert External E_dits"
 msgstr "Odwróć zewnętrzne mo_dyfikacje"
 
-#: ../src/Resources.vala:190
+#: ../src/Resources.vala:223
 msgid "Revert to the master photo"
 msgstr "Przywraca pierwotne zdjęcie"
 
-#: ../src/Resources.vala:192
+#: ../src/Resources.vala:225
 msgid "Set as _Desktop Background"
 msgstr "Ustaw jako tło p_ulpitu"
 
-#: ../src/Resources.vala:193
+#: ../src/Resources.vala:226
 msgid "Set selected image to be the new desktop background"
 msgstr "Ustawia wybrany obraz jako nowe tło pulpitu"
 
-#: ../src/Resources.vala:194
+#: ../src/Resources.vala:227
 msgid "Set as _Desktop Slideshow..."
 msgstr "Ustaw jako pokaz slaj_dów pulpitu..."
 
-#: ../src/Resources.vala:196
+#: ../src/Resources.vala:229
 msgid "_Undo"
 msgstr "Cof_nij"
 
-#: ../src/Resources.vala:197
+#: ../src/Resources.vala:230
 msgid "Undo"
 msgstr "Cofnij"
 
-#: ../src/Resources.vala:199
+#: ../src/Resources.vala:232
 msgid "_Redo"
 msgstr "P_onów"
 
-#: ../src/Resources.vala:200
+#: ../src/Resources.vala:233
 msgid "Redo"
 msgstr "Ponów"
 
-#: ../src/Resources.vala:202
+#: ../src/Resources.vala:235
 msgid "Re_name Event..."
 msgstr "Zmień _nazwę wydarzenia..."
 
-#: ../src/Resources.vala:205
+#: ../src/Resources.vala:238
 msgid "Make _Key Photo for Event"
 msgstr "Utwórz _kluczowe zdjęcie dla wydarzenia"
 
-#: ../src/Resources.vala:206
+#: ../src/Resources.vala:239
 msgid "Make Key Photo for Event"
 msgstr "Tworzy kluczowe zdjęcie dla wydarzenia"
 
-#: ../src/Resources.vala:208
+#: ../src/Resources.vala:241
 msgid "_New Event"
 msgstr "_Nowe wydarzenie"
 
-#: ../src/Resources.vala:209
+#: ../src/Resources.vala:242
 msgid "New Event"
 msgstr "Nowe wydarzenie"
 
-#: ../src/Resources.vala:211
+#: ../src/Resources.vala:244
 msgid "Move Photos"
 msgstr "Przenieś zdjęcia"
 
-#: ../src/Resources.vala:212
+#: ../src/Resources.vala:245
 msgid "Move photos to an event"
 msgstr "Przenosi zdjęcia do innego wydarzenia"
 
-#: ../src/Resources.vala:214
+#: ../src/Resources.vala:247
 msgid "_Merge Events"
 msgstr "_Połącz wydarzenia"
 
-#: ../src/Resources.vala:215
+#: ../src/Resources.vala:248
 msgid "Merge"
 msgstr "Połącz"
 
-#: ../src/Resources.vala:216
+#: ../src/Resources.vala:249
 msgid "Combine events into a single event"
 msgstr "Łączy wydarzenia w jedno"
 
-#: ../src/Resources.vala:218
+#: ../src/Resources.vala:251
 msgid "_Set Rating"
 msgstr "U_staw ocenę"
 
-#: ../src/Resources.vala:219
+#: ../src/Resources.vala:252
 msgid "Set Rating"
 msgstr "Ustaw ocenę"
 
-#: ../src/Resources.vala:220
+#: ../src/Resources.vala:253
 msgid "Change the rating of your photo"
 msgstr "Zmienia ocenę zdjęcia"
 
-#: ../src/Resources.vala:222
+#: ../src/Resources.vala:255
 msgid "_Increase"
 msgstr "Z_większ"
 
-#: ../src/Resources.vala:223
+#: ../src/Resources.vala:256
 msgid "Increase Rating"
 msgstr "Zwiększ ocenę"
 
-#: ../src/Resources.vala:225
+#: ../src/Resources.vala:258
 msgid "_Decrease"
 msgstr "_Zmniejsz"
 
-#: ../src/Resources.vala:226
+#: ../src/Resources.vala:259
 msgid "Decrease Rating"
 msgstr "Zmniejsz ocenę"
 
-#: ../src/Resources.vala:228
+#: ../src/Resources.vala:261
 msgid "_Unrated"
 msgstr "_Bez oceny"
 
-#: ../src/Resources.vala:229
+#: ../src/Resources.vala:262
 msgid "Unrated"
 msgstr "Bez oceny"
 
-#: ../src/Resources.vala:230
+#: ../src/Resources.vala:263
 msgid "Rate Unrated"
 msgstr "Ustaw jako bez oceny"
 
-#: ../src/Resources.vala:231
+#: ../src/Resources.vala:264
 msgid "Setting as unrated"
 msgstr "Ustawianie jako bez oceny"
 
-#: ../src/Resources.vala:232
+#: ../src/Resources.vala:265
 msgid "Remove any ratings"
 msgstr "Usuwa wszystkie oceny"
 
-#: ../src/Resources.vala:234
+#: ../src/Resources.vala:267
 msgid "_Rejected"
 msgstr "_Odrzucona"
 
-#: ../src/Resources.vala:235
+#: ../src/Resources.vala:268
 msgid "Rejected"
 msgstr "Odrzucona"
 
-#: ../src/Resources.vala:236
+#: ../src/Resources.vala:269
 msgid "Rate Rejected"
 msgstr "Odrzucona ocena"
 
-#: ../src/Resources.vala:237
+#: ../src/Resources.vala:270
 msgid "Setting as rejected"
 msgstr "Ustawianie jako odrzucona"
 
-#: ../src/Resources.vala:238
+#: ../src/Resources.vala:271
 msgid "Set rating to rejected"
 msgstr "Ustawia ocenę jako odrzuconą"
 
-#: ../src/Resources.vala:240
+#: ../src/Resources.vala:273
 msgid "Rejected _Only"
 msgstr "Tylko _odrzucone"
 
-#: ../src/Resources.vala:241
+#: ../src/Resources.vala:274
 msgid "Rejected Only"
 msgstr "Tylko odrzucone"
 
-#: ../src/Resources.vala:242
+#: ../src/Resources.vala:275
 msgid "Show only rejected photos"
 msgstr "Wyświetla tylko odrzucone zdjęcia"
 
-#: ../src/Resources.vala:244
+#: ../src/Resources.vala:277
 msgid "All + _Rejected"
 msgstr "Wszystko + _odrzucone"
 
-#: ../src/Resources.vala:245 ../src/Resources.vala:246
+#: ../src/Resources.vala:278 ../src/Resources.vala:279
 msgid "Show all photos, including rejected"
 msgstr "Wyświetla wszystkie zdjęcia, w tym odrzucone"
 
-#: ../src/Resources.vala:248
+#: ../src/Resources.vala:281
 msgid "_All Photos"
 msgstr "_Wszystkie zdjęcia"
 
-#: ../src/Resources.vala:249 ../src/Resources.vala:250
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:283 ../src/Resources.vala:285
 msgid "Show all photos"
 msgstr "Wyświetla wszystkie zdjęcia"
 
-#: ../src/Resources.vala:252
+#: ../src/Resources.vala:287
 msgid "_Ratings"
 msgstr "O_ceny"
 
-#: ../src/Resources.vala:253
+#: ../src/Resources.vala:288
 msgid "Display each photo's rating"
 msgstr "Wyświetla oceny każdego zdjęcia"
 
-#: ../src/Resources.vala:255
+#: ../src/Resources.vala:290
 msgid "_Filter Photos"
 msgstr "_Filtruj zdjęcia"
 
-#: ../src/Resources.vala:256
+#: ../src/Resources.vala:291
 msgid "Filter Photos"
 msgstr "Filtruj zdjęcia"
 
-#: ../src/Resources.vala:257
+#: ../src/Resources.vala:292
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Ogranicza liczbę wyświetlanych zdjęć w oparciu o filtr"
 
-#: ../src/Resources.vala:259
+#: ../src/Resources.vala:294
 msgid "_Duplicate"
 msgstr "Utwórz _duplikat"
 
-#: ../src/Resources.vala:260
+#: ../src/Resources.vala:295
 msgid "Duplicate"
 msgstr "Utwórz duplikat"
 
-#: ../src/Resources.vala:261
+#: ../src/Resources.vala:296
 msgid "Make a duplicate of the photo"
 msgstr "Tworzy duplikat zdjęcia"
 
-#: ../src/Resources.vala:263
+#: ../src/Resources.vala:298
 msgid "_Export..."
 msgstr "Wy_eksportuj..."
 
-#: ../src/Resources.vala:265
+#: ../src/Resources.vala:300
 msgid "_Print..."
 msgstr "Wy_drukuj..."
 
-#: ../src/Resources.vala:267
+#: ../src/Resources.vala:302
 msgid "Pu_blish..."
 msgstr "Opu_blikuj..."
 
-#: ../src/Resources.vala:269
+#: ../src/Resources.vala:304
 msgid "Publish to various websites"
 msgstr "Publikuje na różnych witrynach WWW"
 
-#: ../src/Resources.vala:271
+#: ../src/Resources.vala:306
 msgid "Edit _Title..."
 msgstr "Mo_dyfikuj tytuł..."
 
-#: ../src/Resources.vala:274
+#: ../src/Resources.vala:310
 msgid "Edit _Comment..."
 msgstr "Modyfikuj _komentarz..."
 
-#: ../src/Resources.vala:275
+#. Button label
+#: ../src/Resources.vala:312
 msgid "Edit Comment"
 msgstr "Modyfikacja komentarza"
 
-#: ../src/Resources.vala:277
+#: ../src/Resources.vala:314
 msgid "Edit Event _Comment..."
 msgstr "Modyfikuj _komentarz wydarzenia:"
 
-#: ../src/Resources.vala:280
+#: ../src/Resources.vala:317
 msgid "_Adjust Date and Time..."
 msgstr "Dostosuj d_atę i czas..."
 
-#: ../src/Resources.vala:281
+#: ../src/Resources.vala:318
 msgid "Adjust Date and Time"
 msgstr "Dostosowuje datę i czas"
 
-#: ../src/Resources.vala:283
+#: ../src/Resources.vala:320
 msgid "Add _Tags..."
 msgstr "Dodaj e_tykiety..."
 
-#: ../src/Resources.vala:284
+#: ../src/Resources.vala:321
 msgid "_Add Tags..."
 msgstr "_Dodaj etykiety..."
 
-#: ../src/Resources.vala:285 ../src/Resources.vala:316
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:323 ../src/Resources.vala:356
 msgid "Add Tags"
 msgstr "Dodaj etykiety"
 
-#: ../src/Resources.vala:287
-msgid "_Preferences"
-msgstr "_Preferencje"
-
-#: ../src/Resources.vala:289
+#: ../src/Resources.vala:327
 msgid "Open With E_xternal Editor"
 msgstr "_Otwórz za pomocą zewnętrznego edytora"
 
-#: ../src/Resources.vala:291
+#: ../src/Resources.vala:329
 msgid "Open With RA_W Editor"
 msgstr "Otwórz za pomocą edytora plików _RAW"
 
-#: ../src/Resources.vala:293
+#: ../src/Resources.vala:331
 msgid "Send _To..."
 msgstr "Wyślij _do..."
 
-#: ../src/Resources.vala:294
+#: ../src/Resources.vala:332
 msgid "Send T_o..."
 msgstr "Wyślij d_o..."
 
-#: ../src/Resources.vala:296
+#: ../src/Resources.vala:334
 msgid "_Find..."
 msgstr "_Znajdź..."
 
-#: ../src/Resources.vala:297
+#: ../src/Resources.vala:335
 msgid "Find"
 msgstr "Wyszukiwanie"
 
-#: ../src/Resources.vala:298
+#: ../src/Resources.vala:336
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Wyszukuje obraz przez wpisanie tekstu pojawiającego się w jego nazwie lub "
 "etykietach"
 
-#: ../src/Resources.vala:300
+#: ../src/Resources.vala:338
 msgid "_Flag"
 msgstr "Dod_aj flagę"
 
-#: ../src/Resources.vala:302
+#: ../src/Resources.vala:340
 msgid "Un_flag"
 msgstr "_Usuń flagę"
 
-#: ../src/Resources.vala:305
+#: ../src/Resources.vala:343
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Nie można uruchomić edytora: %s"
 
-#: ../src/Resources.vala:310
+#: ../src/Resources.vala:348
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "Dodaj etykietę \"%s\""
 
-#: ../src/Resources.vala:312
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:351
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "Dodaj etykiety \"%s\" i \"%s\""
 
-#: ../src/Resources.vala:320
+#: ../src/Resources.vala:361
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "_Usuń etykietę \"%s\""
 
-#: ../src/Resources.vala:324
+#: ../src/Resources.vala:365
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "Usuń etykietę \"%s\""
 
-#: ../src/Resources.vala:327
+#: ../src/Resources.vala:368
 msgid "Delete Tag"
 msgstr "Usuń etykietę"
 
-#: ../src/Resources.vala:330
-msgid "_New"
-msgstr "_Nowa"
-
-#: ../src/Resources.vala:333
+#: ../src/Resources.vala:374
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "Zmień _nazwę etykiety \"%s\"..."
 
-#: ../src/Resources.vala:337
+#: ../src/Resources.vala:378
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "Zmień nazwę etykiety \"%s\" na \"%s\""
 
-#: ../src/Resources.vala:340
+#: ../src/Resources.vala:381
 msgid "_Rename..."
 msgstr "_Zmień nazwę..."
 
-#: ../src/Resources.vala:342
+#: ../src/Resources.vala:383
 msgid "Modif_y Tags..."
 msgstr "M_odyfikuj etykiety..."
 
-#: ../src/Resources.vala:343
+#: ../src/Resources.vala:384
 msgid "Modify Tags"
 msgstr "Modyfikuj etykiety"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Dodaje etykietę \"%s\" do zdjęcia"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Dodaje etykietę \"%s\" do zdjęć"
 
-#: ../src/Resources.vala:350
+#: ../src/Resources.vala:391
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "Dodaje etykietę \"%s\" do wybranego zdjęcia"
 
-#: ../src/Resources.vala:351
+#: ../src/Resources.vala:392
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "Dodaje etykietę \"%s\" do wybranych zdjęć"
 
-#: ../src/Resources.vala:355
+#: ../src/Resources.vala:396
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "Usuń etykietę \"%s\" ze _zdjęcia"
 
-#: ../src/Resources.vala:356
+#: ../src/Resources.vala:397
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "Usuwa etykietę \"%s\" ze _zdjęć"
 
-#: ../src/Resources.vala:360
+#: ../src/Resources.vala:401
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "Usuwa etykietę \"%s\" ze zdjęcia"
 
-#: ../src/Resources.vala:361
+#: ../src/Resources.vala:402
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "Usuwa etykietę \"%s\" ze zdjęć"
 
-#: ../src/Resources.vala:365
+#: ../src/Resources.vala:406
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr ""
 "Nie można zmienić nazwy etykiety na \"%s\", ponieważ ta etykieta już "
 "istnieje."
 
-#: ../src/Resources.vala:369
+#: ../src/Resources.vala:410
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr ""
 "Nie można zmienić nazwy wyszukiwania na \"%s\", ponieważ takie wyszukiwanie "
 "już istnieje."
 
-#: ../src/Resources.vala:372
+#: ../src/Resources.vala:413
 msgid "Saved Search"
 msgstr "Zapisane wyszukiwanie"
 
-#: ../src/Resources.vala:374
+#: ../src/Resources.vala:415
 msgid "Delete Search"
 msgstr "Usunięcie wyszukiwania"
 
-#: ../src/Resources.vala:377
+#: ../src/Resources.vala:418
 msgid "_Edit..."
 msgstr "_Modyfikuj..."
 
-#: ../src/Resources.vala:378
+#: ../src/Resources.vala:419
 msgid "Re_name..."
 msgstr "Zmień _nazwę..."
 
-#: ../src/Resources.vala:381
+#: ../src/Resources.vala:422
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "Zmienia nazwę wyszukiwania z \"%s\" na \"%s\""
 
-#: ../src/Resources.vala:385
+#: ../src/Resources.vala:426
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "Usuwa wyszukiwanie \"%s\""
 
-#: ../src/Resources.vala:543
+#: ../src/Resources.vala:584
 #, c-format
 msgid "Rate %s"
 msgstr "Ocena %s"
 
-#: ../src/Resources.vala:544
+#: ../src/Resources.vala:585
 #, c-format
 msgid "Set rating to %s"
 msgstr "Ustaw ocenę na %s"
 
-#: ../src/Resources.vala:545
+#: ../src/Resources.vala:586
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Ustawianie oceny na %s"
 
-#: ../src/Resources.vala:547
+#: ../src/Resources.vala:588
 #, c-format
 msgid "Display %s"
 msgstr "Wyświetlanie %s"
 
-#: ../src/Resources.vala:548
+#: ../src/Resources.vala:589
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Wyświetla tylko z oceną %s"
 
-#: ../src/Resources.vala:549
+#: ../src/Resources.vala:590
 #, c-format
 msgid "%s or Better"
 msgstr "%s lub lepszą"
 
-#: ../src/Resources.vala:550
+#: ../src/Resources.vala:591
 #, c-format
 msgid "Display %s or Better"
 msgstr "Wyświetlanie %s lub lepszych"
 
-#: ../src/Resources.vala:551
+#: ../src/Resources.vala:592
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Wyświetla tylko zdjęcia z oceną %s lub lepszą"
 
-#: ../src/Resources.vala:642
+#: ../src/Resources.vala:683
 msgid "Remove the selected photos from the trash"
 msgstr "Usuwa wybrane zdjęcia z kosza"
 
-#: ../src/Resources.vala:643
+#: ../src/Resources.vala:684
 msgid "Remove the selected photos from the library"
 msgstr "Usuwa wybrane zdjęcia z kolekcji"
 
-#: ../src/Resources.vala:645
+#: ../src/Resources.vala:686
 msgid "_Restore"
 msgstr "P_rzywróć"
 
-#: ../src/Resources.vala:646
+#: ../src/Resources.vala:687
 msgid "Move the selected photos back into the library"
 msgstr "Przenosi wybrane zdjęcia z powrotem do kolekcji"
 
-#: ../src/Resources.vala:648
+#: ../src/Resources.vala:689
 msgid "Show in File Mana_ger"
 msgstr "Wyświetl w mene_dżerze plików"
 
-#: ../src/Resources.vala:649
+#: ../src/Resources.vala:690
 msgid "Open the selected photo's directory in the file manager"
 msgstr "Otwiera wybrany katalog zdjęć w menedżerze plików"
 
-#: ../src/Resources.vala:652
+#: ../src/Resources.vala:693
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Nie można otworzyć w menedżerze plików: %s"
 
-#: ../src/Resources.vala:655
+#: ../src/Resources.vala:696
 msgid "R_emove From Library"
 msgstr "_Usuń z kolekcji"
 
-#: ../src/Resources.vala:657
+#: ../src/Resources.vala:698
 msgid "_Move to Trash"
 msgstr "Przenieś do _kosza"
 
-#: ../src/Resources.vala:659
+#: ../src/Resources.vala:700
 msgid "Select _All"
 msgstr "Z_aznacz wszystkie"
 
-#: ../src/Resources.vala:660
+#: ../src/Resources.vala:701
 msgid "Select all items"
 msgstr "Zaznacza wszystkie elementy"
 
@@ -3665,20 +3776,20 @@ msgstr "Zaznacza wszystkie elementy"
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:741
+#: ../src/Resources.vala:780
 msgid "%-I:%M %p"
 msgstr "%H∶%M"
 
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:746
+#: ../src/Resources.vala:785
 msgid "%-I:%M:%S %p"
 msgstr "%H∶%M∶%S"
 
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:750
+#: ../src/Resources.vala:789
 msgid "%a %b %d, %Y"
 msgstr "%a %e %b %Y"
 
@@ -3688,14 +3799,14 @@ msgstr "%a %e %b %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:755 ../src/Resources.vala:765
+#: ../src/Resources.vala:794 ../src/Resources.vala:804
 msgid "%a %b %d"
 msgstr "%a %e %b"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:760
+#: ../src/Resources.vala:799
 msgid "%d, %Y"
 msgstr "%e, %Y"
 
@@ -3705,11 +3816,12 @@ msgstr "Pokaz slajdów"
 
 #. Flagged label and toggle
 #: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
-#: ../src/SearchFilter.vala:990 ../src/library/FlaggedPage.vala:8
+#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
 msgid "Flagged"
 msgstr "Oznaczone flagą"
 
 #: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
+#: ../src/library/Branch.vala:97
 msgid "Photos"
 msgstr "Zdjęcia"
 
@@ -3725,28 +3837,37 @@ msgstr "Zdjęcia RAW"
 msgid "RAW photos"
 msgstr "Zdjęcia RAW"
 
-#: ../src/SearchFilter.vala:952
+#: ../src/SearchFilter.vala:934
 #, c-format
 msgid "Error loading UI file %s: %s"
 msgstr "Błąd podczas wczytywania pliku interfejsu użytkownika %s: %s"
 
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: ../src/SearchFilter.vala:945
+msgid "Close"
+msgstr "Zamknij"
+
 #. Type label and toggles
-#: ../src/SearchFilter.vala:969
+#: ../src/SearchFilter.vala:951
 msgid "Type"
 msgstr "Typ"
 
 #. Rating label and button
-#: ../src/SearchFilter.vala:1003 ../src/searches/SearchBoolean.vala:184
+#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
 msgid "Rating"
 msgstr "Ocena"
 
-#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:182
+#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
 msgid "Settings"
 msgstr "Ustawienia"
 
 #. Set up toolbar
 #. add toolbar buttons
-#: ../src/SlideshowPage.vala:161
+#: ../src/SlideshowPage.vala:160
 msgid "Back"
 msgstr "Wstecz"
 
@@ -3754,15 +3875,15 @@ msgstr "Wstecz"
 msgid "Go to the previous photo"
 msgstr "Przechodzi do poprzedniego zdjęcia"
 
-#: ../src/SlideshowPage.vala:168 ../src/SlideshowPage.vala:273
+#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:274
+#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
 msgid "Pause the slideshow"
 msgstr "Wstrzymuje pokaz slajdów"
 
-#: ../src/SlideshowPage.vala:175
+#: ../src/SlideshowPage.vala:174
 msgid "Next"
 msgstr "Dalej"
 
@@ -3770,20 +3891,20 @@ msgstr "Dalej"
 msgid "Go to the next photo"
 msgstr "Przechodzi do następnego zdjęcia"
 
-#: ../src/SlideshowPage.vala:183
+#: ../src/SlideshowPage.vala:184
 msgid "Change slideshow settings"
 msgstr "Zmienia ustawienia pokazu slajdów"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: ../src/SlideshowPage.vala:237
+#: ../src/SlideshowPage.vala:238
 msgid "All photo source files are missing."
 msgstr "Brak wszystkich plików źródłowych zdjęć."
 
-#: ../src/SlideshowPage.vala:269
+#: ../src/SlideshowPage.vala:270
 msgid "Play"
 msgstr "Odtwórz"
 
-#: ../src/SlideshowPage.vala:270
+#: ../src/SlideshowPage.vala:271
 msgid "Continue the slideshow"
 msgstr "Kontynuuje pokaz slajdów"
 
@@ -3792,11 +3913,11 @@ msgid "untitled"
 msgstr "bez nazwy"
 
 #. multiple videos
-#: ../src/VideoSupport.vala:486
+#: ../src/VideoSupport.vala:489
 msgid "Export Videos"
 msgstr "Eksport nagrań wideo"
 
-#: ../src/camera/Branch.vala:87
+#: ../src/camera/Branch.vala:85
 msgid "Cameras"
 msgstr "Aparaty"
 
@@ -3820,28 +3941,28 @@ msgstr "Wyświetla tylko zdjęcia, które nie zostały jeszcze zaimportowane"
 #. prior to import.
 #. TODO: replace this with approved text for "talking to camera,
 #. please wait" once new strings are being accepted.
-#: ../src/camera/ImportPage.vala:845
+#: ../src/camera/ImportPage.vala:847
 msgid "Starting import, please wait..."
 msgstr "Rozpoczynanie importowania, proszę czekać..."
 
-#: ../src/camera/ImportPage.vala:884
+#: ../src/camera/ImportPage.vala:886
 msgid "Import _Selected"
 msgstr "_Zaimportuj wybrane"
 
-#: ../src/camera/ImportPage.vala:885
+#: ../src/camera/ImportPage.vala:887
 msgid "Import the selected photos into your library"
 msgstr "Importuje wybrane zdjęcia do kolekcji"
 
-#: ../src/camera/ImportPage.vala:890
+#: ../src/camera/ImportPage.vala:892
 msgid "Import _All"
 msgstr "Z_aimportuj wszystkie"
 
-#: ../src/camera/ImportPage.vala:891
+#: ../src/camera/ImportPage.vala:893
 msgid "Import all the photos into your library"
 msgstr "Importuje wszystkie zdjęcia do kolekcji"
 
 #. it's mounted, offer to unmount for the user
-#: ../src/camera/ImportPage.vala:1012
+#: ../src/camera/ImportPage.vala:1014
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it.  Continue?"
@@ -3849,15 +3970,15 @@ msgstr ""
 "Program Shotwell musi odmontować aparat z systemu plików, aby uzyskać do "
 "niego dostęp. Kontynuować?"
 
-#: ../src/camera/ImportPage.vala:1018
+#: ../src/camera/ImportPage.vala:1020
 msgid "_Unmount"
 msgstr "Odmont_uj"
 
-#: ../src/camera/ImportPage.vala:1023
+#: ../src/camera/ImportPage.vala:1025
 msgid "Please unmount the camera."
 msgstr "Proszę odmontować aparat."
 
-#: ../src/camera/ImportPage.vala:1028
+#: ../src/camera/ImportPage.vala:1030
 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 "
@@ -3867,11 +3988,11 @@ msgstr ""
 "dostęp do aparatu tylko wtedy, kiedy nie jest zablokowany. Proszę zamknąć "
 "wszystkie pozostałe programy używające aparatu i spróbować ponownie."
 
-#: ../src/camera/ImportPage.vala:1038
+#: ../src/camera/ImportPage.vala:1040
 msgid "Please close any other application using the camera."
 msgstr "Proszę zamknąć inne programy używające aparatu."
 
-#: ../src/camera/ImportPage.vala:1043
+#: ../src/camera/ImportPage.vala:1045
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -3880,25 +4001,25 @@ msgstr ""
 "Nie można pobrać podglądu z aparatu:\n"
 "%s"
 
-#: ../src/camera/ImportPage.vala:1060
+#: ../src/camera/ImportPage.vala:1062
 msgid "Unmounting..."
 msgstr "Odmontowywanie..."
 
-#: ../src/camera/ImportPage.vala:1166
+#: ../src/camera/ImportPage.vala:1168
 msgid "Fetching photo information"
 msgstr "Pobieranie informacji o zdjęciach"
 
-#: ../src/camera/ImportPage.vala:1521
+#: ../src/camera/ImportPage.vala:1523
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Pobieranie podglądu dla %s"
 
-#: ../src/camera/ImportPage.vala:1637
+#: ../src/camera/ImportPage.vala:1639
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Nie można zablokować aparatu: %s"
 
-#: ../src/camera/ImportPage.vala:1722
+#: ../src/camera/ImportPage.vala:1724
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -3906,7 +4027,7 @@ msgstr[0] "Usunąć to zdjęcie z aparatu?"
 msgstr[1] "Usunąć te %d zdjęcia z aparatu?"
 msgstr[2] "Usunąć te %d zdjęć z aparatu?"
 
-#: ../src/camera/ImportPage.vala:1725
+#: ../src/camera/ImportPage.vala:1727
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -3914,7 +4035,7 @@ msgstr[0] "Usunąć to nagranie wideo z aparatu?"
 msgstr[1] "Usunąć te %d nagrania wideo z aparatu?"
 msgstr[2] "Usunąć te %d nagrań wideo z aparatu?"
 
-#: ../src/camera/ImportPage.vala:1728
+#: ../src/camera/ImportPage.vala:1730
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
@@ -3922,7 +4043,7 @@ msgstr[0] "Usunąć to zdjęcie/nagranie wideo z aparatu?"
 msgstr[1] "Usunąć te %d zdjęcia/nagrania wideo z aparatu?"
 msgstr[2] "Usunąć te %d zdjęć/nagrań wideo z aparatu?"
 
-#: ../src/camera/ImportPage.vala:1731
+#: ../src/camera/ImportPage.vala:1733
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
@@ -3930,11 +4051,11 @@ msgstr[0] "Usunąć te pliki z aparatu?"
 msgstr[1] "Usunąć %d pliki z aparatu?"
 msgstr[2] "Usunąć %d plików z aparatu?"
 
-#: ../src/camera/ImportPage.vala:1758
+#: ../src/camera/ImportPage.vala:1760
 msgid "Removing photos/videos from camera"
 msgstr "Usuwanie zdjęć/nagrań wideo z aparatu"
 
-#: ../src/camera/ImportPage.vala:1762
+#: ../src/camera/ImportPage.vala:1764
 #, 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."
@@ -3986,20 +4107,16 @@ msgid "Database file:"
 msgstr "Plik bazy danych:"
 
 #: ../src/data_imports/DataImportsUI.vala:112
-#: ../src/library/LibraryWindow.vala:899
+#: ../src/library/LibraryWindow.vala:883
 msgid "_Import"
 msgstr "Zai_mportuj"
 
-#: ../src/data_imports/DataImportsUI.vala:216
+#: ../src/data_imports/DataImportsUI.vala:217
 msgid "Import From Application"
 msgstr "Import z programu"
 
-#: ../src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "Importowanie multimediów _z:"
-
-#: ../src/data_imports/DataImportsUI.vala:394
-#: ../src/publishing/PublishingUI.vala:493
+#: ../src/data_imports/DataImportsUI.vala:369
+#: ../src/publishing/PublishingUI.vala:470
 msgid "_Close"
 msgstr "Zam_knij"
 
@@ -4032,15 +4149,10 @@ msgstr ""
 "Błąd: \n"
 "%s"
 
-#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:352
+#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:336
 msgid "_File"
 msgstr "_Plik"
 
-#: ../src/direct/DirectPhotoPage.vala:51
-#: ../src/direct/DirectPhotoPage.vala:417
-msgid "_Save"
-msgstr "Zapi_sz"
-
 #: ../src/direct/DirectPhotoPage.vala:52
 msgid "Save photo"
 msgstr "Zapisuje zdjęcie"
@@ -4057,19 +4169,10 @@ msgstr "Zapisuje zdjęcie pod inną nazwą"
 msgid "Print the photo to a printer connected to your computer"
 msgstr "Drukuje zdjęcie na drukarce podłączonej do komputera"
 
-#: ../src/direct/DirectPhotoPage.vala:73 ../src/library/LibraryWindow.vala:356
-msgid "_Edit"
-msgstr "_Edycja"
-
-#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:364
+#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:348
 msgid "_Photo"
 msgstr "_Zdjęcie"
 
-#: ../src/direct/DirectPhotoPage.vala:169
-#: ../src/library/LibraryWindow.vala:380
-msgid "_Help"
-msgstr "Pomo_c"
-
 #: ../src/direct/DirectPhotoPage.vala:227
 #, c-format
 msgid "%s does not exist."
@@ -4089,26 +4192,26 @@ msgstr ""
 "Program %s nie obsługuje formatu pliku\n"
 "%s."
 
-#: ../src/direct/DirectPhotoPage.vala:417
+#: ../src/direct/DirectPhotoPage.vala:422
 msgid "_Save a Copy"
 msgstr "Zapi_sz kopię"
 
-#: ../src/direct/DirectPhotoPage.vala:420
+#: ../src/direct/DirectPhotoPage.vala:425
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Utracić zmiany w %s?"
 
-#: ../src/direct/DirectPhotoPage.vala:421
+#: ../src/direct/DirectPhotoPage.vala:426
 msgid "Close _without Saving"
 msgstr "Zamknij _bez zapisywania"
 
-#: ../src/direct/DirectPhotoPage.vala:454
+#: ../src/direct/DirectPhotoPage.vala:459
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Błąd podczas zapisywania zdjęcia do %s: %s"
 
-#: ../src/direct/DirectPhotoPage.vala:482
-#: ../src/direct/DirectPhotoPage.vala:503
+#: ../src/direct/DirectPhotoPage.vala:487
+#: ../src/direct/DirectPhotoPage.vala:508
 msgid "Save As"
 msgstr "Zapisz jako"
 
@@ -4240,6 +4343,10 @@ msgstr "Rozszerzenie kontrastu"
 msgid "Angle:"
 msgstr "Kąt:"
 
+#: ../src/events/Branch.vala:25
+msgid "Events"
+msgstr "Wydarzenia"
+
 #: ../src/events/EventDirectoryItem.vala:83
 #, c-format
 msgid "%d Photo/Video"
@@ -4265,8 +4372,8 @@ msgid "No events found"
 msgstr "Nie odnaleziono wydarzeń"
 
 #: ../src/events/EventsDirectoryPage.vala:230
-msgid "Events"
-msgstr "Wydarzenia"
+msgid "All Events"
+msgstr "Wszystkie wydarzenia"
 
 #: ../src/events/EventsDirectoryPage.vala:244
 msgid "Undated"
@@ -4284,7 +4391,8 @@ msgstr "%B"
 msgid "Folders"
 msgstr "Katalogi"
 
-#: ../src/library/Branch.vala:37 ../ui/shotwell.glade.h:33
+#: ../src/library/Branch.vala:30 ../src/library/Branch.vala:130
+#: ../ui/shotwell.glade.h:32
 msgid "Library"
 msgstr "Kolekcja"
 
@@ -4292,19 +4400,19 @@ msgstr "Kolekcja"
 msgid "Importing..."
 msgstr "Importowanie..."
 
-#: ../src/library/ImportQueuePage.vala:66
+#: ../src/library/ImportQueuePage.vala:67
 msgid "_Stop Import"
 msgstr "_Zatrzymaj importowanie"
 
-#: ../src/library/ImportQueuePage.vala:67
+#: ../src/library/ImportQueuePage.vala:68
 msgid "Stop importing photos"
 msgstr "Zatrzymuje importowanie zdjęć"
 
-#: ../src/library/ImportQueuePage.vala:123
+#: ../src/library/ImportQueuePage.vala:124
 msgid "Preparing to import..."
 msgstr "Przygotowywanie do zaimportowania..."
 
-#: ../src/library/ImportQueuePage.vala:150
+#: ../src/library/ImportQueuePage.vala:151
 #, c-format
 msgid "Imported %s"
 msgstr "Zaimportowano %s"
@@ -4313,100 +4421,100 @@ msgstr "Zaimportowano %s"
 msgid "Last Import"
 msgstr "Ostatni import"
 
-#: ../src/library/LibraryWindow.vala:301
+#: ../src/library/LibraryWindow.vala:286
 msgid "_Import From Folder..."
 msgstr "_Zaimportuj z katalogu..."
 
-#: ../src/library/LibraryWindow.vala:302
+#: ../src/library/LibraryWindow.vala:287
 msgid "Import photos from disk to library"
 msgstr "Importuje zdjęcia z dysku do kolekcji"
 
-#: ../src/library/LibraryWindow.vala:309
+#: ../src/library/LibraryWindow.vala:294
 msgid "Import From _Application..."
 msgstr "Zaimportuj z p_rogramu..."
 
-#: ../src/library/LibraryWindow.vala:313
+#: ../src/library/LibraryWindow.vala:298
 msgid "Sort _Events"
 msgstr "Uporządkuj wydarz_enia"
 
-#: ../src/library/LibraryWindow.vala:323
+#: ../src/library/LibraryWindow.vala:308
 msgid "Empty T_rash"
 msgstr "Opróżnij _kosz"
 
-#: ../src/library/LibraryWindow.vala:324
+#: ../src/library/LibraryWindow.vala:309
 msgid "Delete all photos in the trash"
 msgstr "Usuwa wszystkie zdjęcia z kosza"
 
-#: ../src/library/LibraryWindow.vala:329
+#: ../src/library/LibraryWindow.vala:314
 msgid "View Eve_nt for Photo"
 msgstr "Wyświetl wydarze_nie dla zdjęcia"
 
-#: ../src/library/LibraryWindow.vala:334
+#: ../src/library/LibraryWindow.vala:318
 msgid "_Find"
 msgstr "_Znajdź"
 
-#: ../src/library/LibraryWindow.vala:335
+#: ../src/library/LibraryWindow.vala:319
 msgid "Find photos and videos by search criteria"
 msgstr "Wyszukuje zdjęcia i nagrania wideo według kryteriów wyszukiwania"
 
-#: ../src/library/LibraryWindow.vala:346 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:195
+#: ../src/library/LibraryWindow.vala:330 ../src/searches/Branch.vala:77
+#: ../src/sidebar/Tree.vala:199
 msgid "Ne_w Saved Search..."
 msgstr "No_we zapisane wyszukiwanie..."
 
-#: ../src/library/LibraryWindow.vala:368
+#: ../src/library/LibraryWindow.vala:352
 msgid "_Photos"
 msgstr "_Zdjęcia"
 
-#: ../src/library/LibraryWindow.vala:372
+#: ../src/library/LibraryWindow.vala:356
 msgid "Even_ts"
 msgstr "Wy_darzenia"
 
-#: ../src/library/LibraryWindow.vala:391
+#: ../src/library/LibraryWindow.vala:375
 msgid "_Basic Information"
 msgstr "_Podstawowe informacje"
 
-#: ../src/library/LibraryWindow.vala:392
+#: ../src/library/LibraryWindow.vala:376
 msgid "Display basic information for the selection"
 msgstr "Wyświetla podstawowe informacje o wybranych zdjęciach"
 
-#: ../src/library/LibraryWindow.vala:397
+#: ../src/library/LibraryWindow.vala:381
 msgid "E_xtended Information"
 msgstr "_Rozszerzone informacje"
 
-#: ../src/library/LibraryWindow.vala:398
+#: ../src/library/LibraryWindow.vala:382
 msgid "Display extended information for the selection"
 msgstr "Wyświetla rozszerzone informacje o wybranych zdjęciach"
 
-#: ../src/library/LibraryWindow.vala:403
+#: ../src/library/LibraryWindow.vala:387
 msgid "_Search Bar"
 msgstr "Pasek wy_szukiwania"
 
-#: ../src/library/LibraryWindow.vala:404
+#: ../src/library/LibraryWindow.vala:388
 msgid "Display the search bar"
 msgstr "Wyświetla pasek wyszukiwania"
 
-#: ../src/library/LibraryWindow.vala:409
+#: ../src/library/LibraryWindow.vala:393
 msgid "S_idebar"
 msgstr "Panel _boczny"
 
-#: ../src/library/LibraryWindow.vala:410
+#: ../src/library/LibraryWindow.vala:394
 msgid "Display the sidebar"
 msgstr "Wyświetla panel boczny"
 
-#: ../src/library/LibraryWindow.vala:668
+#: ../src/library/LibraryWindow.vala:652
 msgid "Import From Folder"
 msgstr "Importowanie z katalogu"
 
-#: ../src/library/LibraryWindow.vala:737
+#: ../src/library/LibraryWindow.vala:721
 msgid "Empty Trash"
 msgstr "Opróżnij kosz"
 
-#: ../src/library/LibraryWindow.vala:737
+#: ../src/library/LibraryWindow.vala:721
 msgid "Emptying Trash..."
 msgstr "Opróżnianie kosza..."
 
-#: ../src/library/LibraryWindow.vala:896
+#: ../src/library/LibraryWindow.vala:880
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4420,34 +4528,34 @@ msgstr ""
 "Preferencje</span>.\n"
 "Kontynuować importowanie zdjęć?"
 
-#: ../src/library/LibraryWindow.vala:899 ../ui/shotwell.glade.h:19
+#: ../src/library/LibraryWindow.vala:883 ../ui/shotwell.glade.h:18
 msgid "Library Location"
 msgstr "Położenie kolekcji"
 
 #. TODO: Specify which directory/file.
-#: ../src/library/LibraryWindow.vala:912
+#: ../src/library/LibraryWindow.vala:896
 msgid "Photos cannot be imported from this directory."
 msgstr "Nie można importować zdjęć z tego katalogu."
 
-#: ../src/library/LibraryWindow.vala:1200
+#: ../src/library/LibraryWindow.vala:1184
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: ../src/library/LibraryWindow.vala:1244
-#: ../src/library/LibraryWindow.vala:1255
+#: ../src/library/LibraryWindow.vala:1228
+#: ../src/library/LibraryWindow.vala:1239
 msgid "Updating library..."
 msgstr "Aktualizowanie kolekcji..."
 
-#: ../src/library/LibraryWindow.vala:1261
+#: ../src/library/LibraryWindow.vala:1245
 msgid "Preparing to auto-import photos..."
 msgstr "Przygotowywanie do automatycznego zaimportowania zdjęć..."
 
-#: ../src/library/LibraryWindow.vala:1266
+#: ../src/library/LibraryWindow.vala:1250
 msgid "Auto-importing photos..."
 msgstr "Automatyczne importowanie zdjęć..."
 
-#: ../src/library/LibraryWindow.vala:1274
+#: ../src/library/LibraryWindow.vala:1258
 msgid "Writing metadata to files..."
 msgstr "Zapisywanie metadanych do plików..."
 
@@ -4560,22 +4668,22 @@ msgstr "BMP"
 msgid "JPEG"
 msgstr "JPEG"
 
-#: ../src/photos/JfifSupport.vala:182
+#: ../src/photos/JfifSupport.vala:185
 #, c-format
 msgid "Low (%d%%)"
 msgstr "Niskie (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:185
+#: ../src/photos/JfifSupport.vala:188
 #, c-format
 msgid "Medium (%d%%)"
 msgstr "Średnie (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:188
+#: ../src/photos/JfifSupport.vala:191
 #, c-format
 msgid "High (%d%%)"
 msgstr "Wysokie (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:191
+#: ../src/photos/JfifSupport.vala:194
 #, c-format
 msgid "Maximum (%d%%)"
 msgstr "Maksymalne (%d%%)"
@@ -4644,37 +4752,37 @@ msgstr "Pobieranie informacji o koncie..."
 msgid "Logging in..."
 msgstr "Logowanie..."
 
-#: ../src/publishing/PublishingUI.vala:183
+#: ../src/publishing/PublishingUI.vala:185
 msgid "Publish Photos"
 msgstr "Publikacja zdjęć"
 
-#: ../src/publishing/PublishingUI.vala:184
+#: ../src/publishing/PublishingUI.vala:186
 msgid "Publish photos _to:"
 msgstr "Publikowanie zdjęć _do:"
 
-#: ../src/publishing/PublishingUI.vala:186
+#: ../src/publishing/PublishingUI.vala:188
 msgid "Publish Videos"
 msgstr "Publikacja nagrań wideo"
 
-#: ../src/publishing/PublishingUI.vala:187
+#: ../src/publishing/PublishingUI.vala:189
 msgid "Publish videos _to"
 msgstr "Publikowanie nagrań wideo _do"
 
-#: ../src/publishing/PublishingUI.vala:189
+#: ../src/publishing/PublishingUI.vala:191
 msgid "Publish Photos and Videos"
 msgstr "Publikacja zdjęć i nagrań wideo"
 
-#: ../src/publishing/PublishingUI.vala:190
+#: ../src/publishing/PublishingUI.vala:192
 msgid "Publish photos and videos _to"
 msgstr "Publikowanie zdjęć i nagrań wideo _do"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: ../src/publishing/PublishingUI.vala:383
+#: ../src/publishing/PublishingUI.vala:360
 msgid "Unable to publish"
 msgstr "Nie można opublikować"
 
-#: ../src/publishing/PublishingUI.vala:384
+#: ../src/publishing/PublishingUI.vala:361
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -4692,123 +4800,139 @@ msgid "Saved Searches"
 msgstr "Zapisane wyszukiwania"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:168
 msgid "contains"
 msgstr "zawiera"
 
 #. Ordering must correspond with Context
-#: ../src/searches/SavedSearchDialog.vala:170
-#: ../src/searches/SavedSearchDialog.vala:497
+#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:500
 msgid "is exactly"
 msgstr "wynosi dokładnie"
 
-#: ../src/searches/SavedSearchDialog.vala:171
+#: ../src/searches/SavedSearchDialog.vala:170
 msgid "starts with"
 msgstr "rozpoczyna się od"
 
-#: ../src/searches/SavedSearchDialog.vala:172
+#: ../src/searches/SavedSearchDialog.vala:171
 msgid "ends with"
 msgstr "kończy się na"
 
-#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:172
 msgid "does not contain"
 msgstr "nie zawiera"
 
-#: ../src/searches/SavedSearchDialog.vala:174
-#: ../src/searches/SavedSearchDialog.vala:501
+#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:504
 msgid "is not set"
 msgstr "nie jest ustawione"
 
+#: ../src/searches/SavedSearchDialog.vala:174
+msgid "is set"
+msgstr "jest ustawione"
+
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: ../src/searches/SavedSearchDialog.vala:245
-#: ../src/searches/SavedSearchDialog.vala:376
-#: ../src/searches/SavedSearchDialog.vala:441
+#: ../src/searches/SavedSearchDialog.vala:248
+#: ../src/searches/SavedSearchDialog.vala:379
+#: ../src/searches/SavedSearchDialog.vala:444
 msgid "is"
 msgstr "jest"
 
-#: ../src/searches/SavedSearchDialog.vala:246
+#: ../src/searches/SavedSearchDialog.vala:249
 msgid "is not"
 msgstr "nie jest"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:252
+#: ../src/searches/SavedSearchDialog.vala:255
 msgid "any photo"
 msgstr "wszystkie zdjęcia"
 
-#: ../src/searches/SavedSearchDialog.vala:253
+#: ../src/searches/SavedSearchDialog.vala:256
 msgid "a raw photo"
 msgstr "surowe zdjęcie"
 
-#: ../src/searches/SavedSearchDialog.vala:254
+#: ../src/searches/SavedSearchDialog.vala:257
 msgid "a video"
 msgstr "nagranie wideo"
 
-#: ../src/searches/SavedSearchDialog.vala:308
+#: ../src/searches/SavedSearchDialog.vala:311
 msgid "has"
 msgstr "posiada"
 
-#: ../src/searches/SavedSearchDialog.vala:309
+#: ../src/searches/SavedSearchDialog.vala:312
 msgid "has no"
 msgstr "nie posiada"
 
-#: ../src/searches/SavedSearchDialog.vala:314
+#: ../src/searches/SavedSearchDialog.vala:317
 msgid "modifications"
 msgstr "modyfikacje"
 
-#: ../src/searches/SavedSearchDialog.vala:315
+#: ../src/searches/SavedSearchDialog.vala:318
 msgid "internal modifications"
 msgstr "wewnętrzne modyfikacje"
 
-#: ../src/searches/SavedSearchDialog.vala:316
+#: ../src/searches/SavedSearchDialog.vala:319
 msgid "external modifications"
 msgstr "zewnętrzne modyfikacje"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:370
+#: ../src/searches/SavedSearchDialog.vala:373
 msgid "flagged"
 msgstr "oznaczone flagą"
 
-#: ../src/searches/SavedSearchDialog.vala:371
+#: ../src/searches/SavedSearchDialog.vala:374
 msgid "not flagged"
 msgstr "nieoznaczone flagą"
 
-#: ../src/searches/SavedSearchDialog.vala:434
+#: ../src/searches/SavedSearchDialog.vala:437
 msgid "and higher"
 msgstr "i wyższe"
 
-#: ../src/searches/SavedSearchDialog.vala:435
+#: ../src/searches/SavedSearchDialog.vala:438
 msgid "only"
 msgstr "tylko"
 
-#: ../src/searches/SavedSearchDialog.vala:436
+#: ../src/searches/SavedSearchDialog.vala:439
 msgid "and lower"
 msgstr "i niższe"
 
-#: ../src/searches/SavedSearchDialog.vala:498
+#: ../src/searches/SavedSearchDialog.vala:501
 msgid "is after"
 msgstr "jest po"
 
-#: ../src/searches/SavedSearchDialog.vala:499
+#: ../src/searches/SavedSearchDialog.vala:502
 msgid "is before"
 msgstr "jest przed"
 
-#: ../src/searches/SavedSearchDialog.vala:500
+#: ../src/searches/SavedSearchDialog.vala:503
 msgid "is between"
 msgstr "jest między"
 
-#: ../src/searches/SavedSearchDialog.vala:513
+#: ../src/searches/SavedSearchDialog.vala:516
 msgid "and"
 msgstr "oraz"
 
-#: ../src/searches/SavedSearchDialog.vala:720
+#: ../src/searches/SavedSearchDialog.vala:697
+msgid "Search"
+msgstr "Wyszukiwanie"
+
+#: ../src/searches/SavedSearchDialog.vala:702
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: ../src/searches/SavedSearchDialog.vala:703
+msgid "OK"
+msgstr "OK"
+
+#: ../src/searches/SavedSearchDialog.vala:721
 msgid "any"
 msgstr "dowolne"
 
-#: ../src/searches/SavedSearchDialog.vala:721
+#: ../src/searches/SavedSearchDialog.vala:722
 msgid "all"
 msgstr "wszystko"
 
-#: ../src/searches/SavedSearchDialog.vala:722
+#: ../src/searches/SavedSearchDialog.vala:723
 msgid "none"
 msgstr "brak"
 
@@ -4852,7 +4976,7 @@ msgstr "Stan zdjęcia"
 msgid "Date"
 msgstr "Data"
 
-#: ../src/sidebar/Tree.vala:199
+#: ../src/sidebar/Tree.vala:203
 msgid "New _Tag..."
 msgstr "Nowa _etykieta..."
 
@@ -4872,7 +4996,7 @@ msgstr "Brak"
 msgid "Random"
 msgstr "Losowe"
 
-#: ../src/tags/Branch.vala:127
+#: ../src/tags/Branch.vala:131
 msgid "Tags"
 msgstr "Etykiety"
 
@@ -4911,157 +5035,153 @@ msgid "How long each photo is shown on the desktop background"
 msgstr "Jak długo każde zdjęcie jest wyświetlane jako tło pulpitu"
 
 #: ../ui/shotwell.glade.h:1
-msgid "Search"
-msgstr "Wyszukiwanie"
-
-#: ../ui/shotwell.glade.h:2
 msgid "_Name of search:"
 msgstr "_Nazwa wyszukiwania:"
 
-#: ../ui/shotwell.glade.h:3
+#: ../ui/shotwell.glade.h:2
 msgid "_Match"
 msgstr "_Dopasowanie"
 
-#: ../ui/shotwell.glade.h:4
+#: ../ui/shotwell.glade.h:3
 msgid "of the following:"
 msgstr "następujących:"
 
-#: ../ui/shotwell.glade.h:5
+#: ../ui/shotwell.glade.h:4
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Rozmiar wydrukowanego obrazu</b>"
 
-#: ../ui/shotwell.glade.h:6
+#: ../ui/shotwell.glade.h:5
 msgid "Use a _standard size:"
 msgstr "Użycie _standardowego rozmiaru:"
 
-#: ../ui/shotwell.glade.h:7
+#: ../ui/shotwell.glade.h:6
 msgid "Use a c_ustom size:"
 msgstr "_Użycie własnego rozmiaru:"
 
-#: ../ui/shotwell.glade.h:8
+#: ../ui/shotwell.glade.h:7
 msgid "_Match photo aspect ratio"
 msgstr "Utrzy_mywanie proporcji zdjęcia"
 
-#: ../ui/shotwell.glade.h:9
+#: ../ui/shotwell.glade.h:8
 msgid "_Autosize:"
 msgstr "Rozmiar _automatyczny:"
 
-#: ../ui/shotwell.glade.h:10
+#: ../ui/shotwell.glade.h:9
 msgid "<b>Titles</b>"
 msgstr "<b>Tytuły</b>"
 
-#: ../ui/shotwell.glade.h:11
+#: ../ui/shotwell.glade.h:10
 msgid "Print image _title"
 msgstr "Drukowanie _tytułów obrazów"
 
-#: ../ui/shotwell.glade.h:12
+#: ../ui/shotwell.glade.h:11
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Rozdzielczość w pikselach</b>"
 
-#: ../ui/shotwell.glade.h:13
+#: ../ui/shotwell.glade.h:12
 msgid "_Output photo at:"
 msgstr "Wyjście zdjęcia na:"
 
-#: ../ui/shotwell.glade.h:14
+#: ../ui/shotwell.glade.h:13
 msgid "pixels per inch"
 msgstr "piksele na cal"
 
-#: ../ui/shotwell.glade.h:16
+#: ../ui/shotwell.glade.h:15
 msgid "Shotwell Preferences"
 msgstr "Preferencje programu Shotwell"
 
-#: ../ui/shotwell.glade.h:17
+#: ../ui/shotwell.glade.h:16
 msgid "white"
 msgstr "biały"
 
-#: ../ui/shotwell.glade.h:18
+#: ../ui/shotwell.glade.h:17
 msgid "black"
 msgstr "czarny"
 
-#: ../ui/shotwell.glade.h:20
+#: ../ui/shotwell.glade.h:19
 msgid "_Watch library directory for new files"
 msgstr "_Obserwacja katalogu kolekcji pod kątem nowych plików"
 
-#: ../ui/shotwell.glade.h:21
+#: ../ui/shotwell.glade.h:20
 msgid "Metadata"
 msgstr "Metadane"
 
-#: ../ui/shotwell.glade.h:22
+#: ../ui/shotwell.glade.h:21
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "Zapisywanie etykiet, tytułów i innych metadanych do plików zdjęć"
 
-#: ../ui/shotwell.glade.h:23
+#: ../ui/shotwell.glade.h:22
 msgid "Display"
 msgstr "Ekran"
 
-#: ../ui/shotwell.glade.h:24
+#: ../ui/shotwell.glade.h:23
 msgid "_Import photos to:"
 msgstr "_Importowanie zdjęć do:"
 
-#: ../ui/shotwell.glade.h:25
+#: ../ui/shotwell.glade.h:24
 msgid "_Background:"
 msgstr "_Tło:"
 
-#: ../ui/shotwell.glade.h:26
+#: ../ui/shotwell.glade.h:25
 msgid "Importing"
 msgstr "Importowanie"
 
-#: ../ui/shotwell.glade.h:27
+#: ../ui/shotwell.glade.h:26
 msgid "_Directory structure:"
 msgstr "Struktura _katalogów:"
 
-#: ../ui/shotwell.glade.h:28
+#: ../ui/shotwell.glade.h:27
 msgid "_Pattern:"
 msgstr "_Wzór:"
 
-#: ../ui/shotwell.glade.h:29
+#: ../ui/shotwell.glade.h:28
 msgid "Example:"
 msgstr "Przykład:"
 
-#: ../ui/shotwell.glade.h:30
+#: ../ui/shotwell.glade.h:29
 msgid "R_ename imported files to lowercase"
 msgstr "_Zmienianie nazw importowanych plików na małe litery"
 
-#: ../ui/shotwell.glade.h:31
+#: ../ui/shotwell.glade.h:30
 msgid "RAW Developer"
 msgstr "Wywoływacz RAW"
 
-#: ../ui/shotwell.glade.h:32
+#: ../ui/shotwell.glade.h:31
 msgid "De_fault:"
 msgstr "_Domyślnie:"
 
-#: ../ui/shotwell.glade.h:34
+#: ../ui/shotwell.glade.h:33
 msgid "E_xternal photo editor:"
 msgstr "_Zewnętrzny edytor zdjęć:"
 
-#: ../ui/shotwell.glade.h:35
+#: ../ui/shotwell.glade.h:34
 msgid "External _RAW editor:"
 msgstr "Zewnętrzny edytor plików _RAW:"
 
-#: ../ui/shotwell.glade.h:36
+#: ../ui/shotwell.glade.h:35
 msgid "External Editors"
 msgstr "Zewnętrzne edytory"
 
-#: ../ui/shotwell.glade.h:37
+#: ../ui/shotwell.glade.h:36
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: ../ui/shotwell.glade.h:38
+#: ../ui/shotwell.glade.h:37
 msgid "_Delay:"
 msgstr "_Opóźnienie:"
 
-#: ../ui/shotwell.glade.h:39
+#: ../ui/shotwell.glade.h:38
 msgid "_Transition effect:"
 msgstr "_Efekt przejścia:"
 
-#: ../ui/shotwell.glade.h:40
+#: ../ui/shotwell.glade.h:39
 msgid "Transition d_elay:"
 msgstr "Opóźnienie prz_ejścia:"
 
-#: ../ui/shotwell.glade.h:41
+#: ../ui/shotwell.glade.h:40
 msgid "Show t_itle"
 msgstr "Wyświetlanie tyt_ułu"
 
-#: ../ui/shotwell.glade.h:42
+#: ../ui/shotwell.glade.h:41
 msgid "seconds"
 msgstr "sekundy"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0816240..a372bdf 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,15 +12,15 @@
 #  lsbeeler <lucas@yorba.org>, 2011
 #
 # Translators from GNOME Translation Project (2014 forward):
-#  Rafael Ferreira <rafael.f.f1@gmail.com>, 2014
+#  Rafael Ferreira <rafael.f.f1@gmail.com>, 2014, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2014-05-27 20:10+0000\n"
-"PO-Revision-Date: 2014-06-16 08:21-0300\n"
+"POT-Creation-Date: 2015-03-03 11:53+0000\n"
+"PO-Revision-Date: 2015-03-03 12:05-0300\n"
 "Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -28,7 +28,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.6.5\n"
+"X-Generator: Poedit 1.7.4\n"
 
 #: ../plugins/common/RESTSupport.vala:424
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
@@ -53,7 +53,7 @@ msgstr ""
 msgid "Visit the Shotwell home page"
 msgstr "Visitar o página web do Shotwell"
 
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:691
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
 msgid "translator-credits"
 msgstr ""
 "Djavan Fagundes <djavan@comum.org>\n"
@@ -72,8 +72,9 @@ msgstr ""
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
 #: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
 #: ../src/Resources.vala:27
-msgid "Copyright 2009-2014 Yorba Foundation"
-msgstr "Copyright 2009-2014 Yorba Foundation"
+#| msgid "Copyright 2009-2014 Yorba Foundation"
+msgid "Copyright 2009-2015 Yorba Foundation"
+msgstr "Copyright 2009-2015 Yorba Foundation"
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:56
 msgid ""
@@ -154,7 +155,7 @@ msgstr ""
 msgid "F-Spot library: %s"
 msgstr "Biblioteca F-Spot: %s"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:416
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
 msgid "Preparing to import"
 msgstr "Preparando para importar"
 
@@ -179,7 +180,7 @@ msgstr ""
 "autenticação."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: ../src/MediaPage.vala:420 ../src/photos/RawSupport.vala:297
+#: ../src/MediaPage.vala:434 ../src/photos/RawSupport.vala:300
 msgid "Shotwell"
 msgstr "Shotwell"
 
@@ -210,20 +211,23 @@ msgstr ""
 "Flowplayer."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1774
-msgid "A file required for publishing is unavailable. Publishing to "
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+#, c-format
+msgid ""
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
 msgstr ""
 "Um arquivo necessário para a publicação não está disponível. A publicação "
-"para "
+"para %s não pode continuar."
 
 #. populate any widgets whose contents are
 #. programmatically-generated
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
 #, c-format
 msgid "Publishing to %s as %s."
 msgstr "Publicando para %s e %s."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1816
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
 msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
@@ -231,7 +235,7 @@ msgstr ""
 "Digite a URL do seu site Gallery3, bem como o nome de usuário e senha (ou "
 "chave API) da sua conta Gallery3."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
 msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
@@ -239,7 +243,7 @@ msgstr ""
 "O nome de usuário e senha ou chave de API estavam incorretas. Tente "
 "novamente, digite seu nome de usuário e senha embaixo."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
 msgid ""
 "The URL entered does not appear to be the main directory of a Gallery3 "
 "instance. Please make sure you typed it correctly and it does not have any "
@@ -249,11 +253,11 @@ msgstr ""
 "Gallery3. Por favor, certifique-se de que você digitou-a corretamente e que "
 "ela não tem qualquer componente (ex.: index.php) ao final."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1871
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
 msgid "Unrecognized User"
 msgstr "Usuário não reconhecido"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1876
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
 msgid " Site Not Found"
 msgstr " Site não encontrado"
 
@@ -366,13 +370,13 @@ msgid "Copyright 2012 BJA Electronics"
 msgstr "Copyright 2012 BJA Electronics"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1229
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
 msgid "500 x 375 pixels"
 msgstr "500 x 375 pixels"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1230
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
 msgid "1024 x 768 pixels"
 msgstr "1024 x 768 pixels"
@@ -443,7 +447,7 @@ msgid "Go _Back"
 msgstr "_Voltar"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
-#: ../ui/shotwell.glade.h:43
+#: ../ui/shotwell.glade.h:42
 msgid "_Login"
 msgstr "A_utenticar"
 
@@ -499,7 +503,7 @@ msgid "pixels"
 msgstr "pixels"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
 #: ../src/Dimensions.vala:17
 msgid "Original size"
@@ -513,7 +517,7 @@ msgstr "Largura ou altura"
 #: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
 #: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
 #: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
-#: ../ui/shotwell.glade.h:15
+#: ../ui/shotwell.glade.h:14
 msgid "label"
 msgstr "rótulo"
 
@@ -641,12 +645,12 @@ msgid "Upload _size:"
 msgstr "Tama_nho de upload:"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
 msgid "Just me"
 msgstr "Somente para mim"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
 msgid "Everyone"
 msgstr "Todos"
@@ -699,49 +703,55 @@ msgstr ""
 "Você está autenticado no Flickr como %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
 #, 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 ""
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"Sua conta gratuita do Flickr limita quantos dados você pode enviar por mês.\n"
+"Este mês, você possui %d megabyte restante na sua cota de envio."
+msgstr[1] ""
 "Sua conta gratuita do Flickr limita quantos dados você pode enviar por mês.\n"
 "Este mês, você possui %d megabytes restantes na sua cota de envio."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1157
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Sua conta Pro do Flickr oferece a você uploads ilimitados."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1162
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
 msgid "Photos _visible to:"
 msgstr "Fotos _visíveis para:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
 msgid "Videos _visible to:"
 msgstr "Vídeos _visíveis para:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
 msgid "Photos and videos _visible to:"
 msgstr "Fotos e vídeos _visíveis para:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
 msgid "Friends & family only"
 msgstr "Somente amigos e família"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
 msgid "Family only"
 msgstr "Somente família"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Friends only"
 msgstr "Somente amigos"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
 msgid "2048 x 1536 pixels"
 msgstr "2048 x 1536 pixels"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
 msgid "4096 x 3072 pixels"
 msgstr "4096 x 3072 pixels"
@@ -976,7 +986,7 @@ msgid "Logout"
 msgstr "Encerrar sessão"
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:268
+#: ../src/Resources.vala:303
 msgid "Publish"
 msgstr "Publicar"
 
@@ -1033,8 +1043,9 @@ msgid "Core Slideshow Transitions"
 msgstr "Transições principais de exibição de slides"
 
 #: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
-msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
+#| msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
 
 #: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
 #, c-format
@@ -1061,56 +1072,39 @@ msgstr "Não foi possível criar diretório temporário %s: %s"
 msgid "Unable to create data subdirectory %s: %s"
 msgstr "Não foi possível criar subdiretório de dados %s: %s"
 
-#. restore pin state
-#: ../src/AppWindow.vala:52
+#: ../src/AppWindow.vala:53
 msgid "Pin Toolbar"
 msgstr "Fixar a barra de ferramentas"
 
-#: ../src/AppWindow.vala:53
+#: ../src/AppWindow.vala:54
 msgid "Pin the toolbar open"
 msgstr "Fixar a barra de ferramentas aberta"
 
-#: ../src/AppWindow.vala:57 ../src/AppWindow.vala:135
+#: ../src/AppWindow.vala:59
 msgid "Leave fullscreen"
 msgstr "Sai da tela cheia"
 
-#: ../src/AppWindow.vala:134
-msgid "Leave _Fullscreen"
-msgstr "Sair da _tela cheia"
-
-#: ../src/AppWindow.vala:496
-msgid "_Quit"
-msgstr "_Sair"
-
-#: ../src/AppWindow.vala:501
-msgid "_About"
-msgstr "S_obre"
-
-#: ../src/AppWindow.vala:506
-msgid "Fulls_creen"
-msgstr "Tela _cheia"
-
-#: ../src/AppWindow.vala:511
+#: ../src/AppWindow.vala:525
 msgid "_Contents"
 msgstr "_Conteúdo"
 
-#: ../src/AppWindow.vala:516
+#: ../src/AppWindow.vala:530
 msgid "_Frequently Asked Questions"
 msgstr "Perguntas _frequentes (FAQ)"
 
-#: ../src/AppWindow.vala:521
+#: ../src/AppWindow.vala:535
 msgid "_Report a Problem..."
 msgstr "_Reporte um Problema..."
 
-#: ../src/AppWindow.vala:620 ../src/AppWindow.vala:641
-#: ../src/AppWindow.vala:658 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1417 ../src/Dialogs.vala:1440
-#: ../src/data_imports/DataImportsUI.vala:399
-#: ../src/publishing/PublishingUI.vala:498
+#: ../src/AppWindow.vala:634 ../src/AppWindow.vala:655
+#: ../src/AppWindow.vala:672 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
+#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441 ../src/Resources.vala:162
+#: ../src/data_imports/DataImportsUI.vala:374
+#: ../src/publishing/PublishingUI.vala:475
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/AppWindow.vala:668
+#: ../src/AppWindow.vala:682
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
@@ -1123,21 +1117,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/AppWindow.vala:688
+#: ../src/AppWindow.vala:702
 msgid "Visit the Yorba web site"
 msgstr "Visite o site da Yorba"
 
-#: ../src/AppWindow.vala:700
+#: ../src/AppWindow.vala:714
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Não foi possível exibir a ajuda: %s"
 
-#: ../src/AppWindow.vala:708
+#: ../src/AppWindow.vala:722
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Não foi possível navegar no banco de dados de bugs: %s"
 
-#: ../src/AppWindow.vala:716
+#: ../src/AppWindow.vala:730
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Não foi possível exibir FAQ: %s"
@@ -1203,11 +1197,11 @@ msgstr "Arquivo de imagem corrompido"
 msgid "Imported failed (%d)"
 msgstr "A importação falhou (%d)"
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2634
+#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
 msgid "S_lideshow"
 msgstr "Exibição de s_lides"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2635
+#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
 msgid "Play a slideshow"
 msgstr "Exibir apresentação de slides"
 
@@ -1220,7 +1214,7 @@ msgid "Export Photos/Videos"
 msgstr "Exportar fotos/vídeos"
 
 #: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3207
+#: ../src/PhotoPage.vala:3211
 msgid "Export Photo"
 msgstr "Exportar fotos"
 
@@ -1268,100 +1262,100 @@ msgstr "Melhorando"
 msgid "Undoing Enhance"
 msgstr "Desfazendo melhoramento"
 
-#: ../src/Commands.vala:845
+#: ../src/Commands.vala:853
 msgid "Applying Color Transformations"
 msgstr "Aplicando transformações de cor"
 
-#: ../src/Commands.vala:845
+#: ../src/Commands.vala:853
 msgid "Undoing Color Transformations"
 msgstr "Desfazendo transformações de cor"
 
-#: ../src/Commands.vala:995
+#: ../src/Commands.vala:1003
 msgid "Creating New Event"
 msgstr "Criando novo evento"
 
-#: ../src/Commands.vala:996
+#: ../src/Commands.vala:1004
 msgid "Removing Event"
 msgstr "Removendo evento"
 
-#: ../src/Commands.vala:1005
+#: ../src/Commands.vala:1013
 msgid "Moving Photos to New Event"
 msgstr "Movendo fotos para novo evento"
 
-#: ../src/Commands.vala:1006
+#: ../src/Commands.vala:1014
 msgid "Setting Photos to Previous Event"
 msgstr "Atribuindo fotos ao evento anterior"
 
-#: ../src/Commands.vala:1063
+#: ../src/Commands.vala:1071
 msgid "Merging"
 msgstr "Mesclando"
 
-#: ../src/Commands.vala:1064
+#: ../src/Commands.vala:1072
 msgid "Unmerging"
 msgstr "Separando"
 
-#: ../src/Commands.vala:1073
+#: ../src/Commands.vala:1081
 msgid "Duplicating photos"
 msgstr "Duplicando fotos"
 
-#: ../src/Commands.vala:1073
+#: ../src/Commands.vala:1081
 msgid "Removing duplicated photos"
 msgstr "Removendo fotos duplicadas"
 
-#: ../src/Commands.vala:1096
+#: ../src/Commands.vala:1104
 #, 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] "Não foi possível duplicar uma foto, término com erro de arquivo"
 msgstr[1] "Não foi possível duplicar %d fotos, término com erros de arquivo"
 
-#: ../src/Commands.vala:1183
+#: ../src/Commands.vala:1191
 msgid "Restoring previous rating"
 msgstr "Restaurar avaliação anterior"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
 msgid "Increasing ratings"
 msgstr "Aumentar avaliação"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
 msgid "Decreasing ratings"
 msgstr "Diminuir avaliação"
 
-#: ../src/Commands.vala:1244
+#: ../src/Commands.vala:1252
 msgid "Setting RAW developer"
 msgstr "Definindo desenvolvedor RAW"
 
-#: ../src/Commands.vala:1244
+#: ../src/Commands.vala:1252
 msgid "Restoring previous RAW developer"
 msgstr "Restaurando desenvolvedor RAW anterior"
 
-#: ../src/Commands.vala:1245
+#: ../src/Commands.vala:1253
 msgid "Set Developer"
 msgstr "Definir desenvolvedor"
 
-#: ../src/Commands.vala:1335
+#: ../src/Commands.vala:1343
 msgid "Original photo could not be adjusted."
 msgstr "A foto original não pôde ser ajustada."
 
-#: ../src/Commands.vala:1356
+#: ../src/Commands.vala:1364
 msgid "Adjusting Date and Time"
 msgstr "Ajustando data e hora"
 
-#: ../src/Commands.vala:1356
+#: ../src/Commands.vala:1364
 msgid "Undoing Date and Time Adjustment"
 msgstr "Desfazendo ajuste de data e hora"
 
-#: ../src/Commands.vala:1387
+#: ../src/Commands.vala:1395
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
 msgstr[0] "Uma foto original não pôde ser ajustada."
 msgstr[1] "As seguintes fotos originais não puderam ser ajustadas."
 
-#: ../src/Commands.vala:1389 ../src/Commands.vala:1413
+#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
 msgid "Time Adjustment Error"
 msgstr "Erro de ajuste de hora"
 
-#: ../src/Commands.vala:1411
+#: ../src/Commands.vala:1419
 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."
@@ -1370,60 +1364,60 @@ msgstr[0] ""
 msgstr[1] ""
 "Os ajustes de hora não puderam ser desfeitos nos seguintes arquivos de fotos."
 
-#: ../src/Commands.vala:1625 ../src/Commands.vala:1648
+#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
 msgid "Create Tag"
 msgstr "Criar etiqueta"
 
-#: ../src/Commands.vala:1683
+#: ../src/Commands.vala:1691
 #, c-format
 msgid "Move Tag \"%s\""
 msgstr "Mover etiqueta \"%s\""
 
-#: ../src/Commands.vala:2335
+#: ../src/Commands.vala:2343
 msgid "Move Photos to Trash"
 msgstr "Mover fotos para a lixeira"
 
-#: ../src/Commands.vala:2335
+#: ../src/Commands.vala:2343
 msgid "Restore Photos from Trash"
 msgstr "Restaurar fotos da lixeira"
 
-#: ../src/Commands.vala:2336
+#: ../src/Commands.vala:2344
 msgid "Move the photos to the Shotwell trash"
 msgstr "Mover as fotos para a lixeira do Shotwell"
 
-#: ../src/Commands.vala:2336
+#: ../src/Commands.vala:2344
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Restaurar as fotos selecionadas para a galeria"
 
-#: ../src/Commands.vala:2355
+#: ../src/Commands.vala:2363
 msgid "Moving Photos to Trash"
 msgstr "Movendo fotos para a lixeira"
 
-#: ../src/Commands.vala:2355
+#: ../src/Commands.vala:2363
 msgid "Restoring Photos From Trash"
 msgstr "Restaurando fotos da lixeira"
 
-#: ../src/Commands.vala:2441
+#: ../src/Commands.vala:2449
 msgid "Flag selected photos"
 msgstr "Marcar fotos selecionadas"
 
-#: ../src/Commands.vala:2442
+#: ../src/Commands.vala:2450
 msgid "Unflag selected photos"
 msgstr "Desmarcar fotos selecionadas"
 
-#: ../src/Commands.vala:2443
+#: ../src/Commands.vala:2451
 msgid "Flagging selected photos"
 msgstr "Marcando fotos selecionadas"
 
-#: ../src/Commands.vala:2444
+#: ../src/Commands.vala:2452
 msgid "Unflagging selected photos"
 msgstr "Desmarcando fotos selecionadas"
 
-#: ../src/Commands.vala:2451
+#: ../src/Commands.vala:2459
 msgid "Flag"
 msgstr "Marcar"
 
-#: ../src/Commands.vala:2451
+#: ../src/Commands.vala:2459
 msgid "Unflag"
 msgstr "Desmarcar"
 
@@ -1453,9 +1447,9 @@ msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
 msgstr[0] "Isto irá remover a etiqueta \"%s\" de uma foto. Continuar?"
 msgstr[1] "Isto irá remover a etiqueta \"%s\" de %d fotos. Continuar?"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1385
-#: ../src/Resources.vala:328 ../src/Resources.vala:376
-#: ../src/Resources.vala:641
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
+#: ../src/Resources.vala:163 ../src/Resources.vala:369
+#: ../src/Resources.vala:417 ../src/Resources.vala:682
 msgid "_Delete"
 msgstr "_Apagar"
 
@@ -1530,51 +1524,51 @@ msgid "Current"
 msgstr "Atual"
 
 #. layout controls
-#: ../src/Dialogs.vala:212
+#: ../src/Dialogs.vala:213
 msgid "_Format:"
 msgstr "_Formato:"
 
-#: ../src/Dialogs.vala:215
+#: ../src/Dialogs.vala:216
 msgid "_Quality:"
 msgstr "_Qualidade:"
 
-#: ../src/Dialogs.vala:218
+#: ../src/Dialogs.vala:219
 msgid "_Scaling constraint:"
 msgstr "Re_strição de dimensionamento:"
 
-#: ../src/Dialogs.vala:221
-msgid " _pixels"
-msgstr " _pixels"
+#: ../src/Dialogs.vala:222
+msgid "_Pixels:"
+msgstr "_Pixels:"
 
-#: ../src/Dialogs.vala:229
+#: ../src/Dialogs.vala:225
 msgid "Export metadata"
 msgstr "Exportar metadados"
 
-#: ../src/Dialogs.vala:465
+#: ../src/Dialogs.vala:459
 msgid "Save Details..."
 msgstr "Salvar Detalhes..."
 
-#: ../src/Dialogs.vala:466
+#: ../src/Dialogs.vala:460
 msgid "Save Details"
 msgstr "Salvar Detalhes"
 
-#: ../src/Dialogs.vala:481
+#: ../src/Dialogs.vala:475
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(e %d outras)\n"
 
-#: ../src/Dialogs.vala:534
+#: ../src/Dialogs.vala:528
 msgid "Import Results Report"
 msgstr "Importar Formulários de Resultados"
 
-#: ../src/Dialogs.vala:538
+#: ../src/Dialogs.vala:532
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "Tentada a importação de %d arquivo."
 msgstr[1] "Tentada a importação de %d arquivos."
 
-#: ../src/Dialogs.vala:541
+#: ../src/Dialogs.vala:535
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -1584,30 +1578,30 @@ msgstr[1] "Dessa tentativa, %d arquivos foram importados com sucesso."
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:553
+#: ../src/Dialogs.vala:547
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Duplicar Fotos/Vídeos Não importados:"
 
-#: ../src/Dialogs.vala:557
+#: ../src/Dialogs.vala:551
 msgid "duplicates existing media item"
 msgstr "duplica itens de mídia existentes"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: ../src/Dialogs.vala:568
+#: ../src/Dialogs.vala:562
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "As Fotos/Vídeos não forma Importadas devido à erros com a Câmera:"
 
-#: ../src/Dialogs.vala:571 ../src/Dialogs.vala:586 ../src/Dialogs.vala:601
-#: ../src/Dialogs.vala:617 ../src/Dialogs.vala:632 ../src/Dialogs.vala:646
+#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
+#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
 msgid "error message:"
 msgstr "mensagem de erro:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: ../src/Dialogs.vala:582
+#: ../src/Dialogs.vala:576
 msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgstr ""
 "Arquivos não foram importados porque não foram reconhecidos como Fotos ou "
@@ -1616,7 +1610,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: ../src/Dialogs.vala:597
+#: ../src/Dialogs.vala:591
 msgid ""
 "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
 "Understands:"
@@ -1627,7 +1621,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: ../src/Dialogs.vala:612
+#: ../src/Dialogs.vala:606
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
 "Library:"
@@ -1635,7 +1629,7 @@ msgstr ""
 "As Fotos/Vídeos não foram importadas pois o Shotwell não pôde copiá-las para "
 "sua Biblioteca:"
 
-#: ../src/Dialogs.vala:616
+#: ../src/Dialogs.vala:610
 #, c-format
 msgid ""
 "couldn't copy %s\n"
@@ -1647,39 +1641,39 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: ../src/Dialogs.vala:628
+#: ../src/Dialogs.vala:622
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Fotos/Vídeos não importados porque os arquivos estão corrompidos:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: ../src/Dialogs.vala:643
+#: ../src/Dialogs.vala:637
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "As Fotos/Vídeos não foram importadas por outras razões:"
 
-#: ../src/Dialogs.vala:663
+#: ../src/Dialogs.vala:657
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "1 foto duplicada não foi importada:\n"
 msgstr[1] "%d fotos duplicadas não foram importadas:\n"
 
-#: ../src/Dialogs.vala:666
+#: ../src/Dialogs.vala:660
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "1 vídeo duplicado não foi importado:\n"
 msgstr[1] "%d vídeos duplicados não foram importados:\n"
 
-#: ../src/Dialogs.vala:669
+#: ../src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "1 foto/vídeo duplicado não foi importado:\n"
 msgstr[1] "%d fotos/vídeos duplicados não foram importados:\n"
 
-#: ../src/Dialogs.vala:683
+#: ../src/Dialogs.vala:677
 #, 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"
@@ -1689,7 +1683,7 @@ msgstr[1] ""
 "%d fotos falharam ao serem importadas, ocorreu um erro de arquivo ou de "
 "hardware:\n"
 
-#: ../src/Dialogs.vala:686
+#: ../src/Dialogs.vala:680
 #, 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"
@@ -1699,7 +1693,7 @@ msgstr[1] ""
 "%d vídeos falharam ao serem importados devido a um erro de arquivo ou "
 "hardware:\n"
 
-#: ../src/Dialogs.vala:689
+#: ../src/Dialogs.vala:683
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -1711,7 +1705,7 @@ msgstr[1] ""
 "%d fotos/vídeos falharam ao serem importados devido a um erro de arquivo ou "
 "hardware:\n"
 
-#: ../src/Dialogs.vala:692
+#: ../src/Dialogs.vala:686
 #, 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"
@@ -1721,7 +1715,7 @@ msgstr[1] ""
 "%d arquivos falharam ao serem importados devido a um erro de arquivo ou "
 "hardware:\n"
 
-#: ../src/Dialogs.vala:706
+#: ../src/Dialogs.vala:700
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -1735,7 +1729,7 @@ msgstr[1] ""
 "%d fotos falharam ao serem importadas pelo fato da pasta de biblioteca de "
 "fotos não ser gravável:\n"
 
-#: ../src/Dialogs.vala:709
+#: ../src/Dialogs.vala:703
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -1749,7 +1743,7 @@ msgstr[1] ""
 "%d vídeos falharam ao serem importados pelo fato da pasta de biblioteca de "
 "fotos não ser gravável:\n"
 
-#: ../src/Dialogs.vala:712
+#: ../src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1764,7 +1758,7 @@ msgstr[1] ""
 "%d fotos/vídeos falharam ao serem importados pelo fato da pasta de "
 "biblioteca de fotos não ser gravável:\n"
 
-#: ../src/Dialogs.vala:715
+#: ../src/Dialogs.vala:709
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -1778,14 +1772,14 @@ msgstr[1] ""
 "%d arquivos falharam ao serem importados pelo fato da pasta de biblioteca de "
 "fotos não ser gravável:\n"
 
-#: ../src/Dialogs.vala:729
+#: ../src/Dialogs.vala:723
 #, 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] "1 foto falhou ao ser importada, ocorreu um erro de câmera:\n"
 msgstr[1] "%d fotos falharam ao serem importadas, ocorreu um erro de câmera:\n"
 
-#: ../src/Dialogs.vala:732
+#: ../src/Dialogs.vala:726
 #, 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"
@@ -1793,7 +1787,7 @@ msgstr[0] "1 vídeo falhou ao ser importado devido a um erro da câmera:\n"
 msgstr[1] ""
 "%d vídeos falharam ao serem importados devido a um erro da câmera:\n"
 
-#: ../src/Dialogs.vala:735
+#: ../src/Dialogs.vala:729
 #, 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"
@@ -1801,7 +1795,7 @@ msgstr[0] "1 foto/vídeo falhou ao ser importado devido a um erro da câmera:\n"
 msgstr[1] ""
 "%d fotos/vídeos falharam ao serem importados devido a um erro da câmera:\n"
 
-#: ../src/Dialogs.vala:738
+#: ../src/Dialogs.vala:732
 #, 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"
@@ -1809,21 +1803,21 @@ msgstr[0] "1 arquivo falhou ao ser importado devido a um erro da câmera:\n"
 msgstr[1] ""
 "%d arquivos falharam ao serem importados devido a um erro da câmera:\n"
 
-#: ../src/Dialogs.vala:752
+#: ../src/Dialogs.vala:746
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
 msgstr[0] "1 foto falhou na importação porque estava corrompida:\n"
 msgstr[1] "%d fotos falharam na importação porque estavam corrompidas:\n"
 
-#: ../src/Dialogs.vala:755
+#: ../src/Dialogs.vala:749
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
 msgstr[0] "1 vídeo falhou na importação porque estava corrompido:\n"
 msgstr[1] "%d vídeos falharam na importação porque estavam corrompidos:\n"
 
-#: ../src/Dialogs.vala:758
+#: ../src/Dialogs.vala:752
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
@@ -1831,7 +1825,7 @@ msgstr[0] "1 foto/vídeo falhou na importação porque estava corrompido(a):\n"
 msgstr[1] ""
 "%d vídeos/fotos falharam na importação porque estavam corrompidos:\n"
 
-#: ../src/Dialogs.vala:761
+#: ../src/Dialogs.vala:755
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
@@ -1842,7 +1836,7 @@ msgstr[1] "%d arquivos falharam na importação porque estavam corrompidos:\n"
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: ../src/Dialogs.vala:778
+#: ../src/Dialogs.vala:772
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1851,56 +1845,56 @@ msgstr[1] "%d fotos sem suporte foram puladas:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: ../src/Dialogs.vala:793
+#: ../src/Dialogs.vala:787
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "Pulando um arquivo não-imagem.\n"
 msgstr[1] "Pulando %d arquivos não-imagem.\n"
 
-#: ../src/Dialogs.vala:804
+#: ../src/Dialogs.vala:798
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "1 foto pulada pelo cancelamento do usuário:\n"
 msgstr[1] "%d fotos puladas pelo cancelamento do usuário:\n"
 
-#: ../src/Dialogs.vala:807
+#: ../src/Dialogs.vala:801
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "1 vídeo ignorado por cancelamento do usuário:\n"
 msgstr[1] "%d vídeos ignorados por cancelamento do usuário:\n"
 
-#: ../src/Dialogs.vala:810
+#: ../src/Dialogs.vala:804
 #, 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] "1 foto/vídeo ignorado por cancelamento do usuário:\n"
 msgstr[1] "%d fotos/vídeos ignorados por cancelamento do usuário:\n"
 
-#: ../src/Dialogs.vala:813
+#: ../src/Dialogs.vala:807
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "1 arquivo ignorado por cancelamento do usuário:\n"
 msgstr[1] "%d arquivos ignorados por cancelamento do usuário:\n"
 
-#: ../src/Dialogs.vala:827
+#: ../src/Dialogs.vala:821
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "1 foto foi importada com sucesso.\n"
 msgstr[1] "%d fotos foram importadas com sucesso.\n"
 
-#: ../src/Dialogs.vala:830
+#: ../src/Dialogs.vala:824
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "1 vídeo importado com sucesso.\n"
 msgstr[1] "%d vídeos importados com sucesso.\n"
 
-#: ../src/Dialogs.vala:833
+#: ../src/Dialogs.vala:827
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -1909,90 +1903,93 @@ msgstr[1] "%d fotos/vídeos importados com sucesso.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: ../src/Dialogs.vala:849
+#: ../src/Dialogs.vala:843
 msgid "No photos or videos imported.\n"
 msgstr "Sem fotos ou vídeos importados.\n"
 
-#: ../src/Dialogs.vala:856 ../src/Dialogs.vala:875
+#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
 msgid "Import Complete"
 msgstr "Importação concluída"
 
-#: ../src/Dialogs.vala:1161
+#: ../src/Dialogs.vala:1155
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../src/Dialogs.vala:1164
+#: ../src/Dialogs.vala:1158
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutes"
 
-#: ../src/Dialogs.vala:1168
+#: ../src/Dialogs.vala:1162
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../src/Dialogs.vala:1171
+#: ../src/Dialogs.vala:1165
 msgid "1 day"
 msgstr "1 dia"
 
-#: ../src/Dialogs.vala:1319 ../src/Resources.vala:203
+#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
 msgid "Rename Event"
 msgstr "Renomear evento"
 
-#: ../src/Dialogs.vala:1319
+#: ../src/Dialogs.vala:1315
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/Dialogs.vala:1329 ../src/Resources.vala:272
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
 msgid "Edit Title"
 msgstr "Editar título"
 
-#: ../src/Dialogs.vala:1329 ../src/Properties.vala:340
+#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
 msgid "Title:"
 msgstr "Título:"
 
-#: ../src/Dialogs.vala:1343 ../src/Resources.vala:278
+#. Dialog title
+#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
 msgid "Edit Event Comment"
 msgstr "Editar comentário de evento"
 
-#: ../src/Dialogs.vala:1343
+#: ../src/Dialogs.vala:1344
 msgid "Edit Photo/Video Comment"
 msgstr "Editar comentário de foto/vídeo"
 
-#: ../src/Dialogs.vala:1344 ../src/Properties.vala:630
+#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: ../src/Dialogs.vala:1360
+#: ../src/Dialogs.vala:1361
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Remover e _apagar arquivo"
 msgstr[1] "Remover e _apagar arquivos"
 
-#: ../src/Dialogs.vala:1364
+#: ../src/Dialogs.vala:1365
 msgid "_Remove From Library"
 msgstr "_Remover da biblioteca"
 
-#: ../src/Dialogs.vala:1384 ../src/camera/ImportPage.vala:1739
+#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
 msgid "_Keep"
 msgstr "_Manter"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edit?"
 msgstr "Reverter edição externa?"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edits?"
 msgstr "Reverter edições externas?"
 
-#: ../src/Dialogs.vala:1409
+#: ../src/Dialogs.vala:1410
 #, c-format
 msgid "This will destroy all changes made to the external file.  Continue?"
 msgid_plural ""
@@ -2004,87 +2001,87 @@ msgstr[1] ""
 "Isto irá destruir todas as alterações feitas para %d arquivos externos. "
 "Continuar?"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edit"
 msgstr "Re_verter edição externa"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edits"
 msgstr "Re_verter edições externas"
 
-#: ../src/Dialogs.vala:1434
+#: ../src/Dialogs.vala:1435
 #, 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] "Isto irá remover a foto da galeria. Continuar?"
 msgstr[1] "Isto irá remover %d fotos da galeria. Continuar?"
 
-#: ../src/Dialogs.vala:1441
+#: ../src/Dialogs.vala:1442 ../src/Resources.vala:178
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photo From Library"
 msgstr "Remover fotos da galeria"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photos From Library"
 msgstr "Remover fotos da galeria"
 
-#: ../src/Dialogs.vala:1535
+#: ../src/Dialogs.vala:1536
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1682
+#: ../src/Dialogs.vala:1688
 msgid "AM"
 msgstr "AM"
 
-#: ../src/Dialogs.vala:1683
+#: ../src/Dialogs.vala:1689
 msgid "PM"
 msgstr "PM"
 
-#: ../src/Dialogs.vala:1684
+#: ../src/Dialogs.vala:1690
 msgid "24 Hr"
 msgstr "24 Hr"
 
-#: ../src/Dialogs.vala:1699
+#: ../src/Dialogs.vala:1705
 msgid "_Shift photos/videos by the same amount"
 msgstr "De_slocar fotos/vídeos pelo mesmo montante"
 
-#: ../src/Dialogs.vala:1704
+#: ../src/Dialogs.vala:1710
 msgid "Set _all photos/videos to this time"
 msgstr "Definir tod_as fotos/vídeos para a mesma hora"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo file"
 msgstr "_Modificar arquivo original da foto"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo files"
 msgstr "_Modificar arquivos originais da foto"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original file"
 msgstr "_Modificar originais"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original files"
 msgstr "_Modificar arquivos originais"
 
-#: ../src/Dialogs.vala:1800
+#: ../src/Dialogs.vala:1806
 msgid "Original: "
 msgstr "Original: "
 
-#: ../src/Dialogs.vala:1801
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d/%m/%Y, %H:%M:%S"
 
-#: ../src/Dialogs.vala:1802
+#: ../src/Dialogs.vala:1808
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d/%m/%Y, %I:%M:%S %p"
 
-#: ../src/Dialogs.vala:1891
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -2093,7 +2090,7 @@ msgstr ""
 "O tempo de exposição irá ser mudado para frente, por\n"
 "%d %s, %d %s, %d %s, e %d %s."
 
-#: ../src/Dialogs.vala:1892
+#: ../src/Dialogs.vala:1898
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2102,31 +2099,31 @@ msgstr ""
 "O tempo de exposição irá ser mudado para trás, por\n"
 "%d %s, %d %s, %d %s, e %d %s."
 
-#: ../src/Dialogs.vala:1894
+#: ../src/Dialogs.vala:1900
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dias"
 
-#: ../src/Dialogs.vala:1895
+#: ../src/Dialogs.vala:1901
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../src/Dialogs.vala:1896
+#: ../src/Dialogs.vala:1902
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../src/Dialogs.vala:1897
+#: ../src/Dialogs.vala:1903
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segundo"
 msgstr[1] "segundos"
 
-#: ../src/Dialogs.vala:1941
+#: ../src/Dialogs.vala:1947
 #, c-format
 msgid ""
 "\n"
@@ -2145,49 +2142,49 @@ msgstr[1] ""
 "\n"
 "e %d outras."
 
-#: ../src/Dialogs.vala:1963 ../src/Dialogs.vala:1990
+#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
 msgid "Tags (separated by commas):"
 msgstr "Etiquetas (separadas por vírgulas):"
 
-#: ../src/Dialogs.vala:2070
+#: ../src/Dialogs.vala:2076
 msgid "Welcome!"
 msgstr "Bem-vindo!"
 
-#: ../src/Dialogs.vala:2077
+#: ../src/Dialogs.vala:2083
 msgid "Welcome to Shotwell!"
 msgstr "Bem-vindo ao Shotwell!"
 
-#: ../src/Dialogs.vala:2081
+#: ../src/Dialogs.vala:2087
 msgid "To get started, import photos in any of these ways:"
 msgstr "Para iniciar, importe fotos de alguma destas formas:"
 
-#: ../src/Dialogs.vala:2100
+#: ../src/Dialogs.vala:2106
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Escolha <span weight=\"bold\">Arquivo %s Importar de uma pasta</span>"
 
-#: ../src/Dialogs.vala:2101
+#: ../src/Dialogs.vala:2107
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Arraste e solte fotos para dentro da janela do Shotwell"
 
-#: ../src/Dialogs.vala:2102
+#: ../src/Dialogs.vala:2108
 msgid "Connect a camera to your computer and import"
 msgstr "Conectar uma câmera no seu computador e importe"
 
-#: ../src/Dialogs.vala:2112
+#: ../src/Dialogs.vala:2118
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importar fotos de seu diretório %s"
 
-#: ../src/Dialogs.vala:2119
+#: ../src/Dialogs.vala:2125
 msgid "You can also import photos in any of these ways:"
 msgstr "Você também pode importar fotos de alguma destas formas:"
 
-#: ../src/Dialogs.vala:2129
+#: ../src/Dialogs.vala:2135
 msgid "_Don't show this message again"
 msgstr "Não exibir mais es_ta mensagem"
 
-#: ../src/Dialogs.vala:2164
+#: ../src/Dialogs.vala:2170
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Importar fotos de sua biblioteca %s"
@@ -2195,41 +2192,41 @@ msgstr "Importar fotos de sua biblioteca %s"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2308 ../src/Dialogs.vala:2312
+#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
 msgid "(Help)"
 msgstr "(Ajuda)"
 
-#: ../src/Dialogs.vala:2321
+#: ../src/Dialogs.vala:2324
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Ano%sMês%sDia"
 
-#: ../src/Dialogs.vala:2323
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth"
 msgstr "Ano%sMês"
 
-#: ../src/Dialogs.vala:2325
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Ano%sMês-Dia"
 
-#: ../src/Dialogs.vala:2327
+#: ../src/Dialogs.vala:2330
 msgid "Year-Month-Day"
 msgstr "Ano-Mês-Dia"
 
-#: ../src/Dialogs.vala:2328 ../src/editing_tools/EditingTools.vala:781
+#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Customizar"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2565
+#: ../src/Dialogs.vala:2568
 msgid "Invalid pattern"
 msgstr "Padrão inválido"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: ../src/Dialogs.vala:2668
+#: ../src/Dialogs.vala:2670
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2237,31 +2234,31 @@ msgstr ""
 "Shotwell pode copiar as fotos na sua pasta de biblioteca ou pode importá-los "
 "sem copiar."
 
-#: ../src/Dialogs.vala:2673
+#: ../src/Dialogs.vala:2675
 msgid "Co_py Photos"
 msgstr "Co_piar fotos"
 
-#: ../src/Dialogs.vala:2674
+#: ../src/Dialogs.vala:2676
 msgid "_Import in Place"
 msgstr "_Importar no local"
 
-#: ../src/Dialogs.vala:2675
+#: ../src/Dialogs.vala:2677
 msgid "Import to Library"
 msgstr "Importar para a biblioteca"
 
-#: ../src/Dialogs.vala:2685 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
 msgid "Remove From Library"
 msgstr "Remover da biblioteca"
 
-#: ../src/Dialogs.vala:2686 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
 msgid "Removing Photo From Library"
 msgstr "Removendo fotos da biblioteca"
 
-#: ../src/Dialogs.vala:2686
+#: ../src/Dialogs.vala:2688
 msgid "Removing Photos From Library"
 msgstr "Removendo fotos da biblioteca"
 
-#: ../src/Dialogs.vala:2700
+#: ../src/Dialogs.vala:2702
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -2284,7 +2281,7 @@ msgstr[1] ""
 "\n"
 "Essa ação não poderá ser desfeita."
 
-#: ../src/Dialogs.vala:2704
+#: ../src/Dialogs.vala:2706
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -2307,7 +2304,7 @@ msgstr[1] ""
 "\n"
 "Essa ação não poderá ser desfeita."
 
-#: ../src/Dialogs.vala:2708
+#: ../src/Dialogs.vala:2710
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -2330,7 +2327,7 @@ msgstr[1] ""
 "\n"
 "Esta ação não poderá ser desfeita."
 
-#: ../src/Dialogs.vala:2740
+#: ../src/Dialogs.vala:2742
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -2342,7 +2339,7 @@ msgstr[1] ""
 "%d fotos/vídeos não podem ser movidos para lixeira. Excluir esses arquivos?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2757
+#: ../src/Dialogs.vala:2759
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -2404,115 +2401,115 @@ msgstr "Exportar"
 msgid "Unable to process monitoring updates: %s"
 msgstr "Não foi possível processar as atualizações monitoradas: %s"
 
-#: ../src/MediaPage.vala:143
+#: ../src/MediaPage.vala:157
 msgid "Adjust the size of the thumbnails"
 msgstr "Ajustar o tamanho das miniaturas"
 
-#: ../src/MediaPage.vala:325 ../src/PhotoPage.vala:2590
-#: ../src/direct/DirectPhotoPage.vala:174
+#: ../src/MediaPage.vala:339 ../src/PhotoPage.vala:2593
+#: ../src/Resources.vala:188 ../src/direct/DirectPhotoPage.vala:174
 msgid "Zoom _In"
 msgstr "Ampl_iar"
 
-#: ../src/MediaPage.vala:326
+#: ../src/MediaPage.vala:340
 msgid "Increase the magnification of the thumbnails"
 msgstr "Aumentar a ampliação das miniaturas"
 
-#: ../src/MediaPage.vala:331 ../src/PhotoPage.vala:2596
-#: ../src/direct/DirectPhotoPage.vala:180
+#: ../src/MediaPage.vala:345 ../src/PhotoPage.vala:2599
+#: ../src/Resources.vala:189 ../src/direct/DirectPhotoPage.vala:180
 msgid "Zoom _Out"
 msgstr "Redu_zir"
 
-#: ../src/MediaPage.vala:332
+#: ../src/MediaPage.vala:346
 msgid "Decrease the magnification of the thumbnails"
 msgstr "Diminuir a ampliação das miniaturas"
 
-#: ../src/MediaPage.vala:399
+#: ../src/MediaPage.vala:413
 msgid "Sort _Photos"
 msgstr "Ordenar _fotos"
 
-#: ../src/MediaPage.vala:408
+#: ../src/MediaPage.vala:422
 msgid "_Play Video"
 msgstr "_Reproduzir vídeo"
 
-#: ../src/MediaPage.vala:409
+#: ../src/MediaPage.vala:423
 msgid "Open the selected videos in the system video player"
 msgstr "Abra os vídeos selecionados no reprodutor de vídeo do sistema"
 
-#: ../src/MediaPage.vala:413 ../src/PhotoPage.vala:2639
+#: ../src/MediaPage.vala:427 ../src/PhotoPage.vala:2642
 msgid "_Developer"
 msgstr "_Desenvolvedor"
 
-#: ../src/MediaPage.vala:425 ../src/camera/Branch.vala:101
+#: ../src/MediaPage.vala:439 ../src/camera/Branch.vala:99
 #: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
-#: ../src/photos/RawSupport.vala:300
+#: ../src/photos/RawSupport.vala:303
 msgid "Camera"
 msgstr "Câmera"
 
-#: ../src/MediaPage.vala:436 ../src/camera/ImportPage.vala:872
+#: ../src/MediaPage.vala:450 ../src/camera/ImportPage.vala:874
 msgid "_Titles"
 msgstr "_Títulos"
 
-#: ../src/MediaPage.vala:437 ../src/camera/ImportPage.vala:873
+#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:875
 msgid "Display the title of each photo"
 msgstr "Exibe o título de cada foto"
 
-#: ../src/MediaPage.vala:442 ../src/events/EventsDirectoryPage.vala:130
+#: ../src/MediaPage.vala:456 ../src/events/EventsDirectoryPage.vala:130
 msgid "_Comments"
 msgstr "_Comentários"
 
-#: ../src/MediaPage.vala:443
+#: ../src/MediaPage.vala:457
 msgid "Display the comment of each photo"
 msgstr "Exibe o comentário de cada foto"
 
-#: ../src/MediaPage.vala:454 ../src/library/LibraryWindow.vala:376
+#: ../src/MediaPage.vala:468 ../src/library/LibraryWindow.vala:375
 msgid "Ta_gs"
 msgstr "Eti_quetas"
 
-#: ../src/MediaPage.vala:455
+#: ../src/MediaPage.vala:469
 msgid "Display each photo's tags"
 msgstr "Exibe as etiquetas de cada foto"
 
-#: ../src/MediaPage.vala:471
+#: ../src/MediaPage.vala:485
 msgid "By _Title"
 msgstr "Por _título"
 
-#: ../src/MediaPage.vala:472
+#: ../src/MediaPage.vala:486
 msgid "Sort photos by title"
 msgstr "Ordena as fotos pelo título"
 
-#: ../src/MediaPage.vala:477
+#: ../src/MediaPage.vala:491
 msgid "By Exposure _Date"
 msgstr "Por _data de exposição"
 
-#: ../src/MediaPage.vala:478
+#: ../src/MediaPage.vala:492
 msgid "Sort photos by exposure date"
 msgstr "Ordena as fotos pela data de exposição"
 
-#: ../src/MediaPage.vala:483
+#: ../src/MediaPage.vala:497
 msgid "By _Rating"
 msgstr "Por _avaliação"
 
-#: ../src/MediaPage.vala:484
+#: ../src/MediaPage.vala:498
 msgid "Sort photos by rating"
 msgstr "Ordena as fotos por avaliação"
 
-#: ../src/MediaPage.vala:494 ../src/library/LibraryWindow.vala:422
+#: ../src/MediaPage.vala:508 ../src/library/LibraryWindow.vala:421
 msgid "_Ascending"
 msgstr "_Ascendente"
 
-#: ../src/MediaPage.vala:495 ../src/library/LibraryWindow.vala:423
+#: ../src/MediaPage.vala:509 ../src/library/LibraryWindow.vala:422
 msgid "Sort photos in an ascending order"
 msgstr "Ordena as fotos em ordem ascendente"
 
-#: ../src/MediaPage.vala:500 ../src/library/LibraryWindow.vala:429
+#: ../src/MediaPage.vala:514 ../src/library/LibraryWindow.vala:428
 msgid "D_escending"
 msgstr "D_escendente"
 
-#: ../src/MediaPage.vala:501 ../src/library/LibraryWindow.vala:430
+#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:429
 msgid "Sort photos in a descending order"
 msgstr "Ordena as fotos em ordem descendente"
 
-#: ../src/MediaPage.vala:702
+#: ../src/MediaPage.vala:716
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -2521,99 +2518,99 @@ msgstr ""
 "Shotwell foi incapaz de reproduzir o vídeo selecionado:\n"
 "%s"
 
-#: ../src/Page.vala:1268
+#: ../src/Page.vala:1263
 msgid "No photos/videos"
 msgstr "Sem fotos/vídeos"
 
-#: ../src/Page.vala:1272
+#: ../src/Page.vala:1267
 msgid "No photos/videos found"
 msgstr "Sem fotos/vídeos encontrados"
 
-#: ../src/Page.vala:2569
+#: ../src/Page.vala:2565
 msgid "Photos cannot be exported to this directory."
 msgstr "Fotos não podem ser exportadas para este diretório."
 
-#: ../src/Photo.vala:3656
+#: ../src/Photo.vala:3753
 msgid "modified"
 msgstr "modificado"
 
 #. previous button
-#: ../src/PhotoPage.vala:532
+#: ../src/PhotoPage.vala:533
 msgid "Previous photo"
 msgstr "Foto anterior"
 
 #. next button
-#: ../src/PhotoPage.vala:537
+#: ../src/PhotoPage.vala:539
 msgid "Next photo"
 msgstr "Próxima foto"
 
-#: ../src/PhotoPage.vala:1844
+#: ../src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Faltando arquivo fonte da foto: %s"
 
-#: ../src/PhotoPage.vala:2411 ../src/direct/DirectPhotoPage.vala:165
-#: ../src/library/LibraryWindow.vala:360
+#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
+#: ../src/library/LibraryWindow.vala:359
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/PhotoPage.vala:2415 ../src/direct/DirectPhotoPage.vala:81
+#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
 msgid "T_ools"
 msgstr "F_erramentas"
 
-#: ../src/PhotoPage.vala:2420 ../src/direct/DirectPhotoPage.vala:86
+#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
 msgid "_Previous Photo"
 msgstr "Foto a_nterior"
 
-#: ../src/PhotoPage.vala:2421 ../src/direct/DirectPhotoPage.vala:87
+#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
 msgid "Previous Photo"
 msgstr "Foto anterior"
 
-#: ../src/PhotoPage.vala:2426 ../src/direct/DirectPhotoPage.vala:92
+#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
 msgid "_Next Photo"
 msgstr "Próxi_ma foto"
 
-#: ../src/PhotoPage.vala:2427 ../src/direct/DirectPhotoPage.vala:93
+#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
 msgid "Next Photo"
 msgstr "Próxima foto"
 
-#: ../src/PhotoPage.vala:2591 ../src/direct/DirectPhotoPage.vala:175
+#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
 msgid "Increase the magnification of the photo"
 msgstr "Aumentar a ampliação da foto"
 
-#: ../src/PhotoPage.vala:2597 ../src/direct/DirectPhotoPage.vala:181
+#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
 msgid "Decrease the magnification of the photo"
 msgstr "Diminuir a ampliação da foto"
 
-#: ../src/PhotoPage.vala:2602 ../src/direct/DirectPhotoPage.vala:186
+#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
 msgid "Fit to _Page"
 msgstr "Adaptar à _Página"
 
-#: ../src/PhotoPage.vala:2603 ../src/direct/DirectPhotoPage.vala:187
+#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
 msgid "Zoom the photo to fit on the screen"
 msgstr "Ampliar a foto para se adaptar à tela"
 
-#: ../src/PhotoPage.vala:2609 ../src/direct/DirectPhotoPage.vala:193
+#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
 #, no-c-format
 msgid "Zoom _100%"
 msgstr "Ampliação _100%"
 
-#: ../src/PhotoPage.vala:2611 ../src/direct/DirectPhotoPage.vala:195
+#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
 #, no-c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "Ampliar a foto em 100%"
 
-#: ../src/PhotoPage.vala:2617 ../src/direct/DirectPhotoPage.vala:201
+#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
 #, no-c-format
 msgid "Zoom _200%"
 msgstr "Ampliação _200%"
 
-#: ../src/PhotoPage.vala:2619 ../src/direct/DirectPhotoPage.vala:203
+#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
 #, no-c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "Ampliar a foto em 200%"
 
-#: ../src/PhotoPage.vala:3227
+#: ../src/PhotoPage.vala:3231
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Não foi possível exportar %s: %s"
@@ -2810,67 +2807,67 @@ msgid "Exposure:"
 msgstr "Exposição:"
 
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:585
+#: ../src/Properties.vala:583
 msgid "Location:"
 msgstr "Localização:"
 
-#: ../src/Properties.vala:588
+#: ../src/Properties.vala:586
 msgid "File size:"
 msgstr "Tamanho do arquivo:"
 
-#: ../src/Properties.vala:592
+#: ../src/Properties.vala:590
 msgid "Current Development:"
 msgstr "Desenvolvimento atual:"
 
-#: ../src/Properties.vala:594
+#: ../src/Properties.vala:592
 msgid "Original dimensions:"
 msgstr "Dimensões originais:"
 
-#: ../src/Properties.vala:597
+#: ../src/Properties.vala:595
 msgid "Camera make:"
 msgstr "Câmera:"
 
-#: ../src/Properties.vala:600
+#: ../src/Properties.vala:598
 msgid "Camera model:"
 msgstr "Modelo da câmera:"
 
-#: ../src/Properties.vala:603
+#: ../src/Properties.vala:601
 msgid "Flash:"
 msgstr "Flash:"
 
-#: ../src/Properties.vala:605
+#: ../src/Properties.vala:603
 msgid "Focal length:"
 msgstr "Comprimento focal:"
 
-#: ../src/Properties.vala:608
+#: ../src/Properties.vala:606
 msgid "Exposure date:"
 msgstr "Data de exposição:"
 
-#: ../src/Properties.vala:611
+#: ../src/Properties.vala:609
 msgid "Exposure time:"
 msgstr "Horário da exposição:"
 
-#: ../src/Properties.vala:614
+#: ../src/Properties.vala:612
 msgid "Exposure bias:"
 msgstr "Exposição bias:"
 
-#: ../src/Properties.vala:616
+#: ../src/Properties.vala:614
 msgid "GPS latitude:"
 msgstr "Latitude do GPS:"
 
-#: ../src/Properties.vala:619
+#: ../src/Properties.vala:617
 msgid "GPS longitude:"
 msgstr "Longitude do GPS:"
 
-#: ../src/Properties.vala:622
+#: ../src/Properties.vala:620
 msgid "Artist:"
 msgstr "Artista:"
 
-#: ../src/Properties.vala:624
+#: ../src/Properties.vala:622
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../src/Properties.vala:626
+#: ../src/Properties.vala:624
 msgid "Software:"
 msgstr "Software:"
 
@@ -2886,657 +2883,758 @@ msgstr "Organizador de fotos"
 msgid "Photo Viewer"
 msgstr "Visualizador de fotos"
 
-#: ../src/Resources.vala:142
+#: ../src/Resources.vala:144
 msgid "Rotate _Right"
 msgstr "Girar à _direita"
 
-#: ../src/Resources.vala:143 ../src/Resources.vala:148
+#: ../src/Resources.vala:145 ../src/Resources.vala:150
 msgid "Rotate"
 msgstr "Girar"
 
-#: ../src/Resources.vala:144
+#: ../src/Resources.vala:146
 msgid "Rotate Right"
 msgstr "Girar à direita"
 
-#: ../src/Resources.vala:145
+#: ../src/Resources.vala:147
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Gira as fotos para direita (pressione Ctrl para girar para esquerda)"
 
-#: ../src/Resources.vala:147
+#: ../src/Resources.vala:149
 msgid "Rotate _Left"
 msgstr "Girar à _esquerda"
 
-#: ../src/Resources.vala:149
+#: ../src/Resources.vala:151
 msgid "Rotate Left"
 msgstr "Girar à esquerda"
 
-#: ../src/Resources.vala:150
+#: ../src/Resources.vala:152
 msgid "Rotate the photos left"
 msgstr "Gira a foto para a esquerda"
 
-#: ../src/Resources.vala:152
+#: ../src/Resources.vala:154
 msgid "Flip Hori_zontally"
 msgstr "Inverter hori_zontalmente"
 
-#: ../src/Resources.vala:153
+#: ../src/Resources.vala:155
 msgid "Flip Horizontally"
 msgstr "Inverter horizontalmente"
 
-#: ../src/Resources.vala:155
+#: ../src/Resources.vala:157
 msgid "Flip Verti_cally"
 msgstr "Inverter verti_calmente"
 
-#: ../src/Resources.vala:156
+#: ../src/Resources.vala:158
 msgid "Flip Vertically"
 msgstr "Inverter verticalmente"
 
-#: ../src/Resources.vala:158
+#: ../src/Resources.vala:160
+msgid "_About"
+msgstr "S_obre"
+
+#: ../src/Resources.vala:161
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
+#: ../src/library/LibraryWindow.vala:355
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../src/Resources.vala:165
+msgid "_Forward"
+msgstr "A_vançar"
+
+#: ../src/Resources.vala:166
+msgid "Fulls_creen"
+msgstr "Tela _cheia"
+
+#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
+#: ../src/library/LibraryWindow.vala:379
+msgid "_Help"
+msgstr "A_juda"
+
+#: ../src/Resources.vala:168
+msgid "Leave _Fullscreen"
+msgstr "Sair da _tela cheia"
+
+#: ../src/Resources.vala:169 ../src/Resources.vala:371
+msgid "_New"
+msgstr "_Nova"
+
+#: ../src/Resources.vala:170
+msgid "_Next"
+msgstr "_Próximo"
+
+#: ../src/Resources.vala:171
+msgid "_OK"
+msgstr "_OK"
+
+#: ../src/Resources.vala:172
+msgid "_Play"
+msgstr "_Reproduzir"
+
+#: ../src/Resources.vala:173 ../src/Resources.vala:325
+msgid "_Preferences"
+msgstr "_Preferências"
+
+#: ../src/Resources.vala:174
+msgid "_Previous"
+msgstr "_Anterior"
+
+#: ../src/Resources.vala:175
+msgid "_Print"
+msgstr "Im_primir"
+
+#: ../src/Resources.vala:176
+msgid "_Quit"
+msgstr "_Sair"
+
+#: ../src/Resources.vala:177
+msgid "_Refresh"
+msgstr "Atualiza_r"
+
+#: ../src/Resources.vala:179
+msgid "_Revert"
+msgstr "_Reverter"
+
+#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save"
+msgstr "_Salvar"
+
+#: ../src/Resources.vala:181
+msgid "Save _As"
+msgstr "_Salvar como"
+
+#: ../src/Resources.vala:182
+msgid "Sort _Ascending"
+msgstr "Ordem _crescente"
+
+#: ../src/Resources.vala:183
+msgid "Sort _Descending"
+msgstr "Ordem _decrescente"
+
+#: ../src/Resources.vala:184
+msgid "_Stop"
+msgstr "_Parar"
+
+#: ../src/Resources.vala:185
+msgid "_Undelete"
+msgstr "Rec_uperar"
+
+#: ../src/Resources.vala:186
+msgid "_Normal Size"
+msgstr "Tamanho _normal"
+
+#: ../src/Resources.vala:187
+msgid "Best _Fit"
+msgstr "Melhor aj_uste"
+
+#: ../src/Resources.vala:191
 msgid "_Enhance"
 msgstr "_Melhorar"
 
-#: ../src/Resources.vala:159
+#: ../src/Resources.vala:192
 msgid "Enhance"
 msgstr "Melhorar"
 
-#: ../src/Resources.vala:160
+#: ../src/Resources.vala:193
 msgid "Automatically improve the photo's appearance"
 msgstr "Melhora automaticamente a aparência da foto"
 
-#: ../src/Resources.vala:162
+#: ../src/Resources.vala:195
 msgid "_Copy Color Adjustments"
 msgstr "_Copiar ajustes de cor"
 
-#: ../src/Resources.vala:163
+#: ../src/Resources.vala:196
 msgid "Copy Color Adjustments"
 msgstr "Copiar ajustes de cor"
 
-#: ../src/Resources.vala:164
+#: ../src/Resources.vala:197
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Copiar os ajustes de cor aplicados na foto"
 
-#: ../src/Resources.vala:166
+#: ../src/Resources.vala:199
 msgid "_Paste Color Adjustments"
 msgstr "C_olar ajustes de cor"
 
-#: ../src/Resources.vala:167
+#: ../src/Resources.vala:200
 msgid "Paste Color Adjustments"
 msgstr "Colar ajustes de cor"
 
-#: ../src/Resources.vala:168
+#: ../src/Resources.vala:201
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Aplicar ajustes de cor copiados nas fotos selecionadas"
 
-#: ../src/Resources.vala:170
+#: ../src/Resources.vala:203
 msgid "_Crop"
 msgstr "_Cortar"
 
-#: ../src/Resources.vala:171
+#: ../src/Resources.vala:204
 msgid "Crop"
 msgstr "Cortar"
 
-#: ../src/Resources.vala:172
+#: ../src/Resources.vala:205
 msgid "Crop the photo's size"
 msgstr "Corta o tamanho da foto"
 
-#: ../src/Resources.vala:174 ../src/editing_tools/StraightenTool.vala:100
+#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
 msgid "_Straighten"
 msgstr "En_direitar"
 
-#: ../src/Resources.vala:175
+#: ../src/Resources.vala:208
 msgid "Straighten"
 msgstr "Endireitar"
 
-#: ../src/Resources.vala:176
+#: ../src/Resources.vala:209
 msgid "Straighten the photo"
 msgstr "Endireita foto"
 
-#: ../src/Resources.vala:178
+#: ../src/Resources.vala:211
 msgid "_Red-eye"
 msgstr "Olhos ve_rmelhos"
 
-#: ../src/Resources.vala:179
+#: ../src/Resources.vala:212
 msgid "Red-eye"
 msgstr "Olhos vermelhos"
 
-#: ../src/Resources.vala:180
+#: ../src/Resources.vala:213
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Reduz ou elimina qualquer efeito de olhos vermelhos na foto"
 
-#: ../src/Resources.vala:182
+#: ../src/Resources.vala:215
 msgid "_Adjust"
 msgstr "_Ajustar"
 
-#: ../src/Resources.vala:183
+#: ../src/Resources.vala:216
 msgid "Adjust"
 msgstr "Ajustar"
 
-#: ../src/Resources.vala:184
+#: ../src/Resources.vala:217
 msgid "Adjust the photo's color and tone"
 msgstr "Ajusta a cor e os tons das fotos"
 
-#: ../src/Resources.vala:186
+#: ../src/Resources.vala:219
 msgid "Re_vert to Original"
 msgstr "Re_verter para o original"
 
-#: ../src/Resources.vala:187
+#: ../src/Resources.vala:220
 msgid "Revert to Original"
 msgstr "Reverter para o original"
 
-#: ../src/Resources.vala:189
+#: ../src/Resources.vala:222
 msgid "Revert External E_dits"
 msgstr "Reverter e_dição externa"
 
-#: ../src/Resources.vala:190
+#: ../src/Resources.vala:223
 msgid "Revert to the master photo"
 msgstr "Reverter para a foto mestre"
 
-#: ../src/Resources.vala:192
+#: ../src/Resources.vala:225
 msgid "Set as _Desktop Background"
 msgstr "Definir como _plano de fundo da área de trabalho"
 
-#: ../src/Resources.vala:193
+#: ../src/Resources.vala:226
 msgid "Set selected image to be the new desktop background"
 msgstr ""
 "Definir a imagem selecionada como um novo plano de fundo da área de trabalho"
 
-#: ../src/Resources.vala:194
+#: ../src/Resources.vala:227
 msgid "Set as _Desktop Slideshow..."
 msgstr "Definir como exibição de sli_des da área de trabalho..."
 
-#: ../src/Resources.vala:196
+#: ../src/Resources.vala:229
 msgid "_Undo"
 msgstr "Des_fazer"
 
-#: ../src/Resources.vala:197
+#: ../src/Resources.vala:230
 msgid "Undo"
 msgstr "Desfazer"
 
-#: ../src/Resources.vala:199
+#: ../src/Resources.vala:232
 msgid "_Redo"
 msgstr "_Refazer"
 
-#: ../src/Resources.vala:200
+#: ../src/Resources.vala:233
 msgid "Redo"
 msgstr "Refazer"
 
-#: ../src/Resources.vala:202
+#: ../src/Resources.vala:235
 msgid "Re_name Event..."
 msgstr "Re_nomear evento..."
 
-#: ../src/Resources.vala:205
+#: ../src/Resources.vala:238
 msgid "Make _Key Photo for Event"
 msgstr "Designar f_oto como chave para evento"
 
-#: ../src/Resources.vala:206
+#: ../src/Resources.vala:239
 msgid "Make Key Photo for Event"
 msgstr "Designa a foto como chave para evento"
 
-#: ../src/Resources.vala:208
+#: ../src/Resources.vala:241
 msgid "_New Event"
 msgstr "_Novo evento"
 
-#: ../src/Resources.vala:209
+#: ../src/Resources.vala:242
 msgid "New Event"
 msgstr "Novo evento"
 
-#: ../src/Resources.vala:211
+#: ../src/Resources.vala:244
 msgid "Move Photos"
 msgstr "Mover fotos"
 
-#: ../src/Resources.vala:212
+#: ../src/Resources.vala:245
 msgid "Move photos to an event"
 msgstr "Mover as fotos selecionadas para um evento"
 
-#: ../src/Resources.vala:214
+#: ../src/Resources.vala:247
 msgid "_Merge Events"
 msgstr "_Unir eventos"
 
-#: ../src/Resources.vala:215
+#: ../src/Resources.vala:248
 msgid "Merge"
 msgstr "Unir"
 
-#: ../src/Resources.vala:216
+#: ../src/Resources.vala:249
 msgid "Combine events into a single event"
 msgstr "Combinar eventos em um único evento"
 
-#: ../src/Resources.vala:218
+#: ../src/Resources.vala:251
 msgid "_Set Rating"
 msgstr "A_valiar"
 
-#: ../src/Resources.vala:219
+#: ../src/Resources.vala:252
 msgid "Set Rating"
 msgstr "Avaliar"
 
-#: ../src/Resources.vala:220
+#: ../src/Resources.vala:253
 msgid "Change the rating of your photo"
 msgstr "Alterar a avaliação da foto"
 
-#: ../src/Resources.vala:222
+#: ../src/Resources.vala:255
 msgid "_Increase"
 msgstr "_Aumentar"
 
-#: ../src/Resources.vala:223
+#: ../src/Resources.vala:256
 msgid "Increase Rating"
 msgstr "Aumentar avaliação"
 
-#: ../src/Resources.vala:225
+#: ../src/Resources.vala:258
 msgid "_Decrease"
 msgstr "_Diminuir"
 
-#: ../src/Resources.vala:226
+#: ../src/Resources.vala:259
 msgid "Decrease Rating"
 msgstr "Diminuir avaliação"
 
-#: ../src/Resources.vala:228
+#: ../src/Resources.vala:261
 msgid "_Unrated"
 msgstr "_Sem avaliação"
 
-#: ../src/Resources.vala:229
+#: ../src/Resources.vala:262
 msgid "Unrated"
 msgstr "Sem avaliação"
 
-#: ../src/Resources.vala:230
+#: ../src/Resources.vala:263
 msgid "Rate Unrated"
 msgstr "Apagar avaliação"
 
-#: ../src/Resources.vala:231
+#: ../src/Resources.vala:264
 msgid "Setting as unrated"
 msgstr "Definir como não avaliado"
 
-#: ../src/Resources.vala:232
+#: ../src/Resources.vala:265
 msgid "Remove any ratings"
 msgstr "Remove avaliação"
 
-#: ../src/Resources.vala:234
+#: ../src/Resources.vala:267
 msgid "_Rejected"
 msgstr "_Rejeita"
 
-#: ../src/Resources.vala:235
+#: ../src/Resources.vala:268
 msgid "Rejected"
 msgstr "Rejeitada"
 
-#: ../src/Resources.vala:236
+#: ../src/Resources.vala:269
 msgid "Rate Rejected"
 msgstr "Avaliar como rejeitado"
 
-#: ../src/Resources.vala:237
+#: ../src/Resources.vala:270
 msgid "Setting as rejected"
 msgstr "Definir como rejeitado"
 
-#: ../src/Resources.vala:238
+#: ../src/Resources.vala:271
 msgid "Set rating to rejected"
 msgstr "Avaliar como rejeitado"
 
-#: ../src/Resources.vala:240
+#: ../src/Resources.vala:273
 msgid "Rejected _Only"
 msgstr "Rejeitado _apenas"
 
-#: ../src/Resources.vala:241
+#: ../src/Resources.vala:274
 msgid "Rejected Only"
 msgstr "Rejeitados Apenas"
 
-#: ../src/Resources.vala:242
+#: ../src/Resources.vala:275
 msgid "Show only rejected photos"
 msgstr "Exibir apenas fotos rejeitadas"
 
-#: ../src/Resources.vala:244
+#: ../src/Resources.vala:277
 msgid "All + _Rejected"
 msgstr "Tudo + _rejeitado"
 
-#: ../src/Resources.vala:245 ../src/Resources.vala:246
+#: ../src/Resources.vala:278 ../src/Resources.vala:279
 msgid "Show all photos, including rejected"
 msgstr "Mostrar todas as fotos, inclusive as rejeitadas"
 
-#: ../src/Resources.vala:248
+#: ../src/Resources.vala:281
 msgid "_All Photos"
 msgstr "Todas as _fotos"
 
-#: ../src/Resources.vala:249 ../src/Resources.vala:250
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:283 ../src/Resources.vala:285
 msgid "Show all photos"
 msgstr "Exibe todas fotos"
 
-#: ../src/Resources.vala:252
+#: ../src/Resources.vala:287
 msgid "_Ratings"
 msgstr "_Avaliações"
 
-#: ../src/Resources.vala:253
+#: ../src/Resources.vala:288
 msgid "Display each photo's rating"
 msgstr "Exibe as avaliações de cada foto"
 
-#: ../src/Resources.vala:255
+#: ../src/Resources.vala:290
 msgid "_Filter Photos"
 msgstr "_Filtrar fotos"
 
-#: ../src/Resources.vala:256
+#: ../src/Resources.vala:291
 msgid "Filter Photos"
 msgstr "Filtrar fotos"
 
-#: ../src/Resources.vala:257
+#: ../src/Resources.vala:292
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Limita o número de fotos mostradas com base num filtro"
 
-#: ../src/Resources.vala:259
+#: ../src/Resources.vala:294
 msgid "_Duplicate"
 msgstr "_Duplicar"
 
-#: ../src/Resources.vala:260
+#: ../src/Resources.vala:295
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: ../src/Resources.vala:261
+#: ../src/Resources.vala:296
 msgid "Make a duplicate of the photo"
 msgstr "Duplicar a foto"
 
-#: ../src/Resources.vala:263
+#: ../src/Resources.vala:298
 msgid "_Export..."
 msgstr "_Exportar..."
 
-#: ../src/Resources.vala:265
+#: ../src/Resources.vala:300
 msgid "_Print..."
 msgstr "Imprimi_r..."
 
-#: ../src/Resources.vala:267
+#: ../src/Resources.vala:302
 msgid "Pu_blish..."
 msgstr "Pu_blicar..."
 
-#: ../src/Resources.vala:269
+#: ../src/Resources.vala:304
 msgid "Publish to various websites"
 msgstr "Publicar para vários sites"
 
-#: ../src/Resources.vala:271
+#: ../src/Resources.vala:306
 msgid "Edit _Title..."
 msgstr "Editar _título..."
 
-#: ../src/Resources.vala:274
+#: ../src/Resources.vala:310
 msgid "Edit _Comment..."
 msgstr "Editar _comentário..."
 
-#: ../src/Resources.vala:275
+#. Button label
+#: ../src/Resources.vala:312
 msgid "Edit Comment"
 msgstr "Editar comentário"
 
-#: ../src/Resources.vala:277
+#: ../src/Resources.vala:314
 msgid "Edit Event _Comment..."
 msgstr "Editar _comentário de evento..."
 
-#: ../src/Resources.vala:280
+#: ../src/Resources.vala:317
 msgid "_Adjust Date and Time..."
 msgstr "_Ajustar data e hora..."
 
-#: ../src/Resources.vala:281
+#: ../src/Resources.vala:318
 msgid "Adjust Date and Time"
 msgstr "Ajustar a data e hora"
 
-#: ../src/Resources.vala:283
+#: ../src/Resources.vala:320
 msgid "Add _Tags..."
 msgstr "Adicionar e_tiquetas..."
 
-#: ../src/Resources.vala:284
+#: ../src/Resources.vala:321
 msgid "_Add Tags..."
 msgstr "_Adicionar etiquetas..."
 
-#: ../src/Resources.vala:285 ../src/Resources.vala:316
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:323 ../src/Resources.vala:356
 msgid "Add Tags"
 msgstr "Adicionar etiquetas"
 
-#: ../src/Resources.vala:287
-msgid "_Preferences"
-msgstr "_Preferências"
-
-#: ../src/Resources.vala:289
+#: ../src/Resources.vala:327
 msgid "Open With E_xternal Editor"
 msgstr "Abrir com o editor e_xterno"
 
-#: ../src/Resources.vala:291
+#: ../src/Resources.vala:329
 msgid "Open With RA_W Editor"
 msgstr "Abrir com editor de RA_W"
 
-#: ../src/Resources.vala:293
+#: ../src/Resources.vala:331
 msgid "Send _To..."
 msgstr "Enviar _para..."
 
-#: ../src/Resources.vala:294
+#: ../src/Resources.vala:332
 msgid "Send T_o..."
 msgstr "Enviar p_ara..."
 
-#: ../src/Resources.vala:296
+#: ../src/Resources.vala:334
 msgid "_Find..."
 msgstr "_Localizar..."
 
-#: ../src/Resources.vala:297
+#: ../src/Resources.vala:335
 msgid "Find"
 msgstr "Localização"
 
-#: ../src/Resources.vala:298
+#: ../src/Resources.vala:336
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Encontre uma imagem digitando o texto que aparece em seu nome ou etiquetas"
 
-#: ../src/Resources.vala:300
+#: ../src/Resources.vala:338
 msgid "_Flag"
 msgstr "_Marcar"
 
-#: ../src/Resources.vala:302
+#: ../src/Resources.vala:340
 msgid "Un_flag"
 msgstr "Des_marcar"
 
-#: ../src/Resources.vala:305
+#: ../src/Resources.vala:343
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Não foi possível iniciar o editor: %s"
 
-#: ../src/Resources.vala:310
+#: ../src/Resources.vala:348
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "Adicionar etiqueta \"%s\""
 
-#: ../src/Resources.vala:312
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:351
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "Adicionar etiquetas \"%s\" e \"%s\""
 
-#: ../src/Resources.vala:320
+#: ../src/Resources.vala:361
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "A_pagar etiqueta \"%s\""
 
-#: ../src/Resources.vala:324
+#: ../src/Resources.vala:365
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "Apagar etiqueta \"%s\""
 
-#: ../src/Resources.vala:327
+#: ../src/Resources.vala:368
 msgid "Delete Tag"
 msgstr "Apagar etiqueta"
 
-#: ../src/Resources.vala:330
-msgid "_New"
-msgstr "_Nova"
-
-#: ../src/Resources.vala:333
+#: ../src/Resources.vala:374
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "Re_nomear etiqueta \"%s\"..."
 
-#: ../src/Resources.vala:337
+#: ../src/Resources.vala:378
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "Renomear a etiqueta \"%s\" para \"%s\""
 
-#: ../src/Resources.vala:340
+#: ../src/Resources.vala:381
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../src/Resources.vala:342
+#: ../src/Resources.vala:383
 msgid "Modif_y Tags..."
 msgstr "_Modificar etiquetas..."
 
-#: ../src/Resources.vala:343
+#: ../src/Resources.vala:384
 msgid "Modify Tags"
 msgstr "Modificar etiquetas"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Etiquetar fotos como \"%s\""
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Etiquetar foto como \"%s\""
 
-#: ../src/Resources.vala:350
+#: ../src/Resources.vala:391
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "Etiquetar as fotos selecionadas como \"%s\""
 
-#: ../src/Resources.vala:351
+#: ../src/Resources.vala:392
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "Etiquetar as fotos selecionadas como \"%s\""
 
-#: ../src/Resources.vala:355
+#: ../src/Resources.vala:396
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "Remover etiqueta \"%s\" da _foto"
 
-#: ../src/Resources.vala:356
+#: ../src/Resources.vala:397
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "Remover etiqueta \"%s\" das _fotos"
 
-#: ../src/Resources.vala:360
+#: ../src/Resources.vala:401
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "Remove a etiqueta \"%s\" da foto"
 
-#: ../src/Resources.vala:361
+#: ../src/Resources.vala:402
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "Remove a etiqueta \"%s\" das fotos"
 
-#: ../src/Resources.vala:365
+#: ../src/Resources.vala:406
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr ""
 "Não foi possível renomear a etiqueta para \"%s\" pelo fato da etiqueta já "
 "existir."
 
-#: ../src/Resources.vala:369
+#: ../src/Resources.vala:410
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr ""
 "Não foi possível renomear a pesquisa para \"%s\" pelo fato da pesquisa já "
 "existir."
 
-#: ../src/Resources.vala:372
+#: ../src/Resources.vala:413
 msgid "Saved Search"
 msgstr "Pesquisa salva"
 
-#: ../src/Resources.vala:374
+#: ../src/Resources.vala:415
 msgid "Delete Search"
 msgstr "Apagar pesquisa"
 
-#: ../src/Resources.vala:377
+#: ../src/Resources.vala:418
 msgid "_Edit..."
 msgstr "_Editar..."
 
-#: ../src/Resources.vala:378
+#: ../src/Resources.vala:419
 msgid "Re_name..."
 msgstr "Re_nomear..."
 
-#: ../src/Resources.vala:381
+#: ../src/Resources.vala:422
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "Renomeia a pesquisa \"%s\" para \"%s\""
 
-#: ../src/Resources.vala:385
+#: ../src/Resources.vala:426
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "Apagar pesquisa \"%s\""
 
-#: ../src/Resources.vala:543
+#: ../src/Resources.vala:584
 #, c-format
 msgid "Rate %s"
 msgstr "Avaliar %s"
 
-#: ../src/Resources.vala:544
+#: ../src/Resources.vala:585
 #, c-format
 msgid "Set rating to %s"
 msgstr "Avaliar como %s"
 
-#: ../src/Resources.vala:545
+#: ../src/Resources.vala:586
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Avaliando como %s"
 
-#: ../src/Resources.vala:547
+#: ../src/Resources.vala:588
 #, c-format
 msgid "Display %s"
 msgstr "Mostra %s"
 
-#: ../src/Resources.vala:548
+#: ../src/Resources.vala:589
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Mostra somente as fotos com avaliação de %s"
 
-#: ../src/Resources.vala:549
+#: ../src/Resources.vala:590
 #, c-format
 msgid "%s or Better"
 msgstr "%s ou melhor"
 
-#: ../src/Resources.vala:550
+#: ../src/Resources.vala:591
 #, c-format
 msgid "Display %s or Better"
 msgstr "Mostrar %s ou melhor"
 
-#: ../src/Resources.vala:551
+#: ../src/Resources.vala:592
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Mostra somente as fotos com avaliação de %s ou melhor"
 
-#: ../src/Resources.vala:642
+#: ../src/Resources.vala:683
 msgid "Remove the selected photos from the trash"
 msgstr "Remover as fotos selecionadas para a lixeira"
 
-#: ../src/Resources.vala:643
+#: ../src/Resources.vala:684
 msgid "Remove the selected photos from the library"
 msgstr "Remover as fotos selecionadas da biblioteca"
 
-#: ../src/Resources.vala:645
+#: ../src/Resources.vala:686
 msgid "_Restore"
 msgstr "_Restaurar"
 
-#: ../src/Resources.vala:646
+#: ../src/Resources.vala:687
 msgid "Move the selected photos back into the library"
 msgstr "Remover as fotos selecionadas para a galeria"
 
-#: ../src/Resources.vala:648
+#: ../src/Resources.vala:689
 msgid "Show in File Mana_ger"
 msgstr "Abrir com o gerenciador de a_rquivos"
 
-#: ../src/Resources.vala:649
+#: ../src/Resources.vala:690
 msgid "Open the selected photo's directory in the file manager"
 msgstr "Abre o diretório da foto selecionada no gerenciador de arquivos"
 
-#: ../src/Resources.vala:652
+#: ../src/Resources.vala:693
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Não foi possível abrir no gerenciador de arquivos: %s"
 
-#: ../src/Resources.vala:655
+#: ../src/Resources.vala:696
 msgid "R_emove From Library"
 msgstr "R_emover da biblioteca"
 
-#: ../src/Resources.vala:657
+#: ../src/Resources.vala:698
 msgid "_Move to Trash"
 msgstr "_Mover para a lixeira"
 
-#: ../src/Resources.vala:659
+#: ../src/Resources.vala:700
 msgid "Select _All"
 msgstr "Selecionar _todas"
 
-#: ../src/Resources.vala:660
+#: ../src/Resources.vala:701
 msgid "Select all items"
 msgstr "Selecionar todos os itens"
 
@@ -3545,7 +3643,7 @@ msgstr "Selecionar todos os itens"
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:741
+#: ../src/Resources.vala:780
 msgid "%-I:%M %p"
 msgstr "%-H:%M"
 
@@ -3553,13 +3651,13 @@ msgstr "%-H:%M"
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:746
+#: ../src/Resources.vala:785
 msgid "%-I:%M:%S %p"
 msgstr "%-H:%M:%S"
 
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:750
+#: ../src/Resources.vala:789
 msgid "%a %b %d, %Y"
 msgstr "%a, %d de %b de %Y"
 
@@ -3569,14 +3667,14 @@ msgstr "%a, %d de %b de %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:755 ../src/Resources.vala:765
+#: ../src/Resources.vala:794 ../src/Resources.vala:804
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:760
+#: ../src/Resources.vala:799
 msgid "%d, %Y"
 msgstr "%d, %Y"
 
@@ -3586,7 +3684,7 @@ msgstr "Exibição de slides"
 
 #. Flagged label and toggle
 #: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
-#: ../src/SearchFilter.vala:990 ../src/library/FlaggedPage.vala:8
+#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
 msgid "Flagged"
 msgstr "Sinalizadas"
 
@@ -3606,28 +3704,37 @@ msgstr "Fotos RAW"
 msgid "RAW photos"
 msgstr "Fotos RAW"
 
-#: ../src/SearchFilter.vala:952
+#: ../src/SearchFilter.vala:934
 #, c-format
 msgid "Error loading UI file %s: %s"
 msgstr "Erro ao carregar arquivo de UI %s: %s"
 
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: ../src/SearchFilter.vala:945
+msgid "Close"
+msgstr "Fechar"
+
 #. Type label and toggles
-#: ../src/SearchFilter.vala:969
+#: ../src/SearchFilter.vala:951
 msgid "Type"
 msgstr "Tipo"
 
 #. Rating label and button
-#: ../src/SearchFilter.vala:1003 ../src/searches/SearchBoolean.vala:184
+#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
 msgid "Rating"
 msgstr "Avaliação"
 
-#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:182
+#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
 msgid "Settings"
 msgstr "Configurações"
 
 #. Set up toolbar
 #. add toolbar buttons
-#: ../src/SlideshowPage.vala:161
+#: ../src/SlideshowPage.vala:160
 msgid "Back"
 msgstr "Voltar"
 
@@ -3635,15 +3742,15 @@ msgstr "Voltar"
 msgid "Go to the previous photo"
 msgstr "Ir para a foto anterior"
 
-#: ../src/SlideshowPage.vala:168 ../src/SlideshowPage.vala:273
+#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:274
+#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
 msgid "Pause the slideshow"
 msgstr "Pausar apresentação de slides"
 
-#: ../src/SlideshowPage.vala:175
+#: ../src/SlideshowPage.vala:174
 msgid "Next"
 msgstr "Próxima"
 
@@ -3651,20 +3758,20 @@ msgstr "Próxima"
 msgid "Go to the next photo"
 msgstr "Ir para a próxima foto"
 
-#: ../src/SlideshowPage.vala:183
+#: ../src/SlideshowPage.vala:184
 msgid "Change slideshow settings"
 msgstr "Alterar configuração da exibição de slides"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: ../src/SlideshowPage.vala:237
+#: ../src/SlideshowPage.vala:238
 msgid "All photo source files are missing."
 msgstr "Faltam arquivos fonte de todas as fotos."
 
-#: ../src/SlideshowPage.vala:269
+#: ../src/SlideshowPage.vala:270
 msgid "Play"
 msgstr "Reproduzir"
 
-#: ../src/SlideshowPage.vala:270
+#: ../src/SlideshowPage.vala:271
 msgid "Continue the slideshow"
 msgstr "Continuar a exibição de slides"
 
@@ -3673,11 +3780,11 @@ msgid "untitled"
 msgstr "Sem título"
 
 #. multiple videos
-#: ../src/VideoSupport.vala:486
+#: ../src/VideoSupport.vala:489
 msgid "Export Videos"
 msgstr "Exportar vídeos"
 
-#: ../src/camera/Branch.vala:87
+#: ../src/camera/Branch.vala:85
 msgid "Cameras"
 msgstr "Câmeras"
 
@@ -3701,28 +3808,28 @@ msgstr "Somente exibir fotos que não foram importadas"
 #. prior to import.
 #. TODO: replace this with approved text for "talking to camera,
 #. please wait" once new strings are being accepted.
-#: ../src/camera/ImportPage.vala:845
+#: ../src/camera/ImportPage.vala:847
 msgid "Starting import, please wait..."
 msgstr "Iniciando importação, por favor, aguarde..."
 
-#: ../src/camera/ImportPage.vala:884
+#: ../src/camera/ImportPage.vala:886
 msgid "Import _Selected"
 msgstr "Importar _selecionadas"
 
-#: ../src/camera/ImportPage.vala:885
+#: ../src/camera/ImportPage.vala:887
 msgid "Import the selected photos into your library"
 msgstr "Remover as fotos selecionadas para a sua galeria"
 
-#: ../src/camera/ImportPage.vala:890
+#: ../src/camera/ImportPage.vala:892
 msgid "Import _All"
 msgstr "Importar _todas"
 
-#: ../src/camera/ImportPage.vala:891
+#: ../src/camera/ImportPage.vala:893
 msgid "Import all the photos into your library"
 msgstr "Importar todas as fotos para sua biblioteca"
 
 #. it's mounted, offer to unmount for the user
-#: ../src/camera/ImportPage.vala:1012
+#: ../src/camera/ImportPage.vala:1014
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it.  Continue?"
@@ -3730,15 +3837,15 @@ msgstr ""
 "Shotwell precisa desmontar a câmera do sistema de arquivos para acessá-la.  "
 "Continuar?"
 
-#: ../src/camera/ImportPage.vala:1018
+#: ../src/camera/ImportPage.vala:1020
 msgid "_Unmount"
 msgstr "_Desmontar"
 
-#: ../src/camera/ImportPage.vala:1023
+#: ../src/camera/ImportPage.vala:1025
 msgid "Please unmount the camera."
 msgstr "Por favor, desmonte a câmera."
 
-#: ../src/camera/ImportPage.vala:1028
+#: ../src/camera/ImportPage.vala:1030
 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 "
@@ -3748,12 +3855,12 @@ msgstr ""
 "a câmera quando ela está destravada. Por favor, feche qualquer outro "
 "aplicativo que estiver usando a câmera e tente novamente."
 
-#: ../src/camera/ImportPage.vala:1038
+#: ../src/camera/ImportPage.vala:1040
 msgid "Please close any other application using the camera."
 msgstr ""
 "Por favor, encerre qualquer outro aplicativo que esteja usando a câmera."
 
-#: ../src/camera/ImportPage.vala:1043
+#: ../src/camera/ImportPage.vala:1045
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -3762,57 +3869,57 @@ msgstr ""
 "Não foi possível obter pré-visualizações da câmera:\n"
 "%s"
 
-#: ../src/camera/ImportPage.vala:1060
+#: ../src/camera/ImportPage.vala:1062
 msgid "Unmounting..."
 msgstr "Desmontando..."
 
-#: ../src/camera/ImportPage.vala:1166
+#: ../src/camera/ImportPage.vala:1168
 msgid "Fetching photo information"
 msgstr "Obtendo informação da foto"
 
-#: ../src/camera/ImportPage.vala:1521
+#: ../src/camera/ImportPage.vala:1523
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Obtendo visualização para %s"
 
-#: ../src/camera/ImportPage.vala:1637
+#: ../src/camera/ImportPage.vala:1639
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Não foi possível travar a câmera: %s"
 
-#: ../src/camera/ImportPage.vala:1722
+#: ../src/camera/ImportPage.vala:1724
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "Apagar essa foto da câmera?"
 msgstr[1] "Apagar essas %d fotos da câmera?"
 
-#: ../src/camera/ImportPage.vala:1725
+#: ../src/camera/ImportPage.vala:1727
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] "Apagar esse vídeo da câmera?"
 msgstr[1] "Apagar esses %d vídeos da câmera?"
 
-#: ../src/camera/ImportPage.vala:1728
+#: ../src/camera/ImportPage.vala:1730
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "Excluir essa foto/vídeo da câmera?"
 msgstr[1] "Excluir essas %d fotos/vídeos da câmera?"
 
-#: ../src/camera/ImportPage.vala:1731
+#: ../src/camera/ImportPage.vala:1733
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] "Apagar esse arquivo da câmera?"
 msgstr[1] "Apagar esses %d arquivos da câmera?"
 
-#: ../src/camera/ImportPage.vala:1758
+#: ../src/camera/ImportPage.vala:1760
 msgid "Removing photos/videos from camera"
 msgstr "Excluindo fotos/vídeos da câmera"
 
-#: ../src/camera/ImportPage.vala:1762
+#: ../src/camera/ImportPage.vala:1764
 #, 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."
@@ -3859,20 +3966,16 @@ msgid "Database file:"
 msgstr "Arquivo de banco de dados:"
 
 #: ../src/data_imports/DataImportsUI.vala:112
-#: ../src/library/LibraryWindow.vala:899
+#: ../src/library/LibraryWindow.vala:898
 msgid "_Import"
 msgstr "Parar _importação"
 
-#: ../src/data_imports/DataImportsUI.vala:216
+#: ../src/data_imports/DataImportsUI.vala:217
 msgid "Import From Application"
 msgstr "Importação de aplicativo"
 
-#: ../src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "Impo_rtação de mídia de:"
-
-#: ../src/data_imports/DataImportsUI.vala:394
-#: ../src/publishing/PublishingUI.vala:493
+#: ../src/data_imports/DataImportsUI.vala:369
+#: ../src/publishing/PublishingUI.vala:470
 msgid "_Close"
 msgstr "Fe_char"
 
@@ -3906,15 +4009,10 @@ msgstr ""
 "O erro foi: \n"
 "%s"
 
-#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:352
+#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:351
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../src/direct/DirectPhotoPage.vala:51
-#: ../src/direct/DirectPhotoPage.vala:417
-msgid "_Save"
-msgstr "_Salvar"
-
 #: ../src/direct/DirectPhotoPage.vala:52
 msgid "Save photo"
 msgstr "Salvar foto"
@@ -3931,19 +4029,10 @@ msgstr "Salva a foto com um nome diferente"
 msgid "Print the photo to a printer connected to your computer"
 msgstr "Imprime a foto em uma impressora conectada em seu computador"
 
-#: ../src/direct/DirectPhotoPage.vala:73 ../src/library/LibraryWindow.vala:356
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:364
+#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:363
 msgid "_Photo"
 msgstr "_Foto"
 
-#: ../src/direct/DirectPhotoPage.vala:169
-#: ../src/library/LibraryWindow.vala:380
-msgid "_Help"
-msgstr "A_juda"
-
 #: ../src/direct/DirectPhotoPage.vala:227
 #, c-format
 msgid "%s does not exist."
@@ -3963,26 +4052,26 @@ msgstr ""
 "%s não oferece suporte ao formato do arquivo de\n"
 "%s."
 
-#: ../src/direct/DirectPhotoPage.vala:417
+#: ../src/direct/DirectPhotoPage.vala:422
 msgid "_Save a Copy"
 msgstr "_Salvar uma cópia"
 
-#: ../src/direct/DirectPhotoPage.vala:420
+#: ../src/direct/DirectPhotoPage.vala:425
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Descartar alterações para %s?"
 
-#: ../src/direct/DirectPhotoPage.vala:421
+#: ../src/direct/DirectPhotoPage.vala:426
 msgid "Close _without Saving"
 msgstr "Fechar s_em salvar"
 
-#: ../src/direct/DirectPhotoPage.vala:454
+#: ../src/direct/DirectPhotoPage.vala:459
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Erro ao salvar para %s: %s"
 
-#: ../src/direct/DirectPhotoPage.vala:482
-#: ../src/direct/DirectPhotoPage.vala:503
+#: ../src/direct/DirectPhotoPage.vala:487
+#: ../src/direct/DirectPhotoPage.vala:508
 msgid "Save As"
 msgstr "Salvar como"
 
@@ -4157,7 +4246,7 @@ msgstr "%B"
 msgid "Folders"
 msgstr "Pastas"
 
-#: ../src/library/Branch.vala:37 ../ui/shotwell.glade.h:33
+#: ../src/library/Branch.vala:36 ../ui/shotwell.glade.h:32
 msgid "Library"
 msgstr "Biblioteca"
 
@@ -4165,19 +4254,19 @@ msgstr "Biblioteca"
 msgid "Importing..."
 msgstr "Importando..."
 
-#: ../src/library/ImportQueuePage.vala:66
+#: ../src/library/ImportQueuePage.vala:67
 msgid "_Stop Import"
 msgstr "Pa_rar importação"
 
-#: ../src/library/ImportQueuePage.vala:67
+#: ../src/library/ImportQueuePage.vala:68
 msgid "Stop importing photos"
 msgstr "Parar importação de fotos"
 
-#: ../src/library/ImportQueuePage.vala:123
+#: ../src/library/ImportQueuePage.vala:124
 msgid "Preparing to import..."
 msgstr "Preparando para importar..."
 
-#: ../src/library/ImportQueuePage.vala:150
+#: ../src/library/ImportQueuePage.vala:151
 #, c-format
 msgid "Imported %s"
 msgstr "Importado %s"
@@ -4214,72 +4303,72 @@ msgstr "Apaga todas as fotos na lixeira"
 msgid "View Eve_nt for Photo"
 msgstr "Ver eve_nto para foto"
 
-#: ../src/library/LibraryWindow.vala:334
+#: ../src/library/LibraryWindow.vala:333
 msgid "_Find"
 msgstr "_Localizar"
 
-#: ../src/library/LibraryWindow.vala:335
+#: ../src/library/LibraryWindow.vala:334
 msgid "Find photos and videos by search criteria"
 msgstr "Localiza fotos e vídeos através de pesquisa"
 
-#: ../src/library/LibraryWindow.vala:346 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:195
+#: ../src/library/LibraryWindow.vala:345 ../src/searches/Branch.vala:77
+#: ../src/sidebar/Tree.vala:185
 msgid "Ne_w Saved Search..."
 msgstr "Nova busca salva..."
 
-#: ../src/library/LibraryWindow.vala:368
+#: ../src/library/LibraryWindow.vala:367
 msgid "_Photos"
 msgstr "_Fotos"
 
-#: ../src/library/LibraryWindow.vala:372
+#: ../src/library/LibraryWindow.vala:371
 msgid "Even_ts"
 msgstr "Even_tos"
 
-#: ../src/library/LibraryWindow.vala:391
+#: ../src/library/LibraryWindow.vala:390
 msgid "_Basic Information"
 msgstr "Informações _básicas"
 
-#: ../src/library/LibraryWindow.vala:392
+#: ../src/library/LibraryWindow.vala:391
 msgid "Display basic information for the selection"
 msgstr "Exibe informações básicas para a seleção"
 
-#: ../src/library/LibraryWindow.vala:397
+#: ../src/library/LibraryWindow.vala:396
 msgid "E_xtended Information"
 msgstr "Informações _estendidas"
 
-#: ../src/library/LibraryWindow.vala:398
+#: ../src/library/LibraryWindow.vala:397
 msgid "Display extended information for the selection"
 msgstr "Exibe informações básicas para a seleção"
 
-#: ../src/library/LibraryWindow.vala:403
+#: ../src/library/LibraryWindow.vala:402
 msgid "_Search Bar"
 msgstr "Barra de pe_squisa"
 
-#: ../src/library/LibraryWindow.vala:404
+#: ../src/library/LibraryWindow.vala:403
 msgid "Display the search bar"
 msgstr "Exibe a barra de pesquisa"
 
-#: ../src/library/LibraryWindow.vala:409
+#: ../src/library/LibraryWindow.vala:408
 msgid "S_idebar"
 msgstr "Ba_rra lateral"
 
-#: ../src/library/LibraryWindow.vala:410
+#: ../src/library/LibraryWindow.vala:409
 msgid "Display the sidebar"
 msgstr "Exibe a barra lateral"
 
-#: ../src/library/LibraryWindow.vala:668
+#: ../src/library/LibraryWindow.vala:667
 msgid "Import From Folder"
 msgstr "Importa da pasta"
 
-#: ../src/library/LibraryWindow.vala:737
+#: ../src/library/LibraryWindow.vala:736
 msgid "Empty Trash"
 msgstr "Esvaziar lixeira"
 
-#: ../src/library/LibraryWindow.vala:737
+#: ../src/library/LibraryWindow.vala:736
 msgid "Emptying Trash..."
 msgstr "Esvaziando lixeira..."
 
-#: ../src/library/LibraryWindow.vala:896
+#: ../src/library/LibraryWindow.vala:895
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4292,34 +4381,34 @@ msgstr ""
 "%s</span>.\n"
 "Você deseja continuar a importação de fotos?"
 
-#: ../src/library/LibraryWindow.vala:899 ../ui/shotwell.glade.h:19
+#: ../src/library/LibraryWindow.vala:898 ../ui/shotwell.glade.h:18
 msgid "Library Location"
 msgstr "Localização da biblioteca"
 
 #. TODO: Specify which directory/file.
-#: ../src/library/LibraryWindow.vala:912
+#: ../src/library/LibraryWindow.vala:911
 msgid "Photos cannot be imported from this directory."
 msgstr "Fotos não podem ser importadas deste diretório."
 
-#: ../src/library/LibraryWindow.vala:1200
+#: ../src/library/LibraryWindow.vala:1199
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: ../src/library/LibraryWindow.vala:1244
-#: ../src/library/LibraryWindow.vala:1255
+#: ../src/library/LibraryWindow.vala:1243
+#: ../src/library/LibraryWindow.vala:1254
 msgid "Updating library..."
 msgstr "Atualizando biblioteca..."
 
-#: ../src/library/LibraryWindow.vala:1261
+#: ../src/library/LibraryWindow.vala:1260
 msgid "Preparing to auto-import photos..."
 msgstr "Preparando para auto-importação de fotos..."
 
-#: ../src/library/LibraryWindow.vala:1266
+#: ../src/library/LibraryWindow.vala:1265
 msgid "Auto-importing photos..."
 msgstr "Auto-importação de fotos..."
 
-#: ../src/library/LibraryWindow.vala:1274
+#: ../src/library/LibraryWindow.vala:1273
 msgid "Writing metadata to files..."
 msgstr "Escrevendo metadados para arquivos..."
 
@@ -4433,22 +4522,22 @@ msgstr "BMP"
 msgid "JPEG"
 msgstr "JPEG"
 
-#: ../src/photos/JfifSupport.vala:182
+#: ../src/photos/JfifSupport.vala:185
 #, c-format
 msgid "Low (%d%%)"
 msgstr "Baixo (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:185
+#: ../src/photos/JfifSupport.vala:188
 #, c-format
 msgid "Medium (%d%%)"
 msgstr "Médio (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:188
+#: ../src/photos/JfifSupport.vala:191
 #, c-format
 msgid "High (%d%%)"
 msgstr "Alto (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:191
+#: ../src/photos/JfifSupport.vala:194
 #, c-format
 msgid "Maximum (%d%%)"
 msgstr "Máximo (%d%%)"
@@ -4515,37 +4604,37 @@ msgstr "Obtendo informação da conta..."
 msgid "Logging in..."
 msgstr "Autenticando..."
 
-#: ../src/publishing/PublishingUI.vala:183
+#: ../src/publishing/PublishingUI.vala:185
 msgid "Publish Photos"
 msgstr "Publicar fotos"
 
-#: ../src/publishing/PublishingUI.vala:184
+#: ../src/publishing/PublishingUI.vala:186
 msgid "Publish photos _to:"
 msgstr "Publicar fotos pa_ra:"
 
-#: ../src/publishing/PublishingUI.vala:186
+#: ../src/publishing/PublishingUI.vala:188
 msgid "Publish Videos"
 msgstr "Publicar vídeos"
 
-#: ../src/publishing/PublishingUI.vala:187
+#: ../src/publishing/PublishingUI.vala:189
 msgid "Publish videos _to"
 msgstr "Publicar vídeos pa_ra"
 
-#: ../src/publishing/PublishingUI.vala:189
+#: ../src/publishing/PublishingUI.vala:191
 msgid "Publish Photos and Videos"
 msgstr "Publicar fotos e vídeos"
 
-#: ../src/publishing/PublishingUI.vala:190
+#: ../src/publishing/PublishingUI.vala:192
 msgid "Publish photos and videos _to"
 msgstr "Publicar fotos e vídeos pa_ra"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: ../src/publishing/PublishingUI.vala:383
+#: ../src/publishing/PublishingUI.vala:360
 msgid "Unable to publish"
 msgstr "Não é possível publicar"
 
-#: ../src/publishing/PublishingUI.vala:384
+#: ../src/publishing/PublishingUI.vala:361
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -4563,123 +4652,139 @@ msgid "Saved Searches"
 msgstr "Pesquisas salvas"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:168
 msgid "contains"
 msgstr "contém"
 
 #. Ordering must correspond with Context
-#: ../src/searches/SavedSearchDialog.vala:170
-#: ../src/searches/SavedSearchDialog.vala:497
+#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:500
 msgid "is exactly"
 msgstr "é exatamente"
 
-#: ../src/searches/SavedSearchDialog.vala:171
+#: ../src/searches/SavedSearchDialog.vala:170
 msgid "starts with"
 msgstr "inicia com"
 
-#: ../src/searches/SavedSearchDialog.vala:172
+#: ../src/searches/SavedSearchDialog.vala:171
 msgid "ends with"
 msgstr "termina com"
 
-#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:172
 msgid "does not contain"
 msgstr "não contém"
 
-#: ../src/searches/SavedSearchDialog.vala:174
-#: ../src/searches/SavedSearchDialog.vala:501
+#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:504
 msgid "is not set"
 msgstr "não está definido"
 
+#: ../src/searches/SavedSearchDialog.vala:174
+msgid "is set"
+msgstr "está definido"
+
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: ../src/searches/SavedSearchDialog.vala:245
-#: ../src/searches/SavedSearchDialog.vala:376
-#: ../src/searches/SavedSearchDialog.vala:441
+#: ../src/searches/SavedSearchDialog.vala:248
+#: ../src/searches/SavedSearchDialog.vala:379
+#: ../src/searches/SavedSearchDialog.vala:444
 msgid "is"
 msgstr "é"
 
-#: ../src/searches/SavedSearchDialog.vala:246
+#: ../src/searches/SavedSearchDialog.vala:249
 msgid "is not"
 msgstr "não é"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:252
+#: ../src/searches/SavedSearchDialog.vala:255
 msgid "any photo"
 msgstr "qualquer foto"
 
-#: ../src/searches/SavedSearchDialog.vala:253
+#: ../src/searches/SavedSearchDialog.vala:256
 msgid "a raw photo"
 msgstr "uma foto raw"
 
-#: ../src/searches/SavedSearchDialog.vala:254
+#: ../src/searches/SavedSearchDialog.vala:257
 msgid "a video"
 msgstr "um vídeo"
 
-#: ../src/searches/SavedSearchDialog.vala:308
+#: ../src/searches/SavedSearchDialog.vala:311
 msgid "has"
 msgstr "tem"
 
-#: ../src/searches/SavedSearchDialog.vala:309
+#: ../src/searches/SavedSearchDialog.vala:312
 msgid "has no"
 msgstr "não tem"
 
-#: ../src/searches/SavedSearchDialog.vala:314
+#: ../src/searches/SavedSearchDialog.vala:317
 msgid "modifications"
 msgstr "modificações"
 
-#: ../src/searches/SavedSearchDialog.vala:315
+#: ../src/searches/SavedSearchDialog.vala:318
 msgid "internal modifications"
 msgstr "modificações internas"
 
-#: ../src/searches/SavedSearchDialog.vala:316
+#: ../src/searches/SavedSearchDialog.vala:319
 msgid "external modifications"
 msgstr "modificações externas"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:370
+#: ../src/searches/SavedSearchDialog.vala:373
 msgid "flagged"
 msgstr "sinalizada"
 
-#: ../src/searches/SavedSearchDialog.vala:371
+#: ../src/searches/SavedSearchDialog.vala:374
 msgid "not flagged"
 msgstr "não sinalizada"
 
-#: ../src/searches/SavedSearchDialog.vala:434
+#: ../src/searches/SavedSearchDialog.vala:437
 msgid "and higher"
 msgstr "e maior"
 
-#: ../src/searches/SavedSearchDialog.vala:435
+#: ../src/searches/SavedSearchDialog.vala:438
 msgid "only"
 msgstr "somente"
 
-#: ../src/searches/SavedSearchDialog.vala:436
+#: ../src/searches/SavedSearchDialog.vala:439
 msgid "and lower"
 msgstr "e baixo"
 
-#: ../src/searches/SavedSearchDialog.vala:498
+#: ../src/searches/SavedSearchDialog.vala:501
 msgid "is after"
 msgstr "é depois"
 
-#: ../src/searches/SavedSearchDialog.vala:499
+#: ../src/searches/SavedSearchDialog.vala:502
 msgid "is before"
 msgstr "é antes"
 
-#: ../src/searches/SavedSearchDialog.vala:500
+#: ../src/searches/SavedSearchDialog.vala:503
 msgid "is between"
 msgstr "é entre"
 
-#: ../src/searches/SavedSearchDialog.vala:513
+#: ../src/searches/SavedSearchDialog.vala:516
 msgid "and"
 msgstr "e"
 
-#: ../src/searches/SavedSearchDialog.vala:720
+#: ../src/searches/SavedSearchDialog.vala:695
+msgid "Search"
+msgstr "Pesquisa"
+
+#: ../src/searches/SavedSearchDialog.vala:700
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../src/searches/SavedSearchDialog.vala:701
+msgid "OK"
+msgstr "OK"
+
+#: ../src/searches/SavedSearchDialog.vala:719
 msgid "any"
 msgstr "qualquer"
 
-#: ../src/searches/SavedSearchDialog.vala:721
+#: ../src/searches/SavedSearchDialog.vala:720
 msgid "all"
 msgstr "todos"
 
-#: ../src/searches/SavedSearchDialog.vala:722
+#: ../src/searches/SavedSearchDialog.vala:721
 msgid "none"
 msgstr "nenhum"
 
@@ -4723,7 +4828,7 @@ msgstr "Estado da foto"
 msgid "Date"
 msgstr "Data"
 
-#: ../src/sidebar/Tree.vala:199
+#: ../src/sidebar/Tree.vala:189
 msgid "New _Tag..."
 msgstr "Nova etique_ta..."
 
@@ -4783,161 +4888,165 @@ msgstr ""
 "O tempo que cada foto é exibida como plano de fundo da área de trabalho"
 
 #: ../ui/shotwell.glade.h:1
-msgid "Search"
-msgstr "Pesquisa"
-
-#: ../ui/shotwell.glade.h:2
 msgid "_Name of search:"
 msgstr "_Nome da pesquisa:"
 
-#: ../ui/shotwell.glade.h:3
+#: ../ui/shotwell.glade.h:2
 msgid "_Match"
 msgstr "Co_mbinação"
 
-#: ../ui/shotwell.glade.h:4
+#: ../ui/shotwell.glade.h:3
 msgid "of the following:"
 msgstr "do seguinte:"
 
-#: ../ui/shotwell.glade.h:5
+#: ../ui/shotwell.glade.h:4
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Tamanho da imagem impressa</b>"
 
-#: ../ui/shotwell.glade.h:6
+#: ../ui/shotwell.glade.h:5
 msgid "Use a _standard size:"
 msgstr "Usar um taman_ho padrão:"
 
-#: ../ui/shotwell.glade.h:7
+#: ../ui/shotwell.glade.h:6
 msgid "Use a c_ustom size:"
 msgstr "Usar um tamanho _personalizado:"
 
-#: ../ui/shotwell.glade.h:8
+#: ../ui/shotwell.glade.h:7
 msgid "_Match photo aspect ratio"
 msgstr "_Correspondência de proporção de aspecto da foto"
 
-#: ../ui/shotwell.glade.h:9
+#: ../ui/shotwell.glade.h:8
 msgid "_Autosize:"
 msgstr "Tamanho _automático:"
 
-#: ../ui/shotwell.glade.h:10
+#: ../ui/shotwell.glade.h:9
 msgid "<b>Titles</b>"
 msgstr "<b>Títulos</b>"
 
-#: ../ui/shotwell.glade.h:11
+#: ../ui/shotwell.glade.h:10
 msgid "Print image _title"
 msgstr "Imprimir _título da imagem"
 
-#: ../ui/shotwell.glade.h:12
+#: ../ui/shotwell.glade.h:11
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Resolução em pixel</b>"
 
-#: ../ui/shotwell.glade.h:13
+#: ../ui/shotwell.glade.h:12
 msgid "_Output photo at:"
 msgstr "_Saída da foto em:"
 
-#: ../ui/shotwell.glade.h:14
+#: ../ui/shotwell.glade.h:13
 msgid "pixels per inch"
 msgstr "pixels por polegada"
 
-#: ../ui/shotwell.glade.h:16
+#: ../ui/shotwell.glade.h:15
 msgid "Shotwell Preferences"
 msgstr "Preferências do Shotwell"
 
-#: ../ui/shotwell.glade.h:17
+#: ../ui/shotwell.glade.h:16
 msgid "white"
 msgstr "branco"
 
-#: ../ui/shotwell.glade.h:18
+#: ../ui/shotwell.glade.h:17
 msgid "black"
 msgstr "preto"
 
-#: ../ui/shotwell.glade.h:20
+#: ../ui/shotwell.glade.h:19
 msgid "_Watch library directory for new files"
 msgstr "_Monitorar diretório de galeria por novos arquivos"
 
-#: ../ui/shotwell.glade.h:21
+#: ../ui/shotwell.glade.h:20
 msgid "Metadata"
 msgstr "Metadados"
 
-#: ../ui/shotwell.glade.h:22
+#: ../ui/shotwell.glade.h:21
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "Gravar etiquetas, títulos e outros _metadados para arquivos de fotos"
 
-#: ../ui/shotwell.glade.h:23
+#: ../ui/shotwell.glade.h:22
 msgid "Display"
 msgstr "Exibição"
 
-#: ../ui/shotwell.glade.h:24
+#: ../ui/shotwell.glade.h:23
 msgid "_Import photos to:"
 msgstr "_Importar fotos para:"
 
-#: ../ui/shotwell.glade.h:25
+#: ../ui/shotwell.glade.h:24
 msgid "_Background:"
 msgstr "_Plano de fundo:"
 
-#: ../ui/shotwell.glade.h:26
+#: ../ui/shotwell.glade.h:25
 msgid "Importing"
 msgstr "Importando"
 
-#: ../ui/shotwell.glade.h:27
+#: ../ui/shotwell.glade.h:26
 msgid "_Directory structure:"
 msgstr "Estrutura de _diretório:"
 
-#: ../ui/shotwell.glade.h:28
+#: ../ui/shotwell.glade.h:27
 msgid "_Pattern:"
 msgstr "_Padrão:"
 
-#: ../ui/shotwell.glade.h:29
+#: ../ui/shotwell.glade.h:28
 msgid "Example:"
 msgstr "Exemplo:"
 
-#: ../ui/shotwell.glade.h:30
+#: ../ui/shotwell.glade.h:29
 msgid "R_ename imported files to lowercase"
 msgstr "R_enomear arquivos importados para letra minúscula"
 
-#: ../ui/shotwell.glade.h:31
+#: ../ui/shotwell.glade.h:30
 msgid "RAW Developer"
 msgstr "Desenvolvedor RAW"
 
-#: ../ui/shotwell.glade.h:32
+#: ../ui/shotwell.glade.h:31
 msgid "De_fault:"
 msgstr "Pa_drão:"
 
-#: ../ui/shotwell.glade.h:34
+#: ../ui/shotwell.glade.h:33
 msgid "E_xternal photo editor:"
 msgstr "Editor de foto e_xterno:"
 
-#: ../ui/shotwell.glade.h:35
+#: ../ui/shotwell.glade.h:34
 msgid "External _RAW editor:"
 msgstr "Editor _RAW externo:"
 
-#: ../ui/shotwell.glade.h:36
+#: ../ui/shotwell.glade.h:35
 msgid "External Editors"
 msgstr "Editores externos"
 
-#: ../ui/shotwell.glade.h:37
+#: ../ui/shotwell.glade.h:36
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../ui/shotwell.glade.h:38
+#: ../ui/shotwell.glade.h:37
 msgid "_Delay:"
 msgstr "A_traso:"
 
-#: ../ui/shotwell.glade.h:39
+#: ../ui/shotwell.glade.h:38
 msgid "_Transition effect:"
 msgstr "Efeito de _transição:"
 
-#: ../ui/shotwell.glade.h:40
+#: ../ui/shotwell.glade.h:39
 msgid "Transition d_elay:"
 msgstr "A_traso de transição:"
 
-#: ../ui/shotwell.glade.h:41
+#: ../ui/shotwell.glade.h:40
 msgid "Show t_itle"
 msgstr "Mostrar títul_o"
 
-#: ../ui/shotwell.glade.h:42
+#: ../ui/shotwell.glade.h:41
 msgid "seconds"
 msgstr "segundos"
 
+#~ msgid "A file required for publishing is unavailable. Publishing to "
+#~ msgstr ""
+#~ "Um arquivo necessário para a publicação não está disponível. A publicação "
+#~ "para "
+
+#~ msgid "Import media _from:"
+#~ msgstr "Impo_rtação de mídia de:"
+
 #~ msgid "Only _Remove"
 #~ msgstr "_Remover somente"
 
diff --git a/po/ro.po b/po/ro.po
index 16bf975..cc4e56f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,678 +2,1491 @@
 # PO message string template file for Shotwell Core Components
 # Copyright (C) 2009-2013 Yorba Foundation
 # See COPYING for license.
-#
-#
 # Translators:
 # Pwnisher <ciprian420@gmail.com>, 2013
 # chodella <corneliu.dascalu@gmail.com>, 2013
 # Vasile Marian <marianvasile@upcmail.ro>, 2011
 # verayin <vera@yorba.org>, 2011
 # lsbeeler <lucas@yorba.org>, 2011
-#, fuzzy
+# Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
-"Report-Msgid-Bugs-To: shotwell@yorba.org\n"
-"POT-Creation-Date: 2013-09-20 11:55-0700\n"
-"PO-Revision-Date: 2013-09-23 16:40+0000\n"
-"Last-Translator: chodella <corneliu.dascalu@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/shotwell/"
-"language/ro/)\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=shotwel"
+"l&keywords=I18N+L10N&component=Internationalization\n"
+"POT-Creation-Date: 2015-01-06 20:38+0000\n"
+"PO-Revision-Date: 2015-01-08 17:45+0200\n"
+"Last-Translator: Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
+"Language-Team: Gnome Romanian Translation Team\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1));\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\n"
 
-#: src/Event.vala:737
-#, c-format
-msgid "Event %s"
-msgstr "Eveniment %s"
+#: ../plugins/common/RESTSupport.vala:424
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
+msgid "A temporary file needed for publishing is unavailable"
+msgstr "Un fișier temporar necesar pentru publicare nu este disponibil"
 
-#: src/camera/Branch.vala:87
-msgid "Cameras"
-msgstr "Aparate foto"
+#: ../plugins/common/RESTSupport.vala:1138
+msgid ""
+"You have already logged in and out of a Google service during this Shotwell "
+"session.\n"
+"\n"
+"To continue publishing to Google services, quit and restart Shotwell, then "
+"try publishing again."
+msgstr ""
+"V-ați autentificat și ați ieșit deja dintr-un serviciu Google pe parcursul "
+"acestei sesiuni Shotwell.\n"
+"\n"
+"Pentru a continua publicarea pe serviciile Google, ieșiți din Shotwell și "
+"reporniți programul, apoi reîncercați să publicați."
 
-#: src/camera/Branch.vala:101 src/camera/ImportPage.vala:711
-#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:300
-#: src/MediaPage.vala:425
-msgid "Camera"
-msgstr "Aparat foto"
+#: ../plugins/common/Resources.vala:9
+msgid "Visit the Shotwell home page"
+msgstr "Vizitați pagina oficială Shotwell"
 
-#: src/camera/ImportPage.vala:312 src/Properties.vala:227
-#, c-format
-msgid "RAW+JPEG"
-msgstr "RAW+JPEG"
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:703
+msgid "translator-credits"
+msgstr ""
+"Marian Vasile <marianvasile@upcmail.ro>, Corneliu Dascălu <corneliu."
+"dascalu@gmail.com>, Mircea Sălăjan <mircea.salajan@gmail.com>"
+
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:32
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:34
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:32
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
+#: ../src/Resources.vala:27
+msgid "Copyright 2009-2014 Yorba Foundation"
+msgstr "Drepturi de autor 2009-2014 Yorba Foundation"
+
+#: ../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 ""
+"Bine ai venit la serviciul de import din libraria F-Spot.\n"
+"\n"
+"Selectați o librărie pentru import, fie selectând una din librăriile deja "
+"existente găsite de Shotwell sau selectând o bază de date F-Spot alternativă."
 
-#: src/camera/ImportPage.vala:459
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:58
 msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
+"Welcome to the F-Spot library import service.\n"
+"\n"
+"Please select an F-Spot database file."
 msgstr ""
-"Aparatul foto nu poate fi demontat. Încercați să demontați dispozitivul din "
-"administratorul de fișiere."
+"Bine ați venit la serviciul de import în colecția F-Spot.\n"
+"\n"
+"Selectați o bază de date F-Spot."
 
-#: src/camera/ImportPage.vala:776
-msgid "Hide photos already imported"
-msgstr "Ascunde fotografiile importate deja"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
+msgid "Manually select an F-Spot database file to import:"
+msgstr "Selectează manual o bază de date F-Spot pentru import:"
 
-#: src/camera/ImportPage.vala:777
-msgid "Only display photos that have not been imported"
-msgstr "Afișează doar fotografiile care nu au fost importate"
+#: ../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 ""
+"Nu poate fi deschisă baza de date F-Spot selectată: fișierul nu există sau "
+"nu este o bază de date F-Spot"
 
-#: src/camera/ImportPage.vala:845
-msgid "Starting import, please wait..."
-msgstr "Se pornește importarea, așteptați..."
+#: ../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 ""
+"Nu poate fi deschisă baza de date F-Spot selectată: această versiune a bazei "
+"de date F-Spot nu este suportată de Shotwell"
 
-#: src/camera/ImportPage.vala:872 src/MediaPage.vala:436
-msgid "_Titles"
-msgstr "_Nume"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading tags table"
+msgstr ""
+"Nu poate fi citită baza de date F-Spot: eroare în timpul citirii tabelul cu "
+"etichete"
 
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:437
-msgid "Display the title of each photo"
-msgstr "Afișează numele fiecărei fotografii"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:68
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading photos "
+"table"
+msgstr ""
+"Nu poate fi citită baza de date F-Spot selectată: eroare în timpul citirii "
+"tabelului cu fotografii"
 
-#: src/camera/ImportPage.vala:884
-msgid "Import _Selected"
-msgstr "Importă _selecția"
+#: ../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 ""
+"Shotwell a găsit %d fotografii în librăria F-Spot și le importează. "
+"Duplicatele vor fi detectate automat și șterse.\n"
+"\n"
+"Poți închide acest dialog și începe să folosești Shotwell cât timp import-ul "
+"are loc în fundal."
 
-#: src/camera/ImportPage.vala:885
-msgid "Import the selected photos into your library"
-msgstr "Importați fotografiile selectate în colecția dumneavoastră"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
+#, c-format
+msgid "F-Spot library: %s"
+msgstr "Librăria F-Spot: %s"
 
-#: src/camera/ImportPage.vala:890
-msgid "Import _All"
-msgstr "Importă _tot"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:416
+msgid "Preparing to import"
+msgstr "Se pregătește importul"
 
-#: src/camera/ImportPage.vala:891
-msgid "Import all the photos into your library"
-msgstr "Importați toate fotografiile în colecția dumneavoastră"
+#: ../plugins/shotwell-data-imports/shotwell-data-imports.vala:22
+msgid "Core Data Import Services"
+msgstr "Servicii de import de date centrale"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+msgid "Gallery3 publishing module"
+msgstr "Modulul de publicare Gallery3"
 
-#: src/camera/ImportPage.vala:1012
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
 msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
+"You are not currently logged into your Gallery.\n"
+"\n"
+"You must have already signed up for a Gallery3 account to complete the login "
+"process."
 msgstr ""
-"Shotwell trebuie să demonteze aparatul foto din sistemul de fișiere pentru a-"
-"l accesa. Continuați?"
+"Nu sunteți autentificat pe Gallery.\n"
+"\n"
+"Trebuie să aveți un cont Gallery3 pentru a continua."
 
-#: src/camera/ImportPage.vala:1018
-msgid "_Unmount"
-msgstr "_Demontează"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: ../src/MediaPage.vala:434 ../src/photos/RawSupport.vala:300
+msgid "Shotwell"
+msgstr "Shotwell"
 
-#: src/camera/ImportPage.vala:1023
-msgid "Please unmount the camera."
-msgstr "Demontați aparatul foto."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+msgid "Shotwell default directory"
+msgstr "Dosarul implicit Shotwell"
 
-#: src/camera/ImportPage.vala:1028
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:801
+#, c-format
 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."
+"\n"
+"\n"
+"The file \"%s\" may not be supported by or may be too large for this "
+"instance of Gallery3."
 msgstr ""
-"Aparatul foto este blocat de o altă aplicație. Shotwell poate accesa "
-"aparatul foto numai dacă acesta nu este blocat. Închideți orice altă "
-"aplicație care folosește aparatul foto și încercați din nou."
+"\n"
+"\n"
+"Este posibil ca fișierul „%s” să nu fie suportat sau să fie prea mare pentru "
+"această instanță de Gallery3."
 
-#: src/camera/ImportPage.vala:1038
-msgid "Please close any other application using the camera."
-msgstr "Închideți orice aplicație care folosește aparatul foto."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:802
+msgid ""
+"\n"
+"Note that Gallery3 only supports the video types that Flowplayer does."
+msgstr ""
+"\n"
+"Luați la cunoștință faptul că Gallery3 suportă doar formatele video "
+"suportate și de Flowplayer."
 
-#: src/camera/ImportPage.vala:1043
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
 #, c-format
 msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
 msgstr ""
-"Nu se poate realiza previzualizarea fotografiilor din aparatul foto:\n"
-"%s"
+"Un fișier necesar pentru publicare este indisponibil. Publicarea către %s nu "
+"poate continua."
 
-#: src/camera/ImportPage.vala:1060
-msgid "Unmounting..."
-msgstr "Se demontează..."
+#. populate any widgets whose contents are
+#. programmatically-generated
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
+#, c-format
+msgid "Publishing to %s as %s."
+msgstr "Publicare către %s ca %s."
 
-#: src/camera/ImportPage.vala:1166
-msgid "Fetching photo information"
-msgstr "Se aduc informațiile despre fotografii"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+msgid "A file required for publishing is unavailable. Publishing to "
+msgstr "Un fișier necesar pentru publicare este indisponibil. Publicare către "
 
-#: src/camera/ImportPage.vala:1521
-#, c-format
-msgid "Fetching preview for %s"
-msgstr "Previzualizare pentru %s"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+msgid ""
+"Enter the URL for your Gallery3 site and the username and password (or API "
+"key) for your Gallery3 account."
+msgstr ""
+"Introduceți URL-ul pentru Gallery3 precum și numele de utilizator și parola "
+"(sau cheia API) asociate cu contul dumneavoastră Gallery3."
 
-#: src/camera/ImportPage.vala:1637
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "Aparatul foto nu poate fi blocat: %s"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
+msgid ""
+"The username and password or API key were incorrect. To try again, re-enter "
+"your username and password below."
+msgstr ""
+"Numele de utilizator și parola sau cheia API sunt incorecte. Reîncercați "
+"introducând din nou numele de utilizator și parola."
 
-#: src/camera/ImportPage.vala:1722
-#, c-format
-msgid "Delete this photo from camera?"
-msgid_plural "Delete these %d photos from camera?"
-msgstr[0] "Ștergeți această fotografie din aparatul foto?"
-msgstr[1] "Ștergeți aceste %d fotografii din aparatul foto?"
-msgstr[2] "Ștergeți aceste %d de fotografii din aparatul foto?"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
+msgid ""
+"The URL entered does not appear to be the main directory of a Gallery3 "
+"instance. Please make sure you typed it correctly and it does not have any "
+"trailing components (e.g., index.php)."
+msgstr ""
+"Adresa URL introdusă nu pare a fi dosarul principal al unei instanțe "
+"Gallery3. Asigurați-vă că ați introdus-o corect și că nu există niciun "
+"element suplimentar la sfârșit (ex. index.php)."
 
-#: src/camera/ImportPage.vala:1725
-#, c-format
-msgid "Delete this video from camera?"
-msgid_plural "Delete these %d videos from camera?"
-msgstr[0] "Ștergeți acest clip din aparatul foto?"
-msgstr[1] "Ștergeți aceste %d clipuri din aparatul foto?"
-msgstr[2] "Ștergeți aceste %d de clipuri din aparatul foto?"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
+msgid "Unrecognized User"
+msgstr "Utilizator nerecunoscut"
 
-#: src/camera/ImportPage.vala:1728
-#, c-format
-msgid "Delete this photo/video from camera?"
-msgid_plural "Delete these %d photos/videos from camera?"
-msgstr[0] "Ștergeți această fotografie/acest clip din aparatul foto?"
-msgstr[1] "Ștergeți aceste %d fotografii/clipuri din aparatul foto?"
-msgstr[2] "Ștergeți aceste %d de fotografii/clipuri din aparatul foto?"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
+msgid " Site Not Found"
+msgstr " Siteul nu a fost găsit"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
+msgid "Copyright (C) 2013 rajce.net"
+msgstr "Drepturi de autor (C) 2013 rajce.net"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
+msgid "An error message occurred when publishing to Rajce. Please try again."
+msgstr ""
+"A fost întâmpinată o problemă încercând publicarea către Rajce. Încercați "
+"din nou."
 
-#: src/camera/ImportPage.vala:1731
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
+msgid "Enter email and password associated with your Rajce account."
+msgstr "Introdu numele de utilizator și parola asociate cu contul tău Rajce."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
+msgid "Invalid email and/or password. Please try again"
+msgstr "Nume de utilizator și/sau parolă invalide. Încercați din nou"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
+msgid "Invalid User Email or Password"
+msgstr "Nume de utilizator sau parolă invalide"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:890
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:2
+msgid "_Email address"
+msgstr "Adresă _email"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:891
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
+msgid "_Password"
+msgstr "_Parolă"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
+msgid "_Remember"
+msgstr "_Reține parola"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
+msgid "Login"
+msgstr "Autentificare"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:5
+msgid "_Hide album"
+msgstr "_Ascunde album"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
-msgid "Delete these files from camera?"
-msgid_plural "Delete these %d files from camera?"
-msgstr[0] "Ștergeți acest fișier din aparatul foto?"
-msgstr[1] "Ștergeți aceste %d fișiere din aparatul foto?"
-msgstr[2] "Ștergeți aceste %d de fișiere din aparatul foto?"
+msgid "You are logged into Rajce as %s."
+msgstr "Sunteți autentificat pe Rajce ca %s."
 
-#: src/camera/ImportPage.vala:1739 src/Dialogs.vala:1328
-msgid "_Keep"
-msgstr "_Păstrează"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
+msgid "Photos will appear in:"
+msgstr "Fotografiile vor apărea în:"
 
-#: src/camera/ImportPage.vala:1758
-msgid "Removing photos/videos from camera"
-msgstr "Se șterg fotografiile/clipurile din aparatul foto"
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
+msgid "An _existing album:"
+msgstr "Un album _existent:"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
+msgid "A _new album named:"
+msgstr "Un album _nou denumit:"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:6
+msgid "Open target _album in browser"
+msgstr "Deschide _albumul țintă în navigator"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:8
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
+msgid "_Publish"
+msgstr "_Publică"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
+msgid "_Logout"
+msgstr "Înc_hidere sesiune"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Drepturi de autor 2012 BJA Electronics"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
+msgid "500 x 375 pixels"
+msgstr "500 x 375 pixeli"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
+msgid "1024 x 768 pixels"
+msgstr "1024 x 768 pixeli"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
+msgid "1280 x 853 pixels"
+msgstr "1280 x 853 pixeli"
 
-#: src/camera/ImportPage.vala:1762
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:310
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:320
 #, 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] ""
-"O fotografie/un clip nu poate fi ștearsă/șters din aparatul foto din cauza "
-"unor erori."
-msgstr[1] ""
-"%d fotografii/clipuri nu pot fi șterse din aparatul foto din cauza unor "
-"erori."
-msgstr[2] ""
-"%d de fotografii/clipuri nu pot fi șterse din aparatul foto din cauza unor "
-"erori."
+msgid "'%s' isn't a valid response to an OAuth authentication request"
+msgstr "„%s” nu este un răspuns valid pentru un request de autentificare OAuth"
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2623
-msgid "S_lideshow"
-msgstr "Pre_zentare diapozitive"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:558
+msgid ""
+"TumblrPublisher: start( ): can't start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( ): nu se poate porni; acest publisher nu poate fi "
+"repornit."
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2624
-msgid "Play a slideshow"
-msgstr "Redă o prezentare de diapozitive"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr ""
+"Introduceți numele de utilizator și parola asociate cu contul tău Tumblr."
 
-#: src/CollectionPage.vala:456
-msgid "Export Photo/Video"
-msgstr "Exportă fotografiile/clipurile"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
+msgid "Username and/or password invalid. Please try again"
+msgstr "Numele de utilizator și/sau parola sunt invalide. Încercați din nou"
 
-#: src/CollectionPage.vala:456
-msgid "Export Photos/Videos"
-msgstr "Exportă fotografii/clipuri video"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:617
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
+msgid "Invalid User Name or Password"
+msgstr "Utilizator sau parolă invalide"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:58 src/PhotoPage.vala:3196
-msgid "Export Photo"
-msgstr "Exportă fotografiile"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:636
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Nu a putut fi încărcat UI-ul: %s"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:87
-msgid "Export Photos"
-msgstr "Exportă fotografii"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:739
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Ești conectat pe Tumblr ca %s.\n"
+"\n"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Rotating"
-msgstr "Se rotește"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
+msgstr "Drepturi de autor 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Undoing Rotate"
-msgstr "Se anulează rotirea"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:25
+msgid "Visit the Yandex.Fotki web site"
+msgstr "Vizitați site-ul web Yandex.Fotki"
 
-#: src/CollectionPage.vala:570
-msgid "Flipping Horizontally"
-msgstr "Se inversează pe orizontală"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:632
+msgid "You are not currently logged into Yandex.Fotki."
+msgstr "Nu sunteți autentificat pe Yandex.Fotki."
 
-#: src/CollectionPage.vala:571
-msgid "Undoing Flip Horizontally"
-msgstr "Se anulează inversarea pe orizontală"
+#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+msgid "Shotwell Extra Publishing Services"
+msgstr "Servicii adiționale pentru publicare Shotwell"
 
-#: src/CollectionPage.vala:580
-msgid "Flipping Vertically"
-msgstr "Se inversează pe verticală"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
+msgid "Go _Back"
+msgstr "Î_napoi"
 
-#: src/CollectionPage.vala:581
-msgid "Undoing Flip Vertically"
-msgstr "Se anulează inversarea pe verticală"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
+#: ../ui/shotwell.glade.h:42
+msgid "_Login"
+msgstr "_Autentificare"
 
-#: src/searches/SearchBoolean.vala:157
-msgid "Any text"
-msgstr "Orice text"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
+msgid "Intro message replaced at runtime"
+msgstr "Mesaj de introducere înlocuit la executare"
 
-#: src/searches/SearchBoolean.vala:160
-msgid "Title"
-msgstr "Titlu"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
+msgid "_Gallery3 URL:"
+msgstr "URL _Gallery3:"
 
-#: src/searches/SearchBoolean.vala:163
-msgid "Tag"
-msgstr "Etichetă"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
+msgid "_User name:"
+msgstr "_Nume de utilizator:"
 
-#: src/searches/SearchBoolean.vala:166
-msgid "Comment"
-msgstr "Comentariu"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
+msgid "_Password:"
+msgstr "_Parolă:"
 
-#: src/searches/SearchBoolean.vala:169
-msgid "Event name"
-msgstr "Nume eveniment"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:7
+msgid "API _Key:"
+msgstr "_Cheie API:"
 
-#: src/searches/SearchBoolean.vala:172
-msgid "File name"
-msgstr "Nume fișier"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
+msgid "or"
+msgstr "sau"
 
-#: src/searches/SearchBoolean.vala:175
-msgid "Media type"
-msgstr "Tip media"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
+msgid "A _new album"
+msgstr "Un album _nou denumit"
 
-#: src/searches/SearchBoolean.vala:178
-msgid "Flag state"
-msgstr "Stare marcaj"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
+msgid "An _existing album"
+msgstr "Un album _existent"
 
-#: src/searches/SearchBoolean.vala:181
-msgid "Photo state"
-msgstr "Stare fotografie"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
+msgid "_Remove location, tag and camera-identifying data before uploading"
+msgstr ""
+"_Elimină locația, tipul camerei sau alte informații care pot fi folosite "
+"pentru identificare, înainte de încărcare"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1003
-msgid "Rating"
-msgstr "Cotare"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
+msgid "'Publishing to $url as $username' (populated in application code)"
+msgstr "„Se publică la $url ca $username” (populat în codul aplicației)"
 
-#: src/searches/SearchBoolean.vala:187
-msgid "Date"
-msgstr "Dată"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
+msgid "Scaling constraint:"
+msgstr "Limită scalare:"
 
-#: src/searches/SavedSearchDialog.vala:169
-msgid "contains"
-msgstr "conține"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
+msgid "pixels"
+msgstr "pixeli"
 
-#: src/searches/SavedSearchDialog.vala:170
-#: src/searches/SavedSearchDialog.vala:497
-msgid "is exactly"
-msgstr "este exact"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
+#: ../src/Dimensions.vala:17
+msgid "Original size"
+msgstr "Dimensiune originală"
 
-#: src/searches/SavedSearchDialog.vala:171
-msgid "starts with"
-msgstr "începe cu"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:10
+#: ../src/Dimensions.vala:20
+msgid "Width or height"
+msgstr "Lățime sau înălțime"
 
-#: src/searches/SavedSearchDialog.vala:172
-msgid "ends with"
-msgstr "se termină cu"
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
+#: ../ui/shotwell.glade.h:14
+msgid "label"
+msgstr "etichetă"
 
-#: src/searches/SavedSearchDialog.vala:173
-msgid "does not contain"
-msgstr "nu conține"
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
+msgid "Blogs:"
+msgstr "Bloguri:"
 
-#: src/searches/SavedSearchDialog.vala:174
-#: src/searches/SavedSearchDialog.vala:501
-msgid "is not set"
-msgstr "nu este stabilit"
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:1
+msgid "Photo _size:"
+msgstr "_Dimensiune fotografie:"
 
-#: src/searches/SavedSearchDialog.vala:245
-#: src/searches/SavedSearchDialog.vala:376
-#: src/searches/SavedSearchDialog.vala:441
-msgid "is"
-msgstr "este"
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
+msgid "you are logged in rajce as $name"
+msgstr "Sunteți autentificat pe Rajce ca %s"
 
-#: src/searches/SavedSearchDialog.vala:246
-msgid "is not"
-msgstr "nu este"
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
+msgid "$mediatype will appear in"
+msgstr "$mediatype va apărea în"
 
-#: src/searches/SavedSearchDialog.vala:252
-msgid "any photo"
-msgstr "orice fotografie"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
+msgid "_Albums (or write new):"
+msgstr "_Albume (sau scrieți nou):"
 
-#: src/searches/SavedSearchDialog.vala:253
-msgid "a raw photo"
-msgstr "o fotografie raw"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:2
+msgid "Access _type:"
+msgstr "_Tip acces:"
 
-#: src/searches/SavedSearchDialog.vala:254
-msgid "a video"
-msgstr "un clip video"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
+msgid "Disable _comments"
+msgstr "Dezactivează _comentarii"
 
-#: src/searches/SavedSearchDialog.vala:308
-msgid "has"
-msgstr "are"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:4
+msgid "_Forbid downloading original photo"
+msgstr "Interzice descărcarea _fotografiilor originale"
 
-#: src/searches/SavedSearchDialog.vala:309
-msgid "has no"
-msgstr "nu are"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
+msgid "Public"
+msgstr "Publică"
 
-#: src/searches/SavedSearchDialog.vala:314
-msgid "modifications"
-msgstr "modificări"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:8
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1181
+msgid "Friends"
+msgstr "Prieteni"
 
-#: src/searches/SavedSearchDialog.vala:315
-msgid "internal modifications"
-msgstr "modificări interne"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:9
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
+msgid "Private"
+msgstr "Privat"
 
-#: src/searches/SavedSearchDialog.vala:316
-msgid "external modifications"
-msgstr "modificări externe"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:59
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1127
+msgid "Shotwell Connect"
+msgstr "Shotwell Connect"
 
-#: src/searches/SavedSearchDialog.vala:370
-msgid "flagged"
-msgstr "marcate"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:63
+msgid ""
+"You are not currently logged into Facebook.\n"
+"\n"
+"If you don't yet have a Facebook account, you can create one during the "
+"login process. During login, Shotwell Connect may ask you for permission to "
+"upload photos and publish to your feed. These permissions are required for "
+"Shotwell Connect to function."
+msgstr ""
+"Acum nu sunteți autentificat pe Facebook.\n"
+"\n"
+"Dacă nu aveți un cont Facebook, puteți crea unul în timpul procesului de "
+"autentificare. La conectare, Shotwell Connect poate cere permisiunea de a "
+"publica fotografiile. Permisiunea este necesară pentru funcționarea Shotwell "
+"Connect."
 
-#: src/searches/SavedSearchDialog.vala:371
-msgid "not flagged"
-msgstr "fără marcaje"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:65
+msgid ""
+"You have already logged in and out of Facebook during this Shotwell "
+"session.\n"
+"To continue publishing to Facebook, quit and restart Shotwell, then try "
+"publishing again."
+msgstr ""
+"V-ați autentificat și ați ieșit din Facebook deja pe parcursul acestei "
+"sesiuni Shotwell.\n"
+"Pentru a continua publicarea pe Facebook, ieșiți din Shotwell și reporniți "
+"programul, apoi încercați din nou să publicați."
 
-#: src/searches/SavedSearchDialog.vala:434
-msgid "and higher"
-msgstr "și mai mult"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:86
+msgid "Standard (720 pixels)"
+msgstr "Standard (720 pixeli)"
 
-#: src/searches/SavedSearchDialog.vala:435
-msgid "only"
-msgstr "doar"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:89
+msgid "Large (2048 pixels)"
+msgstr "Mare (2048 pixeli)"
 
-#: src/searches/SavedSearchDialog.vala:436
-msgid "and lower"
-msgstr "și mai mic"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:254
+msgid "Testing connection to Facebook..."
+msgstr "Se testează conexiunea la Facebook..."
 
-#: src/searches/SavedSearchDialog.vala:498
-msgid "is after"
-msgstr "este după"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:347
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
+msgid "Creating album..."
+msgstr "Se creează album..."
 
-#: src/searches/SavedSearchDialog.vala:499
-msgid "is before"
-msgstr "este înainte"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:374
+msgid ""
+"A file required for publishing is unavailable. Publishing to Facebook can't "
+"continue."
+msgstr ""
+"Un fișier necesar pentru publicare este indisponibil. Publicare către "
+"Facebook nu poate continua."
 
-#: src/searches/SavedSearchDialog.vala:500
-msgid "is between"
-msgstr "este între"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1019
+#, c-format
+msgid ""
+"You are logged into Facebook as %s.\n"
+"\n"
+msgstr ""
+"Sunteți autentificat pe Flickr ca %s.\n"
+"\n"
 
-#: src/searches/SavedSearchDialog.vala:513
-msgid "and"
-msgstr "și"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1020
+msgid "Where would you like to publish the selected photos?"
+msgstr "Unde doriți să publicați fotografiile selectate?"
 
-#: src/searches/SavedSearchDialog.vala:720
-msgid "any"
-msgstr "orice"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1021
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
+msgid "Upload _size:"
+msgstr "Dimen_siune încărcare:"
 
-#: src/searches/SavedSearchDialog.vala:721
-msgid "all"
-msgstr "tot"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
+msgid "Just me"
+msgstr "Numai pentru mine"
 
-#: src/searches/SavedSearchDialog.vala:722
-msgid "none"
-msgstr "nimic"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+msgid "Everyone"
+msgstr "Toți"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Căutări salvate"
+#: ../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 ""
+"Acum nu sunteți autentificat pe Flickr.\n"
+"\n"
+"Efectuați clic pe Flickr pentru a vă autentifica în navigatorul de "
+"Internet.  Va trebui să autorizați Shotwell pentru a se conecta la contul "
+"dumneavoastră Flickr."
 
-#: src/searches/Branch.vala:77 src/library/LibraryWindow.vala:346
-#: src/sidebar/Tree.vala:195
-msgid "Ne_w Saved Search..."
-msgstr "Căutare salvată nouă"
+#: ../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 ""
+"V-ați autentificat și ați ieșit din Flickr deja pe parcursul acestei sesiuni "
+"Shotwell.\n"
+"Pentru a continua publicarea la Flickr, ieșiți din Shotwell și reporniți "
+"programul, apoi reîncercați să publicați."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:375
+msgid "Preparing for login..."
+msgstr "Pregătire pentru autentificare..."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:444
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:595
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can't "
+"continue."
+msgstr ""
+"Un fișier necesar pentru publicare este indisponibil. Publicare către Flickr "
+"nu poate continua."
 
-#: src/main.vala:54
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:457
+msgid "Verifying authorization..."
+msgstr "Se verifică autorizarea..."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1153
 #, 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."
+"You are logged into Flickr as %s.\n"
+"\n"
 msgstr ""
-"Colecția dumneavoastră de fotografii nu este compatibilă cu această versiune "
-"de Shotwell. Se pare că a fost creată cu Shotwell %s (schema %d). Versiunea "
-"curentă este %s (schema %d). Vă rugăm să utilizați ultima veriune de "
-"Shotwell."
+"Sunteți autentificat pe Flickr ca %s.\n"
+"\n"
 
-#: src/main.vala:59
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
 #, 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"
+"Your free Flickr account limits how much data you can upload per month.\n"
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"Contul gratuit Flickr limitează cantitatea de date pe care o puteți "
+"încărca.\n"
+"Pentru această lună mai aveți la dispoziție %d MO."
+msgstr[1] ""
+"Contul gratuit Flickr limitează cantitatea de date pe care o puteți "
+"încărca.\n"
+"Pentru această lună mai aveți la dispoziție %d MO."
+msgstr[2] ""
+"Contul gratuit Flickr limitează cantitatea de date pe care o puteți "
+"încărca.\n"
+"Pentru această lună mai aveți la dispoziție %d de MO."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
+msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr ""
-"Shotwell nu poate actualiza colecția de fotografii, de la versiunea %s "
-"(schema %d) la %s (schema %d). Pentru mai multe informații, vă rugăm să "
-"consultați Shotwell Wiki la %s"
+"Contul Flickr Pro vă permite încărcarea a cât de multe fotografii doriți."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
+msgid "Photos _visible to:"
+msgstr "Fotografii _vizibile pentru:"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+msgid "Videos _visible to:"
+msgstr "Videouri _vizibile pentru:"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
+msgid "Photos and videos _visible to:"
+msgstr "Fotografiile și videourile _vizibile pentru:"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+msgid "Friends & family only"
+msgstr "Numai pentru familie și prieteni"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
+msgid "Family only"
+msgstr "Doar familia"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
+msgid "Friends only"
+msgstr "Doar prietenii"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
+msgid "2048 x 1536 pixels"
+msgstr "2048 x 1536 pixeli"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
+msgid "4096 x 3072 pixels"
+msgstr "4096 x 3072 pixeli"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:58
+msgid ""
+"You are not currently logged into Picasa Web Albums.\n"
+"\n"
+"Click Login to log into Picasa Web Albums in your Web browser. You will have "
+"to authorize Shotwell Connect to link to your Picasa Web Albums account."
+msgstr ""
+"Momentan nu ești autentificat în Picasa Web Albums.\n"
+"\n"
+"Apasă Login pentru a te autentifica în Picasa Web Albums în browserul web. "
+"Va trebui să autorizezi Shotwell Connect pentru a se conecta la contul tău "
+"Picasa Web Albums."
 
-#: src/main.vala:65
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:361
+msgid ""
+"A file required for publishing is unavailable. Publishing to Picasa can't "
+"continue."
+msgstr ""
+"Un fișier necesar pentru publicare este indisponibil. Publicare către Picasa "
+"nu poate continua."
+
+#. populate any widgets whose contents are programmatically-generated.
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:659
+#, c-format
+msgid "You are logged into Picasa Web Albums as %s."
+msgstr "Sunteți autentificat pe Picasa Web Album ca %s."
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:665
+msgid "Videos will appear in:"
+msgstr "Videourile vor apărea în:"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
+msgid "Small (640 x 480 pixels)"
+msgstr "Mică (640 x 480 pixeli)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:747
+msgid "Medium (1024 x 768 pixels)"
+msgstr "Medie (1024 x 768 pixeli)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:748
+msgid "Recommended (1600 x 1200 pixels)"
+msgstr "Recomandată (1600 x 1200 pixeli)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:749
+msgid "Google+ (2048 x 1536 pixels)"
+msgstr "Google+ (2048 x 1536 pixels)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:750
+#: ../src/editing_tools/EditingTools.vala:756
+msgid "Original Size"
+msgstr "Dimensiune originală"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
 #, c-format
+msgid "Creating album %s..."
+msgstr "Se creează albumul %s..."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:917
+msgid "An error message occurred when publishing to Piwigo. Please try again."
+msgstr ""
+"A fost întâmpinată o problemă încercând publicarea către Piwigo. Încercați "
+"din nou."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:998
 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."
+"Enter the URL of your Piwigo photo library as well as the username and "
+"password associated with your Piwigo account for that library."
 msgstr ""
-"Colecția de fotografii nu este compatibilă cu această versiune Shotwell. Se "
-"pare că a fost creată cu Shotwell %s (schema %d). Versiunea curentă este %s "
-"(schema %d). Actualizați colecția prin ștergerea %s și reluați importul "
-"fotografiilor."
+"Introduceți URL-ul librăriei foto Piwigo, precum și numele de utilizator și "
+"parola asociate cu contul Piwigo pentru această librărie."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:999
+msgid ""
+"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
+"entered"
+msgstr ""
+"Shotwell nu poate contacta librăria ta foto Piwigo. Te rog verifică URL-ul "
+"pe care l-ai introdus"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+msgid "Invalid URL"
+msgstr "URL invalid"
 
-#: src/main.vala:71
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+msgid "Admins, Family, Friends, Contacts"
+msgstr "Admini, Familie, Prieteni, Contacte"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+msgid "Admins, Family, Friends"
+msgstr "Admini, Familie, Prieteni"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+msgid "Admins, Family"
+msgstr "Admini, Familie"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+msgid "Admins"
+msgstr "Admini"
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:57
+msgid ""
+"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 ""
+"Nu sunteți autentificat pe YouTube.\n"
+"\n"
+"Trebuie să aveți un cont Google configurat deja pentru a fi utilizat cu "
+"YouTube pentru a continua. Puteți configura conturile utilizând navigatorul "
+"de Internet, autentificându-vă apoi pe YouTube."
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
+msgid ""
+"A file required for publishing is unavailable. Publishing to Youtube can't "
+"continue."
+msgstr ""
+"Un fișier necesar pentru publicare este indisponibil. Publicare către "
+"Youtube nu poate continua."
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:461
 #, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
-msgstr "Eroare necunoscută la verificarea bazei de date Shotwell: %s"
+msgid "You are logged into YouTube as %s."
+msgstr "Sunteți autentificat pe YouTube ca %s."
 
-#: src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "Se încarcă Shotwell"
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:463
+#, c-format
+msgid "Videos will appear in '%s'"
+msgstr "Videourile vor apărea în „%s”"
 
-#: src/main.vala:294
-msgid "Path to Shotwell's private data"
-msgstr "Calea către informațiile private Shotwell"
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:495
+msgid "Public listed"
+msgstr "Listare publică"
 
-#: src/main.vala:294
-msgid "DIRECTORY"
-msgstr "DIRECTOR"
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
+msgid "Public unlisted"
+msgstr "Delistare publică"
 
-#: src/main.vala:298
-msgid "Do not monitor library directory at runtime for changes"
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
+msgid "Publish to an e_xisting album:"
+msgstr "Publică într-un album e_xistent:"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:2
+msgid "Create a _new album named:"
+msgstr "Creează un album _nou numit:"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
+msgid "Videos and new photo albums _visible to:"
+msgstr "Albumele noi cu fotografii și videouri _vizibile pentru:"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:5
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:8
+msgid ""
+"_Remove location, camera, and other identifying information before uploading"
 msgstr ""
-"Nu monitoriza directorul librăriei la inițializare pentru a detecta "
-"modificările"
+"_Elimină locația, tipul camerei sau alte informații care pot fi folosite "
+"pentru identificare, înainte de încărcare"
 
-#: src/main.vala:302
-msgid "Don't display startup progress meter"
-msgstr "Nu afișa indicatorul de progres pentru inițializare"
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
+msgid ""
+"Enter the confirmation number which appears after you log into Flickr in "
+"your Web browser."
+msgstr ""
+"Introduceți numărul de confirmare care apare imediat după autentificarea pe "
+"Flicker în navigatorul de Internet."
 
-#: src/main.vala:306
-msgid "Show the application's version"
-msgstr "Arată versiunea aplicației"
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
+msgid "Authorization _Number:"
+msgstr "_Număr autorizare:"
 
-#: src/main.vala:338
-msgid "[FILE]"
-msgstr "[FIȘIER]"
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:3
+#: ../src/Dialogs.vala:131
+msgid "Con_tinue"
+msgstr "Con_tinuă"
+
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
+msgid "L_ist album in public gallery"
+msgstr "L_istează albumele în galeria publică"
+
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
+msgid "Photo _size preset:"
+msgstr "Dimen_siune prestabilită:"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
+msgid "_URL of your Piwigo photo library"
+msgstr "_URL-ul colecției dumneavoastră Piwigo"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
+msgid "User _name"
+msgstr "_Nume utilizator"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
+msgid "_Remember Password"
+msgstr "_Reține parola"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
+msgid "An _existing category:"
+msgstr "O categorie _existentă:"
 
-#: src/main.vala:342
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:4
+msgid "Photos will be _visible by:"
+msgstr "Fotografiilr vor fi _vizibile pentru:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:5
+msgid "Photo size:"
+msgstr "Dimensiune fotografie:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:6
+msgid "within category:"
+msgstr "în interiorul categoriei:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
+msgid "Album comment:"
+msgstr "Comentariu album:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
+msgid "_If a title is set and comment unset, use title as comment"
+msgstr ""
+"_Dacă un titlu este stabilit și comentariul nu, folosește titlul drept "
+"comentariu"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:10
+msgid "_Do no upload tags"
+msgstr "_Nu încărca etichete"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
+msgid "Logout"
+msgstr "Deconectare"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
+#: ../src/Resources.vala:270
+msgid "Publish"
+msgstr "Publică"
+
+#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
+msgid "Core Publishing Services"
+msgstr "Servicii de bază pentru publicare"
+
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
+msgid "Video privacy _setting:"
+msgstr "Configurări acce_s pentru videouri:"
+
+#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+msgid "Blinds"
+msgstr "Jaluzele"
+
+#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+msgid "Chess"
+msgstr "Șah"
+
+#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+msgid "Circle"
+msgstr "Cerc"
+
+#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+msgid "Circles"
+msgstr "Cercuri"
+
+#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+msgid "Clock"
+msgstr "Ceas"
+
+#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+msgid "Crumble"
+msgstr "Fărâmițare"
+
+#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+msgid "Fade"
+msgstr "Atenuare"
+
+#: ../plugins/shotwell-transitions/SlideEffect.vala:20
+msgid "Slide"
+msgstr "Diapozitiv"
+
+#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
+msgid "Squares"
+msgstr "Pătrate"
+
+#: ../plugins/shotwell-transitions/StripesEffect.vala:20
+msgid "Stripes"
+msgstr "Dungi"
+
+#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
+msgid "Core Slideshow Transitions"
+msgstr "Tranziție principală pentru prezentare de diapozitive"
+
+#: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
+msgstr ""
+"Drepturi de autor 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
+
+#: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
 #, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "Rulați '%s --help' pentru a consulta lista completă a comenzilor.\n"
+msgid "Unable to create cache directory %s: %s"
+msgstr "Nu se poate crea directorul cache %s: %s"
 
-#: src/Properties.vala:84
-msgid "Today"
-msgstr "Azi"
+#: ../src/AppDirs.vala:58 ../src/AppDirs.vala:88
+#, c-format
+msgid "Unable to create data directory %s: %s"
+msgstr "Nu se poate crea dosarul de date %s: %s"
 
-#: src/Properties.vala:86
-msgid "Yesterday"
-msgstr "Ieri"
+#. If XDG yarfed, use ~/Pictures
+#: ../src/AppDirs.vala:152
+msgid "Pictures"
+msgstr "Fotografii"
 
-#: src/Properties.vala:340 src/Dialogs.vala:1273
-msgid "Title:"
-msgstr "Nume:"
+#: ../src/AppDirs.vala:190
+#, c-format
+msgid "Unable to create temporary directory %s: %s"
+msgstr "Nu se poate crea directorul temporar %s: %s"
 
-#: src/Properties.vala:343
-msgid "Items:"
-msgstr "Elemente:"
+#: ../src/AppDirs.vala:207 ../src/AppDirs.vala:223
+#, c-format
+msgid "Unable to create data subdirectory %s: %s"
+msgstr "Nu se poate crea subdosarul de date %s: %s"
+
+#. restore pin state
+#: ../src/AppWindow.vala:52
+msgid "Pin Toolbar"
+msgstr "Fixează bară de unelte"
+
+#: ../src/AppWindow.vala:53
+msgid "Pin the toolbar open"
+msgstr "Fixează bara de unelte deschisă"
+
+#: ../src/AppWindow.vala:57 ../src/AppWindow.vala:135
+msgid "Leave fullscreen"
+msgstr "Ieșire din modul pe tot ecranul"
+
+#: ../src/AppWindow.vala:134
+msgid "Leave _Fullscreen"
+msgstr "_Fereastră normală"
+
+#: ../src/AppWindow.vala:508
+msgid "_Quit"
+msgstr "_Ieșire"
+
+#: ../src/AppWindow.vala:513
+msgid "_About"
+msgstr "_Despre"
+
+#: ../src/AppWindow.vala:518
+msgid "Fulls_creen"
+msgstr "Pe tot e_cranul"
+
+#: ../src/AppWindow.vala:523
+msgid "_Contents"
+msgstr "_Cuprins"
 
-#: src/Properties.vala:346
+#: ../src/AppWindow.vala:528
+msgid "_Frequently Asked Questions"
+msgstr "Întrebări _frecvente"
+
+#: ../src/AppWindow.vala:533
+msgid "_Report a Problem..."
+msgstr "_Raportează o Problemă..."
+
+#: ../src/AppWindow.vala:632 ../src/AppWindow.vala:653
+#: ../src/AppWindow.vala:670 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
+#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441
+#: ../src/data_imports/DataImportsUI.vala:374
+#: ../src/publishing/PublishingUI.vala:475
+msgid "_Cancel"
+msgstr "Anulea_ză"
+
+#: ../src/AppWindow.vala:680
 #, c-format
-msgid "%d Event"
-msgid_plural "%d Events"
-msgstr[0] "%d eveniment"
-msgstr[1] "%d evenimente"
-msgstr[2] "%d de evenimente"
+msgid ""
+"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
+"continue.\n"
+"\n"
+"%s"
+msgstr ""
+"În timpul accesării colecției Shotwell a apărut o eroare majoră.  Shotwell "
+"nu poate continua.\n"
+"\n"
+"%s"
+
+#: ../src/AppWindow.vala:700
+msgid "Visit the Yorba web site"
+msgstr "Vizitați site-ul web Yorba"
 
-#: src/Properties.vala:353 src/events/EventDirectoryItem.vala:87
+#: ../src/AppWindow.vala:712
 #, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] "%d fotografie"
-msgstr[1] "%d fotografii"
-msgstr[2] "%d de fotografii"
+msgid "Unable to display help: %s"
+msgstr "Nu se poate afișa pagina de ajutor: %s"
 
-#: src/Properties.vala:355 src/events/EventDirectoryItem.vala:85
+#: ../src/AppWindow.vala:720
 #, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] "%d clip"
-msgstr[1] "%d clipuri"
-msgstr[2] "%d de clipuri"
+msgid "Unable to navigate to bug database: %s"
+msgstr "Nu se poate naviga la baza de date cu bug-uri: %s"
 
-#: src/Properties.vala:377
-msgid "Date:"
-msgstr "Data:"
+#: ../src/AppWindow.vala:728
+#, c-format
+msgid "Unable to display FAQ: %s"
+msgstr "Nu se pot afișa întrebările frecvente FAQ: %s"
 
-#: src/Properties.vala:381
-msgid "Time:"
-msgstr "Oră:"
+#: ../src/BatchImport.vala:26
+msgid "Success"
+msgstr "Succes"
 
-#: src/Properties.vala:384 src/Properties.vala:389
-msgid "From:"
-msgstr "De la:"
+#: ../src/BatchImport.vala:29
+msgid "File error"
+msgstr "Eroare fișier"
 
-#: src/Properties.vala:385 src/Properties.vala:390
-msgid "To:"
-msgstr "În:"
+#: ../src/BatchImport.vala:32
+msgid "Unable to decode file"
+msgstr "Fișierul nu poate fi decodat"
 
-#: src/Properties.vala:395 src/editing_tools/EditingTools.vala:1850
-msgid "Size:"
-msgstr "Dimensiune:"
+#: ../src/BatchImport.vala:35
+msgid "Database error"
+msgstr "Eroare bază de date"
 
-#: src/Properties.vala:404
-msgid "Duration:"
-msgstr "Durată:"
+#: ../src/BatchImport.vala:38
+msgid "User aborted import"
+msgstr "Utilizatorul a abandonat importul"
+
+#: ../src/BatchImport.vala:41
+msgid "Not a file"
+msgstr "Nu este fișier"
+
+#: ../src/BatchImport.vala:44
+msgid "File already exists in database"
+msgstr "Fișierul există deja în baza de date"
+
+#: ../src/BatchImport.vala:47
+msgid "Unsupported file format"
+msgstr "Format fișier nerecunoscut"
+
+#: ../src/BatchImport.vala:50
+msgid "Not an image file"
+msgstr "Nu este un fișier de imagine"
+
+#: ../src/BatchImport.vala:53
+msgid "Disk failure"
+msgstr "Defecțiune disc"
+
+#: ../src/BatchImport.vala:56
+msgid "Disk full"
+msgstr "Disc plin"
+
+#: ../src/BatchImport.vala:59
+msgid "Camera error"
+msgstr "Eroare aparat foto"
+
+#: ../src/BatchImport.vala:62
+msgid "File write error"
+msgstr "Eroare la scrierea fișierului"
 
-#: src/Properties.vala:404
+#: ../src/BatchImport.vala:65
+msgid "Corrupt image file"
+msgstr "Fișier de imagine corupt"
+
+#: ../src/BatchImport.vala:68
 #, c-format
-msgid "%.1f seconds"
-msgstr "%.1f secunde"
+msgid "Imported failed (%d)"
+msgstr "Importul a eșuat (%d)"
 
-#: src/Properties.vala:408
-msgid "Developer:"
-msgstr "Programator:"
+#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2634
+msgid "S_lideshow"
+msgstr "Pre_zentare de diapozitive"
 
-#: src/Properties.vala:436 src/Properties.vala:440 src/Properties.vala:447
-#: src/editing_tools/EditingTools.vala:2218
-msgid "Exposure:"
-msgstr "Expunere:"
+#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2635
+msgid "Play a slideshow"
+msgstr "Redă o prezentare de diapozitive"
 
-#: src/Properties.vala:585
-msgid "Location:"
-msgstr "Loc:"
+#: ../src/CollectionPage.vala:456
+msgid "Export Photo/Video"
+msgstr "Exportă fotografia/videoul"
 
-#: src/Properties.vala:588
-msgid "File size:"
-msgstr "Dimensiune fișier:"
+#: ../src/CollectionPage.vala:456
+msgid "Export Photos/Videos"
+msgstr "Exportă fotografiile/videourile"
 
-#: src/Properties.vala:592
-msgid "Current Development:"
-msgstr "Dezvoltare curentă:"
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
+#: ../src/PhotoPage.vala:3208
+msgid "Export Photo"
+msgstr "Exportă fotografiile"
 
-#: src/Properties.vala:594
-msgid "Original dimensions:"
-msgstr "Dimensiune originală:"
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:87
+msgid "Export Photos"
+msgstr "Exportă fotografii"
 
-#: src/Properties.vala:597
-msgid "Camera make:"
-msgstr "Marcă aparat foto:"
+#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+msgid "Rotating"
+msgstr "Se rotește"
 
-#: src/Properties.vala:600
-msgid "Camera model:"
-msgstr "Model aparat foto:"
+#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+msgid "Undoing Rotate"
+msgstr "Se anulează rotirea"
 
-#: src/Properties.vala:603
-msgid "Flash:"
-msgstr "Bliț:"
+#: ../src/CollectionPage.vala:570
+msgid "Flipping Horizontally"
+msgstr "Se inversează pe orizontală"
 
-#: src/Properties.vala:605
-msgid "Focal length:"
-msgstr "Distanța focală:"
+#: ../src/CollectionPage.vala:571
+msgid "Undoing Flip Horizontally"
+msgstr "Se anulează inversarea pe orizontală"
 
-#: src/Properties.vala:608
-msgid "Exposure date:"
-msgstr "Data expunerii:"
+#: ../src/CollectionPage.vala:580
+msgid "Flipping Vertically"
+msgstr "Se inversează pe verticală"
 
-#: src/Properties.vala:611
-msgid "Exposure time:"
-msgstr "Timp de expunere:"
+#: ../src/CollectionPage.vala:581
+msgid "Undoing Flip Vertically"
+msgstr "Se anulează inversarea pe verticală"
 
-#: src/Properties.vala:614
-msgid "Exposure bias:"
-msgstr "Expunere:"
+#: ../src/Commands.vala:733
+msgid "Reverting"
+msgstr "Se revine"
 
-#: src/Properties.vala:616
-msgid "GPS latitude:"
-msgstr "Latitudine GPS:"
+#: ../src/Commands.vala:733
+msgid "Undoing Revert"
+msgstr "Se anulează revenirea"
 
-#: src/Properties.vala:619
-msgid "GPS longitude:"
-msgstr "Longitudine GPS:"
+#: ../src/Commands.vala:777
+msgid "Enhancing"
+msgstr "Se îmbunătățește"
 
-#: src/Properties.vala:622
-msgid "Artist:"
-msgstr "Autor:"
+#: ../src/Commands.vala:777
+msgid "Undoing Enhance"
+msgstr "Se anulează îmbunătățirea"
 
-#: src/Properties.vala:624
-msgid "Copyright:"
-msgstr "Copyright:"
+#: ../src/Commands.vala:853
+msgid "Applying Color Transformations"
+msgstr "Se aplică transformările de culoare"
 
-#: src/Properties.vala:626
-msgid "Software:"
-msgstr "Software:"
+#: ../src/Commands.vala:853
+msgid "Undoing Color Transformations"
+msgstr "Se anulează transformările de culoare"
 
-#: src/Properties.vala:630 src/Dialogs.vala:1288
-msgid "Comment:"
-msgstr "Comentariu:"
+#: ../src/Commands.vala:1003
+msgid "Creating New Event"
+msgstr "Se creează un eveniment nou"
 
-#: src/Properties.vala:639
-msgid "Extended Information"
-msgstr "Informații extinse"
+#: ../src/Commands.vala:1004
+msgid "Removing Event"
+msgstr "Se șterge evenimentul"
+
+#: ../src/Commands.vala:1013
+msgid "Moving Photos to New Event"
+msgstr "Se mută fotografii către un eveniment nou"
+
+#: ../src/Commands.vala:1014
+msgid "Setting Photos to Previous Event"
+msgstr "Se stabilesc fotografii la evenimentul anterior"
+
+#: ../src/Commands.vala:1071
+msgid "Merging"
+msgstr "Se unește"
+
+#: ../src/Commands.vala:1072
+msgid "Unmerging"
+msgstr "Se desparte"
+
+#: ../src/Commands.vala:1081
+msgid "Duplicating photos"
+msgstr "Se duplică fotografii"
+
+#: ../src/Commands.vala:1081
+msgid "Removing duplicated photos"
+msgstr "Se șterg fotografii duplicate"
+
+#: ../src/Commands.vala:1104
+#, 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] "Nu se poate duplica o fotografie din cauza unei erori în fișier"
+msgstr[1] "Nu se pot duplica %d fotografii din cauza unor erori în fișier"
+msgstr[2] "Nu se pot duplica %d de fotografii din cauza unor erori în fișier"
+
+#: ../src/Commands.vala:1191
+msgid "Restoring previous rating"
+msgstr "Se restaurează aprecierea anterioară"
+
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+msgid "Increasing ratings"
+msgstr "Se mărește aprecierea"
+
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+msgid "Decreasing ratings"
+msgstr "Se micșorează aprecierea"
+
+#: ../src/Commands.vala:1252
+msgid "Setting RAW developer"
+msgstr "Configurare programator RAW"
+
+#: ../src/Commands.vala:1252
+msgid "Restoring previous RAW developer"
+msgstr "Restaurare programator anterior RAW"
+
+#: ../src/Commands.vala:1253
+msgid "Set Developer"
+msgstr "Programator set"
+
+#: ../src/Commands.vala:1343
+msgid "Original photo could not be adjusted."
+msgstr "Fotografia originală nu poate fi modificată."
+
+#: ../src/Commands.vala:1364
+msgid "Adjusting Date and Time"
+msgstr "Se modifică ora și data"
+
+#: ../src/Commands.vala:1364
+msgid "Undoing Date and Time Adjustment"
+msgstr "Se anulează modificarea orei și a datei"
+
+#: ../src/Commands.vala:1395
+msgid "One original photo could not be adjusted."
+msgid_plural "The following original photos could not be adjusted."
+msgstr[0] "O fotografie originală nu poate fi modificată."
+msgstr[1] "Următoarele fotografii originale nu pot fi modificate."
+msgstr[2] "Următoarele fotografii originale nu pot fi modificate."
+
+#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
+msgid "Time Adjustment Error"
+msgstr "Eroare la modificarea orei"
+
+#: ../src/Commands.vala:1419
+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] "Nu se poate modifica ora pentru următorul fișier imagine."
+msgstr[1] "Nu se poate modifica ora pentru următoarele fișiere imagine."
+msgstr[2] "Nu se poate modifica ora pentru următoarele fișiere imagine."
+
+#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
+msgid "Create Tag"
+msgstr "Creează etichetă"
+
+#: ../src/Commands.vala:1691
+#, c-format
+msgid "Move Tag \"%s\""
+msgstr "Mută eticheta „%s”"
+
+#: ../src/Commands.vala:2343
+msgid "Move Photos to Trash"
+msgstr "Mută fotografiile în coșul de gunoi"
+
+#: ../src/Commands.vala:2343
+msgid "Restore Photos from Trash"
+msgstr "Restaurează fotografiile din coșul de gunoi"
+
+#: ../src/Commands.vala:2344
+msgid "Move the photos to the Shotwell trash"
+msgstr "Mută fotografiile în coșul de gunoi Shotwell"
+
+#: ../src/Commands.vala:2344
+msgid "Restore the photos back to the Shotwell library"
+msgstr "Restaurează fotografiile în colecția Shotwell"
+
+#: ../src/Commands.vala:2363
+msgid "Moving Photos to Trash"
+msgstr "Se mută fotografiile la coșul de gunoi"
+
+#: ../src/Commands.vala:2363
+msgid "Restoring Photos From Trash"
+msgstr "Se restaurează fotografiile din coșul de gunoi"
+
+#: ../src/Commands.vala:2449
+msgid "Flag selected photos"
+msgstr "Marchează fotografiile selectate"
+
+#: ../src/Commands.vala:2450
+msgid "Unflag selected photos"
+msgstr "Demarchează fotografiile selectate"
+
+#: ../src/Commands.vala:2451
+msgid "Flagging selected photos"
+msgstr "Marchează fotografiile selectate"
+
+#: ../src/Commands.vala:2452
+msgid "Unflagging selected photos"
+msgstr "Demarchează fotografiile selectate"
+
+#: ../src/Commands.vala:2459
+msgid "Flag"
+msgstr "Marcare"
+
+#: ../src/Commands.vala:2459
+msgid "Unflag"
+msgstr "Demarcare"
+
+#: ../src/DesktopIntegration.vala:121
+#, c-format
+msgid "Unable to launch Nautilus Send-To: %s"
+msgstr "Nu se poate lansa Nautilus Send-To: %s"
+
+#: ../src/DesktopIntegration.vala:129
+msgid "Send To"
+msgstr "Trimite la"
+
+#: ../src/DesktopIntegration.vala:174
+#, c-format
+msgid "Unable to export background to %s: %s"
+msgstr "Fundalul desktopului nu poate fi exportat către %s: %s"
 
-#: src/Dialogs.vala:16
+#: ../src/DesktopIntegration.vala:311
+#, c-format
+msgid "Unable to prepare desktop slideshow: %s"
+msgstr "Nu se poate pregăti prezentarea de diapozitive: %s"
+
+#: ../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] ""
-"Această acțiune va șterge eticheta \"%s\" din fotografie. Continuați?"
+"Această acțiune va șterge eticheta „%s” din fotografie.  Continuați?"
 msgstr[1] ""
-"Această acțiune va șterge eticheta \"%s\" din %d fotografii. Continuați?"
+"Această acțiune va șterge eticheta „%s” din %d fotografii.  Continuați?"
 msgstr[2] ""
-"Această acțiune va șterge eticheta \"%s\" din %d de fotografii. Continuați?"
-
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1361
-#: src/Dialogs.vala:1384 src/data_imports/DataImportsUI.vala:399
-#: src/AppWindow.vala:615 src/AppWindow.vala:636 src/AppWindow.vala:653
-#: src/publishing/PublishingUI.vala:498
-msgid "_Cancel"
-msgstr "Anulează"
+"Această acțiune va șterge eticheta „%s” din %d de fotografii.  Continuați?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1329
-#: src/Resources.vala:330 src/Resources.vala:378 src/Resources.vala:643
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
+#: ../src/Resources.vala:336 ../src/Resources.vala:384
+#: ../src/Resources.vala:649
 msgid "_Delete"
 msgstr "Ș_terge"
 
-#: src/Dialogs.vala:25
+#: ../src/Dialogs.vala:25
 #, c-format
 msgid "This will remove the saved search \"%s\".  Continue?"
-msgstr "Căutarea salvată \"%s\" va fi ștearsă.  Continuați?"
+msgstr "Căutarea salvată „%s” va fi ștearsă.  Continuați?"
 
-#: src/Dialogs.vala:35
-#, c-format
+#: ../src/Dialogs.vala:35
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
 "Shotwell"
@@ -690,15 +1503,20 @@ msgstr[2] ""
 "Schimbarea programatorilor va anula toate modificările pe care le-ai făcut "
 "acestor fotografii în Shotwell"
 
-#: src/Dialogs.vala:39
+#: ../src/Dialogs.vala:39
 msgid "_Switch Developer"
 msgstr "_Schimbă programatorul"
 
-#: src/Dialogs.vala:58
+#: ../src/Dialogs.vala:58
 msgid "Export Video"
-msgstr "Exportă clipul"
+msgstr "Exportă videoul"
 
-#: src/Dialogs.vala:115
+#. Ticket #3023
+#. Attempt to replace the system error with something friendlier
+#. if we can't copy an image over for editing in an external tool.
+#. Did we fail because we can't write to this directory?
+#. Yes - display an alternate error message here.
+#: ../src/Dialogs.vala:115
 #, c-format
 msgid ""
 "Shotwell couldn't create a file for editing this photo because you do not "
@@ -707,7 +1525,7 @@ msgstr ""
 "Shotwell nu poate crea un fișier pentru editarea acestei fotografii deoarece "
 "nu aveți drepturi de scriere pe %s."
 
-#: src/Dialogs.vala:124
+#: ../src/Dialogs.vala:124
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -715,7 +1533,7 @@ msgstr ""
 "Fotografia următoare nu poate fi exportată din cauza unei erori în fișier.\n"
 "\n"
 
-#: src/Dialogs.vala:130
+#: ../src/Dialogs.vala:130
 msgid ""
 "\n"
 "\n"
@@ -725,64 +1543,65 @@ msgstr ""
 "\n"
 "Doriți continuarea exportării?"
 
-#: src/Dialogs.vala:131
-msgid "Con_tinue"
-msgstr "Con_tinuă"
-
-#: src/Dialogs.vala:147
+#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
+#. aren't formats so much as they are operating modes that determine specific formats.
+#. Hereafter we'll refer to these as "special formats."
+#: ../src/Dialogs.vala:147
 msgid "Unmodified"
 msgstr "Nemodificate"
 
-#: src/Dialogs.vala:148
+#: ../src/Dialogs.vala:148
 msgid "Current"
 msgstr "Actual"
 
-#: src/Dialogs.vala:212
+#. layout controls
+#: ../src/Dialogs.vala:213
 msgid "_Format:"
 msgstr "_Format:"
 
-#: src/Dialogs.vala:215
+#: ../src/Dialogs.vala:216
 msgid "_Quality:"
 msgstr "_Calitate:"
 
-#: src/Dialogs.vala:218
+#: ../src/Dialogs.vala:219
 msgid "_Scaling constraint:"
 msgstr "Limită _scalare:"
 
-#: src/Dialogs.vala:221
-msgid " _pixels"
-msgstr "_pixeli"
+#: ../src/Dialogs.vala:222
+#| msgid " _pixels"
+msgid "_Pixels:"
+msgstr "_Pixeli:"
 
-#: src/Dialogs.vala:229
+#: ../src/Dialogs.vala:225
 msgid "Export metadata"
 msgstr "Export metadate"
 
-#: src/Dialogs.vala:465
+#: ../src/Dialogs.vala:459
 msgid "Save Details..."
 msgstr "Salvează detaliile..."
 
-#: src/Dialogs.vala:466
+#: ../src/Dialogs.vala:460
 msgid "Save Details"
 msgstr "Salvează detaliile"
 
-#: src/Dialogs.vala:481
+#: ../src/Dialogs.vala:475
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(și %d în plus)\n"
 
-#: src/Dialogs.vala:534
+#: ../src/Dialogs.vala:528
 msgid "Import Results Report"
 msgstr "Importează raportul cu rezultate"
 
-#: src/Dialogs.vala:538
+#: ../src/Dialogs.vala:532
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "S-a încercat importul a %d fișier."
 msgstr[1] "S-a încercat importul a %d fișiere."
-msgstr[2] "S-a încercat importul a %d fișiere."
+msgstr[2] "S-a încercat importul a %d de fișiere."
 
-#: src/Dialogs.vala:541
+#: ../src/Dialogs.vala:535
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -790,47 +1609,62 @@ msgstr[0] "Din acestea, %d fișier a fost importat cu succes."
 msgstr[1] "Din acestea, %d fișiere au fost importate cu succes."
 msgstr[2] "Din acestea, %d fișiere au fost importate cu succes."
 
-#: src/Dialogs.vala:553
+#.
+#. Duplicates
+#.
+#: ../src/Dialogs.vala:547
 msgid "Duplicate Photos/Videos Not Imported:"
-msgstr "Fotografii/Clipuri duplicate care nu au fost importate:"
+msgstr "Fotografii/Videouri duplicate care nu au fost importate:"
 
-#: src/Dialogs.vala:557
+#: ../src/Dialogs.vala:551
 msgid "duplicates existing media item"
 msgstr "duplică item media existent"
 
-#: src/Dialogs.vala:568
+#.
+#. Files Not Imported Due to Camera Errors
+#.
+#: ../src/Dialogs.vala:562
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr ""
-"Forografii/Clipuri care nu au fost importate datorită erorilor ale camerei:"
+"Forografii/Videouri care nu au fost importate datorită erorilor camerei:"
 
-#: src/Dialogs.vala:571 src/Dialogs.vala:586 src/Dialogs.vala:601
-#: src/Dialogs.vala:617 src/Dialogs.vala:632 src/Dialogs.vala:646
+#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
+#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
 msgid "error message:"
 msgstr "mesaj de eroare:"
 
-#: src/Dialogs.vala:582
+#.
+#. Files Not Imported Because They Weren't Recognized as Photos or Videos
+#.
+#: ../src/Dialogs.vala:576
 msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgstr ""
 "Fișiere care nu au fost importate deoarece nu au fost recunoscute ca "
-"fotografii sau clipuri video:"
+"fotografii sau videouri:"
 
-#: src/Dialogs.vala:597
+#.
+#. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
+#.
+#: ../src/Dialogs.vala:591
 msgid ""
 "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
 "Understands:"
 msgstr ""
-"Fotografii/Clipuri care nu au fost importate din cauză ca erau într-un "
-"format pe care Shotwell nu îl recunoaște:"
+"Fotografii/Videouri care nu au fost importate pentru că erau într-un format "
+"pe care Shotwell nu îl recunoaște:"
 
-#: src/Dialogs.vala:612
+#.
+#. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
+#.
+#: ../src/Dialogs.vala:606
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
 "Library:"
 msgstr ""
-"Fotografii/Clipuri care nu au fost importate pentru că Shotwell nu le-a "
+"Fotografii/Videouri care nu au fost importate pentru că Shotwell nu le-a "
 "putut copia în librăria sa:"
 
-#: src/Dialogs.vala:616
+#: ../src/Dialogs.vala:610
 #, c-format
 msgid ""
 "couldn't copy %s\n"
@@ -839,16 +1673,23 @@ msgstr ""
 "nu s-a putut copia %s\n"
 "\tîn %s"
 
-#: src/Dialogs.vala:628
+#.
+#. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
+#.
+#: ../src/Dialogs.vala:622
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr ""
-"Fotografii/Clipuri care nu au fost importate deoarece fișierele sunt corupte:"
+"Fotografii/Videouri care nu au fost importate deoarece fișierele sunt "
+"corupte:"
 
-#: src/Dialogs.vala:643
+#.
+#. Photos/Videos Not Imported for Other Reasons
+#.
+#: ../src/Dialogs.vala:637
 msgid "Photos/Videos Not Imported for Other Reasons:"
-msgstr "Fotografiile/Videoclipurile nu au fost importate din alte motive:"
+msgstr "Fotografii/Videouri care nu au fost importate din alte motive:"
 
-#: src/Dialogs.vala:663
+#: ../src/Dialogs.vala:657
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
@@ -856,23 +1697,23 @@ msgstr[0] "O fotografie duplicat nu a fost importată:\n"
 msgstr[1] "%d fotografii duplicat nu au fost importate:\n"
 msgstr[2] "%d de fotografii duplicat nu au fost importate:\n"
 
-#: src/Dialogs.vala:666
+#: ../src/Dialogs.vala:660
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
-msgstr[0] "Un clip duplicat nu a fost importat:\n"
-msgstr[1] "%d clipuri duplicate nu au fost importate:\n"
-msgstr[2] "%d de clipuri duplicate nu au fost importate:\n"
+msgstr[0] "Un video duplicat nu a fost importat:\n"
+msgstr[1] "%d videouri duplicate nu au fost importate:\n"
+msgstr[2] "%d de videouri duplicate nu au fost importate:\n"
 
-#: src/Dialogs.vala:669
+#: ../src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
-msgstr[0] "O fotografie/un clip duplicat nu a fost importat(ă):\n"
-msgstr[1] "%d fotografii/clipuri duplicate nu au fost importate:\n"
-msgstr[2] "%d de fotografii/clipuri duplicate nu au fost importate:\n"
+msgstr[0] "O fotografie/un video duplicat nu a fost importat(ă):\n"
+msgstr[1] "%d fotografii/videouri duplicate nu au fost importate:\n"
+msgstr[2] "%d de fotografii/videouri duplicate nu au fost importate:\n"
 
-#: src/Dialogs.vala:683
+#: ../src/Dialogs.vala:677
 #, 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"
@@ -886,48 +1727,50 @@ msgstr[2] ""
 "%d de fotografii nu au fost importate din cauza unei erori în fișier sau de "
 "natură hardware:\n"
 
-#: src/Dialogs.vala:686
+#: ../src/Dialogs.vala:680
 #, 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] ""
-"Un clip nu a fost importat din cauza unei erori în fișier sau de natură "
+"Un video nu a fost importat din cauza unei erori în fișier sau de natură "
 "hardware:\n"
 msgstr[1] ""
-"%d clipuri nu au fost importate din cauza unei erori în fișier sau de natură "
-"hardware:\n"
+"%d videouri nu au fost importate din cauza unei erori în fișier sau de "
+"natură hardware:\n"
 msgstr[2] ""
-"%d de clipuri nu au fost importate din cauza unei erori în fișier sau de "
+"%d de videouri nu au fost importate din cauza unei erori în fișier sau de "
 "natură hardware:\n"
 
-#: src/Dialogs.vala:689
+#: ../src/Dialogs.vala:683
 #, 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] ""
-"O fotografie/un clip nu a fost importat(ă) din cauza unei erori în fișier "
+"O fotografie/un video nu a fost importat(ă) din cauza unei erori în fișier "
 "sau de natură hardware:\n"
 msgstr[1] ""
-"%d fotografii/clipuri nu au fost importate din cauza unei erori în fișier "
+"%d fotografii/videouri nu au fost importate din cauza unei erori în fișier "
 "sau de natură hardware:\n"
 msgstr[2] ""
-"%d de fotografii/clipuri nu au fost importate din cauza unei erori în fișier "
-"sau de natură hardware:\n"
+"%d de fotografii/videouri nu au fost importate din cauza unei erori în "
+"fișier sau de natură hardware:\n"
 
-#: src/Dialogs.vala:692
+#: ../src/Dialogs.vala:686
 #, 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] ""
-"1 fișier nu a fost importat din cauza unei erori în fișier sau de natură "
+"Un fișier nu a fost importat din cauza unei erori în fișier sau de natură "
 "hardware:\n"
 msgstr[1] ""
 "%d fișiere nu au fost importate din cauza unei erori în fișier sau de natură "
 "hardware:\n"
-msgstr[2] "%d de :\n"
+msgstr[2] ""
+"%d fișiere nu au fost importate din cauza unei erori în fișier sau de natură "
+"hardware:\n"
 
-#: src/Dialogs.vala:706
+#: ../src/Dialogs.vala:700
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -935,8 +1778,8 @@ msgid_plural ""
 "%d photos failed to import because the photo library folder was not "
 "writable:\n"
 msgstr[0] ""
-"%d fotografie nu a fost importată deoarece dosarul colecției foto nu poate "
-"fi scris:\n"
+"O fotografie nu a fost importată deoarece dosarul colecției foto nu poate fi "
+"scris:\n"
 msgstr[1] ""
 "%d fotografii nu au fost importate deoarece dosarul colecției foto nu poate "
 "fi scris:\n"
@@ -944,7 +1787,7 @@ msgstr[2] ""
 "%d de fotografii nu au fost importate deoarece dosarul colecției foto nu "
 "poate fi scris:\n"
 
-#: src/Dialogs.vala:709
+#: ../src/Dialogs.vala:703
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -952,16 +1795,16 @@ msgid_plural ""
 "%d videos failed to import because the photo library folder was not "
 "writable:\n"
 msgstr[0] ""
-"%d clip video nu a fost importat deoarece deoarece dosarul colecției foto nu "
+"Un video nu a fost importat deoarece deoarece dosarul colecției foto nu "
 "poate fi scris:\n"
 msgstr[1] ""
-"%d clipuri video nu au fost importate deoarece dosarul colecției foto nu "
-"poate fi scris:\n"
+"%d videouri nu au fost importate deoarece dosarul colecției foto nu poate fi "
+"scris:\n"
 msgstr[2] ""
-"%d de clipuri video nu au fost importate deoarece dosarul colecției foto nu "
-"poate fi scris:\n"
+"%d de videouri nu au fost importate deoarece dosarul colecției foto nu poate "
+"fi scris:\n"
 
-#: src/Dialogs.vala:712
+#: ../src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -970,16 +1813,16 @@ msgid_plural ""
 "%d photos/videos failed to import because the photo library folder was not "
 "writable:\n"
 msgstr[0] ""
-"%d fotografie/clip video nu a fost importat(ă) deoarece dosarul colecției "
-"foto nu poate fi scris:\n"
+"O fotografie/Un video nu a fost importat(ă) deoarece dosarul colecției foto "
+"nu poate fi scris:\n"
 msgstr[1] ""
-"%d fotografii/clipuri nu au fost importate deoarece dosarul colecției foto "
+"%d fotografii/videouri nu au fost importate deoarece dosarul colecției foto "
 "nu poate fi scris:\n"
 msgstr[2] ""
-"%d de fotografii/clipuri nu au fost importate deoarece dosarul colecției "
-"foto nu poate fi scris:\n"
+"%d de fotografii/video nu au fost importate deoarece dosarul colecției foto "
+"nu poate fi scris:\n"
 
-#: src/Dialogs.vala:715
+#: ../src/Dialogs.vala:709
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -987,96 +1830,103 @@ msgid_plural ""
 "%d files failed to import because the photo library folder was not "
 "writable:\n"
 msgstr[0] ""
-"1 fișier nu a fost importat deoarece dosarul colecției foto nu permite "
+"Un fișier nu a fost importat deoarece dosarul colecției foto nu permite "
 "scrierea:\n"
 msgstr[1] ""
 "%d fișiere nu au fost importate deoarece dosarul colecției foto nu permite "
 "scrierea:\n"
-msgstr[2] "%d de :\n"
+msgstr[2] ""
+"%d de fișiere nu au fost importate deoarece dosarul colecției foto nu "
+"permite scrierea:\n"
 
-#: src/Dialogs.vala:729
+#: ../src/Dialogs.vala:723
 #, 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] ""
-"O fotografie nu a fost importată din cauza unei erori a aparatului foto.\n"
+"O fotografie nu a fost importată din cauza unei erori a aparatului foto:\n"
 msgstr[1] ""
 "%d fotografii nu au fost importate din cauza unei erori a aparatului foto:\n"
 msgstr[2] ""
 "%d de fotografii nu au fost importate din cauza unei erori a aparatului "
 "foto:\n"
 
-#: src/Dialogs.vala:732
+#: ../src/Dialogs.vala:726
 #, 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] ""
-"Un clip nu a fost importat din cauza unei erori a aparatului foto:\n"
+"Un video nu a fost importat din cauza unei erori a aparatului foto:\n"
 msgstr[1] ""
-"%d clipuri nu au fost importate din cauza unei erori a aparatului foto:\n"
+"%d videouri nu au fost importate din cauza unei erori a aparatului foto:\n"
 msgstr[2] ""
-"%d de clipuri nu au fost importate din cauza unei erori a aparatului foto:\n"
+"%d de videouri nu au fost importate din cauza unei erori a aparatului foto:\n"
 
-#: src/Dialogs.vala:735
+#: ../src/Dialogs.vala:729
 #, 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] ""
-"O fotografie/un clip nu a fost importat(ă) din cauza unei erori a aparatului "
-"foto:\n"
+"O fotografie/un video nu a fost importat(ă) din cauza unei erori a "
+"aparatului foto:\n"
 msgstr[1] ""
-"%d fotografii/clipuri nu au fost importate din cauza unei erori a aparatului "
-"foto:\n"
+"%d fotografii/videouri nu au fost importate din cauza unei erori a "
+"aparatului foto:\n"
 msgstr[2] ""
-"%d de fotografii/clipuri nu au fost importate din cauza unei erori a "
+"%d de fotografii/videouri nu au fost importate din cauza unei erori a "
 "aparatului foto:\n"
 
-#: src/Dialogs.vala:738
+#: ../src/Dialogs.vala:732
 #, 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] ""
-"1 fișier nu a fost importat din cauza unei erori a aparatului foto:\n"
+"Un fișier nu a fost importat din cauza unei erori a aparatului foto:\n"
 msgstr[1] ""
 "%d fișiere nu au fost importate din cauza unei erori a aparatului foto:\n"
-msgstr[2] "%d de :\n"
+msgstr[2] ""
+"%d de fișiere nu au fost importate din cauza unei erori a aparatului foto:\n"
 
-#: src/Dialogs.vala:752
+#: ../src/Dialogs.vala:746
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
-msgstr[0] "1 fotografie nu a putut fi importată deoarece este coruptă:\n"
+msgstr[0] "O fotografie nu a putut fi importată deoarece este coruptă:\n"
 msgstr[1] "%d fotografii nu au putut fi importate deoarece sunt corupte:\n"
 msgstr[2] "%d fotografii nu au putut fi importate deoarece sunt corupte:\n"
 
-#: src/Dialogs.vala:755
+#: ../src/Dialogs.vala:749
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
-msgstr[0] "1 clip video nu a putut fi importat deoarece este corupt:\n"
-msgstr[1] "%d clipuri video nu au putut fi importate deoarece sunt corupte:\n"
-msgstr[2] "%d clipuri video nu au putut fi importate deoarece sunt corupte:\n"
+msgstr[0] "Un video nu a putut fi importat deoarece este corupt:\n"
+msgstr[1] "%d videouri nu au putut fi importate deoarece sunt corupte:\n"
+msgstr[2] "%d de videouri nu au putut fi importate deoarece sunt corupte:\n"
 
-#: src/Dialogs.vala:758
+#: ../src/Dialogs.vala:752
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
 msgstr[0] ""
-"1 fotografie/clip video nu a putut fi importat(ă) deoarece este corupt(ă):\n"
+"O fotografie/Un video nu a putut fi importat(ă) deoarece este corupt(ă):\n"
 msgstr[1] ""
-"%d fotografii/clipuri video nu au putut fi importate deoarece sunt corupte:\n"
+"%d fotografii/videouri nu au putut fi importate deoarece sunt corupte:\n"
 msgstr[2] ""
-"%d fotografii/clipuri video nu au putut fi importate deoarece sunt corupte:\n"
+"%d de fotografii/videouri nu au putut fi importate deoarece sunt corupte:\n"
 
-#: src/Dialogs.vala:761
+#: ../src/Dialogs.vala:755
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
-msgstr[0] "1 fișier nu a putut fi importat deoarece este corupt:\n"
+msgstr[0] "Un fișier nu a putut fi importat deoarece este corupt:\n"
 msgstr[1] "%d fișiere nu au putut fi importate deoarece erau corupte:\n"
-msgstr[2] "%d fișiere nu au putut fi importate deoarece erau corupte:\n"
+msgstr[2] "%d de fișiere nu au putut fi importate deoarece erau corupte:\n"
 
-#: src/Dialogs.vala:778
+#. we have no notion of "unsupported" video files right now in Shotwell (all
+#. standard container formats are supported, it's just that the streams in them
+#. might or might not be interpretable), so this message does not need to be
+#. media specific
+#: ../src/Dialogs.vala:772
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1084,7 +1934,9 @@ msgstr[0] "O fotografie nerecunoscută a fost omisă:\n"
 msgstr[1] "%d fotografii nerecunoscute au fost omise:\n"
 msgstr[2] "%d de fotografii nerecunoscute au fost omise:\n"
 
-#: src/Dialogs.vala:793
+#. we have no notion of "non-video" video files right now in Shotwell, so this
+#. message doesn't need to be media specific
+#: ../src/Dialogs.vala:787
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
@@ -1092,7 +1944,7 @@ msgstr[0] "Un fișier non-imagine a fost omis.\n"
 msgstr[1] "%d fișiere non-imagine au fost omise.\n"
 msgstr[2] "%d de fișiere non-imagine au fost omise.\n"
 
-#: src/Dialogs.vala:804
+#: ../src/Dialogs.vala:798
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
@@ -1105,75 +1957,77 @@ msgstr[2] ""
 "Au fost omise %d de fotografii din cauza anulării operației de către "
 "utilizator:\n"
 
-#: src/Dialogs.vala:807
+#: ../src/Dialogs.vala:801
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] ""
-"A fost omis un clip din cauza anulării operației de către utilizator:\n"
+"A fost omis un video din cauza anulării operației de către utilizator:\n"
 msgstr[1] ""
-"Au fost omise %d clipuri din cauza anulării operației de către utilizator:\n"
+"Au fost omise %d videouri din cauza anulării operației de către utilizator:\n"
 msgstr[2] ""
-"Au fost omise %d de clipuri din cauza anulării operației de către "
+"Au fost omise %d de videouri din cauza anulării operației de către "
 "utilizator:\n"
 
-#: src/Dialogs.vala:810
+#: ../src/Dialogs.vala:804
 #, 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] ""
-"A fost omis(ă) o fotografie/un clip din cauza anulării operației de către "
+"A fost omis(ă) o fotografie/un video din cauza anulării operației de către "
 "utilizator:\n"
 msgstr[1] ""
-"Au fost omise %d fotografii/clipuri din cauza anulării operației de către "
+"Au fost omise %d fotografii/videouri din cauza anulării operației de către "
 "utilizator:\n"
 msgstr[2] ""
-"Au fost omise %d de fotografii/clipuri din cauza anulării operației de către "
-"utilizator:\n"
+"Au fost omise %d de fotografii/videouri din cauza anulării operației de "
+"către utilizator:\n"
 
-#: src/Dialogs.vala:813
+#: ../src/Dialogs.vala:807
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
-msgstr[0] "1 fișier a fost omis, deoarece utilizatorul a anulat acțiunea:\n"
+msgstr[0] "Un fișier a fost omis, deoarece utilizatorul a anulat acțiunea:\n"
 msgstr[1] ""
 "%d fișiere au fost omise, deoarece utilizatorul a anulat acțiunea:\n"
 msgstr[2] ""
 "%d de fișiere au fost omise, deoarece utilizatorul a anulat acțiunea:\n"
 
-#: src/Dialogs.vala:827
+#: ../src/Dialogs.vala:821
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
-msgstr[0] "Fotografia a fost importată cu succes.\n"
+msgstr[0] "O fotografie a fost importată cu succes.\n"
 msgstr[1] "%d fotografii au fost importate cu succes.\n"
 msgstr[2] "%d de fotografii au fost importate cu succes.\n"
 
-#: src/Dialogs.vala:830
+#: ../src/Dialogs.vala:824
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
-msgstr[0] "Un clip a fost importat cu succes.\n"
-msgstr[1] "%d clipuri au fost importate cu succes.\n"
-msgstr[2] "%d de clipuri au fost importate cu succes.\n"
+msgstr[0] "Un video a fost importat cu succes.\n"
+msgstr[1] "%d videouri au fost importate cu succes.\n"
+msgstr[2] "%d de videouri au fost importate cu succes.\n"
 
-#: src/Dialogs.vala:833
+#: ../src/Dialogs.vala:827
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
-msgstr[0] "O fotografie/un clip a fost importat(ă) cu succes.\n"
-msgstr[1] "%d fotografii/clipuri au fost importate cu succes.\n"
-msgstr[2] "%d de fotografii/clipuri au fost importate cu succes.\n"
+msgstr[0] "O fotografie/un video a fost importat(ă) cu succes.\n"
+msgstr[1] "%d fotografii/videouri au fost importate cu succes.\n"
+msgstr[2] "%d de fotografii/videouri au fost importate cu succes.\n"
 
-#: src/Dialogs.vala:849
+#. if no media items were imported at all (i.e. an empty directory attempted), need to at least
+#. report that nothing was imported
+#: ../src/Dialogs.vala:843
 msgid "No photos or videos imported.\n"
-msgstr "Nicio fotografie și niciun clip nu au fost importate.\n"
+msgstr "Nicio fotografie și niciun video nu au fost importate.\n"
 
-#: src/Dialogs.vala:856 src/Dialogs.vala:875
+#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
 msgid "Import Complete"
 msgstr "Operația de importare a fost încheiată"
 
-#: src/Dialogs.vala:1103
+#: ../src/Dialogs.vala:1155
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1181,7 +2035,7 @@ msgstr[0] "o secundă"
 msgstr[1] "%d secunde"
 msgstr[2] "%d de secunde"
 
-#: src/Dialogs.vala:1106
+#: ../src/Dialogs.vala:1158
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1189,7 +2043,7 @@ msgstr[0] "un minut"
 msgstr[1] "%d minute"
 msgstr[2] "%d de minute"
 
-#: src/Dialogs.vala:1110
+#: ../src/Dialogs.vala:1162
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1197,145 +2051,161 @@ msgstr[0] "o oră"
 msgstr[1] "%d ore"
 msgstr[2] "%d de ore"
 
-#: src/Dialogs.vala:1113
+#: ../src/Dialogs.vala:1165
 msgid "1 day"
 msgstr "1 zi"
 
-#: src/Dialogs.vala:1263 src/Resources.vala:205
+#: ../src/Dialogs.vala:1315 ../src/Resources.vala:203
 msgid "Rename Event"
-msgstr "Redenumește eveniment"
+msgstr "Redenumește evenimentul"
 
-#: src/Dialogs.vala:1263
+#: ../src/Dialogs.vala:1315
 msgid "Name:"
 msgstr "Nume:"
 
-#: src/Dialogs.vala:1273 src/Resources.vala:274
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1326 ../src/Resources.vala:275
 msgid "Edit Title"
 msgstr "Editare nume"
 
-#: src/Dialogs.vala:1287 src/Resources.vala:280
+#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
+msgid "Title:"
+msgstr "Nume:"
+
+#. Dialog title
+#: ../src/Dialogs.vala:1343 ../src/Resources.vala:282
 msgid "Edit Event Comment"
 msgstr "Editează comentariu despre eveniment"
 
-#: src/Dialogs.vala:1287
+#: ../src/Dialogs.vala:1344
 msgid "Edit Photo/Video Comment"
-msgstr "Editează comentariu despre fotografie/clip"
+msgstr "Editează comentariu despre fotografie/video"
+
+#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
+msgid "Comment:"
+msgstr "Comentariu:"
 
-#: src/Dialogs.vala:1304
-msgid "_Trash File"
-msgid_plural "_Trash Files"
+#: ../src/Dialogs.vala:1361
+msgid "Remove and _Trash File"
+msgid_plural "Remove and _Trash Files"
 msgstr[0] "_Trimite fișierul la coșul de gunoi"
 msgstr[1] "_Trimite fișierele la coșul de gunoi"
 msgstr[2] "_Trimite fișierele la coșul de gunoi"
 
-#: src/Dialogs.vala:1308
-msgid "Only _Remove"
-msgstr "Doar ște_rge"
+#: ../src/Dialogs.vala:1365
+msgid "_Remove From Library"
+msgstr "Ș_terge din colecție"
 
-#: src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1739
+msgid "_Keep"
+msgstr "_Păstrează"
+
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edit?"
 msgstr "Anulați editările externe?"
 
-#: src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edits?"
 msgstr "Anulați editările externe?"
 
-#: src/Dialogs.vala:1353
+#: ../src/Dialogs.vala:1410
 #, 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] ""
-"Veți pierde toate modificările aplicate fișierului extern. Continuați?"
+"Veți pierde toate modificările aplicate fișierului extern.  Continuați?"
 msgstr[1] ""
-"Veți pierde toate modificările aplicate celor %d fișiere externe. Continuați?"
+"Veți pierde toate modificările aplicate celor %d fișiere externe.  "
+"Continuați?"
 msgstr[2] ""
-"Veți pierde toate modificările aplicate celor %d de fișiere externe. "
+"Veți pierde toate modificările aplicate celor %d de fișiere externe.  "
 "Continuați?"
 
-#: src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edit"
 msgstr "Anulează e_ditările externe"
 
-#: src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edits"
 msgstr "Anulează editările e_xterne"
 
-#: src/Dialogs.vala:1378
+#: ../src/Dialogs.vala:1435
 #, 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] "Această acțiune va șterge fotografia din colecție. Continuați?"
-msgstr[1] "Această acțiune va șterge %d fotografii din colecție. Continuați?"
+msgstr[0] "Această acțiune va șterge fotografia din colecție.  Continuați?"
+msgstr[1] "Această acțiune va șterge %d fotografii din colecție.  Continuați?"
 msgstr[2] ""
-"Această acțiune va șterge %d de fotografii din colecție. Continuați?"
+"Această acțiune va șterge %d de fotografii din colecție.  Continuați?"
 
-#: src/Dialogs.vala:1385
+#: ../src/Dialogs.vala:1442
 msgid "_Remove"
 msgstr "Ște_rge"
 
-#: src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photo From Library"
 msgstr "Șterge fotografiile din colecție"
 
-#: src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photos From Library"
 msgstr "Șterge fotografiile din colecție"
 
-#: src/Dialogs.vala:1479
+#: ../src/Dialogs.vala:1536
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1626
+#: ../src/Dialogs.vala:1688
 msgid "AM"
 msgstr "AM"
 
-#: src/Dialogs.vala:1627
+#: ../src/Dialogs.vala:1689
 msgid "PM"
 msgstr "PM"
 
-#: src/Dialogs.vala:1628
+#: ../src/Dialogs.vala:1690
 msgid "24 Hr"
 msgstr "24 de ore"
 
-#: src/Dialogs.vala:1643
+#: ../src/Dialogs.vala:1705
 msgid "_Shift photos/videos by the same amount"
-msgstr "_Modifică fotografiile/clipurile video în aceeași măsură"
+msgstr "_Modifică fotografiile/videourile în aceeași măsură"
 
-#: src/Dialogs.vala:1648
+#: ../src/Dialogs.vala:1710
 msgid "Set _all photos/videos to this time"
-msgstr "Marchează to_ate fotografiile/clipurile video cu această oră și dată"
+msgstr "Stabilește to_ate fotografiile/videourile la această oră și dată"
 
-#: src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo file"
 msgstr "_Modifică fișierul fotografiei originale"
 
-#: src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo files"
 msgstr "_Modifică fișierele fotografiilor originale"
 
-#: src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original file"
 msgstr "_Modifică fișierele originale"
 
-#: src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original files"
 msgstr "_Modifică fișierul original"
 
-#: src/Dialogs.vala:1744
+#: ../src/Dialogs.vala:1806
 msgid "Original: "
-msgstr "Original:"
+msgstr "Original: "
 
-#: src/Dialogs.vala:1745
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d/%m/%Y, %H:%M:%S"
 
-#: src/Dialogs.vala:1746
+#: ../src/Dialogs.vala:1808
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d/%m/%Y, %I:%M:%S %p"
 
-#: src/Dialogs.vala:1835
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -1344,7 +2214,7 @@ msgstr ""
 "Data expunerii va fi modificată în avans cu\n"
 "%d %s, %d %s, %d %s, și %d %s."
 
-#: src/Dialogs.vala:1836
+#: ../src/Dialogs.vala:1898
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -1353,35 +2223,35 @@ msgstr ""
 "Data expunerii va fi modificată în devans cu\n"
 "%d %s, %d %s, %d %s, și %d %s."
 
-#: src/Dialogs.vala:1838
+#: ../src/Dialogs.vala:1900
 msgid "day"
 msgid_plural "days"
 msgstr[0] "zi"
 msgstr[1] "zile"
 msgstr[2] "de zile"
 
-#: src/Dialogs.vala:1839
+#: ../src/Dialogs.vala:1901
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "oră"
 msgstr[1] "ore"
 msgstr[2] "de ore"
 
-#: src/Dialogs.vala:1840
+#: ../src/Dialogs.vala:1902
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minute"
 msgstr[2] "de minute"
 
-#: src/Dialogs.vala:1841
+#: ../src/Dialogs.vala:1903
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "secundă"
 msgstr[1] "secunde"
 msgstr[2] "de secunde"
 
-#: src/Dialogs.vala:1885
+#: ../src/Dialogs.vala:1947
 #, c-format
 msgid ""
 "\n"
@@ -1404,119 +2274,123 @@ msgstr[2] ""
 "\n"
 "Și %d în plus."
 
-#: src/Dialogs.vala:1907 src/Dialogs.vala:1934
+#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
 msgid "Tags (separated by commas):"
 msgstr "Etichete (separate prin virgulă):"
 
-#: src/Dialogs.vala:2014
+#: ../src/Dialogs.vala:2076
 msgid "Welcome!"
 msgstr "Bine ați venit!"
 
-#: src/Dialogs.vala:2021
-#, c-format
+#: ../src/Dialogs.vala:2083
 msgid "Welcome to Shotwell!"
 msgstr "Bine ați venit în Shotwell!"
 
-#: src/Dialogs.vala:2025
-#, c-format
+#: ../src/Dialogs.vala:2087
 msgid "To get started, import photos in any of these ways:"
 msgstr "Pentru a începe, importați fotografii prin una din metodele următoare:"
 
-#: src/Dialogs.vala:2044
+#: ../src/Dialogs.vala:2106
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Alegeți <span weight=\"bold\">Fișier %s Importă din dosar</span>"
 
-#: src/Dialogs.vala:2045
+#: ../src/Dialogs.vala:2107
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Trageți și plasați fotografii în fereastra Shotwell"
 
-#: src/Dialogs.vala:2046
+#: ../src/Dialogs.vala:2108
 msgid "Connect a camera to your computer and import"
 msgstr "Conectați un aparat foto la calculator și importați fotografiile"
 
-#: src/Dialogs.vala:2056
+#: ../src/Dialogs.vala:2118
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importă fotografiile din dosarul %s"
 
-#: src/Dialogs.vala:2063
+#: ../src/Dialogs.vala:2125
 msgid "You can also import photos in any of these ways:"
 msgstr "Mai puteți importa fotografii într-unul din următoarele moduri:"
 
-#: src/Dialogs.vala:2073
+#: ../src/Dialogs.vala:2135
 msgid "_Don't show this message again"
 msgstr "Nu arăta _din nou acest mesaj"
 
-#: src/Dialogs.vala:2108
+#: ../src/Dialogs.vala:2170
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Importare fotografii din biblioteca %s"
 
-#: src/Dialogs.vala:2252 src/Dialogs.vala:2256
+#. We're installed system-wide, so use the system help.
+#. We're being run from the build directory; we'll have to handle clicks to this
+#. link manually ourselves, due to a limitation ghelp: URIs.
+#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
 msgid "(Help)"
 msgstr "(Ajutor)"
 
-#: src/Dialogs.vala:2265
+#: ../src/Dialogs.vala:2324
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Zi%sLună%sAn"
 
-#: src/Dialogs.vala:2267
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth"
 msgstr "Zi%sLună"
 
-#: src/Dialogs.vala:2269
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Zi%sLună-An"
 
-#: src/Dialogs.vala:2271
+#: ../src/Dialogs.vala:2330
 msgid "Year-Month-Day"
 msgstr "Zi-Lună-An"
 
-#: src/Dialogs.vala:2272 src/editing_tools/EditingTools.vala:777
+#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Personalizat"
 
-#: src/Dialogs.vala:2509
+#. Invalid pattern.
+#: ../src/Dialogs.vala:2568
 msgid "Invalid pattern"
 msgstr "Model nevalid"
 
-#: src/Dialogs.vala:2612
+#. This function is used to determine whether or not files should be copied or linked when imported.
+#. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
+#: ../src/Dialogs.vala:2670
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
 msgstr ""
 "Shotwell poate copia fotografiile în dosarul colecție sau le poate importa "
-"fără a le copia. "
+"fără a le copia."
 
-#: src/Dialogs.vala:2617
+#: ../src/Dialogs.vala:2675
 msgid "Co_py Photos"
 msgstr "Co_piază fotografiile"
 
-#: src/Dialogs.vala:2618
+#: ../src/Dialogs.vala:2676
 msgid "_Import in Place"
 msgstr "_Importă în locul"
 
-#: src/Dialogs.vala:2619
+#: ../src/Dialogs.vala:2677
 msgid "Import to Library"
 msgstr "Importă în colecție"
 
-#: src/Dialogs.vala:2629 src/PhotoPage.vala:3075
+#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3084
 msgid "Remove From Library"
 msgstr "Șterge din colecție"
 
-#: src/Dialogs.vala:2630 src/PhotoPage.vala:3075
+#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3084
 msgid "Removing Photo From Library"
 msgstr "Se șterg fotografiile din colecție"
 
-#: src/Dialogs.vala:2630
+#: ../src/Dialogs.vala:2688
 msgid "Removing Photos From Library"
 msgstr "Se șterg fotografiile din colecție"
 
-#: src/Dialogs.vala:2644
+#: ../src/Dialogs.vala:2702
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -1529,22 +2403,22 @@ msgid_plural ""
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
-"Această acțiune va șterge fotografia/clipul din colecția Shotwell. Doriți, "
+"Această acțiune va șterge fotografia/videoul din colecția Shotwell.  Doriți, "
 "de asemenea, trimiterea fișierului la coșul de gunoi al sistemului?\n"
 "\n"
 "Nu veți putea reveni asupra acestei acțiuni."
 msgstr[1] ""
-"Această acțiune va șterge %d fotografii/clipuri din colecția Shotwell. "
+"Această acțiune va șterge %d fotografii/videouri din colecția Shotwell.  "
 "Doriți, de asemenea, trimiterea fișierele la coșul de gunoi al sistemului?\n"
 "\n"
 "Nu veți putea reveni asupra acestei acțiuni."
 msgstr[2] ""
-"Această acțiune va șterge %d de fotografii/clipuri din colecția Shotwell. "
+"Această acțiune va șterge %d de fotografii/videouri din colecția Shotwell.  "
 "Doriți, de asemenea, trimiterea fișierele la coșul de gunoi al sistemului?\n"
 "\n"
 "Nu veți putea reveni asupra acestei acțiuni."
 
-#: src/Dialogs.vala:2648
+#: ../src/Dialogs.vala:2706
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -1557,22 +2431,22 @@ msgid_plural ""
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
-"Această acțiune va șterge clipul din colecția Shotwell. Doriți, de asemena, "
-"să trimiteți fișierul la coșul de gunoi al sistemului?\n"
+"Această acțiune va șterge videoul din colecția Shotwell.  Doriți, de "
+"asemena, să trimiteți fișierul la coșul de gunoi al sistemului?\n"
 "\n"
 "Nu veți putea reveni asupra acestei acțiuni."
 msgstr[1] ""
-"Această acțiune va șterge %d clipuri din colecția Shotwell. Doriți, de "
+"Această acțiune va șterge %d videouri din colecția Shotwell.  Doriți, de "
 "asemena, să trimiteți fișierele la coșul de gunoi al sistemului?\n"
 "\n"
 "Nu veți putea reveni asupra acestei acțiuni."
 msgstr[2] ""
-"Această acțiune va șterge %d de clipuri din colecția Shotwell. Doriți, de "
+"Această acțiune va șterge %d de videouri din colecția Shotwell.  Doriți, de "
 "asemenea, să trimiteți fișierele la coșul de gunoi al sistemului?\n"
 "\n"
 "Nu veți putea reveni asupra acestei acțiuni."
 
-#: src/Dialogs.vala:2652
+#: ../src/Dialogs.vala:2710
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -1585,652 +2459,416 @@ msgid_plural ""
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
-"Această acțiune va șterge fotografia din colecția Shotwell. Doriți, de "
+"Această acțiune va șterge fotografia din colecția Shotwell.  Doriți, de "
 "asemenea, să trimiteți fișierul la coșul de gunoi al sistemului?\n"
 "\n"
 "Nu veți putea reveni asupra acestei acțiuni."
 msgstr[1] ""
-"Această acțiune va șterge %d fotografii din colecția Shotwell. Doriți, de "
+"Această acțiune va șterge %d fotografii din colecția Shotwell.  Doriți, de "
 "asemenea, să trimiteți fișierele la coșul de gunoi al sistemului?\n"
 "\n"
 "Nu veți putea reveni asupra acestei acțiuni."
 msgstr[2] ""
-"Această acțiune va șterge %d de fotografii din colecția Shotwell. Doriți, de "
-"asemenea, să trimiteți fișierele la coșul de gunoi al sistemului?\n"
+"Această acțiune va șterge %d de fotografii din colecția Shotwell.  Doriți, "
+"de asemenea, să trimiteți fișierele la coșul de gunoi al sistemului?\n"
 "\n"
 "Nu veți putea reveni asupra acestei acțiuni."
 
-#: src/Dialogs.vala:2684
+#: ../src/Dialogs.vala:2742
 #, 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] ""
-"Fotografia sau clipul nu poate fi trimis(ă) la coșul de gunoi al sistemului. "
-"Ștergeți definitiv fișierul?"
+"Fotografia sau videoul nu poate fi trimis(ă) la coșul de gunoi al "
+"sistemului.  Ștergeți definitiv fișierul?"
 msgstr[1] ""
-"%d fotografii/clipuri nu pot fi trimise la coșul de gunoi al sistemului. "
+"%d fotografii/videouri nu pot fi trimise la coșul de gunoi al sistemului.  "
 "Ștergeți definitiv fișierele?"
 msgstr[2] ""
-"%d de fotografii/clipuri nu pot fi trimise la coșul de gunoi al sistemului. "
-"Ștergeți definitiv fișierele?"
+"%d de fotografii/videouri nu pot fi trimise la coșul de gunoi al "
+"sistemului.  Ștergeți definitiv fișierele?"
 
-#: src/Dialogs.vala:2701
+#. Alert the user that the files were not removed.
+#: ../src/Dialogs.vala:2759
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
-msgstr[0] "Fotografia sau clipul nu poate fi ștearsă/șters. "
-msgstr[1] "%d fotografii/clipuri nu pot fi șterse."
-msgstr[2] "%d de fotografii/clipuri nu pot fi șterse."
+msgstr[0] "Fotografia sau videoul nu poate fi ștearsă/șters."
+msgstr[1] "%d fotografii/videouri nu pot fi șterse."
+msgstr[2] "%d de fotografii/videouri nu pot fi șterse."
 
-#: src/folders/Branch.vala:141
-msgid "Folders"
-msgstr "Dosare"
+#: ../src/Dimensions.vala:23
+msgid "Width"
+msgstr "Lățime"
 
-#: src/tags/Branch.vala:127
-msgid "Tags"
-msgstr "Etichete"
+#: ../src/Dimensions.vala:26
+msgid "Height"
+msgstr "Înalțime"
 
-#: src/BatchImport.vala:26
-msgid "Success"
-msgstr "Succes"
+#. verify this is a directory
+#: ../src/DirectoryMonitor.vala:889
+#, c-format
+msgid "Unable to monitor %s: Not a directory (%s)"
+msgstr "%s nu poate fi monitorizat: nu este un dosar (%s)"
 
-#: src/BatchImport.vala:29
-msgid "File error"
-msgstr "Eroare fișier"
+#. if no name, pretty up the start time
+#: ../src/Event.vala:751
+#, c-format
+msgid "Event %s"
+msgstr "Eveniment %s"
 
-#: src/BatchImport.vala:32
-msgid "Unable to decode file"
-msgstr "Fișierul nu poate fi decodat"
+#: ../src/Exporter.vala:232
+#, c-format
+msgid "Unable to generate a temporary file for %s: %s"
+msgstr "Nu se poate genera fișierul temporar pentru %s: %s"
 
-#: src/BatchImport.vala:35
-msgid "Database error"
-msgstr "Eroare bază de date"
+#: ../src/Exporter.vala:299
+msgid "Exporting"
+msgstr "Se exportă"
 
-#: src/BatchImport.vala:38
-msgid "User aborted import"
-msgstr "Utilizatorul a abandonat importul"
+#: ../src/Exporter.vala:317
+#, c-format
+msgid "File %s already exists.  Replace?"
+msgstr "Fișierul %s există deja.  Înlocuiți?"
 
-#: src/BatchImport.vala:41
-msgid "Not a file"
-msgstr "Nu este fișier"
+#: ../src/Exporter.vala:319
+msgid "_Skip"
+msgstr "_Omite"
 
-#: src/BatchImport.vala:44
-msgid "File already exists in database"
-msgstr "Fișierul există deja în baza de date"
+#: ../src/Exporter.vala:319
+msgid "_Replace"
+msgstr "Î_nlocuiește"
 
-#: src/BatchImport.vala:47
-msgid "Unsupported file format"
-msgstr "Format fișier nerecunoscut"
+#: ../src/Exporter.vala:319
+msgid "Replace _All"
+msgstr "Înlocuiește _tot"
 
-#: src/BatchImport.vala:50
-msgid "Not an image file"
-msgstr "Nu este un fișier imagine"
+#: ../src/Exporter.vala:319
+msgid "Export"
+msgstr "Exportă"
 
-#: src/BatchImport.vala:53
-msgid "Disk failure"
-msgstr "Defecțiune disc"
+#: ../src/MediaMonitor.vala:400
+#, c-format
+msgid "Unable to process monitoring updates: %s"
+msgstr "Nu se pot procesa actualizările monitorizate: %s"
 
-#: src/BatchImport.vala:56
-msgid "Disk full"
-msgstr "Disc plin"
+#: ../src/MediaPage.vala:157
+msgid "Adjust the size of the thumbnails"
+msgstr "Modificați dimensiunea miniaturilor"
 
-#: src/BatchImport.vala:59
-msgid "Camera error"
-msgstr "Eroare aparat foto"
+#: ../src/MediaPage.vala:339 ../src/PhotoPage.vala:2590
+#: ../src/direct/DirectPhotoPage.vala:174
+msgid "Zoom _In"
+msgstr "_Mărește"
 
-#: src/BatchImport.vala:62
-msgid "File write error"
-msgstr "Eroare la scrierea fișierului"
+#: ../src/MediaPage.vala:340
+msgid "Increase the magnification of the thumbnails"
+msgstr "Mărește dimensiunile miniaturilor"
 
-#: src/BatchImport.vala:65
-msgid "Corrupt image file"
-msgstr "Fișier imagine corupt"
+#: ../src/MediaPage.vala:345 ../src/PhotoPage.vala:2596
+#: ../src/direct/DirectPhotoPage.vala:180
+msgid "Zoom _Out"
+msgstr "Mi_cșorează"
+
+#: ../src/MediaPage.vala:346
+msgid "Decrease the magnification of the thumbnails"
+msgstr "Micșorează dimensiunile miniaturilor"
 
-#: src/BatchImport.vala:68
+#: ../src/MediaPage.vala:413
+msgid "Sort _Photos"
+msgstr "Sortează _fotografiile"
+
+#: ../src/MediaPage.vala:422
+msgid "_Play Video"
+msgstr "Redă vi_deoul"
+
+#: ../src/MediaPage.vala:423
+msgid "Open the selected videos in the system video player"
+msgstr "Deschide videourile selectate cu playerul video implicit al sistemului"
+
+#: ../src/MediaPage.vala:427 ../src/PhotoPage.vala:2639
+msgid "_Developer"
+msgstr "_Programator"
+
+#: ../src/MediaPage.vala:439 ../src/camera/Branch.vala:101
+#: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
+#: ../src/photos/RawSupport.vala:303
+msgid "Camera"
+msgstr "Aparat foto"
+
+#: ../src/MediaPage.vala:450 ../src/camera/ImportPage.vala:872
+msgid "_Titles"
+msgstr "_Nume"
+
+#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:873
+msgid "Display the title of each photo"
+msgstr "Afișează numele fiecărei fotografii"
+
+#: ../src/MediaPage.vala:456 ../src/events/EventsDirectoryPage.vala:130
+msgid "_Comments"
+msgstr "_Comentarii"
+
+#: ../src/MediaPage.vala:457
+msgid "Display the comment of each photo"
+msgstr "Afișează comentariul fiecărei fotografii"
+
+#: ../src/MediaPage.vala:468 ../src/library/LibraryWindow.vala:376
+msgid "Ta_gs"
+msgstr "Etic_hete"
+
+#: ../src/MediaPage.vala:469
+msgid "Display each photo's tags"
+msgstr "Afișează eticheta fiecărei fotografii"
+
+#: ../src/MediaPage.vala:485
+msgid "By _Title"
+msgstr "După _nume"
+
+#: ../src/MediaPage.vala:486
+msgid "Sort photos by title"
+msgstr "Sortează fotografiile după nume"
+
+#: ../src/MediaPage.vala:491
+msgid "By Exposure _Date"
+msgstr "După _dată"
+
+#: ../src/MediaPage.vala:492
+msgid "Sort photos by exposure date"
+msgstr "Sortează fotografiile după data expunerii"
+
+#: ../src/MediaPage.vala:497
+msgid "By _Rating"
+msgstr "După ap_reciere"
+
+#: ../src/MediaPage.vala:498
+msgid "Sort photos by rating"
+msgstr "Sortează fotografiile după apreciere"
+
+#: ../src/MediaPage.vala:508 ../src/library/LibraryWindow.vala:422
+msgid "_Ascending"
+msgstr "_Crescător"
+
+#: ../src/MediaPage.vala:509 ../src/library/LibraryWindow.vala:423
+msgid "Sort photos in an ascending order"
+msgstr "Sortează fotografiile în ordine crescătoare"
+
+#: ../src/MediaPage.vala:514 ../src/library/LibraryWindow.vala:429
+msgid "D_escending"
+msgstr "D_escrescător"
+
+#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:430
+msgid "Sort photos in a descending order"
+msgstr "Sortează fotografiile în ordine descrescătoare"
+
+#: ../src/MediaPage.vala:716
 #, c-format
-msgid "Imported failed (%d)"
-msgstr "Importul a eșuat (%d)"
+msgid ""
+"Shotwell was unable to play the selected video:\n"
+"%s"
+msgstr ""
+"Shotwell nu poate reda videoul selectat:\n"
+"%s"
+
+#: ../src/Page.vala:1263
+msgid "No photos/videos"
+msgstr "Nicio fotografie/niciun video"
+
+#: ../src/Page.vala:1267
+msgid "No photos/videos found"
+msgstr "Nicio fotografie/niciun video nu a fost găsită/găsit"
 
-#: src/Photo.vala:3656
+#: ../src/Page.vala:2565
+msgid "Photos cannot be exported to this directory."
+msgstr "Fotografiile nu pot fi exportate în acest director."
+
+#: ../src/Photo.vala:3753
 msgid "modified"
 msgstr "modificat"
 
-#: src/PhotoPage.vala:532
+#. previous button
+#: ../src/PhotoPage.vala:532
 msgid "Previous photo"
 msgstr "Fotogafia anterioară"
 
-#: src/PhotoPage.vala:537
+#. next button
+#: ../src/PhotoPage.vala:537
 msgid "Next photo"
 msgstr "Fotografia următoare"
 
-#: src/PhotoPage.vala:1844
+#: ../src/PhotoPage.vala:1844
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Fișierul sursă al fotografiei lipsește: %s"
 
-#: src/PhotoPage.vala:2404 src/library/LibraryWindow.vala:360
-#: src/direct/DirectPhotoPage.vala:165
+#: ../src/PhotoPage.vala:2411 ../src/direct/DirectPhotoPage.vala:165
+#: ../src/library/LibraryWindow.vala:360
 msgid "_View"
 msgstr "_Vizualizare"
 
-#: src/PhotoPage.vala:2408 src/direct/DirectPhotoPage.vala:81
+#: ../src/PhotoPage.vala:2415 ../src/direct/DirectPhotoPage.vala:81
 msgid "T_ools"
 msgstr "_Unelte"
 
-#: src/PhotoPage.vala:2413 src/direct/DirectPhotoPage.vala:86
+#: ../src/PhotoPage.vala:2420 ../src/direct/DirectPhotoPage.vala:86
 msgid "_Previous Photo"
 msgstr "Fotografia ant_erioară"
 
-#: src/PhotoPage.vala:2414 src/direct/DirectPhotoPage.vala:87
+#: ../src/PhotoPage.vala:2421 ../src/direct/DirectPhotoPage.vala:87
 msgid "Previous Photo"
 msgstr "Fotografia anterioară"
 
-#: src/PhotoPage.vala:2419 src/direct/DirectPhotoPage.vala:92
+#: ../src/PhotoPage.vala:2426 ../src/direct/DirectPhotoPage.vala:92
 msgid "_Next Photo"
 msgstr "Fotografia u_rmătoare"
 
-#: src/PhotoPage.vala:2420 src/direct/DirectPhotoPage.vala:93
+#: ../src/PhotoPage.vala:2427 ../src/direct/DirectPhotoPage.vala:93
 msgid "Next Photo"
 msgstr "Fotografia următoare"
 
-#: src/PhotoPage.vala:2583 src/direct/DirectPhotoPage.vala:174
-#: src/MediaPage.vala:325
-msgid "Zoom _In"
-msgstr "_Mărește"
-
-#: src/PhotoPage.vala:2584 src/direct/DirectPhotoPage.vala:175
+#: ../src/PhotoPage.vala:2591 ../src/direct/DirectPhotoPage.vala:175
 msgid "Increase the magnification of the photo"
 msgstr "Mărește mai mult fotografia"
 
-#: src/PhotoPage.vala:2589 src/direct/DirectPhotoPage.vala:180
-#: src/MediaPage.vala:331
-msgid "Zoom _Out"
-msgstr "Mi_cșorează"
-
-#: src/PhotoPage.vala:2590 src/direct/DirectPhotoPage.vala:181
+#: ../src/PhotoPage.vala:2597 ../src/direct/DirectPhotoPage.vala:181
 msgid "Decrease the magnification of the photo"
 msgstr "Micșorează fotografia mărită"
 
-#: src/PhotoPage.vala:2595 src/direct/DirectPhotoPage.vala:186
+#: ../src/PhotoPage.vala:2602 ../src/direct/DirectPhotoPage.vala:186
 msgid "Fit to _Page"
 msgstr "Scalează la _pagină"
 
-#: src/PhotoPage.vala:2596 src/direct/DirectPhotoPage.vala:187
+#: ../src/PhotoPage.vala:2603 ../src/direct/DirectPhotoPage.vala:187
 msgid "Zoom the photo to fit on the screen"
 msgstr "Potrivește dimensiunea fotografiei la mărimea ecranului"
 
-#: src/PhotoPage.vala:2601 src/direct/DirectPhotoPage.vala:192
+#: ../src/PhotoPage.vala:2609 ../src/direct/DirectPhotoPage.vala:193
+#, no-c-format
 msgid "Zoom _100%"
 msgstr "Zoom _100%"
 
-#: src/PhotoPage.vala:2602 src/direct/DirectPhotoPage.vala:193
-#, c-format
+#: ../src/PhotoPage.vala:2611 ../src/direct/DirectPhotoPage.vala:195
+#, no-c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "Afișează fotografia la dimensiune normală"
 
-#: src/PhotoPage.vala:2607 src/direct/DirectPhotoPage.vala:198
+#: ../src/PhotoPage.vala:2617 ../src/direct/DirectPhotoPage.vala:201
+#, no-c-format
 msgid "Zoom _200%"
 msgstr "Zoom _200%"
 
-#: src/PhotoPage.vala:2608 src/direct/DirectPhotoPage.vala:199
-#, c-format
+#: ../src/PhotoPage.vala:2619 ../src/direct/DirectPhotoPage.vala:203
+#, no-c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "Afișează fotografia la dimensiune dublă"
 
-#: src/PhotoPage.vala:2628 src/MediaPage.vala:413
-msgid "_Developer"
-msgstr "_Programator"
-
-#: src/PhotoPage.vala:3216
+#: ../src/PhotoPage.vala:3228
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Nu se poate realiza exportul %s: %s"
 
-#: src/data_imports/DataImportsPluginHost.vala:65
-#: src/data_imports/DataImportsPluginHost.vala:78
-#, c-format
-msgid "%s Database"
-msgstr "Baza de date %s"
-
-#: 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 "Importarea din %s nu poate continua din cauza unei erori:"
-
-#: src/data_imports/DataImportsPluginHost.vala:151
-msgid "To try importing from another service, select one from the above menu."
-msgstr ""
-"Pentru a încerca importarea din alt serviciu, alegeți unul din meniul de mai "
-"jos."
-
-#: src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr "Importare date"
-
-#: 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 ""
-"Nu ați activat niciun modul pentru importarea datelor.\n"
-"\n"
-"Pentru a utiliza funcția de importare din aplicație, trebuie să activați cel "
-"puțin un modul pentru importarea datelor. Modulele pot fi activate din "
-"dialogul Preferințe. "
-
-#: src/data_imports/DataImportsUI.vala:100
-msgid "Database file:"
-msgstr "Fișierul bazei de date:"
-
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:899
-msgid "_Import"
-msgstr "_Importă"
-
-#: src/data_imports/DataImportsUI.vala:216
-msgid "Import From Application"
-msgstr "Importare din aplicație"
-
-#: src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "Im_portare media din:"
-
-#: src/data_imports/DataImportsUI.vala:394
-#: src/publishing/PublishingUI.vala:493
-msgid "_Close"
-msgstr "În_chide"
-
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:182
-msgid "Settings"
-msgstr "Opţiuni"
-
-#: src/SlideshowPage.vala:141 src/Screensaver.vala:18
-msgid "Slideshow"
-msgstr "Prezentare diapozitive"
-
-#: src/SlideshowPage.vala:161
-msgid "Back"
-msgstr "Înapoi"
-
-#: src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "Mergi la fotografia anterioară"
-
-#: src/SlideshowPage.vala:168 src/SlideshowPage.vala:273
-msgid "Pause"
-msgstr "Pauză"
-
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:274
-msgid "Pause the slideshow"
-msgstr "Pune prezentarea de diapozitive în așteptare"
-
-#: src/SlideshowPage.vala:175
-msgid "Next"
-msgstr "Următoarea"
-
-#: src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "Mergi la fotografia următoare"
-
-#: src/SlideshowPage.vala:183
-msgid "Change slideshow settings"
-msgstr "Modificați configurările prezentării de diapozitive"
-
-#: src/SlideshowPage.vala:237
-msgid "All photo source files are missing."
-msgstr "Toate fișierele sursă ale fotografiilor lipsesc."
-
-#: src/SlideshowPage.vala:269
-msgid "Play"
-msgstr "Redă"
-
-#: src/SlideshowPage.vala:270
-msgid "Continue the slideshow"
-msgstr "Reia prezentarea de diapozitive"
-
-#: src/Commands.vala:733
-msgid "Reverting"
-msgstr "Se revine"
-
-#: src/Commands.vala:733
-msgid "Undoing Revert"
-msgstr "Se anulează revenirea"
-
-#: src/Commands.vala:777
-msgid "Enhancing"
-msgstr "Se îmbunătățește"
-
-#: src/Commands.vala:777
-msgid "Undoing Enhance"
-msgstr "Se anulează îmbunătățirea"
-
-#: src/Commands.vala:845
-msgid "Applying Color Transformations"
-msgstr "Se aplică transformările de culoare"
-
-#: src/Commands.vala:845
-msgid "Undoing Color Transformations"
-msgstr "Se anulează transformările de culoare"
-
-#: src/Commands.vala:995
-msgid "Creating New Event"
-msgstr "Se creează eveniment nou"
-
-#: src/Commands.vala:996
-msgid "Removing Event"
-msgstr "Se șterge eveniment"
-
-#: src/Commands.vala:1005
-msgid "Moving Photos to New Event"
-msgstr "Se mută fotografii către eveniment nou"
-
-#: src/Commands.vala:1006
-msgid "Setting Photos to Previous Event"
-msgstr "Se asociază fotografii cu evenimentul anterior"
-
-#: src/Commands.vala:1063
-msgid "Merging"
-msgstr "Se unește"
-
-#: src/Commands.vala:1064
-msgid "Unmerging"
-msgstr "Se desparte"
-
-#: src/Commands.vala:1073
-msgid "Duplicating photos"
-msgstr "Se duplică fotografii"
-
-#: src/Commands.vala:1073
-msgid "Removing duplicated photos"
-msgstr "Se șterg fotografii duplicate"
-
-#: src/Commands.vala:1096
-#, 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] "Nu se poate duplica o fotografie din cauza unei erori în fișier"
-msgstr[1] "Nu se pot duplica %d fotografii din cauza unor erori în fișier"
-msgstr[2] "Nu se pot duplica %d de fotografii din cauza unor erori în fișier"
-
-#: src/Commands.vala:1183
-msgid "Restoring previous rating"
-msgstr "Se restaurează aprecierea anterioară"
-
-#: src/Commands.vala:1193 src/Commands.vala:1194
-msgid "Increasing ratings"
-msgstr "Se mărește aprecierea"
-
-#: src/Commands.vala:1193 src/Commands.vala:1194
-msgid "Decreasing ratings"
-msgstr "Se micșorează aprecierea"
-
-#: src/Commands.vala:1244
-msgid "Setting RAW developer"
-msgstr "Configurare programator RAW"
-
-#: src/Commands.vala:1244
-msgid "Restoring previous RAW developer"
-msgstr "Restaurare programator anterior RAW"
-
-#: src/Commands.vala:1245
-msgid "Set Developer"
-msgstr "Programator set"
-
-#: src/Commands.vala:1335
-msgid "Original photo could not be adjusted."
-msgstr "Fotografia originală nu poate fi modificată"
-
-#: src/Commands.vala:1356
-msgid "Adjusting Date and Time"
-msgstr "Se modifică ora și data"
-
-#: src/Commands.vala:1356
-msgid "Undoing Date and Time Adjustment"
-msgstr "Se anulează modificarea orei și a datei"
-
-#: src/Commands.vala:1387
-msgid "One original photo could not be adjusted."
-msgid_plural "The following original photos could not be adjusted."
-msgstr[0] "O fotografie originală nu poate fi modificată."
-msgstr[1] "Următoarele fotografii originale nu pot fi modificate."
-msgstr[2] "Următoarele fotografii originale nu pot fi modificate."
-
-#: src/Commands.vala:1389 src/Commands.vala:1413
-msgid "Time Adjustment Error"
-msgstr "Eroare la modificarea orei"
-
-#: src/Commands.vala:1411
-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] "Nu se poate modifica ora pentru următorul fișier imagine."
-msgstr[1] "Nu se poate modifica ora pentru următoarele fișiere imagine."
-msgstr[2] "Nu se poate modifica ora pentru următoarele fișiere imagine."
-
-#: src/Commands.vala:1625 src/Commands.vala:1648
-msgid "Create Tag"
-msgstr "Creează etichetă"
-
-#: src/Commands.vala:1683
-#, c-format
-msgid "Move Tag \"%s\""
-msgstr "Mută eticheta \"%s\""
-
-#: src/Commands.vala:2335
-msgid "Move Photos to Trash"
-msgstr "Mută fotografiile în coșul de gunoi"
-
-#: src/Commands.vala:2335
-msgid "Restore Photos from Trash"
-msgstr "Restaurează fotografiile din coșul de gunoi"
-
-#: src/Commands.vala:2336
-msgid "Move the photos to the Shotwell trash"
-msgstr "Mută fotografiile în coșul de gunoi Shotwell"
-
-#: src/Commands.vala:2336
-msgid "Restore the photos back to the Shotwell library"
-msgstr "Restaurează fotografiile în colecția Shotwell"
-
-#: src/Commands.vala:2355
-msgid "Moving Photos to Trash"
-msgstr "Se mută fotografiile la coșul de gunoi"
-
-#: src/Commands.vala:2355
-msgid "Restoring Photos From Trash"
-msgstr "Se restaurează fotografiile din coșul de gunoi"
-
-#: src/Commands.vala:2441
-msgid "Flag selected photos"
-msgstr "Marchează fotografiile selectate"
-
-#: src/Commands.vala:2442
-msgid "Unflag selected photos"
-msgstr "Demarchează fotografiile selectate "
-
-#: src/Commands.vala:2443
-msgid "Flagging selected photos"
-msgstr "Marchează fotografiile selectate"
-
-#: src/Commands.vala:2444
-msgid "Unflagging selected photos"
-msgstr "Demarchează fotografiile selectate "
-
-#: src/Commands.vala:2451
-msgid "Flag"
-msgstr "Marcare"
-
-#: src/Commands.vala:2451
-msgid "Unflag"
-msgstr "Demarcare"
-
-#: src/photos/RawSupport.vala:134
-msgid "RAW"
-msgstr "RAW"
-
-#: src/photos/RawSupport.vala:297 src/MediaPage.vala:420
-msgid "Shotwell"
-msgstr "Shotwell"
-
-#: src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr "BMP"
-
-#: src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
-
-#: src/photos/JfifSupport.vala:182
-#, c-format
-msgid "Low (%d%%)"
-msgstr "Mică (%d%%)"
-
-#: src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "Medie (%d%%)"
-
-#: src/photos/JfifSupport.vala:188
-#, c-format
-msgid "High (%d%%)"
-msgstr "Mare (%d%%)"
-
-#: src/photos/JfifSupport.vala:191
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "Maximă (%d%%)"
-
-#: src/photos/PngSupport.vala:30
-msgid "PNG"
-msgstr "PNG"
-
-#: src/photos/TiffSupport.vala:86
-msgid "TIFF"
-msgstr "TIFF"
-
-#: src/Page.vala:1268
-msgid "No photos/videos"
-msgstr "Nicio fotografie/niciun clip video"
-
-#: src/Page.vala:1272
-msgid "No photos/videos found"
-msgstr "Nicio fotografie/niciun clip video nu a fost găsit"
-
-#: src/Page.vala:2569
-msgid "Photos cannot be exported to this directory."
-msgstr "Fotografiile nu pot fi exportate în acest director"
-
-#: src/MediaMonitor.vala:400
-#, c-format
-msgid "Unable to process monitoring updates: %s"
-msgstr "Nu se pot procesa actualizările monitorizate: %s"
-
-#: src/Printing.vala:255
+#: ../src/Printing.vala:255
 msgid "Fill the entire page"
 msgstr "Pe toată pagina"
 
-#: src/Printing.vala:256
+#: ../src/Printing.vala:256
 msgid "2 images per page"
 msgstr "2 imagini pe pagină"
 
-#: src/Printing.vala:257
+#: ../src/Printing.vala:257
 msgid "4 images per page"
 msgstr "4 imagini pe pagină"
 
-#: src/Printing.vala:258
+#: ../src/Printing.vala:258
 msgid "6 images per page"
 msgstr "6 imagini pe pagină"
 
-#: src/Printing.vala:259
+#: ../src/Printing.vala:259
 msgid "8 images per page"
 msgstr "8 imagini pe pagină"
 
-#: src/Printing.vala:260
+#: ../src/Printing.vala:260
 msgid "16 images per page"
-msgstr "16 "
+msgstr "16 imagini pe pagină"
 
-#: src/Printing.vala:261
+#: ../src/Printing.vala:261
 msgid "32 images per page"
 msgstr "32 imagini pe pagină"
 
-#: src/Printing.vala:348
+#: ../src/Printing.vala:348
 msgid "in."
 msgstr "in."
 
-#: src/Printing.vala:349
+#: ../src/Printing.vala:349
 msgid "cm"
 msgstr "cm"
 
-#: src/Printing.vala:817 src/editing_tools/EditingTools.vala:757
+#: ../src/Printing.vala:817 ../src/editing_tools/EditingTools.vala:761
 msgid "Wallet (2 x 3 in.)"
 msgstr "Portofel (2 × 3 in.)"
 
-#: src/Printing.vala:820 src/editing_tools/EditingTools.vala:758
+#: ../src/Printing.vala:820 ../src/editing_tools/EditingTools.vala:762
 msgid "Notecard (3 x 5 in.)"
 msgstr "Carnet notițe (3 × 5 in.)"
 
-#: src/Printing.vala:823 src/editing_tools/EditingTools.vala:759
+#: ../src/Printing.vala:823 ../src/editing_tools/EditingTools.vala:763
 msgid "4 x 6 in."
 msgstr "4 × 6 in."
 
-#: src/Printing.vala:826 src/editing_tools/EditingTools.vala:760
+#: ../src/Printing.vala:826 ../src/editing_tools/EditingTools.vala:764
 msgid "5 x 7 in."
 msgstr "5 × 7 in."
 
-#: src/Printing.vala:829 src/editing_tools/EditingTools.vala:761
+#: ../src/Printing.vala:829 ../src/editing_tools/EditingTools.vala:765
 msgid "8 x 10 in."
 msgstr "8 × 10 in."
 
-#: src/Printing.vala:832 src/editing_tools/EditingTools.vala:763
+#: ../src/Printing.vala:832 ../src/editing_tools/EditingTools.vala:767
 msgid "11 x 14 in."
 msgstr "11 × 14 in."
 
-#: src/Printing.vala:835 src/editing_tools/EditingTools.vala:765
+#: ../src/Printing.vala:835 ../src/editing_tools/EditingTools.vala:769
 msgid "16 x 20 in."
 msgstr "16 x 20 in."
 
-#: src/Printing.vala:841 src/editing_tools/EditingTools.vala:767
+#: ../src/Printing.vala:841 ../src/editing_tools/EditingTools.vala:771
 msgid "Metric Wallet (9 x 13 cm)"
 msgstr "Portofel metric (9 × 13 cm)"
 
-#: src/Printing.vala:844 src/editing_tools/EditingTools.vala:768
+#: ../src/Printing.vala:844 ../src/editing_tools/EditingTools.vala:772
 msgid "Postcard (10 x 15 cm)"
 msgstr "Carte poștală (10 × 15 cm)"
 
-#: src/Printing.vala:847 src/editing_tools/EditingTools.vala:769
+#: ../src/Printing.vala:847 ../src/editing_tools/EditingTools.vala:773
 msgid "13 x 18 cm"
 msgstr "13 x 18 cm"
 
-#: src/Printing.vala:850 src/editing_tools/EditingTools.vala:770
+#: ../src/Printing.vala:850 ../src/editing_tools/EditingTools.vala:774
 msgid "18 x 24 cm"
 msgstr "18 x 24 cm"
 
-#: src/Printing.vala:853 src/editing_tools/EditingTools.vala:772
+#: ../src/Printing.vala:853 ../src/editing_tools/EditingTools.vala:776
 msgid "20 x 30 cm"
 msgstr "20 x 30 cm"
 
-#: src/Printing.vala:856 src/editing_tools/EditingTools.vala:773
+#: ../src/Printing.vala:856 ../src/editing_tools/EditingTools.vala:777
 msgid "24 x 40 cm"
 msgstr "24 x 40 cm"
 
-#: src/Printing.vala:859 src/editing_tools/EditingTools.vala:774
+#: ../src/Printing.vala:859 ../src/editing_tools/EditingTools.vala:778
 msgid "30 x 40 cm"
 msgstr "30 x 40 cm"
 
-#: src/Printing.vala:875
+#: ../src/Printing.vala:875
 msgid "Image Settings"
 msgstr "Configurări imagine"
 
-#: src/Printing.vala:888
+#: ../src/Printing.vala:888
 msgid "Printing..."
 msgstr "Se tipărește..."
 
-#: src/Printing.vala:908 src/Printing.vala:1111
+#: ../src/Printing.vala:908 ../src/Printing.vala:1111
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -2241,1528 +2879,1833 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
-msgstr "Nu se poate deschide/crea baza de date %s cu fotografii: cod eroare %d"
+#: ../src/Properties.vala:84
+msgid "Today"
+msgstr "Azi"
 
-#: src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
-msgstr ""
-"Nu se poate scrie în baza de date a fotografiilor:\n"
-" %s"
+#: ../src/Properties.vala:86
+msgid "Yesterday"
+msgstr "Ieri"
 
-#: src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
-msgstr ""
-"Eroare la accesarea fișierului bazei de date:\n"
-" %s\n"
-"\n"
-"Eroarea a fost: \n"
-"%s"
+#: ../src/Properties.vala:227 ../src/camera/ImportPage.vala:312
+msgid "RAW+JPEG"
+msgstr "RAW+JPEG"
 
-#: src/VideoSupport.vala:464
-msgid "Export Videos"
-msgstr "Exportă clipurile"
+#: ../src/Properties.vala:343
+msgid "Items:"
+msgstr "Elemente:"
 
-#: src/DesktopIntegration.vala:118
+#: ../src/Properties.vala:346
 #, c-format
-msgid "Unable to launch Nautilus Send-To: %s"
-msgstr "Nu se poate lansa Nautilus Send-To: %s"
-
-#: src/DesktopIntegration.vala:126
-msgid "Send To"
-msgstr "Trimite la"
+msgid "%d Event"
+msgid_plural "%d Events"
+msgstr[0] "%d eveniment"
+msgstr[1] "%d evenimente"
+msgstr[2] "%d de evenimente"
 
-#: src/DesktopIntegration.vala:171
+#: ../src/Properties.vala:353 ../src/events/EventDirectoryItem.vala:87
 #, c-format
-msgid "Unable to export background to %s: %s"
-msgstr "Fundalul desktopului nu poate fi exportat către %s: %s"
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] "%d fotografie"
+msgstr[1] "%d fotografii"
+msgstr[2] "%d de fotografii"
 
-#: src/DesktopIntegration.vala:299
+#: ../src/Properties.vala:355 ../src/events/EventDirectoryItem.vala:85
 #, c-format
-msgid "Unable to prepare desktop slideshow: %s"
-msgstr "Nu se poate pregăti prezentarea de diapozitive: %s"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:587
-#: src/SearchFilter.vala:588 src/SearchFilter.vala:990
-msgid "Flagged"
-msgstr "Marcate"
-
-#: src/library/TrashPage.vala:8
-msgid "Trash"
-msgstr "Coș de gunoi"
-
-#: src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "Coșul de gunoi este gol"
-
-#: src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "Şterge"
-
-#: src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-msgstr "Se șterg fotografiile"
-
-#: src/library/OfflinePage.vala:8
-msgid "Missing Files"
-msgstr "Fișiere lipsă"
-
-#: src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "Se șterge..."
-
-#: src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "Ultimul import"
-
-#: src/library/LibraryWindow.vala:301
-msgid "_Import From Folder..."
-msgstr "_Importă din dosar..."
-
-#: src/library/LibraryWindow.vala:302
-msgid "Import photos from disk to library"
-msgstr "Importă fotografiile de pe disc în colecție"
-
-#: src/library/LibraryWindow.vala:309
-msgid "Import From _Application..."
-msgstr "Importare din _aplicație..."
-
-#: src/library/LibraryWindow.vala:313
-msgid "Sort _Events"
-msgstr "Sortează _evenimente"
-
-#: src/library/LibraryWindow.vala:323
-msgid "Empty T_rash"
-msgstr "_Golește coșul de gunoi"
-
-#: src/library/LibraryWindow.vala:324
-msgid "Delete all photos in the trash"
-msgstr "Șterge toate fotografiile din coșul de gunoi"
-
-#: src/library/LibraryWindow.vala:329
-msgid "View Eve_nt for Photo"
-msgstr "Vizualizare eve_niment pentru fotografie"
-
-#: src/library/LibraryWindow.vala:334
-msgid "_Find"
-msgstr "_Caută"
-
-#: src/library/LibraryWindow.vala:335
-msgid "Find photos and videos by search criteria"
-msgstr "Căutați fotografii și clipuri video după criterii de căutare"
-
-#: src/library/LibraryWindow.vala:352 src/direct/DirectPhotoPage.vala:46
-msgid "_File"
-msgstr "_Fișier"
-
-#: src/library/LibraryWindow.vala:356 src/direct/DirectPhotoPage.vala:73
-msgid "_Edit"
-msgstr "_Editare"
-
-#: src/library/LibraryWindow.vala:364 src/direct/DirectPhotoPage.vala:77
-msgid "_Photo"
-msgstr "F_otografie"
-
-#: src/library/LibraryWindow.vala:368
-msgid "_Photos"
-msgstr "_Fotografii"
-
-#: src/library/LibraryWindow.vala:372
-msgid "Even_ts"
-msgstr "Evenimen_te"
-
-#: src/library/LibraryWindow.vala:376 src/MediaPage.vala:454
-msgid "Ta_gs"
-msgstr "Etichete"
-
-#: src/library/LibraryWindow.vala:380 src/direct/DirectPhotoPage.vala:169
-msgid "_Help"
-msgstr "_Ajutor"
-
-#: src/library/LibraryWindow.vala:391
-msgid "_Basic Information"
-msgstr "Informații de _bază"
-
-#: src/library/LibraryWindow.vala:392
-msgid "Display basic information for the selection"
-msgstr "Afișează informații de bază pentru selecție"
-
-#: src/library/LibraryWindow.vala:397
-msgid "E_xtended Information"
-msgstr "Informații e_xtinse"
-
-#: src/library/LibraryWindow.vala:398
-msgid "Display extended information for the selection"
-msgstr "Afișează informații extinse despre selecție"
-
-#: src/library/LibraryWindow.vala:403
-msgid "_Search Bar"
-msgstr "_Bară căutare"
-
-#: src/library/LibraryWindow.vala:404
-msgid "Display the search bar"
-msgstr "Afișează bara de căutare"
-
-#: src/library/LibraryWindow.vala:409
-msgid "S_idebar"
-msgstr "Bară laterală"
-
-#: src/library/LibraryWindow.vala:410
-msgid "Display the sidebar"
-msgstr "Afișează bara laterală"
-
-#: src/library/LibraryWindow.vala:422 src/MediaPage.vala:494
-msgid "_Ascending"
-msgstr "_Crescător"
-
-#: src/library/LibraryWindow.vala:423 src/MediaPage.vala:495
-msgid "Sort photos in an ascending order"
-msgstr "Sortează fotografiile în ordine crescătoare"
-
-#: src/library/LibraryWindow.vala:429 src/MediaPage.vala:500
-msgid "D_escending"
-msgstr "D_escrescător"
-
-#: src/library/LibraryWindow.vala:430 src/MediaPage.vala:501
-msgid "Sort photos in a descending order"
-msgstr "Sortează fotografiile în ordine descrescătoare"
+msgid "%d Video"
+msgid_plural "%d Videos"
+msgstr[0] "Un video"
+msgstr[1] "%d videouri"
+msgstr[2] "%d de videouri"
 
-#: src/library/LibraryWindow.vala:668
-msgid "Import From Folder"
-msgstr "Importă din dosar"
+#. display only one date if start and end are the same
+#: ../src/Properties.vala:377
+msgid "Date:"
+msgstr "Data:"
 
-#: src/library/LibraryWindow.vala:737
-msgid "Empty Trash"
-msgstr "Golește coșul de gunoi"
+#. display only one time if start and end are the same
+#: ../src/Properties.vala:381
+msgid "Time:"
+msgstr "Oră:"
 
-#: src/library/LibraryWindow.vala:737
-msgid "Emptying Trash..."
-msgstr "Se golește coșul de gunoi..."
+#. display time range
+#. display date range
+#: ../src/Properties.vala:384 ../src/Properties.vala:389
+msgid "From:"
+msgstr "De la:"
 
-#: src/library/LibraryWindow.vala:896
-msgid "Shotwell is configured to import photos to your home directory.\n"
-msgstr ""
-"Shotwell este configurat să importe fotografiile în directorul personal.\n"
+#: ../src/Properties.vala:385 ../src/Properties.vala:390
+msgid "To:"
+msgstr "În:"
 
-#: src/library/LibraryWindow.vala:899
-msgid "Library Location"
-msgstr "Amplasare colecție"
+#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1890
+msgid "Size:"
+msgstr "Dimensiune:"
 
-#: src/library/LibraryWindow.vala:912
-msgid "Photos cannot be imported from this directory."
-msgstr "Fotografiile din acest director nu pot fi importate."
+#: ../src/Properties.vala:404
+msgid "Duration:"
+msgstr "Durată:"
 
-#: src/library/LibraryWindow.vala:1200
+#: ../src/Properties.vala:404
 #, c-format
-msgid "%s (%d%%)"
-msgstr "%s (%d%%)"
-
-#: src/library/LibraryWindow.vala:1244 src/library/LibraryWindow.vala:1255
-msgid "Updating library..."
-msgstr "Se actualizează colecția..."
-
-#: src/library/LibraryWindow.vala:1261
-msgid "Preparing to auto-import photos..."
-msgstr "Se pregătește importul automat al fotografiilor..."
-
-#: src/library/LibraryWindow.vala:1266
-msgid "Auto-importing photos..."
-msgstr "Se importă automat fotografiile..."
-
-#: src/library/LibraryWindow.vala:1274
-msgid "Writing metadata to files..."
-msgstr "Se scriu metadatele fișierelor..."
-
-#: src/library/Branch.vala:37
-msgid "Library"
-msgstr "Colecție"
+msgid "%.1f seconds"
+msgstr "%.1f secunde"
 
-#: src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "Se importă..."
+#: ../src/Properties.vala:408
+msgid "Developer:"
+msgstr "Programator:"
 
-#: src/library/ImportQueuePage.vala:66
-msgid "_Stop Import"
-msgstr "_Oprește importul"
+#. fit both on the top line, emit and move on
+#: ../src/Properties.vala:436 ../src/Properties.vala:440
+#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2258
+msgid "Exposure:"
+msgstr "Expunere:"
 
-#: src/library/ImportQueuePage.vala:67
-msgid "Stop importing photos"
-msgstr "Oprește importul fotografiilor"
+#. nothing special to be done for now for Events
+#: ../src/Properties.vala:583
+msgid "Location:"
+msgstr "Loc:"
 
-#: src/library/ImportQueuePage.vala:123
-msgid "Preparing to import..."
-msgstr "Se pregătește importul..."
+#: ../src/Properties.vala:586
+msgid "File size:"
+msgstr "Dimensiune fișier:"
 
-#: src/library/ImportQueuePage.vala:150
-#, c-format
-msgid "Imported %s"
-msgstr "Importate %s"
+#: ../src/Properties.vala:590
+msgid "Current Development:"
+msgstr "Dezvoltare curentă:"
 
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:413
-msgid "_Save"
-msgstr "_Salvează"
+#: ../src/Properties.vala:592
+msgid "Original dimensions:"
+msgstr "Dimensiune originală:"
 
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Salvează fotografia"
+#: ../src/Properties.vala:595
+msgid "Camera make:"
+msgstr "Marcă aparat foto:"
 
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "Salvează c_a..."
+#: ../src/Properties.vala:598
+msgid "Camera model:"
+msgstr "Model aparat foto:"
 
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Salvează fotografia sub un alt nume"
+#: ../src/Properties.vala:601
+msgid "Flash:"
+msgstr "Bliț:"
 
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Tipărește fotografia utilizând o imprimantă conectată la calculator"
+#: ../src/Properties.vala:603
+msgid "Focal length:"
+msgstr "Distanța focală:"
 
-#: src/direct/DirectPhotoPage.vala:223
-#, c-format
-msgid "%s does not exist."
-msgstr "%s nu există."
+#: ../src/Properties.vala:606
+msgid "Exposure date:"
+msgstr "Data expunerii:"
 
-#: src/direct/DirectPhotoPage.vala:225
-#, c-format
-msgid "%s is not a file."
-msgstr "%s nu este un fișier."
+#: ../src/Properties.vala:609
+msgid "Exposure time:"
+msgstr "Timp de expunere:"
 
-#: src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr ""
-"%s nu recunoaște formatul fișierului\n"
-"%s."
+#: ../src/Properties.vala:612
+msgid "Exposure bias:"
+msgstr "Expunere:"
 
-#: src/direct/DirectPhotoPage.vala:413
-msgid "_Save a Copy"
-msgstr "_Salvează o copie"
+#: ../src/Properties.vala:614
+msgid "GPS latitude:"
+msgstr "Latitudine GPS:"
 
-#: src/direct/DirectPhotoPage.vala:416
-#, c-format
-msgid "Lose changes to %s?"
-msgstr "Pierdeți modificările pentru %s?"
+#: ../src/Properties.vala:617
+msgid "GPS longitude:"
+msgstr "Longitudine GPS:"
 
-#: src/direct/DirectPhotoPage.vala:417
-msgid "Close _without Saving"
-msgstr "Înc_hide fără salvare"
+#: ../src/Properties.vala:620
+msgid "Artist:"
+msgstr "Autor:"
 
-#: src/direct/DirectPhotoPage.vala:450
-#, c-format
-msgid "Error while saving to %s: %s"
-msgstr "Eroare la salvarea în %s: %s"
+#: ../src/Properties.vala:622
+msgid "Copyright:"
+msgstr "Drepturi de autor:"
 
-#: src/direct/DirectPhotoPage.vala:478 src/direct/DirectPhotoPage.vala:499
-msgid "Save As"
-msgstr "Salvează ca"
+#: ../src/Properties.vala:624
+msgid "Software:"
+msgstr "Software:"
 
-#: src/DirectoryMonitor.vala:889
-#, c-format
-msgid "Unable to monitor %s: Not a directory (%s)"
-msgstr "%s nu poate fi monitorizat: nu este un dosar (%s)"
+#: ../src/Properties.vala:639
+msgid "Extended Information"
+msgstr "Informații extinse"
 
-#: src/Resources.vala:17
+#: ../src/Resources.vala:17
 msgid "Photo Manager"
-msgstr "Administrator fotografii"
+msgstr "Administrator de fotografii"
 
-#: src/Resources.vala:18
+#: ../src/Resources.vala:18
 msgid "Photo Viewer"
-msgstr "Vizualizator fotografii"
-
-#: src/Resources.vala:27 plugins/shotwell-publishing/YouTubePublishing.vala:32
-#: plugins/shotwell-publishing/FlickrPublishing.vala:34
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:32
-#: plugins/shotwell-publishing/PicasaPublishing.vala:32
-#: plugins/shotwell-publishing/FacebookPublishing.vala:32
-#: plugins/shotwell-data-imports/FSpotImporter.vala:34
-msgid "Copyright 2009-2013 Yorba Foundation"
-msgstr "Copyright 2009-2013 Yorba Foundation"
-
-#: src/Resources.vala:144
+msgstr "Vizualizator de fotografii"
+
+#: ../src/Resources.vala:142
 msgid "Rotate _Right"
 msgstr "Rotește la _dreapta"
 
-#: src/Resources.vala:145 src/Resources.vala:150
+#: ../src/Resources.vala:143 ../src/Resources.vala:148
 msgid "Rotate"
 msgstr "Rotire"
 
-#: src/Resources.vala:146
+#: ../src/Resources.vala:144
 msgid "Rotate Right"
 msgstr "Rotește la dreapta"
 
-#: src/Resources.vala:147
+#: ../src/Resources.vala:145
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr ""
 "Rotește fotografiile către dreapta (apăsați Ctrl pentru a roti către stânga)"
 
-#: src/Resources.vala:149
+#: ../src/Resources.vala:147
 msgid "Rotate _Left"
 msgstr "Rotește la _stânga"
 
-#: src/Resources.vala:151
+#: ../src/Resources.vala:149
 msgid "Rotate Left"
 msgstr "Rotește la stânga"
 
-#: src/Resources.vala:152
+#: ../src/Resources.vala:150
 msgid "Rotate the photos left"
 msgstr "Rotește fotografia la stânga"
 
-#: src/Resources.vala:154
+#: ../src/Resources.vala:152
 msgid "Flip Hori_zontally"
 msgstr "Inversează pe ori_zontală"
 
-#: src/Resources.vala:155
+#: ../src/Resources.vala:153
 msgid "Flip Horizontally"
 msgstr "Inversează pe orizontală"
 
-#: src/Resources.vala:157
+#: ../src/Resources.vala:155
 msgid "Flip Verti_cally"
 msgstr "Inversează pe _verticală"
 
-#: src/Resources.vala:158
+#: ../src/Resources.vala:156
 msgid "Flip Vertically"
 msgstr "Inversează pe verticală"
 
-#: src/Resources.vala:160
+#: ../src/Resources.vala:158
 msgid "_Enhance"
 msgstr "Î_mbunătățește"
 
-#: src/Resources.vala:161
+#: ../src/Resources.vala:159
 msgid "Enhance"
 msgstr "Îmbunătățire"
 
-#: src/Resources.vala:162
+#: ../src/Resources.vala:160
 msgid "Automatically improve the photo's appearance"
 msgstr "Îmbunătățește automat aspectul fotografiei"
 
-#: src/Resources.vala:164
+#: ../src/Resources.vala:162
 msgid "_Copy Color Adjustments"
 msgstr "_Copiază ajustările de culoare"
 
-#: src/Resources.vala:165
+#: ../src/Resources.vala:163
 msgid "Copy Color Adjustments"
-msgstr "_Copiază ajustările de culoare"
+msgstr "Copiază ajustările de culoare"
 
-#: src/Resources.vala:166
+#: ../src/Resources.vala:164
 msgid "Copy the color adjustments applied to the photo"
-msgstr "_Copiază ajustările de culoare aplicate fotografiei"
+msgstr "Copiază ajustările de culoare aplicate fotografiei"
 
-#: src/Resources.vala:168
+#: ../src/Resources.vala:166
 msgid "_Paste Color Adjustments"
-msgstr "Lipește ajustările de culoare"
+msgstr "Li_pește ajustările de culoare"
 
-#: src/Resources.vala:169
+#: ../src/Resources.vala:167
 msgid "Paste Color Adjustments"
 msgstr "Lipește ajustările de culoare"
 
-#: src/Resources.vala:170
+#: ../src/Resources.vala:168
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Aplică ajustările de culoare copiate fotografiilor selectate"
 
-#: src/Resources.vala:172
+#: ../src/Resources.vala:170
 msgid "_Crop"
 msgstr "De_cupare"
 
-#: src/Resources.vala:173
+#: ../src/Resources.vala:171
 msgid "Crop"
 msgstr "Trunchiere"
 
-#: src/Resources.vala:174
+#: ../src/Resources.vala:172
 msgid "Crop the photo's size"
 msgstr "Decupează dimensiunea fotografiei"
 
-#: src/Resources.vala:176 src/editing_tools/StraightenTool.vala:100
+#: ../src/Resources.vala:174 ../src/editing_tools/StraightenTool.vala:100
 msgid "_Straighten"
 msgstr "Î_mbunătățire"
 
-#: src/Resources.vala:177
+#: ../src/Resources.vala:175
 msgid "Straighten"
 msgstr "Îmbunătățire"
 
-#: src/Resources.vala:178
+#: ../src/Resources.vala:176
 msgid "Straighten the photo"
 msgstr "Îmbunătățire fotografie"
 
-#: src/Resources.vala:180
+#: ../src/Resources.vala:178
 msgid "_Red-eye"
 msgstr "Ochi _roșii"
 
-#: src/Resources.vala:181
+#: ../src/Resources.vala:179
 msgid "Red-eye"
 msgstr "Ochi roșii"
 
-#: src/Resources.vala:182
+#: ../src/Resources.vala:180
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Reduce sau elimină efectul de ochi roșii din fotografie"
 
-#: src/Resources.vala:184
+#: ../src/Resources.vala:182
 msgid "_Adjust"
 msgstr "_Modifică"
 
-#: src/Resources.vala:185
+#: ../src/Resources.vala:183
 msgid "Adjust"
 msgstr "Modifică"
 
-#: src/Resources.vala:186
+#: ../src/Resources.vala:184
 msgid "Adjust the photo's color and tone"
 msgstr "Modifică culorile și nuanțele fotografiei"
 
-#: src/Resources.vala:188
+#: ../src/Resources.vala:186
 msgid "Re_vert to Original"
 msgstr "Re_vino la original"
 
-#: src/Resources.vala:189
+#: ../src/Resources.vala:187
 msgid "Revert to Original"
 msgstr "Revenire la original"
 
-#: src/Resources.vala:191
+#: ../src/Resources.vala:189
 msgid "Revert External E_dits"
 msgstr "Anulează e_ditările externe"
 
-#: src/Resources.vala:192
+#: ../src/Resources.vala:190
 msgid "Revert to the master photo"
 msgstr "Revenire la fotografia de bază"
 
-#: src/Resources.vala:194
+#: ../src/Resources.vala:192
 msgid "Set as _Desktop Background"
-msgstr "Configurează ca fundal des_ktop"
+msgstr "Stabilește ca fundal _desktop"
 
-#: src/Resources.vala:195
+#: ../src/Resources.vala:193
 msgid "Set selected image to be the new desktop background"
-msgstr "Configurează imaginea aleasă ca fundal nou pentru spațiul de lucru"
+msgstr "Stabilețe imaginea aleasă ca fundal nou pentru desktop"
 
-#: src/Resources.vala:196
+#: ../src/Resources.vala:194
 msgid "Set as _Desktop Slideshow..."
-msgstr "Configurează prezentare diapozitive ca fundal des_ktop..."
+msgstr "Stabilește ca prezentare diapozitive pentru _desktop..."
 
-#: src/Resources.vala:198
+#: ../src/Resources.vala:196
 msgid "_Undo"
 msgstr "An_ulează"
 
-#: src/Resources.vala:199
+#: ../src/Resources.vala:197
 msgid "Undo"
 msgstr "Anulează"
 
-#: src/Resources.vala:201
+#: ../src/Resources.vala:199
 msgid "_Redo"
 msgstr "_Refă"
 
-#: src/Resources.vala:202
+#: ../src/Resources.vala:200
 msgid "Redo"
 msgstr "Refacere"
 
-#: src/Resources.vala:204
+#: ../src/Resources.vala:202
 msgid "Re_name Event..."
-msgstr "Rede_numește eveniment..."
+msgstr "Rede_numește evenimentul..."
 
-#: src/Resources.vala:207
+#: ../src/Resources.vala:205
 msgid "Make _Key Photo for Event"
 msgstr "S_tabilește miniatură pentru eveniment"
 
-#: src/Resources.vala:208
+#: ../src/Resources.vala:206
 msgid "Make Key Photo for Event"
 msgstr "Stabilește miniatură pentru eveniment"
 
-#: src/Resources.vala:210
+#: ../src/Resources.vala:208
 msgid "_New Event"
 msgstr "Eveniment _nou"
 
-#: src/Resources.vala:211
+#: ../src/Resources.vala:209
 msgid "New Event"
 msgstr "Eveniment nou"
 
-#: src/Resources.vala:213
+#: ../src/Resources.vala:211
 msgid "Move Photos"
 msgstr "Mută fotografiile"
 
-#: src/Resources.vala:214
+#: ../src/Resources.vala:212
 msgid "Move photos to an event"
 msgstr "Mută fotografiile către un eveniment"
 
-#: src/Resources.vala:216
+#: ../src/Resources.vala:214
 msgid "_Merge Events"
 msgstr "Unește eveni_mentele"
 
-#: src/Resources.vala:217
+#: ../src/Resources.vala:215
 msgid "Merge"
 msgstr "Unește"
 
-#: src/Resources.vala:218
+#: ../src/Resources.vala:216
 msgid "Combine events into a single event"
 msgstr "Combină evenimentele într-un singur eveniment"
 
-#: src/Resources.vala:220
+#: ../src/Resources.vala:218
 msgid "_Set Rating"
-msgstr "_Stabilește apreciere"
+msgstr "_Stabilește aprecierea"
 
-#: src/Resources.vala:221
+#: ../src/Resources.vala:219
 msgid "Set Rating"
 msgstr "Stabilește apreciere"
 
-#: src/Resources.vala:222
+#: ../src/Resources.vala:220
 msgid "Change the rating of your photo"
 msgstr "Schimbă aprecierea pentru fotografie"
 
-#: src/Resources.vala:224
+#: ../src/Resources.vala:222
 msgid "_Increase"
 msgstr "_Mărește"
 
-#: src/Resources.vala:225
+#: ../src/Resources.vala:223
 msgid "Increase Rating"
 msgstr "Mărește aprecierea"
 
-#: src/Resources.vala:227
+#: ../src/Resources.vala:225
 msgid "_Decrease"
 msgstr "M_icșorează"
 
-#: src/Resources.vala:228
+#: ../src/Resources.vala:226
 msgid "Decrease Rating"
 msgstr "Micșorează aprecierea"
 
-#: src/Resources.vala:230
+#: ../src/Resources.vala:228
 msgid "_Unrated"
 msgstr "_Fără apreciere"
 
-#: src/Resources.vala:231
+#: ../src/Resources.vala:229
 msgid "Unrated"
 msgstr "Necotate"
 
-#: src/Resources.vala:232
+#: ../src/Resources.vala:230
 msgid "Rate Unrated"
 msgstr "Apreciează fotografia ca necotată"
 
-#: src/Resources.vala:233
+#: ../src/Resources.vala:231
 msgid "Setting as unrated"
-msgstr "Configurează ca necotată"
+msgstr "Se stabilește ca necotată"
 
-#: src/Resources.vala:234
+#: ../src/Resources.vala:232
 msgid "Remove any ratings"
 msgstr "Șterge toate aprecierile"
 
-#: src/Resources.vala:236
+#: ../src/Resources.vala:234
 msgid "_Rejected"
 msgstr "_Respinsă"
 
-#: src/Resources.vala:237
+#: ../src/Resources.vala:235
 msgid "Rejected"
 msgstr "Respins"
 
-#: src/Resources.vala:238
+#: ../src/Resources.vala:236
 msgid "Rate Rejected"
 msgstr "Apreciază ca respinsă"
 
-#: src/Resources.vala:239
+#: ../src/Resources.vala:237
 msgid "Setting as rejected"
-msgstr "Configurare ca respinsă"
+msgstr "Se stabilește ca respinsă"
 
-#: src/Resources.vala:240
+#: ../src/Resources.vala:238
 msgid "Set rating to rejected"
-msgstr "Configurează aprecierea ca respinsă"
+msgstr "Stabilește aprecierea ca respinsă"
 
-#: src/Resources.vala:242
+#: ../src/Resources.vala:240
 msgid "Rejected _Only"
 msgstr "D_oar cele respinse"
 
-#: src/Resources.vala:243
+#: ../src/Resources.vala:241
 msgid "Rejected Only"
 msgstr "Numai fotografiile respinse"
 
-#: src/Resources.vala:244
+#: ../src/Resources.vala:242
 msgid "Show only rejected photos"
 msgstr "Arată doar fotografiile respinse"
 
-#: src/Resources.vala:246
+#: ../src/Resources.vala:244
 msgid "All + _Rejected"
 msgstr "Toate + _Respinse"
 
-#: src/Resources.vala:247 src/Resources.vala:248
+#: ../src/Resources.vala:245 ../src/Resources.vala:246
 msgid "Show all photos, including rejected"
 msgstr "Arată toate fotografiile, inclusiv cele respinse"
 
-#: src/Resources.vala:250
+#: ../src/Resources.vala:248
 msgid "_All Photos"
 msgstr "To_ate fotografiile"
 
-#: src/Resources.vala:251 src/Resources.vala:252
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:250 ../src/Resources.vala:252
 msgid "Show all photos"
 msgstr "Arată toate fotografiile"
 
-#: src/Resources.vala:254
+#: ../src/Resources.vala:254
 msgid "_Ratings"
 msgstr "Ap_recieri"
 
-#: src/Resources.vala:255
+#: ../src/Resources.vala:255
 msgid "Display each photo's rating"
 msgstr "Afișează aprecierea fiecărei fotografii"
 
-#: src/Resources.vala:257
+#: ../src/Resources.vala:257
 msgid "_Filter Photos"
 msgstr "_Filtrează fotografiile"
 
-#: src/Resources.vala:258
+#: ../src/Resources.vala:258
 msgid "Filter Photos"
 msgstr "Filtrează fotografiile"
 
-#: src/Resources.vala:259
+#: ../src/Resources.vala:259
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Limitează numărul fotografiilor afișate pe baza unui filtru"
 
-#: src/Resources.vala:261
+#: ../src/Resources.vala:261
 msgid "_Duplicate"
 msgstr "_Duplicare"
 
-#: src/Resources.vala:262
+#: ../src/Resources.vala:262
 msgid "Duplicate"
 msgstr "Duplicare"
 
-#: src/Resources.vala:263
+#: ../src/Resources.vala:263
 msgid "Make a duplicate of the photo"
 msgstr "Creează un duplicat al fotografiei"
 
-#: src/Resources.vala:265
+#: ../src/Resources.vala:265
 msgid "_Export..."
 msgstr "_Exportă..."
 
-#: src/Resources.vala:267
+#: ../src/Resources.vala:267
 msgid "_Print..."
-msgstr "Ti_părește ..."
+msgstr "Ti_părește..."
 
-#: src/Resources.vala:269
+#: ../src/Resources.vala:269
 msgid "Pu_blish..."
 msgstr "Pu_blică..."
 
-#: src/Resources.vala:270
-msgid "Publish"
-msgstr "Publică"
-
-#: src/Resources.vala:271
+#: ../src/Resources.vala:271
 msgid "Publish to various websites"
 msgstr "Publică pe diferite site-uri web"
 
-#: src/Resources.vala:273
+#: ../src/Resources.vala:273
 msgid "Edit _Title..."
 msgstr "Edi_tare nume..."
 
-#: src/Resources.vala:276
+#: ../src/Resources.vala:277
 msgid "Edit _Comment..."
 msgstr "Modifică_Comentariu..."
 
-#: src/Resources.vala:277
+#. Button label
+#: ../src/Resources.vala:279
 msgid "Edit Comment"
 msgstr "Modifică comentariu"
 
-#: src/Resources.vala:279
+#: ../src/Resources.vala:281
 msgid "Edit Event _Comment..."
-msgstr "Editează _comentariu despre eveniment"
+msgstr "Editează _comentariu despre eveniment..."
 
-#: src/Resources.vala:282
+#: ../src/Resources.vala:284
 msgid "_Adjust Date and Time..."
-msgstr "Regle_ază ora și data.."
+msgstr "Regle_ază ora și data..."
 
-#: src/Resources.vala:283
+#: ../src/Resources.vala:285
 msgid "Adjust Date and Time"
 msgstr "Reglează ora și data"
 
-#: src/Resources.vala:285
+#: ../src/Resources.vala:287
 msgid "Add _Tags..."
 msgstr "Adaugă e_tichete..."
 
-#: src/Resources.vala:286
+#: ../src/Resources.vala:288
 msgid "_Add Tags..."
-msgstr "_Adaugă etichete"
+msgstr "_Adaugă etichete..."
 
-#: src/Resources.vala:287 src/Resources.vala:318
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:290 ../src/Resources.vala:323
 msgid "Add Tags"
 msgstr "Adaugă etichete"
 
-#: src/Resources.vala:289
+#: ../src/Resources.vala:292
 msgid "_Preferences"
 msgstr "_Preferințe"
 
-#: src/Resources.vala:291
+#: ../src/Resources.vala:294
 msgid "Open With E_xternal Editor"
 msgstr "Deschide cu editor e_xtern"
 
-#: src/Resources.vala:293
+#: ../src/Resources.vala:296
 msgid "Open With RA_W Editor"
 msgstr "Deschide cu un editor RA_W"
 
-#: src/Resources.vala:295
+#: ../src/Resources.vala:298
 msgid "Send _To..."
 msgstr "_Trimite la..."
 
-#: src/Resources.vala:296
+#: ../src/Resources.vala:299
 msgid "Send T_o..."
 msgstr "_Trimite la..."
 
-#: src/Resources.vala:298
+#: ../src/Resources.vala:301
 msgid "_Find..."
 msgstr "_Caută..."
 
-#: src/Resources.vala:299
+#: ../src/Resources.vala:302
 msgid "Find"
 msgstr "Căutare"
 
-#: src/Resources.vala:300
+#: ../src/Resources.vala:303
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Căutați o imagine după textul care apare în denumire sau în etichete"
 
-#: src/Resources.vala:302
+#: ../src/Resources.vala:305
 msgid "_Flag"
 msgstr "Ma_rcare"
 
-#: src/Resources.vala:304
+#: ../src/Resources.vala:307
 msgid "Un_flag"
 msgstr "Dema_rcare"
 
-#: src/Resources.vala:307
+#: ../src/Resources.vala:310
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Nu se poate lansa editorul: %s"
 
-#: src/Resources.vala:312
+#: ../src/Resources.vala:315
 #, c-format
 msgid "Add Tag \"%s\""
-msgstr "Adaugă eticheta \"%s\""
+msgstr "Adaugă eticheta „%s”"
 
-#: src/Resources.vala:314
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:318
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
-msgstr "Adaugă etichetele \"%s\" și \"%s\""
+msgstr "Adaugă etichetele „%s” și „%s”"
 
-#: src/Resources.vala:322
+#: ../src/Resources.vala:328
 #, c-format
 msgid "_Delete Tag \"%s\""
-msgstr "Șter_ge eticheta \"%s\""
+msgstr "Șter_ge eticheta „%s”"
 
-#: src/Resources.vala:326
+#: ../src/Resources.vala:332
 #, c-format
 msgid "Delete Tag \"%s\""
-msgstr "Șterge eticheta \"%s\""
+msgstr "Șterge eticheta „%s”"
 
-#: src/Resources.vala:329
+#: ../src/Resources.vala:335
 msgid "Delete Tag"
 msgstr "Șterge eticheta"
 
-#: src/Resources.vala:332
+#: ../src/Resources.vala:338
 msgid "_New"
 msgstr "_Nou"
 
-#: src/Resources.vala:335
+#: ../src/Resources.vala:341
 #, c-format
 msgid "Re_name Tag \"%s\"..."
-msgstr "Rede_numește eticheta \"%s\"..."
+msgstr "Rede_numește eticheta „%s”..."
 
-#: src/Resources.vala:339
+#: ../src/Resources.vala:345
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
-msgstr "Redenumește eticheta \"%s\" în \"%s\""
+msgstr "Redenumește eticheta „%s” în „%s”"
 
-#: src/Resources.vala:342
+#: ../src/Resources.vala:348
 msgid "_Rename..."
 msgstr "_Redenumește..."
 
-#: src/Resources.vala:344
+#: ../src/Resources.vala:350
 msgid "Modif_y Tags..."
 msgstr "Mod_ifică etichetele..."
 
-#: src/Resources.vala:345
+#: ../src/Resources.vala:351
 msgid "Modify Tags"
 msgstr "Modifică etichetele"
 
-#: src/Resources.vala:348
+#: ../src/Resources.vala:354
 #, c-format
 msgid "Tag Photo as \"%s\""
-msgstr "Etichetează fotografiile ca \"%s\""
+msgstr "Etichetează fotografia ca „%s”"
 
-#: src/Resources.vala:348
+#: ../src/Resources.vala:354
 #, c-format
 msgid "Tag Photos as \"%s\""
-msgstr "Etichetează fotografia ca \"%s\""
+msgstr "Etichetează fotografiile ca „%s”"
 
-#: src/Resources.vala:352
+#: ../src/Resources.vala:358
 #, c-format
 msgid "Tag the selected photo as \"%s\""
-msgstr "Etichetează fotografiile selectate ca \"%s\""
+msgstr "Etichetează fotografia selectată ca „%s”"
 
-#: src/Resources.vala:353
+#: ../src/Resources.vala:359
 #, c-format
 msgid "Tag the selected photos as \"%s\""
-msgstr "Etichetează fotografiile salvate ca \"%s\""
+msgstr "Etichetează fotografiile selectate ca „%s”"
 
-#: src/Resources.vala:357
+#: ../src/Resources.vala:363
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
-msgstr "Șterge eticheta \"%s\" din _fotografii"
+msgstr "Șterge eticheta „%s” din _fotografie"
 
-#: src/Resources.vala:358
+#: ../src/Resources.vala:364
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
-msgstr "Șterge eticheta \"%s\" din fo_tografii"
+msgstr "Șterge eticheta „%s” din _fotografii"
 
-#: src/Resources.vala:362
+#: ../src/Resources.vala:368
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
-msgstr "Șterge eticheta \"%s\" din fotografii"
+msgstr "Șterge eticheta „%s” din fotografie"
 
-#: src/Resources.vala:363
+#: ../src/Resources.vala:369
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
-msgstr " Șterge eticheta \"%s\" din fotografii"
+msgstr "Șterge eticheta „%s” din fotografii"
 
-#: src/Resources.vala:367
+#: ../src/Resources.vala:373
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
-msgstr "Nu se poate redenumi eticheta în \"%s\" deoarece există deja."
+msgstr "Nu se poate redenumi eticheta în „%s” deoarece există deja."
 
-#: src/Resources.vala:371
+#: ../src/Resources.vala:377
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
-msgstr "Nu se poate redenumi căutarea în \"%s\" deoarece căutarea există deja."
+msgstr "Nu se poate redenumi căutarea în „%s” deoarece căutarea există deja."
 
-#: src/Resources.vala:374
+#: ../src/Resources.vala:380
 msgid "Saved Search"
 msgstr "Căutare salvată"
 
-#: src/Resources.vala:376
+#: ../src/Resources.vala:382
 msgid "Delete Search"
 msgstr "Șterge căutarea"
 
-#: src/Resources.vala:379
+#: ../src/Resources.vala:385
 msgid "_Edit..."
 msgstr "_Editare..."
 
-#: src/Resources.vala:380
+#: ../src/Resources.vala:386
 msgid "Re_name..."
 msgstr "Rede_numește..."
 
-#: src/Resources.vala:383
+#: ../src/Resources.vala:389
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
-msgstr "Redenumește căutarea \"%s\" în \"%s\""
+msgstr "Redenumește căutarea „%s” în „%s”"
 
-#: src/Resources.vala:387
+#: ../src/Resources.vala:393
 #, c-format
 msgid "Delete Search \"%s\""
-msgstr "Șterge căutarea \"%s\""
+msgstr "Șterge căutarea „%s”"
 
-#: src/Resources.vala:545
+#: ../src/Resources.vala:551
 #, c-format
 msgid "Rate %s"
 msgstr "Apreciere %s"
 
-#: src/Resources.vala:546
+#: ../src/Resources.vala:552
 #, c-format
 msgid "Set rating to %s"
-msgstr "Configurează aprecierea la %s"
+msgstr "Stabilește aprecierea la %s"
 
-#: src/Resources.vala:547
+#: ../src/Resources.vala:553
 #, c-format
 msgid "Setting rating to %s"
-msgstr "Configurare apreciere la %s"
+msgstr "Se stabilește apreciere la %s"
 
-#: src/Resources.vala:549
+#: ../src/Resources.vala:555
 #, c-format
 msgid "Display %s"
 msgstr "Afișează %s"
 
-#: src/Resources.vala:550
+#: ../src/Resources.vala:556
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Afișează numai fotografiile cu aprecierea %s"
 
-#: src/Resources.vala:551
+#: ../src/Resources.vala:557
 #, c-format
 msgid "%s or Better"
 msgstr "%s sau mai mare"
 
-#: src/Resources.vala:552
+#: ../src/Resources.vala:558
 #, c-format
 msgid "Display %s or Better"
 msgstr "Afișează %s sau mai mare"
 
-#: src/Resources.vala:553
+#: ../src/Resources.vala:559
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Afișează numai fotografiile cu aprecierea %s sau mai mare"
 
-#: src/Resources.vala:644
+#: ../src/Resources.vala:650
 msgid "Remove the selected photos from the trash"
 msgstr "Șterge fotografiile selectate din coșul de gunoi"
 
-#: src/Resources.vala:645
+#: ../src/Resources.vala:651
 msgid "Remove the selected photos from the library"
 msgstr "Șterge fotografiile selectate din colecție"
 
-#: src/Resources.vala:647
+#: ../src/Resources.vala:653
 msgid "_Restore"
 msgstr "_Restaurează"
 
-#: src/Resources.vala:648
+#: ../src/Resources.vala:654
 msgid "Move the selected photos back into the library"
 msgstr "Mută fotografiile selectate înapoi în colecție"
 
-#: src/Resources.vala:650
+#: ../src/Resources.vala:656
 msgid "Show in File Mana_ger"
 msgstr "Arată în a_dministratorul de fișiere"
 
-#: src/Resources.vala:651
+#: ../src/Resources.vala:657
 msgid "Open the selected photo's directory in the file manager"
 msgstr "Deschide dosarul fotografiei selectate în administratorul de fișiere"
 
-#: src/Resources.vala:654
+#: ../src/Resources.vala:660
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Nu se poate deschide în administratorul de fișiere: %s"
 
-#: src/Resources.vala:657
+#: ../src/Resources.vala:663
 msgid "R_emove From Library"
 msgstr "Șt_erge din colecție"
 
-#: src/Resources.vala:659
+#: ../src/Resources.vala:665
 msgid "_Move to Trash"
 msgstr "_Mută la coșul de gunoi"
 
-#: src/Resources.vala:661
+#: ../src/Resources.vala:667
 msgid "Select _All"
 msgstr "Selecte_ază tot"
 
-#: src/Resources.vala:662
+#: ../src/Resources.vala:668
 msgid "Select all items"
 msgstr "Selectează toate articolele"
 
-#: src/Resources.vala:740
+#. ...precache the timestamp string...
+#. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:749
 msgid "%-I:%M %p"
 msgstr "%-I:%M %p"
 
-#: src/Resources.vala:741
+#. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:754
 msgid "%-I:%M:%S %p"
 msgstr "%-I:%M:%S %p"
 
-#: src/Resources.vala:742
+#. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:758
 msgid "%a %b %d, %Y"
 msgstr "%a %d %b %Y"
 
-#: src/Resources.vala:743 src/Resources.vala:745
+#. / Locale-specific starting date format for multi-date strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#. / Locale-specific calendar date format for multi-month strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:763 ../src/Resources.vala:773
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: src/Resources.vala:744
+#. / Locale-specific ending date format for multi-date strings,
+#. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:768
 msgid "%d, %Y"
 msgstr "%d, %Y"
 
-#: src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr "Unghi:"
+#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
+msgid "Slideshow"
+msgstr "Prezentare diapozitive"
 
-#: src/editing_tools/StraightenTool.vala:102
-#: src/editing_tools/EditingTools.vala:2204
-msgid "_Reset"
-msgstr "_Restabilește"
+#. Flagged label and toggle
+#: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
+#: ../src/SearchFilter.vala:970 ../src/library/FlaggedPage.vala:8
+msgid "Flagged"
+msgstr "Marcate"
+
+#: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
+msgid "Photos"
+msgstr "Fotografii"
+
+#: ../src/SearchFilter.vala:599 ../src/SearchFilter.vala:600
+msgid "Videos"
+msgstr "Videouri"
+
+#: ../src/SearchFilter.vala:605
+msgid "RAW Photos"
+msgstr "Fotografii RAW"
+
+#: ../src/SearchFilter.vala:606
+msgid "RAW photos"
+msgstr "Fotografii RAW"
+
+#: ../src/SearchFilter.vala:932
+#, c-format
+msgid "Error loading UI file %s: %s"
+msgstr "Eroare la încărcarea fișierului UI %s: %s"
+
+#. Type label and toggles
+#: ../src/SearchFilter.vala:949
+msgid "Type"
+msgstr "Tip"
+
+#. Rating label and button
+#: ../src/SearchFilter.vala:983 ../src/searches/SearchBoolean.vala:184
+msgid "Rating"
+msgstr "Cotare"
+
+#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:182
+msgid "Settings"
+msgstr "Opțiuni"
+
+#. Set up toolbar
+#. add toolbar buttons
+#: ../src/SlideshowPage.vala:161
+msgid "Back"
+msgstr "Înapoi"
+
+#: ../src/SlideshowPage.vala:162
+msgid "Go to the previous photo"
+msgstr "Mergi la fotografia anterioară"
+
+#: ../src/SlideshowPage.vala:168 ../src/SlideshowPage.vala:273
+msgid "Pause"
+msgstr "Pauză"
+
+#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:274
+msgid "Pause the slideshow"
+msgstr "Pune prezentarea de diapozitive în așteptare"
+
+#: ../src/SlideshowPage.vala:175
+msgid "Next"
+msgstr "Următoarea"
+
+#: ../src/SlideshowPage.vala:176
+msgid "Go to the next photo"
+msgstr "Mergi la fotografia următoare"
+
+#: ../src/SlideshowPage.vala:183
+msgid "Change slideshow settings"
+msgstr "Modificați configurările prezentării de diapozitive"
+
+#. An entire slideshow set might be missing, so check for a loop.
+#: ../src/SlideshowPage.vala:237
+msgid "All photo source files are missing."
+msgstr "Toate fișierele sursă ale fotografiilor lipsesc."
+
+#: ../src/SlideshowPage.vala:269
+msgid "Play"
+msgstr "Redă"
+
+#: ../src/SlideshowPage.vala:270
+msgid "Continue the slideshow"
+msgstr "Reia prezentarea de diapozitive"
+
+#: ../src/Tag.vala:817
+msgid "untitled"
+msgstr "fără nume"
 
-#: src/editing_tools/EditingTools.vala:661
+#. multiple videos
+#: ../src/VideoSupport.vala:489
+msgid "Export Videos"
+msgstr "Exportă videourile"
+
+#: ../src/camera/Branch.vala:87
+msgid "Cameras"
+msgstr "Aparate foto"
+
+#: ../src/camera/ImportPage.vala:459
+msgid ""
+"Unable to unmount camera.  Try unmounting the camera from the file manager."
+msgstr ""
+"Aparatul foto nu poate fi demontat.  Încercați să demontați dispozitivul din "
+"administratorul de fișiere."
+
+#. hide duplicates checkbox
+#: ../src/camera/ImportPage.vala:776
+msgid "Hide photos already imported"
+msgstr "Ascunde fotografiile importate deja"
+
+#: ../src/camera/ImportPage.vala:777
+msgid "Only display photos that have not been imported"
+msgstr "Afișează doar fotografiile care nu au fost importate"
+
+#. Ticket #3304 - Import page shouldn't display confusing message
+#. prior to import.
+#. TODO: replace this with approved text for "talking to camera,
+#. please wait" once new strings are being accepted.
+#: ../src/camera/ImportPage.vala:845
+msgid "Starting import, please wait..."
+msgstr "Se pornește importarea, așteptați..."
+
+#: ../src/camera/ImportPage.vala:884
+msgid "Import _Selected"
+msgstr "Importă _selecția"
+
+#: ../src/camera/ImportPage.vala:885
+msgid "Import the selected photos into your library"
+msgstr "Importați fotografiile selectate în colecția dumneavoastră"
+
+#: ../src/camera/ImportPage.vala:890
+msgid "Import _All"
+msgstr "Importă _tot"
+
+#: ../src/camera/ImportPage.vala:891
+msgid "Import all the photos into your library"
+msgstr "Importați toate fotografiile în colecția dumneavoastră"
+
+#. it's mounted, offer to unmount for the user
+#: ../src/camera/ImportPage.vala:1012
+msgid ""
+"Shotwell needs to unmount the camera from the filesystem in order to access "
+"it.  Continue?"
+msgstr ""
+"Shotwell trebuie să demonteze aparatul foto din sistemul de fișiere pentru a-"
+"l accesa.  Continuați?"
+
+#: ../src/camera/ImportPage.vala:1018
+msgid "_Unmount"
+msgstr "_Demontează"
+
+#: ../src/camera/ImportPage.vala:1023
+msgid "Please unmount the camera."
+msgstr "Demontați aparatul foto."
+
+#: ../src/camera/ImportPage.vala:1028
+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 ""
+"Aparatul foto este blocat de o altă aplicație.  Shotwell poate accesa "
+"aparatul foto numai dacă acesta nu este blocat.  Închideți orice altă "
+"aplicație care folosește aparatul foto și încercați din nou."
+
+#: ../src/camera/ImportPage.vala:1038
+msgid "Please close any other application using the camera."
+msgstr "Închideți orice aplicație care folosește aparatul foto."
+
+#: ../src/camera/ImportPage.vala:1043
+#, c-format
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
+msgstr ""
+"Nu se poate realiza previzualizarea fotografiilor din aparatul foto:\n"
+"%s"
+
+#: ../src/camera/ImportPage.vala:1060
+msgid "Unmounting..."
+msgstr "Se demontează..."
+
+#: ../src/camera/ImportPage.vala:1166
+msgid "Fetching photo information"
+msgstr "Se aduc informațiile despre fotografii"
+
+#: ../src/camera/ImportPage.vala:1521
+#, c-format
+msgid "Fetching preview for %s"
+msgstr "Previzualizare pentru %s"
+
+#: ../src/camera/ImportPage.vala:1637
+#, c-format
+msgid "Unable to lock camera: %s"
+msgstr "Aparatul foto nu poate fi blocat: %s"
+
+#: ../src/camera/ImportPage.vala:1722
+#, c-format
+msgid "Delete this photo from camera?"
+msgid_plural "Delete these %d photos from camera?"
+msgstr[0] "Ștergeți această fotografie din aparatul foto?"
+msgstr[1] "Ștergeți aceste %d fotografii din aparatul foto?"
+msgstr[2] "Ștergeți aceste %d de fotografii din aparatul foto?"
+
+#: ../src/camera/ImportPage.vala:1725
+#, c-format
+msgid "Delete this video from camera?"
+msgid_plural "Delete these %d videos from camera?"
+msgstr[0] "Ștergeți acest video din aparatul foto?"
+msgstr[1] "Ștergeți aceste %d videouri din aparatul foto?"
+msgstr[2] "Ștergeți aceste %d de videouri din aparatul foto?"
+
+#: ../src/camera/ImportPage.vala:1728
+#, c-format
+msgid "Delete this photo/video from camera?"
+msgid_plural "Delete these %d photos/videos from camera?"
+msgstr[0] "Ștergeți această fotografie/acest video din aparatul foto?"
+msgstr[1] "Ștergeți aceste %d fotografii/videouri din aparatul foto?"
+msgstr[2] "Ștergeți aceste %d de fotografii/videouri din aparatul foto?"
+
+#: ../src/camera/ImportPage.vala:1731
+#, c-format
+msgid "Delete these files from camera?"
+msgid_plural "Delete these %d files from camera?"
+msgstr[0] "Ștergeți acest fișier din aparatul foto?"
+msgstr[1] "Ștergeți aceste %d fișiere din aparatul foto?"
+msgstr[2] "Ștergeți aceste %d de fișiere din aparatul foto?"
+
+#: ../src/camera/ImportPage.vala:1758
+msgid "Removing photos/videos from camera"
+msgstr "Se șterg fotografiile/videourile din aparatul foto"
+
+#: ../src/camera/ImportPage.vala:1762
+#, 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] ""
+"O fotografie/un video nu poate fi ștearsă/șters din aparatul foto din cauza "
+"unor erori."
+msgstr[1] ""
+"%d fotografii/videouri nu pot fi șterse din aparatul foto din cauza unor "
+"erori."
+msgstr[2] ""
+"%d de fotografii/videouri nu pot fi șterse din aparatul foto din cauza unor "
+"erori."
+
+#: ../src/data_imports/DataImports.vala:22
+msgid "Data Imports"
+msgstr "Importare date"
+
+#. Send an empty job to the queue to mark the end of the import
+#: ../src/data_imports/DataImportsPluginHost.vala:65
+#: ../src/data_imports/DataImportsPluginHost.vala:78
+#, c-format
+msgid "%s Database"
+msgstr "Baza de date %s"
+
+#: ../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 "Importarea din %s nu poate continua din cauza unei erori:"
+
+#: ../src/data_imports/DataImportsPluginHost.vala:151
+msgid "To try importing from another service, select one from the above menu."
+msgstr ""
+"Pentru a încerca importarea din alt serviciu, alegeți unul din meniul de mai "
+"jos."
+
+#: ../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 ""
+"Nu ați activat niciun modul pentru importarea datelor.\n"
+"\n"
+"Pentru a utiliza funcția de importare din aplicație, trebuie să activați cel "
+"puțin un modul pentru importarea datelor. Modulele pot fi activate din "
+"dialogul Preferințe."
+
+#: ../src/data_imports/DataImportsUI.vala:100
+msgid "Database file:"
+msgstr "Fișierul bazei de date:"
+
+#: ../src/data_imports/DataImportsUI.vala:112
+#: ../src/library/LibraryWindow.vala:899
+msgid "_Import"
+msgstr "_Importă"
+
+#: ../src/data_imports/DataImportsUI.vala:217
+msgid "Import From Application"
+msgstr "Importare din aplicație"
+
+#: ../src/data_imports/DataImportsUI.vala:369
+#: ../src/publishing/PublishingUI.vala:470
+msgid "_Close"
+msgstr "În_chide"
+
+#: ../src/db/DatabaseTable.vala:37
+#, c-format
+msgid "Unable to open/create photo database %s: error code %d"
+msgstr "Nu se poate deschide/crea baza de date %s cu fotografii: cod eroare %d"
+
+#: ../src/db/DatabaseTable.vala:46
+#, c-format
+msgid ""
+"Unable to write to photo database file:\n"
+" %s"
+msgstr ""
+"Nu se poate scrie în baza de date a fotografiilor:\n"
+" %s"
+
+#: ../src/db/DatabaseTable.vala:48
+#, c-format
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
+msgstr ""
+"Eroare la accesarea fișierului bazei de date:\n"
+" %s\n"
+"\n"
+"Eroarea a fost: \n"
+"%s"
+
+#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:352
+msgid "_File"
+msgstr "_Fișier"
+
+#: ../src/direct/DirectPhotoPage.vala:51
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save"
+msgstr "_Salvează"
+
+#: ../src/direct/DirectPhotoPage.vala:52
+msgid "Save photo"
+msgstr "Salvează fotografia"
+
+#: ../src/direct/DirectPhotoPage.vala:57
+msgid "Save _As..."
+msgstr "Salvează c_a..."
+
+#: ../src/direct/DirectPhotoPage.vala:58
+msgid "Save photo with a different name"
+msgstr "Salvează fotografia sub un alt nume"
+
+#: ../src/direct/DirectPhotoPage.vala:69
+msgid "Print the photo to a printer connected to your computer"
+msgstr "Tipărește fotografia utilizând o imprimantă conectată la calculator"
+
+#: ../src/direct/DirectPhotoPage.vala:73 ../src/library/LibraryWindow.vala:356
+msgid "_Edit"
+msgstr "_Editare"
+
+#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:364
+msgid "_Photo"
+msgstr "F_otografie"
+
+#: ../src/direct/DirectPhotoPage.vala:169
+#: ../src/library/LibraryWindow.vala:380
+msgid "_Help"
+msgstr "_Ajutor"
+
+#: ../src/direct/DirectPhotoPage.vala:227
+#, c-format
+msgid "%s does not exist."
+msgstr "%s nu există."
+
+#: ../src/direct/DirectPhotoPage.vala:229
+#, c-format
+msgid "%s is not a file."
+msgstr "%s nu este un fișier."
+
+#: ../src/direct/DirectPhotoPage.vala:231
+#, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
+msgstr ""
+"%s nu recunoaște formatul fișierului\n"
+"%s."
+
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save a Copy"
+msgstr "_Salvează o copie"
+
+#: ../src/direct/DirectPhotoPage.vala:425
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "Pierdeți modificările pentru %s?"
+
+#: ../src/direct/DirectPhotoPage.vala:426
+msgid "Close _without Saving"
+msgstr "Înc_hide fără salvare"
+
+#: ../src/direct/DirectPhotoPage.vala:459
+#, c-format
+msgid "Error while saving to %s: %s"
+msgstr "Eroare la salvarea în %s: %s"
+
+#: ../src/direct/DirectPhotoPage.vala:487
+#: ../src/direct/DirectPhotoPage.vala:508
+msgid "Save As"
+msgstr "Salvează ca"
+
+#: ../src/editing_tools/EditingTools.vala:665
 msgid "Return to current photo dimensions"
 msgstr "Restabilește dimensiunile originale ale fotografiei"
 
-#: src/editing_tools/EditingTools.vala:664
+#: ../src/editing_tools/EditingTools.vala:668
 msgid "Set the crop for this photo"
 msgstr "Stabilește aria de selecție pentru această fotografie"
 
-#: src/editing_tools/EditingTools.vala:676
+#: ../src/editing_tools/EditingTools.vala:680
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Rotește aria de selecție între orientările portret și peisaj"
 
-#: src/editing_tools/EditingTools.vala:749
+#: ../src/editing_tools/EditingTools.vala:753
 msgid "Unconstrained"
 msgstr "Fără limitări"
 
-#: src/editing_tools/EditingTools.vala:750
+#: ../src/editing_tools/EditingTools.vala:754
 msgid "Square"
 msgstr "Pătrat"
 
-#: src/editing_tools/EditingTools.vala:751
+#: ../src/editing_tools/EditingTools.vala:755
 msgid "Screen"
 msgstr "Ecran"
 
-#: src/editing_tools/EditingTools.vala:752
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
-msgid "Original Size"
-msgstr "Dimensiune originală"
-
-#: src/editing_tools/EditingTools.vala:753
-#: src/editing_tools/EditingTools.vala:756
-#: src/editing_tools/EditingTools.vala:766
-#: src/editing_tools/EditingTools.vala:776
+#: ../src/editing_tools/EditingTools.vala:757
+#: ../src/editing_tools/EditingTools.vala:760
+#: ../src/editing_tools/EditingTools.vala:770
+#: ../src/editing_tools/EditingTools.vala:780
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:754
+#: ../src/editing_tools/EditingTools.vala:758
 msgid "SD Video (4 : 3)"
 msgstr "Video SD (4 : 3)"
 
-#: src/editing_tools/EditingTools.vala:755
+#: ../src/editing_tools/EditingTools.vala:759
 msgid "HD Video (16 : 9)"
 msgstr "Video HD (16 : 9)"
 
-#: src/editing_tools/EditingTools.vala:762
+#: ../src/editing_tools/EditingTools.vala:766
 msgid "Letter (8.5 x 11 in.)"
 msgstr "Scrisoare (215.9 mm × 279.4 mm)"
 
-#: src/editing_tools/EditingTools.vala:764
+#: ../src/editing_tools/EditingTools.vala:768
 msgid "Tabloid (11 x 17 in.)"
 msgstr "Tablou (11 x 17 in.)"
 
-#: src/editing_tools/EditingTools.vala:771
+#: ../src/editing_tools/EditingTools.vala:775
 msgid "A4 (210 x 297 mm)"
 msgstr "A4 (210 x 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:775
+#: ../src/editing_tools/EditingTools.vala:779
 msgid "A3 (297 x 420 mm)"
 msgstr "A3 (297 x 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1865
+#: ../src/editing_tools/EditingTools.vala:1905
 msgid "Close the red-eye tool"
 msgstr "Închide utilitarul pentru ochi roșii"
 
-#: src/editing_tools/EditingTools.vala:1868
+#: ../src/editing_tools/EditingTools.vala:1908
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Șterge toate efectele de ochi roșii din selecție"
 
-#: src/editing_tools/EditingTools.vala:2226
+#: ../src/editing_tools/EditingTools.vala:2244
+#: ../src/editing_tools/StraightenTool.vala:102
+msgid "_Reset"
+msgstr "_Restabilește"
+
+#: ../src/editing_tools/EditingTools.vala:2266
 msgid "Saturation:"
 msgstr "Culoare:"
 
-#: src/editing_tools/EditingTools.vala:2234
+#: ../src/editing_tools/EditingTools.vala:2274
 msgid "Tint:"
 msgstr "Nuanță:"
 
-#: src/editing_tools/EditingTools.vala:2243
+#: ../src/editing_tools/EditingTools.vala:2283
 msgid "Temperature:"
 msgstr "Temperatură:"
 
-#: src/editing_tools/EditingTools.vala:2251
+#: ../src/editing_tools/EditingTools.vala:2291
 msgid "Shadows:"
 msgstr "Umbre:"
 
-#: src/editing_tools/EditingTools.vala:2259
+#: ../src/editing_tools/EditingTools.vala:2299
 msgid "Highlights:"
 msgstr "Evidențieri:"
 
-#: src/editing_tools/EditingTools.vala:2313
+#: ../src/editing_tools/EditingTools.vala:2353
 msgid "Reset Colors"
 msgstr "Restabilește culorile"
 
-#: src/editing_tools/EditingTools.vala:2313
+#: ../src/editing_tools/EditingTools.vala:2353
 msgid "Reset all color adjustments to original"
 msgstr "Restabilește toate modificările culorilor la original"
 
-#: src/editing_tools/EditingTools.vala:2665
+#: ../src/editing_tools/EditingTools.vala:2705
 msgid "Temperature"
 msgstr "Temperatură"
 
-#: src/editing_tools/EditingTools.vala:2678
+#: ../src/editing_tools/EditingTools.vala:2718
 msgid "Tint"
 msgstr "Nuanță"
 
-#: src/editing_tools/EditingTools.vala:2691
+#: ../src/editing_tools/EditingTools.vala:2731
 msgid "Saturation"
 msgstr "Culoare"
 
-#: src/editing_tools/EditingTools.vala:2704
+#: ../src/editing_tools/EditingTools.vala:2744
 msgid "Exposure"
 msgstr "Expunere"
 
-#: src/editing_tools/EditingTools.vala:2717
+#: ../src/editing_tools/EditingTools.vala:2757
 msgid "Shadows"
 msgstr "Umbre"
 
-#: src/editing_tools/EditingTools.vala:2730
+#: ../src/editing_tools/EditingTools.vala:2770
 msgid "Highlights"
 msgstr "Evidențieri"
 
-#: src/editing_tools/EditingTools.vala:2740
+#: ../src/editing_tools/EditingTools.vala:2780
 msgid "Contrast Expansion"
 msgstr "Expansiune contrast"
 
-#: src/AppWindow.vala:49
-msgid "Pin Toolbar"
-msgstr "Fixează bară de unelte"
+#: ../src/editing_tools/StraightenTool.vala:99
+msgid "Angle:"
+msgstr "Unghi:"
 
-#: src/AppWindow.vala:50
-msgid "Pin the toolbar open"
-msgstr "Fixează bara de unelte deschisă"
+#: ../src/events/EventDirectoryItem.vala:83
+#, c-format
+msgid "%d Photo/Video"
+msgid_plural "%d Photos/Videos"
+msgstr[0] "O fotografie/Un video"
+msgstr[1] "%d fotografii/videouri"
+msgstr[2] "%d de fotografii/videouri"
 
-#: src/AppWindow.vala:53 src/AppWindow.vala:131
-msgid "Leave fullscreen"
-msgstr "Ieșire din modul pe tot ecranul"
+#: ../src/events/EventPage.vala:129
+msgid "No Event"
+msgstr "Fără eveniment"
 
-#: src/AppWindow.vala:130
-msgid "Leave _Fullscreen"
-msgstr "_Fereastră normală"
+#: ../src/events/EventsDirectoryPage.vala:131
+msgid "Display the comment of each event"
+msgstr "Afișează comentariul fiecărui eveniment"
 
-#: src/AppWindow.vala:491
-msgid "_Quit"
-msgstr "Ieșire"
+#: ../src/events/EventsDirectoryPage.vala:155
+msgid "No events"
+msgstr "Niciun eveniment"
 
-#: src/AppWindow.vala:496
-msgid "_About"
-msgstr "Despre"
+#: ../src/events/EventsDirectoryPage.vala:159
+msgid "No events found"
+msgstr "Nu a fost găsit niciun eveniment"
 
-#: src/AppWindow.vala:501
-msgid "Fulls_creen"
-msgstr "Pe tot e_cranul"
+#: ../src/events/EventsDirectoryPage.vala:230
+msgid "Events"
+msgstr "Evenimente"
 
-#: src/AppWindow.vala:506
-msgid "_Contents"
-msgstr "_Cuprins"
+#: ../src/events/EventsDirectoryPage.vala:244
+msgid "Undated"
+msgstr "Fără dată"
 
-#: src/AppWindow.vala:511
-msgid "_Frequently Asked Questions"
-msgstr "Întrebări _frecvente"
+#: ../src/events/EventsDirectoryPage.vala:245
+msgid "%Y"
+msgstr "%Y"
 
-#: src/AppWindow.vala:516
-msgid "_Report a Problem..."
-msgstr "_Raportează o Problemă..."
+#: ../src/events/EventsDirectoryPage.vala:246
+msgid "%B"
+msgstr "%B"
 
-#: src/AppWindow.vala:663
-#, c-format
-msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
-"continue.\n"
-"\n"
-"%s"
-msgstr ""
-"În timpul accesării colecției Shotwell a apărut o eroare majoră. Shotwell nu "
-"poate continua.\n"
-"\n"
-"%s"
+#: ../src/folders/Branch.vala:141
+msgid "Folders"
+msgstr "Dosare"
 
-#: src/AppWindow.vala:683 plugins/common/Resources.vala:9
-msgid "Visit the Yorba web site"
-msgstr "Vizitați site-ul web Yorba"
+#: ../src/library/Branch.vala:37 ../ui/shotwell.glade.h:32
+msgid "Library"
+msgstr "Colecție"
 
-#: src/AppWindow.vala:686 plugins/common/Resources.vala:28
-msgid "translator-credits"
-msgstr ""
-" Marian Vasile <marianvasile@upcmail.ro>, Corneliu Dascălu <corneliu."
-"dascalu@gmail.com>"
+#: ../src/library/ImportQueuePage.vala:8
+msgid "Importing..."
+msgstr "Se importă..."
 
-#: src/AppWindow.vala:695
-#, c-format
-msgid "Unable to display help: %s"
-msgstr "Nu se poate afișa pagina de ajutor: %s"
+#: ../src/library/ImportQueuePage.vala:66
+msgid "_Stop Import"
+msgstr "_Oprește importul"
 
-#: src/AppWindow.vala:703
-#, c-format
-msgid "Unable to navigate to bug database: %s"
-msgstr "Nu se poate naviga la baza de date cu bug-uri: %s"
+#: ../src/library/ImportQueuePage.vala:67
+msgid "Stop importing photos"
+msgstr "Oprește importul fotografiilor"
 
-#: src/AppWindow.vala:711
+#: ../src/library/ImportQueuePage.vala:123
+msgid "Preparing to import..."
+msgstr "Se pregătește importul..."
+
+#: ../src/library/ImportQueuePage.vala:150
 #, c-format
-msgid "Unable to display FAQ: %s"
-msgstr "Nu se pot afișa întrebările frecvente FAQ: %s"
+msgid "Imported %s"
+msgstr "Importate %s"
 
-#: src/Tag.vala:817
-msgid "untitled"
-msgstr "fără nume"
+#: ../src/library/LastImportPage.vala:8
+msgid "Last Import"
+msgstr "Ultimul import"
 
-#: src/Dimensions.vala:17
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1250
-msgid "Original size"
-msgstr "Dimensiune originală"
+#: ../src/library/LibraryWindow.vala:301
+msgid "_Import From Folder..."
+msgstr "_Importă din dosar..."
 
-#: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Lățime sau înălțime"
+#: ../src/library/LibraryWindow.vala:302
+msgid "Import photos from disk to library"
+msgstr "Importă fotografiile de pe disc în colecție"
 
-#: src/Dimensions.vala:23
-msgid "Width"
-msgstr "Lățime"
+#: ../src/library/LibraryWindow.vala:309
+msgid "Import From _Application..."
+msgstr "Importare din _aplicație..."
 
-#: src/Dimensions.vala:26
-msgid "Height"
-msgstr "Înalțime"
+#: ../src/library/LibraryWindow.vala:313
+msgid "Sort _Events"
+msgstr "Sortează _evenimente"
 
-#: src/MediaPage.vala:143
-msgid "Adjust the size of the thumbnails"
-msgstr "Modificați dimensiunea miniaturilor"
+#: ../src/library/LibraryWindow.vala:323
+msgid "Empty T_rash"
+msgstr "_Golește coșul de gunoi"
 
-#: src/MediaPage.vala:326
-msgid "Increase the magnification of the thumbnails"
-msgstr "Mărește dimensiunile miniaturilor"
+#: ../src/library/LibraryWindow.vala:324
+msgid "Delete all photos in the trash"
+msgstr "Șterge toate fotografiile din coșul de gunoi"
 
-#: src/MediaPage.vala:332
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Micșorează dimensiunile miniaturilor"
+#: ../src/library/LibraryWindow.vala:329
+msgid "View Eve_nt for Photo"
+msgstr "Vizualizare eve_niment pentru fotografie"
 
-#: src/MediaPage.vala:399
-msgid "Sort _Photos"
-msgstr "Sortează _fotografiile"
+#: ../src/library/LibraryWindow.vala:334
+msgid "_Find"
+msgstr "_Caută"
 
-#: src/MediaPage.vala:408
-msgid "_Play Video"
-msgstr "Redă cli_pul"
+#: ../src/library/LibraryWindow.vala:335
+msgid "Find photos and videos by search criteria"
+msgstr "Căutați fotografii și videouri după criterii de căutare"
 
-#: src/MediaPage.vala:409
-msgid "Open the selected videos in the system video player"
-msgstr "Deschide clipurile selectate cu playerul video implicit al sistemului"
+#: ../src/library/LibraryWindow.vala:346 ../src/searches/Branch.vala:77
+#: ../src/sidebar/Tree.vala:194
+msgid "Ne_w Saved Search..."
+msgstr "Căutare salvată no_uă..."
 
-#: src/MediaPage.vala:442 src/events/EventsDirectoryPage.vala:130
-msgid "_Comments"
-msgstr "_Comentarii"
+#: ../src/library/LibraryWindow.vala:368
+msgid "_Photos"
+msgstr "_Fotografii"
 
-#: src/MediaPage.vala:443
-msgid "Display the comment of each photo"
-msgstr "Afișează comentariul fiecărei fotografii"
+#: ../src/library/LibraryWindow.vala:372
+msgid "Even_ts"
+msgstr "Evenimen_te"
 
-#: src/MediaPage.vala:455
-msgid "Display each photo's tags"
-msgstr "Afișează eticheta fiecărei fotografii"
+#: ../src/library/LibraryWindow.vala:391
+msgid "_Basic Information"
+msgstr "Informații de _bază"
 
-#: src/MediaPage.vala:471
-msgid "By _Title"
-msgstr "După _nume"
+#: ../src/library/LibraryWindow.vala:392
+msgid "Display basic information for the selection"
+msgstr "Afișează informații de bază pentru selecție"
 
-#: src/MediaPage.vala:472
-msgid "Sort photos by title"
-msgstr "Sortează fotografiile după nume"
+#: ../src/library/LibraryWindow.vala:397
+msgid "E_xtended Information"
+msgstr "Informații e_xtinse"
 
-#: src/MediaPage.vala:477
-msgid "By Exposure _Date"
-msgstr "După _dată"
+#: ../src/library/LibraryWindow.vala:398
+msgid "Display extended information for the selection"
+msgstr "Afișează informații extinse despre selecție"
 
-#: src/MediaPage.vala:478
-msgid "Sort photos by exposure date"
-msgstr "Sortează fotografiile după data expunerii"
+#: ../src/library/LibraryWindow.vala:403
+msgid "_Search Bar"
+msgstr "_Bară căutare"
 
-#: src/MediaPage.vala:483
-msgid "By _Rating"
-msgstr "După ap_reciere"
+#: ../src/library/LibraryWindow.vala:404
+msgid "Display the search bar"
+msgstr "Afișează bara de căutare"
 
-#: src/MediaPage.vala:484
-msgid "Sort photos by rating"
-msgstr "Sortează fotografiile după apreciere"
+#: ../src/library/LibraryWindow.vala:409
+msgid "S_idebar"
+msgstr "Bară _laterală"
+
+#: ../src/library/LibraryWindow.vala:410
+msgid "Display the sidebar"
+msgstr "Afișează bara laterală"
+
+#: ../src/library/LibraryWindow.vala:668
+msgid "Import From Folder"
+msgstr "Importă din dosar"
+
+#: ../src/library/LibraryWindow.vala:737
+msgid "Empty Trash"
+msgstr "Golește coșul de gunoi"
+
+#: ../src/library/LibraryWindow.vala:737
+msgid "Emptying Trash..."
+msgstr "Se golește coșul de gunoi..."
 
-#: src/MediaPage.vala:702
+#: ../src/library/LibraryWindow.vala:896
 #, c-format
 msgid ""
-"Shotwell was unable to play the selected video:\n"
-"%s"
+"Shotwell is configured to import photos to your home directory.\n"
+"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
+"span>.\n"
+"Do you want to continue importing photos?"
 msgstr ""
-"Shotwell nu poate reda clipul selectat:\n"
-"%s"
+"Shotwell este configurat să importe fotografii în dosarul dumneavoastră "
+"personal.\n"
+"Vă recomandăm să schimbați acest lucru în <span weight=\"bold\">Editare %s "
+"Preferințe</span>.\n"
+"Doriți să continuați importarea fotografiilor?"
+
+#: ../src/library/LibraryWindow.vala:899 ../ui/shotwell.glade.h:18
+msgid "Library Location"
+msgstr "Amplasare colecție"
+
+#. TODO: Specify which directory/file.
+#: ../src/library/LibraryWindow.vala:912
+msgid "Photos cannot be imported from this directory."
+msgstr "Fotografiile din acest director nu pot fi importate."
 
-#: src/events/EventDirectoryItem.vala:83
+#: ../src/library/LibraryWindow.vala:1200
 #, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] "%d fotografii/clipuri"
-msgstr[1] "%d de fotografii/de clipuri"
-msgstr[2] "%d fotografie/clip"
+msgid "%s (%d%%)"
+msgstr "%s (%d%%)"
 
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Afișează comentariul fiecărui eveniment"
+#: ../src/library/LibraryWindow.vala:1244
+#: ../src/library/LibraryWindow.vala:1255
+msgid "Updating library..."
+msgstr "Se actualizează colecția..."
 
-#: src/events/EventsDirectoryPage.vala:155
-msgid "No events"
-msgstr "Niciun eveniment"
+#: ../src/library/LibraryWindow.vala:1261
+msgid "Preparing to auto-import photos..."
+msgstr "Se pregătește importul automat al fotografiilor..."
 
-#: src/events/EventsDirectoryPage.vala:159
-msgid "No events found"
-msgstr "Nu a fost găsit niciun eveniment"
+#: ../src/library/LibraryWindow.vala:1266
+msgid "Auto-importing photos..."
+msgstr "Se importă automat fotografiile..."
 
-#: src/events/EventsDirectoryPage.vala:230
-msgid "Events"
-msgstr "Evenimente"
+#: ../src/library/LibraryWindow.vala:1274
+msgid "Writing metadata to files..."
+msgstr "Se scriu metadatele fișierelor..."
 
-#: src/events/EventsDirectoryPage.vala:244
-msgid "Undated"
-msgstr "Fără dată"
+#: ../src/library/OfflinePage.vala:8
+msgid "Missing Files"
+msgstr "Fișiere lipsă"
 
-#: src/events/EventsDirectoryPage.vala:245
-msgid "%Y"
-msgstr "%Y"
+#: ../src/library/OfflinePage.vala:106
+msgid "Deleting..."
+msgstr "Se șterge..."
 
-#: src/events/EventsDirectoryPage.vala:246
-msgid "%B"
-msgstr "%B"
+#: ../src/library/TrashPage.vala:8
+msgid "Trash"
+msgstr "Coș de gunoi"
 
-#: src/events/EventPage.vala:129
-msgid "No Event"
-msgstr "Fără eveniment"
+#: ../src/library/TrashPage.vala:108
+msgid "Trash is empty"
+msgstr "Coșul de gunoi este gol"
 
-#: src/AppDirs.vala:48 src/AppDirs.vala:99
-#, c-format
-msgid "Unable to create cache directory %s: %s"
-msgstr "Nu se poate crea directorul cache %s: %s"
+#: ../src/library/TrashPage.vala:112
+msgid "Delete"
+msgstr "Șterge"
+
+#: ../src/library/TrashPage.vala:113
+msgid "Deleting Photos"
+msgstr "Se șterg fotografiile"
 
-#: src/AppDirs.vala:58 src/AppDirs.vala:88
+#: ../src/main.vala:54
 #, c-format
-msgid "Unable to create data directory %s: %s"
-msgstr "Nu se poate crea dosarul de date %s: %s"
+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 ""
+"Colecția dumneavoastră de fotografii nu este compatibilă cu această versiune "
+"de Shotwell.  Se pare că a fost creată cu Shotwell %s (schema %d).  "
+"Versiunea curentă este %s (schema %d).  Vă rugăm să utilizați ultima veriune "
+"de Shotwell."
 
-#: src/AppDirs.vala:152
-msgid "Pictures"
-msgstr "Fotografii"
+#: ../src/main.vala:59
+#, 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 ""
+"Shotwell nu poate actualiza colecția de fotografii, de la versiunea %s "
+"(schema %d) la %s (schema %d).  Pentru mai multe informații, vă rugăm să "
+"consultați Shotwell Wiki la %s"
 
-#: src/AppDirs.vala:190
+#: ../src/main.vala:65
 #, c-format
-msgid "Unable to create temporary directory %s: %s"
-msgstr "Nu se poate crea directorul temporar %s: %s"
+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 ""
+"Colecția de fotografii nu este compatibilă cu această versiune Shotwell.  Se "
+"pare că a fost creată cu Shotwell %s (schema %d).  Versiunea curentă este %s "
+"(schema %d).  Actualizați colecția prin ștergerea %s și reluați importul "
+"fotografiilor."
 
-#: src/AppDirs.vala:207 src/AppDirs.vala:223
+#: ../src/main.vala:71
 #, c-format
-msgid "Unable to create data subdirectory %s: %s"
-msgstr "Nu se poate crea subdosarul de date %s: %s"
+msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgstr "Eroare necunoscută la verificarea bazei de date Shotwell: %s"
 
-#: src/slideshow/TransitionEffects.vala:98
-msgid "(None)"
-msgstr "(Nimic)"
+#: ../src/main.vala:104
+msgid "Loading Shotwell"
+msgstr "Se încarcă Shotwell"
 
-#: src/slideshow/TransitionEffects.vala:287
-msgid "None"
-msgstr "Nimic"
+#: ../src/main.vala:294
+msgid "Path to Shotwell's private data"
+msgstr "Calea către informațiile private Shotwell"
 
-#: src/slideshow/TransitionEffects.vala:339
-msgid "Random"
-msgstr "Aleator"
+#: ../src/main.vala:294
+msgid "DIRECTORY"
+msgstr "DIRECTOR"
 
-#: src/slideshow/Slideshow.vala:22
-msgid "Slideshow Transitions"
-msgstr "Tranziție prezentare diapozitive"
+#: ../src/main.vala:298
+msgid "Do not monitor library directory at runtime for changes"
+msgstr ""
+"Nu monitoriza directorul librăriei la inițializare pentru a detecta "
+"modificările"
+
+#: ../src/main.vala:302
+msgid "Don't display startup progress meter"
+msgstr "Nu afișa indicatorul de progres pentru inițializare"
+
+#: ../src/main.vala:306
+msgid "Show the application's version"
+msgstr "Arată versiunea aplicației"
 
-#: src/Exporter.vala:232
+#. init GTK (valac has already called g_threads_init())
+#: ../src/main.vala:338
+msgid "[FILE]"
+msgstr "[FIȘIER]"
+
+#: ../src/main.vala:342
 #, c-format
-msgid "Unable to generate a temporary file for %s: %s"
-msgstr "Nu se poate genera fișierul temporar pentru %s: %s"
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr "Rulați „%s --help” pentru a consulta lista completă a comenzilor.\n"
 
-#: src/Exporter.vala:299
-msgid "Exporting"
-msgstr "Se exportă"
+#: ../src/photos/BmpSupport.vala:32
+msgid "BMP"
+msgstr "BMP"
+
+#: ../src/photos/JfifSupport.vala:84
+msgid "JPEG"
+msgstr "JPEG"
 
-#: src/Exporter.vala:317
+#: ../src/photos/JfifSupport.vala:185
 #, c-format
-msgid "File %s already exists.  Replace?"
-msgstr "Fișierul %s există deja. Înlocuiți?"
+msgid "Low (%d%%)"
+msgstr "Mică (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "_Skip"
-msgstr "_Omite"
+#: ../src/photos/JfifSupport.vala:188
+#, c-format
+msgid "Medium (%d%%)"
+msgstr "Medie (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "_Replace"
-msgstr "Î_nlocuiește"
+#: ../src/photos/JfifSupport.vala:191
+#, c-format
+msgid "High (%d%%)"
+msgstr "Mare (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "Replace _All"
-msgstr "Înlocuiește _tot"
+#: ../src/photos/JfifSupport.vala:194
+#, c-format
+msgid "Maximum (%d%%)"
+msgstr "Maximă (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "Export"
-msgstr "Exportă"
+#: ../src/photos/PngSupport.vala:30
+msgid "PNG"
+msgstr "PNG"
 
-#: src/SearchFilter.vala:593 src/SearchFilter.vala:594
-msgid "Photos"
-msgstr "Fotografii"
+#: ../src/photos/RawSupport.vala:134
+msgid "RAW"
+msgstr "RAW"
 
-#: src/SearchFilter.vala:599 src/SearchFilter.vala:600
-msgid "Videos"
-msgstr "Clipuri"
+#: ../src/photos/TiffSupport.vala:86
+msgid "TIFF"
+msgstr "TIFF"
 
-#: src/SearchFilter.vala:605
-msgid "RAW Photos"
-msgstr "Fotografii RAW"
+#: ../src/publishing/Publishing.vala:16
+msgid "Publishing"
+msgstr "Se publică"
 
-#: src/SearchFilter.vala:606
-msgid "RAW photos"
-msgstr "Fotografii RAW"
+#: ../src/publishing/PublishingPluginHost.vala:11
+msgid "Preparing for upload"
+msgstr "Pregătire pentru încărcare"
 
-#: src/SearchFilter.vala:952
+#: ../src/publishing/PublishingPluginHost.vala:12
 #, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Eroare la încărcarea fișierului UI %s: %s"
+msgid "Uploading %d of %d"
+msgstr "Se încarcă %d din %d"
 
-#: src/SearchFilter.vala:969
-msgid "Type"
-msgstr "Tip"
+#: ../src/publishing/PublishingPluginHost.vala:81
+#, c-format
+msgid "Publishing to %s can't continue because an error occurred:"
+msgstr "Publicarea pe %s nu poate continua din cauza unei erori:"
 
-#: src/publishing/Publishing.vala:16
-msgid "Publishing"
-msgstr "Se publică"
+#: ../src/publishing/PublishingPluginHost.vala:84
+msgid "To try publishing to another service, select one from the above menu."
+msgstr "Pentru a încerca publicarea pe alt serviciu, alegeți unul din meniu."
 
-#: src/publishing/PublishingUI.vala:105
+#: ../src/publishing/PublishingUI.vala:105
 msgid "The selected photos/videos were successfully published."
-msgstr "Fotografiile/clipurile selectate au fost publicate cu succes."
+msgstr "Fotografiile/videourile selectate au fost publicate cu succes."
 
-#: src/publishing/PublishingUI.vala:107
+#: ../src/publishing/PublishingUI.vala:107
 msgid "The selected videos were successfully published."
-msgstr "Clipurile selectate au fost publicate cu succes."
+msgstr "Videourile selectate au fost publicate cu succes."
 
-#: src/publishing/PublishingUI.vala:109
+#: ../src/publishing/PublishingUI.vala:109
 msgid "The selected photos were successfully published."
 msgstr "Fotografiile selectate au fost publicate cu succes."
 
-#: src/publishing/PublishingUI.vala:112
+#: ../src/publishing/PublishingUI.vala:112
 msgid "The selected video was successfully published."
-msgstr "Clipul video selectat a fost publicat cu succes."
+msgstr "Videoul selectat a fost publicat cu succes."
 
-#: src/publishing/PublishingUI.vala:114
+#: ../src/publishing/PublishingUI.vala:114
 msgid "The selected photo was successfully published."
 msgstr "Fotografia selectată a fost publicată cu succes."
 
-#: src/publishing/PublishingUI.vala:122
+#: ../src/publishing/PublishingUI.vala:122
 msgid "Fetching account information..."
 msgstr "Se aduc informațiile contului..."
 
-#: src/publishing/PublishingUI.vala:128
+#: ../src/publishing/PublishingUI.vala:128
 msgid "Logging in..."
 msgstr "Autentificare..."
 
-#: src/publishing/PublishingUI.vala:183
+#: ../src/publishing/PublishingUI.vala:185
 msgid "Publish Photos"
 msgstr "Publică fotografiile"
 
-#: src/publishing/PublishingUI.vala:184
+#: ../src/publishing/PublishingUI.vala:186
 msgid "Publish photos _to:"
 msgstr "Publică fo_tografiile pe:"
 
-#: src/publishing/PublishingUI.vala:186
+#: ../src/publishing/PublishingUI.vala:188
 msgid "Publish Videos"
-msgstr "Publică clipurile"
+msgstr "Publică videourile"
 
-#: src/publishing/PublishingUI.vala:187
+#: ../src/publishing/PublishingUI.vala:189
 msgid "Publish videos _to"
-msgstr "_Publică clipurile pe"
+msgstr "_Publică videourile pe"
 
-#: src/publishing/PublishingUI.vala:189
+#: ../src/publishing/PublishingUI.vala:191
 msgid "Publish Photos and Videos"
-msgstr "Publicare fotografii și clipuri"
+msgstr "Publicare fotografii și videouri"
 
-#: src/publishing/PublishingUI.vala:190
+#: ../src/publishing/PublishingUI.vala:192
 msgid "Publish photos and videos _to"
-msgstr "Publică fo_tografiile și clipurile pe"
+msgstr "Publică fo_tografiile și videourile pe"
 
-#: src/publishing/PublishingUI.vala:383
+#. There are no enabled publishing services that accept this media type,
+#. warn the user.
+#: ../src/publishing/PublishingUI.vala:360
 msgid "Unable to publish"
 msgstr "Nu se poate publica"
 
-#: src/publishing/PublishingUI.vala:384
+#: ../src/publishing/PublishingUI.vala:361
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -3770,989 +4713,444 @@ msgid ""
 "Preferences</b> and enable one or more of the publishing plugins on the "
 "<b>Plugins</b> tab."
 msgstr ""
-"Shotwell nu poate publica obiectele selectate deoarece nu ai nici un plugin "
+"Shotwell nu poate publica obiectele selectate deoarece nu ai niciun plugin "
 "de publicare compatibil activat. Pentru a corecta acest lucru, alege "
 "<b>Editare %s Preferințe</b> și activează unul sau mai multe din plugin-"
 "urile de publicare din tab-ul <b>Plugins</b>."
 
-#: src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr "Pregătire pentru încărcare"
-
-#: src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
-msgstr "Se încarcă %d din %d"
-
-#: src/publishing/PublishingPluginHost.vala:81
-#, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
-msgstr "Publicarea pe %s nu poate continua din cauza unei erori:"
-
-#: src/publishing/PublishingPluginHost.vala:84
-msgid "To try publishing to another service, select one from the above menu."
-msgstr "Pentru a încerca publicarea pe alt serviciu, alegeți unul din meniu."
-
-#: src/sidebar/Tree.vala:199
-msgid "New _Tag..."
-msgstr "E_tichetă nouă..."
-
-#: plugins/common/RESTSupport.vala:424
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:971
-msgid "A temporary file needed for publishing is unavailable"
-msgstr "Un fișier temporar necesar pentru publicare nu este disponibil"
-
-#: plugins/common/RESTSupport.vala:1138
-msgid ""
-"You have already logged in and out of a Google service during this Shotwell "
-"session.\n"
-"\n"
-"To continue publishing to Google services, quit and restart Shotwell, then "
-"try publishing again."
-msgstr ""
-"V-ați autentificat și ați ieșit deja dintr-un serviciu Google pe parcursul "
-"acestei sesiuni\n"
-"\n"
-"Pentru a continua publicarea pe serviciile Google, ieșiți din Shotwell și "
-"reporniți programul, apoi încercați din nou să publicați."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:57
-msgid ""
-"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 ""
-"Nu sunteți autentificat pe YouTube.\n"
-"\n"
-"Trebuie să aveți un cont Google configurat deja pentru a fi utilizat cu "
-"YouTube pentru a continua. Puteți configura conturile utilizând navigatorul "
-"de Internet, autentificându-vă apoi pe YouTube."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:362
-msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
-"continue."
-msgstr ""
-"Un fișier necesar pentru publicare este indisponibil. Publicare către "
-"Youtube nu poate continua."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:461
-#, c-format
-msgid "You are logged into YouTube as %s."
-msgstr "Sunteți autentificat pe YouTube ca %s."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:463
-#, c-format
-msgid "Videos will appear in '%s'"
-msgstr "  '%s'"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:495
-msgid "Public listed"
-msgstr "Listare publică"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
-msgid "Public unlisted"
-msgstr "Delistare publică"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
-msgid "Private"
-msgstr "Privat"
-
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr "Servicii de bază pentru publicare"
-
-#: 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 ""
-"Acum nu sunteți autentificat pe Flickr.\n"
-"\n"
-"Efectuați clic pe Flickr pentru a vă autentifica în navigatorul de Internet. "
-"Va trebui să autorizați Shotwell pentru a se conecta la contul dumneavoastră "
-"Flickr."
-
-#: 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 ""
-"V-ați autentificat și ați ieșit din Flickr deja pe parcursul acestei "
-"sesiuni\n"
-"Pentru a continua publicarea pe Flickr, ieșiți din Shotwell și reporniți "
-"programul, apoi încercați din nou să publicați."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:375
-msgid "Preparing for login..."
-msgstr "Pregătire pentru autentificare..."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:595
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can't "
-"continue."
-msgstr ""
-"Un fișier necesar pentru publicare este indisponibil. Publicare către Flickr "
-"nu poate continua."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "Se verifică autorizarea..."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1153
-#, c-format
-msgid ""
-"You are logged into Flickr as %s.\n"
-"\n"
-msgstr ""
-"Sunteți autentificat pe Flickr ca %s.\n"
-"\n"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
-#, 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 ""
-"Contul gratuit Flickr limitează cantitatea de date pe care o puteți "
-"încărca.\n"
-"Pentru această lună mai aveți la dispoziție %d MO."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1157
-msgid "Your Flickr Pro account entitles you to unlimited uploads."
-msgstr ""
-"Contul Flickr Pro vă permite încărcarea a cât de multe fotografii doriți."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1162
-msgid "Photos _visible to:"
-msgstr "Fotografii _vizibile pentru:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
-msgid "Videos _visible to:"
-msgstr "Clipuri _vizibile pentru:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1167
-msgid "Photos and videos _visible to:"
-msgstr "Fotografiile și clipurile _vizibile pentru:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1234
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1182
-msgid "Everyone"
-msgstr "Toți"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
-msgid "Friends & family only"
-msgstr "Numai pentru familie și prieteni"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-msgid "Family only"
-msgstr "Doar familia"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
-msgid "Friends only"
-msgstr "Doar prietenii"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1180
-msgid "Just me"
-msgstr "Numai pentru mine"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1229
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1246
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "500 x 375 pixels"
-msgstr "500 x 375 pixeli"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1230
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1247
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:108
-msgid "1024 x 768 pixels"
-msgstr "1024 x 768 pixeli"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1248
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 pixeli"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1249
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 pixeli"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:746
-#, c-format
-msgid "Creating album %s..."
-msgstr "Se creează albumul %s..."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:917
-msgid "An error message occurred when publishing to Piwigo. Please try again."
-msgstr ""
-"A fost întâmpinată o problemă încercând publicarea către Piwigo. Vă rugăm să "
-"încercați din nou."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:998
-msgid ""
-"Enter the URL of your Piwigo photo library as well as the username and "
-"password associated with your Piwigo account for that library."
-msgstr ""
-"Introdu URL-ul librăriei foto Piwigo, precum si username-ul și parola "
-"asociate cu contul Piwigo pentru această librărie."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:999
-msgid ""
-"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
-"entered"
-msgstr ""
-"Shotwell nu poate contacta librăria ta foto Piwigo. Te rog verifică URL-ul "
-"pe care l-ai introdus"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1000
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:590
-msgid "Username and/or password invalid. Please try again"
-msgstr "Username și/sau parolă invalide. Te rog încearcă din nou"
+#: ../src/searches/Branch.vala:68
+msgid "Saved Searches"
+msgstr "Căutări salvate"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1032
-#, c-format
-msgid "Invalid URL"
-msgstr "URL invalid"
+#. Ordering must correspond with SearchConditionText.Context
+#: ../src/searches/SavedSearchDialog.vala:168
+msgid "contains"
+msgstr "conține"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1037
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:620
-#, c-format
-msgid "Invalid User Name or Password"
-msgstr "Utilizator sau parolă invalide"
+#. Ordering must correspond with Context
+#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:496
+msgid "is exactly"
+msgstr "este exact"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1127
-#: plugins/shotwell-publishing/PicasaPublishing.vala:59
-#: plugins/shotwell-publishing/FacebookPublishing.vala:61
-msgid "Shotwell Connect"
-msgstr "Shotwell Connect"
+#: ../src/searches/SavedSearchDialog.vala:170
+msgid "starts with"
+msgstr "începe cu"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1235
-msgid "Admins, Family, Friends, Contacts"
-msgstr "Admini, Familie, Prieteni, Contacte"
+#: ../src/searches/SavedSearchDialog.vala:171
+msgid "ends with"
+msgstr "se termină cu"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1236
-msgid "Admins, Family, Friends"
-msgstr "Admini, Familie, Prieteni"
+#: ../src/searches/SavedSearchDialog.vala:172
+msgid "does not contain"
+msgstr "nu conține"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1237
-msgid "Admins, Family"
-msgstr "Admini, Familie"
+#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:500
+msgid "is not set"
+msgstr "nu este stabilit"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1238
-msgid "Admins"
-msgstr "Admini"
+#. Ordering must correspond with SearchConditionMediaType.Context
+#: ../src/searches/SavedSearchDialog.vala:244
+#: ../src/searches/SavedSearchDialog.vala:375
+#: ../src/searches/SavedSearchDialog.vala:440
+msgid "is"
+msgstr "este"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:58
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have "
-"to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
-"Momentan nu ești autentificat în Picasa Web Albums.\n"
-"\n"
-"Apasă Login pentru a te autentifica în Picasa Web Albums în browserul web. "
-"Va trebui să autorizezi Shotwell Connect pentru a se conecta la contul tău "
-"Picasa Web Albums."
+#: ../src/searches/SavedSearchDialog.vala:245
+msgid "is not"
+msgstr "nu este"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:361
-msgid ""
-"A file required for publishing is unavailable. Publishing to Picasa can't "
-"continue."
-msgstr ""
-"Un fișier necesar pentru publicare este indisponibil. Publicare către Picasa "
-"nu poate continua."
+#. Ordering must correspond with SearchConditionMediaType.MediaType
+#: ../src/searches/SavedSearchDialog.vala:251
+msgid "any photo"
+msgstr "orice fotografie"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
-#: plugins/shotwell-publishing/FacebookPublishing.vala:347
-msgid "Creating album..."
-msgstr "Se creează album..."
+#: ../src/searches/SavedSearchDialog.vala:252
+msgid "a raw photo"
+msgstr "o fotografie raw"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:659
-#, c-format
-msgid "You are logged into Picasa Web Albums as %s."
-msgstr "Sunteți autentificat pe Picasa Web Album ca %s."
+#: ../src/searches/SavedSearchDialog.vala:253
+msgid "a video"
+msgstr "un video"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
-msgid "Videos will appear in:"
-msgstr "Clipurile video vor apărea în:"
+#: ../src/searches/SavedSearchDialog.vala:307
+msgid "has"
+msgstr "are"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:670
-msgid "Photos will appear in:"
-msgstr "Fotografiile vor apărea în:"
+#: ../src/searches/SavedSearchDialog.vala:308
+msgid "has no"
+msgstr "nu are"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "Mică (640 x 480 pixeli)"
+#: ../src/searches/SavedSearchDialog.vala:313
+msgid "modifications"
+msgstr "modificări"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "Medie (1024 x 768 pixeli)"
+#: ../src/searches/SavedSearchDialog.vala:314
+msgid "internal modifications"
+msgstr "modificări interne"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Recomandată (1600 x 1200 pixeli)"
+#: ../src/searches/SavedSearchDialog.vala:315
+msgid "external modifications"
+msgstr "modificări externe"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Google+ (2048 x 1536 pixels)"
+#. Ordering must correspond with SearchConditionFlagged.State
+#: ../src/searches/SavedSearchDialog.vala:369
+msgid "flagged"
+msgstr "marcate"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:63
-msgid ""
-"You are not currently logged into Facebook.\n"
-"\n"
-"If you don't yet have a Facebook account, you can create one during the "
-"login process. During login, Shotwell Connect may ask you for permission to "
-"upload photos and publish to your feed. These permissions are required for "
-"Shotwell Connect to function."
-msgstr ""
-"Acum nu sunteți autentificat pe Facebook.\n"
-"\n"
-"Dacă nu aveți un cont Facebook, puteți crea unul în timpul procesului de "
-"autentificare. La conectare, Shotwell Connect poate cere permisiunea de a "
-"publica fotografiile. Permisiunea este necesară pentru funcționarea Shotwell "
-"Connect."
+#: ../src/searches/SavedSearchDialog.vala:370
+msgid "not flagged"
+msgstr "fără marcaje"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:65
-msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"V-ați autentificat și ați ieșit din Facebook deja pe parcursul acestei "
-"sesiuni Shotwell.\n"
-"Pentru a continua publicarea pe Facebook, ieșiți din Shotwell și reporniți "
-"programul, apoi încercați din nou să publicați."
+#: ../src/searches/SavedSearchDialog.vala:433
+msgid "and higher"
+msgstr "și mai mult"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:86
-msgid "Standard (720 pixels)"
-msgstr "Standard (720 pixeli)"
+#: ../src/searches/SavedSearchDialog.vala:434
+msgid "only"
+msgstr "doar"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:89
-msgid "Large (2048 pixels)"
-msgstr "Mare (2048 pixeli)"
+#: ../src/searches/SavedSearchDialog.vala:435
+msgid "and lower"
+msgstr "și mai mic"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:254
-msgid "Testing connection to Facebook..."
-msgstr "Se testează conexiunea la Facebook..."
+#: ../src/searches/SavedSearchDialog.vala:497
+msgid "is after"
+msgstr "este după"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:374
-msgid ""
-"A file required for publishing is unavailable. Publishing to Facebook can't "
-"continue."
-msgstr ""
-"Un fișier necesar pentru publicare este indisponibil. Publicare către "
-"Facebook nu poate continua."
+#: ../src/searches/SavedSearchDialog.vala:498
+msgid "is before"
+msgstr "este înainte"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1019
-#, c-format
-msgid ""
-"You are logged into Facebook as %s.\n"
-"\n"
-msgstr ""
-"Sunteți autentificat pe Flickr ca %s.\n"
-"\n"
+#: ../src/searches/SavedSearchDialog.vala:499
+msgid "is between"
+msgstr "este între"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1020
-msgid "Where would you like to publish the selected photos?"
-msgstr "Unde doriți să publicați fotografiile selectate?"
+#: ../src/searches/SavedSearchDialog.vala:512
+msgid "and"
+msgstr "și"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1021
-msgid "Upload _size:"
-msgstr "Dimen_siune încărcare:"
+#: ../src/searches/SavedSearchDialog.vala:691
+msgid "Search"
+msgstr "Caută"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1181
-msgid "Friends"
-msgstr "Prieteni"
+#: ../src/searches/SavedSearchDialog.vala:696
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Anulează"
 
-#: plugins/shotwell-transitions/CrumbleEffect.vala:20
-msgid "Crumble"
-msgstr "Fărâmițare"
+#: ../src/searches/SavedSearchDialog.vala:697
+msgid "OK"
+msgstr "OK"
 
-#: plugins/shotwell-transitions/ChessEffect.vala:20
-msgid "Chess"
-msgstr "Șah"
+#: ../src/searches/SavedSearchDialog.vala:715
+msgid "any"
+msgstr "orice"
 
-#: plugins/shotwell-transitions/CirclesEffect.vala:20
-msgid "Circles"
-msgstr "Cercuri"
+#: ../src/searches/SavedSearchDialog.vala:716
+msgid "all"
+msgstr "tot"
 
-#: plugins/shotwell-transitions/BlindsEffect.vala:20
-msgid "Blinds"
-msgstr "Jaluzele"
+#: ../src/searches/SavedSearchDialog.vala:717
+msgid "none"
+msgstr "nimic"
 
-#: plugins/shotwell-transitions/StripesEffect.vala:20
-msgid "Stripes"
-msgstr "Dungi"
+#: ../src/searches/SearchBoolean.vala:157
+msgid "Any text"
+msgstr "Orice text"
 
-#: plugins/shotwell-transitions/ClockEffect.vala:20
-msgid "Clock"
-msgstr "Ceas"
+#: ../src/searches/SearchBoolean.vala:160
+msgid "Title"
+msgstr "Titlu"
 
-#: plugins/shotwell-transitions/CircleEffect.vala:20
-msgid "Circle"
-msgstr "Cerc"
+#: ../src/searches/SearchBoolean.vala:163
+msgid "Tag"
+msgstr "Etichetă"
 
-#: plugins/shotwell-transitions/shotwell-transitions.vala:28
-msgid "Core Slideshow Transitions"
-msgstr "Tranziție principală pentru prezentare diapozitive "
+#: ../src/searches/SearchBoolean.vala:166
+msgid "Comment"
+msgstr "Comentariu"
 
-#: plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
-msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
+#: ../src/searches/SearchBoolean.vala:169
+msgid "Event name"
+msgstr "Nume eveniment"
 
-#: plugins/shotwell-transitions/SlideEffect.vala:20
-msgid "Slide"
-msgstr "Diapozitiv"
+#: ../src/searches/SearchBoolean.vala:172
+msgid "File name"
+msgstr "Nume fișier"
 
-#: plugins/shotwell-transitions/FadeEffect.vala:20
-msgid "Fade"
-msgstr "Atenuare"
+#: ../src/searches/SearchBoolean.vala:175
+msgid "Media type"
+msgstr "Tip media"
 
-#: plugins/shotwell-transitions/SquaresEffect.vala:20
-msgid "Squares"
-msgstr "Pătrate"
+#: ../src/searches/SearchBoolean.vala:178
+msgid "Flag state"
+msgstr "Stare marcaj"
 
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Servicii de import de date centrale"
+#: ../src/searches/SearchBoolean.vala:181
+msgid "Photo state"
+msgstr "Stare fotografie"
 
-#: 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 ""
-"Bine ai venit la serviciul de import din libraria F-Spot\n"
-"\n"
-"Te rog selectează o librărie pentru import, fie selectând una din librăriile "
-"deja existente găsite de Shotwell sau selectând o bază de date F-Spot "
-"alternativă"
+#: ../src/searches/SearchBoolean.vala:187
+msgid "Date"
+msgstr "Dată"
 
-#: 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 ""
-"Bine ai venit la serviciul de import din libraria F-Spot\n"
-"\n"
-"Te rog selectează o bază de date F-Spot."
+#: ../src/sidebar/Tree.vala:198
+msgid "New _Tag..."
+msgstr "E_tichetă nouă..."
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Selectează manual o bază de date F-Spot pentru import:"
+#: ../src/slideshow/Slideshow.vala:22
+msgid "Slideshow Transitions"
+msgstr "Tranziție prezentare diapozitive"
 
-#: 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 ""
-"Nu poate fi deschisă baza de date F-Spot selectată: fișierul nu există sau "
-"nu este o bază de date F-Spot"
+#: ../src/slideshow/TransitionEffects.vala:98
+msgid "(None)"
+msgstr "(Nimic)"
 
-#: 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 ""
-"Nu poate fi deschisă baza de date F-Spot selectată: această versiune a bazei "
-"de date F-Spot nu este suportată de Shotwell"
+#: ../src/slideshow/TransitionEffects.vala:287
+msgid "None"
+msgstr "Nimic"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Nu poate fi citită baza de date F-Spot: eroare în timpul citirii tabelul cu "
-"etichete"
+#: ../src/slideshow/TransitionEffects.vala:339
+msgid "Random"
+msgstr "Aleator"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"Nu poate fi citită baza de date F-Spot selectată: eroare în timpul citirii "
-"tabelului cu fotografii"
+#: ../src/tags/Branch.vala:127
+msgid "Tags"
+msgstr "Etichete"
 
-#: 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 ""
-"Shotwell a găsit %d fotografii în librăria F-Spot și le importează. "
-"Duplicatele vor fi detectate automat și șterse.\n"
-"\n"
-"Poți închide acest dialog și începe să folosești Shotwell cât timp import-ul "
-"are loc în fundal."
+#: ../ui/set_background_dialog.glade.h:1
+msgid "Set as Desktop Background"
+msgstr "Stabilește ca fundal desktop"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:84
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "Librăria F-Spot: %s"
+#: ../ui/set_background_dialog.glade.h:2
+#: ../ui/set_background_slideshow_dialog.glade.h:6
+msgid "Use for Desktop"
+msgstr "Folosește pentru fundalul biroului"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:416
-msgid "Preparing to import"
-msgstr "Se pregătește importul"
+#: ../ui/set_background_dialog.glade.h:3
+#: ../ui/set_background_slideshow_dialog.glade.h:7
+msgid "Use for Lock Screen"
+msgstr "Folosește pentru fundalul ecranului de blocare"
 
-#: ui/set_background_dialog.glade:14
+#: ../ui/set_background_slideshow_dialog.glade.h:1
 msgid "Set as Desktop Slideshow"
-msgstr "Configurează prezentarea de diapozitive ca fundal desktop"
-
-#: ui/set_background_dialog.glade:55
-msgid "Generate desktop background slideshow"
-msgstr "Generare prezentare diapozitive ca fundal pentru desktop"
+msgstr "Stabilește ca prezentarea de diapozitive pentru desktop"
 
-#: ui/set_background_dialog.glade:82
+#: ../ui/set_background_slideshow_dialog.glade.h:2
 msgid "Show each photo for"
 msgstr "Arată fiecare fotografie pentru"
 
-#: ui/set_background_dialog.glade:94
+#: ../ui/set_background_slideshow_dialog.glade.h:3
 msgid "period of time"
 msgstr "perioadă de timp"
 
-#: ui/set_background_dialog.glade:116
+#: ../ui/set_background_slideshow_dialog.glade.h:4
+msgid "Generate desktop background slideshow"
+msgstr "Generare prezentare diapozitive ca fundal pentru desktop"
+
+#: ../ui/set_background_slideshow_dialog.glade.h:5
 msgid "How long each photo is shown on the desktop background"
 msgstr "Cât de mult va fi arătată fotografia pe fundalul desktopului"
 
-#: ui/shotwell.glade:7
-msgid "Search"
-msgstr "Caută"
-
-#: ui/shotwell.glade:47
+#: ../ui/shotwell.glade.h:1
 msgid "_Name of search:"
 msgstr "_Nume căutare:"
 
-#: ui/shotwell.glade:108
+#: ../ui/shotwell.glade.h:2
 msgid "_Match"
 msgstr "Potr_ivire"
 
-#: ui/shotwell.glade:137
+#: ../ui/shotwell.glade.h:3
 msgid "of the following:"
 msgstr "din următoarele:"
 
-#: ui/shotwell.glade:218
+#: ../ui/shotwell.glade.h:4
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Dimensiune imagine tipărită</b>"
 
-#: ui/shotwell.glade:235
+#: ../ui/shotwell.glade.h:5
 msgid "Use a _standard size:"
-msgstr "Utilizează dimensiune _standard"
+msgstr "Utilizează dimensiune _standard:"
 
-#: ui/shotwell.glade:278
+#: ../ui/shotwell.glade.h:6
 msgid "Use a c_ustom size:"
 msgstr "_Utilizează dimensiune personalizată:"
 
-#: ui/shotwell.glade:368
+#: ../ui/shotwell.glade.h:7
 msgid "_Match photo aspect ratio"
 msgstr "Pă_strează proporțiile fotografiei"
 
-#: ui/shotwell.glade:392
+#: ../ui/shotwell.glade.h:8
 msgid "_Autosize:"
 msgstr "Potrivire _automată:"
 
-#: ui/shotwell.glade:432
+#: ../ui/shotwell.glade.h:9
 msgid "<b>Titles</b>"
 msgstr "<b>Titluri</b>"
 
-#: ui/shotwell.glade:449
+#: ../ui/shotwell.glade.h:10
 msgid "Print image _title"
 msgstr "_Tipărește denumirea imaginii"
 
-#: ui/shotwell.glade:493
+#: ../ui/shotwell.glade.h:11
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Rezoluție pixeli</b>"
 
-#: ui/shotwell.glade:513
+#: ../ui/shotwell.glade.h:12
 msgid "_Output photo at:"
 msgstr "Adu f_otografia la:"
 
-#: ui/shotwell.glade:548
+#: ../ui/shotwell.glade.h:13
 msgid "pixels per inch"
 msgstr "pixeli pe inch"
 
-#: ui/shotwell.glade:581 ui/shotwell.glade:623
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:27
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:27
-msgid "label"
-msgstr "etichetă"
-
-#: ui/shotwell.glade:719
+#: ../ui/shotwell.glade.h:15
 msgid "Shotwell Preferences"
 msgstr "Preferințe Shotwell"
 
-#: ui/shotwell.glade:796
+#: ../ui/shotwell.glade.h:16
 msgid "white"
 msgstr "alb"
 
-#: ui/shotwell.glade:823
+#: ../ui/shotwell.glade.h:17
 msgid "black"
 msgstr "negru"
 
-#: ui/shotwell.glade:871
+#: ../ui/shotwell.glade.h:19
 msgid "_Watch library directory for new files"
 msgstr "Ca_ută în colecția de fotografii după fișiere noi"
 
-#: ui/shotwell.glade:900
+#: ../ui/shotwell.glade.h:20
 msgid "Metadata"
 msgstr "Metadate"
 
-#: ui/shotwell.glade:920
+#: ../ui/shotwell.glade.h:21
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "Scriere etichete, nume și alte _metadate în fișierele foto"
 
-#: ui/shotwell.glade:946
+#: ../ui/shotwell.glade.h:22
 msgid "Display"
 msgstr "Afișare"
 
-#: ui/shotwell.glade:967
+#: ../ui/shotwell.glade.h:23
 msgid "_Import photos to:"
 msgstr "_Importă fotografiile în:"
 
-#: ui/shotwell.glade:990
+#: ../ui/shotwell.glade.h:24
 msgid "_Background:"
 msgstr "_Fundal:"
 
-#: ui/shotwell.glade:1013
+#: ../ui/shotwell.glade.h:25
 msgid "Importing"
 msgstr "Se importă"
 
-#: ui/shotwell.glade:1036
+#: ../ui/shotwell.glade.h:26
 msgid "_Directory structure:"
 msgstr "Structură _dosare:"
 
-#: ui/shotwell.glade:1075
+#: ../ui/shotwell.glade.h:27
 msgid "_Pattern:"
 msgstr "_Model:"
 
-#: ui/shotwell.glade:1157
+#: ../ui/shotwell.glade.h:28
 msgid "Example:"
 msgstr "Exemplu:"
 
-#: ui/shotwell.glade:1174
+#: ../ui/shotwell.glade.h:29
 msgid "R_ename imported files to lowercase"
 msgstr "R_edenumește fișierele importate folosind litere mici"
 
-#: ui/shotwell.glade:1203
+#: ../ui/shotwell.glade.h:30
 msgid "RAW Developer"
 msgstr "Programator RAW"
 
-#: ui/shotwell.glade:1238
+#: ../ui/shotwell.glade.h:31
 msgid "De_fault:"
-msgstr "Implicit:"
+msgstr "I_mplicit:"
 
-#: ui/shotwell.glade:1292
+#: ../ui/shotwell.glade.h:33
 msgid "E_xternal photo editor:"
 msgstr "Editor foto e_xtern:"
 
-#: ui/shotwell.glade:1308
+#: ../ui/shotwell.glade.h:34
 msgid "External _RAW editor:"
 msgstr "Editor _RAW extern:"
 
-#: ui/shotwell.glade:1373
+#: ../ui/shotwell.glade.h:35
 msgid "External Editors"
 msgstr "Editoare externe"
 
-#: ui/shotwell.glade:1400
+#: ../ui/shotwell.glade.h:36
 msgid "Plugins"
 msgstr "Module"
 
-#: ui/shotwell.glade:1469
+#: ../ui/shotwell.glade.h:37
 msgid "_Delay:"
 msgstr "_Decalaj:"
 
-#: ui/shotwell.glade:1485
+#: ../ui/shotwell.glade.h:38
 msgid "_Transition effect:"
 msgstr "Efecte _tranziție:"
 
-#: ui/shotwell.glade:1501
+#: ../ui/shotwell.glade.h:39
 msgid "Transition d_elay:"
 msgstr "D_ecalaj tranziție:"
 
-#: ui/shotwell.glade:1513
+#: ../ui/shotwell.glade.h:40
 msgid "Show t_itle"
 msgstr "Afișează t_itlu"
 
-#: ui/shotwell.glade:1603 ui/shotwell.glade:1616
+#: ../ui/shotwell.glade.h:41
 msgid "seconds"
 msgstr "secunde"
 
-#: ui/shotwell.glade:1696
-msgid "_Login"
-msgstr "_Autentificare"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:21
-msgid ""
-" (text depends on fb username and is modified in the app - \n"
-"anything put into this field won't display)"
-msgstr ""
-" (textul depinde de username-ul fb și este modificat în aplicație - \n"
-"orice puneți în acest câmp nu va fi afișat)"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:39
-msgid "Publish to an e_xisting album:"
-msgstr "Publică într-un album e_xistent:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:57
-msgid "Create a _new album named:"
-msgstr "Creează un album _nou numit:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:139
-msgid "Videos and new photo albums _visible to:"
-msgstr "Albumele noi cu fotografii și clipuri _vizibile pentru: "
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:175
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:102
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:178
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:226
-msgid ""
-"_Remove location, camera, and other identifying information before uploading"
-msgstr ""
-"Elimină locația, tipul camerei sau alte informații care pot fi folosite "
-"pentru identificare, înainte de upload"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:197
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:137
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:229
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:99
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:115
-msgid "_Logout"
-msgstr "Înc_hidere sesiune"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:212
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:153
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:243
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:115
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:129
-msgid "_Publish"
-msgstr "_Publică"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:16
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Introduceți numărul de confirmare care apare imediat după autentificarea pe "
-"Flicker în navigatorul de Internet."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:37
-msgid "Authorization _Number:"
-msgstr "_Număr autorizare:"
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:19
-msgid ""
-"You are logged into Flickr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-msgstr ""
-"Ești conectat în Flickr ca (nume).\n"
-"\n"
-"(această etichetă este populată în interiorul codului, \n"
-"așa că modficările făcute aici nu vor fi afișate)"
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:44
-msgid "_visibility label (populated in the code)"
-msgstr "etichetă _vizibilitate (populată în cod)"
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:61
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:60
-msgid "Photo _size:"
-msgstr "_Dimensiune fotografie:"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:18
-msgid ""
-"'you are logged in as $name'\n"
-"(populated in the application code)"
-msgstr ""
-"'ești conectat ca $nume'\n"
-"(populat în codul aplicației)"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:75
-msgid "An _existing album:"
-msgstr "Un album _existent:"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:94
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:52
-msgid "A _new album named:"
-msgstr "Un album _nou denumit:"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:113
-msgid "L_ist album in public gallery"
-msgstr "L_istează albumele în galeria publică"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:134
-msgid ""
-"$mediatype will appear in\n"
-"(populated in code)"
-msgstr ""
-"$mediatype va apărea în\n"
-"(populat în cod)"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:150
-msgid "Photo _size preset:"
-msgstr "Dimen_siune prestabilită:"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:49
-msgid "_URL of your Piwigo photo library"
-msgstr "_URL-ul colecției dumneavoastră Piwigo"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:59
-msgid "User _name"
-msgstr "_Nume utilizator"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:73
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:59
-msgid "_Password"
-msgstr "_Parolă"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:130
-msgid "_Remember Password"
-msgstr "_Reține parola"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:151
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:107
-msgid "Login"
-msgstr "Autentificare"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:40
-msgid "An _existing category:"
-msgstr "O categorie _existentă:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:121
-msgid "Photos will be _visible by:"
-msgstr "Fotografiilr vor fi _vizibile pentru:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:149
-msgid "Photo size:"
-msgstr "Dimensiune fotografie:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:176
-msgid "within category:"
-msgstr "în interiorul categoriei:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:210
-msgid "Album comment:"
-msgstr "Comentariu album:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:242
-msgid "_If a title is set and comment unset, use title as comment"
-msgstr ""
-"Dacă un titlu este setat și comentariul nu, folosește titlul drept comentariu"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:258
-msgid "_Do no upload tags"
-msgstr "Nu uploada etichete"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:278
-msgid "Logout"
-msgstr "Deconectare"
-
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:55
-msgid "Video privacy _setting:"
-msgstr "Configurări acce_s pentru clipuri:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:38
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:109
-msgid "1280 x 853 pixels"
-msgstr "1280 x 853 pixeli"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:313
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:323
-#, c-format
-msgid "'%s' isn't a valid response to an OAuth authentication request"
-msgstr "'%s' nu este un răspuns valid pentru un request de autentificare OAuth"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:561
-msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): nu se poate porni; acest publisher nu poate fi "
-"repornit"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:589
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr "Introdu username-ul și parola asociate cu contul tău Tumblr"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:639
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:760
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "Nu a putut fi încărcat UI-ul: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:742
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Ești conectat pe Tumblr ca %s.\n"
-"\n"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:24
-msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:27
-msgid "Visit the Yandex.Fotki web site"
-msgstr "Vizitați site-ul web Yandex.Fotki"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:635
-msgid "You are not currently logged into Yandex.Fotki."
-msgstr "Nu sunteți autentificat pe Yandex.Fotki."
-
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:49
-msgid "_Email address"
-msgstr "Adresă _email"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:19
-msgid ""
-"You are logged into Tumblr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-msgstr ""
-"Ești conectat la Tumblr ca (nume).\n"
-"\n"
-"(această etichetă este populată în interiorul codului,\n"
-"deci modificările făcute aici nu vor fi afișate)"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:43
-msgid "Blogs:"
-msgstr "Bloguri:"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:24
-msgid "_Albums (or write new):"
-msgstr "_Albume (sau scrieți nou):"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:38
-msgid "Access _type:"
-msgstr "_Tip acces:"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:81
-msgid "Disable _comments"
-msgstr "Dezactivează _comentarii"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:96
-msgid "_Forbid downloading original photo"
-msgstr "Interzice descărcarea _fotografiilor originale"
+#~ msgid "Import media _from:"
+#~ msgstr "Im_portare media din:"
+
+#~ msgid "Only _Remove"
+#~ msgstr "Doar ște_rge"
+
+#~ msgid "Shotwell is configured to import photos to your home directory.\n"
+#~ msgstr ""
+#~ "Shotwell este configurat să importe fotografiile în directorul personal.\n"
+
+#~ msgid ""
+#~ " (text depends on fb username and is modified in the app - \n"
+#~ "anything put into this field won't display)"
+#~ msgstr ""
+#~ " (textul depinde de username-ul fb și este modificat în aplicație - \n"
+#~ "orice puneți în acest câmp nu va fi afișat)"
+
+#~ msgid ""
+#~ "You are logged into Flickr as (name).\n"
+#~ "\n"
+#~ "(this label's string is populated and set inside the code, \n"
+#~ "so changes made here will not display)"
+#~ msgstr ""
+#~ "Ești conectat în Flickr ca (nume).\n"
+#~ "\n"
+#~ "(această etichetă este populată în interiorul codului, \n"
+#~ "așa că modficările făcute aici nu vor fi afișate)"
+
+#~ msgid "_visibility label (populated in the code)"
+#~ msgstr "etichetă _vizibilitate (populată în cod)"
+
+#~ msgid ""
+#~ "$mediatype will appear in\n"
+#~ "(populated in code)"
+#~ msgstr ""
+#~ "$mediatype va apărea în\n"
+#~ "(populat în cod)"
+
+#~ msgid ""
+#~ "You are logged into Tumblr as (name).\n"
+#~ "\n"
+#~ "(this label's string is populated and set inside the code, \n"
+#~ "so changes made here will not display)"
+#~ msgstr ""
+#~ "Ești conectat la Tumblr ca (nume).\n"
+#~ "\n"
+#~ "(această etichetă este populată în interiorul codului,\n"
+#~ "deci modificările făcute aici nu vor fi afișate)"
diff --git a/po/ru.po b/po/ru.po
index abf0d07..6490c0c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,658 +3,1449 @@
 # Copyright (C) 2009-2013 Yorba Foundation
 # See COPYING for license.
 #
-#
 # Translators:
 # Aleksandr P <davian818@gmail.com>, 2011
 # prokoudine <alexandre.prokoudine@gmail.com>, 2011
-# prokoudine <alexandre.prokoudine@gmail.com>, 2011
-# georgev <george.vardo@gmail.com>, 2012
 # georgev <george.vardo@gmail.com>, 2012
 # triplepointfive <iya777@yandex.ru>, 2012
-# triplepointfive <iya777@yandex.ru>, 2012
 # Julia <juliette.tux@gmail.com>, 2013
 # Misha Shnurapet <shnurapet@fedoraproject.org>, 2011
-# oleg koptev <koptev.oleg@gmail.com>, 2011
-# oleg koptev <koptev.oleg@gmail.com>, 2012
+# oleg koptev <koptev.oleg@gmail.com>, 2011, 2012
 # Pavel Ralovets <irbinix@gmail.com>, 2012
 # verayin <vera@yorba.org>, 2011
 # Алексей Мусихин <malexlv@apollo.lv>, 2012
 # Марк Коренберг <socketpair@gmail.com>, 2011
-# georgev <george.vardo@gmail.com>, 2012
-# georgev <george.vardo@gmail.com>, 2012
-# triplepointfive <iya777@yandex.ru>, 2012
-# triplepointfive <iya777@yandex.ru>, 2012
 # lsbeeler <lucas@yorba.org>, 2011
-# oleg koptev <koptev.oleg@gmail.com>, 2011
-# oleg koptev <koptev.oleg@gmail.com>, 2012
-# Алексей Мусихин <malexlv@apollo.lv>, 2012
-#, fuzzy
+# Stas Solovey <whats_up@tut.by>, 2015.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
-"Report-Msgid-Bugs-To: shotwell@yorba.org\n"
-"POT-Creation-Date: 2013-09-20 11:55-0700\n"
-"PO-Revision-Date: 2013-09-21 07:40+0000\n"
-"Last-Translator: Julia <juliette.tux@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/shotwell/"
-"language/ru/)\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
+"POT-Creation-Date: 2015-02-21 00:54+0000\n"
+"PO-Revision-Date: 2015-03-06 13:35+0300\n"
+"Last-Translator: Stas Solovey <whats_up@tut.by>\n"
+"Language-Team: Русский <gnome-cyr@gnome.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
-#: src/Event.vala:737
-#, c-format
-msgid "Event %s"
-msgstr "Событие %s"
+#: ../plugins/common/RESTSupport.vala:424
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
+msgid "A temporary file needed for publishing is unavailable"
+msgstr "Временный файл, необходимый для публикации, недоступен"
 
-#: src/camera/Branch.vala:87
-msgid "Cameras"
-msgstr "Камеры"
+#: ../plugins/common/RESTSupport.vala:1138
+msgid ""
+"You have already logged in and out of a Google service during this Shotwell "
+"session.\n"
+"\n"
+"To continue publishing to Google services, quit and restart Shotwell, then "
+"try publishing again."
+msgstr ""
+"Вы уже авторизовались и вышли из сервисов Google в ходе этой сессии "
+"Shotwell.\n"
+"\n"
+"Чтобы продолжить публикацию в сервисы Google, перезапустите Shotwell, затем "
+"повторите попытку публикации."
 
-#: src/camera/Branch.vala:101 src/camera/ImportPage.vala:711
-#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:300
-#: src/MediaPage.vala:425
-msgid "Camera"
-msgstr "Камера"
+#: ../plugins/common/Resources.vala:9
+msgid "Visit the Shotwell home page"
+msgstr "Посетить веб-сайт Shotwell"
 
-#: src/camera/ImportPage.vala:312 src/Properties.vala:227
-#, c-format
-msgid "RAW+JPEG"
-msgstr "RAW+JPEG"
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
+msgid "translator-credits"
+msgstr "Stas Solovey <whats_up@tut.by>, 2015."
+
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:32
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:34
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:32
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
+#: ../src/Resources.vala:27
+msgid "Copyright 2009-2015 Yorba Foundation"
+msgstr "Авторское право © 2009-2015 Yorba Foundation"
+
+#: ../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 ""
+"Добро пожаловать в сервис импорта библиотеки F-Spot.\n"
+"\n"
+"Выберите библиотеку для импорта, выбрав одну из существующих библиотек, "
+"найденных Shotwell, или указав альтернативный файл базы данных F-Spot."
 
-#: src/camera/ImportPage.vala:459
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:58
 msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
+"Welcome to the F-Spot library import service.\n"
+"\n"
+"Please select an F-Spot database file."
 msgstr ""
-"Невозможно отключить камеру. Попробуйте отмонтировать её из файлового "
-"менеджера."
+"Добро пожаловать в сервис импорта библиотеки F-Spot.\n"
+"\n"
+"Выберите файл базы данных F-Spot."
 
-#: src/camera/ImportPage.vala:776
-msgid "Hide photos already imported"
-msgstr "Скрыть уже импортированные фото"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
+msgid "Manually select an F-Spot database file to import:"
+msgstr "Выберите вручную файл базы данных F-Spot для импорта:"
 
-#: src/camera/ImportPage.vala:777
-msgid "Only display photos that have not been imported"
-msgstr "Показать только не импортированные фото"
+#: ../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 ""
+"Не удалось открыть выбранный файл базы данных F-Spot: файл не существует или "
+"не является базой данных F-Spot"
 
-#: src/camera/ImportPage.vala:845
-msgid "Starting import, please wait..."
-msgstr "Начинаю импортирование…"
+#: ../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 ""
+"Не удалось открыть выбранный файл базы данных F-Spot: эта версия базы данных "
+"F-Spot не поддерживается Shotwell"
 
-#: src/camera/ImportPage.vala:872 src/MediaPage.vala:436
-msgid "_Titles"
-msgstr "_Названия"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading tags table"
+msgstr ""
+"Не удалось прочитать выбранный файл базы данных F-Spot: ошибка при чтении "
+"таблицы тегов"
 
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:437
-msgid "Display the title of each photo"
-msgstr "Показать название каждого фото"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:68
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading photos "
+"table"
+msgstr ""
+"Не удалось прочитать файл базы данных F-Spot: ошибка при чтении таблицы "
+"фотографий"
 
-#: src/camera/ImportPage.vala:884
-msgid "Import _Selected"
-msgstr "_Импортировать выбранные"
+#: ../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 ""
+"Shotwell нашёл изображения (%d) в библиотеке F-Spot и в данный момент "
+"импортирует их. Дубликаты будут автоматически распознаны и убраны из "
+"библиотеки.\n"
+"\n"
+"Можно закрыть это окно и начать использовать Shotwell, импорт будет "
+"продолжаться в фоновом режиме."
 
-#: src/camera/ImportPage.vala:885
-msgid "Import the selected photos into your library"
-msgstr "Импортирование выбранных фотографий в библиотеку"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
+#, c-format
+msgid "F-Spot library: %s"
+msgstr "Библиотека F-Spot: %s"
 
-#: src/camera/ImportPage.vala:890
-msgid "Import _All"
-msgstr "Импортировать _все"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
+msgid "Preparing to import"
+msgstr "Подготовка импорта"
 
-#: src/camera/ImportPage.vala:891
-msgid "Import all the photos into your library"
-msgstr "Импортировать все фотографии в библиотеку"
+#: ../plugins/shotwell-data-imports/shotwell-data-imports.vala:22
+msgid "Core Data Import Services"
+msgstr "Основные сервисы импорта"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+msgid "Gallery3 publishing module"
+msgstr "Сервис публикации Gallery3"
 
-#: src/camera/ImportPage.vala:1012
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
 msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
+"You are not currently logged into your Gallery.\n"
+"\n"
+"You must have already signed up for a Gallery3 account to complete the login "
+"process."
 msgstr ""
-"Для доступа к камере, Shotwell должен отмонтировать её от файловой системы. "
-"Продолжить?"
+"В данный момент вы не авторизованы в Gallery3.\n"
+"\n"
+"Для продолжения необходима уже созданная учётная запись Gallery3."
 
-#: src/camera/ImportPage.vala:1018
-msgid "_Unmount"
-msgstr "_Размонтировать"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: ../src/MediaPage.vala:434 ../src/photos/RawSupport.vala:300
+msgid "Shotwell"
+msgstr "Shotwell"
 
-#: src/camera/ImportPage.vala:1023
-msgid "Please unmount the camera."
-msgstr "Отмонтируйте камеру."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+msgid "Shotwell default directory"
+msgstr "Каталог Shotwell по умолчанию"
 
-#: src/camera/ImportPage.vala:1028
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:801
+#, c-format
 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."
+"\n"
+"\n"
+"The file \"%s\" may not be supported by or may be too large for this "
+"instance of Gallery3."
 msgstr ""
-"Камера заблокирована другим приложением. Shotwell не может работать с "
-"заблокированной камерой. Закройте все приложения, работающие с камерой и "
-"повторите попытку."
 
-#: src/camera/ImportPage.vala:1038
-msgid "Please close any other application using the camera."
-msgstr "Закройте все приложения, работающие с камерой."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:802
+msgid ""
+"\n"
+"Note that Gallery3 only supports the video types that Flowplayer does."
+msgstr ""
+"\n"
+"Обратите внимание, Gallery3 поддерживает только те типы видео, которые "
+"воспроизводятся Flowplayer."
 
-#: src/camera/ImportPage.vala:1043
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
 #, c-format
 msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
 msgstr ""
-"Невозможно получить предпросмотр с камеры:\n"
-"%s"
+"Файл, необходимый для публикации недоступен. Невозможно продолжить "
+"публикацию в %s."
 
-#: src/camera/ImportPage.vala:1060
-msgid "Unmounting..."
-msgstr "Отмонтирование…"
+#. populate any widgets whose contents are
+#. programmatically-generated
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
+#, c-format
+msgid "Publishing to %s as %s."
+msgstr "Публикация в %s как %s."
 
-#: src/camera/ImportPage.vala:1166
-msgid "Fetching photo information"
-msgstr "Получение информации о снимке"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
+msgid ""
+"Enter the URL for your Gallery3 site and the username and password (or API "
+"key) for your Gallery3 account."
+msgstr ""
+"Введите URL-адрес вашей страницы Gallery3, а также имя пользователя и пароль "
+"(или ключ API) для вашей учётной записи Gallery3."
 
-#: src/camera/ImportPage.vala:1521
-#, c-format
-msgid "Fetching preview for %s"
-msgstr "Получение предпросмотра %s"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
+msgid ""
+"The username and password or API key were incorrect. To try again, re-enter "
+"your username and password below."
+msgstr ""
+"Неверное имя пользователя, пароль или ключ API. Заново введите имя "
+"пользователя и пароль, затем повторите попытку."
 
-#: src/camera/ImportPage.vala:1637
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "Невозможно заблокировать камеру: %s"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
+msgid ""
+"The URL entered does not appear to be the main directory of a Gallery3 "
+"instance. Please make sure you typed it correctly and it does not have any "
+"trailing components (e.g., index.php)."
+msgstr ""
+"Указанный URL не выглядит как основной каталог экземпляра Gallery3. "
+"Убедитесь, что URL введён правильно, и не имеет каких-либо замыкающих "
+"компонентов (например, index.php)."
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
+msgid "Unrecognized User"
+msgstr "Нераспознанный пользователь"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
+msgid " Site Not Found"
+msgstr " сайт не найден"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
+msgid "Copyright (C) 2013 rajce.net"
+msgstr "Авторское право © 2013 rajce.net"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
+#| msgid ""
+#| "An error message occurred when publishing to Piwigo. Please try again."
+msgid "An error message occurred when publishing to Rajce. Please try again."
+msgstr "Произошла ошибка при публикации в Rajce. Попробуйте ещё раз."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
+msgid "Enter email and password associated with your Rajce account."
+msgstr ""
+"Введите адрес электронной почты и пароль, связанный с вашей учётной записью "
+"Rajce."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
+msgid "Invalid email and/or password. Please try again"
+msgstr "Неверный адрес электронной почты и/или пароль. Попробуйте ещё раз"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
+msgid "Invalid User Email or Password"
+msgstr "Неверный адрес электронной почты или пароль"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:890
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:2
+msgid "_Email address"
+msgstr "А_дрес эл. почты"
 
-#: src/camera/ImportPage.vala:1722
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:891
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
+msgid "_Password"
+msgstr "_Пароль"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
+msgid "_Remember"
+msgstr "_Запомнить"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
+msgid "Login"
+msgstr "Войти"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:5
+msgid "_Hide album"
+msgstr "_Скрыть альбом"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
-msgid "Delete this photo from camera?"
-msgid_plural "Delete these %d photos from camera?"
-msgstr[0] "Удалить %d фотографию из камеры?"
-msgstr[1] "Удалить %d фотографии из камеры?"
-msgstr[2] "Удалить %d фотографий из камеры?"
+msgid "You are logged into Rajce as %s."
+msgstr "Вы вошли в Rajce как %s."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
+msgid "Photos will appear in:"
+msgstr "Фотографии будут расположены в:"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
+msgid "An _existing album:"
+msgstr "_Существующем альбоме:"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
+msgid "A _new album named:"
+msgstr "_Новом альбоме:"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:6
+msgid "Open target _album in browser"
+msgstr "Открыть целевой альбом в браузере"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:8
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
+msgid "_Publish"
+msgstr "_Опубликовать"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
+msgid "_Logout"
+msgstr "_Выйти"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Авторское право © 2012 BJA Electronics"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
+msgid "500 x 375 pixels"
+msgstr "500 x 375 пикселей"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
+msgid "1024 x 768 pixels"
+msgstr "1024 x 768 пикселей"
 
-#: src/camera/ImportPage.vala:1725
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
+msgid "1280 x 853 pixels"
+msgstr "1280 x 853 пикселей"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:310
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:320
 #, c-format
-msgid "Delete this video from camera?"
-msgid_plural "Delete these %d videos from camera?"
-msgstr[0] "Удалить %d видеофайл из камеры?"
-msgstr[1] "Удалить %d видеофайла из камеры?"
-msgstr[2] "Удалить %d видеофайлов из камеры?"
+msgid "'%s' isn't a valid response to an OAuth authentication request"
+msgstr ""
+"«%s» не является корректным ответом на запрос проверки подлинности OAuth"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:558
+msgid ""
+"TumblrPublisher: start( ): can't start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( ): запуск невозможен; этот публикатор не имеет "
+"возможности перезапуска."
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr ""
+"Введите имя пользователя и пароль, связанный с вашей учётной записью Tumblr."
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
+msgid "Username and/or password invalid. Please try again"
+msgstr "Неверное имя пользователя и/или пароль. Попробуйте ещё раз"
 
-#: src/camera/ImportPage.vala:1728
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:617
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
+msgid "Invalid User Name or Password"
+msgstr "Неверное имя пользователя или пароль"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:636
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
 #, c-format
-msgid "Delete this photo/video from camera?"
-msgid_plural "Delete these %d photos/videos from camera?"
-msgstr[0] "Удалить %d фотографию/видеофайл из камеры?"
-msgstr[1] "Удалить %d фотографии/видеофайла из камеры?"
-msgstr[2] "Удалить %d фотографий/видеофайлов из камеры?"
+msgid "Could not load UI: %s"
+msgstr "Не удалось загрузить пользовательский интерфейс: %s"
 
-#: src/camera/ImportPage.vala:1731
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:739
 #, c-format
-msgid "Delete these files from camera?"
-msgid_plural "Delete these %d files from camera?"
-msgstr[0] "Удалить %d файл из камеры?"
-msgstr[1] "Удалить эти %d файла из камеры? "
-msgstr[2] "Удалить эти %d файлов из камеры?"
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Вы вошли в Tumblr как %s.\n"
+"\n"
 
-#: src/camera/ImportPage.vala:1739 src/Dialogs.vala:1328
-msgid "_Keep"
-msgstr "_Оставить"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
+msgstr "Авторское право © 2010+ Евгений Поляков <zbr@ioremap.net>"
 
-#: src/camera/ImportPage.vala:1758
-msgid "Removing photos/videos from camera"
-msgstr "Удаление фотографий и видеоклипов из камеры"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:25
+msgid "Visit the Yandex.Fotki web site"
+msgstr "Посетить веб-сайт Yandex.Fotki"
 
-#: src/camera/ImportPage.vala:1762
-#, 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] "Невозможно удалить %d фотографию/видео из камеры из-за ошибок."
-msgstr[1] "Невозможно удалить %d фотографии/видео из камеры из-за ошибок."
-msgstr[2] "Невозможно удалить %d фотографий/видео из камеры из-за ошибок."
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:632
+msgid "You are not currently logged into Yandex.Fotki."
+msgstr "В данный момент вы не авторизованы в Yandex.Fotki."
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2623
-msgid "S_lideshow"
-msgstr "_Слайдшоу"
+#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+msgid "Shotwell Extra Publishing Services"
+msgstr "Дополнительные сервисы публикации Shotwell"
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2624
-msgid "Play a slideshow"
-msgstr "_Запустить слайдшоу"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
+msgid "Go _Back"
+msgstr "_Назад"
 
-#: src/CollectionPage.vala:456
-msgid "Export Photo/Video"
-msgstr "Экспорт фотографий/видео"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
+#: ../ui/shotwell.glade.h:42
+msgid "_Login"
+msgstr "_Войти"
 
-#: src/CollectionPage.vala:456
-msgid "Export Photos/Videos"
-msgstr "Экспорт фотографий/видео"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
+msgid "Intro message replaced at runtime"
+msgstr "Вводное сообщение заменено в среде выполнения"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:58 src/PhotoPage.vala:3196
-msgid "Export Photo"
-msgstr "Экспорт фотографий"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
+msgid "_Gallery3 URL:"
+msgstr "_Gallery3 URL:"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:87
-msgid "Export Photos"
-msgstr "Экспортировать фотографии"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
+msgid "_User name:"
+msgstr "_Имя пользователя:"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Rotating"
-msgstr "Поворот"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
+msgid "_Password:"
+msgstr "_Пароль:"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Undoing Rotate"
-msgstr "Отменить поворот"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:7
+msgid "API _Key:"
+msgstr "_Ключ API:"
 
-#: src/CollectionPage.vala:570
-msgid "Flipping Horizontally"
-msgstr "Перевернуть горизонтально"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
+msgid "or"
+msgstr "или"
 
-#: src/CollectionPage.vala:571
-msgid "Undoing Flip Horizontally"
-msgstr "Отменить горизонтальный переворот"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
+msgid "A _new album"
+msgstr "Новый _альбом"
 
-#: src/CollectionPage.vala:580
-msgid "Flipping Vertically"
-msgstr "Перевернуть вертикально"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
+msgid "An _existing album"
+msgstr "_Существующий альбом"
 
-#: src/CollectionPage.vala:581
-msgid "Undoing Flip Vertically"
-msgstr "Отменить вертикальный переворот"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
+msgid "_Remove location, tag and camera-identifying data before uploading"
+msgstr "_Удалите местоположение, тег и информацию о камере перед публикацией"
 
-#: src/searches/SearchBoolean.vala:157
-msgid "Any text"
-msgstr "Любой текст"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
+msgid "'Publishing to $url as $username' (populated in application code)"
+msgstr "«Публикация в $url как $username» (заполняется в коде приложения)"
 
-#: src/searches/SearchBoolean.vala:160
-msgid "Title"
-msgstr "Заголовок"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
+#| msgid "_Scaling constraint:"
+msgid "Scaling constraint:"
+msgstr "Ограничение масштабирования:"
 
-#: src/searches/SearchBoolean.vala:163
-msgid "Tag"
-msgstr "Метка"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
+msgid "pixels"
+msgstr "пикселей"
 
-#: src/searches/SearchBoolean.vala:166
-msgid "Comment"
-msgstr "Комментарий"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
+#: ../src/Dimensions.vala:17
+msgid "Original size"
+msgstr "Исходный размер"
 
-#: src/searches/SearchBoolean.vala:169
-msgid "Event name"
-msgstr "Название события"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:10
+#: ../src/Dimensions.vala:20
+msgid "Width or height"
+msgstr "Ширина или высота"
 
-#: src/searches/SearchBoolean.vala:172
-msgid "File name"
-msgstr "Имя файла"
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
+#: ../ui/shotwell.glade.h:14
+msgid "label"
+msgstr "метка"
 
-#: src/searches/SearchBoolean.vala:175
-msgid "Media type"
-msgstr "Тип носителя"
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
+msgid "Blogs:"
+msgstr "Блоги:"
 
-#: src/searches/SearchBoolean.vala:178
-msgid "Flag state"
-msgstr "Состояние обозначения"
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:1
+msgid "Photo _size:"
+msgstr "_Размер снимка:"
 
-#: src/searches/SearchBoolean.vala:181
-msgid "Photo state"
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
+msgid "you are logged in rajce as $name"
+msgstr "вы зашли в rajce как $name"
+
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
+msgid "$mediatype will appear in"
+msgstr "$mediatype появятся в"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
+msgid "_Albums (or write new):"
+msgstr "_Альбомы (или создать новый):"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:2
+msgid "Access _type:"
+msgstr "Способ _доступа:"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
+msgid "Disable _comments"
+msgstr "Отключить _комментарии"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:4
+msgid "_Forbid downloading original photo"
+msgstr "_Запретить загрузку оригинала"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
+msgid "Public"
+msgstr "Общедоступное"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:8
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1181
+msgid "Friends"
+msgstr "Друзья"
+
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:9
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
+msgid "Private"
+msgstr "Личное"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:59
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1127
+msgid "Shotwell Connect"
+msgstr "Менеджер подключений Shotwell"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:63
+msgid ""
+"You are not currently logged into Facebook.\n"
+"\n"
+"If you don't yet have a Facebook account, you can create one during the "
+"login process. During login, Shotwell Connect may ask you for permission to "
+"upload photos and publish to your feed. These permissions are required for "
+"Shotwell Connect to function."
 msgstr ""
+"В данный момент вы не авторизованы в Facebook.\n"
+"\n"
+"Если у вас ещё нет учётной записи Facebook, вы можете создать её в процессе "
+"авторизации. Во время авторизации менеджер подключений Shotwell может "
+"запросить разрешение на выгрузку изображений и публикацию их в вашей "
+"галерее. Это необходимо для работы менеджера."
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1003
-msgid "Rating"
-msgstr "Рейтинг"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:65
+msgid ""
+"You have already logged in and out of Facebook during this Shotwell "
+"session.\n"
+"To continue publishing to Facebook, quit and restart Shotwell, then try "
+"publishing again."
+msgstr ""
+"Вы уже авторизовались и вышли из Facebook в ходе этой сессии Shotwell.\n"
+"Чтобы продолжить публикацию в Facebook, перезапустите Shotwell, затем "
+"повторите попытку публикации."
 
-#: src/searches/SearchBoolean.vala:187
-msgid "Date"
-msgstr "Дата"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:86
+msgid "Standard (720 pixels)"
+msgstr "Стандартный (720 пикселей)"
 
-#: src/searches/SavedSearchDialog.vala:169
-msgid "contains"
-msgstr "содержит"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:89
+msgid "Large (2048 pixels)"
+msgstr "Большой (2048 пикселей)"
 
-#: src/searches/SavedSearchDialog.vala:170
-#: src/searches/SavedSearchDialog.vala:497
-msgid "is exactly"
-msgstr "точно"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:254
+msgid "Testing connection to Facebook..."
+msgstr "Проверка подключения к Facebook…"
 
-#: src/searches/SavedSearchDialog.vala:171
-msgid "starts with"
-msgstr "начинается с"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:347
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
+msgid "Creating album..."
+msgstr "Создание альбома…"
 
-#: src/searches/SavedSearchDialog.vala:172
-msgid "ends with"
-msgstr "оканчивается на"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:374
+msgid ""
+"A file required for publishing is unavailable. Publishing to Facebook can't "
+"continue."
+msgstr ""
+"Файл, необходимый для публикации недоступен. Невозможно продолжить "
+"публикацию в Facebook."
 
-#: src/searches/SavedSearchDialog.vala:173
-msgid "does not contain"
-msgstr "не содержит"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1019
+#, c-format
+msgid ""
+"You are logged into Facebook as %s.\n"
+"\n"
+msgstr ""
+"Вы зашли в Facebook как %s.\n"
+"\n"
 
-#: src/searches/SavedSearchDialog.vala:174
-#: src/searches/SavedSearchDialog.vala:501
-msgid "is not set"
-msgstr "не задано"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1020
+msgid "Where would you like to publish the selected photos?"
+msgstr "Где нужно опубликовать выбранные фотографии?"
 
-#: src/searches/SavedSearchDialog.vala:245
-#: src/searches/SavedSearchDialog.vala:376
-#: src/searches/SavedSearchDialog.vala:441
-msgid "is"
-msgstr "-"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1021
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
+msgid "Upload _size:"
+msgstr "_Размер отправки:"
 
-#: src/searches/SavedSearchDialog.vala:246
-msgid "is not"
-msgstr "не"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
+msgid "Just me"
+msgstr "Только я"
 
-#: src/searches/SavedSearchDialog.vala:252
-msgid "any photo"
-msgstr "любое фото"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+msgid "Everyone"
+msgstr "Все"
 
-#: src/searches/SavedSearchDialog.vala:253
-msgid "a raw photo"
-msgstr "цифровой негатив"
+#: ../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 ""
+"В данный момент вы не авторизованы в Flickr.\n"
+"\n"
+"Нажмите кнопку «Войти» для входа в Flickr с помощью веб-браузера. Вам будет "
+"нужно разрешить подключение Shotwell к вашей учётной записи Flickr."
 
-#: src/searches/SavedSearchDialog.vala:254
-msgid "a video"
-msgstr "видео"
+#: ../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 ""
+"Вы уже авторизовались и вышли из Flickr в ходе этой сессии Shotwell.\n"
+"Чтобы продолжить публикацию в Flickr, перезапустите Shotwell, затем "
+"повторите попытку публикации."
 
-#: src/searches/SavedSearchDialog.vala:308
-msgid "has"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:375
+msgid "Preparing for login..."
+msgstr "Подготовка входа…"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:444
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:595
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can't "
+"continue."
 msgstr ""
+"Файл, необходимый для публикации недоступен. Невозможно продолжить "
+"публикацию в Flickr."
 
-#: src/searches/SavedSearchDialog.vala:309
-msgid "has no"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:457
+msgid "Verifying authorization..."
+msgstr "Проверка прав доступа…"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1153
+#, c-format
+msgid ""
+"You are logged into Flickr as %s.\n"
+"\n"
 msgstr ""
+"Вы зашли в Flickr как %s.\n"
+"\n"
 
-#: src/searches/SavedSearchDialog.vala:314
-msgid "modifications"
-msgstr "модификации"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
+#, fuzzy, 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."
+msgid ""
+"Your free Flickr account limits how much data you can upload per month.\n"
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"Бесплатная учётная запись Flickr имеет ограничение по количеству загрузок\n"
+"в месяц. На этот месяц у вас имеется квота в %d мегабайт."
+msgstr[1] ""
+"Бесплатная учётная запись Flickr имеет ограничение по количеству загрузок\n"
+"в месяц. На этот месяц у вас имеется квота в %d мегабайт."
+msgstr[2] ""
+"Бесплатная учётная запись Flickr имеет ограничение по количеству загрузок\n"
+"в месяц. На этот месяц у вас имеется квота в %d мегабайт."
 
-#: src/searches/SavedSearchDialog.vala:315
-msgid "internal modifications"
-msgstr "внутренние модификации"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
+msgid "Your Flickr Pro account entitles you to unlimited uploads."
+msgstr ""
+"Ваша подписка Flickr Pro позволяет делать неограниченное количество загрузок."
 
-#: src/searches/SavedSearchDialog.vala:316
-msgid "external modifications"
-msgstr "внешние модификации"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
+msgid "Photos _visible to:"
+msgstr "Изображения _видимы:"
 
-#: src/searches/SavedSearchDialog.vala:370
-msgid "flagged"
-msgstr "отмеченные"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+msgid "Videos _visible to:"
+msgstr "Видео _видимы:"
 
-#: src/searches/SavedSearchDialog.vala:371
-msgid "not flagged"
-msgstr "не отмеченные"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
+msgid "Photos and videos _visible to:"
+msgstr "Изображения и видео _видимы:"
 
-#: src/searches/SavedSearchDialog.vala:434
-msgid "and higher"
-msgstr "и выше"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+msgid "Friends & family only"
+msgstr "Только друзьям и семье"
 
-#: src/searches/SavedSearchDialog.vala:435
-msgid "only"
-msgstr "только"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
+msgid "Family only"
+msgstr "Только семье"
 
-#: src/searches/SavedSearchDialog.vala:436
-msgid "and lower"
-msgstr "и ниже"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
+msgid "Friends only"
+msgstr "Только друзьям"
 
-#: src/searches/SavedSearchDialog.vala:498
-msgid "is after"
-msgstr "после"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
+msgid "2048 x 1536 pixels"
+msgstr "2048 x 1536 пикселей"
 
-#: src/searches/SavedSearchDialog.vala:499
-msgid "is before"
-msgstr "перед"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
+msgid "4096 x 3072 pixels"
+msgstr "4096 x 3072 пикселей"
 
-#: src/searches/SavedSearchDialog.vala:500
-msgid "is between"
-msgstr "между"
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:58
+msgid ""
+"You are not currently logged into Picasa Web Albums.\n"
+"\n"
+"Click Login to log into Picasa Web Albums in your Web browser. You will have "
+"to authorize Shotwell Connect to link to your Picasa Web Albums account."
+msgstr ""
+"В данный момент вы не авторизованы в Picasa.\n"
+"\n"
+"Нажмите кнопку «Войти» для входа в Picasa с помощью веб-браузера. Вам будет "
+"нужно разрешить подключение Shotwell к вашей учётной записи Picasa."
 
-#: src/searches/SavedSearchDialog.vala:513
-msgid "and"
-msgstr "и"
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:361
+msgid ""
+"A file required for publishing is unavailable. Publishing to Picasa can't "
+"continue."
+msgstr ""
+"Файл, необходимый для публикации недоступен. Невозможно продолжить "
+"публикацию в Picasa."
 
-#: src/searches/SavedSearchDialog.vala:720
-msgid "any"
-msgstr "любой"
+#. populate any widgets whose contents are programmatically-generated.
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:659
+#, c-format
+msgid "You are logged into Picasa Web Albums as %s."
+msgstr "Вы вошли в веб-альбомы Picasa как %s."
 
-#: src/searches/SavedSearchDialog.vala:721
-msgid "all"
-msgstr "все"
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:665
+msgid "Videos will appear in:"
+msgstr "Видео будут в:"
 
-#: src/searches/SavedSearchDialog.vala:722
-msgid "none"
-msgstr "ни один"
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
+msgid "Small (640 x 480 pixels)"
+msgstr "Маленький (640 х 480 пикселей)"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Сохранённые поисковые запросы"
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:747
+msgid "Medium (1024 x 768 pixels)"
+msgstr "Средний (1024 х 768 пикселей)"
 
-#: src/searches/Branch.vala:77 src/library/LibraryWindow.vala:346
-#: src/sidebar/Tree.vala:195
-msgid "Ne_w Saved Search..."
-msgstr "Новый Сохранить Поиск..."
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:748
+msgid "Recommended (1600 x 1200 pixels)"
+msgstr "Рекомендуемый (1600 х 1200 пикселей)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:749
+msgid "Google+ (2048 x 1536 pixels)"
+msgstr "Google+ (2048 x 1536 пикселей)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:750
+#: ../src/editing_tools/EditingTools.vala:756
+msgid "Original Size"
+msgstr "Исходный размер"
 
-#: src/main.vala:54
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
 #, c-format
+msgid "Creating album %s..."
+msgstr "Создание альбома %s…"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:917
+msgid "An error message occurred when publishing to Piwigo. Please try again."
+msgstr "Произошла ошибка при публикации в Piwigo. Попробуйте ещё раз."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:998
 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."
+"Enter the URL of your Piwigo photo library as well as the username and "
+"password associated with your Piwigo account for that library."
 msgstr ""
-"Ваша библиотека фотографий не совместима с этой версией Shotwell. Судя по "
-"всему, она создана версией Shotwell %s (сборка %d). Текущая версия программы "
-"%s (сборка %d). Установите последнюю версию Shotwell."
+"Введите URL-адрес вашей фотобиблиотеки Piwigo, а также имя пользователя и "
+"пароль, связанные с вашей учётной записью Piwigo."
 
-#: src/main.vala:59
-#, c-format
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:999
 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"
+"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
+"entered"
 msgstr ""
-"Shotwell не удалось обновить вашу библиотеку фото с версии %s (сборка %d) на "
-"%s (сборка %d). Для получения дополнительной информации, ознакомьтесь с wiki "
-"Shotwell, находящуюся по адресу %s"
+"Shotwell не удалось связаться с Piwigo. Проверьте правильность введённого "
+"URL-адреса."
 
-#: src/main.vala:65
-#, c-format
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+msgid "Invalid URL"
+msgstr "Недопустимый URL"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+msgid "Admins, Family, Friends, Contacts"
+msgstr "Администраторы, семья, друзья, контакты"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+msgid "Admins, Family, Friends"
+msgstr "Администраторы, семья, друзья"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+msgid "Admins, Family"
+msgstr "Администраторы, семья"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+msgid "Admins"
+msgstr "Администраторы"
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:57
 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."
+"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 ""
-"Ваша библиотека фотографий не совместима с этой версией Shotwell. Судя по "
-"всему, она создана версией %s (сборка %d). Текущая версия %s (сборка %d). "
-"Очистите библиотеку, удалив %s и повторно импортируйте свои фото."
+"В данный момент вы не авторизованы в YouTube.\n"
+"\n"
+"Чтобы продолжить, вам необходима уже созданная учётная запись Google, "
+"имеющая привязку к YouTube. Можно связать учётные записи после первого входа "
+"на сайт YouTube в браузере."
 
-#: src/main.vala:71
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
+msgid ""
+"A file required for publishing is unavailable. Publishing to Youtube can't "
+"continue."
+msgstr ""
+"Файл, необходимый для публикации недоступен. Невозможно продолжить "
+"публикацию в Youtube."
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:461
 #, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
-msgstr "Неизвестная ошибка при попытке проверки базы данных Shotwell: %s"
+msgid "You are logged into YouTube as %s."
+msgstr "Вы зашли в YouTube как %s."
 
-#: src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "Загрузка Shotwell"
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:463
+#, c-format
+msgid "Videos will appear in '%s'"
+msgstr "Видео появятся в «%s»"
 
-#: src/main.vala:294
-msgid "Path to Shotwell's private data"
-msgstr "Путь до конфиденциальной информации Shotwell"
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:495
+msgid "Public listed"
+msgstr "Общедоступное"
 
-#: src/main.vala:294
-msgid "DIRECTORY"
-msgstr "КАТАЛОГ"
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
+msgid "Public unlisted"
+msgstr "Не общедоступное"
 
-#: src/main.vala:298
-msgid "Do not monitor library directory at runtime for changes"
-msgstr "Не отслеживать изменения в каталоге библиотеки во время работы"
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
+msgid "Publish to an e_xisting album:"
+msgstr "Опубликовать в _альбоме:"
 
-#: src/main.vala:302
-msgid "Don't display startup progress meter"
-msgstr "Не показывать анимированный индикатор прогресса при старте программы"
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:2
+msgid "Create a _new album named:"
+msgstr "Создать _новый альбом:"
 
-#: src/main.vala:306
-msgid "Show the application's version"
-msgstr "Показывать версию приложения"
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
+msgid "Videos and new photo albums _visible to:"
+msgstr "Видео и новые фотоальбомы _видимы для:"
 
-#: src/main.vala:338
-msgid "[FILE]"
-msgstr "[FILE]"
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:5
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:8
+msgid ""
+"_Remove location, camera, and other identifying information before uploading"
+msgstr ""
+"_Удалите местоположение, информацию о камере и другую идентифицирующую "
+"информацию перед публикацией"
 
-#: src/main.vala:342
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
+msgid ""
+"Enter the confirmation number which appears after you log into Flickr in "
+"your Web browser."
 msgstr ""
-"Выполните '%s --help' для просмотра полного списка параметров командной "
-"строки.\n"
+"Введите номер подтверждения, который появится после входа в Flickr в веб-"
+"браузере."
 
-#: src/Properties.vala:84
-msgid "Today"
-msgstr "Сегодня"
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
+msgid "Authorization _Number:"
+msgstr "_Номер подтверждения:"
 
-#: src/Properties.vala:86
-msgid "Yesterday"
-msgstr "Вчера"
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:3
+#: ../src/Dialogs.vala:131
+msgid "Con_tinue"
+msgstr "_Продолжить"
 
-#: src/Properties.vala:340 src/Dialogs.vala:1273
-msgid "Title:"
-msgstr "Название:"
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
+msgid "L_ist album in public gallery"
+msgstr "_Список альбомов в общедоступной галерее"
 
-#: src/Properties.vala:343
-msgid "Items:"
-msgstr "Элементы:"
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
+msgid "Photo _size preset:"
+msgstr "_Предустановки размера снимка:"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
+msgid "_URL of your Piwigo photo library"
+msgstr "_URL вашей коллекции фотографий на Piwigo"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
+msgid "User _name"
+msgstr "_Имя пользователя"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
+msgid "_Remember Password"
+msgstr "_Напомнить пароль"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
+msgid "An _existing category:"
+msgstr "_Существующая категория:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:4
+msgid "Photos will be _visible by:"
+msgstr "Фотографии будут _видимы для:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:5
+msgid "Photo size:"
+msgstr "Размер фотографии:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:6
+msgid "within category:"
+msgstr "в категории:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
+msgid "Album comment:"
+msgstr "Комментарий к альбому:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
+msgid "_If a title is set and comment unset, use title as comment"
+msgstr ""
+"_Если название установлено, а комментарий нет, то использовать название как "
+"комментарий"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:10
+msgid "_Do no upload tags"
+msgstr "_Не публиковать теги"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
+msgid "Logout"
+msgstr "Выйти"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
+#: ../src/Resources.vala:303
+msgid "Publish"
+msgstr "Опубликовать"
+
+#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
+msgid "Core Publishing Services"
+msgstr "Основные сервисы публикации"
+
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
+msgid "Video privacy _setting:"
+msgstr "_Установки конфиденциальности видео:"
+
+#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+msgid "Blinds"
+msgstr "Жалюзи"
+
+#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+msgid "Chess"
+msgstr "Шахматы"
+
+#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+msgid "Circle"
+msgstr "Круг"
+
+#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+msgid "Circles"
+msgstr "Круги"
+
+#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+msgid "Clock"
+msgstr "Часы"
+
+#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+msgid "Crumble"
+msgstr "Распад"
 
-#: src/Properties.vala:346
+#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+msgid "Fade"
+msgstr "Угасание"
+
+#: ../plugins/shotwell-transitions/SlideEffect.vala:20
+msgid "Slide"
+msgstr "Слайд"
+
+#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
+msgid "Squares"
+msgstr "Квадраты"
+
+#: ../plugins/shotwell-transitions/StripesEffect.vala:20
+msgid "Stripes"
+msgstr "Полоски"
+
+#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
+msgid "Core Slideshow Transitions"
+msgstr "Основные эффекты переходов"
+
+#: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+msgstr "Авторское право © 2010 Maxim Kartashev, © 2011-2015 Yorba Foundation"
+
+#: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
 #, c-format
-msgid "%d Event"
-msgid_plural "%d Events"
-msgstr[0] "%d событие"
-msgstr[1] "%d события"
-msgstr[2] "%d событий"
+msgid "Unable to create cache directory %s: %s"
+msgstr "Невозможно создать каталог кэша %s: %s"
 
-#: src/Properties.vala:353 src/events/EventDirectoryItem.vala:87
+#: ../src/AppDirs.vala:58 ../src/AppDirs.vala:88
 #, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] "%d фотография"
-msgstr[1] "%d фотографии"
-msgstr[2] "%d фотографий"
+msgid "Unable to create data directory %s: %s"
+msgstr "Невозможно создать каталог данных %s: %s"
 
-#: src/Properties.vala:355 src/events/EventDirectoryItem.vala:85
+#. If XDG yarfed, use ~/Pictures
+#: ../src/AppDirs.vala:152
+msgid "Pictures"
+msgstr "Изображения"
+
+#: ../src/AppDirs.vala:190
 #, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] "%d видео"
-msgstr[1] "%d видео"
-msgstr[2] "%d видео"
+msgid "Unable to create temporary directory %s: %s"
+msgstr "Невозможно создать временный каталог %s: %s"
 
-#: src/Properties.vala:377
-msgid "Date:"
-msgstr "Дата:"
+#: ../src/AppDirs.vala:207 ../src/AppDirs.vala:223
+#, c-format
+msgid "Unable to create data subdirectory %s: %s"
+msgstr "Невозможно создать подкаталог данных %s: %s"
 
-#: src/Properties.vala:381
-msgid "Time:"
-msgstr "Время:"
+#: ../src/AppWindow.vala:53
+msgid "Pin Toolbar"
+msgstr "Прикрепить панель инструментов"
 
-#: src/Properties.vala:384 src/Properties.vala:389
-msgid "From:"
-msgstr "От:"
+#: ../src/AppWindow.vala:54
+msgid "Pin the toolbar open"
+msgstr "Прикрепить панель инструментов"
 
-#: src/Properties.vala:385 src/Properties.vala:390
-msgid "To:"
-msgstr "До:"
+#: ../src/AppWindow.vala:59
+msgid "Leave fullscreen"
+msgstr "Покинуть полноэкранный режим"
 
-#: src/Properties.vala:395 src/editing_tools/EditingTools.vala:1850
-msgid "Size:"
-msgstr "Размер:"
+#: ../src/AppWindow.vala:525
+msgid "_Contents"
+msgstr "_Содержание"
 
-#: src/Properties.vala:404
-msgid "Duration:"
-msgstr "Продолжительность:"
+#: ../src/AppWindow.vala:530
+msgid "_Frequently Asked Questions"
+msgstr "_Часто задаваемые вопросы (FAQ)"
+
+#: ../src/AppWindow.vala:535
+msgid "_Report a Problem..."
+msgstr "_Сообщить об ошибке…"
 
-#: src/Properties.vala:404
+#: ../src/AppWindow.vala:634 ../src/AppWindow.vala:655
+#: ../src/AppWindow.vala:672 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
+#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441 ../src/Resources.vala:162
+#: ../src/data_imports/DataImportsUI.vala:374
+#: ../src/publishing/PublishingUI.vala:475
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#: ../src/AppWindow.vala:682
 #, c-format
-msgid "%.1f seconds"
-msgstr "%.1f секунд"
+msgid ""
+"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
+"continue.\n"
+"\n"
+"%s"
+msgstr ""
+"При доступе к библиотеке Shotwell произошла критическая ошибка. Дальнейшая "
+"работа программы невозможна.\n"
+"\n"
+"%s"
 
-#: src/Properties.vala:408
-msgid "Developer:"
-msgstr "Обработчик:"
+#: ../src/AppWindow.vala:702
+msgid "Visit the Yorba web site"
+msgstr "Посетить сайт Yorba"
 
-#: src/Properties.vala:436 src/Properties.vala:440 src/Properties.vala:447
-#: src/editing_tools/EditingTools.vala:2218
-msgid "Exposure:"
-msgstr "Выдержка:"
+#: ../src/AppWindow.vala:714
+#, c-format
+msgid "Unable to display help: %s"
+msgstr "Невозможно отобразить справку: %s"
 
-#: src/Properties.vala:585
-msgid "Location:"
-msgstr "Местоположение:"
+#: ../src/AppWindow.vala:722
+#, c-format
+msgid "Unable to navigate to bug database: %s"
+msgstr "Невозможно перейти к базе данных об ошибках: %s"
 
-#: src/Properties.vala:588
-msgid "File size:"
-msgstr "Размер файла:"
+#: ../src/AppWindow.vala:730
+#, c-format
+msgid "Unable to display FAQ: %s"
+msgstr "Невозможно отобразить FAQ: %s"
 
-#: src/Properties.vala:592
-msgid "Current Development:"
-msgstr "Текущая разработка:"
+#: ../src/BatchImport.vala:26
+msgid "Success"
+msgstr "Успешно"
 
-#: src/Properties.vala:594
-msgid "Original dimensions:"
-msgstr "Размеры оригинала:"
+#: ../src/BatchImport.vala:29
+msgid "File error"
+msgstr "Ошибка файла"
 
-#: src/Properties.vala:597
-msgid "Camera make:"
-msgstr "Модель камеры:"
+#: ../src/BatchImport.vala:32
+msgid "Unable to decode file"
+msgstr "Невозможно декодировать файл"
 
-#: src/Properties.vala:600
-msgid "Camera model:"
-msgstr "Модель камеры:"
+#: ../src/BatchImport.vala:35
+msgid "Database error"
+msgstr "Ошибка базы данных"
 
-#: src/Properties.vala:603
-msgid "Flash:"
-msgstr "Вспышка:"
+#: ../src/BatchImport.vala:38
+msgid "User aborted import"
+msgstr "Импортирование прервано пользователем"
 
-#: src/Properties.vala:605
-msgid "Focal length:"
-msgstr "Фокусное расстояние:"
+#: ../src/BatchImport.vala:41
+msgid "Not a file"
+msgstr "Не является файлом"
 
-#: src/Properties.vala:608
-msgid "Exposure date:"
-msgstr "Данные экспонирования:"
+#: ../src/BatchImport.vala:44
+msgid "File already exists in database"
+msgstr "Файл уже существует в базе данных"
 
-#: src/Properties.vala:611
-msgid "Exposure time:"
-msgstr "Время экспонирования:"
+#: ../src/BatchImport.vala:47
+msgid "Unsupported file format"
+msgstr "Неподдерживаемый формат файла"
 
-#: src/Properties.vala:614
-msgid "Exposure bias:"
-msgstr "Компенсация экспозиции:"
+#: ../src/BatchImport.vala:50
+msgid "Not an image file"
+msgstr "Не является изображением"
 
-#: src/Properties.vala:616
-msgid "GPS latitude:"
-msgstr "Широта GPS:"
+#: ../src/BatchImport.vala:53
+msgid "Disk failure"
+msgstr "Сбой диска"
 
-#: src/Properties.vala:619
-msgid "GPS longitude:"
-msgstr "Долгота GPS:"
+#: ../src/BatchImport.vala:56
+msgid "Disk full"
+msgstr "Диск переполнен"
 
-#: src/Properties.vala:622
-msgid "Artist:"
-msgstr "Фотограф:"
+#: ../src/BatchImport.vala:59
+msgid "Camera error"
+msgstr "Ошибка камеры"
 
-#: src/Properties.vala:624
-msgid "Copyright:"
-msgstr "Права:"
+#: ../src/BatchImport.vala:62
+msgid "File write error"
+msgstr "Ошибка записи файла"
 
-#: src/Properties.vala:626
-msgid "Software:"
-msgstr "Программа:"
+#: ../src/BatchImport.vala:65
+msgid "Corrupt image file"
+msgstr "Повреждённый файл изображения"
 
-#: src/Properties.vala:630 src/Dialogs.vala:1288
-msgid "Comment:"
-msgstr "Комментарий:"
+#: ../src/BatchImport.vala:68
+#, c-format
+msgid "Imported failed (%d)"
+msgstr "Не удалось импортировать (%d)"
 
-#: src/Properties.vala:639
-msgid "Extended Information"
-msgstr "Расширенная информация"
+#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
+msgid "S_lideshow"
+msgstr "_Слайдшоу"
+
+#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
+msgid "Play a slideshow"
+msgstr "_Запустить слайдшоу"
+
+#: ../src/CollectionPage.vala:456
+msgid "Export Photo/Video"
+msgstr "Экспортировать фотографию/видео"
+
+#: ../src/CollectionPage.vala:456
+msgid "Export Photos/Videos"
+msgstr "Экспортировать фотографий/видео"
+
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
+#: ../src/PhotoPage.vala:3211
+msgid "Export Photo"
+msgstr "Экспортировать фотографию"
+
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:87
+msgid "Export Photos"
+msgstr "Экспортировать фотографии"
+
+#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+msgid "Rotating"
+msgstr "Поворот"
 
-#: src/Dialogs.vala:16
+#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+msgid "Undoing Rotate"
+msgstr "Отменить поворот"
+
+#: ../src/CollectionPage.vala:570
+msgid "Flipping Horizontally"
+msgstr "Отразить по горизонтали"
+
+#: ../src/CollectionPage.vala:571
+msgid "Undoing Flip Horizontally"
+msgstr "Отменить отражение по горизонтали"
+
+#: ../src/CollectionPage.vala:580
+msgid "Flipping Vertically"
+msgstr "Отразить по вертикали"
+
+#: ../src/CollectionPage.vala:581
+msgid "Undoing Flip Vertically"
+msgstr "Отменить отражение по вертикали"
+
+#: ../src/Commands.vala:733
+msgid "Reverting"
+msgstr "Возврат"
+
+#: ../src/Commands.vala:733
+msgid "Undoing Revert"
+msgstr "Отменить возврат"
+
+#: ../src/Commands.vala:777
+msgid "Enhancing"
+msgstr "Автокоррекция"
+
+#: ../src/Commands.vala:777
+msgid "Undoing Enhance"
+msgstr "Отмена автокоррекции"
+
+#: ../src/Commands.vala:853
+msgid "Applying Color Transformations"
+msgstr "Применение цветовых изменений"
+
+#: ../src/Commands.vala:853
+msgid "Undoing Color Transformations"
+msgstr "Отмена цветовых изменений"
+
+#: ../src/Commands.vala:1003
+msgid "Creating New Event"
+msgstr "Создание нового события"
+
+#: ../src/Commands.vala:1004
+msgid "Removing Event"
+msgstr "Удаление события"
+
+#: ../src/Commands.vala:1013
+msgid "Moving Photos to New Event"
+msgstr "Перемещение снимков в новое событие"
+
+#: ../src/Commands.vala:1014
+msgid "Setting Photos to Previous Event"
+msgstr "Назначение снимкам предыдущего события"
+
+#: ../src/Commands.vala:1071
+msgid "Merging"
+msgstr "Объединение"
+
+#: ../src/Commands.vala:1072
+msgid "Unmerging"
+msgstr "Отмена объединения"
+
+#: ../src/Commands.vala:1081
+msgid "Duplicating photos"
+msgstr "Дублирование фотографий"
+
+#: ../src/Commands.vala:1081
+msgid "Removing duplicated photos"
+msgstr "Удаление дубликатов фотографий"
+
+#: ../src/Commands.vala:1104
+#, 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] "Невозможно сделать копии %d фотографии из-за ошибки файла."
+msgstr[1] "Невозможно сделать копии %d фотографий из-за ошибки файла."
+msgstr[2] "Невозможно сделать копии %d фотографий из-за ошибки файла."
+
+#: ../src/Commands.vala:1191
+msgid "Restoring previous rating"
+msgstr "Восстанавление предыдущей оценки"
+
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+msgid "Increasing ratings"
+msgstr "По возрастанию оценок"
+
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+msgid "Decreasing ratings"
+msgstr "По убыванию оценок"
+
+#: ../src/Commands.vala:1252
+msgid "Setting RAW developer"
+msgstr "Установка обработчика RAW"
+
+#: ../src/Commands.vala:1252
+msgid "Restoring previous RAW developer"
+msgstr "Восстановление предыдущего обработчика RAW"
+
+#: ../src/Commands.vala:1253
+msgid "Set Developer"
+msgstr "Задать обработчик"
+
+#: ../src/Commands.vala:1343
+msgid "Original photo could not be adjusted."
+msgstr "Оригинал не может быть изменён."
+
+#: ../src/Commands.vala:1364
+msgid "Adjusting Date and Time"
+msgstr "Изменить время и дату"
+
+#: ../src/Commands.vala:1364
+msgid "Undoing Date and Time Adjustment"
+msgstr "Отменить изменение даты и времени"
+
+#: ../src/Commands.vala:1395
+msgid "One original photo could not be adjusted."
+msgid_plural "The following original photos could not be adjusted."
+msgstr[0] "Следующие оригиналы фотографий не могут быть изменены."
+msgstr[1] "Следующие оригиналы фотографий не могут быть изменены."
+msgstr[2] "Следующие оригиналы фотографий не могут быть изменены."
+
+#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
+msgid "Time Adjustment Error"
+msgstr "Ошибка изменения времени"
+
+#: ../src/Commands.vala:1419
+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] ""
+"Для этих фотографий операция изменения времени не может быть отменена."
+msgstr[2] ""
+"Для этих фотографий операция изменения времени не может быть отменена."
+
+#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
+msgid "Create Tag"
+msgstr "Создать метку"
+
+#: ../src/Commands.vala:1691
+#, c-format
+msgid "Move Tag \"%s\""
+msgstr "Переместить метку «%s»"
+
+#: ../src/Commands.vala:2343
+msgid "Move Photos to Trash"
+msgstr "Переместить фотографии в корзину"
+
+#: ../src/Commands.vala:2343
+msgid "Restore Photos from Trash"
+msgstr "Восстановить фотографии из корзины"
+
+#: ../src/Commands.vala:2344
+msgid "Move the photos to the Shotwell trash"
+msgstr "Переместить фотографии в корзину Shotwell"
+
+#: ../src/Commands.vala:2344
+msgid "Restore the photos back to the Shotwell library"
+msgstr "Восстановить фотографии в библиотеку Shotwell"
+
+#: ../src/Commands.vala:2363
+msgid "Moving Photos to Trash"
+msgstr "Переместить фотографии в корзину"
+
+#: ../src/Commands.vala:2363
+msgid "Restoring Photos From Trash"
+msgstr "Восстановить фотографии из корзины"
+
+#: ../src/Commands.vala:2449
+msgid "Flag selected photos"
+msgstr "Отметить выбранные фотографии"
+
+#: ../src/Commands.vala:2450
+msgid "Unflag selected photos"
+msgstr "Снять отметку с выбранных фотографий"
+
+#: ../src/Commands.vala:2451
+msgid "Flagging selected photos"
+msgstr "Запись отметки в выбранные фотографий"
+
+#: ../src/Commands.vala:2452
+msgid "Unflagging selected photos"
+msgstr "Снятие отметки с выбранных фотографий"
+
+#: ../src/Commands.vala:2459
+msgid "Flag"
+msgstr "Отметить"
+
+#: ../src/Commands.vala:2459
+msgid "Unflag"
+msgstr "Снять отметку"
+
+#: ../src/DesktopIntegration.vala:121
+#, c-format
+msgid "Unable to launch Nautilus Send-To: %s"
+msgstr "Невозможно отправить через Nautilus: %s"
+
+#: ../src/DesktopIntegration.vala:129
+msgid "Send To"
+msgstr "Отправить"
+
+#: ../src/DesktopIntegration.vala:174
+#, c-format
+msgid "Unable to export background to %s: %s"
+msgstr "Невозможно экспортировать фон в %s: %s"
+
+#: ../src/DesktopIntegration.vala:311
+#, c-format
+msgid "Unable to prepare desktop slideshow: %s"
+msgstr "Невозможно подготовить слайдшоу рабочего стола: %s"
+
+#: ../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?"
@@ -662,25 +1453,18 @@ msgstr[0] "Это действие удалит метку «%s» с %d фото
 msgstr[1] "Это действие удалит метку «%s» с %d фотографий. Продолжить?"
 msgstr[2] "Это действие удалит метку «%s» с %d фотографий. Продолжить?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1361
-#: src/Dialogs.vala:1384 src/data_imports/DataImportsUI.vala:399
-#: src/AppWindow.vala:615 src/AppWindow.vala:636 src/AppWindow.vala:653
-#: src/publishing/PublishingUI.vala:498
-msgid "_Cancel"
-msgstr "От_менить"
-
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1329
-#: src/Resources.vala:330 src/Resources.vala:378 src/Resources.vala:643
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
+#: ../src/Resources.vala:163 ../src/Resources.vala:369
+#: ../src/Resources.vala:417 ../src/Resources.vala:682
 msgid "_Delete"
 msgstr "_Удалить"
 
-#: src/Dialogs.vala:25
+#: ../src/Dialogs.vala:25
 #, c-format
 msgid "This will remove the saved search \"%s\".  Continue?"
-msgstr "Это удалит сохранённый поиск «%s».  Продолжить?"
+msgstr "Это действие удалит сохранённый поисковый запрос «%s». Продолжить?"
 
-#: src/Dialogs.vala:35
-#, c-format
+#: ../src/Dialogs.vala:35
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
 "Shotwell"
@@ -697,15 +1481,20 @@ msgstr[2] ""
 "Переключение между обработчиками отменит все изменения, внесенные в эту "
 "фотографию с помощью Shotwell"
 
-#: src/Dialogs.vala:39
+#: ../src/Dialogs.vala:39
 msgid "_Switch Developer"
 msgstr "_Переключить обработчик"
 
-#: src/Dialogs.vala:58
+#: ../src/Dialogs.vala:58
 msgid "Export Video"
 msgstr "Экспортировать видео"
 
-#: src/Dialogs.vala:115
+#. Ticket #3023
+#. Attempt to replace the system error with something friendlier
+#. if we can't copy an image over for editing in an external tool.
+#. Did we fail because we can't write to this directory?
+#. Yes - display an alternate error message here.
+#: ../src/Dialogs.vala:115
 #, c-format
 msgid ""
 "Shotwell couldn't create a file for editing this photo because you do not "
@@ -714,15 +1503,15 @@ msgstr ""
 "Shotwell не удалось создать файл для редактирования фотографии, потому что у "
 "вас нет разрешения на запись в %s."
 
-#: src/Dialogs.vala:124
+#: ../src/Dialogs.vala:124
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
 msgstr ""
-"Невозможно экспортировать следующее фото из-за ошибки файла.\n"
+"Невозможно экспортировать следующее изображение из-за ошибки файла.\n"
 "\n"
 
-#: src/Dialogs.vala:130
+#: ../src/Dialogs.vala:130
 msgid ""
 "\n"
 "\n"
@@ -732,56 +1521,56 @@ msgstr ""
 "\n"
 "Хотите продолжить экспортирование?"
 
-#: src/Dialogs.vala:131
-msgid "Con_tinue"
-msgstr "_Продолжить"
-
-#: src/Dialogs.vala:147
+#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
+#. aren't formats so much as they are operating modes that determine specific formats.
+#. Hereafter we'll refer to these as "special formats."
+#: ../src/Dialogs.vala:147
 msgid "Unmodified"
 msgstr "Неизменённый"
 
-#: src/Dialogs.vala:148
+#: ../src/Dialogs.vala:148
 msgid "Current"
 msgstr "Текущий"
 
-#: src/Dialogs.vala:212
+#. layout controls
+#: ../src/Dialogs.vala:213
 msgid "_Format:"
 msgstr "_Формат:"
 
-#: src/Dialogs.vala:215
+#: ../src/Dialogs.vala:216
 msgid "_Quality:"
 msgstr "_Качество:"
 
-#: src/Dialogs.vala:218
+#: ../src/Dialogs.vala:219
 msgid "_Scaling constraint:"
 msgstr "_Ограничение масштабирования:"
 
-#: src/Dialogs.vala:221
-msgid " _pixels"
-msgstr " _пикселей"
+#: ../src/Dialogs.vala:222
+msgid "_Pixels:"
+msgstr "_Пикселей:"
 
-#: src/Dialogs.vala:229
+#: ../src/Dialogs.vala:225
 msgid "Export metadata"
 msgstr "Экспортировать метаданные"
 
-#: src/Dialogs.vala:465
+#: ../src/Dialogs.vala:459
 msgid "Save Details..."
-msgstr "Сохранить подробности..."
+msgstr "Сохранить подробности…"
 
-#: src/Dialogs.vala:466
+#: ../src/Dialogs.vala:460
 msgid "Save Details"
 msgstr "Сохранить подробности"
 
-#: src/Dialogs.vala:481
+#: ../src/Dialogs.vala:475
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(и ещё %d)\n"
 
-#: src/Dialogs.vala:534
+#: ../src/Dialogs.vala:528
 msgid "Import Results Report"
 msgstr "Импортировать отчёт о результатах"
 
-#: src/Dialogs.vala:538
+#: ../src/Dialogs.vala:532
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
@@ -789,7 +1578,7 @@ msgstr[0] "Попытка импорта %d файла."
 msgstr[1] "Попытка импорта %d файлов."
 msgstr[2] "Попытка импорта %d файлов."
 
-#: src/Dialogs.vala:541
+#: ../src/Dialogs.vala:535
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -797,46 +1586,61 @@ msgstr[0] "Из них, был успешно импортирован %d фай
 msgstr[1] "Из них, было успешно импортировано %d файла."
 msgstr[2] "Из них, было успешно импортировано %d файлов."
 
-#: src/Dialogs.vala:553
+#.
+#. Duplicates
+#.
+#: ../src/Dialogs.vala:547
 msgid "Duplicate Photos/Videos Not Imported:"
-msgstr "Дублировать не импортированные фото/видео:"
+msgstr "Дублирующиеся фотографии/видео не импортированы:"
 
-#: src/Dialogs.vala:557
+#: ../src/Dialogs.vala:551
 msgid "duplicates existing media item"
 msgstr "делает копию существующего экземпляра медиа"
 
-#: src/Dialogs.vala:568
+#.
+#. Files Not Imported Due to Camera Errors
+#.
+#: ../src/Dialogs.vala:562
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
-msgstr "В результате ошибок камеры не были импортированы следующие фото/видео:"
+msgstr "Фотографии/видео не импортированы из-за ошибок камеры:"
 
-#: src/Dialogs.vala:571 src/Dialogs.vala:586 src/Dialogs.vala:601
-#: src/Dialogs.vala:617 src/Dialogs.vala:632 src/Dialogs.vala:646
+#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
+#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
 msgid "error message:"
 msgstr "сообщение об ошибке:"
 
-#: src/Dialogs.vala:582
+#.
+#. Files Not Imported Because They Weren't Recognized as Photos or Videos
+#.
+#: ../src/Dialogs.vala:576
 msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgstr ""
-"Не были импортированы следующие фото/видео, нераспознанные как фото или "
+"Файлы не импортированы, потому что они не распознаются как фотографии или "
 "видео:"
 
-#: src/Dialogs.vala:597
+#.
+#. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
+#.
+#: ../src/Dialogs.vala:591
 msgid ""
 "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
 "Understands:"
 msgstr ""
-"Не были импортированы следующие фото/видео, поскольку их формат не был "
-"распознан программой Shotwell:"
+"Фотографии/видео не импортированы, потому что их формат не поддерживается "
+"Shotwell:"
 
-#: src/Dialogs.vala:612
+#.
+#. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
+#.
+#: ../src/Dialogs.vala:606
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
 "Library:"
 msgstr ""
-"В результате сбоя копирования в библиотеку Shotwell не были импортированы "
-"следующие фото/видео:"
+"Фотографии/видео не импортированы, потому что произошёл сбой копирования в "
+"библиотеку Shotwell:"
 
-#: src/Dialogs.vala:616
+#: ../src/Dialogs.vala:610
 #, c-format
 msgid ""
 "couldn't copy %s\n"
@@ -845,39 +1649,45 @@ msgstr ""
 "не удалось скопировать %s\n"
 "\tв %s"
 
-#: src/Dialogs.vala:628
+#.
+#. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
+#.
+#: ../src/Dialogs.vala:622
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
-msgstr "Не импортированные фото/видео в результате испорченных файлов:"
+msgstr "Фотографии/видео не импортированы, поскольку файлы повреждены:"
 
-#: src/Dialogs.vala:643
+#.
+#. Photos/Videos Not Imported for Other Reasons
+#.
+#: ../src/Dialogs.vala:637
 msgid "Photos/Videos Not Imported for Other Reasons:"
-msgstr "Фото/видео, которые не были импортированы по другим причинам:"
+msgstr "Фотографии/видео не импортированы по иным причинам:"
 
-#: src/Dialogs.vala:663
+#: ../src/Dialogs.vala:657
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
-msgstr[0] "%d дубликат фото не был импортирован.\n"
-msgstr[1] "%d дубликата фото не были импортированы.\n"
-msgstr[2] "%d дубликатов фото не были импортированы.\n"
+msgstr[0] "%d дубликат фотографии не был импортирован:\n"
+msgstr[1] "%d дубликата фотографий не были импортированы:\n"
+msgstr[2] "%d дубликатов фотографий не были импортированы:\n"
 
-#: src/Dialogs.vala:666
+#: ../src/Dialogs.vala:660
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
-msgstr[0] "%d дубликат видео не был импортирован.\n"
-msgstr[1] "%d дубликата видео не были импортированы.\n"
-msgstr[2] "%d дубликатов видео не были импортированы.\n"
+msgstr[0] "%d дубликат видео не был импортирован:\n"
+msgstr[1] "%d дубликата видео не были импортированы:\n"
+msgstr[2] "%d дубликатов видео не были импортированы:\n"
 
-#: src/Dialogs.vala:669
+#: ../src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
-msgstr[0] "%d дубликат фото/видео не был импортировано:\n"
-msgstr[1] "%d дубликата фото/видео не было импортировано:\n"
-msgstr[2] "%d дубликатов фото/видео не было импортировано:\n"
+msgstr[0] "%d дубликат фотографии/видео не был импортировано:\n"
+msgstr[1] "%d дубликата фотографий/видео не были импортировано:\n"
+msgstr[2] "%d дубликатов фотографий/видео не были импортировано:\n"
 
-#: src/Dialogs.vala:683
+#: ../src/Dialogs.vala:677
 #, 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"
@@ -891,7 +1701,7 @@ msgstr[2] ""
 "%d фотографий не удалось импортировать из-за ошибки файла или аппаратной "
 "ошибки:\n"
 
-#: src/Dialogs.vala:686
+#: ../src/Dialogs.vala:680
 #, 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"
@@ -902,7 +1712,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%d видео не удалось импортировать из-за ошибки файла или аппаратной ошибки:\n"
 
-#: src/Dialogs.vala:689
+#: ../src/Dialogs.vala:683
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -917,7 +1727,7 @@ msgstr[2] ""
 "Ошибка импорта %d фотографий/видео из-за файловой ошибки или аппаратной "
 "проблемы:\n"
 
-#: src/Dialogs.vala:692
+#: ../src/Dialogs.vala:686
 #, 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"
@@ -929,7 +1739,7 @@ msgstr[2] ""
 "%d файлов не удалось импортировать из-за ошибки файла или аппаратной "
 "ошибки:\n"
 
-#: src/Dialogs.vala:706
+#: ../src/Dialogs.vala:700
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -946,7 +1756,7 @@ msgstr[2] ""
 "Не удалось импортировать %d фотографий, поскольку каталог библиотеки был "
 "недоступен для записи:\n"
 
-#: src/Dialogs.vala:709
+#: ../src/Dialogs.vala:703
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -963,7 +1773,7 @@ msgstr[2] ""
 "Не удалось импортировать %d видео, поскольку каталог библиотеки был не "
 "доступен для записи:\n"
 
-#: src/Dialogs.vala:712
+#: ../src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -981,7 +1791,7 @@ msgstr[2] ""
 "Не удалось импортировать %d фото/видео, поскольку каталог библиотеки был не "
 "доступен для записи:\n"
 
-#: src/Dialogs.vala:715
+#: ../src/Dialogs.vala:709
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -998,7 +1808,7 @@ msgstr[2] ""
 "Не удалось импортировать %d видео, поскольку каталог библиотеки был не "
 "доступен для записи:\n"
 
-#: src/Dialogs.vala:729
+#: ../src/Dialogs.vala:723
 #, 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"
@@ -1006,7 +1816,7 @@ msgstr[0] "Не удалось импортировать %d фотографи�
 msgstr[1] "Не удалось импортировать %d фотографии из-за ошибки камеры:\n"
 msgstr[2] "Не удалось импортировать %d фотографий из-за ошибки камеры:\n"
 
-#: src/Dialogs.vala:732
+#: ../src/Dialogs.vala:726
 #, 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"
@@ -1014,7 +1824,7 @@ msgstr[0] "Не удалось импортировать %d видео из-з�
 msgstr[1] "Не удалось импортировать %d видео из-за ошибки камеры:\n"
 msgstr[2] "Не удалось импортировать %d видео из-за ошибки камеры:\n"
 
-#: src/Dialogs.vala:735
+#: ../src/Dialogs.vala:729
 #, 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"
@@ -1022,7 +1832,7 @@ msgstr[0] "Не удалось импортировать %d фото/видео
 msgstr[1] "Не удалось импортировать %d фото/видео из-за ошибки камеры:\n"
 msgstr[2] "Не удалось импортировать %d фото/видео из-за ошибки камеры:\n"
 
-#: src/Dialogs.vala:738
+#: ../src/Dialogs.vala:732
 #, 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"
@@ -1030,7 +1840,7 @@ msgstr[0] "Не удалось импортировать %d файл из-за
 msgstr[1] "Не удалось импортировать %d файла из-за ошибки камеры:\n"
 msgstr[2] "Не удалось импортировать %d файлов из-за ошибки камеры:\n"
 
-#: src/Dialogs.vala:752
+#: ../src/Dialogs.vala:746
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
@@ -1038,7 +1848,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/Dialogs.vala:755
+#: ../src/Dialogs.vala:749
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
@@ -1046,7 +1856,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/Dialogs.vala:758
+#: ../src/Dialogs.vala:752
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
@@ -1054,7 +1864,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/Dialogs.vala:761
+#: ../src/Dialogs.vala:755
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
@@ -1062,7 +1872,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/Dialogs.vala:778
+#. we have no notion of "unsupported" video files right now in Shotwell (all
+#. standard container formats are supported, it's just that the streams in them
+#. might or might not be interpretable), so this message does not need to be
+#. media specific
+#: ../src/Dialogs.vala:772
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1070,7 +1884,9 @@ msgstr[0] "Пропущена %d неподдерживаемая фотогра
 msgstr[1] "Пропущено %d неподдерживаемые фотографии:\n"
 msgstr[2] "Пропущено %d неподдерживаемых фотографий:\n"
 
-#: src/Dialogs.vala:793
+#. we have no notion of "non-video" video files right now in Shotwell, so this
+#. message doesn't need to be media specific
+#: ../src/Dialogs.vala:787
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
@@ -1078,7 +1894,7 @@ msgstr[0] "Пропущен %d файл, не являющийся изобра�
 msgstr[1] "Пропущено %d файла, не являющихся изображениями.\n"
 msgstr[2] "Пропущено %d файлов, не являющихся изображениями.\n"
 
-#: src/Dialogs.vala:804
+#: ../src/Dialogs.vala:798
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
@@ -1086,7 +1902,7 @@ msgstr[0] "%d фотография пропущена пользователем
 msgstr[1] "%d фотографии пропущены пользователем:\n"
 msgstr[2] "%d фотографий пропущены пользователем:\n"
 
-#: src/Dialogs.vala:807
+#: ../src/Dialogs.vala:801
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
@@ -1094,7 +1910,7 @@ msgstr[0] "%d видео пропущено пользователем:\n"
 msgstr[1] "%d видео пропущено пользователем:\n"
 msgstr[2] "%d видео пропущено пользователем:\n"
 
-#: src/Dialogs.vala:810
+#: ../src/Dialogs.vala:804
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
@@ -1102,7 +1918,7 @@ msgstr[0] "%d фото/видео пропущены пользователем:
 msgstr[1] "%d фото/видео пропущены пользователем:\n"
 msgstr[2] "%d фото/видео пропущены пользователем:\n"
 
-#: src/Dialogs.vala:813
+#: ../src/Dialogs.vala:807
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
@@ -1110,7 +1926,7 @@ msgstr[0] "%d файл пропущен пользователем:\n"
 msgstr[1] "%d файла пропущено пользователем:\n"
 msgstr[2] "%d файлов пропущено пользователем:\n"
 
-#: src/Dialogs.vala:827
+#: ../src/Dialogs.vala:821
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
@@ -1118,7 +1934,7 @@ msgstr[0] "Успешно импортировано %d фото.\n"
 msgstr[1] "Успешно импортировано %d фото.\n"
 msgstr[2] "Успешно импортировано %d фото.\n"
 
-#: src/Dialogs.vala:830
+#: ../src/Dialogs.vala:824
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
@@ -1126,7 +1942,7 @@ msgstr[0] "Успешно импортировано %d видео.\n"
 msgstr[1] "Успешно импортировано %d видео.\n"
 msgstr[2] "Успешно импортировано %d видео.\n"
 
-#: src/Dialogs.vala:833
+#: ../src/Dialogs.vala:827
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -1134,31 +1950,33 @@ msgstr[0] "%d фото/видео успешно импортировано.\n"
 msgstr[1] "%d фото/видео успешно импортировано.\n"
 msgstr[2] "%d фото/видео успешно импортировано.\n"
 
-#: src/Dialogs.vala:849
+#. if no media items were imported at all (i.e. an empty directory attempted), need to at least
+#. report that nothing was imported
+#: ../src/Dialogs.vala:843
 msgid "No photos or videos imported.\n"
-msgstr "Не был импортирован ни один фото/видеофайл.\n"
+msgstr "Нет импортированых фотографий или видео.\n"
 
-#: src/Dialogs.vala:856 src/Dialogs.vala:875
+#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
 msgid "Import Complete"
 msgstr "Импортирование завершено"
 
-#: src/Dialogs.vala:1103
+#: ../src/Dialogs.vala:1155
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d секунда"
 msgstr[1] "%d секунды"
-msgstr[2] "%d секунды"
+msgstr[2] "%d секунд"
 
-#: src/Dialogs.vala:1106
+#: ../src/Dialogs.vala:1158
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d минута"
 msgstr[1] "%d минуты"
-msgstr[2] "%d минуты"
+msgstr[2] "%d минут"
 
-#: src/Dialogs.vala:1110
+#: ../src/Dialogs.vala:1162
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1166,73 +1984,87 @@ msgstr[0] "%d час"
 msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 
-#: src/Dialogs.vala:1113
+#: ../src/Dialogs.vala:1165
 msgid "1 day"
 msgstr "1 день"
 
-#: src/Dialogs.vala:1263 src/Resources.vala:205
+#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
 msgid "Rename Event"
 msgstr "Переименовать событие"
 
-#: src/Dialogs.vala:1263
+#: ../src/Dialogs.vala:1315
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/Dialogs.vala:1273 src/Resources.vala:274
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
 msgid "Edit Title"
 msgstr "Редактировать название"
 
-#: src/Dialogs.vala:1287 src/Resources.vala:280
+#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
+msgid "Title:"
+msgstr "Название:"
+
+#. Dialog title
+#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
 msgid "Edit Event Comment"
 msgstr "Изменить комментарий к событию"
 
-#: src/Dialogs.vala:1287
+#: ../src/Dialogs.vala:1344
 msgid "Edit Photo/Video Comment"
 msgstr "Изменить комментарий к фото/видео"
 
-#: src/Dialogs.vala:1304
-msgid "_Trash File"
-msgid_plural "_Trash Files"
-msgstr[0] "_Удалить файлы в корзину"
+#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
+msgid "Comment:"
+msgstr "Комментарий:"
+
+#: ../src/Dialogs.vala:1361
+msgid "Remove and _Trash File"
+msgid_plural "Remove and _Trash Files"
+msgstr[0] "_Удалить файл в корзину"
 msgstr[1] "_Удалить файлы в корзину"
 msgstr[2] "_Удалить файлы в корзину"
 
-#: src/Dialogs.vala:1308
-msgid "Only _Remove"
-msgstr "Только _удалить"
+#: ../src/Dialogs.vala:1365
+msgid "_Remove From Library"
+msgstr "_Удалить из библиотеки"
+
+#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
+msgid "_Keep"
+msgstr "_Оставить"
 
-#: src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edit?"
-msgstr "Вернуть внешнее изменение?"
+msgstr "Отменить внешнее изменение?"
 
-#: src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edits?"
-msgstr "Вернуть внешние изменения?"
+msgstr "Отменить внешние изменения?"
 
-#: src/Dialogs.vala:1353
+#: ../src/Dialogs.vala:1410
 #, 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] ""
-"Это действие уничтожит все изменения, сделанные в %d внешнем файле.  "
-"Продолжить?"
+"Это действие отменит все изменения, сделанные в %d внешнем файле. Продолжить?"
 msgstr[1] ""
-"Это действие уничтожит все изменения, сделанные в %d внешних файлах. "
+"Это действие отменит все изменения, сделанные в %d внешних файлах. "
 "Продолжить?"
 msgstr[2] ""
-"Это действие уничтожит все изменения, сделанные в %d внешних файлах. "
+"Это действие отменит все изменения, сделанные в %d внешних файлах. "
 "Продолжить?"
 
-#: src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edit"
-msgstr "От_менить внешние изменения"
+msgstr "_Отменить внешнее изменение"
 
-#: src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edits"
-msgstr "Вернуть _внешние изменения?"
+msgstr "_Отменить внешние изменения"
 
-#: src/Dialogs.vala:1378
+#: ../src/Dialogs.vala:1435
 #, c-format
 msgid "This will remove the photo from the library.  Continue?"
 msgid_plural "This will remove %d photos from the library.  Continue?"
@@ -1240,72 +2072,74 @@ msgstr[0] "Это действие удалит %d фотографию из б�
 msgstr[1] "Это действие удалит %d фотографии из библиотеки. Продолжить?"
 msgstr[2] "Это действие удалит %d фотографий из библиотеки. Продолжить?"
 
-#: src/Dialogs.vala:1385
+#: ../src/Dialogs.vala:1442 ../src/Resources.vala:178
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photo From Library"
-msgstr "Удалить фотографии из библиотеки"
+msgstr "Удалить фотографию из библиотеки"
 
-#: src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photos From Library"
 msgstr "Удалить фотографии из библиотеки"
 
-#: src/Dialogs.vala:1479
+#: ../src/Dialogs.vala:1536
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1626
+#: ../src/Dialogs.vala:1688
 msgid "AM"
 msgstr "AM"
 
-#: src/Dialogs.vala:1627
+#: ../src/Dialogs.vala:1689
 msgid "PM"
 msgstr "PM"
 
-#: src/Dialogs.vala:1628
+#: ../src/Dialogs.vala:1690
 msgid "24 Hr"
 msgstr "24 часа"
 
-#: src/Dialogs.vala:1643
+#: ../src/Dialogs.vala:1705
 msgid "_Shift photos/videos by the same amount"
 msgstr "С_двинуть фотографии или видео на одинаковый промежуток времени"
 
-#: src/Dialogs.vala:1648
+#: ../src/Dialogs.vala:1710
 msgid "Set _all photos/videos to this time"
 msgstr "Установить _текущее время для всех фото/видео"
 
-#: src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo file"
 msgstr "_Изменить оригинал фото"
 
-#: src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo files"
 msgstr "_Изменить оригиналы фото"
 
-#: src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original file"
 msgstr "_Изменить оригиналы"
 
-#: src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original files"
 msgstr "_Изменить оригиналы"
 
-#: src/Dialogs.vala:1744
+#: ../src/Dialogs.vala:1806
 msgid "Original: "
 msgstr "Оригинал: "
 
-#: src/Dialogs.vala:1745
+# исправление даты
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%d %m %Y, %H:%M:%S"
+msgstr "%e %b. %Y, %H:%M:%S"
 
-#: src/Dialogs.vala:1746
+# исправление даты
+#: ../src/Dialogs.vala:1808
 msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%d/%m/%Y, %H:%M:%S"
+msgstr "%e %b. %Y, %I:%M:%S %p"
 
-#: src/Dialogs.vala:1835
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -1314,7 +2148,7 @@ msgstr ""
 "Выдержка будет смещаться вперёд на\n"
 "%d %s, %d %s, %d %s, и %d %s."
 
-#: src/Dialogs.vala:1836
+#: ../src/Dialogs.vala:1898
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -1323,35 +2157,35 @@ msgstr ""
 "Выдержка будет смещаться назад на\n"
 "%d %s, %d %s, %d %s, и %d %s."
 
-#: src/Dialogs.vala:1838
+#: ../src/Dialogs.vala:1900
 msgid "day"
 msgid_plural "days"
 msgstr[0] "день"
 msgstr[1] "дня"
 msgstr[2] "дней"
 
-#: src/Dialogs.vala:1839
+#: ../src/Dialogs.vala:1901
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "час"
 msgstr[1] "часа"
 msgstr[2] "часов"
 
-#: src/Dialogs.vala:1840
+#: ../src/Dialogs.vala:1902
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
 msgstr[1] "минуты"
 msgstr[2] "минут"
 
-#: src/Dialogs.vala:1841
+#: ../src/Dialogs.vala:1903
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "секунда"
 msgstr[1] "секунды"
 msgstr[2] "секунд"
 
-#: src/Dialogs.vala:1885
+#: ../src/Dialogs.vala:1947
 #, c-format
 msgid ""
 "\n"
@@ -1374,119 +2208,123 @@ msgstr[2] ""
 "\n"
 "И %d других."
 
-#: src/Dialogs.vala:1907 src/Dialogs.vala:1934
+#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
 msgid "Tags (separated by commas):"
-msgstr "Метки (разделитель запятая):"
+msgstr "Метки (резделяются запятыми):"
 
-#: src/Dialogs.vala:2014
+#: ../src/Dialogs.vala:2076
 msgid "Welcome!"
 msgstr "Добро пожаловать!"
 
-#: src/Dialogs.vala:2021
-#, c-format
+#: ../src/Dialogs.vala:2083
 msgid "Welcome to Shotwell!"
 msgstr "Добро пожаловать в Shotwell!"
 
-#: src/Dialogs.vala:2025
-#, c-format
+#: ../src/Dialogs.vala:2087
 msgid "To get started, import photos in any of these ways:"
-msgstr "Для начала работы, импортируйте фото одним из следующих способов:"
+msgstr "Начните работу импортировав фотографии любым из следующих способов:"
 
-#: src/Dialogs.vala:2044
+#: ../src/Dialogs.vala:2106
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Выберите <span weight=\"bold\">Файл %s Импортировать из папки</span>"
 
-#: src/Dialogs.vala:2045
+#: ../src/Dialogs.vala:2107
 msgid "Drag and drop photos onto the Shotwell window"
-msgstr "Перетащите фото в окно Shotwell"
+msgstr "Перетащите фотографии в окно Shotwell"
 
-#: src/Dialogs.vala:2046
+#: ../src/Dialogs.vala:2108
 msgid "Connect a camera to your computer and import"
-msgstr "Присоедините камеру к компьютеру и импортируйте фотографии"
+msgstr "Подключите камеру к компьютеру и импортируйте фотографии"
 
-#: src/Dialogs.vala:2056
+#: ../src/Dialogs.vala:2118
 #, c-format
 msgid "_Import photos from your %s folder"
-msgstr "_Импортирование фотографий из папки %s "
+msgstr "_Импортировать фотографии из папки %s"
 
-#: src/Dialogs.vala:2063
+#: ../src/Dialogs.vala:2125
 msgid "You can also import photos in any of these ways:"
-msgstr "Кроме того, вы можете импортировать фото одним из cледующих способов:"
+msgstr "Также можно импортировать фотографии любым из следующих способов:"
 
-#: src/Dialogs.vala:2073
+#: ../src/Dialogs.vala:2135
 msgid "_Don't show this message again"
 msgstr "_Больше не показывать это сообщение"
 
-#: src/Dialogs.vala:2108
+#: ../src/Dialogs.vala:2170
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Импортировать фотографии из библиотеки %s"
 
-#: src/Dialogs.vala:2252 src/Dialogs.vala:2256
+#. We're installed system-wide, so use the system help.
+#. We're being run from the build directory; we'll have to handle clicks to this
+#. link manually ourselves, due to a limitation ghelp: URIs.
+#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
 msgid "(Help)"
-msgstr "(Помощь)"
+msgstr "(Справка)"
 
-#: src/Dialogs.vala:2265
+#: ../src/Dialogs.vala:2324
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Год%sМесяц%sДень"
 
-#: src/Dialogs.vala:2267
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth"
 msgstr "Год%sМесяц"
 
-#: src/Dialogs.vala:2269
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Год%sМесяц-День"
 
-#: src/Dialogs.vala:2271
+#: ../src/Dialogs.vala:2330
 msgid "Year-Month-Day"
 msgstr "Год-Месяц-День"
 
-#: src/Dialogs.vala:2272 src/editing_tools/EditingTools.vala:777
+#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Пользовательский"
 
-#: src/Dialogs.vala:2509
+#. Invalid pattern.
+#: ../src/Dialogs.vala:2568
 msgid "Invalid pattern"
-msgstr "Неправильный шаблон"
+msgstr "Неверный шаблон"
 
-#: src/Dialogs.vala:2612
+#. This function is used to determine whether or not files should be copied or linked when imported.
+#. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
+#: ../src/Dialogs.vala:2670
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
 msgstr ""
-"Shotwell может скопировать фотографии в папку библиотеки, либо импортировать "
+"Shotwell может копировать фотографии в папку библиотеки, либо импортировать "
 "их без копирования."
 
-#: src/Dialogs.vala:2617
+#: ../src/Dialogs.vala:2675
 msgid "Co_py Photos"
 msgstr "Ко_пировать фотографии"
 
-#: src/Dialogs.vala:2618
+#: ../src/Dialogs.vala:2676
 msgid "_Import in Place"
 msgstr "_Импорт в"
 
-#: src/Dialogs.vala:2619
+#: ../src/Dialogs.vala:2677
 msgid "Import to Library"
 msgstr "Импортировать в библиотеку"
 
-#: src/Dialogs.vala:2629 src/PhotoPage.vala:3075
+#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
 msgid "Remove From Library"
 msgstr "Удалить из библиотеки"
 
-#: src/Dialogs.vala:2630 src/PhotoPage.vala:3075
+#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
 msgid "Removing Photo From Library"
 msgstr "Удалить фотографии из библиотеки"
 
-#: src/Dialogs.vala:2630
+#: ../src/Dialogs.vala:2688
 msgid "Removing Photos From Library"
 msgstr "Удаление фотографий из библиотеки"
 
-#: src/Dialogs.vala:2644
+#: ../src/Dialogs.vala:2702
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -1514,7 +2352,7 @@ msgstr[2] ""
 "\n"
 "Это действие не может быть отменено."
 
-#: src/Dialogs.vala:2648
+#: ../src/Dialogs.vala:2706
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -1542,7 +2380,7 @@ msgstr[2] ""
 "\n"
 "Это действие не может быть отменено."
 
-#: src/Dialogs.vala:2652
+#: ../src/Dialogs.vala:2710
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -1570,23 +2408,24 @@ msgstr[2] ""
 "\n"
 "Это действие не может быть отменено."
 
-#: src/Dialogs.vala:2684
+#: ../src/Dialogs.vala:2742
 #, 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] ""
-"%d фотография/видеозапись не могут быть помещены в корзину.  Удалить эти "
+"%d фотография/видеозапись не могут быть помещены в корзину. Удалить эти "
 "файлы?"
 msgstr[1] ""
-"%d фотографии/видеозаписи не могут быть помещены в корзину.  Удалить эти "
+"%d фотографии/видеозаписи не могут быть помещены в корзину. Удалить эти "
 "файлы?"
 msgstr[2] ""
-"%d фотографий/видеозаписей не могут быть помещены в корзину.  Удалить эти "
+"%d фотографий/видеозаписей не могут быть помещены в корзину. Удалить эти "
 "файлы?"
 
-#: src/Dialogs.vala:2701
+#. Alert the user that the files were not removed.
+#: ../src/Dialogs.vala:2759
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -1594,614 +2433,376 @@ msgstr[0] "%d фотография/видео не могут быть удал�
 msgstr[1] "%d фотографии/видео не могут быть удалены."
 msgstr[2] "%d фотографий/видео не могут быть удалены."
 
-#: src/folders/Branch.vala:141
-msgid "Folders"
-msgstr "Папки"
+#: ../src/Dimensions.vala:23
+msgid "Width"
+msgstr "Ширина"
 
-#: src/tags/Branch.vala:127
-msgid "Tags"
-msgstr "Метки"
+#: ../src/Dimensions.vala:26
+msgid "Height"
+msgstr "Высота"
 
-#: src/BatchImport.vala:26
-msgid "Success"
-msgstr "Успешно"
+#. verify this is a directory
+#: ../src/DirectoryMonitor.vala:889
+#, c-format
+msgid "Unable to monitor %s: Not a directory (%s)"
+msgstr "Невозможно следить за %s: не является каталогом (%s)"
 
-#: src/BatchImport.vala:29
-msgid "File error"
-msgstr "Ошибка файла"
+#. if no name, pretty up the start time
+#: ../src/Event.vala:751
+#, c-format
+msgid "Event %s"
+msgstr "Событие %s"
 
-#: src/BatchImport.vala:32
-msgid "Unable to decode file"
-msgstr "Не могу декодировать файл"
+#: ../src/Exporter.vala:232
+#, c-format
+msgid "Unable to generate a temporary file for %s: %s"
+msgstr "Невозможно создать временный файл для %s: %s"
 
-#: src/BatchImport.vala:35
-msgid "Database error"
-msgstr "Ошибка базы данных"
+#: ../src/Exporter.vala:299
+msgid "Exporting"
+msgstr "Экспортирование"
 
-#: src/BatchImport.vala:38
-msgid "User aborted import"
-msgstr "Импортирование прервано пользователем"
+#: ../src/Exporter.vala:317
+#, c-format
+msgid "File %s already exists.  Replace?"
+msgstr "Файл %s уже существует. Заменить?"
 
-#: src/BatchImport.vala:41
-msgid "Not a file"
-msgstr "Не является файлом"
+#: ../src/Exporter.vala:319
+msgid "_Skip"
+msgstr "_Пропустить"
 
-#: src/BatchImport.vala:44
-msgid "File already exists in database"
-msgstr "Файл уже существует в базе данных"
+#: ../src/Exporter.vala:319
+msgid "_Replace"
+msgstr "_Заменить"
 
-#: src/BatchImport.vala:47
-msgid "Unsupported file format"
-msgstr "Неподдерживаемый формат"
+#: ../src/Exporter.vala:319
+msgid "Replace _All"
+msgstr "Заменить вс_ё"
 
-#: src/BatchImport.vala:50
-msgid "Not an image file"
-msgstr "Не является изображением"
+#: ../src/Exporter.vala:319
+msgid "Export"
+msgstr "Экспортировать"
 
-#: src/BatchImport.vala:53
-msgid "Disk failure"
-msgstr "Ошибка диска"
+#: ../src/MediaMonitor.vala:400
+#, c-format
+msgid "Unable to process monitoring updates: %s"
+msgstr "Невозможно обработать результаты наблюдения: %s"
 
-#: src/BatchImport.vala:56
-msgid "Disk full"
-msgstr "Диск переполнен"
+#: ../src/MediaPage.vala:157
+msgid "Adjust the size of the thumbnails"
+msgstr "Задать размер миниатюр"
 
-#: src/BatchImport.vala:59
-msgid "Camera error"
-msgstr "Ошибка камеры"
+#: ../src/MediaPage.vala:339 ../src/PhotoPage.vala:2593
+#: ../src/Resources.vala:188 ../src/direct/DirectPhotoPage.vala:174
+msgid "Zoom _In"
+msgstr "_Увеличить"
 
-#: src/BatchImport.vala:62
-msgid "File write error"
-msgstr "Ошибка записи файла"
+#: ../src/MediaPage.vala:340
+msgid "Increase the magnification of the thumbnails"
+msgstr "Увеличить размер миниатюр"
 
-#: src/BatchImport.vala:65
-msgid "Corrupt image file"
-msgstr "Повреждённый файл снимка"
+#: ../src/MediaPage.vala:345 ../src/PhotoPage.vala:2599
+#: ../src/Resources.vala:189 ../src/direct/DirectPhotoPage.vala:180
+msgid "Zoom _Out"
+msgstr "У_меньшить"
+
+#: ../src/MediaPage.vala:346
+msgid "Decrease the magnification of the thumbnails"
+msgstr "Уменьшить размер миниатюр"
+
+#: ../src/MediaPage.vala:413
+msgid "Sort _Photos"
+msgstr "_Сортировать фотографии"
+
+#: ../src/MediaPage.vala:422
+msgid "_Play Video"
+msgstr "_Воспроизвести видео"
+
+#: ../src/MediaPage.vala:423
+msgid "Open the selected videos in the system video player"
+msgstr "Открыть выбранное видео в системном видеопроигрывателе"
+
+#: ../src/MediaPage.vala:427 ../src/PhotoPage.vala:2642
+msgid "_Developer"
+msgstr "_Обработчик"
+
+#: ../src/MediaPage.vala:439 ../src/camera/Branch.vala:99
+#: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
+#: ../src/photos/RawSupport.vala:303
+msgid "Camera"
+msgstr "Камера"
+
+#: ../src/MediaPage.vala:450 ../src/camera/ImportPage.vala:874
+msgid "_Titles"
+msgstr "_Названия"
+
+#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:875
+msgid "Display the title of each photo"
+msgstr "Показать название каждого фото"
+
+#: ../src/MediaPage.vala:456 ../src/events/EventsDirectoryPage.vala:130
+msgid "_Comments"
+msgstr "_Комментарии"
+
+#: ../src/MediaPage.vala:457
+msgid "Display the comment of each photo"
+msgstr "Показывать комментарий для каждого фото"
+
+#: ../src/MediaPage.vala:468 ../src/library/LibraryWindow.vala:375
+msgid "Ta_gs"
+msgstr "_Метки"
+
+#: ../src/MediaPage.vala:469
+msgid "Display each photo's tags"
+msgstr "Показывать все метки фотографии"
+
+#: ../src/MediaPage.vala:485
+msgid "By _Title"
+msgstr "По _названию"
+
+#: ../src/MediaPage.vala:486
+msgid "Sort photos by title"
+msgstr "Сортировать по названию"
 
-#: src/BatchImport.vala:68
+#: ../src/MediaPage.vala:491
+msgid "By Exposure _Date"
+msgstr "По дате _съёмки"
+
+#: ../src/MediaPage.vala:492
+msgid "Sort photos by exposure date"
+msgstr "Сортировать по дате съёмки"
+
+#: ../src/MediaPage.vala:497
+msgid "By _Rating"
+msgstr "По _рейтингу"
+
+#: ../src/MediaPage.vala:498
+msgid "Sort photos by rating"
+msgstr "Сортировать по рейтингу"
+
+#: ../src/MediaPage.vala:508 ../src/library/LibraryWindow.vala:421
+msgid "_Ascending"
+msgstr "По _возрастанию"
+
+#: ../src/MediaPage.vala:509 ../src/library/LibraryWindow.vala:422
+msgid "Sort photos in an ascending order"
+msgstr "Сортировать фото по возрастанию"
+
+#: ../src/MediaPage.vala:514 ../src/library/LibraryWindow.vala:428
+msgid "D_escending"
+msgstr "По _убыванию"
+
+#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:429
+msgid "Sort photos in a descending order"
+msgstr "Сортировать фото по убыванию"
+
+#: ../src/MediaPage.vala:716
 #, c-format
-msgid "Imported failed (%d)"
-msgstr "Ошибка импортирования (%d)"
+msgid ""
+"Shotwell was unable to play the selected video:\n"
+"%s"
+msgstr ""
+"Shotwell не может воспроизвести выбранное видео:\n"
+"%s"
+
+#: ../src/Page.vala:1263
+msgid "No photos/videos"
+msgstr "Нет фото/видео"
 
-#: src/Photo.vala:3656
+#: ../src/Page.vala:1267
+msgid "No photos/videos found"
+msgstr "Не найдены фото/видео"
+
+#: ../src/Page.vala:2565
+msgid "Photos cannot be exported to this directory."
+msgstr "Фотографии не могут быть экспортированы в этот каталог."
+
+#: ../src/Photo.vala:3753
 msgid "modified"
 msgstr "изменено"
 
-#: src/PhotoPage.vala:532
+#. previous button
+#: ../src/PhotoPage.vala:533
 msgid "Previous photo"
 msgstr "Предыдущее фото"
 
-#: src/PhotoPage.vala:537
+#. next button
+#: ../src/PhotoPage.vala:539
 msgid "Next photo"
 msgstr "Следующее фото"
 
-#: src/PhotoPage.vala:1844
+#: ../src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Исходный файл не найден: %s"
 
-#: src/PhotoPage.vala:2404 src/library/LibraryWindow.vala:360
-#: src/direct/DirectPhotoPage.vala:165
+#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
+#: ../src/library/LibraryWindow.vala:359
 msgid "_View"
 msgstr "_Вид"
 
-#: src/PhotoPage.vala:2408 src/direct/DirectPhotoPage.vala:81
+#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
 msgid "T_ools"
 msgstr "_Инструменты"
 
-#: src/PhotoPage.vala:2413 src/direct/DirectPhotoPage.vala:86
+#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
 msgid "_Previous Photo"
 msgstr "_Предыдущее фото"
 
-#: src/PhotoPage.vala:2414 src/direct/DirectPhotoPage.vala:87
+#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
 msgid "Previous Photo"
 msgstr "Предыдущее фото"
 
-#: src/PhotoPage.vala:2419 src/direct/DirectPhotoPage.vala:92
+#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
 msgid "_Next Photo"
 msgstr "_Следующее фото"
 
-#: src/PhotoPage.vala:2420 src/direct/DirectPhotoPage.vala:93
+#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
 msgid "Next Photo"
 msgstr "Следующее фото"
 
-#: src/PhotoPage.vala:2583 src/direct/DirectPhotoPage.vala:174
-#: src/MediaPage.vala:325
-msgid "Zoom _In"
-msgstr "_Увеличить"
-
-#: src/PhotoPage.vala:2584 src/direct/DirectPhotoPage.vala:175
+#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
 msgid "Increase the magnification of the photo"
 msgstr "Увеличить масштаб фотографии"
 
-#: src/PhotoPage.vala:2589 src/direct/DirectPhotoPage.vala:180
-#: src/MediaPage.vala:331
-msgid "Zoom _Out"
-msgstr "У_меньшить"
-
-#: src/PhotoPage.vala:2590 src/direct/DirectPhotoPage.vala:181
+#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
 msgid "Decrease the magnification of the photo"
 msgstr "Уменьшить масштаб фотографии"
 
-#: src/PhotoPage.vala:2595 src/direct/DirectPhotoPage.vala:186
+#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
 msgid "Fit to _Page"
 msgstr "На всю _страницу"
 
-#: src/PhotoPage.vala:2596 src/direct/DirectPhotoPage.vala:187
+#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
 msgid "Zoom the photo to fit on the screen"
 msgstr "Изменение размера фото по размеру экрана"
 
-#: src/PhotoPage.vala:2601 src/direct/DirectPhotoPage.vala:192
+#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
+#, no-c-format
 msgid "Zoom _100%"
 msgstr "_Реальный размер"
 
-#: src/PhotoPage.vala:2602 src/direct/DirectPhotoPage.vala:193
-#, c-format
+#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
+#, no-c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "Установить реальный размер фотоснимка"
 
-#: src/PhotoPage.vala:2607 src/direct/DirectPhotoPage.vala:198
+#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
+#, no-c-format
 msgid "Zoom _200%"
 msgstr "Увеличить на _200%"
 
-#: src/PhotoPage.vala:2608 src/direct/DirectPhotoPage.vala:199
-#, c-format
+#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
+#, no-c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "Увеличить фото в два раза"
 
-#: src/PhotoPage.vala:2628 src/MediaPage.vala:413
-msgid "_Developer"
-msgstr "_Обработчик"
-
-#: src/PhotoPage.vala:3216
+#: ../src/PhotoPage.vala:3231
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Невозможно экспортировать %s: %s"
 
-#: src/data_imports/DataImportsPluginHost.vala:65
-#: src/data_imports/DataImportsPluginHost.vala:78
-#, c-format
-msgid "%s Database"
-msgstr "База данных %s"
-
-#: 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 "Импортирование из %s не может быть продолжено из-за ошибки:"
-
-#: src/data_imports/DataImportsPluginHost.vala:151
-msgid "To try importing from another service, select one from the above menu."
-msgstr "Чтобы попробовать импорт из другой службы, выберите её из меню сверху."
-
-#: src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr "Импорт данных"
-
-#: 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 ""
-"Не активированы модули импорта.\n"
-"\n"
-"Для того, чтобы использовать функцию импортирования из приложения, требуется "
-"активировать по крайней мере один модуль импорта. Модули могут быть "
-"активированы в диалоговом окне «Настройки»."
-
-#: src/data_imports/DataImportsUI.vala:100
-msgid "Database file:"
-msgstr "Файл базы данных:"
-
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:899
-msgid "_Import"
-msgstr "_Импортирование"
-
-#: src/data_imports/DataImportsUI.vala:216
-msgid "Import From Application"
-msgstr "Импортировать из приложения"
-
-#: src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "Импортировать данные _из:"
-
-#: src/data_imports/DataImportsUI.vala:394
-#: src/publishing/PublishingUI.vala:493
-msgid "_Close"
-msgstr "_Закрыть"
-
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:182
-msgid "Settings"
-msgstr "Настройки"
-
-#: src/SlideshowPage.vala:141 src/Screensaver.vala:18
-msgid "Slideshow"
-msgstr "Слайдшоу"
-
-#: src/SlideshowPage.vala:161
-msgid "Back"
-msgstr "Назад"
-
-#: src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "Перейти к предыдущему фото"
-
-#: src/SlideshowPage.vala:168 src/SlideshowPage.vala:273
-msgid "Pause"
-msgstr "Пауза"
-
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:274
-msgid "Pause the slideshow"
-msgstr "Приостановить слайдшоу"
-
-#: src/SlideshowPage.vala:175
-msgid "Next"
-msgstr "Следующее"
-
-#: src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "Перейти к следующему фото"
-
-#: src/SlideshowPage.vala:183
-msgid "Change slideshow settings"
-msgstr "Изменить настройки слайдшоу"
-
-#: src/SlideshowPage.vala:237
-msgid "All photo source files are missing."
-msgstr "Не найдено ни одного исходного файла"
-
-#: src/SlideshowPage.vala:269
-msgid "Play"
-msgstr "Просмотр"
-
-#: src/SlideshowPage.vala:270
-msgid "Continue the slideshow"
-msgstr "Продолжить слайдшоу"
-
-#: src/Commands.vala:733
-msgid "Reverting"
-msgstr "Возврат"
-
-#: src/Commands.vala:733
-msgid "Undoing Revert"
-msgstr "Отменить возврат"
-
-#: src/Commands.vala:777
-msgid "Enhancing"
-msgstr "Улучшение"
-
-#: src/Commands.vala:777
-msgid "Undoing Enhance"
-msgstr "Отменить улучшение"
-
-#: src/Commands.vala:845
-msgid "Applying Color Transformations"
-msgstr "Применяются цветовые изменения"
-
-#: src/Commands.vala:845
-msgid "Undoing Color Transformations"
-msgstr "Отменяются цветовые изменения"
-
-#: src/Commands.vala:995
-msgid "Creating New Event"
-msgstr "Создать новое событие"
-
-#: src/Commands.vala:996
-msgid "Removing Event"
-msgstr "Отменить событие"
-
-#: src/Commands.vala:1005
-msgid "Moving Photos to New Event"
-msgstr "Переместить снимки в новое событие"
-
-#: src/Commands.vala:1006
-msgid "Setting Photos to Previous Event"
-msgstr "Назначить снимкам предыдущее событие"
-
-#: src/Commands.vala:1063
-msgid "Merging"
-msgstr "Объединение"
-
-#: src/Commands.vala:1064
-msgid "Unmerging"
-msgstr "Отменить объединение"
-
-#: src/Commands.vala:1073
-msgid "Duplicating photos"
-msgstr "Дублирование фотографий"
-
-#: src/Commands.vala:1073
-msgid "Removing duplicated photos"
-msgstr "Отменить дублирование фотографий"
-
-#: src/Commands.vala:1096
-#, 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] "Невозможно сделать копии %d фотографии из-за ошибки файла."
-msgstr[1] "Невозможно сделать копии %d фотографий из-за ошибки файла."
-msgstr[2] "Невозможно сделать копии %d фотографий из-за ошибки файла."
-
-#: src/Commands.vala:1183
-msgid "Restoring previous rating"
-msgstr "Восстановить предыдущую оценку"
-
-#: src/Commands.vala:1193 src/Commands.vala:1194
-msgid "Increasing ratings"
-msgstr "По возрастанию оценок"
-
-#: src/Commands.vala:1193 src/Commands.vala:1194
-msgid "Decreasing ratings"
-msgstr "По убыванию оценок"
-
-#: src/Commands.vala:1244
-msgid "Setting RAW developer"
-msgstr "Установка обработчика RAW"
-
-#: src/Commands.vala:1244
-msgid "Restoring previous RAW developer"
-msgstr "Восстановление предыдущего обработчика RAW"
-
-#: src/Commands.vala:1245
-msgid "Set Developer"
-msgstr "Задать обработчик"
-
-#: src/Commands.vala:1335
-msgid "Original photo could not be adjusted."
-msgstr "Оригинал не может быть изменён."
-
-#: src/Commands.vala:1356
-msgid "Adjusting Date and Time"
-msgstr "Изменить время и дату"
-
-#: src/Commands.vala:1356
-msgid "Undoing Date and Time Adjustment"
-msgstr "Отменить изменение даты и времени"
-
-#: src/Commands.vala:1387
-msgid "One original photo could not be adjusted."
-msgid_plural "The following original photos could not be adjusted."
-msgstr[0] "Следующие оригиналы фотографий не могут быть изменены."
-msgstr[1] "Следующие оригиналы фотографий не могут быть изменены."
-msgstr[2] "Следующие оригиналы фотографий не могут быть изменены."
-
-#: src/Commands.vala:1389 src/Commands.vala:1413
-msgid "Time Adjustment Error"
-msgstr "Ошибка изменения времени"
-
-#: src/Commands.vala:1411
-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] ""
-"Для этих фотографий операция изменения времени не может быть отменена."
-msgstr[2] ""
-"Для этих фотографий операция изменения времени не может быть отменена."
-
-#: src/Commands.vala:1625 src/Commands.vala:1648
-msgid "Create Tag"
-msgstr "Создать метку"
-
-#: src/Commands.vala:1683
-#, c-format
-msgid "Move Tag \"%s\""
-msgstr "Переместить метку «%s»"
-
-#: src/Commands.vala:2335
-msgid "Move Photos to Trash"
-msgstr "Переместить фотографии в корзину"
-
-#: src/Commands.vala:2335
-msgid "Restore Photos from Trash"
-msgstr "Восстановить фотографии из корзины"
-
-#: src/Commands.vala:2336
-msgid "Move the photos to the Shotwell trash"
-msgstr "Переместить фотографии в корзину Shotwell"
-
-#: src/Commands.vala:2336
-msgid "Restore the photos back to the Shotwell library"
-msgstr "Восстановить фотографии в библиотеку Shotwell"
-
-#: src/Commands.vala:2355
-msgid "Moving Photos to Trash"
-msgstr "Переместить фотографии в корзину"
-
-#: src/Commands.vala:2355
-msgid "Restoring Photos From Trash"
-msgstr "Восстановить фотографии из корзины"
-
-#: src/Commands.vala:2441
-msgid "Flag selected photos"
-msgstr "Отметить выбранные фотографии"
-
-#: src/Commands.vala:2442
-msgid "Unflag selected photos"
-msgstr "Снять отметку с выбранных фотографий"
-
-#: src/Commands.vala:2443
-msgid "Flagging selected photos"
-msgstr ""
-
-#: src/Commands.vala:2444
-msgid "Unflagging selected photos"
-msgstr ""
-
-#: src/Commands.vala:2451
-msgid "Flag"
-msgstr "Отметить"
-
-#: src/Commands.vala:2451
-msgid "Unflag"
-msgstr "Снять отметку"
-
-#: src/photos/RawSupport.vala:134
-msgid "RAW"
-msgstr "RAW"
-
-#: src/photos/RawSupport.vala:297 src/MediaPage.vala:420
-msgid "Shotwell"
-msgstr "Shotwell"
-
-#: src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr "BMP"
-
-#: src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
-
-#: src/photos/JfifSupport.vala:182
-#, c-format
-msgid "Low (%d%%)"
-msgstr "Низкое (%d%%)"
-
-#: src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "Среднее (%d%%)"
-
-#: src/photos/JfifSupport.vala:188
-#, c-format
-msgid "High (%d%%)"
-msgstr "Высокое (%d%%)"
-
-#: src/photos/JfifSupport.vala:191
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "Максимум (%d%%)"
-
-#: src/photos/PngSupport.vala:30
-msgid "PNG"
-msgstr "PNG"
-
-#: src/photos/TiffSupport.vala:86
-msgid "TIFF"
-msgstr "TIFF"
-
-#: src/Page.vala:1268
-msgid "No photos/videos"
-msgstr "Нет фото/видео"
-
-#: src/Page.vala:1272
-msgid "No photos/videos found"
-msgstr "Не найдены фото/видео"
-
-#: src/Page.vala:2569
-msgid "Photos cannot be exported to this directory."
-msgstr "Фотографии не могут быть экспортированы в этот каталог."
-
-#: src/MediaMonitor.vala:400
-#, c-format
-msgid "Unable to process monitoring updates: %s"
-msgstr "Не удалось обработать рузультаты наблюдения: %s"
-
-#: src/Printing.vala:255
+#: ../src/Printing.vala:255
 msgid "Fill the entire page"
-msgstr "Заполнить страницу целиком"
+msgstr "На всю страницу"
 
-#: src/Printing.vala:256
+#: ../src/Printing.vala:256
 msgid "2 images per page"
 msgstr "2 изображения на странице"
 
-#: src/Printing.vala:257
+#: ../src/Printing.vala:257
 msgid "4 images per page"
 msgstr "4 изображения на странице"
 
-#: src/Printing.vala:258
+#: ../src/Printing.vala:258
 msgid "6 images per page"
 msgstr "6 изображений на странице"
 
-#: src/Printing.vala:259
+#: ../src/Printing.vala:259
 msgid "8 images per page"
 msgstr "8 изображений на странице"
 
-#: src/Printing.vala:260
+#: ../src/Printing.vala:260
 msgid "16 images per page"
 msgstr "16 изображений на странице"
 
-#: src/Printing.vala:261
+#: ../src/Printing.vala:261
 msgid "32 images per page"
 msgstr "32 изображений на странице"
 
-#: src/Printing.vala:348
+#: ../src/Printing.vala:348
 msgid "in."
-msgstr "дюймы"
+msgstr "дюймов"
 
-#: src/Printing.vala:349
+#: ../src/Printing.vala:349
 msgid "cm"
 msgstr "см"
 
-#: src/Printing.vala:817 src/editing_tools/EditingTools.vala:757
+#: ../src/Printing.vala:817 ../src/editing_tools/EditingTools.vala:761
 msgid "Wallet (2 x 3 in.)"
 msgstr "Бумажник (2 х 3 дюйма)"
 
-#: src/Printing.vala:820 src/editing_tools/EditingTools.vala:758
+#: ../src/Printing.vala:820 ../src/editing_tools/EditingTools.vala:762
 msgid "Notecard (3 x 5 in.)"
-msgstr "Notecard (3 х 5 дюймов)"
+msgstr "Записная книжка (3 х 5 дюймов)"
 
-#: src/Printing.vala:823 src/editing_tools/EditingTools.vala:759
+#: ../src/Printing.vala:823 ../src/editing_tools/EditingTools.vala:763
 msgid "4 x 6 in."
-msgstr "4 x 6 дюймов."
+msgstr "4 x 6 дюймов"
 
-#: src/Printing.vala:826 src/editing_tools/EditingTools.vala:760
+#: ../src/Printing.vala:826 ../src/editing_tools/EditingTools.vala:764
 msgid "5 x 7 in."
-msgstr "5 x 7 дюймов."
+msgstr "5 x 7 дюймов"
 
-#: src/Printing.vala:829 src/editing_tools/EditingTools.vala:761
+#: ../src/Printing.vala:829 ../src/editing_tools/EditingTools.vala:765
 msgid "8 x 10 in."
-msgstr "8 x 10 дюймов."
+msgstr "8 x 10 дюймов"
 
-#: src/Printing.vala:832 src/editing_tools/EditingTools.vala:763
+#: ../src/Printing.vala:832 ../src/editing_tools/EditingTools.vala:767
 msgid "11 x 14 in."
-msgstr "11 x 14 дюймов."
+msgstr "11 x 14 дюймов"
 
-#: src/Printing.vala:835 src/editing_tools/EditingTools.vala:765
+#: ../src/Printing.vala:835 ../src/editing_tools/EditingTools.vala:769
 msgid "16 x 20 in."
-msgstr "16 x 20 дюймов."
+msgstr "16 x 20 дюймов"
 
-#: src/Printing.vala:841 src/editing_tools/EditingTools.vala:767
+#: ../src/Printing.vala:841 ../src/editing_tools/EditingTools.vala:771
 msgid "Metric Wallet (9 x 13 cm)"
-msgstr "Metric Wallet (9 х 13 см)"
+msgstr "Бумажник (9 х 13 см)"
 
-#: src/Printing.vala:844 src/editing_tools/EditingTools.vala:768
+#: ../src/Printing.vala:844 ../src/editing_tools/EditingTools.vala:772
 msgid "Postcard (10 x 15 cm)"
-msgstr "Почтовая карточка (10 x 15 см)"
+msgstr "Открытка (10 x 15 см)"
 
-#: src/Printing.vala:847 src/editing_tools/EditingTools.vala:769
+#: ../src/Printing.vala:847 ../src/editing_tools/EditingTools.vala:773
 msgid "13 x 18 cm"
 msgstr "13 x 18 см"
 
-#: src/Printing.vala:850 src/editing_tools/EditingTools.vala:770
+#: ../src/Printing.vala:850 ../src/editing_tools/EditingTools.vala:774
 msgid "18 x 24 cm"
 msgstr "18 x 24 см"
 
-#: src/Printing.vala:853 src/editing_tools/EditingTools.vala:772
+#: ../src/Printing.vala:853 ../src/editing_tools/EditingTools.vala:776
 msgid "20 x 30 cm"
 msgstr "20 x 30 см"
 
-#: src/Printing.vala:856 src/editing_tools/EditingTools.vala:773
+#: ../src/Printing.vala:856 ../src/editing_tools/EditingTools.vala:777
 msgid "24 x 40 cm"
 msgstr "24 x 40 см"
 
-#: src/Printing.vala:859 src/editing_tools/EditingTools.vala:774
+#: ../src/Printing.vala:859 ../src/editing_tools/EditingTools.vala:778
 msgid "30 x 40 cm"
 msgstr "30 x 40 см"
 
-#: src/Printing.vala:875
+#: ../src/Printing.vala:875
 msgid "Image Settings"
 msgstr "Настройки изображения"
 
-#: src/Printing.vala:888
+#: ../src/Printing.vala:888
 msgid "Printing..."
-msgstr "Печать..."
+msgstr "Печать…"
 
-#: src/Printing.vala:908 src/Printing.vala:1111
+#: ../src/Printing.vala:908 ../src/Printing.vala:1111
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -2212,1532 +2813,1944 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
-msgstr "Невозможно открыть/создать базу данных фото %s: код ошибки %d"
+#: ../src/Properties.vala:84
+msgid "Today"
+msgstr "Сегодня"
 
-#: src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
-msgstr ""
-"Не удаётся записать в файл базы данных фото:\n"
-" %s"
+#: ../src/Properties.vala:86
+msgid "Yesterday"
+msgstr "Вчера"
 
-#: src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
-msgstr ""
-"Ошибка при доступе к файлу базы данных:\n"
-" %s\n"
-"ошибка: \n"
-"%s"
+#: ../src/Properties.vala:227 ../src/camera/ImportPage.vala:312
+msgid "RAW+JPEG"
+msgstr "RAW+JPEG"
 
-#: src/VideoSupport.vala:464
-msgid "Export Videos"
-msgstr "Экспортирование видео"
+#: ../src/Properties.vala:343
+msgid "Items:"
+msgstr "Элементы:"
 
-#: src/DesktopIntegration.vala:118
+#: ../src/Properties.vala:346
 #, c-format
-msgid "Unable to launch Nautilus Send-To: %s"
-msgstr "Невозможно отправить через Nautilus: %s"
-
-#: src/DesktopIntegration.vala:126
-msgid "Send To"
-msgstr "Отправить"
+msgid "%d Event"
+msgid_plural "%d Events"
+msgstr[0] "%d событие"
+msgstr[1] "%d события"
+msgstr[2] "%d событий"
 
-#: src/DesktopIntegration.vala:171
+#: ../src/Properties.vala:353 ../src/events/EventDirectoryItem.vala:87
 #, c-format
-msgid "Unable to export background to %s: %s"
-msgstr "Невозможно экспортировать фон в %s: %s"
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] "%d фотография"
+msgstr[1] "%d фотографии"
+msgstr[2] "%d фотографий"
 
-#: src/DesktopIntegration.vala:299
+#: ../src/Properties.vala:355 ../src/events/EventDirectoryItem.vala:85
 #, c-format
-msgid "Unable to prepare desktop slideshow: %s"
-msgstr "Не удалось подготовить слайдшоу для рабочего стола: %s"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:587
-#: src/SearchFilter.vala:588 src/SearchFilter.vala:990
-msgid "Flagged"
-msgstr "Отмеченные"
-
-#: src/library/TrashPage.vala:8
-msgid "Trash"
-msgstr "Корзина"
-
-#: src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "Корзина пуста"
-
-#: src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "_Удалить"
-
-#: src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-msgstr "Удаление фотографий"
-
-#: src/library/OfflinePage.vala:8
-msgid "Missing Files"
-msgstr "Отсутствующие файлы"
+msgid "%d Video"
+msgid_plural "%d Videos"
+msgstr[0] "%d видео"
+msgstr[1] "%d видео"
+msgstr[2] "%d видео"
 
-#: src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "Удаление…"
+#. display only one date if start and end are the same
+#: ../src/Properties.vala:377
+msgid "Date:"
+msgstr "Дата:"
 
-#: src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "Последнее импортирование"
+#. display only one time if start and end are the same
+#: ../src/Properties.vala:381
+msgid "Time:"
+msgstr "Время:"
 
-#: src/library/LibraryWindow.vala:301
-msgid "_Import From Folder..."
-msgstr "_Импортировать из папки…"
+#. display time range
+#. display date range
+#: ../src/Properties.vala:384 ../src/Properties.vala:389
+msgid "From:"
+msgstr "От:"
 
-#: src/library/LibraryWindow.vala:302
-msgid "Import photos from disk to library"
-msgstr "Импортировать фотографии в библиотеку с диска "
+#: ../src/Properties.vala:385 ../src/Properties.vala:390
+msgid "To:"
+msgstr "До:"
 
-#: src/library/LibraryWindow.vala:309
-msgid "Import From _Application..."
-msgstr "Импортировать из _приложения…"
+#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1890
+msgid "Size:"
+msgstr "Размер:"
 
-#: src/library/LibraryWindow.vala:313
-msgid "Sort _Events"
-msgstr "Сортировать _события"
+#: ../src/Properties.vala:404
+msgid "Duration:"
+msgstr "Продолжительность:"
 
-#: src/library/LibraryWindow.vala:323
-msgid "Empty T_rash"
-msgstr "Очистить _корзину"
+#: ../src/Properties.vala:404
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f секунд"
 
-#: src/library/LibraryWindow.vala:324
-msgid "Delete all photos in the trash"
-msgstr "Удалить все снимки в корзину"
+#: ../src/Properties.vala:408
+msgid "Developer:"
+msgstr "Обработчик:"
 
-#: src/library/LibraryWindow.vala:329
-msgid "View Eve_nt for Photo"
-msgstr "Показать _событие для фото"
+#. fit both on the top line, emit and move on
+#: ../src/Properties.vala:436 ../src/Properties.vala:440
+#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2258
+msgid "Exposure:"
+msgstr "Выдержка:"
 
-#: src/library/LibraryWindow.vala:334
-msgid "_Find"
-msgstr "_Поиск"
+#. nothing special to be done for now for Events
+#: ../src/Properties.vala:583
+msgid "Location:"
+msgstr "Местоположение:"
 
-#: src/library/LibraryWindow.vala:335
-msgid "Find photos and videos by search criteria"
-msgstr "Поиск фото и видео"
+#: ../src/Properties.vala:586
+msgid "File size:"
+msgstr "Размер файла:"
 
-#: src/library/LibraryWindow.vala:352 src/direct/DirectPhotoPage.vala:46
-msgid "_File"
-msgstr "_Файл"
+#: ../src/Properties.vala:590
+msgid "Current Development:"
+msgstr "Текущая разработка:"
 
-#: src/library/LibraryWindow.vala:356 src/direct/DirectPhotoPage.vala:73
-msgid "_Edit"
-msgstr "_Правка"
+#: ../src/Properties.vala:592
+msgid "Original dimensions:"
+msgstr "Исходный размер:"
 
-#: src/library/LibraryWindow.vala:364 src/direct/DirectPhotoPage.vala:77
-msgid "_Photo"
-msgstr "_Фото"
+#: ../src/Properties.vala:595
+msgid "Camera make:"
+msgstr "Производитель камеры:"
 
-#: src/library/LibraryWindow.vala:368
-msgid "_Photos"
-msgstr "_Фотографии"
+#: ../src/Properties.vala:598
+msgid "Camera model:"
+msgstr "Модель камеры:"
 
-#: src/library/LibraryWindow.vala:372
-msgid "Even_ts"
-msgstr "Со_бытия"
+#: ../src/Properties.vala:601
+msgid "Flash:"
+msgstr "Вспышка:"
 
-#: src/library/LibraryWindow.vala:376 src/MediaPage.vala:454
-msgid "Ta_gs"
-msgstr "_Метки"
+#: ../src/Properties.vala:603
+msgid "Focal length:"
+msgstr "Фокусное расстояние:"
 
-#: src/library/LibraryWindow.vala:380 src/direct/DirectPhotoPage.vala:169
-msgid "_Help"
-msgstr "_Справка"
+# тут не экспозиция
+#: ../src/Properties.vala:606
+msgid "Exposure date:"
+msgstr "Дата съёмки:"
 
-#: src/library/LibraryWindow.vala:391
-msgid "_Basic Information"
-msgstr "_Основная информация"
+# тут не экспозиция
+#: ../src/Properties.vala:609
+msgid "Exposure time:"
+msgstr "Время съёмки:"
 
-#: src/library/LibraryWindow.vala:392
-msgid "Display basic information for the selection"
-msgstr "Показать основную информацию о выделенных"
+#: ../src/Properties.vala:612
+msgid "Exposure bias:"
+msgstr "Компенсация экспозиции:"
 
-#: src/library/LibraryWindow.vala:397
-msgid "E_xtended Information"
-msgstr "_Расширенная информация"
+#: ../src/Properties.vala:614
+msgid "GPS latitude:"
+msgstr "Широта GPS:"
 
-#: src/library/LibraryWindow.vala:398
-msgid "Display extended information for the selection"
-msgstr "Показать расширенную информацию о выделенных"
+#: ../src/Properties.vala:617
+msgid "GPS longitude:"
+msgstr "Долгота GPS:"
 
-#: src/library/LibraryWindow.vala:403
-msgid "_Search Bar"
-msgstr "П_анель поиска"
+#: ../src/Properties.vala:620
+msgid "Artist:"
+msgstr "Фотограф:"
 
-#: src/library/LibraryWindow.vala:404
-msgid "Display the search bar"
-msgstr "Показывать панель поиска"
+#: ../src/Properties.vala:622
+msgid "Copyright:"
+msgstr "Права:"
 
-#: src/library/LibraryWindow.vala:409
-msgid "S_idebar"
-msgstr "Б_ковая панель"
+#: ../src/Properties.vala:624
+msgid "Software:"
+msgstr "Программное обеспечение:"
 
-#: src/library/LibraryWindow.vala:410
-msgid "Display the sidebar"
-msgstr "Показывать боковую панель"
+#: ../src/Properties.vala:639
+msgid "Extended Information"
+msgstr "Расширенная информация"
 
-#: src/library/LibraryWindow.vala:422 src/MediaPage.vala:494
-msgid "_Ascending"
-msgstr "По _возрастанию"
+#: ../src/Resources.vala:17
+msgid "Photo Manager"
+msgstr "Менеджер фотографий"
 
-#: src/library/LibraryWindow.vala:423 src/MediaPage.vala:495
-msgid "Sort photos in an ascending order"
-msgstr "Сортировать фото по возрастанию"
+#: ../src/Resources.vala:18
+msgid "Photo Viewer"
+msgstr "Программа просмотра фотографий"
 
-#: src/library/LibraryWindow.vala:429 src/MediaPage.vala:500
-msgid "D_escending"
-msgstr "По _убыванию"
+#: ../src/Resources.vala:144
+msgid "Rotate _Right"
+msgstr "Повернуть в_право"
 
-#: src/library/LibraryWindow.vala:430 src/MediaPage.vala:501
-msgid "Sort photos in a descending order"
-msgstr "Сортировать фото по убыванию"
+#: ../src/Resources.vala:145 ../src/Resources.vala:150
+msgid "Rotate"
+msgstr "Поворот"
 
-#: src/library/LibraryWindow.vala:668
-msgid "Import From Folder"
-msgstr "Импортировать из папки"
+#: ../src/Resources.vala:146
+msgid "Rotate Right"
+msgstr "Повернуть вправо"
 
-#: src/library/LibraryWindow.vala:737
-msgid "Empty Trash"
-msgstr "Очистить корзину"
+#: ../src/Resources.vala:147
+msgid "Rotate the photos right (press Ctrl to rotate left)"
+msgstr "Повернуть изображение вправо (нажмите Ctrl для поворота влево)"
 
-#: src/library/LibraryWindow.vala:737
-msgid "Emptying Trash..."
-msgstr "Очистка корзины…"
+#: ../src/Resources.vala:149
+msgid "Rotate _Left"
+msgstr "Повернуть в_лево"
 
-#: src/library/LibraryWindow.vala:896
-msgid "Shotwell is configured to import photos to your home directory.\n"
-msgstr ""
-"Shotwell настроен на импортирование фотографий в ваш домашний каталог.\n"
+#: ../src/Resources.vala:151
+msgid "Rotate Left"
+msgstr "Повернуть влево"
 
-#: src/library/LibraryWindow.vala:899
-msgid "Library Location"
-msgstr "Расположение библиотеки:"
+#: ../src/Resources.vala:152
+msgid "Rotate the photos left"
+msgstr "Повернуть изображение влево"
 
-#: src/library/LibraryWindow.vala:912
-msgid "Photos cannot be imported from this directory."
-msgstr "Фотографии не могут быть импортированы из этого каталога."
+#: ../src/Resources.vala:154
+msgid "Flip Hori_zontally"
+msgstr "Отразить по _горизонтали"
 
-#: src/library/LibraryWindow.vala:1200
-#, c-format
-msgid "%s (%d%%)"
-msgstr "%s (%d%%)"
+#: ../src/Resources.vala:155
+msgid "Flip Horizontally"
+msgstr "Отразить по горизонтали"
 
-#: src/library/LibraryWindow.vala:1244 src/library/LibraryWindow.vala:1255
-msgid "Updating library..."
-msgstr "Обновление библиотеки…"
+#: ../src/Resources.vala:157
+msgid "Flip Verti_cally"
+msgstr "Отразить по _вертикали"
 
-#: src/library/LibraryWindow.vala:1261
-msgid "Preparing to auto-import photos..."
-msgstr "Подготовка к авто-импортированию…"
+#: ../src/Resources.vala:158
+msgid "Flip Vertically"
+msgstr "Отразить по вертикали"
 
-#: src/library/LibraryWindow.vala:1266
-msgid "Auto-importing photos..."
-msgstr "Автоматическое импортирование фотографий…"
+#: ../src/Resources.vala:160
+msgid "_About"
+msgstr "_О программе"
 
-#: src/library/LibraryWindow.vala:1274
-msgid "Writing metadata to files..."
-msgstr "Запись метаданных в файлы…"
+#: ../src/Resources.vala:161
+msgid "_Apply"
+msgstr ""
 
-#: src/library/Branch.vala:37
-msgid "Library"
-msgstr "Библиотека"
+#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
+#: ../src/library/LibraryWindow.vala:355
+msgid "_Edit"
+msgstr "_Правка"
 
-#: src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "Импортирование…"
+#: ../src/Resources.vala:165
+#, fuzzy
+#| msgid "_Format:"
+msgid "_Forward"
+msgstr "_Формат:"
 
-#: src/library/ImportQueuePage.vala:66
-msgid "_Stop Import"
-msgstr "_Остановить импортирование"
+#: ../src/Resources.vala:166
+msgid "Fulls_creen"
+msgstr "_Полноэкранный режим"
 
-#: src/library/ImportQueuePage.vala:67
-msgid "Stop importing photos"
-msgstr "Остановить импортирование снимков"
+#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
+#: ../src/library/LibraryWindow.vala:379
+msgid "_Help"
+msgstr "_Справка"
 
-#: src/library/ImportQueuePage.vala:123
-msgid "Preparing to import..."
-msgstr "Подготовка к импортированию…"
+#: ../src/Resources.vala:168
+msgid "Leave _Fullscreen"
+msgstr "Выйти из _полноэкранного режима"
 
-#: src/library/ImportQueuePage.vala:150
-#, c-format
-msgid "Imported %s"
-msgstr "Импортировано %s"
+#: ../src/Resources.vala:169 ../src/Resources.vala:371
+msgid "_New"
+msgstr "_Создать"
 
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:413
-msgid "_Save"
-msgstr "_Сохранить"
+#: ../src/Resources.vala:170
+#, fuzzy
+#| msgid "Next"
+msgid "_Next"
+msgstr "Следующее"
 
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Сохранить снимок"
+#: ../src/Resources.vala:171
+#, fuzzy
+#| msgid "OK"
+msgid "_OK"
+msgstr "ОК"
 
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "Сохранить _как…"
+#: ../src/Resources.vala:172
+#, fuzzy
+#| msgid "Play"
+msgid "_Play"
+msgstr "Просмотр"
 
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Сохранить снимок с другим именем"
+#: ../src/Resources.vala:173 ../src/Resources.vala:325
+msgid "_Preferences"
+msgstr "_Параметры"
 
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Распечатать фото на принтере"
+#: ../src/Resources.vala:174
+#, fuzzy
+#| msgid "_Previous Photo"
+msgid "_Previous"
+msgstr "_Предыдущее фото"
 
-#: src/direct/DirectPhotoPage.vala:223
-#, c-format
-msgid "%s does not exist."
-msgstr "%s не существует."
+#: ../src/Resources.vala:175
+#, fuzzy
+#| msgid "_Print..."
+msgid "_Print"
+msgstr "_Печать…"
 
-#: src/direct/DirectPhotoPage.vala:225
-#, c-format
-msgid "%s is not a file."
-msgstr "%s не является файлом."
+#: ../src/Resources.vala:176
+msgid "_Quit"
+msgstr "_Завершить"
 
-#: src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
+#: ../src/Resources.vala:177
+msgid "_Refresh"
 msgstr ""
-"%s не поддерживает формат файла\n"
-"%s."
-
-#: src/direct/DirectPhotoPage.vala:413
-msgid "_Save a Copy"
-msgstr "Сохранить _копию"
-
-#: src/direct/DirectPhotoPage.vala:416
-#, c-format
-msgid "Lose changes to %s?"
-msgstr "Отменить изменения %s?"
 
-#: src/direct/DirectPhotoPage.vala:417
-msgid "Close _without Saving"
-msgstr "Закрыть _без сохранения"
+#: ../src/Resources.vala:179
+#, fuzzy
+#| msgid "Reverting"
+msgid "_Revert"
+msgstr "Возврат"
 
-#: src/direct/DirectPhotoPage.vala:450
-#, c-format
-msgid "Error while saving to %s: %s"
-msgstr "Ошибка при сохранении в %s: %s"
+#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save"
+msgstr "_Сохранить"
 
-#: src/direct/DirectPhotoPage.vala:478 src/direct/DirectPhotoPage.vala:499
-msgid "Save As"
+#: ../src/Resources.vala:181
+#, fuzzy
+#| msgid "Save As"
+msgid "Save _As"
 msgstr "Сохранить как"
 
-#: src/DirectoryMonitor.vala:889
-#, c-format
-msgid "Unable to monitor %s: Not a directory (%s)"
-msgstr "Не возможно следить за %s: не является каталогом (%s)"
-
-#: src/Resources.vala:17
-msgid "Photo Manager"
-msgstr "Менеджер фотографий"
-
-#: src/Resources.vala:18
-msgid "Photo Viewer"
-msgstr "Просмотрщик фотоснимков"
-
-#: src/Resources.vala:27 plugins/shotwell-publishing/YouTubePublishing.vala:32
-#: plugins/shotwell-publishing/FlickrPublishing.vala:34
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:32
-#: plugins/shotwell-publishing/PicasaPublishing.vala:32
-#: plugins/shotwell-publishing/FacebookPublishing.vala:32
-#: plugins/shotwell-data-imports/FSpotImporter.vala:34
-msgid "Copyright 2009-2013 Yorba Foundation"
-msgstr "©Yorba Foundation, 2009-2013"
-
-#: src/Resources.vala:144
-msgid "Rotate _Right"
-msgstr "Повернуть в_право"
-
-#: src/Resources.vala:145 src/Resources.vala:150
-msgid "Rotate"
-msgstr "Повернуть"
-
-#: src/Resources.vala:146
-msgid "Rotate Right"
-msgstr "Повернуть вправо"
-
-#: src/Resources.vala:147
-msgid "Rotate the photos right (press Ctrl to rotate left)"
-msgstr "Поворот фотографии вправо (нажмите Ctrl, чтобы повернуть влево)"
-
-#: src/Resources.vala:149
-msgid "Rotate _Left"
-msgstr "Повернуть в_лево"
-
-#: src/Resources.vala:151
-msgid "Rotate Left"
-msgstr "Повернуть влево"
+#: ../src/Resources.vala:182
+#, fuzzy
+#| msgid "_Ascending"
+msgid "Sort _Ascending"
+msgstr "По _возрастанию"
 
-#: src/Resources.vala:152
-msgid "Rotate the photos left"
-msgstr "Поворот фото влево"
+#: ../src/Resources.vala:183
+#, fuzzy
+#| msgid "D_escending"
+msgid "Sort _Descending"
+msgstr "По _убыванию"
 
-#: src/Resources.vala:154
-msgid "Flip Hori_zontally"
-msgstr "Перевернуть _горизонтально"
+#: ../src/Resources.vala:184
+msgid "_Stop"
+msgstr ""
 
-#: src/Resources.vala:155
-msgid "Flip Horizontally"
-msgstr "Перевернуть горизонтально"
+#: ../src/Resources.vala:185
+#, fuzzy
+#| msgid "_Delete"
+msgid "_Undelete"
+msgstr "_Удалить"
 
-#: src/Resources.vala:157
-msgid "Flip Verti_cally"
-msgstr "Перевернуть _вертикально"
+#: ../src/Resources.vala:186
+#, fuzzy
+#| msgid "Original Size"
+msgid "_Normal Size"
+msgstr "Исходный размер"
 
-#: src/Resources.vala:158
-msgid "Flip Vertically"
-msgstr "Перевернуть вертикально"
+#: ../src/Resources.vala:187
+msgid "Best _Fit"
+msgstr ""
 
-#: src/Resources.vala:160
+#: ../src/Resources.vala:191
 msgid "_Enhance"
-msgstr "_Улучшить"
+msgstr "_Автокоррекция"
 
-#: src/Resources.vala:161
+#: ../src/Resources.vala:192
 msgid "Enhance"
-msgstr "Улучшить"
+msgstr "Автокоррекция"
 
-#: src/Resources.vala:162
+#: ../src/Resources.vala:193
 msgid "Automatically improve the photo's appearance"
-msgstr "Автоматически улучшить внешний вид фото"
+msgstr "Автоматически откорректировать цвет и тон изображения"
 
-#: src/Resources.vala:164
+#: ../src/Resources.vala:195
 msgid "_Copy Color Adjustments"
 msgstr ""
 
-#: src/Resources.vala:165
+#: ../src/Resources.vala:196
 msgid "Copy Color Adjustments"
 msgstr ""
 
-#: src/Resources.vala:166
+#: ../src/Resources.vala:197
 msgid "Copy the color adjustments applied to the photo"
 msgstr ""
 
-#: src/Resources.vala:168
+#: ../src/Resources.vala:199
 msgid "_Paste Color Adjustments"
 msgstr ""
 
-#: src/Resources.vala:169
+#: ../src/Resources.vala:200
 msgid "Paste Color Adjustments"
 msgstr ""
 
-#: src/Resources.vala:170
+#: ../src/Resources.vala:201
 msgid "Apply copied color adjustments to the selected photos"
 msgstr ""
 
-#: src/Resources.vala:172
+#: ../src/Resources.vala:203
 msgid "_Crop"
 msgstr "_Обрезать"
 
-#: src/Resources.vala:173
+#: ../src/Resources.vala:204
 msgid "Crop"
-msgstr "Обрезать"
+msgstr "Подрезка"
 
-#: src/Resources.vala:174
+#: ../src/Resources.vala:205
 msgid "Crop the photo's size"
-msgstr "Обрезать фотографию"
+msgstr "Изменить размер изображения"
 
-#: src/Resources.vala:176 src/editing_tools/StraightenTool.vala:100
+#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
 msgid "_Straighten"
-msgstr "_Выпрямить"
+msgstr "_Выровнять"
 
-#: src/Resources.vala:177
+#: ../src/Resources.vala:208
 msgid "Straighten"
-msgstr "Выпрямить"
+msgstr "Выравнивание"
 
-#: src/Resources.vala:178
+#: ../src/Resources.vala:209
 msgid "Straighten the photo"
-msgstr "Выпрямить фотографию"
+msgstr "Выровнять изображение"
 
-#: src/Resources.vala:180
+#: ../src/Resources.vala:211
 msgid "_Red-eye"
-msgstr "_Удаление «красных глаз»"
+msgstr "_Удаление эффекта «красных глаз»"
 
-#: src/Resources.vala:181
+#: ../src/Resources.vala:212
 msgid "Red-eye"
-msgstr "Удаление «красных глаз»"
+msgstr "Удаление эффекта «красных глаз»"
 
-#: src/Resources.vala:182
+#: ../src/Resources.vala:213
 msgid "Reduce or eliminate any red-eye effects in the photo"
-msgstr "Уменьшает или полностью устраняет эффект «красных глаз»"
+msgstr "Уменьшение или полное устранение эффекта «красных глаз» на фотографиях"
 
-#: src/Resources.vala:184
+#: ../src/Resources.vala:215
 msgid "_Adjust"
 msgstr "_Коррекция"
 
-#: src/Resources.vala:185
+#: ../src/Resources.vala:216
 msgid "Adjust"
 msgstr "Коррекция"
 
-#: src/Resources.vala:186
+#: ../src/Resources.vala:217
 msgid "Adjust the photo's color and tone"
-msgstr "Настроить цвет и оттенок фото"
+msgstr "Настроить цвет или тон изображения"
 
-#: src/Resources.vala:188
+#: ../src/Resources.vala:219
 msgid "Re_vert to Original"
-msgstr "Вернуться к _оригиналу"
+msgstr "Отменить автокоррек_цию"
 
-#: src/Resources.vala:189
+#: ../src/Resources.vala:220
 msgid "Revert to Original"
-msgstr "Вернуться к оригиналу"
+msgstr "Отменить автокоррекцию"
 
-#: src/Resources.vala:191
+#: ../src/Resources.vala:222
 msgid "Revert External E_dits"
-msgstr "Вернуться к _оригиналу"
+msgstr "Отменить и_зменения внешнего редактора"
 
-#: src/Resources.vala:192
+#: ../src/Resources.vala:223
 msgid "Revert to the master photo"
-msgstr "Вернуться к исходной фотографии"
+msgstr "Вернуться к исходному изображению"
 
-#: src/Resources.vala:194
+#: ../src/Resources.vala:225
 msgid "Set as _Desktop Background"
 msgstr "Сделать _фоном рабочего стола"
 
-#: src/Resources.vala:195
+#: ../src/Resources.vala:226
 msgid "Set selected image to be the new desktop background"
 msgstr "Сделать выбранное изображение фоном рабочего стола"
 
-#: src/Resources.vala:196
+#: ../src/Resources.vala:227
 msgid "Set as _Desktop Slideshow..."
 msgstr "Сделать набором слайдов _рабочего стола"
 
-#: src/Resources.vala:198
+#: ../src/Resources.vala:229
 msgid "_Undo"
 msgstr "_Отменить"
 
-#: src/Resources.vala:199
+#: ../src/Resources.vala:230
 msgid "Undo"
 msgstr "Отменить"
 
-#: src/Resources.vala:201
+#: ../src/Resources.vala:232
 msgid "_Redo"
-msgstr "_Вернуть: "
+msgstr "_Вернуть"
 
-#: src/Resources.vala:202
+#: ../src/Resources.vala:233
 msgid "Redo"
-msgstr "Вернуть: "
+msgstr "Вернуть"
 
-#: src/Resources.vala:204
+#: ../src/Resources.vala:235
 msgid "Re_name Event..."
 msgstr "_Переименовать событие…"
 
-#: src/Resources.vala:207
+#: ../src/Resources.vala:238
 msgid "Make _Key Photo for Event"
 msgstr "Сделать _ключевым фото для события"
 
-#: src/Resources.vala:208
+#: ../src/Resources.vala:239
 msgid "Make Key Photo for Event"
 msgstr "Сделать ключевым фото для события"
 
-#: src/Resources.vala:210
+#: ../src/Resources.vala:241
 msgid "_New Event"
 msgstr "_Новое событие"
 
-#: src/Resources.vala:211
+#: ../src/Resources.vala:242
 msgid "New Event"
 msgstr "Новое событие"
 
-#: src/Resources.vala:213
+#: ../src/Resources.vala:244
 msgid "Move Photos"
 msgstr "Переместить фото"
 
-#: src/Resources.vala:214
+#: ../src/Resources.vala:245
 msgid "Move photos to an event"
 msgstr "Переместить фото в событие"
 
-#: src/Resources.vala:216
+#: ../src/Resources.vala:247
 msgid "_Merge Events"
 msgstr "_Объединение событий"
 
-#: src/Resources.vala:217
+#: ../src/Resources.vala:248
 msgid "Merge"
 msgstr "Объединить"
 
-#: src/Resources.vala:218
+#: ../src/Resources.vala:249
 msgid "Combine events into a single event"
 msgstr "Собрать события в одно"
 
-#: src/Resources.vala:220
+#: ../src/Resources.vala:251
 msgid "_Set Rating"
 msgstr "_Оценить"
 
-#: src/Resources.vala:221
+#: ../src/Resources.vala:252
 msgid "Set Rating"
 msgstr "Поставить оценку фотографии"
 
-#: src/Resources.vala:222
+#: ../src/Resources.vala:253
 msgid "Change the rating of your photo"
 msgstr "Изменить оценку фотоснимка"
 
-#: src/Resources.vala:224
+#: ../src/Resources.vala:255
 msgid "_Increase"
 msgstr "По_высить"
 
-#: src/Resources.vala:225
+#: ../src/Resources.vala:256
 msgid "Increase Rating"
 msgstr "Повысить оценку"
 
-#: src/Resources.vala:227
+#: ../src/Resources.vala:258
 msgid "_Decrease"
 msgstr "По_низить"
 
-#: src/Resources.vala:228
+#: ../src/Resources.vala:259
 msgid "Decrease Rating"
 msgstr "Понизить оценку"
 
-#: src/Resources.vala:230
+#: ../src/Resources.vala:261
 msgid "_Unrated"
 msgstr "_Без оценки"
 
-#: src/Resources.vala:231
+#: ../src/Resources.vala:262
 msgid "Unrated"
 msgstr "Без оценки"
 
-#: src/Resources.vala:232
+#: ../src/Resources.vala:263
 msgid "Rate Unrated"
 msgstr "Поставить оценку неоценённым"
 
-#: src/Resources.vala:233
+#: ../src/Resources.vala:264
 msgid "Setting as unrated"
 msgstr "Снять оценку"
 
-#: src/Resources.vala:234
+#: ../src/Resources.vala:265
 msgid "Remove any ratings"
 msgstr "Удалить все оценки"
 
-#: src/Resources.vala:236
+#: ../src/Resources.vala:267
 msgid "_Rejected"
 msgstr "_Отклонённые"
 
-#: src/Resources.vala:237
+#: ../src/Resources.vala:268
 msgid "Rejected"
 msgstr "Отклонённые"
 
-#: src/Resources.vala:238
+#: ../src/Resources.vala:269
 msgid "Rate Rejected"
 msgstr "Оценить отклонённые"
 
-#: src/Resources.vala:239
+#: ../src/Resources.vala:270
 msgid "Setting as rejected"
 msgstr "Пометить как отклонённое"
 
-#: src/Resources.vala:240
+#: ../src/Resources.vala:271
 msgid "Set rating to rejected"
 msgstr "Поставить оценки отклонённым"
 
-#: src/Resources.vala:242
+#: ../src/Resources.vala:273
 msgid "Rejected _Only"
 msgstr "Только _отклонённые"
 
-#: src/Resources.vala:243
+#: ../src/Resources.vala:274
 msgid "Rejected Only"
 msgstr "Только отклонённые"
 
-#: src/Resources.vala:244
+#: ../src/Resources.vala:275
 msgid "Show only rejected photos"
 msgstr "Показать только отклонённые фото"
 
-#: src/Resources.vala:246
+#: ../src/Resources.vala:277
 msgid "All + _Rejected"
-msgstr "Все + _Отклонённые"
+msgstr "Все и _отклонённые"
 
-#: src/Resources.vala:247 src/Resources.vala:248
+#: ../src/Resources.vala:278 ../src/Resources.vala:279
 msgid "Show all photos, including rejected"
 msgstr "Показать все фото, включая отклонённые"
 
-#: src/Resources.vala:250
+#: ../src/Resources.vala:281
 msgid "_All Photos"
 msgstr "_Все фотографии"
 
-#: src/Resources.vala:251 src/Resources.vala:252
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:283 ../src/Resources.vala:285
 msgid "Show all photos"
 msgstr "Показать все фото"
 
-#: src/Resources.vala:254
+#: ../src/Resources.vala:287
 msgid "_Ratings"
 msgstr "_Оценки"
 
-#: src/Resources.vala:255
+#: ../src/Resources.vala:288
 msgid "Display each photo's rating"
 msgstr "Показывать оценку каждой фотографии"
 
-#: src/Resources.vala:257
+#: ../src/Resources.vala:290
 msgid "_Filter Photos"
 msgstr "_Фильтровать фото"
 
-#: src/Resources.vala:258
+#: ../src/Resources.vala:291
 msgid "Filter Photos"
 msgstr "Фильтровать фотографии"
 
-#: src/Resources.vala:259
+#: ../src/Resources.vala:292
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Ограничить с помощью фильтра число показываемых фотографий"
 
-#: src/Resources.vala:261
+#: ../src/Resources.vala:294
 msgid "_Duplicate"
 msgstr "_Дублировать"
 
-#: src/Resources.vala:262
+#: ../src/Resources.vala:295
 msgid "Duplicate"
 msgstr "Дублировать"
 
-#: src/Resources.vala:263
+#: ../src/Resources.vala:296
 msgid "Make a duplicate of the photo"
 msgstr "Сделать дубликат снимка"
 
-#: src/Resources.vala:265
+#: ../src/Resources.vala:298
 msgid "_Export..."
 msgstr "_Экспортировать…"
 
-#: src/Resources.vala:267
+#: ../src/Resources.vala:300
 msgid "_Print..."
 msgstr "_Печать…"
 
-#: src/Resources.vala:269
+#: ../src/Resources.vala:302
 msgid "Pu_blish..."
 msgstr "О_публиковать…"
 
-#: src/Resources.vala:270
-msgid "Publish"
-msgstr "Опубликовать"
-
-#: src/Resources.vala:271
+#: ../src/Resources.vala:304
 msgid "Publish to various websites"
 msgstr "Опубликовать на различных сайтах"
 
-#: src/Resources.vala:273
+#: ../src/Resources.vala:306
 msgid "Edit _Title..."
 msgstr "Редактировать _название…"
 
-#: src/Resources.vala:276
+#: ../src/Resources.vala:310
 msgid "Edit _Comment..."
-msgstr "Изменить _комментарий..."
+msgstr "Изменить _комментарий…"
 
-#: src/Resources.vala:277
+#. Button label
+#: ../src/Resources.vala:312
 msgid "Edit Comment"
 msgstr "Изменить комментарий"
 
-#: src/Resources.vala:279
+#: ../src/Resources.vala:314
 msgid "Edit Event _Comment..."
 msgstr ""
 
-#: src/Resources.vala:282
+#: ../src/Resources.vala:317
 msgid "_Adjust Date and Time..."
 msgstr "_Изменить дату и время…"
 
-#: src/Resources.vala:283
+#: ../src/Resources.vala:318
 msgid "Adjust Date and Time"
 msgstr "Изменить дату и время"
 
-#: src/Resources.vala:285
+#: ../src/Resources.vala:320
 msgid "Add _Tags..."
 msgstr "Добавить _метки…"
 
-#: src/Resources.vala:286
+#: ../src/Resources.vala:321
 msgid "_Add Tags..."
 msgstr "_Добавить метки…"
 
-#: src/Resources.vala:287 src/Resources.vala:318
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:323 ../src/Resources.vala:356
 msgid "Add Tags"
 msgstr "Добавить метки"
 
-#: src/Resources.vala:289
-msgid "_Preferences"
-msgstr "_Параметры"
-
-#: src/Resources.vala:291
+#: ../src/Resources.vala:327
 msgid "Open With E_xternal Editor"
 msgstr "Открыть с помощью внешнего _редактора"
 
-#: src/Resources.vala:293
+#: ../src/Resources.vala:329
 msgid "Open With RA_W Editor"
 msgstr "Открыть с помощью редактора _RAW"
 
-#: src/Resources.vala:295
+#: ../src/Resources.vala:331
 msgid "Send _To..."
 msgstr "_Отправить…"
 
-#: src/Resources.vala:296
+#: ../src/Resources.vala:332
 msgid "Send T_o..."
 msgstr "_Отправить…"
 
-#: src/Resources.vala:298
+#: ../src/Resources.vala:334
 msgid "_Find..."
-msgstr "_Поиск..."
+msgstr "_Поиск…"
 
-#: src/Resources.vala:299
+#: ../src/Resources.vala:335
 msgid "Find"
 msgstr "Поиск"
 
-#: src/Resources.vala:300
+#: ../src/Resources.vala:336
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Найти изображения по указанной строке из названий или меток изображений"
 
-#: src/Resources.vala:302
+#: ../src/Resources.vala:338
 msgid "_Flag"
 msgstr "_Отметить"
 
-#: src/Resources.vala:304
+#: ../src/Resources.vala:340
 msgid "Un_flag"
 msgstr "_Снять отметку"
 
-#: src/Resources.vala:307
+#: ../src/Resources.vala:343
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Невозможно запустить редактор: %s"
 
-#: src/Resources.vala:312
+#: ../src/Resources.vala:348
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "Добавить метку «%s»"
 
-#: src/Resources.vala:314
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:351
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "Добавить метки «%s» и «%s»"
 
-#: src/Resources.vala:322
+#: ../src/Resources.vala:361
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "_Снять метку «%s»"
 
-#: src/Resources.vala:326
+#: ../src/Resources.vala:365
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "Снять метку «%s»"
 
-#: src/Resources.vala:329
+#: ../src/Resources.vala:368
 msgid "Delete Tag"
 msgstr "Удалить метку"
 
-#: src/Resources.vala:332
-msgid "_New"
-msgstr "_Создать"
-
-#: src/Resources.vala:335
+#: ../src/Resources.vala:374
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "П_ереименовать метку «%s»…"
 
-#: src/Resources.vala:339
+#: ../src/Resources.vala:378
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "Переименовать метку «%s» на «%s»"
 
-#: src/Resources.vala:342
+#: ../src/Resources.vala:381
 msgid "_Rename..."
 msgstr "_Переименовать"
 
-#: src/Resources.vala:344
+#: ../src/Resources.vala:383
 msgid "Modif_y Tags..."
 msgstr "_Изменить метки…"
 
-#: src/Resources.vala:345
+#: ../src/Resources.vala:384
 msgid "Modify Tags"
 msgstr "Изменить метки"
 
-#: src/Resources.vala:348
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Добавить метку «%s» к фотографиям"
 
-#: src/Resources.vala:348
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Добавить метку «%s» к фотографиям"
 
-#: src/Resources.vala:352
+#: ../src/Resources.vala:391
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "Добавить метку «%s» к выбранной фотографии"
 
-#: src/Resources.vala:353
+#: ../src/Resources.vala:392
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "Добавить метку «%s» к выбранным фотографиям"
 
-#: src/Resources.vala:357
+#: ../src/Resources.vala:396
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "Снять метку «%s» с _фотографии"
 
-#: src/Resources.vala:358
+#: ../src/Resources.vala:397
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "Снять метку «%s» с _фотографий"
 
-#: src/Resources.vala:362
+#: ../src/Resources.vala:401
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "Снять метку «%s» с фотографии"
 
-#: src/Resources.vala:363
+#: ../src/Resources.vala:402
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "Снять метку «%s» с фотографий"
 
-#: src/Resources.vala:367
+#: ../src/Resources.vala:406
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr "Невозможно переименовать метку в «%s», такая метка уже существует."
 
-#: src/Resources.vala:371
+#: ../src/Resources.vala:410
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr ""
 "Невозможно переименовать поиск в «%s», такой поисковый запрос уже существует."
 
-#: src/Resources.vala:374
+#: ../src/Resources.vala:413
 msgid "Saved Search"
-msgstr "Сохраненный поиск"
+msgstr "Сохранённый поиск"
 
-#: src/Resources.vala:376
+#: ../src/Resources.vala:415
 msgid "Delete Search"
 msgstr "Удалить поиск"
 
-#: src/Resources.vala:379
+#: ../src/Resources.vala:418
 msgid "_Edit..."
-msgstr "_Изменить"
+msgstr "_Изменить…"
 
-#: src/Resources.vala:380
+#: ../src/Resources.vala:419
 msgid "Re_name..."
-msgstr "Переименовать"
+msgstr "_Переименовать…"
 
-#: src/Resources.vala:383
+#: ../src/Resources.vala:422
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "Переименовать поисковый запрос «%s» в «%s»"
 
-#: src/Resources.vala:387
+#: ../src/Resources.vala:426
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "Удалить поиск «%s»"
 
-#: src/Resources.vala:545
+#: ../src/Resources.vala:584
 #, c-format
 msgid "Rate %s"
 msgstr "Оценить %s"
 
-#: src/Resources.vala:546
+#: ../src/Resources.vala:585
 #, c-format
 msgid "Set rating to %s"
 msgstr "Оценить на %s"
 
-#: src/Resources.vala:547
+#: ../src/Resources.vala:586
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Оценить на %s"
 
-#: src/Resources.vala:549
+#: ../src/Resources.vala:588
 #, c-format
 msgid "Display %s"
 msgstr "Показать %s"
 
-#: src/Resources.vala:550
+#: ../src/Resources.vala:589
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Показывать только фото с оценкой %s"
 
-#: src/Resources.vala:551
+#: ../src/Resources.vala:590
 #, c-format
 msgid "%s or Better"
 msgstr "%s или лучше"
 
-#: src/Resources.vala:552
+#: ../src/Resources.vala:591
 #, c-format
 msgid "Display %s or Better"
 msgstr "Показывать с оценкой %s или лучшей"
 
-#: src/Resources.vala:553
+#: ../src/Resources.vala:592
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Показывать только фото с оценкой %s или лучшей"
 
-#: src/Resources.vala:644
+#: ../src/Resources.vala:683
 msgid "Remove the selected photos from the trash"
 msgstr "Удалить выбранные фотографии из корзины"
 
-#: src/Resources.vala:645
+#: ../src/Resources.vala:684
 msgid "Remove the selected photos from the library"
 msgstr "Удалить выбранные фотографии из библиотеки"
 
-#: src/Resources.vala:647
+#: ../src/Resources.vala:686
 msgid "_Restore"
 msgstr "_Восстановить"
 
-#: src/Resources.vala:648
+#: ../src/Resources.vala:687
 msgid "Move the selected photos back into the library"
 msgstr "Вернуть выбранные фотографии в библиотеку"
 
-#: src/Resources.vala:650
+#: ../src/Resources.vala:689
 msgid "Show in File Mana_ger"
 msgstr "Открыть в файловом _менеджере"
 
-#: src/Resources.vala:651
+#: ../src/Resources.vala:690
 msgid "Open the selected photo's directory in the file manager"
 msgstr ""
 "Открыть каталог, в котором находится выбранная фотография, в файловом "
 "менеджере"
 
-#: src/Resources.vala:654
+#: ../src/Resources.vala:693
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Невозможно открыть в файловом менеджере: %s"
 
-#: src/Resources.vala:657
+#: ../src/Resources.vala:696
 msgid "R_emove From Library"
 msgstr "_Удалить из библиотеки"
 
-#: src/Resources.vala:659
+#: ../src/Resources.vala:698
 msgid "_Move to Trash"
 msgstr "Переместить в корзину"
 
-#: src/Resources.vala:661
+#: ../src/Resources.vala:700
 msgid "Select _All"
 msgstr "Выбрать _всё"
 
-#: src/Resources.vala:662
+#: ../src/Resources.vala:701
 msgid "Select all items"
 msgstr "Выбрать всё"
 
-#: src/Resources.vala:740
+#. ...precache the timestamp string...
+#. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:780
 msgid "%-I:%M %p"
 msgstr "%-I:%M %p"
 
-#: src/Resources.vala:741
+#. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:785
 msgid "%-I:%M:%S %p"
 msgstr "%-I:%M:%S %p"
 
-#: src/Resources.vala:742
+# исправление даты
+#. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:789
 msgid "%a %b %d, %Y"
-msgstr "%a %b %d, %Y"
-
-#: src/Resources.vala:743 src/Resources.vala:745
+msgstr "%a., %d %b. %Y"
+
+# исправление даты
+#. / Locale-specific starting date format for multi-date strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#. / Locale-specific calendar date format for multi-month strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:794 ../src/Resources.vala:804
 msgid "%a %b %d"
-msgstr "%a %b %d"
+msgstr "%a., %d"
 
-#: src/Resources.vala:744
+# исправление даты
+#. / Locale-specific ending date format for multi-date strings,
+#. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:799
 msgid "%d, %Y"
-msgstr "%d, %Y"
+msgstr "%d %b., %Y"
 
-#: src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr "Угол:"
+#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
+msgid "Slideshow"
+msgstr "Слайдшоу"
 
-#: src/editing_tools/StraightenTool.vala:102
-#: src/editing_tools/EditingTools.vala:2204
-msgid "_Reset"
-msgstr "_Сброс"
+#. Flagged label and toggle
+#: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
+#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
+msgid "Flagged"
+msgstr "Отмеченные"
 
-#: src/editing_tools/EditingTools.vala:661
+#: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
+msgid "Photos"
+msgstr "Фотографии"
+
+#: ../src/SearchFilter.vala:599 ../src/SearchFilter.vala:600
+msgid "Videos"
+msgstr "Видео"
+
+#: ../src/SearchFilter.vala:605
+msgid "RAW Photos"
+msgstr "Изображения RAW"
+
+#: ../src/SearchFilter.vala:606
+msgid "RAW photos"
+msgstr "Изображения RAW"
+
+#: ../src/SearchFilter.vala:934
+#, c-format
+msgid "Error loading UI file %s: %s"
+msgstr "Не удалось загрузить файл интерфейса %s: %s"
+
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: ../src/SearchFilter.vala:945
+#, fuzzy
+#| msgid "_Close"
+msgid "Close"
+msgstr "_Закрыть"
+
+#. Type label and toggles
+#: ../src/SearchFilter.vala:951
+msgid "Type"
+msgstr "Тип"
+
+#. Rating label and button
+#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
+msgid "Rating"
+msgstr "Рейтинг"
+
+#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
+msgid "Settings"
+msgstr "Настройки"
+
+#. Set up toolbar
+#. add toolbar buttons
+#: ../src/SlideshowPage.vala:160
+msgid "Back"
+msgstr "Назад"
+
+#: ../src/SlideshowPage.vala:162
+msgid "Go to the previous photo"
+msgstr "Перейти к предыдущему фото"
+
+#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
+msgid "Pause"
+msgstr "Пауза"
+
+#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
+msgid "Pause the slideshow"
+msgstr "Приостановить слайдшоу"
+
+#: ../src/SlideshowPage.vala:174
+msgid "Next"
+msgstr "Следующее"
+
+#: ../src/SlideshowPage.vala:176
+msgid "Go to the next photo"
+msgstr "Перейти к следующему фото"
+
+#: ../src/SlideshowPage.vala:184
+msgid "Change slideshow settings"
+msgstr "Изменить настройки слайдшоу"
+
+#. An entire slideshow set might be missing, so check for a loop.
+#: ../src/SlideshowPage.vala:238
+msgid "All photo source files are missing."
+msgstr "Не найдено ни одного исходного файла"
+
+#: ../src/SlideshowPage.vala:270
+msgid "Play"
+msgstr "Просмотр"
+
+#: ../src/SlideshowPage.vala:271
+msgid "Continue the slideshow"
+msgstr "Продолжить слайдшоу"
+
+#: ../src/Tag.vala:817
+msgid "untitled"
+msgstr "безымянный"
+
+#. multiple videos
+#: ../src/VideoSupport.vala:489
+msgid "Export Videos"
+msgstr "Экспортирование видео"
+
+#: ../src/camera/Branch.vala:85
+msgid "Cameras"
+msgstr "Камеры"
+
+#: ../src/camera/ImportPage.vala:459
+msgid ""
+"Unable to unmount camera.  Try unmounting the camera from the file manager."
+msgstr ""
+"Невозможно размонтировать камеру. Попробуйте размонтировать её из файлового "
+"менеджера."
+
+#. hide duplicates checkbox
+#: ../src/camera/ImportPage.vala:776
+msgid "Hide photos already imported"
+msgstr "Скрыть уже импортированные фото"
+
+#: ../src/camera/ImportPage.vala:777
+msgid "Only display photos that have not been imported"
+msgstr "Показать только не импортированные фото"
+
+#. Ticket #3304 - Import page shouldn't display confusing message
+#. prior to import.
+#. TODO: replace this with approved text for "talking to camera,
+#. please wait" once new strings are being accepted.
+#: ../src/camera/ImportPage.vala:847
+msgid "Starting import, please wait..."
+msgstr "Идёт импортирование, пожалуйста подождите…"
+
+#: ../src/camera/ImportPage.vala:886
+msgid "Import _Selected"
+msgstr "_Импортировать выбранные"
+
+#: ../src/camera/ImportPage.vala:887
+msgid "Import the selected photos into your library"
+msgstr "Импортирование выбранных фотографий в библиотеку"
+
+#: ../src/camera/ImportPage.vala:892
+msgid "Import _All"
+msgstr "Импортировать _все"
+
+#: ../src/camera/ImportPage.vala:893
+msgid "Import all the photos into your library"
+msgstr "Импортировать все фотографии в библиотеку"
+
+#. it's mounted, offer to unmount for the user
+#: ../src/camera/ImportPage.vala:1014
+msgid ""
+"Shotwell needs to unmount the camera from the filesystem in order to access "
+"it.  Continue?"
+msgstr ""
+"Для доступа к камере Shotwell должен размонтировать её от файловой системы. "
+"Продолжить?"
+
+#: ../src/camera/ImportPage.vala:1020
+msgid "_Unmount"
+msgstr "_Размонтировать"
+
+#: ../src/camera/ImportPage.vala:1025
+msgid "Please unmount the camera."
+msgstr "Размонтируйте камеру."
+
+#: ../src/camera/ImportPage.vala:1030
+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 ""
+"Камера заблокирована другим приложением. Shotwell не может работать с "
+"заблокированной камерой. Закройте все приложения, работающие с камерой и "
+"повторите попытку."
+
+#: ../src/camera/ImportPage.vala:1040
+msgid "Please close any other application using the camera."
+msgstr "Закройте все приложения, работающие с камерой."
+
+#: ../src/camera/ImportPage.vala:1045
+#, c-format
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
+msgstr ""
+"Невозможно получить предпросмотр с камеры:\n"
+"%s"
+
+#: ../src/camera/ImportPage.vala:1062
+msgid "Unmounting..."
+msgstr "Размонтирование…"
+
+#: ../src/camera/ImportPage.vala:1168
+msgid "Fetching photo information"
+msgstr "Получение информации о снимке"
+
+#: ../src/camera/ImportPage.vala:1523
+#, c-format
+msgid "Fetching preview for %s"
+msgstr "Получение предпросмотра %s"
+
+#: ../src/camera/ImportPage.vala:1639
+#, c-format
+msgid "Unable to lock camera: %s"
+msgstr "Невозможно заблокировать камеру: %s"
+
+#: ../src/camera/ImportPage.vala:1724
+#, c-format
+msgid "Delete this photo from camera?"
+msgid_plural "Delete these %d photos from camera?"
+msgstr[0] "Удалить %d фотографию из камеры?"
+msgstr[1] "Удалить %d фотографии из камеры?"
+msgstr[2] "Удалить %d фотографий из камеры?"
+
+#: ../src/camera/ImportPage.vala:1727
+#, c-format
+msgid "Delete this video from camera?"
+msgid_plural "Delete these %d videos from camera?"
+msgstr[0] "Удалить %d видеофайл из камеры?"
+msgstr[1] "Удалить %d видеофайла из камеры?"
+msgstr[2] "Удалить %d видеофайлов из камеры?"
+
+#: ../src/camera/ImportPage.vala:1730
+#, c-format
+msgid "Delete this photo/video from camera?"
+msgid_plural "Delete these %d photos/videos from camera?"
+msgstr[0] "Удалить %d фотографию/видеофайл из камеры?"
+msgstr[1] "Удалить %d фотографии/видеофайла из камеры?"
+msgstr[2] "Удалить %d фотографий/видеофайлов из камеры?"
+
+#: ../src/camera/ImportPage.vala:1733
+#, c-format
+msgid "Delete these files from camera?"
+msgid_plural "Delete these %d files from camera?"
+msgstr[0] "Удалить %d файл из камеры?"
+msgstr[1] "Удалить эти %d файла из камеры? "
+msgstr[2] "Удалить эти %d файлов из камеры?"
+
+#: ../src/camera/ImportPage.vala:1760
+msgid "Removing photos/videos from camera"
+msgstr "Удаление фотографий/видеофайлов из камеры"
+
+#: ../src/camera/ImportPage.vala:1764
+#, 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] "Невозможно удалить %d фотографию/видеофайл из камеры из-за ошибок."
+msgstr[1] "Невозможно удалить %d фотографии/видеофайла из камеры из-за ошибок."
+msgstr[2] ""
+"Невозможно удалить %d фотографий/видеофайлов из камеры из-за ошибок."
+
+#: ../src/data_imports/DataImports.vala:22
+msgid "Data Imports"
+msgstr "Импорт данных"
+
+#. Send an empty job to the queue to mark the end of the import
+#: ../src/data_imports/DataImportsPluginHost.vala:65
+#: ../src/data_imports/DataImportsPluginHost.vala:78
+#, c-format
+msgid "%s Database"
+msgstr "База данных %s"
+
+#: ../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 "Невозможно продолжить импортирование из %s из-за ошибки:"
+
+#: ../src/data_imports/DataImportsPluginHost.vala:151
+msgid "To try importing from another service, select one from the above menu."
+msgstr "Чтобы попробовать импорт из другой службы, выберите её из меню сверху."
+
+#: ../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 ""
+"Не активированы модули импорта.\n"
+"\n"
+"Для того, чтобы использовать функцию импортирования из приложения, требуется "
+"активировать по крайней мере один модуль импорта. Модули могут быть "
+"активированы в диалоговом окне «Настройки»."
+
+#: ../src/data_imports/DataImportsUI.vala:100
+msgid "Database file:"
+msgstr "Файл базы данных:"
+
+#: ../src/data_imports/DataImportsUI.vala:112
+#: ../src/library/LibraryWindow.vala:898
+msgid "_Import"
+msgstr "_Импортировать"
+
+#: ../src/data_imports/DataImportsUI.vala:217
+msgid "Import From Application"
+msgstr "Импортировать из приложения"
+
+#: ../src/data_imports/DataImportsUI.vala:369
+#: ../src/publishing/PublishingUI.vala:470
+msgid "_Close"
+msgstr "_Закрыть"
+
+#: ../src/db/DatabaseTable.vala:37
+#, c-format
+msgid "Unable to open/create photo database %s: error code %d"
+msgstr "Невозможно открыть/создать базу данных фото %s: код ошибки %d"
+
+#: ../src/db/DatabaseTable.vala:46
+#, c-format
+msgid ""
+"Unable to write to photo database file:\n"
+" %s"
+msgstr ""
+"Невозможно записать в файл базы данных фотографий:\n"
+" %s"
+
+#: ../src/db/DatabaseTable.vala:48
+#, c-format
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
+msgstr ""
+"Ошибка доступа к файлу базы данных:\n"
+" %s\n"
+"\n"
+"Ошибка: \n"
+"%s"
+
+#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:351
+msgid "_File"
+msgstr "_Файл"
+
+#: ../src/direct/DirectPhotoPage.vala:52
+msgid "Save photo"
+msgstr "Сохранить снимок"
+
+#: ../src/direct/DirectPhotoPage.vala:57
+msgid "Save _As..."
+msgstr "Сохранить _как…"
+
+#: ../src/direct/DirectPhotoPage.vala:58
+msgid "Save photo with a different name"
+msgstr "Сохранить снимок под другим именем"
+
+#: ../src/direct/DirectPhotoPage.vala:69
+msgid "Print the photo to a printer connected to your computer"
+msgstr "Распечатать фото на принтере"
+
+#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:363
+msgid "_Photo"
+msgstr "_Фото"
+
+#: ../src/direct/DirectPhotoPage.vala:227
+#, c-format
+msgid "%s does not exist."
+msgstr "%s не существует."
+
+#: ../src/direct/DirectPhotoPage.vala:229
+#, c-format
+msgid "%s is not a file."
+msgstr "%s не является файлом."
+
+#: ../src/direct/DirectPhotoPage.vala:231
+#, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
+msgstr ""
+"%s не поддерживает формат файла\n"
+"%s."
+
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save a Copy"
+msgstr "Сохранить _копию"
+
+#: ../src/direct/DirectPhotoPage.vala:425
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "Отменить изменения %s?"
+
+#: ../src/direct/DirectPhotoPage.vala:426
+msgid "Close _without Saving"
+msgstr "Закрыть _без сохранения"
+
+#: ../src/direct/DirectPhotoPage.vala:459
+#, c-format
+msgid "Error while saving to %s: %s"
+msgstr "Ошибка при сохранении в %s: %s"
+
+#: ../src/direct/DirectPhotoPage.vala:487
+#: ../src/direct/DirectPhotoPage.vala:508
+msgid "Save As"
+msgstr "Сохранить как"
+
+#: ../src/editing_tools/EditingTools.vala:665
 msgid "Return to current photo dimensions"
 msgstr "Вернуться к текущим размерам фото"
 
-#: src/editing_tools/EditingTools.vala:664
+#: ../src/editing_tools/EditingTools.vala:668
 msgid "Set the crop for this photo"
 msgstr "Установить рамку обрезки для фото"
 
-#: src/editing_tools/EditingTools.vala:676
+#: ../src/editing_tools/EditingTools.vala:680
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
-msgstr "Вращать прямоугольник обрезки при изменении ориентации."
+msgstr ""
+"Изменение ориентации прямоугольника подрезки на портретную или альбомную"
 
-#: src/editing_tools/EditingTools.vala:749
+#: ../src/editing_tools/EditingTools.vala:753
 msgid "Unconstrained"
 msgstr "Незакреплённый"
 
-#: src/editing_tools/EditingTools.vala:750
+#: ../src/editing_tools/EditingTools.vala:754
 msgid "Square"
 msgstr "Квадрат"
 
-#: src/editing_tools/EditingTools.vala:751
+#: ../src/editing_tools/EditingTools.vala:755
 msgid "Screen"
 msgstr "Экран"
 
-#: src/editing_tools/EditingTools.vala:752
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
-msgid "Original Size"
-msgstr "Фактический размер"
-
-#: src/editing_tools/EditingTools.vala:753
-#: src/editing_tools/EditingTools.vala:756
-#: src/editing_tools/EditingTools.vala:766
-#: src/editing_tools/EditingTools.vala:776
+#: ../src/editing_tools/EditingTools.vala:757
+#: ../src/editing_tools/EditingTools.vala:760
+#: ../src/editing_tools/EditingTools.vala:770
+#: ../src/editing_tools/EditingTools.vala:780
 msgid "-"
-msgstr "-"
+msgstr "—"
 
-#: src/editing_tools/EditingTools.vala:754
+#: ../src/editing_tools/EditingTools.vala:758
 msgid "SD Video (4 : 3)"
 msgstr "Видео SD (4 : 3)"
 
-#: src/editing_tools/EditingTools.vala:755
+#: ../src/editing_tools/EditingTools.vala:759
 msgid "HD Video (16 : 9)"
 msgstr "Видео HD (16 : 9)"
 
-#: src/editing_tools/EditingTools.vala:762
+#: ../src/editing_tools/EditingTools.vala:766
 msgid "Letter (8.5 x 11 in.)"
 msgstr "Letter (8.5 x 11 дюймов)"
 
-#: src/editing_tools/EditingTools.vala:764
+#: ../src/editing_tools/EditingTools.vala:768
 msgid "Tabloid (11 x 17 in.)"
 msgstr "Tabloid (11 x 17 дюймов)"
 
-#: src/editing_tools/EditingTools.vala:771
+#: ../src/editing_tools/EditingTools.vala:775
 msgid "A4 (210 x 297 mm)"
 msgstr "A4 (210 x 297 мм)"
 
-#: src/editing_tools/EditingTools.vala:775
+#: ../src/editing_tools/EditingTools.vala:779
 msgid "A3 (297 x 420 mm)"
 msgstr "A3 (297 x 420 мм)"
 
-#: src/editing_tools/EditingTools.vala:1865
+#: ../src/editing_tools/EditingTools.vala:1905
 msgid "Close the red-eye tool"
-msgstr "Закрыть «Удаление «красных глаз»"
+msgstr "Закрыть инструмент «Удаление эффекта «красных глаз»"
 
-#: src/editing_tools/EditingTools.vala:1868
+#: ../src/editing_tools/EditingTools.vala:1908
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Удаление эффекта «красных глаз» на выбранной области"
 
-#: src/editing_tools/EditingTools.vala:2226
+#: ../src/editing_tools/EditingTools.vala:2244
+#: ../src/editing_tools/StraightenTool.vala:102
+msgid "_Reset"
+msgstr "_Сброс"
+
+#: ../src/editing_tools/EditingTools.vala:2266
 msgid "Saturation:"
 msgstr "Насыщенность:"
 
-#: src/editing_tools/EditingTools.vala:2234
+#: ../src/editing_tools/EditingTools.vala:2274
 msgid "Tint:"
 msgstr "Оттенок:"
 
-#: src/editing_tools/EditingTools.vala:2243
+#: ../src/editing_tools/EditingTools.vala:2283
 msgid "Temperature:"
 msgstr "Цветовая температура:"
 
-#: src/editing_tools/EditingTools.vala:2251
+#: ../src/editing_tools/EditingTools.vala:2291
 msgid "Shadows:"
 msgstr "Тени:"
 
-#: src/editing_tools/EditingTools.vala:2259
+#: ../src/editing_tools/EditingTools.vala:2299
 msgid "Highlights:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2313
+#: ../src/editing_tools/EditingTools.vala:2353
 msgid "Reset Colors"
 msgstr "Сбросить цвета"
 
-#: src/editing_tools/EditingTools.vala:2313
+#: ../src/editing_tools/EditingTools.vala:2353
 msgid "Reset all color adjustments to original"
-msgstr "Возврат к оригиналу"
+msgstr "Сбросить настройки цвета на исходные"
 
-#: src/editing_tools/EditingTools.vala:2665
+#: ../src/editing_tools/EditingTools.vala:2705
 msgid "Temperature"
 msgstr "Цветовая температура"
 
-#: src/editing_tools/EditingTools.vala:2678
+#: ../src/editing_tools/EditingTools.vala:2718
 msgid "Tint"
 msgstr "Оттенок"
 
-#: src/editing_tools/EditingTools.vala:2691
+#: ../src/editing_tools/EditingTools.vala:2731
 msgid "Saturation"
 msgstr "Насыщенность"
 
-#: src/editing_tools/EditingTools.vala:2704
+#: ../src/editing_tools/EditingTools.vala:2744
 msgid "Exposure"
 msgstr "Выдержка"
 
-#: src/editing_tools/EditingTools.vala:2717
+#: ../src/editing_tools/EditingTools.vala:2757
 msgid "Shadows"
 msgstr "Тени"
 
-#: src/editing_tools/EditingTools.vala:2730
+#: ../src/editing_tools/EditingTools.vala:2770
 msgid "Highlights"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2740
+#: ../src/editing_tools/EditingTools.vala:2780
 msgid "Contrast Expansion"
 msgstr "Расширение контрастности"
 
-#: src/AppWindow.vala:49
-msgid "Pin Toolbar"
-msgstr "Прикрепить панель инструментов"
+#: ../src/editing_tools/StraightenTool.vala:99
+msgid "Angle:"
+msgstr "Угол:"
 
-#: src/AppWindow.vala:50
-msgid "Pin the toolbar open"
-msgstr "Прикрепить панель инструментов"
+#: ../src/events/EventDirectoryItem.vala:83
+#, c-format
+msgid "%d Photo/Video"
+msgid_plural "%d Photos/Videos"
+msgstr[0] "%d фотография/видео"
+msgstr[1] "%d фотографии/видео"
+msgstr[2] "%d фотографий/видео"
 
-#: src/AppWindow.vala:53 src/AppWindow.vala:131
-msgid "Leave fullscreen"
-msgstr "Выйти из полноэкранного режима"
+#: ../src/events/EventPage.vala:129
+msgid "No Event"
+msgstr "Нет события"
 
-#: src/AppWindow.vala:130
-msgid "Leave _Fullscreen"
-msgstr "Выйти из _полноэкранного режима"
+#: ../src/events/EventsDirectoryPage.vala:131
+msgid "Display the comment of each event"
+msgstr "Показывать комментарий по каждому событию"
 
-#: src/AppWindow.vala:491
-msgid "_Quit"
-msgstr "В_ыход"
+#: ../src/events/EventsDirectoryPage.vala:155
+msgid "No events"
+msgstr "Нет событий"
 
-#: src/AppWindow.vala:496
-msgid "_About"
-msgstr "_О программе"
+#: ../src/events/EventsDirectoryPage.vala:159
+msgid "No events found"
+msgstr "События не найдены"
 
-#: src/AppWindow.vala:501
-msgid "Fulls_creen"
-msgstr "_На весь экран"
+#: ../src/events/EventsDirectoryPage.vala:230
+msgid "Events"
+msgstr "События"
 
-#: src/AppWindow.vala:506
-msgid "_Contents"
-msgstr "_Содержание"
+#: ../src/events/EventsDirectoryPage.vala:244
+msgid "Undated"
+msgstr "Без даты"
 
-#: src/AppWindow.vala:511
-msgid "_Frequently Asked Questions"
-msgstr "_Часто задаваемые вопросы"
+#: ../src/events/EventsDirectoryPage.vala:245
+msgid "%Y"
+msgstr "%Y"
 
-#: src/AppWindow.vala:516
-msgid "_Report a Problem..."
-msgstr "_Сообщить о проблеме…"
+#: ../src/events/EventsDirectoryPage.vala:246
+msgid "%B"
+msgstr "%B"
 
-#: src/AppWindow.vala:663
-#, c-format
-msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
-"continue.\n"
-"\n"
-"%s"
-msgstr ""
-"При доступе к библиотеке Shotwell произошла критическая ошибка. Дальнейшая "
-"работа программы невозможна.\n"
-"\n"
-"%s"
+#: ../src/folders/Branch.vala:141
+msgid "Folders"
+msgstr "Папки"
 
-#: src/AppWindow.vala:683 plugins/common/Resources.vala:9
-msgid "Visit the Yorba web site"
-msgstr "Посетить сайт Yorba"
+#: ../src/library/Branch.vala:36 ../ui/shotwell.glade.h:32
+msgid "Library"
+msgstr "Библиотека"
 
-#: src/AppWindow.vala:686 plugins/common/Resources.vala:28
-msgid "translator-credits"
-msgstr ""
-"Oleg Koptev <koptev.oleg AT gmail.com>\n"
-"Yulia Poyarko <ypoyarko AT redhat.com>\n"
-"Misha Shnurapet <shnurapet AT fedoraproject.org>\n"
-"Марк Коренберг <socketpair AT gmail.com>"
+#: ../src/library/ImportQueuePage.vala:8
+msgid "Importing..."
+msgstr "Импортирование…"
 
-#: src/AppWindow.vala:695
-#, c-format
-msgid "Unable to display help: %s"
-msgstr "Не удалось отобразить справку: %s"
+#: ../src/library/ImportQueuePage.vala:67
+msgid "_Stop Import"
+msgstr "_Остановить импортирование"
 
-#: src/AppWindow.vala:703
-#, c-format
-msgid "Unable to navigate to bug database: %s"
-msgstr "Не удается перейти к ошибке базы данных: %s"
+#: ../src/library/ImportQueuePage.vala:68
+msgid "Stop importing photos"
+msgstr "Остановить импортирование фотографий"
+
+#: ../src/library/ImportQueuePage.vala:124
+msgid "Preparing to import..."
+msgstr "Подготовка к импортированию…"
 
-#: src/AppWindow.vala:711
+#: ../src/library/ImportQueuePage.vala:151
 #, c-format
-msgid "Unable to display FAQ: %s"
-msgstr "Не удалось отобразить ЧаВо: %s"
+msgid "Imported %s"
+msgstr "Импортировано %s"
 
-#: src/Tag.vala:817
-msgid "untitled"
-msgstr "безымянный"
+#: ../src/library/LastImportPage.vala:8
+msgid "Last Import"
+msgstr "Последнее импортированное"
 
-#: src/Dimensions.vala:17
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1250
-msgid "Original size"
-msgstr "Фактический размер"
+#: ../src/library/LibraryWindow.vala:301
+msgid "_Import From Folder..."
+msgstr "_Импортировать из папки…"
 
-#: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Ширина или высота"
+#: ../src/library/LibraryWindow.vala:302
+msgid "Import photos from disk to library"
+msgstr "Импортировать фотографии в библиотеку с диска "
 
-#: src/Dimensions.vala:23
-msgid "Width"
-msgstr "Ширина"
+#: ../src/library/LibraryWindow.vala:309
+msgid "Import From _Application..."
+msgstr "Импортировать из _приложения…"
 
-#: src/Dimensions.vala:26
-msgid "Height"
-msgstr "Высота"
+#: ../src/library/LibraryWindow.vala:313
+msgid "Sort _Events"
+msgstr "Сортировать _события"
 
-#: src/MediaPage.vala:143
-msgid "Adjust the size of the thumbnails"
-msgstr "Задать размер миниатюр"
+#: ../src/library/LibraryWindow.vala:323
+msgid "Empty T_rash"
+msgstr "Очистить _корзину"
 
-#: src/MediaPage.vala:326
-msgid "Increase the magnification of the thumbnails"
-msgstr "Увеличить размер миниатюр"
+#: ../src/library/LibraryWindow.vala:324
+msgid "Delete all photos in the trash"
+msgstr "Удалить все снимки в корзину"
 
-#: src/MediaPage.vala:332
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Уменьшить размер миниатюр"
+#: ../src/library/LibraryWindow.vala:329
+msgid "View Eve_nt for Photo"
+msgstr "Показать _событие для фото"
 
-#: src/MediaPage.vala:399
-msgid "Sort _Photos"
-msgstr "_Сортировать фотографии"
+#: ../src/library/LibraryWindow.vala:333
+msgid "_Find"
+msgstr "_Найти"
 
-#: src/MediaPage.vala:408
-msgid "_Play Video"
-msgstr "_Воспроизвести видео"
+#: ../src/library/LibraryWindow.vala:334
+msgid "Find photos and videos by search criteria"
+msgstr "Найти фото и видео по заданным критериям"
 
-#: src/MediaPage.vala:409
-msgid "Open the selected videos in the system video player"
-msgstr "Открыть выбранное видео в системном видеопроигрывателе"
+#: ../src/library/LibraryWindow.vala:345 ../src/searches/Branch.vala:77
+#: ../src/sidebar/Tree.vala:184
+msgid "Ne_w Saved Search..."
+msgstr "Создать и сохранить поисковый запрос"
 
-#: src/MediaPage.vala:442 src/events/EventsDirectoryPage.vala:130
-msgid "_Comments"
-msgstr "_Комментарии"
+#: ../src/library/LibraryWindow.vala:367
+msgid "_Photos"
+msgstr "_Фотографии"
 
-#: src/MediaPage.vala:443
-msgid "Display the comment of each photo"
-msgstr "Показывать комментарий для каждого фото"
+#: ../src/library/LibraryWindow.vala:371
+msgid "Even_ts"
+msgstr "Со_бытия"
 
-#: src/MediaPage.vala:455
-msgid "Display each photo's tags"
-msgstr "Показывать все метки фотографии"
+#: ../src/library/LibraryWindow.vala:390
+msgid "_Basic Information"
+msgstr "_Основная информация"
 
-#: src/MediaPage.vala:471
-msgid "By _Title"
-msgstr "По _названию"
+#: ../src/library/LibraryWindow.vala:391
+msgid "Display basic information for the selection"
+msgstr "Показать основную информацию о выделенных элементах"
 
-#: src/MediaPage.vala:472
-msgid "Sort photos by title"
-msgstr "Сортировать по названию"
+#: ../src/library/LibraryWindow.vala:396
+msgid "E_xtended Information"
+msgstr "_Расширенная информация"
 
-#: src/MediaPage.vala:477
-msgid "By Exposure _Date"
-msgstr "По дате _съёмки"
+#: ../src/library/LibraryWindow.vala:397
+msgid "Display extended information for the selection"
+msgstr "Показать расширенную информацию о выделенных элементах"
 
-#: src/MediaPage.vala:478
-msgid "Sort photos by exposure date"
-msgstr "Сортировать по дате съёмки"
+#: ../src/library/LibraryWindow.vala:402
+msgid "_Search Bar"
+msgstr "П_анель поиска"
 
-#: src/MediaPage.vala:483
-msgid "By _Rating"
-msgstr "По _рейтингу"
+#: ../src/library/LibraryWindow.vala:403
+msgid "Display the search bar"
+msgstr "Показывать панель поиска"
 
-#: src/MediaPage.vala:484
-msgid "Sort photos by rating"
-msgstr "Сортировать по рейтингу"
+#: ../src/library/LibraryWindow.vala:408
+msgid "S_idebar"
+msgstr "Б_оковая панель"
 
-#: src/MediaPage.vala:702
+#: ../src/library/LibraryWindow.vala:409
+msgid "Display the sidebar"
+msgstr "Показывать боковую панель"
+
+#: ../src/library/LibraryWindow.vala:667
+msgid "Import From Folder"
+msgstr "Импортировать из папки"
+
+#: ../src/library/LibraryWindow.vala:736
+msgid "Empty Trash"
+msgstr "Очистить корзину"
+
+#: ../src/library/LibraryWindow.vala:736
+msgid "Emptying Trash..."
+msgstr "Очистка корзины…"
+
+#: ../src/library/LibraryWindow.vala:895
 #, c-format
 msgid ""
-"Shotwell was unable to play the selected video:\n"
-"%s"
+"Shotwell is configured to import photos to your home directory.\n"
+"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
+"span>.\n"
+"Do you want to continue importing photos?"
 msgstr ""
-"Shotwell не может воспроизвести выбранное видео:\n"
-"%s"
 
-#: src/events/EventDirectoryItem.vala:83
+#: ../src/library/LibraryWindow.vala:898 ../ui/shotwell.glade.h:18
+msgid "Library Location"
+msgstr "Расположение библиотеки"
+
+#. TODO: Specify which directory/file.
+#: ../src/library/LibraryWindow.vala:911
+msgid "Photos cannot be imported from this directory."
+msgstr "Фотографии не могут быть импортированы из этого каталога."
+
+#: ../src/library/LibraryWindow.vala:1199
 #, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] "%d фото/видео"
-msgstr[1] "%d фото/видео"
-msgstr[2] "%d фото/видео"
+msgid "%s (%d%%)"
+msgstr "%s (%d%%)"
 
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Показывать комментарий по каждому событию"
+#: ../src/library/LibraryWindow.vala:1243
+#: ../src/library/LibraryWindow.vala:1254
+msgid "Updating library..."
+msgstr "Обновление библиотеки…"
 
-#: src/events/EventsDirectoryPage.vala:155
-msgid "No events"
-msgstr "Нет событий"
+#: ../src/library/LibraryWindow.vala:1260
+msgid "Preparing to auto-import photos..."
+msgstr "Подготовка к авто-импортированию…"
 
-#: src/events/EventsDirectoryPage.vala:159
-msgid "No events found"
-msgstr "События не найдены"
+#: ../src/library/LibraryWindow.vala:1265
+msgid "Auto-importing photos..."
+msgstr "Авто-импортирование фотографий…"
 
-#: src/events/EventsDirectoryPage.vala:230
-msgid "Events"
-msgstr "События"
+#: ../src/library/LibraryWindow.vala:1273
+msgid "Writing metadata to files..."
+msgstr "Запись метаданных в файлы…"
 
-#: src/events/EventsDirectoryPage.vala:244
-msgid "Undated"
-msgstr "Недатированный"
+#: ../src/library/OfflinePage.vala:8
+msgid "Missing Files"
+msgstr "Отсутствующие файлы"
 
-#: src/events/EventsDirectoryPage.vala:245
-msgid "%Y"
-msgstr "%Y"
+#: ../src/library/OfflinePage.vala:106
+msgid "Deleting..."
+msgstr "Удаление…"
 
-#: src/events/EventsDirectoryPage.vala:246
-msgid "%B"
-msgstr "%B"
+#: ../src/library/TrashPage.vala:8
+msgid "Trash"
+msgstr "Корзина"
 
-#: src/events/EventPage.vala:129
-msgid "No Event"
-msgstr "Вне событий"
+#: ../src/library/TrashPage.vala:108
+msgid "Trash is empty"
+msgstr "Корзина пуста"
 
-#: src/AppDirs.vala:48 src/AppDirs.vala:99
-#, c-format
-msgid "Unable to create cache directory %s: %s"
-msgstr "Невозможно создать каталог кэша %s: %s"
+#: ../src/library/TrashPage.vala:112
+msgid "Delete"
+msgstr "Удалить"
 
-#: src/AppDirs.vala:58 src/AppDirs.vala:88
+#: ../src/library/TrashPage.vala:113
+msgid "Deleting Photos"
+msgstr "Удаление фотографий"
+
+#: ../src/main.vala:54
 #, c-format
-msgid "Unable to create data directory %s: %s"
-msgstr "Невозможно создать каталог %s: %s"
+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 ""
+"Ваша библиотека фотографий не совместима с этой версией Shotwell. Судя по "
+"всему, она создана версией Shotwell %s (сборка %d). Текущая версия программы "
+"%s (сборка %d). Установите последнюю версию Shotwell."
 
-#: src/AppDirs.vala:152
-msgid "Pictures"
-msgstr "Изображения"
+#: ../src/main.vala:59
+#, 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 ""
+"Shotwell не удалось обновить вашу библиотеку фото с версии %s (сборка %d) на "
+"%s (сборка %d). Для получения дополнительной информации, ознакомьтесь с wiki "
+"Shotwell, находящуюся по адресу %s"
 
-#: src/AppDirs.vala:190
+#: ../src/main.vala:65
 #, c-format
-msgid "Unable to create temporary directory %s: %s"
-msgstr "Невозможно создать временный каталог %s: %s"
+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 ""
+"Ваша библиотека фотографий не совместима с этой версией Shotwell. Судя по "
+"всему, она создана версией %s (сборка %d). Текущая версия %s (сборка %d). "
+"Очистите библиотеку, удалив %s и повторно импортируйте свои фото."
 
-#: src/AppDirs.vala:207 src/AppDirs.vala:223
+#: ../src/main.vala:71
 #, c-format
-msgid "Unable to create data subdirectory %s: %s"
-msgstr "Невозможно создать подкаталог %s: %s"
+msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgstr "Неизвестная ошибка при попытке проверки базы данных Shotwell: %s"
 
-#: src/slideshow/TransitionEffects.vala:98
-msgid "(None)"
-msgstr "(Ничего)"
+#: ../src/main.vala:104
+msgid "Loading Shotwell"
+msgstr "Загрузка Shotwell"
 
-#: src/slideshow/TransitionEffects.vala:287
-msgid "None"
-msgstr "Ничего"
+#: ../src/main.vala:294
+msgid "Path to Shotwell's private data"
+msgstr "Путь к базе персональных данных Shotwell"
 
-#: src/slideshow/TransitionEffects.vala:339
-msgid "Random"
-msgstr "Случайно"
+#: ../src/main.vala:294
+msgid "DIRECTORY"
+msgstr "КАТАЛОГ"
 
-#: src/slideshow/Slideshow.vala:22
-msgid "Slideshow Transitions"
-msgstr "Эффекты перехода"
+#: ../src/main.vala:298
+msgid "Do not monitor library directory at runtime for changes"
+msgstr "Не отслеживать изменения в каталоге библиотеки во время работы"
 
-#: src/Exporter.vala:232
+#: ../src/main.vala:302
+msgid "Don't display startup progress meter"
+msgstr "Не показывать анимированный индикатор прогресса при старте программы"
+
+#: ../src/main.vala:306
+msgid "Show the application's version"
+msgstr "Показать версию приложения"
+
+#. init GTK (valac has already called g_threads_init())
+#: ../src/main.vala:338
+msgid "[FILE]"
+msgstr "[FILE]"
+
+#: ../src/main.vala:342
 #, c-format
-msgid "Unable to generate a temporary file for %s: %s"
-msgstr "Не удается создать временный файл для %s: %s"
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Введите «%s --help» для просмотра полного списка параметров командной "
+"строки.\n"
 
-#: src/Exporter.vala:299
-msgid "Exporting"
-msgstr "Экспортирование"
+#: ../src/photos/BmpSupport.vala:32
+msgid "BMP"
+msgstr "BMP"
+
+#: ../src/photos/JfifSupport.vala:84
+msgid "JPEG"
+msgstr "JPEG"
 
-#: src/Exporter.vala:317
+#: ../src/photos/JfifSupport.vala:185
 #, c-format
-msgid "File %s already exists.  Replace?"
-msgstr "Файл %s уже существует. Заменить?"
+msgid "Low (%d%%)"
+msgstr "Низкое (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "_Skip"
-msgstr "_Пропустить"
+#: ../src/photos/JfifSupport.vala:188
+#, c-format
+msgid "Medium (%d%%)"
+msgstr "Среднее (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "_Replace"
-msgstr "_Заменить"
+#: ../src/photos/JfifSupport.vala:191
+#, c-format
+msgid "High (%d%%)"
+msgstr "Высокое (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "Replace _All"
-msgstr "Заменить вс_ё"
+#: ../src/photos/JfifSupport.vala:194
+#, c-format
+msgid "Maximum (%d%%)"
+msgstr "Максимум (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "Export"
-msgstr "Экспортирование"
+#: ../src/photos/PngSupport.vala:30
+msgid "PNG"
+msgstr "PNG"
 
-#: src/SearchFilter.vala:593 src/SearchFilter.vala:594
-msgid "Photos"
-msgstr "Фотографии"
+#: ../src/photos/RawSupport.vala:134
+msgid "RAW"
+msgstr "RAW"
 
-#: src/SearchFilter.vala:599 src/SearchFilter.vala:600
-msgid "Videos"
-msgstr "Видео"
+#: ../src/photos/TiffSupport.vala:86
+msgid "TIFF"
+msgstr "TIFF"
 
-#: src/SearchFilter.vala:605
-msgid "RAW Photos"
-msgstr "Изображения RAW"
+#: ../src/publishing/Publishing.vala:16
+msgid "Publishing"
+msgstr "Публикация"
 
-#: src/SearchFilter.vala:606
-msgid "RAW photos"
-msgstr "Изображения RAW"
+#: ../src/publishing/PublishingPluginHost.vala:11
+msgid "Preparing for upload"
+msgstr "Подготовка к отправке"
 
-#: src/SearchFilter.vala:952
+#: ../src/publishing/PublishingPluginHost.vala:12
 #, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Не удалось загрузить файл интерфейса %s: %s"
+msgid "Uploading %d of %d"
+msgstr "Отправка %d из %d"
 
-#: src/SearchFilter.vala:969
-msgid "Type"
-msgstr "Тип"
+#: ../src/publishing/PublishingPluginHost.vala:81
+#, c-format
+msgid "Publishing to %s can't continue because an error occurred:"
+msgstr "Не удалось опубликовать на %s из-за ошибки:"
 
-#: src/publishing/Publishing.vala:16
-msgid "Publishing"
-msgstr "Публикация"
+#: ../src/publishing/PublishingPluginHost.vala:84
+msgid "To try publishing to another service, select one from the above menu."
+msgstr "Для публикации на другом сервисе, выберите его ниже."
 
-#: src/publishing/PublishingUI.vala:105
+#: ../src/publishing/PublishingUI.vala:105
 msgid "The selected photos/videos were successfully published."
 msgstr "Выбранные фото/видео были успешно опубликованы."
 
-#: src/publishing/PublishingUI.vala:107
+#: ../src/publishing/PublishingUI.vala:107
 msgid "The selected videos were successfully published."
 msgstr "Выбранные видеоклипы были успешно опубликованы."
 
-#: src/publishing/PublishingUI.vala:109
+#: ../src/publishing/PublishingUI.vala:109
 msgid "The selected photos were successfully published."
 msgstr "Выбранные фотографии были успешно опубликованы."
 
-#: src/publishing/PublishingUI.vala:112
+#: ../src/publishing/PublishingUI.vala:112
 msgid "The selected video was successfully published."
 msgstr "Выбранные видеофайлы были успешно опубликованы."
 
-#: src/publishing/PublishingUI.vala:114
+#: ../src/publishing/PublishingUI.vala:114
 msgid "The selected photo was successfully published."
 msgstr "Выбранные изображения были успешно опубликованы."
 
-#: src/publishing/PublishingUI.vala:122
+#: ../src/publishing/PublishingUI.vala:122
 msgid "Fetching account information..."
 msgstr "Получение информации об учётной записи…"
 
-#: src/publishing/PublishingUI.vala:128
+#: ../src/publishing/PublishingUI.vala:128
 msgid "Logging in..."
 msgstr "Вход…"
 
-#: src/publishing/PublishingUI.vala:183
+#: ../src/publishing/PublishingUI.vala:185
 msgid "Publish Photos"
 msgstr "Публикация фотографий"
 
-#: src/publishing/PublishingUI.vala:184
+#: ../src/publishing/PublishingUI.vala:186
 msgid "Publish photos _to:"
 msgstr "Опубликовать фотографии _на:"
 
-#: src/publishing/PublishingUI.vala:186
+#: ../src/publishing/PublishingUI.vala:188
 msgid "Publish Videos"
 msgstr "Публикация видео"
 
-#: src/publishing/PublishingUI.vala:187
+#: ../src/publishing/PublishingUI.vala:189
 msgid "Publish videos _to"
 msgstr "Опубликовать видео _на"
 
-#: src/publishing/PublishingUI.vala:189
+#: ../src/publishing/PublishingUI.vala:191
 msgid "Publish Photos and Videos"
 msgstr "Публикация фотографий и видео"
 
-#: src/publishing/PublishingUI.vala:190
+#: ../src/publishing/PublishingUI.vala:192
 msgid "Publish photos and videos _to"
-msgstr "Опубликовать видео и фотографии  _на"
+msgstr "Опубликовать видео и фотографии _на"
 
-#: src/publishing/PublishingUI.vala:383
+#. There are no enabled publishing services that accept this media type,
+#. warn the user.
+#: ../src/publishing/PublishingUI.vala:360
 msgid "Unable to publish"
 msgstr "Невозможно опубликовать"
 
-#: src/publishing/PublishingUI.vala:384
+#: ../src/publishing/PublishingUI.vala:361
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -3748,968 +4761,398 @@ msgstr ""
 "Shotwell не может опубликовать выделенные элементы поскольку у Вас нет "
 "активированных подходящих модулей публикации. Для того чтобы это исправить, "
 "выберите <b>Правка %s Параметры</b> и активируйте один или несколько модулей "
-"публикации на вкладке  <b>Модули</b>."
-
-#: src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr "Подготовка к загрузке"
-
-#: src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
-msgstr "Загрузка файла %d из %d"
-
-#: src/publishing/PublishingPluginHost.vala:81
-#, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
-msgstr "Не удалось опубликовать на %s из-за ошибки:"
-
-#: src/publishing/PublishingPluginHost.vala:84
-msgid "To try publishing to another service, select one from the above menu."
-msgstr "Для публикации на другом сервисе, выберите его ниже."
+"публикации на вкладке <b>Модули</b>."
 
-#: src/sidebar/Tree.vala:199
-msgid "New _Tag..."
-msgstr "Новая _метка…"
-
-#: plugins/common/RESTSupport.vala:424
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:971
-#, fuzzy
-msgid "A temporary file needed for publishing is unavailable"
-msgstr ""
-"Временный файл, необходимый для публикации недоступен"
-
-#: plugins/common/RESTSupport.vala:1138
-msgid ""
-"You have already logged in and out of a Google service during this Shotwell "
-"session.\n"
-"\n"
-"To continue publishing to Google services, quit and restart Shotwell, then "
-"try publishing again."
-msgstr ""
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:57
-msgid ""
-"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 ""
-"Вы не вошли на YouTube.\n"
-"\n"
-"Чтобы продолжить, вам необходима учётная запись Google, имеющая привязку к "
-"YouTube. Можно связать учётные записи после первого входа на сайт YouTube в "
-"браузере."
+#: ../src/searches/Branch.vala:68
+msgid "Saved Searches"
+msgstr "Сохранённые поисковые запросы"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:362
-msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
-"continue."
-msgstr ""
-"Файл, необходимый для публикации недоступен. Публикация на Youtube "
-"невозможна."
+#. Ordering must correspond with SearchConditionText.Context
+#: ../src/searches/SavedSearchDialog.vala:168
+msgid "contains"
+msgstr "содержит"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:461
-#, c-format
-msgid "You are logged into YouTube as %s."
-msgstr "Вы зашли на YouTube как %s."
+#. Ordering must correspond with Context
+#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:500
+msgid "is exactly"
+msgstr "точно"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:463
-#, c-format
-msgid "Videos will appear in '%s'"
-msgstr "Видео появятся в «%s»"
+#: ../src/searches/SavedSearchDialog.vala:170
+msgid "starts with"
+msgstr "начинается с"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:495
-msgid "Public listed"
-msgstr "Общедоступное"
+#: ../src/searches/SavedSearchDialog.vala:171
+msgid "ends with"
+msgstr "оканчивается на"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
-msgid "Public unlisted"
-msgstr "Не общедоступное"
+#: ../src/searches/SavedSearchDialog.vala:172
+msgid "does not contain"
+msgstr "не содержит"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
-msgid "Private"
-msgstr "Личное"
+#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:504
+msgid "is not set"
+msgstr "не задано"
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr "Основные сервисы публикации"
+#: ../src/searches/SavedSearchDialog.vala:174
+msgid "is set"
+msgstr "задано"
 
-#: 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."
+#. Ordering must correspond with SearchConditionMediaType.Context
+#: ../src/searches/SavedSearchDialog.vala:248
+#: ../src/searches/SavedSearchDialog.vala:379
+#: ../src/searches/SavedSearchDialog.vala:444
+msgid "is"
 msgstr ""
-"Вы не авторизовались на Flickr.\n"
-"\n"
-"Нажмите кнопку «Войти» для входа на Flickr с помощью веб-браузера. Вам будет "
-"нужно разрешить подключение Shotwell для связи с вашей учетной записи Flickr."
 
-#: 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."
+#: ../src/searches/SavedSearchDialog.vala:249
+msgid "is not"
 msgstr ""
-"Вы уже выходили из Flickr во время этой сессии Shotwell.\n"
-"Для продолжения публикации на Flickr, перезапустите Shotwell и попробуйте "
-"снова."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:375
-msgid "Preparing for login..."
-msgstr "Подготовка к входу…"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:595
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can't "
-"continue."
-msgstr ""
-"Файл, необходимый для публикации недоступен. Публикация в Flickr невозможна."
+#. Ordering must correspond with SearchConditionMediaType.MediaType
+#: ../src/searches/SavedSearchDialog.vala:255
+msgid "any photo"
+msgstr "любое фото"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "Проверка прав доступа…"
+#: ../src/searches/SavedSearchDialog.vala:256
+msgid "a raw photo"
+msgstr "цифровой негатив"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1153
-#, c-format
-msgid ""
-"You are logged into Flickr as %s.\n"
-"\n"
-msgstr ""
-"Вы зашли на Flickr как %s.\n"
-"\n"
+#: ../src/searches/SavedSearchDialog.vala:257
+msgid "a video"
+msgstr "видео"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
-#, 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."
+#: ../src/searches/SavedSearchDialog.vala:311
+msgid "has"
 msgstr ""
-"Бесплатная учётная запись Flickr имеет ограничение по количеству загрузок\n"
-"в месяц. На этот месяц у вас имеется квота в %d мегабайт."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1157
-msgid "Your Flickr Pro account entitles you to unlimited uploads."
+#: ../src/searches/SavedSearchDialog.vala:312
+msgid "has no"
 msgstr ""
-"Ваша подписка Flickr Pro позволяет вам делать неограниченное количество "
-"загрузок."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1162
-msgid "Photos _visible to:"
-msgstr "Снимки _видимы для:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
-msgid "Videos _visible to:"
-msgstr "Видео _видимы для:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1167
-msgid "Photos and videos _visible to:"
-msgstr "Фото и видео _видимы для:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1234
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1182
-msgid "Everyone"
-msgstr "Всем"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
-msgid "Friends & family only"
-msgstr "Только друзьям и семье"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-msgid "Family only"
-msgstr "Только семье"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
-msgid "Friends only"
-msgstr "Только друзьям"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1180
-msgid "Just me"
-msgstr "Только мне"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1229
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1246
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "500 x 375 pixels"
-msgstr "500 x 375 пикселей"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1230
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1247
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:108
-msgid "1024 x 768 pixels"
-msgstr "1024 x 768 пикселей"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1248
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 пикселей"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1249
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 пикселей"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:746
-#, c-format
-msgid "Creating album %s..."
-msgstr "Создаётся альбом %s..."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:917
-msgid "An error message occurred when publishing to Piwigo. Please try again."
-msgstr "Ошибка публикации в Piwigo. Попробуйте ещё раз."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:998
-msgid ""
-"Enter the URL of your Piwigo photo library as well as the username and "
-"password associated with your Piwigo account for that library."
-msgstr ""
-"Введите URL-адрес вашей фотобиблиотеки Piwigo, а также имя пользователя и "
-"пароль, связанные с вашей учётной записью на Piwigo."
+#: ../src/searches/SavedSearchDialog.vala:317
+msgid "modifications"
+msgstr "модификации"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:999
-msgid ""
-"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
-"entered"
-msgstr ""
-"Shotwell не удается связаться с Piwigo. Проверьте правильность введенного "
-"URL-адреса."
+#: ../src/searches/SavedSearchDialog.vala:318
+msgid "internal modifications"
+msgstr "внутренние модификации"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1000
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:590
-#, fuzzy
-msgid "Username and/or password invalid. Please try again"
-msgstr ""
-"Имя пользователя и/или пароль неверны. Пожалуйства, попытайтесь снова"
+#: ../src/searches/SavedSearchDialog.vala:319
+msgid "external modifications"
+msgstr "внешние модификации"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1032
-#, c-format
-msgid "Invalid URL"
-msgstr "Недопустимый URL"
+#. Ordering must correspond with SearchConditionFlagged.State
+#: ../src/searches/SavedSearchDialog.vala:373
+msgid "flagged"
+msgstr "отмеченные"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1037
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:620
-#, c-format
-msgid "Invalid User Name or Password"
-msgstr "Недопустимое имя пользователя или пароль"
+#: ../src/searches/SavedSearchDialog.vala:374
+msgid "not flagged"
+msgstr "не отмеченные"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1127
-#: plugins/shotwell-publishing/PicasaPublishing.vala:59
-#: plugins/shotwell-publishing/FacebookPublishing.vala:61
-msgid "Shotwell Connect"
-msgstr "Менеджер подключений Shotwell"
+#: ../src/searches/SavedSearchDialog.vala:437
+msgid "and higher"
+msgstr "и выше"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1235
-msgid "Admins, Family, Friends, Contacts"
-msgstr "Администраторы, семья, друзья, контакты"
+#: ../src/searches/SavedSearchDialog.vala:438
+msgid "only"
+msgstr "только"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1236
-msgid "Admins, Family, Friends"
-msgstr "Администраторы, семья, друзья"
+#: ../src/searches/SavedSearchDialog.vala:439
+msgid "and lower"
+msgstr "и ниже"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1237
-msgid "Admins, Family"
-msgstr "Администраторы, семья"
+#: ../src/searches/SavedSearchDialog.vala:501
+msgid "is after"
+msgstr "после"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1238
-msgid "Admins"
-msgstr "Администраторы"
+#: ../src/searches/SavedSearchDialog.vala:502
+msgid "is before"
+msgstr "перед"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:58
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have "
-"to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
-"Вы не авторизовались в Picasa Web Albums.\n"
-"\n"
-"Нажмите кнопку «Войти» для входа в Picasa с помощью веб-браузера. Вам будет "
-"нужно разрешить подключение Shotwell для связи с вашей учетной записи Picasa."
+#: ../src/searches/SavedSearchDialog.vala:503
+msgid "is between"
+msgstr "между"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:361
-msgid ""
-"A file required for publishing is unavailable. Publishing to Picasa can't "
-"continue."
-msgstr ""
-"Файл, необходимый для публикации недоступен. Публикация в Picasa невозможна."
+#: ../src/searches/SavedSearchDialog.vala:516
+msgid "and"
+msgstr "и"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
-#: plugins/shotwell-publishing/FacebookPublishing.vala:347
-msgid "Creating album..."
-msgstr "Создание альбома..."
+#: ../src/searches/SavedSearchDialog.vala:695
+msgid "Search"
+msgstr "Поиск"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:659
-#, c-format
-msgid "You are logged into Picasa Web Albums as %s."
-msgstr "Вы вошли в альбомы Picasa как %s."
+#: ../src/searches/SavedSearchDialog.vala:700
+msgid "Cancel"
+msgstr "Отмена"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
-msgid "Videos will appear in:"
-msgstr "Видео появятся в:"
+#: ../src/searches/SavedSearchDialog.vala:701
+msgid "OK"
+msgstr "ОК"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:670
-msgid "Photos will appear in:"
-msgstr "Фото будут расположены в:"
+#: ../src/searches/SavedSearchDialog.vala:719
+msgid "any"
+msgstr "любой"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "Маленький (640х480 пикселей)"
+#: ../src/searches/SavedSearchDialog.vala:720
+msgid "all"
+msgstr "все"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "Средний (1024х768 пикселей)"
+#: ../src/searches/SavedSearchDialog.vala:721
+msgid "none"
+msgstr "ни один"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Рекомендуемый (1600х1200 пикселей)"
+#: ../src/searches/SearchBoolean.vala:157
+msgid "Any text"
+msgstr "Любой текст"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Google+ (2048 x 1536 пикселей)"
+#: ../src/searches/SearchBoolean.vala:160
+msgid "Title"
+msgstr "Название"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:63
-msgid ""
-"You are not currently logged into Facebook.\n"
-"\n"
-"If you don't yet have a Facebook account, you can create one during the "
-"login process. During login, Shotwell Connect may ask you for permission to "
-"upload photos and publish to your feed. These permissions are required for "
-"Shotwell Connect to function."
-msgstr ""
-"Вы не авторизовались в Facebook.\n"
-"\n"
-"Если у вас ещё нет учётной записи Facebook, вы сможете создать её в процессе "
-"авторизации. Во время авторизации менеджер подключений может запросить "
-"разрешение на выгрузку фото и публикацию их в вашей галерее. Это необходимо "
-"для работы менеджера."
+#: ../src/searches/SearchBoolean.vala:163
+msgid "Tag"
+msgstr "Метка"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:65
-msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Вы уже входили в Facebook в течение этой сессии.\n"
-"Для продолжения публикации на Facebook, перезапустите Shotwell и повторите "
-"попытку."
+#: ../src/searches/SearchBoolean.vala:166
+msgid "Comment"
+msgstr "Комментарий"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:86
-msgid "Standard (720 pixels)"
-msgstr "Стандарт (720 пикселов)"
+#: ../src/searches/SearchBoolean.vala:169
+msgid "Event name"
+msgstr "Название события"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:89
-msgid "Large (2048 pixels)"
-msgstr "Большой (2048 пикселов)"
+#: ../src/searches/SearchBoolean.vala:172
+msgid "File name"
+msgstr "Имя файла"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:254
-msgid "Testing connection to Facebook..."
-msgstr "Проверка подключения к Facebook..."
+#: ../src/searches/SearchBoolean.vala:175
+msgid "Media type"
+msgstr "Тип носителя"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:374
-msgid ""
-"A file required for publishing is unavailable. Publishing to Facebook can't "
-"continue."
-msgstr ""
-"Файл, необходимый для публикации недоступен. Публикация в Facebook "
-"невозможна."
+#: ../src/searches/SearchBoolean.vala:178
+msgid "Flag state"
+msgstr "Состояние обозначения"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1019
-#, c-format
-msgid ""
-"You are logged into Facebook as %s.\n"
-"\n"
+#: ../src/searches/SearchBoolean.vala:181
+msgid "Photo state"
 msgstr ""
-"Вы зашли на Facebook как %s.\n"
-"\n"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1020
-msgid "Where would you like to publish the selected photos?"
-msgstr "Где бы вы хотели опубликовать выбранные фотографии?"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1021
-msgid "Upload _size:"
-msgstr "_Размеры выгруженного:"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1181
-msgid "Friends"
-msgstr "Друзья"
-
-#: plugins/shotwell-transitions/CrumbleEffect.vala:20
-msgid "Crumble"
-msgstr "Распад"
-
-#: plugins/shotwell-transitions/ChessEffect.vala:20
-msgid "Chess"
-msgstr "Шахматы"
-
-#: plugins/shotwell-transitions/CirclesEffect.vala:20
-msgid "Circles"
-msgstr "Круги"
-
-#: plugins/shotwell-transitions/BlindsEffect.vala:20
-msgid "Blinds"
-msgstr "Жалюзи"
-
-#: plugins/shotwell-transitions/StripesEffect.vala:20
-msgid "Stripes"
-msgstr "Полоски"
-
-#: plugins/shotwell-transitions/ClockEffect.vala:20
-msgid "Clock"
-msgstr "Часы"
-
-#: plugins/shotwell-transitions/CircleEffect.vala:20
-msgid "Circle"
-msgstr "Круг"
-
-#: plugins/shotwell-transitions/shotwell-transitions.vala:28
-msgid "Core Slideshow Transitions"
-msgstr "Основные эффекты переходов"
-
-#: plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
-msgstr "© Максим Карташев (Maxim Kartashev), 2010; ©Yorba Foundation,2011-2013"
-
-#: plugins/shotwell-transitions/SlideEffect.vala:20
-msgid "Slide"
-msgstr "Слайд"
-
-#: plugins/shotwell-transitions/FadeEffect.vala:20
-msgid "Fade"
-msgstr "Угасание"
-
-#: plugins/shotwell-transitions/SquaresEffect.vala:20
-msgid "Squares"
-msgstr "Квадраты"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Ядро Данные Импорт Службы"
-
-#: 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 ""
-"Добро пожаловать в сервис импорта библиотек F-Spot\n"
-"\n"
-"Пожалуйста, выберите библиотеку для импорта, либо выбором одной из "
-"библиотек, обнаруженной Shotwell, либо выбором альтернативного F-Spot  файла "
-"базы данных."
+#: ../src/searches/SearchBoolean.vala:187
+msgid "Date"
+msgstr "Дата"
 
-#: 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 ""
-"Добро Пожаловать в сервис по импорту файлов из библиотеки F-Spot.\n"
-"\n"
-"Пожалуйста, выберите файл из базы данных F-Spot."
+#: ../src/sidebar/Tree.vala:188
+msgid "New _Tag..."
+msgstr "Новая _метка…"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Вручную выберите файл из базы данных F-Spot для импорта"
+#: ../src/slideshow/Slideshow.vala:22
+msgid "Slideshow Transitions"
+msgstr "Эффекты перехода"
 
-#: 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 ""
-"Не удалось открыть выбранный файл из базы данных F-Spot: файл не существует, "
-"или не располагается в базе данных F-Spot"
+#: ../src/slideshow/TransitionEffects.vala:98
+msgid "(None)"
+msgstr "(Ничего)"
 
-#: 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 ""
-"Не получается открыть выбранный файл из базы данных F-Spot: данная версия "
-"базы данных F-Spot не поддерживается Shotwell"
+#: ../src/slideshow/TransitionEffects.vala:287
+msgid "None"
+msgstr "Ничего"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Не удалось прочитать выбранный файл из базы данных F-Spot: ошибка во время "
-"чтения тегов"
+#: ../src/slideshow/TransitionEffects.vala:339
+msgid "Random"
+msgstr "Случайно"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"Не удалось прочитать файл из базы данных F-Spot: ошибка во время чтения "
-"изображений"
+#: ../src/tags/Branch.vala:127
+msgid "Tags"
+msgstr "Метки"
 
-#: 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 ""
-"Shotwell нашёл %d изображения в библиотеке F-Spot и в данный момент "
-"импортирует их. Дубликаты будут автоматически распознаны и удалены.\n"
-"\n"
-"Вы можете закрыть это окно и начать использовать Shotwell, в то время как "
-"импорт будет продолжаться на заднем плане."
+#: ../ui/set_background_dialog.glade.h:1
+msgid "Set as Desktop Background"
+msgstr "Установить в качестве фона рабочего стола"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:84
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "Библиотека F-Spot: %s"
+#: ../ui/set_background_dialog.glade.h:2
+#: ../ui/set_background_slideshow_dialog.glade.h:6
+msgid "Use for Desktop"
+msgstr "Использовать для рабочего стола"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:416
-msgid "Preparing to import"
-msgstr "Подготовка к импортированию"
+#: ../ui/set_background_dialog.glade.h:3
+#: ../ui/set_background_slideshow_dialog.glade.h:7
+msgid "Use for Lock Screen"
+msgstr "Использовать для экрана блокировки"
 
-#: ui/set_background_dialog.glade:14
+#: ../ui/set_background_slideshow_dialog.glade.h:1
 msgid "Set as Desktop Slideshow"
-msgstr "Сделать слайдшоу для рабочего стола"
+msgstr "Установить в качестве слайдшоу рабочего стола"
 
-#: ui/set_background_dialog.glade:55
-msgid "Generate desktop background slideshow"
-msgstr "Создать слайдшоу для рабочего стола"
-
-#: ui/set_background_dialog.glade:82
+#: ../ui/set_background_slideshow_dialog.glade.h:2
 msgid "Show each photo for"
 msgstr "Показывать каждое фото в течение"
 
-#: ui/set_background_dialog.glade:94
+#: ../ui/set_background_slideshow_dialog.glade.h:3
 msgid "period of time"
 msgstr "период времени"
 
-#: ui/set_background_dialog.glade:116
-msgid "How long each photo is shown on the desktop background"
-msgstr "Как долго будет отображаться каждая фотография на фоне рабочего стола"
+#: ../ui/set_background_slideshow_dialog.glade.h:4
+msgid "Generate desktop background slideshow"
+msgstr "Создать слайдшоу рабочего стола"
 
-#: ui/shotwell.glade:7
-msgid "Search"
-msgstr "Поиск"
+#: ../ui/set_background_slideshow_dialog.glade.h:5
+msgid "How long each photo is shown on the desktop background"
+msgstr "Время отображения каждой фотографии в качестве фона рабочего стола"
 
-#: ui/shotwell.glade:47
+#: ../ui/shotwell.glade.h:1
 msgid "_Name of search:"
 msgstr "_Название поиска:"
 
-#: ui/shotwell.glade:108
+#: ../ui/shotwell.glade.h:2
 msgid "_Match"
 msgstr "_Совпадение"
 
-#: ui/shotwell.glade:137
+#: ../ui/shotwell.glade.h:3
 msgid "of the following:"
 msgstr "из следующих:"
 
-#: ui/shotwell.glade:218
+#: ../ui/shotwell.glade.h:4
 msgid "<b>Printed Image Size</b>"
-msgstr "<b>Размер изображения на печати</b>"
+msgstr "<b>Размер изображения при печати</b>"
 
-#: ui/shotwell.glade:235
+#: ../ui/shotwell.glade.h:5
 msgid "Use a _standard size:"
 msgstr "Использовать _стандартный размер:"
 
-#: ui/shotwell.glade:278
+#: ../ui/shotwell.glade.h:6
 msgid "Use a c_ustom size:"
 msgstr "Использовать свой _размер:"
 
-#: ui/shotwell.glade:368
+#: ../ui/shotwell.glade.h:7
 msgid "_Match photo aspect ratio"
-msgstr "_Соответствие соотношению сторон фото"
+msgstr "_Сохранять соотношение сторон изображения"
 
-#: ui/shotwell.glade:392
+#: ../ui/shotwell.glade.h:8
 msgid "_Autosize:"
 msgstr "_Автоматический размер:"
 
-#: ui/shotwell.glade:432
+#: ../ui/shotwell.glade.h:9
 msgid "<b>Titles</b>"
-msgstr "<b>Заголовки</b>"
+msgstr "<b>Названия</b>"
 
-#: ui/shotwell.glade:449
+#: ../ui/shotwell.glade.h:10
 msgid "Print image _title"
-msgstr "Печатать _названия изображений"
+msgstr "Напечатать _название изображения"
 
-#: ui/shotwell.glade:493
+#: ../ui/shotwell.glade.h:11
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Разрешающая способность</b>"
 
-#: ui/shotwell.glade:513
+#: ../ui/shotwell.glade.h:12
 msgid "_Output photo at:"
-msgstr "_Сохранить фото в:"
+msgstr "_Печатать изображение в:"
 
-#: ui/shotwell.glade:548
+#: ../ui/shotwell.glade.h:13
 msgid "pixels per inch"
 msgstr "пикселей на дюйм"
 
-#: ui/shotwell.glade:581 ui/shotwell.glade:623
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:27
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:27
-#, fuzzy
-msgid "label"
-msgstr ""
-"ярлык"
-
-#: ui/shotwell.glade:719
+#: ../ui/shotwell.glade.h:15
 msgid "Shotwell Preferences"
 msgstr "Параметры Shotwell"
 
-#: ui/shotwell.glade:796
+#: ../ui/shotwell.glade.h:16
 msgid "white"
 msgstr "белый"
 
-#: ui/shotwell.glade:823
+#: ../ui/shotwell.glade.h:17
 msgid "black"
 msgstr "чёрный"
 
-#: ui/shotwell.glade:871
+#: ../ui/shotwell.glade.h:19
 msgid "_Watch library directory for new files"
 msgstr "_Следить за появлением новых файлов в папке библиотеки"
 
-#: ui/shotwell.glade:900
+#: ../ui/shotwell.glade.h:20
 msgid "Metadata"
 msgstr "Метаданные"
 
-#: ui/shotwell.glade:920
+#: ../ui/shotwell.glade.h:21
 msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "Записывать метки, заголовки и другие _метаданные в файлы фотографий"
+msgstr "Записывать метки, названия и другие _метаданные в файлы фотографий"
 
-#: ui/shotwell.glade:946
+#: ../ui/shotwell.glade.h:22
 msgid "Display"
 msgstr "Экран"
 
-#: ui/shotwell.glade:967
+#: ../ui/shotwell.glade.h:23
 msgid "_Import photos to:"
-msgstr "_Импортировать фото в:"
+msgstr "_Импортировать изображения в:"
 
-#: ui/shotwell.glade:990
+#: ../ui/shotwell.glade.h:24
 msgid "_Background:"
 msgstr "_Фон:"
 
-#: ui/shotwell.glade:1013
+#: ../ui/shotwell.glade.h:25
 msgid "Importing"
-msgstr "Импорт"
+msgstr "Импортирование"
 
-#: ui/shotwell.glade:1036
+#: ../ui/shotwell.glade.h:26
 msgid "_Directory structure:"
 msgstr "_Структура каталога:"
 
-#: ui/shotwell.glade:1075
+#: ../ui/shotwell.glade.h:27
 msgid "_Pattern:"
 msgstr "_Шаблон:"
 
-#: ui/shotwell.glade:1157
+#: ../ui/shotwell.glade.h:28
 msgid "Example:"
 msgstr "Пример:"
 
-#: ui/shotwell.glade:1174
+#: ../ui/shotwell.glade.h:29
 msgid "R_ename imported files to lowercase"
-msgstr "П_еревести названия импортированных файлов в нижний регистр"
+msgstr "П_ереводить названия импортированных файлов в нижний регистр"
 
-#: ui/shotwell.glade:1203
+#: ../ui/shotwell.glade.h:30
 msgid "RAW Developer"
-msgstr "Обработка RAW"
+msgstr "Обработчик RAW"
 
-#: ui/shotwell.glade:1238
+#: ../ui/shotwell.glade.h:31
 msgid "De_fault:"
-msgstr "По умолчанию:"
+msgstr "По _умолчанию:"
 
-#: ui/shotwell.glade:1292
+#: ../ui/shotwell.glade.h:33
 msgid "E_xternal photo editor:"
-msgstr "Внешний _фоторедактор:"
+msgstr "Внешний _редактор изображений:"
 
-#: ui/shotwell.glade:1308
+#: ../ui/shotwell.glade.h:34
 msgid "External _RAW editor:"
 msgstr "_Внешний редактор RAW:"
 
-#: ui/shotwell.glade:1373
+#: ../ui/shotwell.glade.h:35
 msgid "External Editors"
 msgstr "Внешние редакторы"
 
-#: ui/shotwell.glade:1400
+#: ../ui/shotwell.glade.h:36
 msgid "Plugins"
 msgstr "Модули"
 
-#: ui/shotwell.glade:1469
+#: ../ui/shotwell.glade.h:37
 msgid "_Delay:"
 msgstr "_Задержка:"
 
-#: ui/shotwell.glade:1485
+#: ../ui/shotwell.glade.h:38
 msgid "_Transition effect:"
 msgstr "_Эффект перехода:"
 
-#: ui/shotwell.glade:1501
+#: ../ui/shotwell.glade.h:39
 msgid "Transition d_elay:"
 msgstr "Задержка _перехода:"
 
-#: ui/shotwell.glade:1513
+#: ../ui/shotwell.glade.h:40
 msgid "Show t_itle"
-msgstr "Показать _заголовок"
+msgstr "Показывать _название"
 
-#: ui/shotwell.glade:1603 ui/shotwell.glade:1616
+#: ../ui/shotwell.glade.h:41
 msgid "seconds"
 msgstr "секунд"
 
-#: ui/shotwell.glade:1696
-msgid "_Login"
-msgstr "_Войти"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:21
-msgid ""
-" (text depends on fb username and is modified in the app - \n"
-"anything put into this field won't display)"
-msgstr ""
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:39
-msgid "Publish to an e_xisting album:"
-msgstr "Опубликовать в _альбоме:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:57
-msgid "Create a _new album named:"
-msgstr "Создать _новый альбом:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:139
-msgid "Videos and new photo albums _visible to:"
-msgstr "Видео и новые фотоальбомы _видимы для:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:175
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:102
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:178
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:226
-msgid ""
-"_Remove location, camera, and other identifying information before uploading"
-msgstr ""
-"_Удалите местоположение, информацию о камере и другую идентифицирующую "
-"информацию перед публикацией"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:197
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:137
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:229
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:99
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:115
-msgid "_Logout"
-msgstr "_Выйти"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:212
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:153
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:243
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:115
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:129
-msgid "_Publish"
-msgstr "_Опубликовать"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:16
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Введите номер подтверждения, который появится после того, как вы зайдёте в "
-"Flickr в веб-браузере."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:37
-msgid "Authorization _Number:"
-msgstr "_Номер подтверждения:"
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:19
-msgid ""
-"You are logged into Flickr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-msgstr ""
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:44
-msgid "_visibility label (populated in the code)"
-msgstr ""
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:61
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:60
-msgid "Photo _size:"
-msgstr "_Размер снимка:"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:18
-msgid ""
-"'you are logged in as $name'\n"
-"(populated in the application code)"
-msgstr ""
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:75
-msgid "An _existing album:"
-msgstr "_Существующем альбоме:"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:94
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:52
-msgid "A _new album named:"
-msgstr "Новый _альбом:"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:113
-msgid "L_ist album in public gallery"
-msgstr "_Список альбомов в общедоступной галерее"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:134
-msgid ""
-"$mediatype will appear in\n"
-"(populated in code)"
-msgstr ""
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:150
-msgid "Photo _size preset:"
-msgstr "_Предустановки размера снимка:"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:49
-msgid "_URL of your Piwigo photo library"
-msgstr "_URL вашей коллекции фото на Piwigo"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:59
-msgid "User _name"
-msgstr "_Имя пользователя"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:73
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:59
-msgid "_Password"
-msgstr "_Пароль"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:130
-msgid "_Remember Password"
-msgstr "_Напомнить пароль"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:151
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:107
-msgid "Login"
-msgstr "Войти"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:40
-msgid "An _existing category:"
-msgstr "_Существующая категория:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:121
-msgid "Photos will be _visible by:"
-msgstr "Фото будут _видимы для:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:149
-msgid "Photo size:"
-msgstr "Размер фотографии:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:176
-msgid "within category:"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:210
-msgid "Album comment:"
-msgstr "Комментарий к альбому:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:242
-msgid "_If a title is set and comment unset, use title as comment"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:258
-msgid "_Do no upload tags"
-msgstr "_Не публиковать теги"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:278
-msgid "Logout"
-msgstr "Выйти"
-
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:55
-msgid "Video privacy _setting:"
-msgstr "_Установки конфиденциальности видео:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:38
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Авторские права 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:109
-msgid "1280 x 853 pixels"
-msgstr "1280 x 853 пикселей"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:313
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:323
-#, c-format
-msgid "'%s' isn't a valid response to an OAuth authentication request"
-msgstr ""
-"«%s» не является корректным ответом на запрос проверки подлинности OAuth"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:561
-msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): запуск невозможен; этот публикатор не имеет "
-"возможности перезапуска."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:589
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr ""
-"Введите имя пользователя и пароль, связанный с вашей учётной записью Tumblr."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:639
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:760
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "Не могу загрузить интерфейс: %s "
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:742
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr "Вы вошли в Tumblr как %s.\n"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:24
-msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-msgstr "Авторские права 2010+ Евгений Поляков <zbr@ioremap.net>"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:27
-msgid "Visit the Yandex.Fotki web site"
-msgstr "Посетить сайт "
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:635
-msgid "You are not currently logged into Yandex.Fotki."
-msgstr "Вы не вошли в Яндекс.Фотки."
-
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:49
-msgid "_Email address"
-msgstr "Адрес _электронной почты:"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:19
-msgid ""
-"You are logged into Tumblr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-msgstr ""
-"You are logged into Tumblr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:43
-msgid "Blogs:"
-msgstr "Блоги:"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:24
-msgid "_Albums (or write new):"
-msgstr "_Альбомы (или создать новый):"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:38
-msgid "Access _type:"
-msgstr "Способ _доступа:"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:81
-msgid "Disable _comments"
-msgstr "Отключить _комментарии"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:96
-msgid "_Forbid downloading original photo"
-msgstr "_Запретить загрузку оригинала"
+#~ msgid "A file required for publishing is unavailable. Publishing to "
+#~ msgstr "Файл, необходимый для публикации недоступен. Публикация в "
diff --git a/po/sk.po b/po/sk.po
index 5b8f4f1..d9fc3b6 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2014-05-27 20:10+0000\n"
-"PO-Revision-Date: 2014-09-13 23:36+0100\n"
+"POT-Creation-Date: 2015-03-18 11:16+0000\n"
+"PO-Revision-Date: 2015-03-12 10:01+0100\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: slovenčina <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
@@ -28,7 +28,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.7.4\n"
 
 #: ../plugins/common/RESTSupport.vala:424
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
@@ -52,7 +52,7 @@ msgstr ""
 msgid "Visit the Shotwell home page"
 msgstr "Navštíviť domovskú stránku programu Shotwell"
 
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:691
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
 msgid "translator-credits"
 msgstr ""
 "Laco Gubík <lacogubik@googlemail.com>\n"
@@ -67,8 +67,8 @@ msgstr ""
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
 #: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
 #: ../src/Resources.vala:27
-msgid "Copyright 2009-2014 Yorba Foundation"
-msgstr "Autorské práva 2009-2014 Nadácia Yorba"
+msgid "Copyright 2009-2015 Yorba Foundation"
+msgstr "Autorské práva 2009-2015 Nadácia Yorba"
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:56
 msgid ""
@@ -149,7 +149,7 @@ msgstr ""
 msgid "F-Spot library: %s"
 msgstr "Knižnica F-Spot: %s"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:416
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
 msgid "Preparing to import"
 msgstr "Pripravuje sa importovanie"
 
@@ -162,12 +162,6 @@ msgid "Gallery3 publishing module"
 msgstr "Modul na uverejňovanie na službe Gallery3"
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
-#| msgid ""
-#| "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."
 msgid ""
 "You are not currently logged into your Gallery.\n"
 "\n"
@@ -179,12 +173,11 @@ msgstr ""
 "Gallery3."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: ../src/MediaPage.vala:420 ../src/photos/RawSupport.vala:297
+#: ../src/MediaPage.vala:435 ../src/photos/RawSupport.vala:300
 msgid "Shotwell"
 msgstr "Shotwell"
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
-#| msgid "Shotwell Preferences"
 msgid "Shotwell default directory"
 msgstr "Predvolený adresár programu Shotwell"
 
@@ -210,30 +203,24 @@ msgstr ""
 "Berte na vedomie, že služba Gallery3 podporuje iba tie isté formáty videí "
 "ako služba Flowplayer."
 
-# DK: https://bugzilla.gnome.org/show_bug.cgi?id=736634
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1774
-#, fuzzy
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Flickr can't "
-#| "continue."
-msgid "A file required for publishing is unavailable. Publishing to "
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+#, c-format
+msgid ""
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
 msgstr ""
-"Súbor potrebný na uverejňovanie nie je dostupný. Uverejňovanie v službe "
-"Flickr nemôže pokračovať."
+"Súbor potrebný na uverejňovanie nie je dostupný. Uverejňovanie na službu %s "
+"nemôže pokračovať."
 
 #. populate any widgets whose contents are
 #. programmatically-generated
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
 #, c-format
-#| msgid "Publish Photos and Videos"
 msgid "Publishing to %s as %s."
 msgstr "Uverejňuje sa na %s pod používateľským menom %s."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1816
-#| msgid ""
-#| "Enter the URL of your Piwigo photo library as well as the username and "
-#| "password associated with your Piwigo account for that library."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
 msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
@@ -241,7 +228,7 @@ msgstr ""
 "Zadajte adresu URL vašej knižnice fotografií v službe Piwigo a taktiež "
 "patričné používateľské meno a heslo k účtu služby Piwigo pre danú knižnicu."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
 msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
@@ -249,7 +236,7 @@ msgstr ""
 "Používateľské meno a heslo, alebo kľúč API neboli správne. Pre nový pokus "
 "znovu zadajte používateľské meno a heslo nižšie."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
 msgid ""
 "The URL entered does not appear to be the main directory of a Gallery3 "
 "instance. Please make sure you typed it correctly and it does not have any "
@@ -259,11 +246,11 @@ msgstr ""
 "Prosím, uistite sa, že ste ju zadali správne a že neobsahuje žiadne koncové "
 "prípony (napr. index.php)."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1871
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
 msgid "Unrecognized User"
 msgstr "Nerozpoznaný používateľ"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1876
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
 msgid " Site Not Found"
 msgstr " Stránka sa nenašla"
 
@@ -278,7 +265,6 @@ msgstr ""
 "skúste to znovu."
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
-#| msgid "Enter the username and password associated with your Tumblr account."
 msgid "Enter email and password associated with your Rajce account."
 msgstr "Zadajte meno používateľa a heslo pre váš príslušný účet Tumblr."
 
@@ -305,7 +291,6 @@ msgstr "_Heslo"
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
 #: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
-#| msgid "_Remember Password"
 msgid "_Remember"
 msgstr "Za_pamätať heslo"
 
@@ -323,9 +308,6 @@ msgstr "_Skryť album"
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
-#| msgid ""
-#| "You are logged into Facebook as %s.\n"
-#| "\n"
 msgid "You are logged into Rajce as %s."
 msgstr "Ste prihlásený do služby Rajce ako %s."
 
@@ -382,13 +364,13 @@ msgid "Copyright 2012 BJA Electronics"
 msgstr "Autorské práva 2012 BJA Electronics"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1229
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
 msgid "500 x 375 pixels"
 msgstr "500 x 375 bodov"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1230
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
 msgid "1024 x 768 pixels"
 msgstr "1024 x 768 bodov"
@@ -407,6 +389,8 @@ msgstr "'%s' nie je platnou odpoveďou na autorizačnú požiadavku OAuth"
 msgid ""
 "TumblrPublisher: start( ): can't start; this publisher is not restartable."
 msgstr ""
+"TumblrPublisher: start( ): nedá sa spustiť; túto službu na uverejnenie nie "
+"je možné reštartovať."
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
 msgid "Enter the username and password associated with your Tumblr account."
@@ -450,17 +434,15 @@ msgid "You are not currently logged into Yandex.Fotki."
 msgstr "Momentálne nie ste prihlásený do služby Yandex.Fotki."
 
 #: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
-#| msgid "Core Publishing Services"
 msgid "Shotwell Extra Publishing Services"
 msgstr "Hlavné uverejňovacie služby"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
-#| msgid "Back"
 msgid "Go _Back"
 msgstr "Späť"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
-#: ../ui/shotwell.glade.h:43
+#: ../ui/shotwell.glade.h:42
 msgid "_Login"
 msgstr "_Prihlásiť sa"
 
@@ -473,12 +455,10 @@ msgid "_Gallery3 URL:"
 msgstr "URL služby _Gallery3:"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
-#| msgid "User _name"
 msgid "_User name:"
 msgstr "Používateľské _meno"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
-#| msgid "_Password"
 msgid "_Password:"
 msgstr "_Heslo"
 
@@ -487,18 +467,14 @@ msgid "API _Key:"
 msgstr "_Kľúč API:"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
-#| msgid "hour"
-#| msgid_plural "hours"
 msgid "or"
 msgstr "hodín"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
-#| msgid "A _new album named:"
 msgid "A _new album"
 msgstr "Photos will be _visible by:"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
-#| msgid "An _existing album:"
 msgid "An _existing album"
 msgstr "_Existujúcom albume:"
 
@@ -513,17 +489,15 @@ msgid "'Publishing to $url as $username' (populated in application code)"
 msgstr "„Uverejňuje sa na $url ako $username“ (obsiahnuté v kóde aplikácie)"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
-#| msgid "_Scaling constraint:"
 msgid "Scaling constraint:"
 msgstr "_Zachovať pomer podľa:"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
-#| msgid " _pixels"
 msgid "pixels"
 msgstr " _pixelov"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
 #: ../src/Dimensions.vala:17
 msgid "Original size"
@@ -537,7 +511,7 @@ msgstr "Šírky alebo výšky"
 #: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
 #: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
 #: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
-#: ../ui/shotwell.glade.h:15
+#: ../ui/shotwell.glade.h:14
 msgid "label"
 msgstr "štítok"
 
@@ -551,14 +525,10 @@ msgid "Photo _size:"
 msgstr "Veľkosť _fotky:"
 
 #: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
-#| msgid ""
-#| "You are logged into Facebook as %s.\n"
-#| "\n"
 msgid "you are logged in rajce as $name"
 msgstr "Ste prihlásený do služby rajce ako $name"
 
 #: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
-#| msgid "Videos will appear in:"
 msgid "$mediatype will appear in"
 msgstr "Videá sa zobrazia v:"
 
@@ -579,7 +549,6 @@ msgid "_Forbid downloading original photo"
 msgstr "Zakázať stiahnutie _pôvodnej fotografie"
 
 #: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
-#| msgid "Publish"
 msgid "Public"
 msgstr "Uverejniť"
 
@@ -671,12 +640,12 @@ msgid "Upload _size:"
 msgstr "_Veľkosť odovzdávania:"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
 msgid "Just me"
 msgstr "Len pre mňa"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
 msgid "Everyone"
 msgstr "Všetkých"
@@ -732,51 +701,62 @@ msgstr ""
 "\n"
 
 # DK: https://bugzilla.gnome.org/show_bug.cgi?id=736633
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1155
-#, fuzzy, c-format
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
+#, 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 ""
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
 "Váš Flickr účet, ktorý je zdarma, obmedzuje koľko dát môžete odovzdať za "
 "mesiac.\n"
 "Tento mesiac vám ešte zostáva  %d  megabajtov z vašej kvóty."
+msgstr[1] ""
+"Váš Flickr účet, ktorý je zdarma, obmedzuje koľko dát môžete odovzdať za "
+"mesiac.\n"
+"Tento mesiac vám ešte zostáva  jeden  megabajt z vašej kvóty."
+msgstr[2] ""
+"Váš Flickr účet, ktorý je zdarma, obmedzuje koľko dát môžete odovzdať za "
+"mesiac.\n"
+"Tento mesiac vám ešte zostávajú  %d  megabajty z vašej kvóty."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1157
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr ""
 "Váš účet služby Flickr Pro vám umožňuje neobmedzené odovzdávania fotografií."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1162
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
 msgid "Photos _visible to:"
 msgstr "Fotografie _viditeľné pre:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
 msgid "Videos _visible to:"
 msgstr "Videá budú v_iditeľné:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
 msgid "Photos and videos _visible to:"
 msgstr "Fotografie a videá budú v_iditeľné:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
 msgid "Friends & family only"
 msgstr "Len pre priateľov a rodinu"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
 msgid "Family only"
 msgstr "Iba rodina"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Friends only"
 msgstr "Iba priatelia"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
 msgid "2048 x 1536 pixels"
 msgstr "2048 x 1536 pixelov"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
 msgid "4096 x 3072 pixels"
 msgstr "4096 x 3072 pixelov"
@@ -948,8 +928,8 @@ msgid ""
 "Enter the confirmation number which appears after you log into Flickr in "
 "your Web browser."
 msgstr ""
-"Zadajte potvrdzovacie číslo, ktoré bolo zobrazené po prihlásený do služby Flickr vo "
-"vašom webovom prehliadači."
+"Zadajte potvrdzovacie číslo, ktoré bolo zobrazené po prihlásený do služby "
+"Flickr vo vašom webovom prehliadači."
 
 #: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
 msgid "Authorization _Number:"
@@ -1013,7 +993,7 @@ msgid "Logout"
 msgstr "Odhlásiť sa"
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:268
+#: ../src/Resources.vala:303
 msgid "Publish"
 msgstr "Uverejniť"
 
@@ -1070,9 +1050,9 @@ msgid "Core Slideshow Transitions"
 msgstr "Hlavné prechody prezentácie"
 
 #: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
 msgstr ""
-"Autorské práva 2010 Maxim Kartashev, Autorské práva 2011-2014 Nadácia Yorba"
+"Autorské práva 2010 Maxim Kartashev, Autorské práva 2011-2015 Nadácia Yorba"
 
 #: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
 #, c-format
@@ -1099,56 +1079,39 @@ msgstr "Nepodarilo sa vytvoriť dočasný adresár %s: %s"
 msgid "Unable to create data subdirectory %s: %s"
 msgstr "Nepodarilo sa vytvoriť dátový podadresár %s: %s"
 
-#. restore pin state
-#: ../src/AppWindow.vala:52
+#: ../src/AppWindow.vala:53
 msgid "Pin Toolbar"
 msgstr "Pripnúť panel"
 
-#: ../src/AppWindow.vala:53
+#: ../src/AppWindow.vala:54
 msgid "Pin the toolbar open"
 msgstr "Pripnúť panel nástrojov otvorený"
 
-#: ../src/AppWindow.vala:57 ../src/AppWindow.vala:135
+#: ../src/AppWindow.vala:59
 msgid "Leave fullscreen"
 msgstr "Opustiť režim celej obrazovky"
 
-#: ../src/AppWindow.vala:134
-msgid "Leave _Fullscreen"
-msgstr "Opustiť režim _celej obrazovky"
-
-#: ../src/AppWindow.vala:496
-msgid "_Quit"
-msgstr "U_končiť"
-
-#: ../src/AppWindow.vala:501
-msgid "_About"
-msgstr "_O programe"
-
-#: ../src/AppWindow.vala:506
-msgid "Fulls_creen"
-msgstr "Na _celú obrazovku"
-
-#: ../src/AppWindow.vala:511
+#: ../src/AppWindow.vala:525
 msgid "_Contents"
 msgstr "Ob_sah"
 
-#: ../src/AppWindow.vala:516
+#: ../src/AppWindow.vala:530
 msgid "_Frequently Asked Questions"
 msgstr "Často _kladené otázky"
 
-#: ../src/AppWindow.vala:521
+#: ../src/AppWindow.vala:535
 msgid "_Report a Problem..."
 msgstr "_Nahlásiť problém..."
 
-#: ../src/AppWindow.vala:620 ../src/AppWindow.vala:641
-#: ../src/AppWindow.vala:658 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1417 ../src/Dialogs.vala:1440
-#: ../src/data_imports/DataImportsUI.vala:399
-#: ../src/publishing/PublishingUI.vala:498
+#: ../src/AppWindow.vala:634 ../src/AppWindow.vala:655
+#: ../src/AppWindow.vala:672 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
+#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441 ../src/Resources.vala:162
+#: ../src/data_imports/DataImportsUI.vala:374
+#: ../src/publishing/PublishingUI.vala:475
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: ../src/AppWindow.vala:668
+#: ../src/AppWindow.vala:682
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
@@ -1161,21 +1124,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/AppWindow.vala:688
+#: ../src/AppWindow.vala:702
 msgid "Visit the Yorba web site"
 msgstr "Navštívte webovú stránku nadácie Yorba"
 
-#: ../src/AppWindow.vala:700
+#: ../src/AppWindow.vala:714
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Nepodarilo sa zobraziť pomocníka: %s"
 
-#: ../src/AppWindow.vala:708
+#: ../src/AppWindow.vala:722
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Nepodarilo sa prejsť do databázy chýb: %s"
 
-#: ../src/AppWindow.vala:716
+#: ../src/AppWindow.vala:730
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Nepodarilo sa zobraziť FAQ: %s"
@@ -1241,11 +1204,11 @@ msgstr "Poškodený súbor obrázku"
 msgid "Imported failed (%d)"
 msgstr "Importovanie zlyhalo (%d)"
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2634
+#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
 msgid "S_lideshow"
 msgstr "P_rezentácia"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2635
+#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
 msgid "Play a slideshow"
 msgstr "Spustiť prezentáciu"
 
@@ -1258,7 +1221,7 @@ msgid "Export Photos/Videos"
 msgstr "Exportovať fotografie/videá"
 
 #: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3207
+#: ../src/PhotoPage.vala:3211
 msgid "Export Photo"
 msgstr "Exportovať fotografiu"
 
@@ -1306,47 +1269,47 @@ msgstr "Vylepšuje sa"
 msgid "Undoing Enhance"
 msgstr "Vracia sa spať vylepšenie"
 
-#: ../src/Commands.vala:845
+#: ../src/Commands.vala:853
 msgid "Applying Color Transformations"
 msgstr "Aplikujú sa transformácie farieb"
 
-#: ../src/Commands.vala:845
+#: ../src/Commands.vala:853
 msgid "Undoing Color Transformations"
 msgstr "Vracajú sa späť transformácie farieb"
 
-#: ../src/Commands.vala:995
+#: ../src/Commands.vala:1003
 msgid "Creating New Event"
 msgstr "Vytvára sa nová udalosť"
 
-#: ../src/Commands.vala:996
+#: ../src/Commands.vala:1004
 msgid "Removing Event"
 msgstr "Odstraňuje sa udalosť"
 
-#: ../src/Commands.vala:1005
+#: ../src/Commands.vala:1013
 msgid "Moving Photos to New Event"
 msgstr "Fotografie sa presúvajú do novej udalosti"
 
-#: ../src/Commands.vala:1006
+#: ../src/Commands.vala:1014
 msgid "Setting Photos to Previous Event"
 msgstr "Fotografie sa nastavujú na predošlú udalosť"
 
-#: ../src/Commands.vala:1063
+#: ../src/Commands.vala:1071
 msgid "Merging"
 msgstr "Zlučovanie"
 
-#: ../src/Commands.vala:1064
+#: ../src/Commands.vala:1072
 msgid "Unmerging"
 msgstr "Vracia sa spať zlučovanie"
 
-#: ../src/Commands.vala:1073
+#: ../src/Commands.vala:1081
 msgid "Duplicating photos"
 msgstr "Fotografie sa duplikujú"
 
-#: ../src/Commands.vala:1073
+#: ../src/Commands.vala:1081
 msgid "Removing duplicated photos"
 msgstr "Odstraňujú sa duplikátne fotografie"
 
-#: ../src/Commands.vala:1096
+#: ../src/Commands.vala:1104
 #, c-format
 msgid "Unable to duplicate one photo due to a file error"
 msgid_plural "Unable to duplicate %d photos due to file errors"
@@ -1354,54 +1317,54 @@ msgstr[0] "Nie je možné duplikovať %d fotografií kvôli súborovej chybe"
 msgstr[1] "Nie je možné duplikovať jednu fotografiu kvôli súborovej chybe"
 msgstr[2] "Nie je možné duplikovať %d fotografie kvôli súborovej chybe"
 
-#: ../src/Commands.vala:1183
+#: ../src/Commands.vala:1191
 msgid "Restoring previous rating"
 msgstr "Obnovuje sa predchádzajúce hodnotenie"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
 msgid "Increasing ratings"
 msgstr "Zvyšujú sa hodnotenia"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
 msgid "Decreasing ratings"
 msgstr "Znižujú sa hodnotenia"
 
-#: ../src/Commands.vala:1244
+#: ../src/Commands.vala:1252
 msgid "Setting RAW developer"
 msgstr "Nastavuje sa RAW vývojka"
 
-#: ../src/Commands.vala:1244
+#: ../src/Commands.vala:1252
 msgid "Restoring previous RAW developer"
 msgstr "Obnovuje sa predchádzajúca RAW vývojka"
 
-#: ../src/Commands.vala:1245
+#: ../src/Commands.vala:1253
 msgid "Set Developer"
 msgstr "Nastaviť vývojára"
 
-#: ../src/Commands.vala:1335
+#: ../src/Commands.vala:1343
 msgid "Original photo could not be adjusted."
 msgstr "Pôvodná fotografia nemôže byť upravená."
 
-#: ../src/Commands.vala:1356
+#: ../src/Commands.vala:1364
 msgid "Adjusting Date and Time"
 msgstr "Nastavuje sa čas a dátum"
 
-#: ../src/Commands.vala:1356
+#: ../src/Commands.vala:1364
 msgid "Undoing Date and Time Adjustment"
 msgstr "Vracia sa späť úprava času a dátumu"
 
-#: ../src/Commands.vala:1387
+#: ../src/Commands.vala:1395
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
 msgstr[0] "Následujúce pôvodné fotografie nemôžu byť upravené."
 msgstr[1] "Jedna pôvodná fotografia nemôže byť upravená."
 msgstr[2] "Následujúce pôvodné fotografie nemôžu byť upravené."
 
-#: ../src/Commands.vala:1389 ../src/Commands.vala:1413
+#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
 msgid "Time Adjustment Error"
 msgstr "Chyba úpravy času"
 
-#: ../src/Commands.vala:1411
+#: ../src/Commands.vala:1419
 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."
@@ -1412,60 +1375,60 @@ msgstr[1] ""
 msgstr[2] ""
 "Nie je možné vrátiť spať úpravy času v následujúcich súboroch fotografií."
 
-#: ../src/Commands.vala:1625 ../src/Commands.vala:1648
+#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
 msgid "Create Tag"
 msgstr "Vytvoriť značku"
 
-#: ../src/Commands.vala:1683
+#: ../src/Commands.vala:1691
 #, c-format
 msgid "Move Tag \"%s\""
 msgstr "Presunúť značku „%s“"
 
-#: ../src/Commands.vala:2335
+#: ../src/Commands.vala:2343
 msgid "Move Photos to Trash"
 msgstr "Presunúť fotografie do koša"
 
-#: ../src/Commands.vala:2335
+#: ../src/Commands.vala:2343
 msgid "Restore Photos from Trash"
 msgstr "Obnoviť fotografie z koša"
 
-#: ../src/Commands.vala:2336
+#: ../src/Commands.vala:2344
 msgid "Move the photos to the Shotwell trash"
 msgstr "Presunúť fotografie do Shotwell koša"
 
-#: ../src/Commands.vala:2336
+#: ../src/Commands.vala:2344
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Obnoviť tieto fotografie naspať do Shotwell knižnice"
 
-#: ../src/Commands.vala:2355
+#: ../src/Commands.vala:2363
 msgid "Moving Photos to Trash"
 msgstr "Fotografie sa presúvajú do koša"
 
-#: ../src/Commands.vala:2355
+#: ../src/Commands.vala:2363
 msgid "Restoring Photos From Trash"
 msgstr "Obnovujú sa fotografie z koša"
 
-#: ../src/Commands.vala:2441
+#: ../src/Commands.vala:2449
 msgid "Flag selected photos"
 msgstr "Označiť vybrané fotografie"
 
-#: ../src/Commands.vala:2442
+#: ../src/Commands.vala:2450
 msgid "Unflag selected photos"
 msgstr "Odznačiť vybrané fotografie"
 
-#: ../src/Commands.vala:2443
+#: ../src/Commands.vala:2451
 msgid "Flagging selected photos"
 msgstr "Označujú sa vybrané fotografie"
 
-#: ../src/Commands.vala:2444
+#: ../src/Commands.vala:2452
 msgid "Unflagging selected photos"
 msgstr "Odznačujú sa vybrané fotografie"
 
-#: ../src/Commands.vala:2451
+#: ../src/Commands.vala:2459
 msgid "Flag"
 msgstr "Označiť"
 
-#: ../src/Commands.vala:2451
+#: ../src/Commands.vala:2459
 msgid "Unflag"
 msgstr "Odznačiť"
 
@@ -1500,9 +1463,9 @@ msgstr[1] ""
 msgstr[2] ""
 "Táto operácia odstráni značku „%s“ z %d fotografií. Chcete pokračovať?"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1385
-#: ../src/Resources.vala:328 ../src/Resources.vala:376
-#: ../src/Resources.vala:641
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
+#: ../src/Resources.vala:163 ../src/Resources.vala:369
+#: ../src/Resources.vala:417 ../src/Resources.vala:682
 msgid "_Delete"
 msgstr "O_dstrániť"
 
@@ -1580,45 +1543,45 @@ msgid "Current"
 msgstr "Aktuálny"
 
 #. layout controls
-#: ../src/Dialogs.vala:212
+#: ../src/Dialogs.vala:213
 msgid "_Format:"
 msgstr "_Formát:"
 
-#: ../src/Dialogs.vala:215
+#: ../src/Dialogs.vala:216
 msgid "_Quality:"
 msgstr "_Kvalita:"
 
-#: ../src/Dialogs.vala:218
+#: ../src/Dialogs.vala:219
 msgid "_Scaling constraint:"
 msgstr "_Zachovať pomer podľa:"
 
-#: ../src/Dialogs.vala:221
-msgid " _pixels"
-msgstr " _pixelov"
+#: ../src/Dialogs.vala:222
+msgid "_Pixels:"
+msgstr "_Pixely:"
 
-#: ../src/Dialogs.vala:229
+#: ../src/Dialogs.vala:225
 msgid "Export metadata"
 msgstr "Exportovať metaúdaje"
 
-#: ../src/Dialogs.vala:465
+#: ../src/Dialogs.vala:459
 msgid "Save Details..."
 msgstr "Uložiť podrobnosti..."
 
 # dialog title
-#: ../src/Dialogs.vala:466
+#: ../src/Dialogs.vala:460
 msgid "Save Details"
 msgstr "Uloženie podrobností"
 
-#: ../src/Dialogs.vala:481
+#: ../src/Dialogs.vala:475
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(a %d naviac)\n"
 
-#: ../src/Dialogs.vala:534
+#: ../src/Dialogs.vala:528
 msgid "Import Results Report"
 msgstr "Hlásenie o výsledkoch importovania"
 
-#: ../src/Dialogs.vala:538
+#: ../src/Dialogs.vala:532
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
@@ -1626,7 +1589,7 @@ msgstr[0] "Pokúsilo sa importovať %d súborov."
 msgstr[1] "Pokúsilo sa importovať jeden súbor."
 msgstr[2] "Pokúsilo sa importovať %d súbory."
 
-#: ../src/Dialogs.vala:541
+#: ../src/Dialogs.vala:535
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -1637,30 +1600,30 @@ msgstr[2] "Z týchto súborov boli úspešne importované %d."
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:553
+#: ../src/Dialogs.vala:547
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Duplikátne fotografie/videá, ktoré neboli importované:"
 
-#: ../src/Dialogs.vala:557
+#: ../src/Dialogs.vala:551
 msgid "duplicates existing media item"
 msgstr "duplikátna položka existujúceho multimédia"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: ../src/Dialogs.vala:568
+#: ../src/Dialogs.vala:562
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Fotografie/videá neboli importované kvôli problémom s fotoaparátom:"
 
-#: ../src/Dialogs.vala:571 ../src/Dialogs.vala:586 ../src/Dialogs.vala:601
-#: ../src/Dialogs.vala:617 ../src/Dialogs.vala:632 ../src/Dialogs.vala:646
+#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
+#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
 msgid "error message:"
 msgstr "Správa o chybe:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: ../src/Dialogs.vala:582
+#: ../src/Dialogs.vala:576
 msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgstr ""
 "Súbory neboli importované, pretože neboli rozpoznané ako fotografie alebo "
@@ -1669,7 +1632,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: ../src/Dialogs.vala:597
+#: ../src/Dialogs.vala:591
 msgid ""
 "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
 "Understands:"
@@ -1680,7 +1643,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: ../src/Dialogs.vala:612
+#: ../src/Dialogs.vala:606
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
 "Library:"
@@ -1688,7 +1651,7 @@ msgstr ""
 "Fotografie/videá neboli importované, pretože program Shotwell ich nedokáže "
 "skopírovať do svojej knižnice:"
 
-#: ../src/Dialogs.vala:616
+#: ../src/Dialogs.vala:610
 #, c-format
 msgid ""
 "couldn't copy %s\n"
@@ -1700,18 +1663,18 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: ../src/Dialogs.vala:628
+#: ../src/Dialogs.vala:622
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Fotografie/videá neboli importované, pretože súbory sú poškodené:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: ../src/Dialogs.vala:643
+#: ../src/Dialogs.vala:637
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Fotografie/videá neboli importované kvôli iným dôvodom:"
 
-#: ../src/Dialogs.vala:663
+#: ../src/Dialogs.vala:657
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
@@ -1719,7 +1682,7 @@ msgstr[0] "%d duplikátnych fotografií nebolo importovaných:\n"
 msgstr[1] "1 duplikátna fotografia nebola importovaná:\n"
 msgstr[2] "%d duplikátne fotografie neboli importované:\n"
 
-#: ../src/Dialogs.vala:666
+#: ../src/Dialogs.vala:660
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
@@ -1727,7 +1690,7 @@ msgstr[0] "%d duplicitných videí nebolo importovaných:\n"
 msgstr[1] "1 duplicitné video nebolo importované:\n"
 msgstr[2] "%d duplicitné videá neboli importované:\n"
 
-#: ../src/Dialogs.vala:669
+#: ../src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
@@ -1735,7 +1698,7 @@ msgstr[0] "%d duplicitných fotografií/videí nebolo importovaných:\n"
 msgstr[1] "1 duplicitná fotografia/video nebola importovaná:\n"
 msgstr[2] "%d duplicitné fotografie/videá neboli importované:\n"
 
-#: ../src/Dialogs.vala:683
+#: ../src/Dialogs.vala:677
 #, 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"
@@ -1749,7 +1712,7 @@ msgstr[2] ""
 "%d fotografie sa nepodarilo importovať kvôli súborovej alebo hardvérovej "
 "chybe:\n"
 
-#: ../src/Dialogs.vala:686
+#: ../src/Dialogs.vala:680
 #, 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"
@@ -1760,7 +1723,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%d videá sa nepodarilo importovať kvôli súborovej alebo hardvérovej chybe:\n"
 
-#: ../src/Dialogs.vala:689
+#: ../src/Dialogs.vala:683
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -1775,7 +1738,7 @@ msgstr[2] ""
 "%d fotografie/videá sa nepodarilo importovať kvôli súborovej alebo "
 "hardvérovej chybe:\n"
 
-#: ../src/Dialogs.vala:692
+#: ../src/Dialogs.vala:686
 #, 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"
@@ -1787,7 +1750,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%d súbory sa nepodarilo importovať kvôli súborovej alebo hardvérovej chybe:\n"
 
-#: ../src/Dialogs.vala:706
+#: ../src/Dialogs.vala:700
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -1804,7 +1767,7 @@ msgstr[2] ""
 "%d fotografie sa nepodarilo importovať, pretože do priečinka s knižnicou "
 "fotografií sa nedá zapisovať:\n"
 
-#: ../src/Dialogs.vala:709
+#: ../src/Dialogs.vala:703
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -1821,7 +1784,7 @@ msgstr[2] ""
 "%d videá sa nepodarilo importovať, pretože do priečinka s knižnicou "
 "fotografií sa nedá zapisovať:\n"
 
-#: ../src/Dialogs.vala:712
+#: ../src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1839,7 +1802,7 @@ msgstr[2] ""
 "%d fotografie/videá sa nepodarilo importovať, pretože do priečinka s "
 "knižnicou fotografií sa nedá zapisovať:\n"
 
-#: ../src/Dialogs.vala:715
+#: ../src/Dialogs.vala:709
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -1856,7 +1819,7 @@ msgstr[2] ""
 "%d súbory sa nepodarilo importovať, pretože do priečinka s knižnicou "
 "fotografií sa nedá zapisovať:\n"
 
-#: ../src/Dialogs.vala:729
+#: ../src/Dialogs.vala:723
 #, 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"
@@ -1864,7 +1827,7 @@ msgstr[0] "%d fotografií sa nepodarilo importovať kvôli chybe fotoaparátu:\n
 msgstr[1] "1 fotografiu sa nepodarilo importovať kvôli chybe fotoaparátu:\n"
 msgstr[2] "%d fotografie sa nepodarilo importovať kvôli chybe fotoaparátu:\n"
 
-#: ../src/Dialogs.vala:732
+#: ../src/Dialogs.vala:726
 #, 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"
@@ -1872,7 +1835,7 @@ msgstr[0] "%d videí sa nepodarilo importovať kvôli chybe fotoaparátu:\n"
 msgstr[1] "1 video sa nepodarilo importovať kvôli chybe fotoaparátu:\n"
 msgstr[2] "%d videá sa nepodarilo importovať kvôli chybe fotoaparátu:\n"
 
-#: ../src/Dialogs.vala:735
+#: ../src/Dialogs.vala:729
 #, 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"
@@ -1883,7 +1846,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%d fotografie/videá sa nepodarilo importovať kvôli chybe fotoaparátu:\n"
 
-#: ../src/Dialogs.vala:738
+#: ../src/Dialogs.vala:732
 #, 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"
@@ -1891,7 +1854,7 @@ msgstr[0] "%d súborov sa nepodarilo importovať kvôli chybe fotoaparátu:\n"
 msgstr[1] "1 súbor sa nepodarilo importovať kvôli chybe fotoaparátu:\n"
 msgstr[2] "%d súbory sa nepodarilo importovať kvôli chybe fotoaparátu:\n"
 
-#: ../src/Dialogs.vala:752
+#: ../src/Dialogs.vala:746
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
@@ -1899,7 +1862,7 @@ msgstr[0] "Importovanie %d fotografií zlyhalo, pretože boli poškodené:\n"
 msgstr[1] "Importovanie jednej fotografie zlyhalo, pretože bola poškodená:\n"
 msgstr[2] "Importovanie %d fotografií zlyhalo, pretože boli poškodené:\n"
 
-#: ../src/Dialogs.vala:755
+#: ../src/Dialogs.vala:749
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
@@ -1907,7 +1870,7 @@ msgstr[0] "Importovanie %d videí zlyhalo, pretože boli poškodené:\n"
 msgstr[1] "Importovanie jedného videa zlyhalo, pretože bolo poškodené:\n"
 msgstr[2] "Importovanie %d videí zlyhalo, pretože boli poškodené:\n"
 
-#: ../src/Dialogs.vala:758
+#: ../src/Dialogs.vala:752
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
@@ -1916,7 +1879,7 @@ msgstr[1] ""
 "Importovanie jednej fotografie/videa zlyhalo, pretože bolo poškodené:\n"
 msgstr[2] "Importovanie %d fotografií/videí zlyhalo, pretože boli poškodené:\n"
 
-#: ../src/Dialogs.vala:761
+#: ../src/Dialogs.vala:755
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
@@ -1928,7 +1891,7 @@ msgstr[2] "Importovanie %d súborov zlyhalo, pretože boli poškodené:\n"
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: ../src/Dialogs.vala:778
+#: ../src/Dialogs.vala:772
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1938,7 +1901,7 @@ msgstr[2] "%d nepodporované fotografie boli preskočené:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: ../src/Dialogs.vala:793
+#: ../src/Dialogs.vala:787
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
@@ -1946,7 +1909,7 @@ msgstr[0] "%d súborov, ktoré nie sú obrázkami, bolo preskočených.\n"
 msgstr[1] "Jeden súbor, ktorý nie je obrázok, bol preskočený.\n"
 msgstr[2] "%d súbory, ktorý nie sú obrázkami, boli preskočené.\n"
 
-#: ../src/Dialogs.vala:804
+#: ../src/Dialogs.vala:798
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
@@ -1954,7 +1917,7 @@ msgstr[0] "%d fotografií bolo preskočených kvôli prerušeniu používateľom
 msgstr[1] "Jedna fotografia bola preskočená kvôli prerušeniu používateľom:\n"
 msgstr[2] "%d fotografie boli preskočené kvôli prerušeniu používateľom:\n"
 
-#: ../src/Dialogs.vala:807
+#: ../src/Dialogs.vala:801
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
@@ -1962,7 +1925,7 @@ msgstr[0] "%d videí bolo preskočených kvôli prerušeniu používateľom:\n"
 msgstr[1] "Jedno video bolo preskočené kvôli prerušeniu používateľom:\n"
 msgstr[2] "%d videá bolí preskočené kvôli prerušeniu používateľom:\n"
 
-#: ../src/Dialogs.vala:810
+#: ../src/Dialogs.vala:804
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
@@ -1973,7 +1936,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%d fotografií/videí bolo preskočených kvôli prerušeniu používateľom:\n"
 
-#: ../src/Dialogs.vala:813
+#: ../src/Dialogs.vala:807
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
@@ -1981,7 +1944,7 @@ msgstr[0] "%d súborov bolo preskočených kvôli prerušeniu používateľom:\n
 msgstr[1] "Jeden súbor bol preskočený kvôli prerušeniu používateľom:\n"
 msgstr[2] "%d súbory boli preskočené kvôli prerušeniu používateľom:\n"
 
-#: ../src/Dialogs.vala:827
+#: ../src/Dialogs.vala:821
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
@@ -1989,7 +1952,7 @@ msgstr[0] "%d fotografií bolo úspešne importovaných.\n"
 msgstr[1] "Jedna fotografia bola úspešne importovaná.\n"
 msgstr[2] "%d fotografie boli úspešne importované.\n"
 
-#: ../src/Dialogs.vala:830
+#: ../src/Dialogs.vala:824
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
@@ -1997,7 +1960,7 @@ msgstr[0] "%d videí bolo úspešne importovaných.\n"
 msgstr[1] "Jedno video bolo úspešne importované.\n"
 msgstr[2] "%d videá bolo úspešne importované.\n"
 
-#: ../src/Dialogs.vala:833
+#: ../src/Dialogs.vala:827
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -2007,15 +1970,15 @@ msgstr[2] "%d fotografie/videá boli úspešne importované.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: ../src/Dialogs.vala:849
+#: ../src/Dialogs.vala:843
 msgid "No photos or videos imported.\n"
 msgstr "Žiadne fotografie ani videá neboli importované.\n"
 
-#: ../src/Dialogs.vala:856 ../src/Dialogs.vala:875
+#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
 msgid "Import Complete"
 msgstr "Importovanie dokončené"
 
-#: ../src/Dialogs.vala:1161
+#: ../src/Dialogs.vala:1155
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -2023,7 +1986,7 @@ msgstr[0] "%d sekúnd"
 msgstr[1] "%d sekunda"
 msgstr[2] "%d sekundy"
 
-#: ../src/Dialogs.vala:1164
+#: ../src/Dialogs.vala:1158
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2031,7 +1994,7 @@ msgstr[0] "%d minút"
 msgstr[1] "%d minúta"
 msgstr[2] "%d minúty"
 
-#: ../src/Dialogs.vala:1168
+#: ../src/Dialogs.vala:1162
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -2039,70 +2002,68 @@ msgstr[0] "%d hodín"
 msgstr[1] "%d hodina"
 msgstr[2] "%d hodiny"
 
-#: ../src/Dialogs.vala:1171
+#: ../src/Dialogs.vala:1165
 msgid "1 day"
 msgstr "1 deň"
 
-#: ../src/Dialogs.vala:1319 ../src/Resources.vala:203
+#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
 msgid "Rename Event"
 msgstr "Premenovať udalosť"
 
-#: ../src/Dialogs.vala:1319
+#: ../src/Dialogs.vala:1315
 msgid "Name:"
 msgstr "Názov:"
 
-# DK: https://bugzilla.gnome.org/show_bug.cgi?id=736632
-#: ../src/Dialogs.vala:1329 ../src/Resources.vala:272
-#, fuzzy
+# DK:https://bugzilla.gnome.org/show_bug.cgi?id=744251
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
 msgid "Edit Title"
 msgstr "Upraviť názov"
 
-#: ../src/Dialogs.vala:1329 ../src/Properties.vala:340
+#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
 msgid "Title:"
 msgstr "Názov:"
 
 # DK: https://bugzilla.gnome.org/show_bug.cgi?id=736632
-#: ../src/Dialogs.vala:1343 ../src/Resources.vala:278
-#, fuzzy
+#. Dialog title
+#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
 msgid "Edit Event Comment"
-msgstr "Upraviť komentár k udalosti"
+msgstr "Upravenie komentára k udalosti"
 
 # window title
-#: ../src/Dialogs.vala:1343
+#: ../src/Dialogs.vala:1344
 msgid "Edit Photo/Video Comment"
 msgstr "Úprava komentáru k fotografii/videu"
 
-#: ../src/Dialogs.vala:1344 ../src/Properties.vala:630
+#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
 msgid "Comment:"
 msgstr "Komentár:"
 
-#: ../src/Dialogs.vala:1360
-#| msgid "_Trash File"
-#| msgid_plural "_Trash Files"
+#: ../src/Dialogs.vala:1361
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "_Vyhodiť súbory do koša"
 msgstr[1] "_Vyhodiť súbor do koša"
 msgstr[2] "_Vyhodiť súbory do koša"
 
-#: ../src/Dialogs.vala:1364
-#| msgid "Remove From Library"
+#: ../src/Dialogs.vala:1365
 msgid "_Remove From Library"
 msgstr "Odstrániť z knižnice"
 
-#: ../src/Dialogs.vala:1384 ../src/camera/ImportPage.vala:1739
+#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
 msgid "_Keep"
 msgstr "_Ponechať"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edit?"
 msgstr "Vrátiť externú úpravu?"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edits?"
 msgstr "Vrátiť externé úpravy?"
 
-#: ../src/Dialogs.vala:1409
+#: ../src/Dialogs.vala:1410
 #, c-format
 msgid "This will destroy all changes made to the external file.  Continue?"
 msgid_plural ""
@@ -2116,15 +2077,15 @@ msgstr[2] ""
 "Táto operácia zničí všetky zmeny vykonané na %d externých súboroch. "
 "Pokračovať?"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edit"
 msgstr "V_rátiť externé úpravy"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edits"
 msgstr "V_rátiť externé úpravy"
 
-#: ../src/Dialogs.vala:1434
+#: ../src/Dialogs.vala:1435
 #, c-format
 msgid "This will remove the photo from the library.  Continue?"
 msgid_plural "This will remove %d photos from the library.  Continue?"
@@ -2132,72 +2093,72 @@ msgstr[0] "Táto operácia odstráni %d fotografií z knižnice. Chcete pokračo
 msgstr[1] "Táto operácia odstráni fotografiu z knižnice. Chcete pokračovať?"
 msgstr[2] "Táto operácia odstráni %d fotografie z knižnice. Chcete pokračovať?"
 
-#: ../src/Dialogs.vala:1441
+#: ../src/Dialogs.vala:1442 ../src/Resources.vala:178
 msgid "_Remove"
 msgstr "O_dstrániť"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photo From Library"
 msgstr "Odstrániť fotografie z knižnice"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photos From Library"
 msgstr "Odstrániť fotografie z knižnice"
 
-#: ../src/Dialogs.vala:1535
+#: ../src/Dialogs.vala:1536
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1682
+#: ../src/Dialogs.vala:1688
 msgid "AM"
 msgstr "AM"
 
-#: ../src/Dialogs.vala:1683
+#: ../src/Dialogs.vala:1689
 msgid "PM"
 msgstr "PM"
 
-#: ../src/Dialogs.vala:1684
+#: ../src/Dialogs.vala:1690
 msgid "24 Hr"
 msgstr "24-hodinový"
 
-#: ../src/Dialogs.vala:1699
+#: ../src/Dialogs.vala:1705
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Posunúť fotografie/videá o rovnakú hodnotu"
 
-#: ../src/Dialogs.vala:1704
+#: ../src/Dialogs.vala:1710
 msgid "Set _all photos/videos to this time"
 msgstr "Nastaviť _všetky fotografie/videá na tento čas"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo file"
 msgstr "_Zmeniť pôvodný súbor fotky"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo files"
 msgstr "_Zmeniť pôvodné súbory fotiek"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original file"
 msgstr "_Upraviť pôvodné súbory"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original files"
 msgstr "_Zmeniť pôvodné súbory"
 
-#: ../src/Dialogs.vala:1800
+#: ../src/Dialogs.vala:1806
 msgid "Original: "
 msgstr "Originál: "
 
-#: ../src/Dialogs.vala:1801
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%H:%M:%S %p, %d. %b %Y"
 
-#: ../src/Dialogs.vala:1802
+#: ../src/Dialogs.vala:1808
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%I:%M:%S %p, %d. %b %Y"
 
-#: ../src/Dialogs.vala:1891
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -2206,7 +2167,7 @@ msgstr ""
 "Doba expozície sa posunie vpred o\n"
 "%d %s, %d %s, %d %s, a %d %s."
 
-#: ../src/Dialogs.vala:1892
+#: ../src/Dialogs.vala:1898
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2215,35 +2176,35 @@ msgstr ""
 "Doba expozície sa posunie dozadu o\n"
 "%d %s, %d %s, %d %s, a %d %s."
 
-#: ../src/Dialogs.vala:1894
+#: ../src/Dialogs.vala:1900
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dní"
 msgstr[1] "deň"
 msgstr[2] "dni"
 
-#: ../src/Dialogs.vala:1895
+#: ../src/Dialogs.vala:1901
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hodín"
 msgstr[1] "hodina"
 msgstr[2] "hodiny"
 
-#: ../src/Dialogs.vala:1896
+#: ../src/Dialogs.vala:1902
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minút"
 msgstr[1] "minúta"
 msgstr[2] "minúty"
 
-#: ../src/Dialogs.vala:1897
+#: ../src/Dialogs.vala:1903
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekúnd"
 msgstr[1] "sekunda"
 msgstr[2] "sekundy"
 
-#: ../src/Dialogs.vala:1941
+#: ../src/Dialogs.vala:1947
 #, c-format
 msgid ""
 "\n"
@@ -2266,49 +2227,49 @@ msgstr[2] ""
 "\n"
 "A %d ďalšie."
 
-#: ../src/Dialogs.vala:1963 ../src/Dialogs.vala:1990
+#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
 msgid "Tags (separated by commas):"
 msgstr "Značky (oddelené čiarkou):"
 
-#: ../src/Dialogs.vala:2070
+#: ../src/Dialogs.vala:2076
 msgid "Welcome!"
 msgstr "Vitajte!"
 
-#: ../src/Dialogs.vala:2077
+#: ../src/Dialogs.vala:2083
 msgid "Welcome to Shotwell!"
 msgstr "Vitajte v Shotwell!"
 
-#: ../src/Dialogs.vala:2081
+#: ../src/Dialogs.vala:2087
 msgid "To get started, import photos in any of these ways:"
 msgstr "Aby ste začali, importujte fotografie jedným z následujúcich spôsobov:"
 
-#: ../src/Dialogs.vala:2100
+#: ../src/Dialogs.vala:2106
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Zvoľte <span weight=\"bold\">Importovať súbor %s z priečinka</span>"
 
-#: ../src/Dialogs.vala:2101
+#: ../src/Dialogs.vala:2107
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Pretiahnite fotografie do Shotwell okna"
 
-#: ../src/Dialogs.vala:2102
+#: ../src/Dialogs.vala:2108
 msgid "Connect a camera to your computer and import"
 msgstr "Pripojte fotoaparát k vášmu počítaču a importujte"
 
-#: ../src/Dialogs.vala:2112
+#: ../src/Dialogs.vala:2118
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importovať fotografie z vášho priečinka %s"
 
-#: ../src/Dialogs.vala:2119
+#: ../src/Dialogs.vala:2125
 msgid "You can also import photos in any of these ways:"
 msgstr "Takisto môžete importovať fotografie jedným z následujúcich spôsobov:"
 
-#: ../src/Dialogs.vala:2129
+#: ../src/Dialogs.vala:2135
 msgid "_Don't show this message again"
 msgstr "_Nezobrazovať znova túto správu"
 
-#: ../src/Dialogs.vala:2164
+#: ../src/Dialogs.vala:2170
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Importovať fotografie z vašej knižnice %s"
@@ -2316,41 +2277,41 @@ msgstr "Importovať fotografie z vašej knižnice %s"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2308 ../src/Dialogs.vala:2312
+#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
 msgid "(Help)"
 msgstr "(Pomocník)"
 
-#: ../src/Dialogs.vala:2321
+#: ../src/Dialogs.vala:2324
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Rok%sMesiac%sDeň"
 
-#: ../src/Dialogs.vala:2323
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth"
 msgstr "Rok%sMesiac"
 
-#: ../src/Dialogs.vala:2325
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Rok%sMesiac-Deň"
 
-#: ../src/Dialogs.vala:2327
+#: ../src/Dialogs.vala:2330
 msgid "Year-Month-Day"
 msgstr "Rok-Mesiac-Deň"
 
-#: ../src/Dialogs.vala:2328 ../src/editing_tools/EditingTools.vala:781
+#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Vlastný"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2565
+#: ../src/Dialogs.vala:2568
 msgid "Invalid pattern"
 msgstr "Chybný vzorec"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: ../src/Dialogs.vala:2668
+#: ../src/Dialogs.vala:2670
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2358,31 +2319,31 @@ msgstr ""
 "Shotwell môže skopírovať fotografie do vášho priečinka s knižnicou alebo ich "
 "importovať bez kopírovania."
 
-#: ../src/Dialogs.vala:2673
+#: ../src/Dialogs.vala:2675
 msgid "Co_py Photos"
 msgstr "Ko_pírovať fotografie"
 
-#: ../src/Dialogs.vala:2674
+#: ../src/Dialogs.vala:2676
 msgid "_Import in Place"
 msgstr "_Importovať na mieste"
 
-#: ../src/Dialogs.vala:2675
+#: ../src/Dialogs.vala:2677
 msgid "Import to Library"
 msgstr "Importovať do knižnice"
 
-#: ../src/Dialogs.vala:2685 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
 msgid "Remove From Library"
 msgstr "Odstrániť z knižnice"
 
-#: ../src/Dialogs.vala:2686 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
 msgid "Removing Photo From Library"
 msgstr "Odstraňuje sa fotografia z knižnice"
 
-#: ../src/Dialogs.vala:2686
+#: ../src/Dialogs.vala:2688
 msgid "Removing Photos From Library"
 msgstr "Odstraňujú sa fotografie z knižnice"
 
-#: ../src/Dialogs.vala:2700
+#: ../src/Dialogs.vala:2702
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -2412,7 +2373,7 @@ msgstr[2] ""
 "\n"
 "Táto operácia sa nedá vrátiť späť."
 
-#: ../src/Dialogs.vala:2704
+#: ../src/Dialogs.vala:2706
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -2440,7 +2401,7 @@ msgstr[2] ""
 "\n"
 "Táto operácia sa nedá vrátiť späť."
 
-#: ../src/Dialogs.vala:2708
+#: ../src/Dialogs.vala:2710
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -2468,7 +2429,7 @@ msgstr[2] ""
 "\n"
 "Táto akcie nemôže byť vrátená späť."
 
-#: ../src/Dialogs.vala:2740
+#: ../src/Dialogs.vala:2742
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -2485,7 +2446,7 @@ msgstr[2] ""
 "Chcete tieto súbory odstrániť?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2757
+#: ../src/Dialogs.vala:2759
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -2550,116 +2511,124 @@ msgid "Unable to process monitoring updates: %s"
 msgstr "Nie je možné spracovať aktualizácie sledovania: %s"
 
 # tooltip
-#: ../src/MediaPage.vala:143
+#: ../src/MediaPage.vala:158
 msgid "Adjust the size of the thumbnails"
 msgstr "Upraví veľkosť náhľadov"
 
-#: ../src/MediaPage.vala:325 ../src/PhotoPage.vala:2590
-#: ../src/direct/DirectPhotoPage.vala:174
+#: ../src/MediaPage.vala:340 ../src/PhotoPage.vala:2593
+#: ../src/Resources.vala:188 ../src/direct/DirectPhotoPage.vala:174
 msgid "Zoom _In"
 msgstr "_Priblížiť"
 
-#: ../src/MediaPage.vala:326
+#: ../src/MediaPage.vala:341
 msgid "Increase the magnification of the thumbnails"
 msgstr "Zvýšiť zväčšenie nadhľadov"
 
-#: ../src/MediaPage.vala:331 ../src/PhotoPage.vala:2596
-#: ../src/direct/DirectPhotoPage.vala:180
+#: ../src/MediaPage.vala:346 ../src/PhotoPage.vala:2599
+#: ../src/Resources.vala:189 ../src/direct/DirectPhotoPage.vala:180
 msgid "Zoom _Out"
 msgstr "_Vzdialiť"
 
-#: ../src/MediaPage.vala:332
+#: ../src/MediaPage.vala:347
 msgid "Decrease the magnification of the thumbnails"
 msgstr "Zmenšiť zväčšenie nadhľadov"
 
-#: ../src/MediaPage.vala:399
+#: ../src/MediaPage.vala:414
 msgid "Sort _Photos"
 msgstr "Usporiadať _fotografie"
 
-#: ../src/MediaPage.vala:408
+#: ../src/MediaPage.vala:423
 msgid "_Play Video"
 msgstr "_Prehrať video"
 
-#: ../src/MediaPage.vala:409
+#: ../src/MediaPage.vala:424
 msgid "Open the selected videos in the system video player"
 msgstr "Otvoriť vybrané videá v systémovom prehrávači videa"
 
-#: ../src/MediaPage.vala:413 ../src/PhotoPage.vala:2639
+#: ../src/MediaPage.vala:428 ../src/PhotoPage.vala:2642
 msgid "_Developer"
 msgstr "_Vývojár"
 
-#: ../src/MediaPage.vala:425 ../src/camera/Branch.vala:101
+#: ../src/MediaPage.vala:440 ../src/camera/Branch.vala:99
 #: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
-#: ../src/photos/RawSupport.vala:300
+#: ../src/photos/RawSupport.vala:303
 msgid "Camera"
 msgstr "Fotoaparát"
 
-#: ../src/MediaPage.vala:436 ../src/camera/ImportPage.vala:872
+#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:874
 msgid "_Titles"
 msgstr "_Názvy"
 
-#: ../src/MediaPage.vala:437 ../src/camera/ImportPage.vala:873
+#: ../src/MediaPage.vala:452 ../src/camera/ImportPage.vala:875
 msgid "Display the title of each photo"
 msgstr "Zobraziť názov každej fotografie"
 
-#: ../src/MediaPage.vala:442 ../src/events/EventsDirectoryPage.vala:130
+#: ../src/MediaPage.vala:457 ../src/events/EventsDirectoryPage.vala:130
 msgid "_Comments"
 msgstr "Komentár"
 
 # tooltip
-#: ../src/MediaPage.vala:443
+#: ../src/MediaPage.vala:458
 msgid "Display the comment of each photo"
 msgstr "Zobrazí komentár ku každej fotografii"
 
-#: ../src/MediaPage.vala:454 ../src/library/LibraryWindow.vala:376
+#: ../src/MediaPage.vala:469 ../src/library/LibraryWindow.vala:360
 msgid "Ta_gs"
 msgstr "_Značky"
 
-#: ../src/MediaPage.vala:455
+#: ../src/MediaPage.vala:470
 msgid "Display each photo's tags"
 msgstr "Zobraziť značky každej fotografie"
 
-#: ../src/MediaPage.vala:471
+#: ../src/MediaPage.vala:486
 msgid "By _Title"
 msgstr "Podľa _názvu"
 
-#: ../src/MediaPage.vala:472
+#: ../src/MediaPage.vala:487
 msgid "Sort photos by title"
 msgstr "Usporiadať fotografie podľa názvu"
 
-#: ../src/MediaPage.vala:477
+#: ../src/MediaPage.vala:492
 msgid "By Exposure _Date"
 msgstr "Podľa _dátumu vytvorenie"
 
-#: ../src/MediaPage.vala:478
+#: ../src/MediaPage.vala:493
 msgid "Sort photos by exposure date"
 msgstr "Usporiadať fotografie podľa dátumu vytvorenia"
 
-#: ../src/MediaPage.vala:483
+#: ../src/MediaPage.vala:498
 msgid "By _Rating"
 msgstr "Podľa  _hodnotenia"
 
-#: ../src/MediaPage.vala:484
+#: ../src/MediaPage.vala:499
 msgid "Sort photos by rating"
 msgstr "Usporiadať fotografie podľa hodnotenia"
 
-#: ../src/MediaPage.vala:494 ../src/library/LibraryWindow.vala:422
+#: ../src/MediaPage.vala:504
+msgid "By _Filename"
+msgstr "Podľa názvu _súboru"
+
+#: ../src/MediaPage.vala:505
+msgid "Sort photos by filename"
+msgstr "Usporiada fotografie podľa názvu súboru"
+
+#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:406
 msgid "_Ascending"
 msgstr "Vz_ostupne"
 
-#: ../src/MediaPage.vala:495 ../src/library/LibraryWindow.vala:423
+#: ../src/MediaPage.vala:516 ../src/library/LibraryWindow.vala:407
 msgid "Sort photos in an ascending order"
 msgstr "Usporiadať fotografie vo vzostupnom poradí"
 
-#: ../src/MediaPage.vala:500 ../src/library/LibraryWindow.vala:429
+#: ../src/MediaPage.vala:521 ../src/library/LibraryWindow.vala:413
 msgid "D_escending"
 msgstr "Zo_stupne"
 
-#: ../src/MediaPage.vala:501 ../src/library/LibraryWindow.vala:430
+#: ../src/MediaPage.vala:522 ../src/library/LibraryWindow.vala:414
 msgid "Sort photos in a descending order"
 msgstr "Usporiadať fotografie v zostupnom poradí"
 
-#: ../src/MediaPage.vala:702
+#: ../src/MediaPage.vala:723
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -2668,99 +2637,99 @@ msgstr ""
 "Shotwell nebol schopný prehrať vybrané video: \n"
 "%s"
 
-#: ../src/Page.vala:1268
+#: ../src/Page.vala:1263
 msgid "No photos/videos"
 msgstr "Žiadne fotografie/videá"
 
-#: ../src/Page.vala:1272
+#: ../src/Page.vala:1267
 msgid "No photos/videos found"
 msgstr "Neboli nájdené žiadne fotografie/videá"
 
-#: ../src/Page.vala:2569
+#: ../src/Page.vala:2565
 msgid "Photos cannot be exported to this directory."
 msgstr "Fotografie nemôžu byť exportované do tohoto adresára."
 
-#: ../src/Photo.vala:3656
+#: ../src/Photo.vala:3753
 msgid "modified"
 msgstr "upravené"
 
 #. previous button
-#: ../src/PhotoPage.vala:532
+#: ../src/PhotoPage.vala:533
 msgid "Previous photo"
 msgstr "Predchádzajúca fotografia"
 
 #. next button
-#: ../src/PhotoPage.vala:537
+#: ../src/PhotoPage.vala:539
 msgid "Next photo"
 msgstr "Ďalšia fotografia"
 
-#: ../src/PhotoPage.vala:1844
+#: ../src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Chýba zdrojový súbor fotografie: %s"
 
-#: ../src/PhotoPage.vala:2411 ../src/direct/DirectPhotoPage.vala:165
-#: ../src/library/LibraryWindow.vala:360
+#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
+#: ../src/library/LibraryWindow.vala:344
 msgid "_View"
 msgstr "_Zobraziť"
 
-#: ../src/PhotoPage.vala:2415 ../src/direct/DirectPhotoPage.vala:81
+#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
 msgid "T_ools"
 msgstr "Nás_troje"
 
-#: ../src/PhotoPage.vala:2420 ../src/direct/DirectPhotoPage.vala:86
+#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
 msgid "_Previous Photo"
 msgstr "_Predchádzajúca fotografia"
 
-#: ../src/PhotoPage.vala:2421 ../src/direct/DirectPhotoPage.vala:87
+#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
 msgid "Previous Photo"
 msgstr "Predchádzajúca fotografia"
 
-#: ../src/PhotoPage.vala:2426 ../src/direct/DirectPhotoPage.vala:92
+#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
 msgid "_Next Photo"
 msgstr "Ďa_lšia fotografia"
 
-#: ../src/PhotoPage.vala:2427 ../src/direct/DirectPhotoPage.vala:93
+#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
 msgid "Next Photo"
 msgstr "Ďalšia fotografia"
 
-#: ../src/PhotoPage.vala:2591 ../src/direct/DirectPhotoPage.vala:175
+#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
 msgid "Increase the magnification of the photo"
 msgstr "Zvýšiť zväčšenie fotografie"
 
-#: ../src/PhotoPage.vala:2597 ../src/direct/DirectPhotoPage.vala:181
+#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
 msgid "Decrease the magnification of the photo"
 msgstr "Zmenšiť zväčšenie fotografie"
 
-#: ../src/PhotoPage.vala:2602 ../src/direct/DirectPhotoPage.vala:186
+#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
 msgid "Fit to _Page"
 msgstr "Prispôsobiť _strane"
 
-#: ../src/PhotoPage.vala:2603 ../src/direct/DirectPhotoPage.vala:187
+#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
 msgid "Zoom the photo to fit on the screen"
 msgstr "Zväčšiť fotografiu na veľkosť obrazovky"
 
-#: ../src/PhotoPage.vala:2609 ../src/direct/DirectPhotoPage.vala:193
+#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
 #, no-c-format
 msgid "Zoom _100%"
 msgstr "Mierka _100%"
 
-#: ../src/PhotoPage.vala:2611 ../src/direct/DirectPhotoPage.vala:195
+#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
 #, no-c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "Priblížiť fotografiu na 100% zväčšenie"
 
-#: ../src/PhotoPage.vala:2617 ../src/direct/DirectPhotoPage.vala:201
+#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
 #, no-c-format
 msgid "Zoom _200%"
 msgstr "Mierka _200%"
 
-#: ../src/PhotoPage.vala:2619 ../src/direct/DirectPhotoPage.vala:203
+#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
 #, no-c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "Priblížiť fotografiu na 200% zväčšenie"
 
-#: ../src/PhotoPage.vala:3227
+#: ../src/PhotoPage.vala:3231
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Nepodarilo sa exportovať %s: %s"
@@ -2960,67 +2929,67 @@ msgid "Exposure:"
 msgstr "Expozícia:"
 
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:585
+#: ../src/Properties.vala:583
 msgid "Location:"
 msgstr "Umiestnenie:"
 
-#: ../src/Properties.vala:588
+#: ../src/Properties.vala:586
 msgid "File size:"
 msgstr "Veľkosť súboru:"
 
-#: ../src/Properties.vala:592
+#: ../src/Properties.vala:590
 msgid "Current Development:"
 msgstr "Aktuálny vývoj:"
 
-#: ../src/Properties.vala:594
+#: ../src/Properties.vala:592
 msgid "Original dimensions:"
 msgstr "Pôvodné rozmery:"
 
-#: ../src/Properties.vala:597
+#: ../src/Properties.vala:595
 msgid "Camera make:"
 msgstr "Výrobca fotoaparátu:"
 
-#: ../src/Properties.vala:600
+#: ../src/Properties.vala:598
 msgid "Camera model:"
 msgstr "Model fotoaparátu:"
 
-#: ../src/Properties.vala:603
+#: ../src/Properties.vala:601
 msgid "Flash:"
 msgstr "Blesk:"
 
-#: ../src/Properties.vala:605
+#: ../src/Properties.vala:603
 msgid "Focal length:"
 msgstr "Ohnisková vzdialenosť:"
 
-#: ../src/Properties.vala:608
+#: ../src/Properties.vala:606
 msgid "Exposure date:"
 msgstr "Dátum vytvorenia:"
 
-#: ../src/Properties.vala:611
+#: ../src/Properties.vala:609
 msgid "Exposure time:"
 msgstr "Čas vytvorenia:"
 
-#: ../src/Properties.vala:614
+#: ../src/Properties.vala:612
 msgid "Exposure bias:"
 msgstr "Expozícia:"
 
-#: ../src/Properties.vala:616
+#: ../src/Properties.vala:614
 msgid "GPS latitude:"
 msgstr "GPS zemepisná šírka:"
 
-#: ../src/Properties.vala:619
+#: ../src/Properties.vala:617
 msgid "GPS longitude:"
 msgstr "GPS zemepisná dĺžka:"
 
-#: ../src/Properties.vala:622
+#: ../src/Properties.vala:620
 msgid "Artist:"
 msgstr "Umelec:"
 
-#: ../src/Properties.vala:624
+#: ../src/Properties.vala:622
 msgid "Copyright:"
 msgstr "Autorské právo:"
 
-#: ../src/Properties.vala:626
+#: ../src/Properties.vala:624
 msgid "Software:"
 msgstr "Softvér:"
 
@@ -3036,669 +3005,768 @@ msgstr "Správca fotografií"
 msgid "Photo Viewer"
 msgstr "Prehliadač fotografií"
 
-#: ../src/Resources.vala:142
+#: ../src/Resources.vala:144
 msgid "Rotate _Right"
 msgstr "Otočiť do_prava"
 
-#: ../src/Resources.vala:143 ../src/Resources.vala:148
+#: ../src/Resources.vala:145 ../src/Resources.vala:150
 msgid "Rotate"
 msgstr "Otočiť"
 
-#: ../src/Resources.vala:144
+#: ../src/Resources.vala:146
 msgid "Rotate Right"
 msgstr "Otočiť doprava"
 
-#: ../src/Resources.vala:145
+#: ../src/Resources.vala:147
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Otočí fotografie doprava (stlačte Ctrl na otočenie doľava)"
 
-#: ../src/Resources.vala:147
+#: ../src/Resources.vala:149
 msgid "Rotate _Left"
 msgstr "Otočiť doľa_va"
 
-#: ../src/Resources.vala:149
+#: ../src/Resources.vala:151
 msgid "Rotate Left"
 msgstr "Otočiť doľava"
 
-#: ../src/Resources.vala:150
+#: ../src/Resources.vala:152
 msgid "Rotate the photos left"
 msgstr "Otočiť fotografie doľava"
 
-#: ../src/Resources.vala:152
+#: ../src/Resources.vala:154
 msgid "Flip Hori_zontally"
 msgstr "Prevrátiť vodo_rovne"
 
-#: ../src/Resources.vala:153
+#: ../src/Resources.vala:155
 msgid "Flip Horizontally"
 msgstr "Prevrátiť horizontálne"
 
-#: ../src/Resources.vala:155
+#: ../src/Resources.vala:157
 msgid "Flip Verti_cally"
 msgstr "Prevrátiť _zvislo"
 
-#: ../src/Resources.vala:156
+#: ../src/Resources.vala:158
 msgid "Flip Vertically"
 msgstr "Prevrátiť vertikálne"
 
-#: ../src/Resources.vala:158
+#: ../src/Resources.vala:160
+msgid "_About"
+msgstr "_O programe"
+
+#: ../src/Resources.vala:161
+msgid "_Apply"
+msgstr "_Použiť"
+
+#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
+#: ../src/library/LibraryWindow.vala:340
+msgid "_Edit"
+msgstr "_Upraviť"
+
+#: ../src/Resources.vala:165
+msgid "_Forward"
+msgstr "_Dopredu"
+
+#: ../src/Resources.vala:166
+msgid "Fulls_creen"
+msgstr "Na _celú obrazovku"
+
+#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
+#: ../src/library/LibraryWindow.vala:364
+msgid "_Help"
+msgstr "_Pomocník"
+
+#: ../src/Resources.vala:168
+msgid "Leave _Fullscreen"
+msgstr "Opustiť režim _celej obrazovky"
+
+#: ../src/Resources.vala:169 ../src/Resources.vala:371
+msgid "_New"
+msgstr "_Nová"
+
+#: ../src/Resources.vala:170
+msgid "_Next"
+msgstr "Ď_alšia"
+
+#: ../src/Resources.vala:171
+msgid "_OK"
+msgstr "_OK"
+
+#: ../src/Resources.vala:172
+msgid "_Play"
+msgstr "_Spustiť"
+
+#: ../src/Resources.vala:173 ../src/Resources.vala:325
+msgid "_Preferences"
+msgstr "_Nastavenia"
+
+#: ../src/Resources.vala:174
+msgid "_Previous"
+msgstr "_Predchádzajúca"
+
+#: ../src/Resources.vala:175
+msgid "_Print"
+msgstr "_Tlačiť"
+
+#: ../src/Resources.vala:176
+msgid "_Quit"
+msgstr "U_končiť"
+
+#: ../src/Resources.vala:177
+msgid "_Refresh"
+msgstr "_Obnoviť"
+
+#: ../src/Resources.vala:179
+msgid "_Revert"
+msgstr "V_rátiť"
+
+#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save"
+msgstr "_Uložiť"
+
+#: ../src/Resources.vala:181
+msgid "Save _As"
+msgstr "Uložiť _ako"
+
+#: ../src/Resources.vala:182
+msgid "Sort _Ascending"
+msgstr "Usporiadať vz_ostupne"
+
+#: ../src/Resources.vala:183
+msgid "Sort _Descending"
+msgstr "Usporiadať zo_stupne"
+
+#: ../src/Resources.vala:184
+msgid "_Stop"
+msgstr "_Zastaviť"
+
+#: ../src/Resources.vala:185
+msgid "_Undelete"
+msgstr "Vrátiť o_dstránenie"
+
+#: ../src/Resources.vala:186
+msgid "_Normal Size"
+msgstr "_Normálna veľkosť"
+
+#: ../src/Resources.vala:187
+msgid "Best _Fit"
+msgstr "_Prispôsobiť"
+
+#: ../src/Resources.vala:191
 msgid "_Enhance"
 msgstr "Vy_lepšiť"
 
-#: ../src/Resources.vala:159
+#: ../src/Resources.vala:192
 msgid "Enhance"
 msgstr "Vylepšiť"
 
 # tooltip
-#: ../src/Resources.vala:160
+#: ../src/Resources.vala:193
 msgid "Automatically improve the photo's appearance"
 msgstr "Automaticky vylepší vzhľad fotografie"
 
-#: ../src/Resources.vala:162
+#: ../src/Resources.vala:195
 msgid "_Copy Color Adjustments"
 msgstr "_Kopírovať úpravu farieb"
 
-#: ../src/Resources.vala:163
+#: ../src/Resources.vala:196
 msgid "Copy Color Adjustments"
 msgstr "Kopírovať úpravu farieb"
 
 # tooltip
-#: ../src/Resources.vala:164
+#: ../src/Resources.vala:197
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Skopíruje úpravu farieb aplikovanú na fotografiu"
 
-#: ../src/Resources.vala:166
+#: ../src/Resources.vala:199
 msgid "_Paste Color Adjustments"
 msgstr "_Vložiť úpravu farieb"
 
-#: ../src/Resources.vala:167
+#: ../src/Resources.vala:200
 msgid "Paste Color Adjustments"
 msgstr "Vložiť úpravu farieb"
 
 # tooltip
-#: ../src/Resources.vala:168
+#: ../src/Resources.vala:201
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Aplikuje skopírovanú úpravu farieb na vybranú fotografiu"
 
-#: ../src/Resources.vala:170
+#: ../src/Resources.vala:203
 msgid "_Crop"
 msgstr "O_rezať"
 
-#: ../src/Resources.vala:171
+#: ../src/Resources.vala:204
 msgid "Crop"
 msgstr "Orezať"
 
 # tooltip
-#: ../src/Resources.vala:172
+#: ../src/Resources.vala:205
 msgid "Crop the photo's size"
 msgstr "Oreže veľkosť fotografie"
 
-#: ../src/Resources.vala:174 ../src/editing_tools/StraightenTool.vala:100
+#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
 msgid "_Straighten"
 msgstr "_Vyrovnať"
 
-#: ../src/Resources.vala:175
+#: ../src/Resources.vala:208
 msgid "Straighten"
 msgstr "Vyrovnať"
 
 # tooltip
-#: ../src/Resources.vala:176
+#: ../src/Resources.vala:209
 msgid "Straighten the photo"
 msgstr "Vyrovná fotografiu"
 
-#: ../src/Resources.vala:178
+#: ../src/Resources.vala:211
 msgid "_Red-eye"
 msgstr "Červené _oči"
 
-#: ../src/Resources.vala:179
+#: ../src/Resources.vala:212
 msgid "Red-eye"
 msgstr "Červené oči"
 
 # tooltip
-#: ../src/Resources.vala:180
+#: ../src/Resources.vala:213
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Zmierni alebo odstráni efekt červených očí vo fotografii"
 
-#: ../src/Resources.vala:182
+#: ../src/Resources.vala:215
 msgid "_Adjust"
 msgstr "_Upraviť"
 
-#: ../src/Resources.vala:183
+#: ../src/Resources.vala:216
 msgid "Adjust"
 msgstr "Upraviť"
 
 # tooltip
-#: ../src/Resources.vala:184
+#: ../src/Resources.vala:217
 msgid "Adjust the photo's color and tone"
 msgstr "Upraví farbu a tón fotografie"
 
-#: ../src/Resources.vala:186
+#: ../src/Resources.vala:219
 msgid "Re_vert to Original"
 msgstr "Vrátiť do _pôvodného stavu"
 
-#: ../src/Resources.vala:187
+#: ../src/Resources.vala:220
 msgid "Revert to Original"
 msgstr "Vrátiť do pôvodného stavu"
 
-#: ../src/Resources.vala:189
+#: ../src/Resources.vala:222
 msgid "Revert External E_dits"
 msgstr "Vrátiť _externé úpravy"
 
-#: ../src/Resources.vala:190
+#: ../src/Resources.vala:223
 msgid "Revert to the master photo"
 msgstr "Vrátiť sa k pôvodnej fotografii"
 
-#: ../src/Resources.vala:192
+#: ../src/Resources.vala:225
 msgid "Set as _Desktop Background"
 msgstr "Nastaviť ako _pozadie pracovnej plochy"
 
-#: ../src/Resources.vala:193
+#: ../src/Resources.vala:226
 msgid "Set selected image to be the new desktop background"
 msgstr "Nastaviť vybraný obrázok ako pozadie pracovnej plochy"
 
-#: ../src/Resources.vala:194
+#: ../src/Resources.vala:227
 msgid "Set as _Desktop Slideshow..."
 msgstr "Nastaviť ako _prezentáciu pre pracovnú plochu..."
 
-#: ../src/Resources.vala:196
+#: ../src/Resources.vala:229
 msgid "_Undo"
 msgstr "Vrátiť _späť"
 
-#: ../src/Resources.vala:197
+#: ../src/Resources.vala:230
 msgid "Undo"
 msgstr "Vrátiť späť"
 
-#: ../src/Resources.vala:199
+#: ../src/Resources.vala:232
 msgid "_Redo"
 msgstr "_Opakovať vrátené"
 
-#: ../src/Resources.vala:200
+#: ../src/Resources.vala:233
 msgid "Redo"
 msgstr "Opakovať vrátené"
 
-#: ../src/Resources.vala:202
+#: ../src/Resources.vala:235
 msgid "Re_name Event..."
 msgstr "Pre_menovať udalosť..."
 
-#: ../src/Resources.vala:205
+#: ../src/Resources.vala:238
 msgid "Make _Key Photo for Event"
 msgstr "Označiť ako _hlavnú fotografiu udalosti"
 
-#: ../src/Resources.vala:206
+#: ../src/Resources.vala:239
 msgid "Make Key Photo for Event"
 msgstr "Označiť ako hlavnú fotografiu udalosti"
 
-#: ../src/Resources.vala:208
+#: ../src/Resources.vala:241
 msgid "_New Event"
 msgstr "_Nová udalosť"
 
-#: ../src/Resources.vala:209
+#: ../src/Resources.vala:242
 msgid "New Event"
 msgstr "Nová udalosť"
 
-#: ../src/Resources.vala:211
+#: ../src/Resources.vala:244
 msgid "Move Photos"
 msgstr "Presunúť fotografie"
 
-#: ../src/Resources.vala:212
+#: ../src/Resources.vala:245
 msgid "Move photos to an event"
 msgstr "Presunúť fotografie do udalosti"
 
-#: ../src/Resources.vala:214
+#: ../src/Resources.vala:247
 msgid "_Merge Events"
 msgstr "_Zlúčiť udalosti"
 
-#: ../src/Resources.vala:215
+#: ../src/Resources.vala:248
 msgid "Merge"
 msgstr "Zlúčiť"
 
-#: ../src/Resources.vala:216
+#: ../src/Resources.vala:249
 msgid "Combine events into a single event"
 msgstr "Zlúčiť udalosti do jednej udalosti"
 
-#: ../src/Resources.vala:218
+#: ../src/Resources.vala:251
 msgid "_Set Rating"
 msgstr "O_hodnotiť"
 
-#: ../src/Resources.vala:219
+#: ../src/Resources.vala:252
 msgid "Set Rating"
 msgstr "Ohodnotiť"
 
-#: ../src/Resources.vala:220
+#: ../src/Resources.vala:253
 msgid "Change the rating of your photo"
 msgstr "Zmeniť hodnotenie vašej fotografie"
 
-#: ../src/Resources.vala:222
+#: ../src/Resources.vala:255
 msgid "_Increase"
 msgstr "Z_výšiť"
 
-#: ../src/Resources.vala:223
+#: ../src/Resources.vala:256
 msgid "Increase Rating"
 msgstr "Zvýšiť hodnotenie"
 
-#: ../src/Resources.vala:225
+#: ../src/Resources.vala:258
 msgid "_Decrease"
 msgstr "_Znížiť"
 
-#: ../src/Resources.vala:226
+#: ../src/Resources.vala:259
 msgid "Decrease Rating"
 msgstr "Znížiť hodnotenie"
 
-#: ../src/Resources.vala:228
+#: ../src/Resources.vala:261
 msgid "_Unrated"
 msgstr "_Neohodnotená"
 
-#: ../src/Resources.vala:229
+#: ../src/Resources.vala:262
 msgid "Unrated"
 msgstr "Neohodnotená"
 
-#: ../src/Resources.vala:230
+#: ../src/Resources.vala:263
 msgid "Rate Unrated"
 msgstr "Hodnotiť neohodnotené"
 
-#: ../src/Resources.vala:231
+#: ../src/Resources.vala:264
 msgid "Setting as unrated"
 msgstr "Nastavuje sa ako neohodnotená"
 
-#: ../src/Resources.vala:232
+#: ../src/Resources.vala:265
 msgid "Remove any ratings"
 msgstr "Odstrániť všetky hodnotenia"
 
-#: ../src/Resources.vala:234
+#: ../src/Resources.vala:267
 msgid "_Rejected"
 msgstr "_Odmietnutá"
 
-#: ../src/Resources.vala:235
+#: ../src/Resources.vala:268
 msgid "Rejected"
 msgstr "Odmietnutá"
 
-#: ../src/Resources.vala:236
+#: ../src/Resources.vala:269
 msgid "Rate Rejected"
 msgstr "Hodnotiť odmietnuté"
 
-#: ../src/Resources.vala:237
+#: ../src/Resources.vala:270
 msgid "Setting as rejected"
 msgstr "Nastavuje sa ako odmietnutá"
 
-#: ../src/Resources.vala:238
+#: ../src/Resources.vala:271
 msgid "Set rating to rejected"
 msgstr "Nastaviť hodnotenie ako odmietnuté"
 
-#: ../src/Resources.vala:240
+#: ../src/Resources.vala:273
 msgid "Rejected _Only"
 msgstr "Len _odmietnuté"
 
-#: ../src/Resources.vala:241
+#: ../src/Resources.vala:274
 msgid "Rejected Only"
 msgstr "Len odmietnuté"
 
-#: ../src/Resources.vala:242
+#: ../src/Resources.vala:275
 msgid "Show only rejected photos"
 msgstr "Zobraziť len odmietnuté fotografie"
 
-#: ../src/Resources.vala:244
+#: ../src/Resources.vala:277
 msgid "All + _Rejected"
 msgstr "Všetky + o_dmietnuté"
 
-#: ../src/Resources.vala:245 ../src/Resources.vala:246
+#: ../src/Resources.vala:278 ../src/Resources.vala:279
 msgid "Show all photos, including rejected"
 msgstr "Zobraziť všetky fotografie vrátane odmietnutých"
 
-#: ../src/Resources.vala:248
+#: ../src/Resources.vala:281
 msgid "_All Photos"
 msgstr "_Všetky fotografie"
 
-# DK:https://bugzilla.gnome.org/show_bug.cgi?id=736632
-#: ../src/Resources.vala:249 ../src/Resources.vala:250
-#, fuzzy
+# DK: https://bugzilla.gnome.org/show_bug.cgi?id=744254
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:283 ../src/Resources.vala:285
 msgid "Show all photos"
 msgstr "Zobraziť všetky fotografie"
 
-#: ../src/Resources.vala:252
+#: ../src/Resources.vala:287
 msgid "_Ratings"
 msgstr "_Hodnotenia"
 
-#: ../src/Resources.vala:253
+#: ../src/Resources.vala:288
 msgid "Display each photo's rating"
 msgstr "Zobraziť hodnotenie každej fotografie"
 
-#: ../src/Resources.vala:255
+#: ../src/Resources.vala:290
 msgid "_Filter Photos"
 msgstr "_Filtrovať fotografie"
 
-#: ../src/Resources.vala:256
+#: ../src/Resources.vala:291
 msgid "Filter Photos"
 msgstr "Filtrovať fotografie"
 
-#: ../src/Resources.vala:257
+#: ../src/Resources.vala:292
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Obmedziť počet zobrazených fotografií na základe filtra"
 
-#: ../src/Resources.vala:259
+#: ../src/Resources.vala:294
 msgid "_Duplicate"
 msgstr "Du_plikovať"
 
-#: ../src/Resources.vala:260
+#: ../src/Resources.vala:295
 msgid "Duplicate"
 msgstr "Duplikovať"
 
-#: ../src/Resources.vala:261
+#: ../src/Resources.vala:296
 msgid "Make a duplicate of the photo"
 msgstr "Vytvoriť duplikát fotografie"
 
-#: ../src/Resources.vala:263
+#: ../src/Resources.vala:298
 msgid "_Export..."
 msgstr "_Exportovať..."
 
-#: ../src/Resources.vala:265
+#: ../src/Resources.vala:300
 msgid "_Print..."
 msgstr "_Tlačiť..."
 
-#: ../src/Resources.vala:267
+#: ../src/Resources.vala:302
 msgid "Pu_blish..."
 msgstr "_Uverejniť..."
 
-#: ../src/Resources.vala:269
+#: ../src/Resources.vala:304
 msgid "Publish to various websites"
 msgstr "Uverejní na rôznych webových stránkach"
 
-#: ../src/Resources.vala:271
+#: ../src/Resources.vala:306
 msgid "Edit _Title..."
 msgstr "Upraviť _názov..."
 
-#: ../src/Resources.vala:274
+#: ../src/Resources.vala:310
 msgid "Edit _Comment..."
 msgstr "Upraviť _komentár..."
 
-#: ../src/Resources.vala:275
+#. Button label
+#: ../src/Resources.vala:312
 msgid "Edit Comment"
 msgstr "Upraviť komentár"
 
-#: ../src/Resources.vala:277
+#: ../src/Resources.vala:314
 msgid "Edit Event _Comment..."
 msgstr "Upraviť komentár k _udalosti..."
 
-#: ../src/Resources.vala:280
+#: ../src/Resources.vala:317
 msgid "_Adjust Date and Time..."
 msgstr "_Upraviť dátum a čas..."
 
 # window title
-#: ../src/Resources.vala:281
+#: ../src/Resources.vala:318
 msgid "Adjust Date and Time"
 msgstr "Upráva dátumu a času"
 
-#: ../src/Resources.vala:283
+#: ../src/Resources.vala:320
 msgid "Add _Tags..."
 msgstr "Pridať _značky..."
 
-#: ../src/Resources.vala:284
+#: ../src/Resources.vala:321
 msgid "_Add Tags..."
 msgstr "_Pridať značky..."
 
-# DK: https://bugzilla.gnome.org/show_bug.cgi?id=736632
-#: ../src/Resources.vala:285 ../src/Resources.vala:316
-#, fuzzy
+# DK: https://bugzilla.gnome.org/show_bug.cgi?id=744255
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:323 ../src/Resources.vala:356
 msgid "Add Tags"
 msgstr "Pridať značky"
 
-#: ../src/Resources.vala:287
-msgid "_Preferences"
-msgstr "_Nastavenia"
-
-#: ../src/Resources.vala:289
+#: ../src/Resources.vala:327
 msgid "Open With E_xternal Editor"
 msgstr "Otvoriť pomocou e_xterného editora"
 
-#: ../src/Resources.vala:291
+#: ../src/Resources.vala:329
 msgid "Open With RA_W Editor"
 msgstr "Otvoriť pomocou RA_W editora"
 
-#: ../src/Resources.vala:293
+#: ../src/Resources.vala:331
 msgid "Send _To..."
 msgstr "Odoslať _do..."
 
-#: ../src/Resources.vala:294
+#: ../src/Resources.vala:332
 msgid "Send T_o..."
 msgstr "Odoslať d_o..."
 
-#: ../src/Resources.vala:296
+#: ../src/Resources.vala:334
 msgid "_Find..."
 msgstr "_Nájsť..."
 
-#: ../src/Resources.vala:297
+#: ../src/Resources.vala:335
 msgid "Find"
 msgstr "Nájsť"
 
-#: ../src/Resources.vala:298
+#: ../src/Resources.vala:336
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Nájdite obrázok napísaním textu ktorý sa nachádza v jeho názve alebo značke"
 
-#: ../src/Resources.vala:300
+#: ../src/Resources.vala:338
 msgid "_Flag"
 msgstr "_Označiť"
 
-#: ../src/Resources.vala:302
+#: ../src/Resources.vala:340
 msgid "Un_flag"
 msgstr "Odz_načiť"
 
-#: ../src/Resources.vala:305
+#: ../src/Resources.vala:343
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Nie je možné spustiť editor: %s"
 
-#: ../src/Resources.vala:310
+#: ../src/Resources.vala:348
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "Pridať značku „%s“"
 
-#: ../src/Resources.vala:312
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:351
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "Pridať značky „%s“ a „%s“"
 
-#: ../src/Resources.vala:320
+#: ../src/Resources.vala:361
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "O_dstrániť značku „%s“"
 
-#: ../src/Resources.vala:324
+#: ../src/Resources.vala:365
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "Odstrániť značku „%s“"
 
-#: ../src/Resources.vala:327
+#: ../src/Resources.vala:368
 msgid "Delete Tag"
 msgstr "Odstrániť značku"
 
-#: ../src/Resources.vala:330
-msgid "_New"
-msgstr "_Nová"
-
-#: ../src/Resources.vala:333
+#: ../src/Resources.vala:374
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "Pre_menovať značku „%s“..."
 
-#: ../src/Resources.vala:337
+#: ../src/Resources.vala:378
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "Premenovať značku „%s“ na „%s“"
 
-#: ../src/Resources.vala:340
+#: ../src/Resources.vala:381
 msgid "_Rename..."
 msgstr "_Premenovať..."
 
-#: ../src/Resources.vala:342
+#: ../src/Resources.vala:383
 msgid "Modif_y Tags..."
 msgstr "_Upraviť značky..."
 
 # dialog title
-#: ../src/Resources.vala:343
+#: ../src/Resources.vala:384
 msgid "Modify Tags"
 msgstr "Úprava značiek"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Označiť fotografie ako „%s“"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Označiť fotografie ako „%s“"
 
-#: ../src/Resources.vala:350
+#: ../src/Resources.vala:391
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "Označiť vybrané fotografie ako „%s“"
 
-#: ../src/Resources.vala:351
+#: ../src/Resources.vala:392
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "Označiť vybrané fotografie ako „%s“"
 
-#: ../src/Resources.vala:355
+#: ../src/Resources.vala:396
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "Odstrániť značku „%s“ z _fotografií"
 
-#: ../src/Resources.vala:356
+#: ../src/Resources.vala:397
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "Odstrániť značku „%s“ z _fotografií"
 
-#: ../src/Resources.vala:360
+#: ../src/Resources.vala:401
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "Odstrániť značku „%s“ z fotografií"
 
-#: ../src/Resources.vala:361
+#: ../src/Resources.vala:402
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "Odstrániť značku „%s“ z fotografií"
 
-#: ../src/Resources.vala:365
+#: ../src/Resources.vala:406
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr "Nie je možné premenovať značku na „%s“, lebo táto značka už existuje."
 
-#: ../src/Resources.vala:369
+#: ../src/Resources.vala:410
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr ""
 "Nepodarilo sa premenovať vyhľadávanie na „%s“, lebo takéto vyhľadávanie už "
 "existuje."
 
-#: ../src/Resources.vala:372
+#: ../src/Resources.vala:413
 msgid "Saved Search"
 msgstr "Uložené vyhľadávanie"
 
-#: ../src/Resources.vala:374
+#: ../src/Resources.vala:415
 msgid "Delete Search"
 msgstr "Odstrániť vyhľadávanie"
 
-#: ../src/Resources.vala:377
+#: ../src/Resources.vala:418
 msgid "_Edit..."
 msgstr "_Upraviť..."
 
-#: ../src/Resources.vala:378
+#: ../src/Resources.vala:419
 msgid "Re_name..."
 msgstr "_Premenovať..."
 
-#: ../src/Resources.vala:381
+#: ../src/Resources.vala:422
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "Premenovať vyhľadávanie „%s“ na „%s“"
 
-#: ../src/Resources.vala:385
+#: ../src/Resources.vala:426
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "O_dstrániť vyhľadávanie „%s“"
 
-#: ../src/Resources.vala:543
+#: ../src/Resources.vala:584
 #, c-format
 msgid "Rate %s"
 msgstr "Hodnotiť %s"
 
-#: ../src/Resources.vala:544
+#: ../src/Resources.vala:585
 #, c-format
 msgid "Set rating to %s"
 msgstr "Nastaviť hodnotenie na %s"
 
-#: ../src/Resources.vala:545
+#: ../src/Resources.vala:586
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Nastavuje sa hodnotenie na %s"
 
-#: ../src/Resources.vala:547
+#: ../src/Resources.vala:588
 #, c-format
 msgid "Display %s"
 msgstr "Zobraziť %s"
 
-#: ../src/Resources.vala:548
+#: ../src/Resources.vala:589
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Zobraziť len fotografie s hodnotením %s"
 
-#: ../src/Resources.vala:549
+#: ../src/Resources.vala:590
 #, c-format
 msgid "%s or Better"
 msgstr "%s alebo lepšie"
 
-#: ../src/Resources.vala:550
+#: ../src/Resources.vala:591
 #, c-format
 msgid "Display %s or Better"
 msgstr "Zobraziť %s alebo lepšie"
 
-#: ../src/Resources.vala:551
+#: ../src/Resources.vala:592
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Zobraziť iba fotografie s hodnotením %s alebo lepšie"
 
 # tooltip
-#: ../src/Resources.vala:642
+#: ../src/Resources.vala:683
 msgid "Remove the selected photos from the trash"
 msgstr "Odstráni vybrané fotografie z koša"
 
-#: ../src/Resources.vala:643
+#: ../src/Resources.vala:684
 msgid "Remove the selected photos from the library"
 msgstr "Odstrániť vybrané fotografie z knižnice"
 
-#: ../src/Resources.vala:645
+#: ../src/Resources.vala:686
 msgid "_Restore"
 msgstr "_Obnoviť"
 
 # tooltip
-#: ../src/Resources.vala:646
+#: ../src/Resources.vala:687
 msgid "Move the selected photos back into the library"
 msgstr "Presunie vybrané fotografie naspäť do knižnice"
 
-#: ../src/Resources.vala:648
+#: ../src/Resources.vala:689
 msgid "Show in File Mana_ger"
 msgstr "Zobraziť v správcovi sú_borov"
 
-#: ../src/Resources.vala:649
+#: ../src/Resources.vala:690
 msgid "Open the selected photo's directory in the file manager"
 msgstr "Otvoriť priečinok zvolených fotografií v správcovi súborov"
 
-#: ../src/Resources.vala:652
+#: ../src/Resources.vala:693
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Nie je možné otvoriť v správcovi súborov: %s"
 
-#: ../src/Resources.vala:655
+#: ../src/Resources.vala:696
 msgid "R_emove From Library"
 msgstr "_Odstrániť z knižnice"
 
-#: ../src/Resources.vala:657
+#: ../src/Resources.vala:698
 msgid "_Move to Trash"
 msgstr "Presunúť do _Koša"
 
-#: ../src/Resources.vala:659
+#: ../src/Resources.vala:700
 msgid "Select _All"
 msgstr "Ozn_ačiť všetko"
 
-#: ../src/Resources.vala:660
+#: ../src/Resources.vala:701
 msgid "Select all items"
 msgstr "Vybrať všetky položky"
 
@@ -3706,20 +3774,20 @@ msgstr "Vybrať všetky položky"
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:741
+#: ../src/Resources.vala:780
 msgid "%-I:%M %p"
 msgstr "%-H:%M"
 
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:746
+#: ../src/Resources.vala:785
 msgid "%-I:%M:%S %p"
 msgstr "%-H:%M:%S"
 
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:750
+#: ../src/Resources.vala:789
 msgid "%a %b %d, %Y"
 msgstr "%a %d. %b, %Y"
 
@@ -3729,14 +3797,14 @@ msgstr "%a %d. %b, %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:755 ../src/Resources.vala:765
+#: ../src/Resources.vala:794 ../src/Resources.vala:804
 msgid "%a %b %d"
 msgstr "%a %d. %b"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:760
+#: ../src/Resources.vala:799
 msgid "%d, %Y"
 msgstr "%d. %b, %Y"
 
@@ -3746,11 +3814,12 @@ msgstr "Prezentácia"
 
 #. Flagged label and toggle
 #: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
-#: ../src/SearchFilter.vala:990 ../src/library/FlaggedPage.vala:8
+#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
 msgid "Flagged"
 msgstr "Označené"
 
 #: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
+#: ../src/library/Branch.vala:97
 msgid "Photos"
 msgstr "Fotografie"
 
@@ -3766,28 +3835,37 @@ msgstr "RAW fotografie"
 msgid "RAW photos"
 msgstr "RAW fotografie"
 
-#: ../src/SearchFilter.vala:952
+#: ../src/SearchFilter.vala:934
 #, c-format
 msgid "Error loading UI file %s: %s"
 msgstr "Chyba pri nahrávaní súboru používateľského rozhrania %s: %s"
 
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: ../src/SearchFilter.vala:945
+msgid "Close"
+msgstr "Zavrieť"
+
 #. Type label and toggles
-#: ../src/SearchFilter.vala:969
+#: ../src/SearchFilter.vala:951
 msgid "Type"
 msgstr "Typ"
 
 #. Rating label and button
-#: ../src/SearchFilter.vala:1003 ../src/searches/SearchBoolean.vala:184
+#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
 msgid "Rating"
 msgstr "Hodnotenie"
 
-#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:182
+#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
 msgid "Settings"
 msgstr "Nastavenia"
 
 #. Set up toolbar
 #. add toolbar buttons
-#: ../src/SlideshowPage.vala:161
+#: ../src/SlideshowPage.vala:160
 msgid "Back"
 msgstr "Späť"
 
@@ -3795,15 +3873,15 @@ msgstr "Späť"
 msgid "Go to the previous photo"
 msgstr "Prejsť na predchádzajúcu fotografiu"
 
-#: ../src/SlideshowPage.vala:168 ../src/SlideshowPage.vala:273
+#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
 msgid "Pause"
 msgstr "Pozastaviť"
 
-#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:274
+#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
 msgid "Pause the slideshow"
 msgstr "Pozastaviť prezentáciu"
 
-#: ../src/SlideshowPage.vala:175
+#: ../src/SlideshowPage.vala:174
 msgid "Next"
 msgstr "Ďalšia"
 
@@ -3811,20 +3889,20 @@ msgstr "Ďalšia"
 msgid "Go to the next photo"
 msgstr "Prejsť na nasledujúcu fotografiu"
 
-#: ../src/SlideshowPage.vala:183
+#: ../src/SlideshowPage.vala:184
 msgid "Change slideshow settings"
 msgstr "Zmeniť nastavenia prezentácie"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: ../src/SlideshowPage.vala:237
+#: ../src/SlideshowPage.vala:238
 msgid "All photo source files are missing."
 msgstr "Chýbajú všetky zdrojové súbory fotografií."
 
-#: ../src/SlideshowPage.vala:269
+#: ../src/SlideshowPage.vala:270
 msgid "Play"
 msgstr "Spustiť"
 
-#: ../src/SlideshowPage.vala:270
+#: ../src/SlideshowPage.vala:271
 msgid "Continue the slideshow"
 msgstr "Pokračovať v prezentácii"
 
@@ -3833,11 +3911,11 @@ msgid "untitled"
 msgstr "bez názvu"
 
 #. multiple videos
-#: ../src/VideoSupport.vala:486
+#: ../src/VideoSupport.vala:489
 msgid "Export Videos"
 msgstr "Exportovať videá"
 
-#: ../src/camera/Branch.vala:87
+#: ../src/camera/Branch.vala:85
 msgid "Cameras"
 msgstr "Fotoaparáty"
 
@@ -3861,28 +3939,28 @@ msgstr "Zobraziť iba fotografie, ktoré neboli importované"
 #. prior to import.
 #. TODO: replace this with approved text for "talking to camera,
 #. please wait" once new strings are being accepted.
-#: ../src/camera/ImportPage.vala:845
+#: ../src/camera/ImportPage.vala:847
 msgid "Starting import, please wait..."
 msgstr "Začína sa import, prosím, čakajte..."
 
-#: ../src/camera/ImportPage.vala:884
+#: ../src/camera/ImportPage.vala:886
 msgid "Import _Selected"
 msgstr "Importovať vy_brané"
 
-#: ../src/camera/ImportPage.vala:885
+#: ../src/camera/ImportPage.vala:887
 msgid "Import the selected photos into your library"
 msgstr "Importovať vybrané fotografie do vašej knižnice"
 
-#: ../src/camera/ImportPage.vala:890
+#: ../src/camera/ImportPage.vala:892
 msgid "Import _All"
 msgstr "Importovať _všetky"
 
-#: ../src/camera/ImportPage.vala:891
+#: ../src/camera/ImportPage.vala:893
 msgid "Import all the photos into your library"
 msgstr "Importovať všetky fotografie do vašej knižnice"
 
 #. it's mounted, offer to unmount for the user
-#: ../src/camera/ImportPage.vala:1012
+#: ../src/camera/ImportPage.vala:1014
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it.  Continue?"
@@ -3890,15 +3968,15 @@ msgstr ""
 "Shotwell potrebuje odpojiť váš fotoaparát od súborového systému, aby k nemu "
 "mohol pristupovať.  Chcete pokračovať?"
 
-#: ../src/camera/ImportPage.vala:1018
+#: ../src/camera/ImportPage.vala:1020
 msgid "_Unmount"
 msgstr "_Odpojiť"
 
-#: ../src/camera/ImportPage.vala:1023
+#: ../src/camera/ImportPage.vala:1025
 msgid "Please unmount the camera."
 msgstr "Prosím, odpojte fotoaparát."
 
-#: ../src/camera/ImportPage.vala:1028
+#: ../src/camera/ImportPage.vala:1030
 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 "
@@ -3908,11 +3986,11 @@ msgstr ""
 "fotoaparátu iba ak nie je uzamknutý.  Zatvorte, prosím, ostatné aplikácie, "
 "ktoré používajú fotoaparát, a skúste to znova."
 
-#: ../src/camera/ImportPage.vala:1038
+#: ../src/camera/ImportPage.vala:1040
 msgid "Please close any other application using the camera."
 msgstr "Zatvorte, prosím, ostatné aplikácie, ktoré používajú fotoaparát."
 
-#: ../src/camera/ImportPage.vala:1043
+#: ../src/camera/ImportPage.vala:1045
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -3921,25 +3999,25 @@ msgstr ""
 "Nepodarilo sa získať náhľady z fotoaparátu:\n"
 "%s"
 
-#: ../src/camera/ImportPage.vala:1060
+#: ../src/camera/ImportPage.vala:1062
 msgid "Unmounting..."
 msgstr "Odpája sa..."
 
-#: ../src/camera/ImportPage.vala:1166
+#: ../src/camera/ImportPage.vala:1168
 msgid "Fetching photo information"
 msgstr "Získavajú sa informácie o fotografiách"
 
-#: ../src/camera/ImportPage.vala:1521
+#: ../src/camera/ImportPage.vala:1523
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Získava sa náhľad pre %s"
 
-#: ../src/camera/ImportPage.vala:1637
+#: ../src/camera/ImportPage.vala:1639
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Nepodarilo sa uzamknúť fotoaparát: %s"
 
-#: ../src/camera/ImportPage.vala:1722
+#: ../src/camera/ImportPage.vala:1724
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -3947,7 +4025,7 @@ msgstr[0] "Odstrániť týchto %d fotografií z fotoaparátu?"
 msgstr[1] "Odstrániť túto fotografiu z fotoaparátu?"
 msgstr[2] "Odstrániť tieto %d fotografie z fotoaparátu?"
 
-#: ../src/camera/ImportPage.vala:1725
+#: ../src/camera/ImportPage.vala:1727
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -3955,7 +4033,7 @@ msgstr[0] "Odstrániť týchto %d videí z fotoaparátu?"
 msgstr[1] "Odstrániť toto %d video z fotoaparátu?"
 msgstr[2] "Odstrániť tieto %d videá z fotoaparátu?"
 
-#: ../src/camera/ImportPage.vala:1728
+#: ../src/camera/ImportPage.vala:1730
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
@@ -3963,7 +4041,7 @@ msgstr[0] "Odstrániť týchto %d fotografií/videí z fotoaparátu?"
 msgstr[1] "Odstrániť túto %d fotografiu/video z fotoaparátu?"
 msgstr[2] "Odstrániť ieto %d fotografie/videá z fotoaparátu?"
 
-#: ../src/camera/ImportPage.vala:1731
+#: ../src/camera/ImportPage.vala:1733
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
@@ -3971,11 +4049,11 @@ msgstr[0] "Odstrániť týchto %d súborov z fotoaparátu?"
 msgstr[1] "Odstrániť tento %d súbor z fotoaparátu?"
 msgstr[2] "Odstrániť tieto %d súbory z fotoaparátu?"
 
-#: ../src/camera/ImportPage.vala:1758
+#: ../src/camera/ImportPage.vala:1760
 msgid "Removing photos/videos from camera"
 msgstr "Odstraňujú sa fotografie/videá z fotoaparátu"
 
-#: ../src/camera/ImportPage.vala:1762
+#: ../src/camera/ImportPage.vala:1764
 #, 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."
@@ -4025,20 +4103,16 @@ msgid "Database file:"
 msgstr "Súbor databázy:"
 
 #: ../src/data_imports/DataImportsUI.vala:112
-#: ../src/library/LibraryWindow.vala:899
+#: ../src/library/LibraryWindow.vala:883
 msgid "_Import"
 msgstr "_Importovať"
 
-#: ../src/data_imports/DataImportsUI.vala:216
+#: ../src/data_imports/DataImportsUI.vala:217
 msgid "Import From Application"
 msgstr "Importovať z aplikácie"
 
-#: ../src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "Importovať multimédiá _z:"
-
-#: ../src/data_imports/DataImportsUI.vala:394
-#: ../src/publishing/PublishingUI.vala:493
+#: ../src/data_imports/DataImportsUI.vala:369
+#: ../src/publishing/PublishingUI.vala:470
 msgid "_Close"
 msgstr "Za_vrieť"
 
@@ -4070,15 +4144,10 @@ msgstr ""
 "Popis chyby: \n"
 "%s"
 
-#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:352
+#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:336
 msgid "_File"
 msgstr "_Súbor"
 
-#: ../src/direct/DirectPhotoPage.vala:51
-#: ../src/direct/DirectPhotoPage.vala:417
-msgid "_Save"
-msgstr "_Uložiť"
-
 #: ../src/direct/DirectPhotoPage.vala:52
 msgid "Save photo"
 msgstr "Uložiť fotografiu"
@@ -4095,19 +4164,10 @@ msgstr "Uložiť fotografiu pod novým názvom"
 msgid "Print the photo to a printer connected to your computer"
 msgstr "Vytlačiť fotografiu na tlačiarni pripojenej k vášmu počítaču"
 
-#: ../src/direct/DirectPhotoPage.vala:73 ../src/library/LibraryWindow.vala:356
-msgid "_Edit"
-msgstr "_Upraviť"
-
-#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:364
+#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:348
 msgid "_Photo"
 msgstr "_Fotografia"
 
-#: ../src/direct/DirectPhotoPage.vala:169
-#: ../src/library/LibraryWindow.vala:380
-msgid "_Help"
-msgstr "_Pomocník"
-
 #: ../src/direct/DirectPhotoPage.vala:227
 #, c-format
 msgid "%s does not exist."
@@ -4127,26 +4187,26 @@ msgstr ""
 "%s nepodporuje súborový formát\n"
 "%s."
 
-#: ../src/direct/DirectPhotoPage.vala:417
+#: ../src/direct/DirectPhotoPage.vala:422
 msgid "_Save a Copy"
 msgstr "_Uložiť kópiu"
 
-#: ../src/direct/DirectPhotoPage.vala:420
+#: ../src/direct/DirectPhotoPage.vala:425
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Zahodiť zmeny vo %s?"
 
-#: ../src/direct/DirectPhotoPage.vala:421
+#: ../src/direct/DirectPhotoPage.vala:426
 msgid "Close _without Saving"
 msgstr "Zavrieť _bez uloženia"
 
-#: ../src/direct/DirectPhotoPage.vala:454
+#: ../src/direct/DirectPhotoPage.vala:459
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Chyba počas ukladania do %s: %s"
 
-#: ../src/direct/DirectPhotoPage.vala:482
-#: ../src/direct/DirectPhotoPage.vala:503
+#: ../src/direct/DirectPhotoPage.vala:487
+#: ../src/direct/DirectPhotoPage.vala:508
 msgid "Save As"
 msgstr "Uložiť ako"
 
@@ -4281,6 +4341,10 @@ msgstr "Rozšíriť kontrast"
 msgid "Angle:"
 msgstr "Uhol:"
 
+#: ../src/events/Branch.vala:25
+msgid "Events"
+msgstr "Udalosti"
+
 #: ../src/events/EventDirectoryItem.vala:83
 #, c-format
 msgid "%d Photo/Video"
@@ -4307,8 +4371,8 @@ msgid "No events found"
 msgstr "Neboli nájdené žiadne udalosti"
 
 #: ../src/events/EventsDirectoryPage.vala:230
-msgid "Events"
-msgstr "Udalosti"
+msgid "All Events"
+msgstr "Všetky udalosti"
 
 #: ../src/events/EventsDirectoryPage.vala:244
 msgid "Undated"
@@ -4326,7 +4390,8 @@ msgstr "%B"
 msgid "Folders"
 msgstr "Priečinky"
 
-#: ../src/library/Branch.vala:37 ../ui/shotwell.glade.h:33
+#: ../src/library/Branch.vala:30 ../src/library/Branch.vala:130
+#: ../ui/shotwell.glade.h:32
 msgid "Library"
 msgstr "Knižnica"
 
@@ -4334,19 +4399,19 @@ msgstr "Knižnica"
 msgid "Importing..."
 msgstr "Importuje sa..."
 
-#: ../src/library/ImportQueuePage.vala:66
+#: ../src/library/ImportQueuePage.vala:67
 msgid "_Stop Import"
 msgstr "_Zastaviť importovanie"
 
-#: ../src/library/ImportQueuePage.vala:67
+#: ../src/library/ImportQueuePage.vala:68
 msgid "Stop importing photos"
 msgstr "Zastaviť importovanie fotografií"
 
-#: ../src/library/ImportQueuePage.vala:123
+#: ../src/library/ImportQueuePage.vala:124
 msgid "Preparing to import..."
 msgstr "Pripravuje sa importovanie..."
 
-#: ../src/library/ImportQueuePage.vala:150
+#: ../src/library/ImportQueuePage.vala:151
 #, c-format
 msgid "Imported %s"
 msgstr "Importovaný súbor „%s“"
@@ -4355,101 +4420,101 @@ msgstr "Importovaný súbor „%s“"
 msgid "Last Import"
 msgstr "Posledné importovanie"
 
-#: ../src/library/LibraryWindow.vala:301
+#: ../src/library/LibraryWindow.vala:286
 msgid "_Import From Folder..."
 msgstr "_Importovať z priečinka..."
 
-#: ../src/library/LibraryWindow.vala:302
+#: ../src/library/LibraryWindow.vala:287
 msgid "Import photos from disk to library"
 msgstr "Importovať fotografie z disku do knižnice"
 
-#: ../src/library/LibraryWindow.vala:309
+#: ../src/library/LibraryWindow.vala:294
 msgid "Import From _Application..."
 msgstr "Importovať z _aplikácie..."
 
-#: ../src/library/LibraryWindow.vala:313
+#: ../src/library/LibraryWindow.vala:298
 msgid "Sort _Events"
 msgstr "Zora_diť udalosti"
 
-#: ../src/library/LibraryWindow.vala:323
+#: ../src/library/LibraryWindow.vala:308
 msgid "Empty T_rash"
 msgstr "_Vyprázdniť kôš"
 
 # tooltip
-#: ../src/library/LibraryWindow.vala:324
+#: ../src/library/LibraryWindow.vala:309
 msgid "Delete all photos in the trash"
 msgstr "Odstráni všetky fotografie v koši"
 
-#: ../src/library/LibraryWindow.vala:329
+#: ../src/library/LibraryWindow.vala:314
 msgid "View Eve_nt for Photo"
 msgstr "Zobraziť u_dalosť fotografie"
 
-#: ../src/library/LibraryWindow.vala:334
+#: ../src/library/LibraryWindow.vala:318
 msgid "_Find"
 msgstr "_Nájsť"
 
-#: ../src/library/LibraryWindow.vala:335
+#: ../src/library/LibraryWindow.vala:319
 msgid "Find photos and videos by search criteria"
 msgstr "Nájsť fotografie a videá podľa kritérií hľadania"
 
-#: ../src/library/LibraryWindow.vala:346 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:195
+#: ../src/library/LibraryWindow.vala:330 ../src/searches/Branch.vala:77
+#: ../src/sidebar/Tree.vala:199
 msgid "Ne_w Saved Search..."
 msgstr "No_vé uložené vyhľadávanie..."
 
-#: ../src/library/LibraryWindow.vala:368
+#: ../src/library/LibraryWindow.vala:352
 msgid "_Photos"
 msgstr "_Fotografie"
 
-#: ../src/library/LibraryWindow.vala:372
+#: ../src/library/LibraryWindow.vala:356
 msgid "Even_ts"
 msgstr "U_dalosti"
 
-#: ../src/library/LibraryWindow.vala:391
+#: ../src/library/LibraryWindow.vala:375
 msgid "_Basic Information"
 msgstr "_Základné informácie"
 
-#: ../src/library/LibraryWindow.vala:392
+#: ../src/library/LibraryWindow.vala:376
 msgid "Display basic information for the selection"
 msgstr "Zobraziť základné informácie pre výber"
 
-#: ../src/library/LibraryWindow.vala:397
+#: ../src/library/LibraryWindow.vala:381
 msgid "E_xtended Information"
 msgstr "_Rozšírené informácie"
 
-#: ../src/library/LibraryWindow.vala:398
+#: ../src/library/LibraryWindow.vala:382
 msgid "Display extended information for the selection"
 msgstr "Zobraziť rozšírené informácie pre výber"
 
-#: ../src/library/LibraryWindow.vala:403
+#: ../src/library/LibraryWindow.vala:387
 msgid "_Search Bar"
 msgstr "_Vyhľadávacia lišta"
 
-#: ../src/library/LibraryWindow.vala:404
+#: ../src/library/LibraryWindow.vala:388
 msgid "Display the search bar"
 msgstr "Zobrazí vyhľadávaciu lištu"
 
-#: ../src/library/LibraryWindow.vala:409
+#: ../src/library/LibraryWindow.vala:393
 msgid "S_idebar"
 msgstr "Bočný panel"
 
-#: ../src/library/LibraryWindow.vala:410
+#: ../src/library/LibraryWindow.vala:394
 msgid "Display the sidebar"
 msgstr "Zobraz bočný panel"
 
-#: ../src/library/LibraryWindow.vala:668
+#: ../src/library/LibraryWindow.vala:652
 msgid "Import From Folder"
 msgstr "Importovať z priečinka"
 
-#: ../src/library/LibraryWindow.vala:737
+#: ../src/library/LibraryWindow.vala:721
 msgid "Empty Trash"
 msgstr "Vyprázdniť kôš"
 
-#: ../src/library/LibraryWindow.vala:737
+#: ../src/library/LibraryWindow.vala:721
 msgid "Emptying Trash..."
 msgstr "Vyprázdňuje sa kôš..."
 
-#: ../src/library/LibraryWindow.vala:896
+#: ../src/library/LibraryWindow.vala:880
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4463,34 +4528,34 @@ msgstr ""
 "programu %s</span>.\n"
 "Chcete pokračovať s importovaním fotografií?"
 
-#: ../src/library/LibraryWindow.vala:899 ../ui/shotwell.glade.h:19
+#: ../src/library/LibraryWindow.vala:883 ../ui/shotwell.glade.h:18
 msgid "Library Location"
 msgstr "Umiestnenie knižnice"
 
 #. TODO: Specify which directory/file.
-#: ../src/library/LibraryWindow.vala:912
+#: ../src/library/LibraryWindow.vala:896
 msgid "Photos cannot be imported from this directory."
 msgstr "Fotografie sa nedajú importovať z tohto adresára."
 
-#: ../src/library/LibraryWindow.vala:1200
+#: ../src/library/LibraryWindow.vala:1184
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: ../src/library/LibraryWindow.vala:1244
-#: ../src/library/LibraryWindow.vala:1255
+#: ../src/library/LibraryWindow.vala:1228
+#: ../src/library/LibraryWindow.vala:1239
 msgid "Updating library..."
 msgstr "Aktualizuje sa knižnica..."
 
-#: ../src/library/LibraryWindow.vala:1261
+#: ../src/library/LibraryWindow.vala:1245
 msgid "Preparing to auto-import photos..."
 msgstr "Pripravuje sa automatické importovanie fotografií..."
 
-#: ../src/library/LibraryWindow.vala:1266
+#: ../src/library/LibraryWindow.vala:1250
 msgid "Auto-importing photos..."
 msgstr "Prebieha automatické importovanie fotografií..."
 
-#: ../src/library/LibraryWindow.vala:1274
+#: ../src/library/LibraryWindow.vala:1258
 msgid "Writing metadata to files..."
 msgstr "Zapisujú sa metaúdaje do súborov..."
 
@@ -4606,22 +4671,22 @@ msgstr "BMP"
 msgid "JPEG"
 msgstr "JPEG"
 
-#: ../src/photos/JfifSupport.vala:182
+#: ../src/photos/JfifSupport.vala:185
 #, c-format
 msgid "Low (%d%%)"
 msgstr "Nízka (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:185
+#: ../src/photos/JfifSupport.vala:188
 #, c-format
 msgid "Medium (%d%%)"
 msgstr "Stredná (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:188
+#: ../src/photos/JfifSupport.vala:191
 #, c-format
 msgid "High (%d%%)"
 msgstr "Vysoká (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:191
+#: ../src/photos/JfifSupport.vala:194
 #, c-format
 msgid "Maximum (%d%%)"
 msgstr "Maximálna (%d%%)"
@@ -4690,37 +4755,37 @@ msgstr "Získavajú sa informácie o účte..."
 msgid "Logging in..."
 msgstr "Prihlasuje sa..."
 
-#: ../src/publishing/PublishingUI.vala:183
+#: ../src/publishing/PublishingUI.vala:185
 msgid "Publish Photos"
 msgstr "Uverejniť fotografie"
 
-#: ../src/publishing/PublishingUI.vala:184
+#: ../src/publishing/PublishingUI.vala:186
 msgid "Publish photos _to:"
 msgstr "Uverejniť fotografie _na službe:"
 
-#: ../src/publishing/PublishingUI.vala:186
+#: ../src/publishing/PublishingUI.vala:188
 msgid "Publish Videos"
 msgstr "Uverejniť videá"
 
-#: ../src/publishing/PublishingUI.vala:187
+#: ../src/publishing/PublishingUI.vala:189
 msgid "Publish videos _to"
 msgstr "Uverejniť videá _na"
 
-#: ../src/publishing/PublishingUI.vala:189
+#: ../src/publishing/PublishingUI.vala:191
 msgid "Publish Photos and Videos"
 msgstr "Uverejniť fotografie a videá"
 
-#: ../src/publishing/PublishingUI.vala:190
+#: ../src/publishing/PublishingUI.vala:192
 msgid "Publish photos and videos _to"
 msgstr "Uverejniť fotografie a videá _na"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: ../src/publishing/PublishingUI.vala:383
+#: ../src/publishing/PublishingUI.vala:360
 msgid "Unable to publish"
 msgstr "Nepodarilo sa uverejniť"
 
-#: ../src/publishing/PublishingUI.vala:384
+#: ../src/publishing/PublishingUI.vala:361
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -4738,123 +4803,139 @@ msgid "Saved Searches"
 msgstr "Uložené vyhľadávania"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:168
 msgid "contains"
 msgstr "obsahuje"
 
 #. Ordering must correspond with Context
-#: ../src/searches/SavedSearchDialog.vala:170
-#: ../src/searches/SavedSearchDialog.vala:497
+#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:500
 msgid "is exactly"
 msgstr "je presne"
 
-#: ../src/searches/SavedSearchDialog.vala:171
+#: ../src/searches/SavedSearchDialog.vala:170
 msgid "starts with"
 msgstr "začína s"
 
-#: ../src/searches/SavedSearchDialog.vala:172
+#: ../src/searches/SavedSearchDialog.vala:171
 msgid "ends with"
 msgstr "končí s"
 
-#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:172
 msgid "does not contain"
 msgstr "neobsahuje"
 
-#: ../src/searches/SavedSearchDialog.vala:174
-#: ../src/searches/SavedSearchDialog.vala:501
+#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:504
 msgid "is not set"
 msgstr "nie je nastavené"
 
+#: ../src/searches/SavedSearchDialog.vala:174
+msgid "is set"
+msgstr "je nastavené"
+
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: ../src/searches/SavedSearchDialog.vala:245
-#: ../src/searches/SavedSearchDialog.vala:376
-#: ../src/searches/SavedSearchDialog.vala:441
+#: ../src/searches/SavedSearchDialog.vala:248
+#: ../src/searches/SavedSearchDialog.vala:379
+#: ../src/searches/SavedSearchDialog.vala:444
 msgid "is"
 msgstr "je"
 
-#: ../src/searches/SavedSearchDialog.vala:246
+#: ../src/searches/SavedSearchDialog.vala:249
 msgid "is not"
 msgstr "nie je"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:252
+#: ../src/searches/SavedSearchDialog.vala:255
 msgid "any photo"
 msgstr "akákoľvek fotografia"
 
-#: ../src/searches/SavedSearchDialog.vala:253
+#: ../src/searches/SavedSearchDialog.vala:256
 msgid "a raw photo"
 msgstr "RAW fotografia"
 
-#: ../src/searches/SavedSearchDialog.vala:254
+#: ../src/searches/SavedSearchDialog.vala:257
 msgid "a video"
 msgstr "video"
 
-#: ../src/searches/SavedSearchDialog.vala:308
+#: ../src/searches/SavedSearchDialog.vala:311
 msgid "has"
 msgstr "obsahuje"
 
-#: ../src/searches/SavedSearchDialog.vala:309
+#: ../src/searches/SavedSearchDialog.vala:312
 msgid "has no"
 msgstr "neobsahuje"
 
-#: ../src/searches/SavedSearchDialog.vala:314
+#: ../src/searches/SavedSearchDialog.vala:317
 msgid "modifications"
 msgstr "úpravy"
 
-#: ../src/searches/SavedSearchDialog.vala:315
+#: ../src/searches/SavedSearchDialog.vala:318
 msgid "internal modifications"
 msgstr "interné úpravy"
 
-#: ../src/searches/SavedSearchDialog.vala:316
+#: ../src/searches/SavedSearchDialog.vala:319
 msgid "external modifications"
 msgstr "externé úpravy"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:370
+#: ../src/searches/SavedSearchDialog.vala:373
 msgid "flagged"
 msgstr "označená"
 
-#: ../src/searches/SavedSearchDialog.vala:371
+#: ../src/searches/SavedSearchDialog.vala:374
 msgid "not flagged"
 msgstr "neoznačená"
 
-#: ../src/searches/SavedSearchDialog.vala:434
+#: ../src/searches/SavedSearchDialog.vala:437
 msgid "and higher"
 msgstr "a vyššie"
 
-#: ../src/searches/SavedSearchDialog.vala:435
+#: ../src/searches/SavedSearchDialog.vala:438
 msgid "only"
 msgstr "iba"
 
-#: ../src/searches/SavedSearchDialog.vala:436
+#: ../src/searches/SavedSearchDialog.vala:439
 msgid "and lower"
 msgstr "a nižšie"
 
-#: ../src/searches/SavedSearchDialog.vala:498
+#: ../src/searches/SavedSearchDialog.vala:501
 msgid "is after"
 msgstr "je po"
 
-#: ../src/searches/SavedSearchDialog.vala:499
+#: ../src/searches/SavedSearchDialog.vala:502
 msgid "is before"
 msgstr "je pred"
 
-#: ../src/searches/SavedSearchDialog.vala:500
+#: ../src/searches/SavedSearchDialog.vala:503
 msgid "is between"
 msgstr "je medzi"
 
-#: ../src/searches/SavedSearchDialog.vala:513
+#: ../src/searches/SavedSearchDialog.vala:516
 msgid "and"
 msgstr "a"
 
-#: ../src/searches/SavedSearchDialog.vala:720
+#: ../src/searches/SavedSearchDialog.vala:697
+msgid "Search"
+msgstr "Hľadať"
+
+#: ../src/searches/SavedSearchDialog.vala:702
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#: ../src/searches/SavedSearchDialog.vala:703
+msgid "OK"
+msgstr "OK"
+
+#: ../src/searches/SavedSearchDialog.vala:721
 msgid "any"
 msgstr "aspoň jedno"
 
-#: ../src/searches/SavedSearchDialog.vala:721
+#: ../src/searches/SavedSearchDialog.vala:722
 msgid "all"
 msgstr "všetky"
 
-#: ../src/searches/SavedSearchDialog.vala:722
+#: ../src/searches/SavedSearchDialog.vala:723
 msgid "none"
 msgstr "žiadne"
 
@@ -4898,7 +4979,7 @@ msgstr "Stav fotografie"
 msgid "Date"
 msgstr "Dátum"
 
-#: ../src/sidebar/Tree.vala:199
+#: ../src/sidebar/Tree.vala:203
 msgid "New _Tag..."
 msgstr "Nová _značka"
 
@@ -4918,12 +4999,11 @@ msgstr "Žiadny"
 msgid "Random"
 msgstr "Náhodná"
 
-#: ../src/tags/Branch.vala:127
+#: ../src/tags/Branch.vala:131
 msgid "Tags"
 msgstr "Značky"
 
 #: ../ui/set_background_dialog.glade.h:1
-#| msgid "Set as _Desktop Background"
 msgid "Set as Desktop Background"
 msgstr "Nastaviť ako _pozadie pracovnej plochy"
 
@@ -4959,161 +5039,170 @@ msgid "How long each photo is shown on the desktop background"
 msgstr "Ako dlho bude každá fotografia zobrazená na pozadí pracovnej plochy"
 
 #: ../ui/shotwell.glade.h:1
-msgid "Search"
-msgstr "Hľadať"
-
-#: ../ui/shotwell.glade.h:2
 msgid "_Name of search:"
 msgstr "_Názov vyhľadávania:"
 
-#: ../ui/shotwell.glade.h:3
+#: ../ui/shotwell.glade.h:2
 msgid "_Match"
 msgstr "_Zhoda"
 
-#: ../ui/shotwell.glade.h:4
+#: ../ui/shotwell.glade.h:3
 msgid "of the following:"
 msgstr "z nasledujúcich:"
 
-#: ../ui/shotwell.glade.h:5
+#: ../ui/shotwell.glade.h:4
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Veľkosť tlačeného obrázku</b>"
 
-#: ../ui/shotwell.glade.h:6
+#: ../ui/shotwell.glade.h:5
 msgid "Use a _standard size:"
 msgstr "Použiť š_tandardnú veľkosť:"
 
-#: ../ui/shotwell.glade.h:7
+#: ../ui/shotwell.glade.h:6
 msgid "Use a c_ustom size:"
 msgstr "Použiť _vlastnú veľkosť:"
 
-#: ../ui/shotwell.glade.h:8
+#: ../ui/shotwell.glade.h:7
 msgid "_Match photo aspect ratio"
 msgstr "_Zachovať pomer strán fotografie"
 
-#: ../ui/shotwell.glade.h:9
+#: ../ui/shotwell.glade.h:8
 msgid "_Autosize:"
 msgstr "_Automatická veľkosť:"
 
-#: ../ui/shotwell.glade.h:10
+#: ../ui/shotwell.glade.h:9
 msgid "<b>Titles</b>"
 msgstr "<b>Názvy</b>"
 
-#: ../ui/shotwell.glade.h:11
+#: ../ui/shotwell.glade.h:10
 msgid "Print image _title"
 msgstr "Vytlačiť _názov obrázku"
 
-#: ../ui/shotwell.glade.h:12
+#: ../ui/shotwell.glade.h:11
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Rozlíšenie pixelov</b>"
 
-#: ../ui/shotwell.glade.h:13
+#: ../ui/shotwell.glade.h:12
 msgid "_Output photo at:"
 msgstr "_Vytvoriť fotografiu v:"
 
-#: ../ui/shotwell.glade.h:14
+#: ../ui/shotwell.glade.h:13
 msgid "pixels per inch"
 msgstr "pixeloch na palec"
 
-#: ../ui/shotwell.glade.h:16
+#: ../ui/shotwell.glade.h:15
 msgid "Shotwell Preferences"
 msgstr "Nastavenia programu Shotwell"
 
-#: ../ui/shotwell.glade.h:17
+#: ../ui/shotwell.glade.h:16
 msgid "white"
 msgstr "biela"
 
-#: ../ui/shotwell.glade.h:18
+#: ../ui/shotwell.glade.h:17
 msgid "black"
 msgstr "čierna"
 
-#: ../ui/shotwell.glade.h:20
+#: ../ui/shotwell.glade.h:19
 msgid "_Watch library directory for new files"
 msgstr "_Sledovať adresáre knižnice kvôli novým súborom"
 
-#: ../ui/shotwell.glade.h:21
+#: ../ui/shotwell.glade.h:20
 msgid "Metadata"
 msgstr "metaúdaje"
 
-#: ../ui/shotwell.glade.h:22
+#: ../ui/shotwell.glade.h:21
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "_Zapísať značky, názvy a ďalšie metaúdaje do súborov fotografií"
 
-#: ../ui/shotwell.glade.h:23
+#: ../ui/shotwell.glade.h:22
 msgid "Display"
 msgstr "Obrazovka"
 
-#: ../ui/shotwell.glade.h:24
+#: ../ui/shotwell.glade.h:23
 msgid "_Import photos to:"
 msgstr "_Importovať fotografie do:"
 
-#: ../ui/shotwell.glade.h:25
+#: ../ui/shotwell.glade.h:24
 msgid "_Background:"
 msgstr "_Pozadie:"
 
-#: ../ui/shotwell.glade.h:26
+#: ../ui/shotwell.glade.h:25
 msgid "Importing"
 msgstr "Importuje sa..."
 
-#: ../ui/shotwell.glade.h:27
+#: ../ui/shotwell.glade.h:26
 msgid "_Directory structure:"
 msgstr "Š_truktúra priečinkov:"
 
-#: ../ui/shotwell.glade.h:28
+#: ../ui/shotwell.glade.h:27
 msgid "_Pattern:"
 msgstr "_Vzorec:"
 
-#: ../ui/shotwell.glade.h:29
+#: ../ui/shotwell.glade.h:28
 msgid "Example:"
 msgstr "Príklad:"
 
-#: ../ui/shotwell.glade.h:30
+#: ../ui/shotwell.glade.h:29
 msgid "R_ename imported files to lowercase"
 msgstr "Zmeniť názov importovaných súborov na _malé písmená"
 
-#: ../ui/shotwell.glade.h:31
+#: ../ui/shotwell.glade.h:30
 msgid "RAW Developer"
 msgstr "RAW vývojka"
 
-#: ../ui/shotwell.glade.h:32
+#: ../ui/shotwell.glade.h:31
 msgid "De_fault:"
 msgstr "Pred_volená:"
 
-#: ../ui/shotwell.glade.h:34
+#: ../ui/shotwell.glade.h:33
 msgid "E_xternal photo editor:"
 msgstr "_Externý editor fotografií:"
 
-#: ../ui/shotwell.glade.h:35
+#: ../ui/shotwell.glade.h:34
 msgid "External _RAW editor:"
 msgstr "Externý _RAW editor:"
 
-#: ../ui/shotwell.glade.h:36
+#: ../ui/shotwell.glade.h:35
 msgid "External Editors"
 msgstr "Externé editory"
 
-#: ../ui/shotwell.glade.h:37
+#: ../ui/shotwell.glade.h:36
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
-#: ../ui/shotwell.glade.h:38
+#: ../ui/shotwell.glade.h:37
 msgid "_Delay:"
 msgstr "_Oneskorenie:"
 
-#: ../ui/shotwell.glade.h:39
+#: ../ui/shotwell.glade.h:38
 msgid "_Transition effect:"
 msgstr "_Efekt prechodu:"
 
-#: ../ui/shotwell.glade.h:40
+#: ../ui/shotwell.glade.h:39
 msgid "Transition d_elay:"
 msgstr "Oneskorenie _prechodu:"
 
-#: ../ui/shotwell.glade.h:41
+#: ../ui/shotwell.glade.h:40
 msgid "Show t_itle"
 msgstr "Zobraziť ná_zov"
 
-#: ../ui/shotwell.glade.h:42
+#: ../ui/shotwell.glade.h:41
 msgid "seconds"
 msgstr "sekúnd"
 
+# DK: https://bugzilla.gnome.org/show_bug.cgi?id=736634
+#, fuzzy
+#~| msgid ""
+#~| "A file required for publishing is unavailable. Publishing to Flickr "
+#~| "can't continue."
+#~ msgid "A file required for publishing is unavailable. Publishing to "
+#~ msgstr ""
+#~ "Súbor potrebný na uverejňovanie nie je dostupný. Uverejňovanie v službe "
+#~ "Flickr nemôže pokračovať."
+
+#~ msgid "Import media _from:"
+#~ msgstr "Importovať multimédiá _z:"
+
 #~ msgid "Only _Remove"
 #~ msgstr "Len _odstrániť"
 
diff --git a/po/sr.po b/po/sr.po
index 19d13b7..8483fe1 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=shotwel"
 "l&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2014-10-06 22:50+0000\n"
-"PO-Revision-Date: 2014-10-11 11:59+0200\n"
+"POT-Creation-Date: 2014-10-27 11:26+0000\n"
+"PO-Revision-Date: 2014-10-27 20:49+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@@ -51,7 +51,7 @@ msgstr "Посетите веб страницу Фото-бунара"
 msgid "translator-credits"
 msgstr ""
 "Никола Радовановић <nrad@eunet.rs>\n"
-"Мирослав Николић   <miroslavnikolic@rocketmail.com>\n"
+"Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "\n"
 "http://prevod.org — превод на српски језик"
 
@@ -106,7 +106,7 @@ msgid ""
 "database is not supported by Shotwell"
 msgstr ""
 "Не могу да отворим датотеку збирке Ф-броја: Фото-бунар не подржава ово "
-"издање збирке Ф-броја"
+"издање збирке Ф-броја."
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
 msgid ""
@@ -153,7 +153,7 @@ msgstr "Услуге увоза кључних података"
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
-msgstr "Модул објављивања Галерије3"
+msgstr "Модулобјављивања Галерије 3"
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
 #| msgid ""
@@ -168,9 +168,9 @@ msgid ""
 "You must have already signed up for a Gallery3 account to complete the login "
 "process."
 msgstr ""
-"Тренутно нисте пријављени на вашу Галерију.\n"
+"Нисте тренутно пријављени на вашу Галерију.\n"
 "\n"
-"Треба да сте већ отворили налог за Галерију3 да бисте обавили процес "
+"Потребно је да сте већ отворили налог за Галерију 3 да бисте обавили процес "
 "пријављивања."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
@@ -194,7 +194,7 @@ msgstr ""
 "\n"
 "\n"
 "Може бити да датотека „%s“ није подржана или је превелика за овај примерак "
-"Галерије3."
+"Галерије 3."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:802
 msgid ""
@@ -202,25 +202,36 @@ msgid ""
 "Note that Gallery3 only supports the video types that Flowplayer does."
 msgstr ""
 "\n"
-"Знајте да Галерија3 подржава само врсте видеа које и пуштач тока."
+"Знајте да Галерија 3 подржава само врсте видеа које и Фловплејер."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1774
+#, c-format
 #| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Flickr can't "
+#| "A file required for publishing is unavailable. Publishing to Picasa can't "
 #| "continue."
-msgid "A file required for publishing is unavailable. Publishing to "
-msgstr "Датотека за објављивање није доступна. Објављујем на "
+msgid ""
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
+msgstr ""
+"Датотека за објављивање није доступна. Објављивање на „%s“ не може да се "
+"настави."
 
 #. populate any widgets whose contents are
 #. programmatically-generated
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
 #, c-format
 #| msgid "Publish Photos and Videos"
 msgid "Publishing to %s as %s."
-msgstr "Објављујем на %s као %s."
+msgstr "Објављујем на „%s“ као %s."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1816
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Flickr can't "
+#| "continue."
+msgid "A file required for publishing is unavailable. Publishing to "
+msgstr "Датотека за објављивање није доступна. Објављујем на "
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
 #| msgid ""
 #| "Enter the URL of your Piwigo photo library as well as the username and "
 #| "password associated with your Piwigo account for that library."
@@ -228,34 +239,34 @@ msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
 msgstr ""
-"Унесите адресу вашег сајта Галерије3 као и корисничко име и лозинку (или АПИ "
-"кључ) вашег налога Галерије3."
+"Унесите адресу вашег сајта Галерије 3 као и корисничко име и лозинку (или "
+"АПИ кључ) за ваш налог Галерије 3."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
 msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
 msgstr ""
-"Корисничко име и лозинка или АПИ кључ беху неисправни. Да покушате опет, "
+"Корисничко име и лозинка или АПИ кључ бејаху неисправни. Да покушате опет, "
 "поново унесите ваше корисничко име и лозинку."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
 msgid ""
 "The URL entered does not appear to be the main directory of a Gallery3 "
 "instance. Please make sure you typed it correctly and it does not have any "
 "trailing components (e.g., index.php)."
 msgstr ""
-"Адреса коју сте унели не изгледа да је главни директоријум примерка "
-"Галерије3. Проверите да ли сте тачно укуцали и да нема никаквог пратећег "
-"састојка (нпр. „index.php“)."
+"Унесена адреса не изгледа да је главни директоријум примерка Галерије 3. "
+"Проверите да ли сте је исправно укуцали и да нема никакав пратећи састојак ("
+"нпр., „index.php“)."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1871
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
 msgid "Unrecognized User"
-msgstr "Непознат корисник"
+msgstr "Непознати корисник"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1876
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
 msgid " Site Not Found"
-msgstr " Нисам нашао сајт"
+msgstr " Нисам пронашао сајт"
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
 msgid "Copyright (C) 2013 rajce.net"
@@ -265,17 +276,17 @@ msgstr "Ауторска права (C) 2013 rajce.net"
 #| msgid ""
 #| "An error message occurred when publishing to Piwigo. Please try again."
 msgid "An error message occurred when publishing to Rajce. Please try again."
-msgstr "Дошло је до грешке приликом објављивања на Рајсу. Покушајте поново."
+msgstr "Дошли је до грешке приликом објављивања на Рајсу. Покушајте поново."
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
 #| msgid "Enter the username and password associated with your Tumblr account."
 msgid "Enter email and password associated with your Rajce account."
-msgstr "Унесите корисничко име и лозинку придружену вашем налогу Рајса."
+msgstr "Унесите ел. пошту и лозинку придружену вашем налогу Рајс-а."
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
 #| msgid "Username and/or password invalid. Please try again"
 msgid "Invalid email and/or password. Please try again"
-msgstr "Ел. пошта и/или лозинка нису исправни. Покушајте поново"
+msgstr "Ел. пошта и/или лозинка нису исправни. Покушајте поново."
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
 #| msgid "Invalid User Name or Password"
@@ -319,7 +330,7 @@ msgstr "_Сакриј албум"
 #| "You are logged into Facebook as %s.\n"
 #| "\n"
 msgid "You are logged into Rajce as %s."
-msgstr "Пријављени сте на Рајсу као %s."
+msgstr "Пријављени сте на Рајс као %s."
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
 #: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
@@ -374,13 +385,13 @@ msgid "Copyright 2012 BJA Electronics"
 msgstr "Ауторска права 2012 BJA Electronics"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1229
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
 msgid "500 x 375 pixels"
 msgstr "500 x 375 тачкица"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1230
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
 msgid "1024 x 768 pixels"
 msgstr "1024 x 768 тачкица"
@@ -450,7 +461,7 @@ msgstr "Фото-бунарове додатне услуге објављива
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
 #| msgid "Back"
 msgid "Go _Back"
-msgstr "Иди _назад"
+msgstr "_Назад"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
 #: ../ui/shotwell.glade.h:43
@@ -459,11 +470,11 @@ msgstr "_Пријави ме"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
 msgid "Intro message replaced at runtime"
-msgstr "Уводна порука замењена приликом покретања"
+msgstr "Уводна порука замењена за време покретања"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
 msgid "_Gallery3 URL:"
-msgstr "Адреса _Галерије3:"
+msgstr "Адреса _Галерије 3:"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
 #| msgid "User _name"
@@ -500,11 +511,11 @@ msgstr "_Постојећи албум"
 #| "_Remove location, camera, and other identifying information before "
 #| "uploading"
 msgid "_Remove location, tag and camera-identifying data before uploading"
-msgstr "_Уклони место, ознаку и податке препознавања фото-апарат пре отпремања"
+msgstr "_Уклони место, податке препознавања ознаке и фото-апарата пре отпремања"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
 msgid "'Publishing to $url as $username' (populated in application code)"
-msgstr "'Објављујем на „$url“ као „$username“' (попуњено у програмском коду)"
+msgstr "'Објављујем на $url као $username' (испуњено у коду програма)"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
 #| msgid "_Scaling constraint:"
@@ -517,7 +528,7 @@ msgid "pixels"
 msgstr "тачкица"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
 #: ../src/Dimensions.vala:17
 msgid "Original size"
@@ -549,12 +560,12 @@ msgstr "Величина _фотографије:"
 #| "You are logged into Facebook as %s.\n"
 #| "\n"
 msgid "you are logged in rajce as $name"
-msgstr "пријављени сте на рајс као „$name“"
+msgstr "пријављени сте на рајс као $name"
 
 #: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
 #| msgid "Videos will appear in:"
 msgid "$mediatype will appear in"
-msgstr "„$mediatype“ ће се појавити у"
+msgstr "$mediatype ће се појавиит у"
 
 #: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
 msgid "_Albums (or write new):"
@@ -664,12 +675,12 @@ msgid "Upload _size:"
 msgstr "_Величина слања:"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
 msgid "Just me"
 msgstr "Само мени"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
 msgid "Everyone"
 msgstr "Свима"
@@ -723,50 +734,68 @@ msgstr ""
 "Пријављени сте на Фликр као %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
 #, 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."
 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 ""
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"Ваш бесплатни налог Фликра ограничава количину података коју можете месечно "
+"да отпремите.\n"
+"За овај месец вам је преостао још %d мегабајт за отпремање."
+msgstr[1] ""
+"Ваш бесплатни налог Фликра ограничава количину података коју можете месечно "
+"да отпремите.\n"
+"За овај месец су вам преостала још %d мегабајта за отпремање."
+msgstr[2] ""
+"Ваш бесплатни налог Фликра ограничава количину података коју можете месечно "
+"да отпремите.\n"
+"За овај месец вам је преостало још %d мегабајта за отпремање."
+msgstr[3] ""
 "Ваш бесплатни налог Фликра има ограничење количине података за месечно "
 "отпремање.\n"
 "За овај месец, преостало вам је још %d мегабајта за отпремање."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1157
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Ваш налог Фликра Про вам омогућава неограничена отпремања."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1162
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
 msgid "Photos _visible to:"
 msgstr "Фотографије могу _видети:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
 msgid "Videos _visible to:"
 msgstr "Видео снимке могу _видети:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
 msgid "Photos and videos _visible to:"
 msgstr "Фотографије и снимке могу _видети:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
 msgid "Friends & family only"
 msgstr "Само пријатељи и породица"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
 msgid "Family only"
 msgstr "Само породица"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Friends only"
 msgstr "Само пријатељи"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
 msgid "2048 x 1536 pixels"
 msgstr "2048 x 1536 тачкица"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
 msgid "4096 x 3072 pixels"
 msgstr "4096 x 3072 тачкица"
@@ -998,7 +1027,7 @@ msgid "Logout"
 msgstr "Одјави ме"
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:268
+#: ../src/Resources.vala:270
 msgid "Publish"
 msgstr "Објави"
 
@@ -1127,7 +1156,7 @@ msgstr "_Пријави проблем..."
 
 #: ../src/AppWindow.vala:624 ../src/AppWindow.vala:645
 #: ../src/AppWindow.vala:662 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1417 ../src/Dialogs.vala:1440
+#: ../src/Dialogs.vala:1422 ../src/Dialogs.vala:1445
 #: ../src/data_imports/DataImportsUI.vala:399
 #: ../src/publishing/PublishingUI.vala:498
 msgid "_Cancel"
@@ -1141,7 +1170,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Дошло је до кобне грешке приликом приступања фототеци Фото-бунара.  Фото-"
+"Дошло је до кобне грешке приликом приступања фототеци Фото-бунара. Фото-"
 "бунар не може да настави рад.\n"
 "\n"
 "%s"
@@ -1486,9 +1515,9 @@ msgstr[1] "Ово ће уклонити ознаку „%s“ из %d фотог
 msgstr[2] "Ово ће уклонити ознаку „%s“ из %d фотографија.  Да наставим?"
 msgstr[3] "Ово ће уклонити ознаку „%s“ из %d фотографије.  Да наставим?"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1385
-#: ../src/Resources.vala:328 ../src/Resources.vala:376
-#: ../src/Resources.vala:641
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1390
+#: ../src/Resources.vala:336 ../src/Resources.vala:384
+#: ../src/Resources.vala:649
 msgid "_Delete"
 msgstr "_Избриши"
 
@@ -2066,27 +2095,30 @@ msgstr "Преименујте догађај"
 msgid "Name:"
 msgstr "Назив:"
 
-#: ../src/Dialogs.vala:1329 ../src/Resources.vala:272
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1330 ../src/Resources.vala:275
 msgid "Edit Title"
 msgstr "Уредите наслов"
 
-#: ../src/Dialogs.vala:1329 ../src/Properties.vala:340
+#: ../src/Dialogs.vala:1331 ../src/Properties.vala:340
 msgid "Title:"
 msgstr "Наслов:"
 
-#: ../src/Dialogs.vala:1343 ../src/Resources.vala:278
+#. Dialog title
+#: ../src/Dialogs.vala:1347 ../src/Resources.vala:282
 msgid "Edit Event Comment"
 msgstr "Уредите напомену догађаја"
 
-#: ../src/Dialogs.vala:1343
+#: ../src/Dialogs.vala:1348
 msgid "Edit Photo/Video Comment"
 msgstr "Уредите напомену фотографије/снимка"
 
-#: ../src/Dialogs.vala:1344 ../src/Properties.vala:630
+#: ../src/Dialogs.vala:1349 ../src/Properties.vala:630
 msgid "Comment:"
 msgstr "Напомена:"
 
-#: ../src/Dialogs.vala:1360
+#: ../src/Dialogs.vala:1365
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Уклони и _oбриши фотографију"
@@ -2094,23 +2126,23 @@ msgstr[1] "Уклони и _oбриши фотографије"
 msgstr[2] "Уклони и _oбриши фотографије"
 msgstr[3] "Уклони и _oбриши фотографију"
 
-#: ../src/Dialogs.vala:1364
+#: ../src/Dialogs.vala:1369
 msgid "_Remove From Library"
 msgstr "_Уклони из фототеке"
 
-#: ../src/Dialogs.vala:1384 ../src/camera/ImportPage.vala:1739
+#: ../src/Dialogs.vala:1389 ../src/camera/ImportPage.vala:1739
 msgid "_Keep"
 msgstr "_Задржи"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1412
 msgid "Revert External Edit?"
 msgstr "Да ли да вратим спољну измену?"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1412
 msgid "Revert External Edits?"
 msgstr "Да ли да вратим спољне измене?"
 
-#: ../src/Dialogs.vala:1409
+#: ../src/Dialogs.vala:1414
 #, c-format
 msgid "This will destroy all changes made to the external file.  Continue?"
 msgid_plural ""
@@ -2124,15 +2156,15 @@ msgstr[2] ""
 msgstr[3] ""
 "Ова радња ће уништити све измене на %d спољној датотеци.  Да наставим?"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1418
 msgid "Re_vert External Edit"
 msgstr "_Врати спољну измену"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1418
 msgid "Re_vert External Edits"
 msgstr "_Врати спољне измене"
 
-#: ../src/Dialogs.vala:1434
+#: ../src/Dialogs.vala:1439
 #, c-format
 msgid "This will remove the photo from the library.  Continue?"
 msgid_plural "This will remove %d photos from the library.  Continue?"
@@ -2141,72 +2173,72 @@ msgstr[1] "Ово ће уклонити %d фотографије из фото�
 msgstr[2] "Ово ће уклонити %d фотографија из фототеке.  Да наставим?"
 msgstr[3] "Ово ће уклонити %d фотографију из фототеке.  Да наставим?"
 
-#: ../src/Dialogs.vala:1441
+#: ../src/Dialogs.vala:1446
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1447
 msgid "Remove Photo From Library"
 msgstr "Уклоните фотографију из фототеке"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1447
 msgid "Remove Photos From Library"
 msgstr "Уклоните фотографије из фототеке"
 
-#: ../src/Dialogs.vala:1535
+#: ../src/Dialogs.vala:1540
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1682
+#: ../src/Dialogs.vala:1687
 msgid "AM"
 msgstr "ПрП"
 
-#: ../src/Dialogs.vala:1683
+#: ../src/Dialogs.vala:1688
 msgid "PM"
 msgstr "ПоП"
 
-#: ../src/Dialogs.vala:1684
+#: ../src/Dialogs.vala:1689
 msgid "24 Hr"
 msgstr "24 сата"
 
-#: ../src/Dialogs.vala:1699
+#: ../src/Dialogs.vala:1704
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Помери фотографије/снимке за исти износ"
 
-#: ../src/Dialogs.vala:1704
+#: ../src/Dialogs.vala:1709
 msgid "Set _all photos/videos to this time"
 msgstr "Постави _све фотографије/снимке на ово време"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1716
 msgid "_Modify original photo file"
 msgstr "_Измени изворну фотографију"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1716
 msgid "_Modify original photo files"
 msgstr "_Измени изворне фотографије"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1719
 msgid "_Modify original file"
 msgstr "_Измени изворну датотеку"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1719
 msgid "_Modify original files"
 msgstr "_Измени изворне датотеке"
 
-#: ../src/Dialogs.vala:1800
+#: ../src/Dialogs.vala:1805
 msgid "Original: "
 msgstr "Изворно: "
 
-#: ../src/Dialogs.vala:1801
+#: ../src/Dialogs.vala:1806
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d.%m.%Y. %H:%M:%S"
 
-#: ../src/Dialogs.vala:1802
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d.%m.%Y. %H:%M:%S"
 
-#: ../src/Dialogs.vala:1891
+#: ../src/Dialogs.vala:1896
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -2215,7 +2247,7 @@ msgstr ""
 "Време излагања ће бити померено унапред за\n"
 "%d %s, %d %s, %d %s, и %d %s."
 
-#: ../src/Dialogs.vala:1892
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2224,7 +2256,7 @@ msgstr ""
 "Вреем излагања ће бити померено уназад за\n"
 "%d %s, %d %s, %d %s, и %d %s."
 
-#: ../src/Dialogs.vala:1894
+#: ../src/Dialogs.vala:1899
 msgid "day"
 msgid_plural "days"
 msgstr[0] "дан"
@@ -2232,7 +2264,7 @@ msgstr[1] "дана"
 msgstr[2] "дана"
 msgstr[3] "дан"
 
-#: ../src/Dialogs.vala:1895
+#: ../src/Dialogs.vala:1900
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "сат"
@@ -2240,7 +2272,7 @@ msgstr[1] "сата"
 msgstr[2] "сати"
 msgstr[3] "сат"
 
-#: ../src/Dialogs.vala:1896
+#: ../src/Dialogs.vala:1901
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минут"
@@ -2248,7 +2280,7 @@ msgstr[1] "минута"
 msgstr[2] "минута"
 msgstr[3] "минут"
 
-#: ../src/Dialogs.vala:1897
+#: ../src/Dialogs.vala:1902
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "секунду"
@@ -2256,7 +2288,7 @@ msgstr[1] "секунде"
 msgstr[2] "секунди"
 msgstr[3] "секунду"
 
-#: ../src/Dialogs.vala:1941
+#: ../src/Dialogs.vala:1946
 #, c-format
 msgid ""
 "\n"
@@ -2283,49 +2315,49 @@ msgstr[3] ""
 "\n"
 "И %d друга."
 
-#: ../src/Dialogs.vala:1963 ../src/Dialogs.vala:1990
+#: ../src/Dialogs.vala:1968 ../src/Dialogs.vala:1995
 msgid "Tags (separated by commas):"
 msgstr "Ознаке (раздвојене запетом):"
 
-#: ../src/Dialogs.vala:2070
+#: ../src/Dialogs.vala:2075
 msgid "Welcome!"
 msgstr "Добро дошли!"
 
-#: ../src/Dialogs.vala:2077
+#: ../src/Dialogs.vala:2082
 msgid "Welcome to Shotwell!"
 msgstr "Добро дошли у Фото-бунар!"
 
-#: ../src/Dialogs.vala:2081
+#: ../src/Dialogs.vala:2086
 msgid "To get started, import photos in any of these ways:"
 msgstr "Да започнете, увезите фотографије на један од следећих начина:"
 
-#: ../src/Dialogs.vala:2100
+#: ../src/Dialogs.vala:2105
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Изаберите <span weight=\"bold\">Датотека %s Увези из фасцикле</span>"
 
-#: ../src/Dialogs.vala:2101
+#: ../src/Dialogs.vala:2106
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Превуците и убаците фотографију у прозор Фото-бунара"
 
-#: ../src/Dialogs.vala:2102
+#: ../src/Dialogs.vala:2107
 msgid "Connect a camera to your computer and import"
 msgstr "Повежите фото-апарат на рачунар и увезите фотографије"
 
-#: ../src/Dialogs.vala:2112
+#: ../src/Dialogs.vala:2117
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Увези фотографије из фасцикле „%s“"
 
-#: ../src/Dialogs.vala:2119
+#: ../src/Dialogs.vala:2124
 msgid "You can also import photos in any of these ways:"
 msgstr "Можете увести фотографије на неки од следећих начина:"
 
-#: ../src/Dialogs.vala:2129
+#: ../src/Dialogs.vala:2134
 msgid "_Don't show this message again"
 msgstr "_Не приказуј више ову поруку"
 
-#: ../src/Dialogs.vala:2164
+#: ../src/Dialogs.vala:2169
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Увезите фотографије из фототеке „%s“"
@@ -2333,73 +2365,73 @@ msgstr "Увезите фотографије из фототеке „%s“"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2308 ../src/Dialogs.vala:2312
+#: ../src/Dialogs.vala:2313 ../src/Dialogs.vala:2317
 msgid "(Help)"
 msgstr "(Помоћ)"
 
-#: ../src/Dialogs.vala:2321
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Година%sмесец%sдан"
 
-#: ../src/Dialogs.vala:2323
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth"
 msgstr "Година%sмесец"
 
-#: ../src/Dialogs.vala:2325
+#: ../src/Dialogs.vala:2330
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Година%sмесец-дан"
 
-#: ../src/Dialogs.vala:2327
+#: ../src/Dialogs.vala:2332
 msgid "Year-Month-Day"
 msgstr "Година-месец-дан"
 
-#: ../src/Dialogs.vala:2328 ../src/editing_tools/EditingTools.vala:781
+#: ../src/Dialogs.vala:2333 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Произвољно"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2565
+#: ../src/Dialogs.vala:2570
 msgid "Invalid pattern"
 msgstr "Неисправан образац"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: ../src/Dialogs.vala:2668
+#: ../src/Dialogs.vala:2673
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
 msgstr ""
 "Фото-бунар може да умножи фотографије у фасциклу фототеке или да их увезе "
-"без умножавања."
+"без умножавања"
 
-#: ../src/Dialogs.vala:2673
+#: ../src/Dialogs.vala:2678
 msgid "Co_py Photos"
 msgstr "_Умножи фотографије"
 
-#: ../src/Dialogs.vala:2674
+#: ../src/Dialogs.vala:2679
 msgid "_Import in Place"
 msgstr "Увези _на месту"
 
-#: ../src/Dialogs.vala:2675
+#: ../src/Dialogs.vala:2680
 msgid "Import to Library"
 msgstr "Увезите у фототеку"
 
-#: ../src/Dialogs.vala:2685 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2690 ../src/PhotoPage.vala:3086
 msgid "Remove From Library"
 msgstr "Уклоните из фототеке"
 
-#: ../src/Dialogs.vala:2686 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2691 ../src/PhotoPage.vala:3086
 msgid "Removing Photo From Library"
 msgstr "Уклањам фотографију из фототеке"
 
-#: ../src/Dialogs.vala:2686
+#: ../src/Dialogs.vala:2691
 msgid "Removing Photos From Library"
 msgstr "Уклањам фотографије из фототеке"
 
-#: ../src/Dialogs.vala:2700
+#: ../src/Dialogs.vala:2705
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -2432,7 +2464,7 @@ msgstr[3] ""
 "\n"
 "Ова радња не може бити поништена."
 
-#: ../src/Dialogs.vala:2704
+#: ../src/Dialogs.vala:2709
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -2465,7 +2497,7 @@ msgstr[3] ""
 "\n"
 "Ова радња не може бити поништена."
 
-#: ../src/Dialogs.vala:2708
+#: ../src/Dialogs.vala:2713
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -2498,7 +2530,7 @@ msgstr[3] ""
 "\n"
 "Ова радња не може бити поништена."
 
-#: ../src/Dialogs.vala:2740
+#: ../src/Dialogs.vala:2745
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -2514,7 +2546,7 @@ msgstr[3] ""
 "Не могу да преместим у смеће %d фотографију/снимак.  Да ли да уклоним?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2757
+#: ../src/Dialogs.vala:2762
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -3370,347 +3402,353 @@ msgstr "Прикажите све фотографије, укључујући �
 msgid "_All Photos"
 msgstr "_Све фотографије"
 
-#: ../src/Resources.vala:249 ../src/Resources.vala:250
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:250 ../src/Resources.vala:252
 msgid "Show all photos"
 msgstr "Прикажите све фотографије"
 
-#: ../src/Resources.vala:252
+#: ../src/Resources.vala:254
 msgid "_Ratings"
 msgstr "_Оцене"
 
-#: ../src/Resources.vala:253
+#: ../src/Resources.vala:255
 msgid "Display each photo's rating"
 msgstr "Прикажите оцене свих фотографија"
 
-#: ../src/Resources.vala:255
+#: ../src/Resources.vala:257
 msgid "_Filter Photos"
 msgstr "_Издвој фотографије"
 
-#: ../src/Resources.vala:256
+#: ../src/Resources.vala:258
 msgid "Filter Photos"
 msgstr "Издвојте фотографије"
 
-#: ../src/Resources.vala:257
+#: ../src/Resources.vala:259
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Ограничите број приказаних фотографија на основу пропусника"
 
-#: ../src/Resources.vala:259
+#: ../src/Resources.vala:261
 msgid "_Duplicate"
 msgstr "_Удвостручи"
 
-#: ../src/Resources.vala:260
+#: ../src/Resources.vala:262
 msgid "Duplicate"
 msgstr "Удвостручи"
 
-#: ../src/Resources.vala:261
+#: ../src/Resources.vala:263
 msgid "Make a duplicate of the photo"
 msgstr "Направите умножак фотографије"
 
-#: ../src/Resources.vala:263
+#: ../src/Resources.vala:265
 msgid "_Export..."
 msgstr "_Извези..."
 
-#: ../src/Resources.vala:265
+#: ../src/Resources.vala:267
 msgid "_Print..."
 msgstr "_Штампај..."
 
-#: ../src/Resources.vala:267
+#: ../src/Resources.vala:269
 msgid "Pu_blish..."
 msgstr "_Објави..."
 
-#: ../src/Resources.vala:269
+#: ../src/Resources.vala:271
 msgid "Publish to various websites"
 msgstr "Објавите изабране фотографије на разним сајтовима"
 
-#: ../src/Resources.vala:271
+#: ../src/Resources.vala:273
 msgid "Edit _Title..."
 msgstr "Измени _наслов..."
 
-#: ../src/Resources.vala:274
+#: ../src/Resources.vala:277
 msgid "Edit _Comment..."
 msgstr "Измени _напомену..."
 
-#: ../src/Resources.vala:275
+#. Button label
+#: ../src/Resources.vala:279
 msgid "Edit Comment"
 msgstr "Измените напомену"
 
-#: ../src/Resources.vala:277
+#: ../src/Resources.vala:281
 msgid "Edit Event _Comment..."
 msgstr "Измени _напомену догађаја..."
 
-#: ../src/Resources.vala:280
+#: ../src/Resources.vala:284
 msgid "_Adjust Date and Time..."
-msgstr "_Подеси датум и време..."
+msgstr "_Подеси датум и време"
 
-#: ../src/Resources.vala:281
+#: ../src/Resources.vala:285
 msgid "Adjust Date and Time"
 msgstr "Подесите датум и време"
 
-#: ../src/Resources.vala:283
+#: ../src/Resources.vala:287
 msgid "Add _Tags..."
 msgstr "Додај _ознаке..."
 
-#: ../src/Resources.vala:284
+#: ../src/Resources.vala:288
 msgid "_Add Tags..."
 msgstr "_Додај ознаке..."
 
-#: ../src/Resources.vala:285 ../src/Resources.vala:316
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:290 ../src/Resources.vala:323
 msgid "Add Tags"
 msgstr "Додајте ознаке"
 
-#: ../src/Resources.vala:287
+#: ../src/Resources.vala:292
 msgid "_Preferences"
 msgstr "_Поставке"
 
-#: ../src/Resources.vala:289
+#: ../src/Resources.vala:294
 msgid "Open With E_xternal Editor"
 msgstr "_Отвори спољним уређивачем"
 
-#: ../src/Resources.vala:291
+#: ../src/Resources.vala:296
 msgid "Open With RA_W Editor"
 msgstr "Отвори уређивачем _сирових"
 
-#: ../src/Resources.vala:293
+#: ../src/Resources.vala:298
 msgid "Send _To..."
 msgstr "Пошаљи _у..."
 
-#: ../src/Resources.vala:294
+#: ../src/Resources.vala:299
 msgid "Send T_o..."
 msgstr "Пошаљи _у..."
 
-#: ../src/Resources.vala:296
+#: ../src/Resources.vala:301
 msgid "_Find..."
 msgstr "_Нађи..."
 
-#: ../src/Resources.vala:297
+#: ../src/Resources.vala:302
 msgid "Find"
 msgstr "Пронађите"
 
-#: ../src/Resources.vala:298
+#: ../src/Resources.vala:303
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Пронађите фотографије на основу назива или ознаке"
 
-#: ../src/Resources.vala:300
+#: ../src/Resources.vala:305
 msgid "_Flag"
 msgstr "_Постави обележје"
 
-#: ../src/Resources.vala:302
+#: ../src/Resources.vala:307
 msgid "Un_flag"
 msgstr "_Уклони обележје"
 
-#: ../src/Resources.vala:305
+#: ../src/Resources.vala:310
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Не могу да покренем уређивача: %s"
 
-#: ../src/Resources.vala:310
+#: ../src/Resources.vala:315
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "Додај ознаку „%s“"
 
-#: ../src/Resources.vala:312
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:318
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "Додај ознаку „%s“ и „%s“"
 
-#: ../src/Resources.vala:320
+#: ../src/Resources.vala:328
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "_Обриши ознаку „%s“"
 
-#: ../src/Resources.vala:324
+#: ../src/Resources.vala:332
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "Обриши ознаку „%s“"
 
-#: ../src/Resources.vala:327
+#: ../src/Resources.vala:335
 msgid "Delete Tag"
 msgstr "Обришите ознаку"
 
-#: ../src/Resources.vala:330
+#: ../src/Resources.vala:338
 msgid "_New"
 msgstr "_Ново"
 
-#: ../src/Resources.vala:333
+#: ../src/Resources.vala:341
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "_Преименуј ознаку „%s“..."
 
-#: ../src/Resources.vala:337
+#: ../src/Resources.vala:345
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "Преименуј ознаку „%s“ у „%s“"
 
-#: ../src/Resources.vala:340
+#: ../src/Resources.vala:348
 msgid "_Rename..."
 msgstr "_Преименуј..."
 
-#: ../src/Resources.vala:342
+#: ../src/Resources.vala:350
 msgid "Modif_y Tags..."
 msgstr "Измени _ознаке..."
 
-#: ../src/Resources.vala:343
+#: ../src/Resources.vala:351
 msgid "Modify Tags"
 msgstr "Измените ознаке"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:354
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Означи фотографије као „%s“"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:354
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Означи фотографије као „%s“"
 
-#: ../src/Resources.vala:350
+#: ../src/Resources.vala:358
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "Означи изабрану фотографију као „%s“"
 
-#: ../src/Resources.vala:351
+#: ../src/Resources.vala:359
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "Означи изабране фотографије као „%s“"
 
-#: ../src/Resources.vala:355
+#: ../src/Resources.vala:363
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "Уклони ознаку „%s“ са _фотографије"
 
-#: ../src/Resources.vala:356
+#: ../src/Resources.vala:364
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "Уклони ознаку „%s“ са _фотографија"
 
-#: ../src/Resources.vala:360
+#: ../src/Resources.vala:368
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "Уклоните ознаку „%s“ са фотографије"
 
-#: ../src/Resources.vala:361
+#: ../src/Resources.vala:369
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "Уклоните ознаку „%s“ са фотографија"
 
-#: ../src/Resources.vala:365
+#: ../src/Resources.vala:373
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr "Не могу да преименујем ознаку „%s“ јер већ постоји та ознака."
 
-#: ../src/Resources.vala:369
+#: ../src/Resources.vala:377
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr "Не могу да преименујем претрагу „%s“ јер већ постоји та претрага."
 
-#: ../src/Resources.vala:372
+#: ../src/Resources.vala:380
 msgid "Saved Search"
 msgstr "Сачуване претраге"
 
-#: ../src/Resources.vala:374
+#: ../src/Resources.vala:382
 msgid "Delete Search"
 msgstr "Избриши претрагу"
 
-#: ../src/Resources.vala:377
+#: ../src/Resources.vala:385
 msgid "_Edit..."
 msgstr "_Измени..."
 
-#: ../src/Resources.vala:378
+#: ../src/Resources.vala:386
 msgid "Re_name..."
 msgstr "Пре_именуј..."
 
-#: ../src/Resources.vala:381
+#: ../src/Resources.vala:389
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "Преименуј претрагу „%s“ у „%s“"
 
-#: ../src/Resources.vala:385
+#: ../src/Resources.vala:393
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "Избриши претрагу „%s“"
 
-#: ../src/Resources.vala:543
+#: ../src/Resources.vala:551
 #, c-format
 msgid "Rate %s"
 msgstr "Оцени „%s“"
 
-#: ../src/Resources.vala:544
+#: ../src/Resources.vala:552
 #, c-format
 msgid "Set rating to %s"
 msgstr "Поставите оцену на „%s“"
 
-#: ../src/Resources.vala:545
+#: ../src/Resources.vala:553
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Постављам оцену на „%s“"
 
-#: ../src/Resources.vala:547
+#: ../src/Resources.vala:555
 #, c-format
 msgid "Display %s"
 msgstr "Прикажи „%s“"
 
-#: ../src/Resources.vala:548
+#: ../src/Resources.vala:556
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Прикажите само фотографије са оценом „%s“"
 
-#: ../src/Resources.vala:549
+#: ../src/Resources.vala:557
 #, c-format
 msgid "%s or Better"
 msgstr "%s или боље"
 
-#: ../src/Resources.vala:550
+#: ../src/Resources.vala:558
 #, c-format
 msgid "Display %s or Better"
 msgstr "Прикажи %s или боље"
 
-#: ../src/Resources.vala:551
+#: ../src/Resources.vala:559
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Прикажите само фотографије са оценом %s или бољом"
 
-#: ../src/Resources.vala:642
+#: ../src/Resources.vala:650
 msgid "Remove the selected photos from the trash"
 msgstr "Уклоните изабране фотографије из корпе"
 
-#: ../src/Resources.vala:643
+#: ../src/Resources.vala:651
 msgid "Remove the selected photos from the library"
 msgstr "Уклоните изабране фотографије из фототеке"
 
-#: ../src/Resources.vala:645
+#: ../src/Resources.vala:653
 msgid "_Restore"
 msgstr "_Поврати"
 
-#: ../src/Resources.vala:646
+#: ../src/Resources.vala:654
 msgid "Move the selected photos back into the library"
 msgstr "Преместите изабране фотографије назад у фототеку"
 
-#: ../src/Resources.vala:648
+#: ../src/Resources.vala:656
 msgid "Show in File Mana_ger"
 msgstr "Прикажи у _управнику датотека"
 
-#: ../src/Resources.vala:649
+#: ../src/Resources.vala:657
 msgid "Open the selected photo's directory in the file manager"
 msgstr "Отворите директоријум изабраних фотографија у управнику датотека"
 
-#: ../src/Resources.vala:652
+#: ../src/Resources.vala:660
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Не могу да отворим управника датотека: %s"
 
-#: ../src/Resources.vala:655
+#: ../src/Resources.vala:663
 msgid "R_emove From Library"
 msgstr "Уклони из _фототеке"
 
-#: ../src/Resources.vala:657
+#: ../src/Resources.vala:665
 msgid "_Move to Trash"
 msgstr "_Премести у корпу"
 
-#: ../src/Resources.vala:659
+#: ../src/Resources.vala:667
 msgid "Select _All"
 msgstr "Изабери _све"
 
-#: ../src/Resources.vala:660
+#: ../src/Resources.vala:668
 msgid "Select all items"
 msgstr "Изаберите све ставке"
 
@@ -3718,20 +3756,20 @@ msgstr "Изаберите све ставке"
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:741
+#: ../src/Resources.vala:749
 msgid "%-I:%M %p"
 msgstr "%-I:%M %p"
 
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:746
+#: ../src/Resources.vala:754
 msgid "%-I:%M:%S %p"
 msgstr "%-I:%M:%S %p"
 
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:750
+#: ../src/Resources.vala:758
 msgid "%a %b %d, %Y"
 msgstr "%A, %d. %B %Y."
 
@@ -3741,14 +3779,14 @@ msgstr "%A, %d. %B %Y."
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:755 ../src/Resources.vala:765
+#: ../src/Resources.vala:763 ../src/Resources.vala:773
 msgid "%a %b %d"
 msgstr "%A, %d. %B"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:760
+#: ../src/Resources.vala:768
 msgid "%d, %Y"
 msgstr "%d., %Y."
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index f18f1f1..0977ccf 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=shotwel"
 "l&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2014-10-06 22:50+0000\n"
-"PO-Revision-Date: 2014-10-11 11:59+0200\n"
+"POT-Creation-Date: 2014-10-27 11:26+0000\n"
+"PO-Revision-Date: 2014-10-27 20:49+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@@ -51,7 +51,7 @@ msgstr "Posetite veb stranicu Foto-bunara"
 msgid "translator-credits"
 msgstr ""
 "Nikola Radovanović <nrad@eunet.rs>\n"
-"Miroslav Nikolić   <miroslavnikolic@rocketmail.com>\n"
+"Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "\n"
 "http://prevod.org — prevod na srpski jezik"
 
@@ -106,7 +106,7 @@ msgid ""
 "database is not supported by Shotwell"
 msgstr ""
 "Ne mogu da otvorim datoteku zbirke F-broja: Foto-bunar ne podržava ovo "
-"izdanje zbirke F-broja"
+"izdanje zbirke F-broja."
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
 msgid ""
@@ -153,7 +153,7 @@ msgstr "Usluge uvoza ključnih podataka"
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
-msgstr "Modul objavljivanja Galerije3"
+msgstr "Modulobjavljivanja Galerije 3"
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
 #| msgid ""
@@ -168,9 +168,9 @@ msgid ""
 "You must have already signed up for a Gallery3 account to complete the login "
 "process."
 msgstr ""
-"Trenutno niste prijavljeni na vašu Galeriju.\n"
+"Niste trenutno prijavljeni na vašu Galeriju.\n"
 "\n"
-"Treba da ste već otvorili nalog za Galeriju3 da biste obavili proces "
+"Potrebno je da ste već otvorili nalog za Galeriju 3 da biste obavili proces "
 "prijavljivanja."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
@@ -194,7 +194,7 @@ msgstr ""
 "\n"
 "\n"
 "Može biti da datoteka „%s“ nije podržana ili je prevelika za ovaj primerak "
-"Galerije3."
+"Galerije 3."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:802
 msgid ""
@@ -202,25 +202,36 @@ msgid ""
 "Note that Gallery3 only supports the video types that Flowplayer does."
 msgstr ""
 "\n"
-"Znajte da Galerija3 podržava samo vrste videa koje i puštač toka."
+"Znajte da Galerija 3 podržava samo vrste videa koje i Flovplejer."
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1774
+#, c-format
 #| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Flickr can't "
+#| "A file required for publishing is unavailable. Publishing to Picasa can't "
 #| "continue."
-msgid "A file required for publishing is unavailable. Publishing to "
-msgstr "Datoteka za objavljivanje nije dostupna. Objavljujem na "
+msgid ""
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
+msgstr ""
+"Datoteka za objavljivanje nije dostupna. Objavljivanje na „%s“ ne može da se "
+"nastavi."
 
 #. populate any widgets whose contents are
 #. programmatically-generated
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
 #, c-format
 #| msgid "Publish Photos and Videos"
 msgid "Publishing to %s as %s."
-msgstr "Objavljujem na %s kao %s."
+msgstr "Objavljujem na „%s“ kao %s."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1816
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Flickr can't "
+#| "continue."
+msgid "A file required for publishing is unavailable. Publishing to "
+msgstr "Datoteka za objavljivanje nije dostupna. Objavljujem na "
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
 #| msgid ""
 #| "Enter the URL of your Piwigo photo library as well as the username and "
 #| "password associated with your Piwigo account for that library."
@@ -228,34 +239,34 @@ msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
 msgstr ""
-"Unesite adresu vašeg sajta Galerije3 kao i korisničko ime i lozinku (ili API "
-"ključ) vašeg naloga Galerije3."
+"Unesite adresu vašeg sajta Galerije 3 kao i korisničko ime i lozinku (ili "
+"API ključ) za vaš nalog Galerije 3."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
 msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
 msgstr ""
-"Korisničko ime i lozinka ili API ključ behu neispravni. Da pokušate opet, "
+"Korisničko ime i lozinka ili API ključ bejahu neispravni. Da pokušate opet, "
 "ponovo unesite vaše korisničko ime i lozinku."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
 msgid ""
 "The URL entered does not appear to be the main directory of a Gallery3 "
 "instance. Please make sure you typed it correctly and it does not have any "
 "trailing components (e.g., index.php)."
 msgstr ""
-"Adresa koju ste uneli ne izgleda da je glavni direktorijum primerka "
-"Galerije3. Proverite da li ste tačno ukucali i da nema nikakvog pratećeg "
-"sastojka (npr. „index.php“)."
+"Unesena adresa ne izgleda da je glavni direktorijum primerka Galerije 3. "
+"Proverite da li ste je ispravno ukucali i da nema nikakav prateći sastojak ("
+"npr., „index.php“)."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1871
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
 msgid "Unrecognized User"
-msgstr "Nepoznat korisnik"
+msgstr "Nepoznati korisnik"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1876
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
 msgid " Site Not Found"
-msgstr " Nisam našao sajt"
+msgstr " Nisam pronašao sajt"
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
 msgid "Copyright (C) 2013 rajce.net"
@@ -265,17 +276,17 @@ msgstr "Autorska prava (C) 2013 rajce.net"
 #| msgid ""
 #| "An error message occurred when publishing to Piwigo. Please try again."
 msgid "An error message occurred when publishing to Rajce. Please try again."
-msgstr "Došlo je do greške prilikom objavljivanja na Rajsu. Pokušajte ponovo."
+msgstr "Došli je do greške prilikom objavljivanja na Rajsu. Pokušajte ponovo."
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
 #| msgid "Enter the username and password associated with your Tumblr account."
 msgid "Enter email and password associated with your Rajce account."
-msgstr "Unesite korisničko ime i lozinku pridruženu vašem nalogu Rajsa."
+msgstr "Unesite el. poštu i lozinku pridruženu vašem nalogu Rajs-a."
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
 #| msgid "Username and/or password invalid. Please try again"
 msgid "Invalid email and/or password. Please try again"
-msgstr "El. pošta i/ili lozinka nisu ispravni. Pokušajte ponovo"
+msgstr "El. pošta i/ili lozinka nisu ispravni. Pokušajte ponovo."
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
 #| msgid "Invalid User Name or Password"
@@ -319,7 +330,7 @@ msgstr "_Sakrij album"
 #| "You are logged into Facebook as %s.\n"
 #| "\n"
 msgid "You are logged into Rajce as %s."
-msgstr "Prijavljeni ste na Rajsu kao %s."
+msgstr "Prijavljeni ste na Rajs kao %s."
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
 #: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
@@ -374,13 +385,13 @@ msgid "Copyright 2012 BJA Electronics"
 msgstr "Autorska prava 2012 BJA Electronics"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1229
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
 msgid "500 x 375 pixels"
 msgstr "500 x 375 tačkica"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1230
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
 msgid "1024 x 768 pixels"
 msgstr "1024 x 768 tačkica"
@@ -450,7 +461,7 @@ msgstr "Foto-bunarove dodatne usluge objavljivanja"
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
 #| msgid "Back"
 msgid "Go _Back"
-msgstr "Idi _nazad"
+msgstr "_Nazad"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
 #: ../ui/shotwell.glade.h:43
@@ -459,11 +470,11 @@ msgstr "_Prijavi me"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
 msgid "Intro message replaced at runtime"
-msgstr "Uvodna poruka zamenjena prilikom pokretanja"
+msgstr "Uvodna poruka zamenjena za vreme pokretanja"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
 msgid "_Gallery3 URL:"
-msgstr "Adresa _Galerije3:"
+msgstr "Adresa _Galerije 3:"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
 #| msgid "User _name"
@@ -500,11 +511,11 @@ msgstr "_Postojeći album"
 #| "_Remove location, camera, and other identifying information before "
 #| "uploading"
 msgid "_Remove location, tag and camera-identifying data before uploading"
-msgstr "_Ukloni mesto, oznaku i podatke prepoznavanja foto-aparat pre otpremanja"
+msgstr "_Ukloni mesto, podatke prepoznavanja oznake i foto-aparata pre otpremanja"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
 msgid "'Publishing to $url as $username' (populated in application code)"
-msgstr "'Objavljujem na „$url“ kao „$username“' (popunjeno u programskom kodu)"
+msgstr "'Objavljujem na $url kao $username' (ispunjeno u kodu programa)"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
 #| msgid "_Scaling constraint:"
@@ -517,7 +528,7 @@ msgid "pixels"
 msgstr "tačkica"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
 #: ../src/Dimensions.vala:17
 msgid "Original size"
@@ -549,12 +560,12 @@ msgstr "Veličina _fotografije:"
 #| "You are logged into Facebook as %s.\n"
 #| "\n"
 msgid "you are logged in rajce as $name"
-msgstr "prijavljeni ste na rajs kao „$name“"
+msgstr "prijavljeni ste na rajs kao $name"
 
 #: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
 #| msgid "Videos will appear in:"
 msgid "$mediatype will appear in"
-msgstr "„$mediatype“ će se pojaviti u"
+msgstr "$mediatype će se pojaviit u"
 
 #: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
 msgid "_Albums (or write new):"
@@ -664,12 +675,12 @@ msgid "Upload _size:"
 msgstr "_Veličina slanja:"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
 msgid "Just me"
 msgstr "Samo meni"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
 msgid "Everyone"
 msgstr "Svima"
@@ -723,50 +734,68 @@ msgstr ""
 "Prijavljeni ste na Flikr kao %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
 #, 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."
 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 ""
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"Vaš besplatni nalog Flikra ograničava količinu podataka koju možete mesečno "
+"da otpremite.\n"
+"Za ovaj mesec vam je preostao još %d megabajt za otpremanje."
+msgstr[1] ""
+"Vaš besplatni nalog Flikra ograničava količinu podataka koju možete mesečno "
+"da otpremite.\n"
+"Za ovaj mesec su vam preostala još %d megabajta za otpremanje."
+msgstr[2] ""
+"Vaš besplatni nalog Flikra ograničava količinu podataka koju možete mesečno "
+"da otpremite.\n"
+"Za ovaj mesec vam je preostalo još %d megabajta za otpremanje."
+msgstr[3] ""
 "Vaš besplatni nalog Flikra ima ograničenje količine podataka za mesečno "
 "otpremanje.\n"
 "Za ovaj mesec, preostalo vam je još %d megabajta za otpremanje."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1157
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Vaš nalog Flikra Pro vam omogućava neograničena otpremanja."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1162
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
 msgid "Photos _visible to:"
 msgstr "Fotografije mogu _videti:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
 msgid "Videos _visible to:"
 msgstr "Video snimke mogu _videti:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
 msgid "Photos and videos _visible to:"
 msgstr "Fotografije i snimke mogu _videti:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
 msgid "Friends & family only"
 msgstr "Samo prijatelji i porodica"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
 msgid "Family only"
 msgstr "Samo porodica"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Friends only"
 msgstr "Samo prijatelji"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
 msgid "2048 x 1536 pixels"
 msgstr "2048 x 1536 tačkica"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
 msgid "4096 x 3072 pixels"
 msgstr "4096 x 3072 tačkica"
@@ -998,7 +1027,7 @@ msgid "Logout"
 msgstr "Odjavi me"
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:268
+#: ../src/Resources.vala:270
 msgid "Publish"
 msgstr "Objavi"
 
@@ -1127,7 +1156,7 @@ msgstr "_Prijavi problem..."
 
 #: ../src/AppWindow.vala:624 ../src/AppWindow.vala:645
 #: ../src/AppWindow.vala:662 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1417 ../src/Dialogs.vala:1440
+#: ../src/Dialogs.vala:1422 ../src/Dialogs.vala:1445
 #: ../src/data_imports/DataImportsUI.vala:399
 #: ../src/publishing/PublishingUI.vala:498
 msgid "_Cancel"
@@ -1141,7 +1170,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Došlo je do kobne greške prilikom pristupanja fototeci Foto-bunara.  Foto-"
+"Došlo je do kobne greške prilikom pristupanja fototeci Foto-bunara. Foto-"
 "bunar ne može da nastavi rad.\n"
 "\n"
 "%s"
@@ -1486,9 +1515,9 @@ msgstr[1] "Ovo će ukloniti oznaku „%s“ iz %d fotografije.  Da nastavim?"
 msgstr[2] "Ovo će ukloniti oznaku „%s“ iz %d fotografija.  Da nastavim?"
 msgstr[3] "Ovo će ukloniti oznaku „%s“ iz %d fotografije.  Da nastavim?"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1385
-#: ../src/Resources.vala:328 ../src/Resources.vala:376
-#: ../src/Resources.vala:641
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1390
+#: ../src/Resources.vala:336 ../src/Resources.vala:384
+#: ../src/Resources.vala:649
 msgid "_Delete"
 msgstr "_Izbriši"
 
@@ -2066,27 +2095,30 @@ msgstr "Preimenujte događaj"
 msgid "Name:"
 msgstr "Naziv:"
 
-#: ../src/Dialogs.vala:1329 ../src/Resources.vala:272
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1330 ../src/Resources.vala:275
 msgid "Edit Title"
 msgstr "Uredite naslov"
 
-#: ../src/Dialogs.vala:1329 ../src/Properties.vala:340
+#: ../src/Dialogs.vala:1331 ../src/Properties.vala:340
 msgid "Title:"
 msgstr "Naslov:"
 
-#: ../src/Dialogs.vala:1343 ../src/Resources.vala:278
+#. Dialog title
+#: ../src/Dialogs.vala:1347 ../src/Resources.vala:282
 msgid "Edit Event Comment"
 msgstr "Uredite napomenu događaja"
 
-#: ../src/Dialogs.vala:1343
+#: ../src/Dialogs.vala:1348
 msgid "Edit Photo/Video Comment"
 msgstr "Uredite napomenu fotografije/snimka"
 
-#: ../src/Dialogs.vala:1344 ../src/Properties.vala:630
+#: ../src/Dialogs.vala:1349 ../src/Properties.vala:630
 msgid "Comment:"
 msgstr "Napomena:"
 
-#: ../src/Dialogs.vala:1360
+#: ../src/Dialogs.vala:1365
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Ukloni i _obriši fotografiju"
@@ -2094,23 +2126,23 @@ msgstr[1] "Ukloni i _obriši fotografije"
 msgstr[2] "Ukloni i _obriši fotografije"
 msgstr[3] "Ukloni i _obriši fotografiju"
 
-#: ../src/Dialogs.vala:1364
+#: ../src/Dialogs.vala:1369
 msgid "_Remove From Library"
 msgstr "_Ukloni iz fototeke"
 
-#: ../src/Dialogs.vala:1384 ../src/camera/ImportPage.vala:1739
+#: ../src/Dialogs.vala:1389 ../src/camera/ImportPage.vala:1739
 msgid "_Keep"
 msgstr "_Zadrži"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1412
 msgid "Revert External Edit?"
 msgstr "Da li da vratim spoljnu izmenu?"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1412
 msgid "Revert External Edits?"
 msgstr "Da li da vratim spoljne izmene?"
 
-#: ../src/Dialogs.vala:1409
+#: ../src/Dialogs.vala:1414
 #, c-format
 msgid "This will destroy all changes made to the external file.  Continue?"
 msgid_plural ""
@@ -2124,15 +2156,15 @@ msgstr[2] ""
 msgstr[3] ""
 "Ova radnja će uništiti sve izmene na %d spoljnoj datoteci.  Da nastavim?"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1418
 msgid "Re_vert External Edit"
 msgstr "_Vrati spoljnu izmenu"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1418
 msgid "Re_vert External Edits"
 msgstr "_Vrati spoljne izmene"
 
-#: ../src/Dialogs.vala:1434
+#: ../src/Dialogs.vala:1439
 #, c-format
 msgid "This will remove the photo from the library.  Continue?"
 msgid_plural "This will remove %d photos from the library.  Continue?"
@@ -2141,72 +2173,72 @@ msgstr[1] "Ovo će ukloniti %d fotografije iz fototeke.  Da nastavim?"
 msgstr[2] "Ovo će ukloniti %d fotografija iz fototeke.  Da nastavim?"
 msgstr[3] "Ovo će ukloniti %d fotografiju iz fototeke.  Da nastavim?"
 
-#: ../src/Dialogs.vala:1441
+#: ../src/Dialogs.vala:1446
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1447
 msgid "Remove Photo From Library"
 msgstr "Uklonite fotografiju iz fototeke"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1447
 msgid "Remove Photos From Library"
 msgstr "Uklonite fotografije iz fototeke"
 
-#: ../src/Dialogs.vala:1535
+#: ../src/Dialogs.vala:1540
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1682
+#: ../src/Dialogs.vala:1687
 msgid "AM"
 msgstr "PrP"
 
-#: ../src/Dialogs.vala:1683
+#: ../src/Dialogs.vala:1688
 msgid "PM"
 msgstr "PoP"
 
-#: ../src/Dialogs.vala:1684
+#: ../src/Dialogs.vala:1689
 msgid "24 Hr"
 msgstr "24 sata"
 
-#: ../src/Dialogs.vala:1699
+#: ../src/Dialogs.vala:1704
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Pomeri fotografije/snimke za isti iznos"
 
-#: ../src/Dialogs.vala:1704
+#: ../src/Dialogs.vala:1709
 msgid "Set _all photos/videos to this time"
 msgstr "Postavi _sve fotografije/snimke na ovo vreme"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1716
 msgid "_Modify original photo file"
 msgstr "_Izmeni izvornu fotografiju"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1716
 msgid "_Modify original photo files"
 msgstr "_Izmeni izvorne fotografije"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1719
 msgid "_Modify original file"
 msgstr "_Izmeni izvornu datoteku"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1719
 msgid "_Modify original files"
 msgstr "_Izmeni izvorne datoteke"
 
-#: ../src/Dialogs.vala:1800
+#: ../src/Dialogs.vala:1805
 msgid "Original: "
 msgstr "Izvorno: "
 
-#: ../src/Dialogs.vala:1801
+#: ../src/Dialogs.vala:1806
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d.%m.%Y. %H:%M:%S"
 
-#: ../src/Dialogs.vala:1802
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d.%m.%Y. %H:%M:%S"
 
-#: ../src/Dialogs.vala:1891
+#: ../src/Dialogs.vala:1896
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -2215,7 +2247,7 @@ msgstr ""
 "Vreme izlaganja će biti pomereno unapred za\n"
 "%d %s, %d %s, %d %s, i %d %s."
 
-#: ../src/Dialogs.vala:1892
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2224,7 +2256,7 @@ msgstr ""
 "Vreem izlaganja će biti pomereno unazad za\n"
 "%d %s, %d %s, %d %s, i %d %s."
 
-#: ../src/Dialogs.vala:1894
+#: ../src/Dialogs.vala:1899
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dan"
@@ -2232,7 +2264,7 @@ msgstr[1] "dana"
 msgstr[2] "dana"
 msgstr[3] "dan"
 
-#: ../src/Dialogs.vala:1895
+#: ../src/Dialogs.vala:1900
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "sat"
@@ -2240,7 +2272,7 @@ msgstr[1] "sata"
 msgstr[2] "sati"
 msgstr[3] "sat"
 
-#: ../src/Dialogs.vala:1896
+#: ../src/Dialogs.vala:1901
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
@@ -2248,7 +2280,7 @@ msgstr[1] "minuta"
 msgstr[2] "minuta"
 msgstr[3] "minut"
 
-#: ../src/Dialogs.vala:1897
+#: ../src/Dialogs.vala:1902
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekundu"
@@ -2256,7 +2288,7 @@ msgstr[1] "sekunde"
 msgstr[2] "sekundi"
 msgstr[3] "sekundu"
 
-#: ../src/Dialogs.vala:1941
+#: ../src/Dialogs.vala:1946
 #, c-format
 msgid ""
 "\n"
@@ -2283,49 +2315,49 @@ msgstr[3] ""
 "\n"
 "I %d druga."
 
-#: ../src/Dialogs.vala:1963 ../src/Dialogs.vala:1990
+#: ../src/Dialogs.vala:1968 ../src/Dialogs.vala:1995
 msgid "Tags (separated by commas):"
 msgstr "Oznake (razdvojene zapetom):"
 
-#: ../src/Dialogs.vala:2070
+#: ../src/Dialogs.vala:2075
 msgid "Welcome!"
 msgstr "Dobro došli!"
 
-#: ../src/Dialogs.vala:2077
+#: ../src/Dialogs.vala:2082
 msgid "Welcome to Shotwell!"
 msgstr "Dobro došli u Foto-bunar!"
 
-#: ../src/Dialogs.vala:2081
+#: ../src/Dialogs.vala:2086
 msgid "To get started, import photos in any of these ways:"
 msgstr "Da započnete, uvezite fotografije na jedan od sledećih načina:"
 
-#: ../src/Dialogs.vala:2100
+#: ../src/Dialogs.vala:2105
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Izaberite <span weight=\"bold\">Datoteka %s Uvezi iz fascikle</span>"
 
-#: ../src/Dialogs.vala:2101
+#: ../src/Dialogs.vala:2106
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Prevucite i ubacite fotografiju u prozor Foto-bunara"
 
-#: ../src/Dialogs.vala:2102
+#: ../src/Dialogs.vala:2107
 msgid "Connect a camera to your computer and import"
 msgstr "Povežite foto-aparat na računar i uvezite fotografije"
 
-#: ../src/Dialogs.vala:2112
+#: ../src/Dialogs.vala:2117
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Uvezi fotografije iz fascikle „%s“"
 
-#: ../src/Dialogs.vala:2119
+#: ../src/Dialogs.vala:2124
 msgid "You can also import photos in any of these ways:"
 msgstr "Možete uvesti fotografije na neki od sledećih načina:"
 
-#: ../src/Dialogs.vala:2129
+#: ../src/Dialogs.vala:2134
 msgid "_Don't show this message again"
 msgstr "_Ne prikazuj više ovu poruku"
 
-#: ../src/Dialogs.vala:2164
+#: ../src/Dialogs.vala:2169
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Uvezite fotografije iz fototeke „%s“"
@@ -2333,73 +2365,73 @@ msgstr "Uvezite fotografije iz fototeke „%s“"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2308 ../src/Dialogs.vala:2312
+#: ../src/Dialogs.vala:2313 ../src/Dialogs.vala:2317
 msgid "(Help)"
 msgstr "(Pomoć)"
 
-#: ../src/Dialogs.vala:2321
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Godina%smesec%sdan"
 
-#: ../src/Dialogs.vala:2323
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth"
 msgstr "Godina%smesec"
 
-#: ../src/Dialogs.vala:2325
+#: ../src/Dialogs.vala:2330
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Godina%smesec-dan"
 
-#: ../src/Dialogs.vala:2327
+#: ../src/Dialogs.vala:2332
 msgid "Year-Month-Day"
 msgstr "Godina-mesec-dan"
 
-#: ../src/Dialogs.vala:2328 ../src/editing_tools/EditingTools.vala:781
+#: ../src/Dialogs.vala:2333 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Proizvoljno"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2565
+#: ../src/Dialogs.vala:2570
 msgid "Invalid pattern"
 msgstr "Neispravan obrazac"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: ../src/Dialogs.vala:2668
+#: ../src/Dialogs.vala:2673
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
 msgstr ""
 "Foto-bunar može da umnoži fotografije u fasciklu fototeke ili da ih uveze "
-"bez umnožavanja."
+"bez umnožavanja"
 
-#: ../src/Dialogs.vala:2673
+#: ../src/Dialogs.vala:2678
 msgid "Co_py Photos"
 msgstr "_Umnoži fotografije"
 
-#: ../src/Dialogs.vala:2674
+#: ../src/Dialogs.vala:2679
 msgid "_Import in Place"
 msgstr "Uvezi _na mestu"
 
-#: ../src/Dialogs.vala:2675
+#: ../src/Dialogs.vala:2680
 msgid "Import to Library"
 msgstr "Uvezite u fototeku"
 
-#: ../src/Dialogs.vala:2685 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2690 ../src/PhotoPage.vala:3086
 msgid "Remove From Library"
 msgstr "Uklonite iz fototeke"
 
-#: ../src/Dialogs.vala:2686 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2691 ../src/PhotoPage.vala:3086
 msgid "Removing Photo From Library"
 msgstr "Uklanjam fotografiju iz fototeke"
 
-#: ../src/Dialogs.vala:2686
+#: ../src/Dialogs.vala:2691
 msgid "Removing Photos From Library"
 msgstr "Uklanjam fotografije iz fototeke"
 
-#: ../src/Dialogs.vala:2700
+#: ../src/Dialogs.vala:2705
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -2432,7 +2464,7 @@ msgstr[3] ""
 "\n"
 "Ova radnja ne može biti poništena."
 
-#: ../src/Dialogs.vala:2704
+#: ../src/Dialogs.vala:2709
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -2465,7 +2497,7 @@ msgstr[3] ""
 "\n"
 "Ova radnja ne može biti poništena."
 
-#: ../src/Dialogs.vala:2708
+#: ../src/Dialogs.vala:2713
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -2498,7 +2530,7 @@ msgstr[3] ""
 "\n"
 "Ova radnja ne može biti poništena."
 
-#: ../src/Dialogs.vala:2740
+#: ../src/Dialogs.vala:2745
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -2514,7 +2546,7 @@ msgstr[3] ""
 "Ne mogu da premestim u smeće %d fotografiju/snimak.  Da li da uklonim?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2757
+#: ../src/Dialogs.vala:2762
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -3370,347 +3402,353 @@ msgstr "Prikažite sve fotografije, uključujući i odbačene"
 msgid "_All Photos"
 msgstr "_Sve fotografije"
 
-#: ../src/Resources.vala:249 ../src/Resources.vala:250
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:250 ../src/Resources.vala:252
 msgid "Show all photos"
 msgstr "Prikažite sve fotografije"
 
-#: ../src/Resources.vala:252
+#: ../src/Resources.vala:254
 msgid "_Ratings"
 msgstr "_Ocene"
 
-#: ../src/Resources.vala:253
+#: ../src/Resources.vala:255
 msgid "Display each photo's rating"
 msgstr "Prikažite ocene svih fotografija"
 
-#: ../src/Resources.vala:255
+#: ../src/Resources.vala:257
 msgid "_Filter Photos"
 msgstr "_Izdvoj fotografije"
 
-#: ../src/Resources.vala:256
+#: ../src/Resources.vala:258
 msgid "Filter Photos"
 msgstr "Izdvojte fotografije"
 
-#: ../src/Resources.vala:257
+#: ../src/Resources.vala:259
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Ograničite broj prikazanih fotografija na osnovu propusnika"
 
-#: ../src/Resources.vala:259
+#: ../src/Resources.vala:261
 msgid "_Duplicate"
 msgstr "_Udvostruči"
 
-#: ../src/Resources.vala:260
+#: ../src/Resources.vala:262
 msgid "Duplicate"
 msgstr "Udvostruči"
 
-#: ../src/Resources.vala:261
+#: ../src/Resources.vala:263
 msgid "Make a duplicate of the photo"
 msgstr "Napravite umnožak fotografije"
 
-#: ../src/Resources.vala:263
+#: ../src/Resources.vala:265
 msgid "_Export..."
 msgstr "_Izvezi..."
 
-#: ../src/Resources.vala:265
+#: ../src/Resources.vala:267
 msgid "_Print..."
 msgstr "_Štampaj..."
 
-#: ../src/Resources.vala:267
+#: ../src/Resources.vala:269
 msgid "Pu_blish..."
 msgstr "_Objavi..."
 
-#: ../src/Resources.vala:269
+#: ../src/Resources.vala:271
 msgid "Publish to various websites"
 msgstr "Objavite izabrane fotografije na raznim sajtovima"
 
-#: ../src/Resources.vala:271
+#: ../src/Resources.vala:273
 msgid "Edit _Title..."
 msgstr "Izmeni _naslov..."
 
-#: ../src/Resources.vala:274
+#: ../src/Resources.vala:277
 msgid "Edit _Comment..."
 msgstr "Izmeni _napomenu..."
 
-#: ../src/Resources.vala:275
+#. Button label
+#: ../src/Resources.vala:279
 msgid "Edit Comment"
 msgstr "Izmenite napomenu"
 
-#: ../src/Resources.vala:277
+#: ../src/Resources.vala:281
 msgid "Edit Event _Comment..."
 msgstr "Izmeni _napomenu događaja..."
 
-#: ../src/Resources.vala:280
+#: ../src/Resources.vala:284
 msgid "_Adjust Date and Time..."
-msgstr "_Podesi datum i vreme..."
+msgstr "_Podesi datum i vreme"
 
-#: ../src/Resources.vala:281
+#: ../src/Resources.vala:285
 msgid "Adjust Date and Time"
 msgstr "Podesite datum i vreme"
 
-#: ../src/Resources.vala:283
+#: ../src/Resources.vala:287
 msgid "Add _Tags..."
 msgstr "Dodaj _oznake..."
 
-#: ../src/Resources.vala:284
+#: ../src/Resources.vala:288
 msgid "_Add Tags..."
 msgstr "_Dodaj oznake..."
 
-#: ../src/Resources.vala:285 ../src/Resources.vala:316
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:290 ../src/Resources.vala:323
 msgid "Add Tags"
 msgstr "Dodajte oznake"
 
-#: ../src/Resources.vala:287
+#: ../src/Resources.vala:292
 msgid "_Preferences"
 msgstr "_Postavke"
 
-#: ../src/Resources.vala:289
+#: ../src/Resources.vala:294
 msgid "Open With E_xternal Editor"
 msgstr "_Otvori spoljnim uređivačem"
 
-#: ../src/Resources.vala:291
+#: ../src/Resources.vala:296
 msgid "Open With RA_W Editor"
 msgstr "Otvori uređivačem _sirovih"
 
-#: ../src/Resources.vala:293
+#: ../src/Resources.vala:298
 msgid "Send _To..."
 msgstr "Pošalji _u..."
 
-#: ../src/Resources.vala:294
+#: ../src/Resources.vala:299
 msgid "Send T_o..."
 msgstr "Pošalji _u..."
 
-#: ../src/Resources.vala:296
+#: ../src/Resources.vala:301
 msgid "_Find..."
 msgstr "_Nađi..."
 
-#: ../src/Resources.vala:297
+#: ../src/Resources.vala:302
 msgid "Find"
 msgstr "Pronađite"
 
-#: ../src/Resources.vala:298
+#: ../src/Resources.vala:303
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Pronađite fotografije na osnovu naziva ili oznake"
 
-#: ../src/Resources.vala:300
+#: ../src/Resources.vala:305
 msgid "_Flag"
 msgstr "_Postavi obeležje"
 
-#: ../src/Resources.vala:302
+#: ../src/Resources.vala:307
 msgid "Un_flag"
 msgstr "_Ukloni obeležje"
 
-#: ../src/Resources.vala:305
+#: ../src/Resources.vala:310
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Ne mogu da pokrenem uređivača: %s"
 
-#: ../src/Resources.vala:310
+#: ../src/Resources.vala:315
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "Dodaj oznaku „%s“"
 
-#: ../src/Resources.vala:312
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:318
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "Dodaj oznaku „%s“ i „%s“"
 
-#: ../src/Resources.vala:320
+#: ../src/Resources.vala:328
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "_Obriši oznaku „%s“"
 
-#: ../src/Resources.vala:324
+#: ../src/Resources.vala:332
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "Obriši oznaku „%s“"
 
-#: ../src/Resources.vala:327
+#: ../src/Resources.vala:335
 msgid "Delete Tag"
 msgstr "Obrišite oznaku"
 
-#: ../src/Resources.vala:330
+#: ../src/Resources.vala:338
 msgid "_New"
 msgstr "_Novo"
 
-#: ../src/Resources.vala:333
+#: ../src/Resources.vala:341
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "_Preimenuj oznaku „%s“..."
 
-#: ../src/Resources.vala:337
+#: ../src/Resources.vala:345
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "Preimenuj oznaku „%s“ u „%s“"
 
-#: ../src/Resources.vala:340
+#: ../src/Resources.vala:348
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ../src/Resources.vala:342
+#: ../src/Resources.vala:350
 msgid "Modif_y Tags..."
 msgstr "Izmeni _oznake..."
 
-#: ../src/Resources.vala:343
+#: ../src/Resources.vala:351
 msgid "Modify Tags"
 msgstr "Izmenite oznake"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:354
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Označi fotografije kao „%s“"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:354
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Označi fotografije kao „%s“"
 
-#: ../src/Resources.vala:350
+#: ../src/Resources.vala:358
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "Označi izabranu fotografiju kao „%s“"
 
-#: ../src/Resources.vala:351
+#: ../src/Resources.vala:359
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "Označi izabrane fotografije kao „%s“"
 
-#: ../src/Resources.vala:355
+#: ../src/Resources.vala:363
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "Ukloni oznaku „%s“ sa _fotografije"
 
-#: ../src/Resources.vala:356
+#: ../src/Resources.vala:364
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "Ukloni oznaku „%s“ sa _fotografija"
 
-#: ../src/Resources.vala:360
+#: ../src/Resources.vala:368
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "Uklonite oznaku „%s“ sa fotografije"
 
-#: ../src/Resources.vala:361
+#: ../src/Resources.vala:369
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "Uklonite oznaku „%s“ sa fotografija"
 
-#: ../src/Resources.vala:365
+#: ../src/Resources.vala:373
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr "Ne mogu da preimenujem oznaku „%s“ jer već postoji ta oznaka."
 
-#: ../src/Resources.vala:369
+#: ../src/Resources.vala:377
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr "Ne mogu da preimenujem pretragu „%s“ jer već postoji ta pretraga."
 
-#: ../src/Resources.vala:372
+#: ../src/Resources.vala:380
 msgid "Saved Search"
 msgstr "Sačuvane pretrage"
 
-#: ../src/Resources.vala:374
+#: ../src/Resources.vala:382
 msgid "Delete Search"
 msgstr "Izbriši pretragu"
 
-#: ../src/Resources.vala:377
+#: ../src/Resources.vala:385
 msgid "_Edit..."
 msgstr "_Izmeni..."
 
-#: ../src/Resources.vala:378
+#: ../src/Resources.vala:386
 msgid "Re_name..."
 msgstr "Pre_imenuj..."
 
-#: ../src/Resources.vala:381
+#: ../src/Resources.vala:389
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "Preimenuj pretragu „%s“ u „%s“"
 
-#: ../src/Resources.vala:385
+#: ../src/Resources.vala:393
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "Izbriši pretragu „%s“"
 
-#: ../src/Resources.vala:543
+#: ../src/Resources.vala:551
 #, c-format
 msgid "Rate %s"
 msgstr "Oceni „%s“"
 
-#: ../src/Resources.vala:544
+#: ../src/Resources.vala:552
 #, c-format
 msgid "Set rating to %s"
 msgstr "Postavite ocenu na „%s“"
 
-#: ../src/Resources.vala:545
+#: ../src/Resources.vala:553
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Postavljam ocenu na „%s“"
 
-#: ../src/Resources.vala:547
+#: ../src/Resources.vala:555
 #, c-format
 msgid "Display %s"
 msgstr "Prikaži „%s“"
 
-#: ../src/Resources.vala:548
+#: ../src/Resources.vala:556
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Prikažite samo fotografije sa ocenom „%s“"
 
-#: ../src/Resources.vala:549
+#: ../src/Resources.vala:557
 #, c-format
 msgid "%s or Better"
 msgstr "%s ili bolje"
 
-#: ../src/Resources.vala:550
+#: ../src/Resources.vala:558
 #, c-format
 msgid "Display %s or Better"
 msgstr "Prikaži %s ili bolje"
 
-#: ../src/Resources.vala:551
+#: ../src/Resources.vala:559
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Prikažite samo fotografije sa ocenom %s ili boljom"
 
-#: ../src/Resources.vala:642
+#: ../src/Resources.vala:650
 msgid "Remove the selected photos from the trash"
 msgstr "Uklonite izabrane fotografije iz korpe"
 
-#: ../src/Resources.vala:643
+#: ../src/Resources.vala:651
 msgid "Remove the selected photos from the library"
 msgstr "Uklonite izabrane fotografije iz fototeke"
 
-#: ../src/Resources.vala:645
+#: ../src/Resources.vala:653
 msgid "_Restore"
 msgstr "_Povrati"
 
-#: ../src/Resources.vala:646
+#: ../src/Resources.vala:654
 msgid "Move the selected photos back into the library"
 msgstr "Premestite izabrane fotografije nazad u fototeku"
 
-#: ../src/Resources.vala:648
+#: ../src/Resources.vala:656
 msgid "Show in File Mana_ger"
 msgstr "Prikaži u _upravniku datoteka"
 
-#: ../src/Resources.vala:649
+#: ../src/Resources.vala:657
 msgid "Open the selected photo's directory in the file manager"
 msgstr "Otvorite direktorijum izabranih fotografija u upravniku datoteka"
 
-#: ../src/Resources.vala:652
+#: ../src/Resources.vala:660
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Ne mogu da otvorim upravnika datoteka: %s"
 
-#: ../src/Resources.vala:655
+#: ../src/Resources.vala:663
 msgid "R_emove From Library"
 msgstr "Ukloni iz _fototeke"
 
-#: ../src/Resources.vala:657
+#: ../src/Resources.vala:665
 msgid "_Move to Trash"
 msgstr "_Premesti u korpu"
 
-#: ../src/Resources.vala:659
+#: ../src/Resources.vala:667
 msgid "Select _All"
 msgstr "Izaberi _sve"
 
-#: ../src/Resources.vala:660
+#: ../src/Resources.vala:668
 msgid "Select all items"
 msgstr "Izaberite sve stavke"
 
@@ -3718,20 +3756,20 @@ msgstr "Izaberite sve stavke"
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:741
+#: ../src/Resources.vala:749
 msgid "%-I:%M %p"
 msgstr "%-I:%M %p"
 
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:746
+#: ../src/Resources.vala:754
 msgid "%-I:%M:%S %p"
 msgstr "%-I:%M:%S %p"
 
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:750
+#: ../src/Resources.vala:758
 msgid "%a %b %d, %Y"
 msgstr "%A, %d. %B %Y."
 
@@ -3741,14 +3779,14 @@ msgstr "%A, %d. %B %Y."
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:755 ../src/Resources.vala:765
+#: ../src/Resources.vala:763 ../src/Resources.vala:773
 msgid "%a %b %d"
 msgstr "%A, %d. %B"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:760
+#: ../src/Resources.vala:768
 msgid "%d, %Y"
 msgstr "%d., %Y."
 
diff --git a/po/sv.po b/po/sv.po
index 7f4dd49..d9b4671 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -16,623 +16,1470 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
-"Report-Msgid-Bugs-To: shotwell@yorba.org\n"
-"POT-Creation-Date: 2013-09-20 11:55-0700\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
+"POT-Creation-Date: 2015-02-26 12:04+0000\n"
 "PO-Revision-Date: 2013-09-24 19:00+0000\n"
 "Last-Translator: Konstigt <thomas@xyz.pp.se>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/shotwell/"
 "language/sv/)\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/Event.vala:737
-#, c-format
-msgid "Event %s"
-msgstr "Händelse %s"
+#: ../plugins/common/RESTSupport.vala:424
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
+#, fuzzy
+msgid "A temporary file needed for publishing is unavailable"
+msgstr "En temporärfil som krävs för publicering finns inte tillgänglig"
 
-#: src/camera/Branch.vala:87
-msgid "Cameras"
-msgstr "Kameror"
+#: ../plugins/common/RESTSupport.vala:1138
+msgid ""
+"You have already logged in and out of a Google service during this Shotwell "
+"session.\n"
+"\n"
+"To continue publishing to Google services, quit and restart Shotwell, then "
+"try publishing again."
+msgstr ""
+"Du har redan loggat in och ut från Google under denna Shotwell-session.\n"
+"För att fortsätta att publicera till Google så måste du starta om Shotwell "
+"och försök att publicera igen."
 
-#: src/camera/Branch.vala:101 src/camera/ImportPage.vala:711
-#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:300
-#: src/MediaPage.vala:425
-msgid "Camera"
-msgstr "Kamera"
+#: ../plugins/common/Resources.vala:9
+msgid "Visit the Shotwell home page"
+msgstr ""
 
-#: src/camera/ImportPage.vala:312 src/Properties.vala:227
-#, c-format
-msgid "RAW+JPEG"
-msgstr "RAW+JPEG"
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
+msgid "translator-credits"
+msgstr ""
+"Daniel Nylander <po@danielnylander.se>\n"
+"Olof Nord <olof_nord_@hotmail.com>\n"
+"Alexander Styre <lessneurope@yandex.com>\n"
+"Joachim Johansson <joachim.j@gmail.com>"
 
-#: src/camera/ImportPage.vala:459
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:32
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:34
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:32
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
+#: ../src/Resources.vala:27
+#, fuzzy
+#| msgid "Copyright 2009-2013 Yorba Foundation"
+msgid "Copyright 2009-2015 Yorba Foundation"
+msgstr "Copyright 2009-2013 Yorba Foundation"
+
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:56
 msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
+"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 ""
-"Kunde inte avmontera kameran.  Försök att avmontera kameran från "
-"filhanteraren."
+"Välkommen till tjänsten för import av F-Spot-bilbliotek.\n"
+"\n"
+"Välj ett bibliotek att importera, antingen det som Shotwell automatiskt "
+"hittar, eller ett du väljer manuellt."
 
-#: src/camera/ImportPage.vala:776
-msgid "Hide photos already imported"
-msgstr "Dölj bilder som redan importerats"
+#: ../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 ""
+"Välkommen till tjänsten för import av F-Spot-bilbliotek.\n"
+"\n"
+"Välj en F-Spot-databasfil."
 
-#: src/camera/ImportPage.vala:777
-msgid "Only display photos that have not been imported"
-msgstr "Visa enbart bilder som inte har importerats"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
+msgid "Manually select an F-Spot database file to import:"
+msgstr "Välj manuellt den F-Spot-databasfil du vill importera:"
 
-#: src/camera/ImportPage.vala:845
-msgid "Starting import, please wait..."
-msgstr "Påbörjar importen, var god vänta..."
+#: ../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 ""
+"Det går inte att öppna den F-Spot-databasfil som du har valt: antingen "
+"saknas filen, eller så är det inte en F-Spot-databas."
 
-#: src/camera/ImportPage.vala:872 src/MediaPage.vala:436
-msgid "_Titles"
-msgstr "_Titlar"
+#: ../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 ""
+"Det går inte att öppna den valda F-Spot-databasfilen: den här versionen av F-"
+"Spot-databasen stöds inte av Shotwell"
 
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:437
-msgid "Display the title of each photo"
-msgstr "Visa titeln för varje bild"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading tags table"
+msgstr ""
+"Det går inte att läsa den valda F-Spot-databasfilen: ett fel uppstod när "
+"etikettabellen skulle läsas."
 
-#: src/camera/ImportPage.vala:884
-msgid "Import _Selected"
-msgstr "Importera  _markerade"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:68
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading photos "
+"table"
+msgstr ""
+"Det går inte att läsa den valda F-Spot-databasfilen: ett fel uppstod när "
+"bildtabellen skulle läsas."
 
-#: src/camera/ImportPage.vala:885
-msgid "Import the selected photos into your library"
-msgstr "Importera de valda bildera till ditt bibliotek"
+#: ../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 ""
+"Shotwell har hittat %d bilder i F-Spot-biblioteket och importerar dem nu. "
+"Dubbletter kommer att hittas och tas bort automatiskt.\n"
+"\n"
+"Du kan stänga den här dialogrutan. Importen kommer att fortsätta bakgrunden."
 
-#: src/camera/ImportPage.vala:890
-msgid "Import _All"
-msgstr "Importera _alla"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
+#, c-format
+msgid "F-Spot library: %s"
+msgstr "F-Spot-bibliotek: %s"
 
-#: src/camera/ImportPage.vala:891
-msgid "Import all the photos into your library"
-msgstr "Importera alla bilder till ditt bibliotek"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
+msgid "Preparing to import"
+msgstr "Förbereder import"
+
+#: ../plugins/shotwell-data-imports/shotwell-data-imports.vala:22
+msgid "Core Data Import Services"
+msgstr "Core Data-importtjänster"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+msgid "Gallery3 publishing module"
+msgstr ""
 
-#: src/camera/ImportPage.vala:1012
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
+#, fuzzy
+#| msgid ""
+#| "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."
 msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
+"You are not currently logged into your Gallery.\n"
+"\n"
+"You must have already signed up for a Gallery3 account to complete the login "
+"process."
 msgstr ""
-"Shotwell behöver avmontera kameran från filsystemet för att kunna komma åt "
-"den. Vill du fortsätta?"
+"Du är för närvarande inte inloggad på YouTube.\n"
+"\n"
+"Du måste redan ha registrerat ett Google-konto och konfigurerat det för "
+"användning med YouTube för att fortsätta. Du kan konfigurera de flesta "
+"konton genom att logga in på YouTube med din webbläsare."
 
-#: src/camera/ImportPage.vala:1018
-msgid "_Unmount"
-msgstr "A_vmontera"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: ../src/MediaPage.vala:434 ../src/photos/RawSupport.vala:300
+msgid "Shotwell"
+msgstr "Shotwell"
 
-#: src/camera/ImportPage.vala:1023
-msgid "Please unmount the camera."
-msgstr "Avmontera kameran."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+#, fuzzy
+#| msgid "Shotwell Preferences"
+msgid "Shotwell default directory"
+msgstr "Inställningar för Shotwell"
 
-#: src/camera/ImportPage.vala:1028
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:801
+#, c-format
 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."
+"\n"
+"\n"
+"The file \"%s\" may not be supported by or may be too large for this "
+"instance of Gallery3."
 msgstr ""
-"Kameran är låst av ett annat program.  Shotwell kan endast komma åt kameran "
-"när den är olåst.  Stäng alla andra program som använder kameran och försök "
-"igen."
 
-#: src/camera/ImportPage.vala:1038
-msgid "Please close any other application using the camera."
-msgstr "Stäng alla andra program som använder kameran."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:802
+msgid ""
+"\n"
+"Note that Gallery3 only supports the video types that Flowplayer does."
+msgstr ""
 
-#: src/camera/ImportPage.vala:1043
-#, c-format
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+#, fuzzy, c-format
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Picasa can't "
+#| "continue."
 msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
 msgstr ""
-"Kunde inte hämta förhandsvisningar från kameran:\n"
-"%s"
+"En fil som krävs för publiceringen saknas. Därför kan publiceringen till "
+"Picasa inte fortsätta."
 
-#: src/camera/ImportPage.vala:1060
-msgid "Unmounting..."
-msgstr "Avmonterar..."
+#. populate any widgets whose contents are
+#. programmatically-generated
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
+#, fuzzy, c-format
+#| msgid "Publish Photos and Videos"
+msgid "Publishing to %s as %s."
+msgstr "Publicera bilder och filmer"
 
-#: src/camera/ImportPage.vala:1166
-msgid "Fetching photo information"
-msgstr "Hämtar bildinformation"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
+#, fuzzy
+#| msgid ""
+#| "Enter the URL of your Piwigo photo library as well as the username and "
+#| "password associated with your Piwigo account for that library."
+msgid ""
+"Enter the URL for your Gallery3 site and the username and password (or API "
+"key) for your Gallery3 account."
+msgstr ""
+"Skriv in länken till ditt Piwigo-bildbibliotek, samt ditt Piwigo-"
+"användarnamn och -lösenord."
 
-#: src/camera/ImportPage.vala:1521
-#, c-format
-msgid "Fetching preview for %s"
-msgstr "Hämtar förhandsvisning av %s"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
+msgid ""
+"The username and password or API key were incorrect. To try again, re-enter "
+"your username and password below."
+msgstr ""
 
-#: src/camera/ImportPage.vala:1637
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "Kunde inte låsa kameran: %s"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
+msgid ""
+"The URL entered does not appear to be the main directory of a Gallery3 "
+"instance. Please make sure you typed it correctly and it does not have any "
+"trailing components (e.g., index.php)."
+msgstr ""
 
-#: src/camera/ImportPage.vala:1722
-#, c-format
-msgid "Delete this photo from camera?"
-msgid_plural "Delete these %d photos from camera?"
-msgstr[0] "Radera denna bild från kameran?"
-msgstr[1] "Radera dessa %d bilder från kameran?"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
+msgid "Unrecognized User"
+msgstr ""
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
+msgid " Site Not Found"
+msgstr ""
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
+msgid "Copyright (C) 2013 rajce.net"
+msgstr ""
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
+#, fuzzy
+#| msgid ""
+#| "An error message occurred when publishing to Piwigo. Please try again."
+msgid "An error message occurred when publishing to Rajce. Please try again."
+msgstr "Ett felmeddelande visades vid publiceringen till Piwigo. Försök igen."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
+#, fuzzy
+#| msgid "Enter the username and password associated with your Tumblr account."
+msgid "Enter email and password associated with your Rajce account."
+msgstr "Fyll i användarnamn och lösenord för ditt Tumblr-konto."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
+#, fuzzy
+#| msgid "Username and/or password invalid. Please try again"
+msgid "Invalid email and/or password. Please try again"
+msgstr "Användarnamn och/eller lösenord ogiltigt. Var god försök igen"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
+#, fuzzy
+#| msgid "Invalid User Name or Password"
+msgid "Invalid User Email or Password"
+msgstr "Ogiltigt användarnamn eller lösenord"
 
-#: src/camera/ImportPage.vala:1725
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:890
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:2
+msgid "_Email address"
+msgstr "_E-postadress"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:891
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
+msgid "_Password"
+msgstr "_Lösenord"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
+#, fuzzy
+#| msgid "_Remember Password"
+msgid "_Remember"
+msgstr "_Kom ihåg lösenord"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
+msgid "Login"
+msgstr "Logga in"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:5
+msgid "_Hide album"
+msgstr ""
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
+#, fuzzy, c-format
+#| msgid ""
+#| "You are logged into Facebook as %s.\n"
+#| "\n"
+msgid "You are logged into Rajce as %s."
+msgstr ""
+"Du är inloggad på Facebook som %s.\n"
+"\n"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
+msgid "Photos will appear in:"
+msgstr "Bilder kommer att visas i:"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
+msgid "An _existing album:"
+msgstr "Ett _befintligt album:"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
+msgid "A _new album named:"
+msgstr "Ett _nytt album med namnet:"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:6
+msgid "Open target _album in browser"
+msgstr ""
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:8
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
+msgid "_Publish"
+msgstr "_Publicera"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
+msgid "_Logout"
+msgstr "_Logga ut"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Copyright 2012 BJA Electronics"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
+msgid "500 x 375 pixels"
+msgstr "500 x 375 pixlar"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
+#, fuzzy
+msgid "1024 x 768 pixels"
+msgstr "1024 x 768 pixlar"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
+msgid "1280 x 853 pixels"
+msgstr "1280 x 853 pixlar"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:310
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:320
 #, c-format
-msgid "Delete this video from camera?"
-msgid_plural "Delete these %d videos from camera?"
-msgstr[0] "Radera denna film från kameran?"
-msgstr[1] "Radera dessa %d filmer från kameran?"
+msgid "'%s' isn't a valid response to an OAuth authentication request"
+msgstr "'%s' är inte ett giltigt svar på autentiseringsförsöket med OAuth."
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:558
+msgid ""
+"TumblrPublisher: start( ): can't start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( ): går inte att starta. Detta publiceringsverktyg "
+"går inte att starta om."
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "Fyll i användarnamn och lösenord för ditt Tumblr-konto."
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
+msgid "Username and/or password invalid. Please try again"
+msgstr "Användarnamn och/eller lösenord ogiltigt. Var god försök igen"
 
-#: src/camera/ImportPage.vala:1728
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:617
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
+msgid "Invalid User Name or Password"
+msgstr "Ogiltigt användarnamn eller lösenord"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:636
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
 #, c-format
-msgid "Delete this photo/video from camera?"
-msgid_plural "Delete these %d photos/videos from camera?"
-msgstr[0] "Radera denna bild och film från kameran?"
-msgstr[1] "Radera dessa %d bilder och filmer från kameran?"
+msgid "Could not load UI: %s"
+msgstr "Kunde inte ladda användargränssnittet: %s"
 
-#: src/camera/ImportPage.vala:1731
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:739
 #, c-format
-msgid "Delete these files from camera?"
-msgid_plural "Delete these %d files from camera?"
-msgstr[0] "Radera denna fil från kameran?"
-msgstr[1] "Radera dessa %d filer från kameran?"
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Du är inloggad på Tumblr som %s.\n"
+"\n"
 
-#: src/camera/ImportPage.vala:1739 src/Dialogs.vala:1328
-msgid "_Keep"
-msgstr "_Behåll"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
+msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 
-#: src/camera/ImportPage.vala:1758
-msgid "Removing photos/videos from camera"
-msgstr "Tar bort bilder och filmer från kameran"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:25
+msgid "Visit the Yandex.Fotki web site"
+msgstr "Besök webbplatsen för Yandex.Fotki"
 
-#: src/camera/ImportPage.vala:1762
-#, 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] ""
-"Kunde inte radera %d bild och film från kameran på grund av ett fel."
-msgstr[1] ""
-"Kunde inte radera %d bilder och filmer från kameran på grund av ett fel."
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:632
+msgid "You are not currently logged into Yandex.Fotki."
+msgstr "Du är för närvarande inte inloggad på Yandex.Fotki."
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2623
-msgid "S_lideshow"
-msgstr "_Bildspel"
+#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+#, fuzzy
+#| msgid "Core Publishing Services"
+msgid "Shotwell Extra Publishing Services"
+msgstr "Standardtjänster för publicering"
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2624
-msgid "Play a slideshow"
-msgstr "Spela upp ett bildspel"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
+#, fuzzy
+#| msgid "Back"
+msgid "Go _Back"
+msgstr "Bakåt"
 
-#: src/CollectionPage.vala:456
-msgid "Export Photo/Video"
-msgstr "Exportera bilder/filmer"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
+#: ../ui/shotwell.glade.h:42
+msgid "_Login"
+msgstr "_Logga in"
 
-#: src/CollectionPage.vala:456
-msgid "Export Photos/Videos"
-msgstr "Exportera bilder/filmer"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
+msgid "Intro message replaced at runtime"
+msgstr ""
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:58 src/PhotoPage.vala:3196
-msgid "Export Photo"
-msgstr "Exportera bilder"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
+msgid "_Gallery3 URL:"
+msgstr ""
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:87
-msgid "Export Photos"
-msgstr "Exportera bilder"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
+#, fuzzy
+#| msgid "User _name"
+msgid "_User name:"
+msgstr "Användar_namn"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Rotating"
-msgstr "Roteraren"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
+#, fuzzy
+#| msgid "_Password"
+msgid "_Password:"
+msgstr "_Lösenord"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Undoing Rotate"
-msgstr "Återställ roteringen"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:7
+msgid "API _Key:"
+msgstr ""
 
-#: src/CollectionPage.vala:570
-msgid "Flipping Horizontally"
-msgstr "Vänder horisontellt"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
+#, fuzzy
+#| msgid "hour"
+#| msgid_plural "hours"
+msgid "or"
+msgstr "timme"
 
-#: src/CollectionPage.vala:571
-msgid "Undoing Flip Horizontally"
-msgstr "Återställer horisontell vändning"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
+#, fuzzy
+#| msgid "A _new album named:"
+msgid "A _new album"
+msgstr "Ett _nytt album med namnet:"
 
-#: src/CollectionPage.vala:580
-msgid "Flipping Vertically"
-msgstr "Vänder vertikalt"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
+#, fuzzy
+#| msgid "An _existing album:"
+msgid "An _existing album"
+msgstr "Ett _befintligt album:"
 
-#: src/CollectionPage.vala:581
-msgid "Undoing Flip Vertically"
-msgstr "Återställer vertikal vändning"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
+msgid "_Remove location, tag and camera-identifying data before uploading"
+msgstr ""
 
-#: src/searches/SearchBoolean.vala:157
-msgid "Any text"
-msgstr "Valfri text"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
+msgid "'Publishing to $url as $username' (populated in application code)"
+msgstr ""
 
-#: src/searches/SearchBoolean.vala:160
-msgid "Title"
-msgstr "Titel"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
+#, fuzzy
+#| msgid "_Scaling constraint:"
+msgid "Scaling constraint:"
+msgstr "_Skalningsbegränsning:"
 
-#: src/searches/SearchBoolean.vala:163
-msgid "Tag"
-msgstr "Etikett"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
+#, fuzzy
+#| msgid " _pixels"
+msgid "pixels"
+msgstr " _pixlar"
 
-#: src/searches/SearchBoolean.vala:166
-msgid "Comment"
-msgstr "Kommentar"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
+#: ../src/Dimensions.vala:17
+msgid "Original size"
+msgstr "Ursprungsstorlek"
 
-#: src/searches/SearchBoolean.vala:169
-msgid "Event name"
-msgstr "Händelsenamn"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:10
+#: ../src/Dimensions.vala:20
+msgid "Width or height"
+msgstr "Bredd eller höjd"
 
-#: src/searches/SearchBoolean.vala:172
-msgid "File name"
-msgstr "Filnamn"
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
+#: ../ui/shotwell.glade.h:14
+msgid "label"
+msgstr "etikett"
 
-#: src/searches/SearchBoolean.vala:175
-msgid "Media type"
-msgstr "Mediatyp"
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
+msgid "Blogs:"
+msgstr "Bloggar:"
 
-#: src/searches/SearchBoolean.vala:178
-msgid "Flag state"
-msgstr "Flaggtillstånd"
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:1
+msgid "Photo _size:"
+msgstr "Bild_storlek:"
 
-#: src/searches/SearchBoolean.vala:181
-msgid "Photo state"
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
+#, fuzzy
+#| msgid ""
+#| "You are logged into Facebook as %s.\n"
+#| "\n"
+msgid "you are logged in rajce as $name"
 msgstr ""
+"Du är inloggad på Facebook som %s.\n"
+"\n"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1003
-msgid "Rating"
-msgstr "Betyg"
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
+#, fuzzy
+#| msgid "Videos will appear in:"
+msgid "$mediatype will appear in"
+msgstr "Filmer kommer att visas i:"
 
-#: src/searches/SearchBoolean.vala:187
-msgid "Date"
-msgstr "Datum"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
+msgid "_Albums (or write new):"
+msgstr "_Album (eller skriv nytt):"
 
-#: src/searches/SavedSearchDialog.vala:169
-msgid "contains"
-msgstr "innehåller"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:2
+msgid "Access _type:"
+msgstr "Åtkomst_typ:"
 
-#: src/searches/SavedSearchDialog.vala:170
-#: src/searches/SavedSearchDialog.vala:497
-msgid "is exactly"
-msgstr "är exakt"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
+msgid "Disable _comments"
+msgstr "Inaktivera _kommentarer"
 
-#: src/searches/SavedSearchDialog.vala:171
-msgid "starts with"
-msgstr "börjar med"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:4
+msgid "_Forbid downloading original photo"
+msgstr "_Förbjud nedladdning av ursprunglig bild"
 
-#: src/searches/SavedSearchDialog.vala:172
-msgid "ends with"
-msgstr "slutar med"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
+#, fuzzy
+#| msgid "Publish"
+msgid "Public"
+msgstr "Publicera"
 
-#: src/searches/SavedSearchDialog.vala:173
-msgid "does not contain"
-msgstr "innehåller inte"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:8
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1181
+msgid "Friends"
+msgstr "Vänner"
 
-#: src/searches/SavedSearchDialog.vala:174
-#: src/searches/SavedSearchDialog.vala:501
-msgid "is not set"
-msgstr "är inte inställd"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:9
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
+msgid "Private"
+msgstr "Privat"
 
-#: src/searches/SavedSearchDialog.vala:245
-#: src/searches/SavedSearchDialog.vala:376
-#: src/searches/SavedSearchDialog.vala:441
-msgid "is"
-msgstr "är"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:59
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1127
+msgid "Shotwell Connect"
+msgstr "Shotwell Connect"
 
-#: src/searches/SavedSearchDialog.vala:246
-msgid "is not"
-msgstr "är inte"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:63
+msgid ""
+"You are not currently logged into Facebook.\n"
+"\n"
+"If you don't yet have a Facebook account, you can create one during the "
+"login process. During login, Shotwell Connect may ask you for permission to "
+"upload photos and publish to your feed. These permissions are required for "
+"Shotwell Connect to function."
+msgstr ""
+"Du är för närvarande inte inloggad på Facebook.\n"
+"\n"
+"Om du ännu inte har ett Facebook-konto så kan du skapa ett under "
+"inloggningsprocessen. Under inloggningen kan Shotwell fråga dig om "
+"behörighet att skicka upp bilder och publicera till din logg. Dessa "
+"behörigheter krävs för att Shotwell Connect ska fungera."
 
-#: src/searches/SavedSearchDialog.vala:252
-msgid "any photo"
-msgstr "valfri bild"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:65
+msgid ""
+"You have already logged in and out of Facebook during this Shotwell "
+"session.\n"
+"To continue publishing to Facebook, quit and restart Shotwell, then try "
+"publishing again."
+msgstr ""
+"Du har redan loggat in och ut från Facebook under denna Shotwell-session.\n"
+"För att fortsätta att publicera på Facebook, starta om Shotwell och försök "
+"att publicera igen."
 
-#: src/searches/SavedSearchDialog.vala:253
-msgid "a raw photo"
-msgstr "en råfil"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:86
+msgid "Standard (720 pixels)"
+msgstr "Standard (720 pixlar)"
 
-#: src/searches/SavedSearchDialog.vala:254
-msgid "a video"
-msgstr "en film"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:89
+msgid "Large (2048 pixels)"
+msgstr "Stor (2048 pixlar)"
 
-#: src/searches/SavedSearchDialog.vala:308
-msgid "has"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:254
+msgid "Testing connection to Facebook..."
+msgstr "Testar anslutningen till Facebook..."
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:347
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
+msgid "Creating album..."
+msgstr "Skapar album..."
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:374
+msgid ""
+"A file required for publishing is unavailable. Publishing to Facebook can't "
+"continue."
 msgstr ""
+"En fil som krävs för publiceringen saknas. Därför kan publiceringen till "
+"Facebook inte fortsätta."
 
-#: src/searches/SavedSearchDialog.vala:309
-msgid "has no"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1019
+#, c-format
+msgid ""
+"You are logged into Facebook as %s.\n"
+"\n"
 msgstr ""
+"Du är inloggad på Facebook som %s.\n"
+"\n"
 
-#: src/searches/SavedSearchDialog.vala:314
-msgid "modifications"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1020
+msgid "Where would you like to publish the selected photos?"
+msgstr "Var vill du publicera de markerade bildera?"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1021
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
+msgid "Upload _size:"
+msgstr "_Storlek att ladda upp:"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
+msgid "Just me"
+msgstr "Bara jag"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+msgid "Everyone"
+msgstr "Alla"
+
+#: ../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 ""
+"Du är för närvarande inte inloggad på Flickr.\n"
+"\n"
+"Klicka på Logga in för att logga in på Flickr med din webbläsare. Du måste "
+"specifikt godkänna att Shotwell Connect kan länka till ditt Flickr-konto."
 
-#: src/searches/SavedSearchDialog.vala:315
-msgid "internal modifications"
+#: ../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 ""
+"Du har redan loggat in och ut från Flickr under denna Shotwell-session.\n"
+"För att fortsätta att publicera till Flickr, starta om Shotwell och försök "
+"att publicera igen."
 
-#: src/searches/SavedSearchDialog.vala:316
-msgid "external modifications"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:375
+msgid "Preparing for login..."
+msgstr "Förbereder inloggning..."
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:444
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:595
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can't "
+"continue."
 msgstr ""
+"En fil som krävs för publiceringen saknas. Därför kan publiceringen till "
+"Flickr inte fortsätta."
 
-#: src/searches/SavedSearchDialog.vala:370
-msgid "flagged"
-msgstr "flaggad"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:457
+msgid "Verifying authorization..."
+msgstr "Verifierar behörighet..."
 
-#: src/searches/SavedSearchDialog.vala:371
-msgid "not flagged"
-msgstr "oflaggad"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1153
+#, c-format
+msgid ""
+"You are logged into Flickr as %s.\n"
+"\n"
+msgstr ""
+"Du är inloggad på Flickr som %s.\n"
+"\n"
 
-#: src/searches/SavedSearchDialog.vala:434
-msgid "and higher"
-msgstr "och högre"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
+#, fuzzy, 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."
+msgid ""
+"Your free Flickr account limits how much data you can upload per month.\n"
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"Ditt gratiskonto på Flickr begränsar hur mycket data som du kan skicka\n"
+"upp per månad. Denna månad har du %d megabyte kvar att ladda upp."
+msgstr[1] ""
+"Ditt gratiskonto på Flickr begränsar hur mycket data som du kan skicka\n"
+"upp per månad. Denna månad har du %d megabyte kvar att ladda upp."
 
-#: src/searches/SavedSearchDialog.vala:435
-msgid "only"
-msgstr "endast"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
+msgid "Your Flickr Pro account entitles you to unlimited uploads."
+msgstr "Ditt Flickr Pro-konto låter dig ladda upp obegränsat med data."
 
-#: src/searches/SavedSearchDialog.vala:436
-msgid "and lower"
-msgstr "och lägre"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
+msgid "Photos _visible to:"
+msgstr "Bilderna _visas för:"
 
-#: src/searches/SavedSearchDialog.vala:498
-msgid "is after"
-msgstr "är efter"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+msgid "Videos _visible to:"
+msgstr "Filmerna _visas för:"
 
-#: src/searches/SavedSearchDialog.vala:499
-msgid "is before"
-msgstr "är före"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
+msgid "Photos and videos _visible to:"
+msgstr "Bilder och filmer _visas för:"
 
-#: src/searches/SavedSearchDialog.vala:500
-msgid "is between"
-msgstr "är mellan"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+msgid "Friends & family only"
+msgstr "Endast vänner och familj"
 
-#: src/searches/SavedSearchDialog.vala:513
-msgid "and"
-msgstr "och"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
+msgid "Family only"
+msgstr "endast familj"
 
-#: src/searches/SavedSearchDialog.vala:720
-msgid "any"
-msgstr "någon"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
+msgid "Friends only"
+msgstr "endast vänner"
 
-#: src/searches/SavedSearchDialog.vala:721
-msgid "all"
-msgstr "alla"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
+msgid "2048 x 1536 pixels"
+msgstr "2048 x 1536 pixlar"
 
-#: src/searches/SavedSearchDialog.vala:722
-msgid "none"
-msgstr "ingen"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
+msgid "4096 x 3072 pixels"
+msgstr "4096 x 3072 pixlar"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Sparade sökningar"
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:58
+msgid ""
+"You are not currently logged into Picasa Web Albums.\n"
+"\n"
+"Click Login to log into Picasa Web Albums in your Web browser. You will have "
+"to authorize Shotwell Connect to link to your Picasa Web Albums account."
+msgstr ""
+"Du är för närvarande inte inloggad på Picasa Web Albums.\n"
+"\n"
+"Klicka på Logga in för att logga in på Picasa Web Albums med din webbläsare. "
+"Du måste specifikt godkänna att Shotwell Connect kan länka till ditt Picasa-"
+"konto."
 
-#: src/searches/Branch.vala:77 src/library/LibraryWindow.vala:346
-#: src/sidebar/Tree.vala:195
-msgid "Ne_w Saved Search..."
-msgstr "_Ny sparad sökning..."
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:361
+msgid ""
+"A file required for publishing is unavailable. Publishing to Picasa can't "
+"continue."
+msgstr ""
+"En fil som krävs för publiceringen saknas. Därför kan publiceringen till "
+"Picasa inte fortsätta."
+
+#. populate any widgets whose contents are programmatically-generated.
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:659
+#, c-format
+msgid "You are logged into Picasa Web Albums as %s."
+msgstr "Du är inloggad på Picasa webbalbum som %s."
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:665
+msgid "Videos will appear in:"
+msgstr "Filmer kommer att visas i:"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
+msgid "Small (640 x 480 pixels)"
+msgstr "Liten (640 x 480 bildpunkter)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:747
+msgid "Medium (1024 x 768 pixels)"
+msgstr "Medel (1024 x 768 bildpunkter)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:748
+msgid "Recommended (1600 x 1200 pixels)"
+msgstr "Rekommenderad (1600 x 1200 bildpunkter)"
 
-#: src/main.vala:54
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:749
+msgid "Google+ (2048 x 1536 pixels)"
+msgstr "Google+ (2048 x 1536 pixlar)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:750
+#: ../src/editing_tools/EditingTools.vala:756
+msgid "Original Size"
+msgstr "Ursprungsstorlek"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
 #, c-format
+msgid "Creating album %s..."
+msgstr "Skapar album %s..."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:917
+msgid "An error message occurred when publishing to Piwigo. Please try again."
+msgstr "Ett felmeddelande visades vid publiceringen till Piwigo. Försök igen."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:998
 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."
+"Enter the URL of your Piwigo photo library as well as the username and "
+"password associated with your Piwigo account for that library."
 msgstr ""
-"Ditt bildbibliotek är inte kompatibelt med denna version av Shotwell.  Det "
-"verkar som det skapades med Shotwell %s (schema %d).  Denna version är %s "
-"(schema %d).  Använd den senaste versionen av Shotwell."
+"Skriv in länken till ditt Piwigo-bildbibliotek, samt ditt Piwigo-"
+"användarnamn och -lösenord."
 
-#: src/main.vala:59
-#, c-format
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:999
 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"
+"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
+"entered"
 msgstr ""
-"Shotwell kunde inte uppgradera din bildbibliotek från version %s (schema %d) "
-"till %s (schema %d).  För ytterligare information, läs Shotwells wiki-sida "
-"på %s"
+"Shotwell kan inte nå ditt Piwigo-bildbibliotek. Kontrollera länkadressen "
+"igen."
 
-#: src/main.vala:65
-#, c-format
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+msgid "Invalid URL"
+msgstr "Ogiltig länkadress"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+msgid "Admins, Family, Friends, Contacts"
+msgstr "Administratörer, familj, vänner, kontakter"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+msgid "Admins, Family, Friends"
+msgstr "Administratörer, familj, vänner"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+msgid "Admins, Family"
+msgstr "Administratörer, familj"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+msgid "Admins"
+msgstr "Administratörer"
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:57
 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."
+"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 ""
-"Ditt bildbibliotek är inte kompatibelt med denna version av Shotwell.  Det "
-"verkar som om det skapades med Shotwell %s (schema %d).  Denna version är %s "
-"(schema %d).  Töm ditt bibliotek genom att ta bort %s och importera dina "
-"bilder igen."
+"Du är för närvarande inte inloggad på YouTube.\n"
+"\n"
+"Du måste redan ha registrerat ett Google-konto och konfigurerat det för "
+"användning med YouTube för att fortsätta. Du kan konfigurera de flesta "
+"konton genom att logga in på YouTube med din webbläsare."
 
-#: src/main.vala:71
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
+msgid ""
+"A file required for publishing is unavailable. Publishing to Youtube can't "
+"continue."
+msgstr ""
+"En fil som krävs för publiceringen saknas. Därför kan publiceringen till "
+"YouTube inte fortsätta."
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:461
 #, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
-msgstr "Okänt fel vid försök att verifiera Shotwells databas: %s"
+msgid "You are logged into YouTube as %s."
+msgstr "Du är inloggad på YouTube som %s."
 
-#: src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "Läser in Shotwell"
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:463
+#, c-format
+msgid "Videos will appear in '%s'"
+msgstr "Filmer kommer att visas i \"%s\""
 
-#: src/main.vala:294
-msgid "Path to Shotwell's private data"
-msgstr "Sökväg till Shotwells privata data"
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:495
+msgid "Public listed"
+msgstr "Publikt listad"
 
-#: src/main.vala:294
-msgid "DIRECTORY"
-msgstr "DIRECTORY"
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
+msgid "Public unlisted"
+msgstr "Publikt olistad"
 
-#: src/main.vala:298
-msgid "Do not monitor library directory at runtime for changes"
-msgstr "Sök inte efter ändringar i biblioteket medan programmet används"
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
+msgid "Publish to an e_xisting album:"
+msgstr "Publicera till ett _befintligt album:"
 
-#: src/main.vala:302
-msgid "Don't display startup progress meter"
-msgstr "Visa inte hur uppstarten framskrider"
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:2
+msgid "Create a _new album named:"
+msgstr "Skapa ett _nytt album med namnet:"
 
-#: src/main.vala:306
-msgid "Show the application's version"
-msgstr "Visa programversion"
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
+msgid "Videos and new photo albums _visible to:"
+msgstr "Videor och nya fotoalbum är _synliga för:"
 
-#: src/main.vala:338
-msgid "[FILE]"
-msgstr "[FILE]"
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:5
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:8
+msgid ""
+"_Remove location, camera, and other identifying information before uploading"
+msgstr ""
 
-#: src/main.vala:342
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
+msgid ""
+"Enter the confirmation number which appears after you log into Flickr in "
+"your Web browser."
 msgstr ""
-"Kör \"%s --help\" för en komplett lista över tillgängliga "
-"kommandoradsalternativ.\n"
 
-#: src/Properties.vala:84
-msgid "Today"
-msgstr "Idag"
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
+msgid "Authorization _Number:"
+msgstr ""
 
-#: src/Properties.vala:86
-msgid "Yesterday"
-msgstr "Igår"
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:3
+#: ../src/Dialogs.vala:131
+msgid "Con_tinue"
+msgstr "_Fortsätt"
 
-#: src/Properties.vala:340 src/Dialogs.vala:1273
-msgid "Title:"
-msgstr "Titel:"
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
+msgid "L_ist album in public gallery"
+msgstr "L_ista album i publikt galleri"
 
-#: src/Properties.vala:343
-msgid "Items:"
-msgstr "Objekt:"
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
+msgid "Photo _size preset:"
+msgstr "Förval för foto_storlek:"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
+msgid "_URL of your Piwigo photo library"
+msgstr "_URL till ditt Piwigo-fotobibliotek"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
+msgid "User _name"
+msgstr "Användar_namn"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
+msgid "_Remember Password"
+msgstr "_Kom ihåg lösenord"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
+msgid "An _existing category:"
+msgstr "En _befintlig kategori:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:4
+msgid "Photos will be _visible by:"
+msgstr "Foton kommer att kunna _ses av:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:5
+msgid "Photo size:"
+msgstr "Foto_storlek:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:6
+msgid "within category:"
+msgstr ""
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
+msgid "Album comment:"
+msgstr ""
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
+msgid "_If a title is set and comment unset, use title as comment"
+msgstr ""
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:10
+msgid "_Do no upload tags"
+msgstr ""
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
+msgid "Logout"
+msgstr "Logga ut"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
+#: ../src/Resources.vala:303
+msgid "Publish"
+msgstr "Publicera"
+
+#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
+msgid "Core Publishing Services"
+msgstr "Standardtjänster för publicering"
+
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
+msgid "Video privacy _setting:"
+msgstr "Sekretessinställningar för video:"
+
+#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+msgid "Blinds"
+msgstr "Persienner"
+
+#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+msgid "Chess"
+msgstr "Schackrutig"
+
+#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+msgid "Circle"
+msgstr "Cirkel"
+
+#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+msgid "Circles"
+msgstr "Cirklar"
+
+#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+msgid "Clock"
+msgstr "Klocka"
+
+#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+msgid "Crumble"
+msgstr "Smula sönder"
+
+#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+msgid "Fade"
+msgstr "Tona ut"
+
+#: ../plugins/shotwell-transitions/SlideEffect.vala:20
+msgid "Slide"
+msgstr "Glid"
+
+#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
+msgid "Squares"
+msgstr "Rutor"
+
+#: ../plugins/shotwell-transitions/StripesEffect.vala:20
+msgid "Stripes"
+msgstr "Randig"
+
+#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
+msgid "Core Slideshow Transitions"
+msgstr "Standardövergångar för bildspel"
+
+#: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
+#, fuzzy
+#| msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
 
-#: src/Properties.vala:346
+#: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
 #, c-format
-msgid "%d Event"
-msgid_plural "%d Events"
-msgstr[0] "%d händelse"
-msgstr[1] "%d händelser"
+msgid "Unable to create cache directory %s: %s"
+msgstr "Det går inte att skapa cache-mappen %s: %s"
 
-#: src/Properties.vala:353 src/events/EventDirectoryItem.vala:87
+#: ../src/AppDirs.vala:58 ../src/AppDirs.vala:88
 #, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] "%d bild"
-msgstr[1] "%d bilder"
+msgid "Unable to create data directory %s: %s"
+msgstr "Kunde inte skapa datakatalogen %s: %s"
 
-#: src/Properties.vala:355 src/events/EventDirectoryItem.vala:85
+#. If XDG yarfed, use ~/Pictures
+#: ../src/AppDirs.vala:152
+msgid "Pictures"
+msgstr "Bilder"
+
+#: ../src/AppDirs.vala:190
 #, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] "%d film"
-msgstr[1] "%d filemr"
+msgid "Unable to create temporary directory %s: %s"
+msgstr "Kunde inte skapa den temporära katalogen %s: %s"
 
-#: src/Properties.vala:377
-msgid "Date:"
-msgstr "Datum:"
+#: ../src/AppDirs.vala:207 ../src/AppDirs.vala:223
+#, c-format
+msgid "Unable to create data subdirectory %s: %s"
+msgstr "Kunde inte skapa den underliggande datakatalogen %s: %s"
 
-#: src/Properties.vala:381
-msgid "Time:"
-msgstr "Tid:"
+#: ../src/AppWindow.vala:53
+msgid "Pin Toolbar"
+msgstr "Fäst verktygsfält"
 
-#: src/Properties.vala:384 src/Properties.vala:389
-msgid "From:"
-msgstr "Från:"
+#: ../src/AppWindow.vala:54
+msgid "Pin the toolbar open"
+msgstr "Fäst verktygsfältet i öppet läge"
 
-#: src/Properties.vala:385 src/Properties.vala:390
-msgid "To:"
-msgstr "Till:"
+#: ../src/AppWindow.vala:59
+msgid "Leave fullscreen"
+msgstr "Avsluta helskärmsläge"
 
-#: src/Properties.vala:395 src/editing_tools/EditingTools.vala:1850
-msgid "Size:"
-msgstr "Storlek:"
+#: ../src/AppWindow.vala:525
+msgid "_Contents"
+msgstr "_Innehåll"
 
-#: src/Properties.vala:404
-msgid "Duration:"
-msgstr "Speltid:"
+#: ../src/AppWindow.vala:530
+msgid "_Frequently Asked Questions"
+msgstr "Återkommande frågor"
 
-#: src/Properties.vala:404
+#: ../src/AppWindow.vala:535
+msgid "_Report a Problem..."
+msgstr "_Rapportera ett problem..."
+
+#: ../src/AppWindow.vala:634 ../src/AppWindow.vala:655
+#: ../src/AppWindow.vala:672 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
+#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441 ../src/Resources.vala:162
+#: ../src/data_imports/DataImportsUI.vala:374
+#: ../src/publishing/PublishingUI.vala:475
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: ../src/AppWindow.vala:682
 #, c-format
-msgid "%.1f seconds"
-msgstr "%.1f sekunder"
+msgid ""
+"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
+"continue.\n"
+"\n"
+"%s"
+msgstr ""
+"Ett allvarligt fel inträffade vid åtkomsten till Shotwells bibliotek.  "
+"Shotwell kan inte fortsätta.\n"
+"\n"
+"%s"
 
-#: src/Properties.vala:408
-msgid "Developer:"
-msgstr "Framkallare:"
+#: ../src/AppWindow.vala:702
+msgid "Visit the Yorba web site"
+msgstr "Besök Yorbas webbplats"
 
-#: src/Properties.vala:436 src/Properties.vala:440 src/Properties.vala:447
-#: src/editing_tools/EditingTools.vala:2218
-msgid "Exposure:"
-msgstr "Exponering:"
+#: ../src/AppWindow.vala:714
+#, c-format
+msgid "Unable to display help: %s"
+msgstr "Kunde inte visa hjälp: %s"
 
-#: src/Properties.vala:585
-msgid "Location:"
-msgstr "Plats:"
+#: ../src/AppWindow.vala:722
+#, c-format
+msgid "Unable to navigate to bug database: %s"
+msgstr "Det går inte att komma åt bugg-databasen: %s"
 
-#: src/Properties.vala:588
-msgid "File size:"
-msgstr "Filstorlek:"
+#: ../src/AppWindow.vala:730
+#, c-format
+msgid "Unable to display FAQ: %s"
+msgstr "Kunde inte visa återkommande frågor: %s"
 
-#: src/Properties.vala:592
-msgid "Current Development:"
-msgstr "Nuvarande framkallare:"
+#: ../src/BatchImport.vala:26
+msgid "Success"
+msgstr "Lyckades"
 
-#: src/Properties.vala:594
-msgid "Original dimensions:"
-msgstr "Ursprungsstorlek:"
+#: ../src/BatchImport.vala:29
+msgid "File error"
+msgstr "Filfel"
 
-#: src/Properties.vala:597
-msgid "Camera make:"
-msgstr "Kameratillverkare:"
+#: ../src/BatchImport.vala:32
+msgid "Unable to decode file"
+msgstr "Kunde inte avkoda filen"
 
-#: src/Properties.vala:600
-msgid "Camera model:"
-msgstr "Kameramodell:"
+#: ../src/BatchImport.vala:35
+msgid "Database error"
+msgstr "Databasfel"
 
-#: src/Properties.vala:603
-msgid "Flash:"
-msgstr "Blixt:"
+#: ../src/BatchImport.vala:38
+msgid "User aborted import"
+msgstr "Användaren avbröt importen"
 
-#: src/Properties.vala:605
-msgid "Focal length:"
-msgstr "Brännvidd:"
+#: ../src/BatchImport.vala:41
+msgid "Not a file"
+msgstr "Inte en fil"
 
-#: src/Properties.vala:608
-msgid "Exposure date:"
-msgstr "Exponeringsögonblick:"
+#: ../src/BatchImport.vala:44
+msgid "File already exists in database"
+msgstr "Filen finns redan i databasen"
 
-#: src/Properties.vala:611
-msgid "Exposure time:"
-msgstr "Exponeringstid:"
+#: ../src/BatchImport.vala:47
+msgid "Unsupported file format"
+msgstr "Filformatet stöds inte"
 
-#: src/Properties.vala:614
-msgid "Exposure bias:"
-msgstr "Exponeringskompensation:"
+#: ../src/BatchImport.vala:50
+msgid "Not an image file"
+msgstr "Inte en bildfil"
 
-#: src/Properties.vala:616
-msgid "GPS latitude:"
-msgstr "GPS-latitud:"
+#: ../src/BatchImport.vala:53
+msgid "Disk failure"
+msgstr "Diskfel"
 
-#: src/Properties.vala:619
-msgid "GPS longitude:"
-msgstr "GPS-longitud:"
+#: ../src/BatchImport.vala:56
+msgid "Disk full"
+msgstr "Disken är full"
 
-#: src/Properties.vala:622
-msgid "Artist:"
-msgstr "Kostnär:"
+#: ../src/BatchImport.vala:59
+msgid "Camera error"
+msgstr "Kamerafel"
 
-#: src/Properties.vala:624
-msgid "Copyright:"
-msgstr "Upphovsrätt:"
+#: ../src/BatchImport.vala:62
+msgid "File write error"
+msgstr "Fel vid filskrivning"
 
-#: src/Properties.vala:626
-msgid "Software:"
-msgstr "Programvara:"
+#: ../src/BatchImport.vala:65
+msgid "Corrupt image file"
+msgstr ""
 
-#: src/Properties.vala:630 src/Dialogs.vala:1288
-msgid "Comment:"
-msgstr "Kommentar:"
+#: ../src/BatchImport.vala:68
+#, c-format
+msgid "Imported failed (%d)"
+msgstr "Importen misslyckades (%d)"
 
-#: src/Properties.vala:639
-msgid "Extended Information"
-msgstr "Utökad information"
+#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
+msgid "S_lideshow"
+msgstr "_Bildspel"
+
+#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
+msgid "Play a slideshow"
+msgstr "Spela upp ett bildspel"
+
+#: ../src/CollectionPage.vala:456
+msgid "Export Photo/Video"
+msgstr "Exportera bilder/filmer"
+
+#: ../src/CollectionPage.vala:456
+msgid "Export Photos/Videos"
+msgstr "Exportera bilder/filmer"
+
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
+#: ../src/PhotoPage.vala:3211
+msgid "Export Photo"
+msgstr "Exportera bilder"
+
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:87
+msgid "Export Photos"
+msgstr "Exportera bilder"
+
+#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+msgid "Rotating"
+msgstr "Roteraren"
+
+#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+msgid "Undoing Rotate"
+msgstr "Återställ roteringen"
+
+#: ../src/CollectionPage.vala:570
+msgid "Flipping Horizontally"
+msgstr "Vänder horisontellt"
+
+#: ../src/CollectionPage.vala:571
+msgid "Undoing Flip Horizontally"
+msgstr "Återställer horisontell vändning"
+
+#: ../src/CollectionPage.vala:580
+msgid "Flipping Vertically"
+msgstr "Vänder vertikalt"
+
+#: ../src/CollectionPage.vala:581
+msgid "Undoing Flip Vertically"
+msgstr "Återställer vertikal vändning"
+
+#: ../src/Commands.vala:733
+msgid "Reverting"
+msgstr "Återställer"
+
+#: ../src/Commands.vala:733
+msgid "Undoing Revert"
+msgstr "Ångrar återställning"
+
+#: ../src/Commands.vala:777
+msgid "Enhancing"
+msgstr "Förbättrar"
+
+#: ../src/Commands.vala:777
+msgid "Undoing Enhance"
+msgstr "Ångrar förbättring"
+
+#: ../src/Commands.vala:853
+msgid "Applying Color Transformations"
+msgstr ""
+
+#: ../src/Commands.vala:853
+msgid "Undoing Color Transformations"
+msgstr ""
 
-#: src/Dialogs.vala:16
+#: ../src/Commands.vala:1003
+msgid "Creating New Event"
+msgstr "Skapar ny händelse"
+
+#: ../src/Commands.vala:1004
+msgid "Removing Event"
+msgstr "Tar bort händelse"
+
+#: ../src/Commands.vala:1013
+msgid "Moving Photos to New Event"
+msgstr "Flyttar bilder till ny händelse"
+
+#: ../src/Commands.vala:1014
+msgid "Setting Photos to Previous Event"
+msgstr "Ställer in bilder till föregående händelse"
+
+#: ../src/Commands.vala:1071
+msgid "Merging"
+msgstr "Slår ihop"
+
+#: ../src/Commands.vala:1072
+msgid "Unmerging"
+msgstr "Delar upp"
+
+#: ../src/Commands.vala:1081
+msgid "Duplicating photos"
+msgstr "Skapar kopior av bilderna"
+
+#: ../src/Commands.vala:1081
+msgid "Removing duplicated photos"
+msgstr "Raderar kopior på bilderna"
+
+#: ../src/Commands.vala:1104
+#, 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] "Kunde inte kopiera en bild på grund av en felaktig fil"
+msgstr[1] "Det gick inte kopiera %d bilderna på grund av  felaktiga filer"
+
+#: ../src/Commands.vala:1191
+msgid "Restoring previous rating"
+msgstr "Återställer tidigare betyg"
+
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+msgid "Increasing ratings"
+msgstr "Ökar betyg"
+
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+msgid "Decreasing ratings"
+msgstr "Sänker betyg"
+
+#: ../src/Commands.vala:1252
+msgid "Setting RAW developer"
+msgstr "Ställer in RAW-framkallare"
+
+#: ../src/Commands.vala:1252
+msgid "Restoring previous RAW developer"
+msgstr "Återställer tidigare RAW-framkallare"
+
+#: ../src/Commands.vala:1253
+msgid "Set Developer"
+msgstr "Bestäm utvecklare"
+
+#: ../src/Commands.vala:1343
+msgid "Original photo could not be adjusted."
+msgstr "Den ursprungliga bilden kunde inte justeras."
+
+#: ../src/Commands.vala:1364
+msgid "Adjusting Date and Time"
+msgstr "Justerar datum och tid"
+
+#: ../src/Commands.vala:1364
+msgid "Undoing Date and Time Adjustment"
+msgstr "Återställer justering för datum och tid"
+
+#: ../src/Commands.vala:1395
+msgid "One original photo could not be adjusted."
+msgid_plural "The following original photos could not be adjusted."
+msgstr[0] "Den ursprungliga bilden kunde inte anpassas."
+msgstr[1] "Följande ursprungliga bilder kunde inte anpassas."
+
+#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
+msgid "Time Adjustment Error"
+msgstr "Anpassning av tidsfel"
+
+#: ../src/Commands.vala:1419
+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] "Tidsanpassningen kunde inte återställas för den här bilden."
+msgstr[1] "Tidsanpassningen kunde inte återställas för följande bilder."
+
+#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
+msgid "Create Tag"
+msgstr "Skapa etikett"
+
+#: ../src/Commands.vala:1691
+#, c-format
+msgid "Move Tag \"%s\""
+msgstr "Flytta etiketten \"%s\""
+
+#: ../src/Commands.vala:2343
+msgid "Move Photos to Trash"
+msgstr "Flytta bilder till papperskorgen"
+
+#: ../src/Commands.vala:2343
+msgid "Restore Photos from Trash"
+msgstr "Återställ bilder från papperskorgen"
+
+#: ../src/Commands.vala:2344
+msgid "Move the photos to the Shotwell trash"
+msgstr "Flytta bilderna till Shotwells papperskorg"
+
+#: ../src/Commands.vala:2344
+msgid "Restore the photos back to the Shotwell library"
+msgstr "Återställ bilder tillbaka till Shotwell-biblioteket"
+
+#: ../src/Commands.vala:2363
+msgid "Moving Photos to Trash"
+msgstr "Flyttar bilder till papperskorgen"
+
+#: ../src/Commands.vala:2363
+msgid "Restoring Photos From Trash"
+msgstr "Återställer bilderna från papperskorgen"
+
+#: ../src/Commands.vala:2449
+msgid "Flag selected photos"
+msgstr "Märk markerade bilder"
+
+#: ../src/Commands.vala:2450
+msgid "Unflag selected photos"
+msgstr "Återställ märkningen för markerade bilder"
+
+#: ../src/Commands.vala:2451
+msgid "Flagging selected photos"
+msgstr ""
+
+#: ../src/Commands.vala:2452
+msgid "Unflagging selected photos"
+msgstr ""
+
+#: ../src/Commands.vala:2459
+msgid "Flag"
+msgstr "Märk"
+
+#: ../src/Commands.vala:2459
+msgid "Unflag"
+msgstr "Återställ märkningen"
+
+#: ../src/DesktopIntegration.vala:121
+#, c-format
+msgid "Unable to launch Nautilus Send-To: %s"
+msgstr "Kunde inte starta Nautilus Send-To: %s"
+
+#: ../src/DesktopIntegration.vala:129
+msgid "Send To"
+msgstr "Skicka till"
+
+#: ../src/DesktopIntegration.vala:174
+#, c-format
+msgid "Unable to export background to %s: %s"
+msgstr "Kunde inte exportera bakgrund till %s: %s"
+
+#: ../src/DesktopIntegration.vala:311
+#, c-format
+msgid "Unable to prepare desktop slideshow: %s"
+msgstr "Kunde inte förbereda skrivbordsbildspel: %s"
+
+#: ../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?"
@@ -642,26 +1489,19 @@ msgstr[1] ""
 "Det här kommer att ta bort etiketten \"%s\" från %d bilder. Vill du "
 "fortsätta?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1361
-#: src/Dialogs.vala:1384 src/data_imports/DataImportsUI.vala:399
-#: src/AppWindow.vala:615 src/AppWindow.vala:636 src/AppWindow.vala:653
-#: src/publishing/PublishingUI.vala:498
-msgid "_Cancel"
-msgstr "_Avbryt"
-
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1329
-#: src/Resources.vala:330 src/Resources.vala:378 src/Resources.vala:643
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
+#: ../src/Resources.vala:163 ../src/Resources.vala:369
+#: ../src/Resources.vala:417 ../src/Resources.vala:682
 msgid "_Delete"
 msgstr "_Radera"
 
-#: src/Dialogs.vala:25
+#: ../src/Dialogs.vala:25
 #, c-format
 msgid "This will remove the saved search \"%s\".  Continue?"
 msgstr ""
 "Det här kommer att ta bort sparade sökningen \"%s\".  Vill du fortsätta?"
 
-#: src/Dialogs.vala:35
-#, c-format
+#: ../src/Dialogs.vala:35
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
 "Shotwell"
@@ -675,15 +1515,20 @@ msgstr[1] ""
 "Om du ändrar råbildsframkallare kommer alla ändringar du gjort på bilderna i "
 "Shotwell att återställas."
 
-#: src/Dialogs.vala:39
+#: ../src/Dialogs.vala:39
 msgid "_Switch Developer"
 msgstr "_Byt råbildsframkallare"
 
-#: src/Dialogs.vala:58
+#: ../src/Dialogs.vala:58
 msgid "Export Video"
 msgstr "Exportera film"
 
-#: src/Dialogs.vala:115
+#. Ticket #3023
+#. Attempt to replace the system error with something friendlier
+#. if we can't copy an image over for editing in an external tool.
+#. Did we fail because we can't write to this directory?
+#. Yes - display an alternate error message here.
+#: ../src/Dialogs.vala:115
 #, c-format
 msgid ""
 "Shotwell couldn't create a file for editing this photo because you do not "
@@ -692,7 +1537,7 @@ msgstr ""
 "Shotwell kunde inte skapa en fil för redigering av denna bild därför att du "
 "inte har behörighet att skriva till %s."
 
-#: src/Dialogs.vala:124
+#: ../src/Dialogs.vala:124
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -700,7 +1545,7 @@ msgstr ""
 "Kunde inte exportera följande bild på grund av ett filfel.\n"
 "\n"
 
-#: src/Dialogs.vala:130
+#: ../src/Dialogs.vala:130
 msgid ""
 "\n"
 "\n"
@@ -710,93 +1555,107 @@ msgstr ""
 "\n"
 "Vill du fortsätta att exportera?"
 
-#: src/Dialogs.vala:131
-msgid "Con_tinue"
-msgstr "_Fortsätt"
-
-#: src/Dialogs.vala:147
+#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
+#. aren't formats so much as they are operating modes that determine specific formats.
+#. Hereafter we'll refer to these as "special formats."
+#: ../src/Dialogs.vala:147
 msgid "Unmodified"
 msgstr "Oförändrad"
 
-#: src/Dialogs.vala:148
+#: ../src/Dialogs.vala:148
 msgid "Current"
 msgstr "Aktuell"
 
-#: src/Dialogs.vala:212
+#. layout controls
+#: ../src/Dialogs.vala:213
 msgid "_Format:"
 msgstr "_Format:"
 
-#: src/Dialogs.vala:215
+#: ../src/Dialogs.vala:216
 msgid "_Quality:"
 msgstr "_Kvalitet:"
 
-#: src/Dialogs.vala:218
+#: ../src/Dialogs.vala:219
 msgid "_Scaling constraint:"
 msgstr "_Skalningsbegränsning:"
 
-#: src/Dialogs.vala:221
-msgid " _pixels"
+#: ../src/Dialogs.vala:222
+#, fuzzy
+#| msgid " _pixels"
+msgid "_Pixels:"
 msgstr " _pixlar"
 
-#: src/Dialogs.vala:229
+#: ../src/Dialogs.vala:225
 msgid "Export metadata"
 msgstr "Exportera metadata"
 
-#: src/Dialogs.vala:465
+#: ../src/Dialogs.vala:459
 msgid "Save Details..."
 msgstr "Spara detaljer..."
 
-#: src/Dialogs.vala:466
+#: ../src/Dialogs.vala:460
 msgid "Save Details"
 msgstr "Spara detaljer"
 
-#: src/Dialogs.vala:481
+#: ../src/Dialogs.vala:475
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(och ytterligare %d)\n"
 
-#: src/Dialogs.vala:534
+#: ../src/Dialogs.vala:528
 msgid "Import Results Report"
 msgstr "Importera resultatrapport"
 
-#: src/Dialogs.vala:538
+#: ../src/Dialogs.vala:532
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "Försökte importera %d fil"
 msgstr[1] "Försökte importera %d filer"
 
-#: src/Dialogs.vala:541
+#: ../src/Dialogs.vala:535
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
 msgstr[0] "Av dessa importerades %d fil framgångsrikt."
 msgstr[1] "Av dessa importerades %d filer framgångsrikt."
 
-#: src/Dialogs.vala:553
+#.
+#. Duplicates
+#.
+#: ../src/Dialogs.vala:547
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Dubbletter av bilder/filmer som inte importerades:"
 
-#: src/Dialogs.vala:557
+#: ../src/Dialogs.vala:551
 msgid "duplicates existing media item"
 msgstr "dubblett av befintligt media"
 
-#: src/Dialogs.vala:568
+#.
+#. Files Not Imported Due to Camera Errors
+#.
+#: ../src/Dialogs.vala:562
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "På grund av ett kamerafel importerades inga bilder eller filmer:"
 
-#: src/Dialogs.vala:571 src/Dialogs.vala:586 src/Dialogs.vala:601
-#: src/Dialogs.vala:617 src/Dialogs.vala:632 src/Dialogs.vala:646
+#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
+#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
 msgid "error message:"
 msgstr "felmeddelande:"
 
-#: src/Dialogs.vala:582
+#.
+#. Files Not Imported Because They Weren't Recognized as Photos or Videos
+#.
+#: ../src/Dialogs.vala:576
 msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgstr ""
 "Filerna importerades inte på grund av att de inte kändes igen som bild- "
 "eller filmfiler:"
 
-#: src/Dialogs.vala:597
+#.
+#. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
+#.
+#: ../src/Dialogs.vala:591
 msgid ""
 "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
 "Understands:"
@@ -804,7 +1663,10 @@ msgstr ""
 "Bilderna eller filmerna importerades inte på grund av att de var i ett "
 "format som Shotwell inte stöder:"
 
-#: src/Dialogs.vala:612
+#.
+#. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
+#.
+#: ../src/Dialogs.vala:606
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
 "Library:"
@@ -812,7 +1674,7 @@ msgstr ""
 "Bilderna eller filmerna importerades inte på grund av att det inte gick att "
 "kopiera dem till biblioteket:"
 
-#: src/Dialogs.vala:616
+#: ../src/Dialogs.vala:610
 #, c-format
 msgid ""
 "couldn't copy %s\n"
@@ -821,36 +1683,42 @@ msgstr ""
 "det gick inte att kopiera %s\n"
 "\ttill %s"
 
-#: src/Dialogs.vala:628
+#.
+#. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
+#.
+#: ../src/Dialogs.vala:622
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr ""
 
-#: src/Dialogs.vala:643
+#.
+#. Photos/Videos Not Imported for Other Reasons
+#.
+#: ../src/Dialogs.vala:637
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Bilder eller filmer importerades inte på grund av andra anledningar:"
 
-#: src/Dialogs.vala:663
+#: ../src/Dialogs.vala:657
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "1 bilddubblett importades inte:\n"
 msgstr[1] "%d bilddubbletter importerades inte:\n"
 
-#: src/Dialogs.vala:666
+#: ../src/Dialogs.vala:660
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "1 videodubblett importerades inte:\n"
 msgstr[1] "%d filmdubbletter importerades inte:\n"
 
-#: src/Dialogs.vala:669
+#: ../src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "1 video-/bilddublett importerades inte:\n"
 msgstr[1] "%d bild- och filmdubletter importerades inte:\n"
 
-#: src/Dialogs.vala:683
+#: ../src/Dialogs.vala:677
 #, 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"
@@ -859,7 +1727,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Import av %d bilder misslyckades på grund av ett fil- eller hårdvarufel:\n"
 
-#: src/Dialogs.vala:686
+#: ../src/Dialogs.vala:680
 #, 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"
@@ -868,7 +1736,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d filmer gick inte att importera på grund av ett fil- eller hårdvarufel:\n"
 
-#: src/Dialogs.vala:689
+#: ../src/Dialogs.vala:683
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -880,7 +1748,7 @@ msgstr[1] ""
 "%d bilder och filmer gick inte att importera på grund av ett fil- eller "
 "hårdvarufel:\n"
 
-#: src/Dialogs.vala:692
+#: ../src/Dialogs.vala:686
 #, 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"
@@ -889,7 +1757,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d filer gick inte att importera på grund av ett fil- eller maskinvarufel:\n"
 
-#: src/Dialogs.vala:706
+#: ../src/Dialogs.vala:700
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -903,7 +1771,7 @@ msgstr[1] ""
 "%d bilder gick inte att importera därför att bildbiblioteksmappen inte var "
 "skrivbar:\n"
 
-#: src/Dialogs.vala:709
+#: ../src/Dialogs.vala:703
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -917,7 +1785,7 @@ msgstr[1] ""
 "%d filmer gick inte att importera därför att bildbiblioteksmappen inte var "
 "skrivbar:\n"
 
-#: src/Dialogs.vala:712
+#: ../src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -932,7 +1800,7 @@ msgstr[1] ""
 "%d bilder och filmer gick inte att importera därför att bildbiblioteksmappen "
 "inte var skrivbar:\n"
 
-#: src/Dialogs.vala:715
+#: ../src/Dialogs.vala:709
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -946,21 +1814,21 @@ msgstr[1] ""
 "%d filer gick inte att importera på grund av att bildbibliotekets mapp inte "
 "var skrivbar:\n"
 
-#: src/Dialogs.vala:729
+#: ../src/Dialogs.vala:723
 #, 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] "Import av ett bild misslyckades på grund av ett kamerafel:\n"
 msgstr[1] "%d bilder gick inte att importera på grund av ett kamerafel:\n"
 
-#: src/Dialogs.vala:732
+#: ../src/Dialogs.vala:726
 #, 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] "1 video gick inte att importera på grund av ett kamerafel:\n"
 msgstr[1] "%d filmer gick inte att importera på grund av ett kamerafel:\n"
 
-#: src/Dialogs.vala:735
+#: ../src/Dialogs.vala:729
 #, 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"
@@ -968,176 +1836,204 @@ msgstr[0] "1 bild/video gick inte att importera på grund av ett kamerafel:\n"
 msgstr[1] ""
 "%d bilder och filmer gick inte att importera på grund av ett kamerafel:\n"
 
-#: src/Dialogs.vala:738
+#: ../src/Dialogs.vala:732
 #, 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] "En fil gick inte att importera på grund av ett kamerafel:\n"
 msgstr[1] "%d filer gick inte att importera på grund av ett kamerafel:\n"
 
-#: src/Dialogs.vala:752
+#: ../src/Dialogs.vala:746
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:755
+#: ../src/Dialogs.vala:749
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:758
+#: ../src/Dialogs.vala:752
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:761
+#: ../src/Dialogs.vala:755
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:778
+#. we have no notion of "unsupported" video files right now in Shotwell (all
+#. standard container formats are supported, it's just that the streams in them
+#. might or might not be interpretable), so this message does not need to be
+#. media specific
+#: ../src/Dialogs.vala:772
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
 msgstr[0] "En bild som inte stöds hoppades över:\n"
 msgstr[1] "%d bilder som inte stöds hoppades över:\n"
 
-#: src/Dialogs.vala:793
+#. we have no notion of "non-video" video files right now in Shotwell, so this
+#. message doesn't need to be media specific
+#: ../src/Dialogs.vala:787
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "En icke-bildfil hoppades över.\n"
 msgstr[1] "%d icke-bildfiler hoppades över.\n"
 
-#: src/Dialogs.vala:804
+#: ../src/Dialogs.vala:798
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "En bild hoppades över därför att användaren avbröt:\n"
 msgstr[1] "%d bilder hoppades över därför att användaren avbröt:\n"
 
-#: src/Dialogs.vala:807
+#: ../src/Dialogs.vala:801
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "1 video hoppades över därför att användaren avbröt:\n"
 msgstr[1] "%d filmer hoppades över därför att användaren avbröt:\n"
 
-#: src/Dialogs.vala:810
+#: ../src/Dialogs.vala:804
 #, 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] "1 bild/video hoppades över därför att användaren avbröt:\n"
 msgstr[1] "%d bilder och filmer hoppades över därför att användaren avbröt:\n"
 
-#: src/Dialogs.vala:813
+#: ../src/Dialogs.vala:807
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "En fil hoppades över därför att användaren avbröt:\n"
 msgstr[1] "%d filer hoppades över därför att användaren avbröt:\n"
 
-#: src/Dialogs.vala:827
+#: ../src/Dialogs.vala:821
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "En bild importerades.\n"
 msgstr[1] "%d bilder importerades.\n"
 
-#: src/Dialogs.vala:830
+#: ../src/Dialogs.vala:824
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "En film importerades.\n"
 msgstr[1] "%d filmer importerades.\n"
 
-#: src/Dialogs.vala:833
+#: ../src/Dialogs.vala:827
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
 msgstr[0] "En bild och film importerades.\n"
 msgstr[1] "%d bilder och filmer importerades.\n"
 
-#: src/Dialogs.vala:849
+#. if no media items were imported at all (i.e. an empty directory attempted), need to at least
+#. report that nothing was imported
+#: ../src/Dialogs.vala:843
 msgid "No photos or videos imported.\n"
 msgstr "Inga bilder eller filmer importerades.\n"
 
-#: src/Dialogs.vala:856 src/Dialogs.vala:875
+#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
 msgid "Import Complete"
 msgstr "Importen är färdig"
 
-#: src/Dialogs.vala:1103
+#: ../src/Dialogs.vala:1155
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: src/Dialogs.vala:1106
+#: ../src/Dialogs.vala:1158
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuter"
 
-#: src/Dialogs.vala:1110
+#: ../src/Dialogs.vala:1162
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d timme"
 msgstr[1] "%d timmar"
 
-#: src/Dialogs.vala:1113
+#: ../src/Dialogs.vala:1165
 msgid "1 day"
 msgstr "Ett dygn"
 
-#: src/Dialogs.vala:1263 src/Resources.vala:205
+#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
 msgid "Rename Event"
 msgstr "Byt namn på händelse"
 
-#: src/Dialogs.vala:1263
+#: ../src/Dialogs.vala:1315
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/Dialogs.vala:1273 src/Resources.vala:274
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
 msgid "Edit Title"
 msgstr "Redigera titel"
 
-#: src/Dialogs.vala:1287 src/Resources.vala:280
+#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
+msgid "Title:"
+msgstr "Titel:"
+
+#. Dialog title
+#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
 msgid "Edit Event Comment"
 msgstr ""
 
-#: src/Dialogs.vala:1287
+#: ../src/Dialogs.vala:1344
 msgid "Edit Photo/Video Comment"
 msgstr ""
 
-#: src/Dialogs.vala:1304
-msgid "_Trash File"
-msgid_plural "_Trash Files"
+#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
+msgid "Comment:"
+msgstr "Kommentar:"
+
+#: ../src/Dialogs.vala:1361
+#, fuzzy
+#| msgid "_Trash File"
+#| msgid_plural "_Trash Files"
+msgid "Remove and _Trash File"
+msgid_plural "Remove and _Trash Files"
 msgstr[0] "_Ta bort filen"
 msgstr[1] "_Ta bort filerna"
 
-#: src/Dialogs.vala:1308
-msgid "Only _Remove"
-msgstr "Ta _endast bort"
+#: ../src/Dialogs.vala:1365
+#, fuzzy
+#| msgid "Remove From Library"
+msgid "_Remove From Library"
+msgstr "Ta bort från biblioteket"
+
+#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
+msgid "_Keep"
+msgstr "_Behåll"
 
-#: src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edit?"
 msgstr "Återställ externa redigeringar?"
 
-#: src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edits?"
 msgstr "Återställ externa redigeringar?"
 
-#: src/Dialogs.vala:1353
+#: ../src/Dialogs.vala:1410
 #, c-format
 msgid "This will destroy all changes made to the external file.  Continue?"
 msgid_plural ""
@@ -1149,15 +2045,15 @@ msgstr[1] ""
 "Det här kommer att förstöra alla ändringar som gjorts i de %d externa "
 "filerna.  Vill du fortsätta?"
 
-#: src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edit"
 msgstr "Återställ externa redigeringar"
 
-#: src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edits"
 msgstr "Åt_erställ externa redigeringar"
 
-#: src/Dialogs.vala:1378
+#: ../src/Dialogs.vala:1435
 #, c-format
 msgid "This will remove the photo from the library.  Continue?"
 msgid_plural "This will remove %d photos from the library.  Continue?"
@@ -1166,72 +2062,72 @@ msgstr[0] ""
 msgstr[1] ""
 "Det här kommer att radera %d bilder från biblioteket. Vill du fortsätta?"
 
-#: src/Dialogs.vala:1385
+#: ../src/Dialogs.vala:1442 ../src/Resources.vala:178
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photo From Library"
 msgstr "Ta bort bilder från biblioteket"
 
-#: src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photos From Library"
 msgstr "Ta bort bilder från bibliotek"
 
-#: src/Dialogs.vala:1479
+#: ../src/Dialogs.vala:1536
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1626
+#: ../src/Dialogs.vala:1688
 msgid "AM"
 msgstr "AM"
 
-#: src/Dialogs.vala:1627
+#: ../src/Dialogs.vala:1689
 msgid "PM"
 msgstr "PM"
 
-#: src/Dialogs.vala:1628
+#: ../src/Dialogs.vala:1690
 msgid "24 Hr"
 msgstr "24 timmar"
 
-#: src/Dialogs.vala:1643
+#: ../src/Dialogs.vala:1705
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Förskjut bilder/filmer med samma värde"
 
-#: src/Dialogs.vala:1648
+#: ../src/Dialogs.vala:1710
 msgid "Set _all photos/videos to this time"
 msgstr "Ställ in _alla bilder/filmer till denna tid"
 
-#: src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo file"
 msgstr "_Modifiera originalbilden"
 
-#: src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo files"
 msgstr "_Modifiera originalbilderna"
 
-#: src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original file"
 msgstr "Än_dra originalfiler"
 
-#: src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original files"
 msgstr "Än_dra originalfiler"
 
-#: src/Dialogs.vala:1744
+#: ../src/Dialogs.vala:1806
 msgid "Original: "
 msgstr "Original:"
 
-#: src/Dialogs.vala:1745
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%Y-%m-%d, %H.%M.%S"
 
-#: src/Dialogs.vala:1746
+#: ../src/Dialogs.vala:1808
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%Y-%m-%d, %H.%M.%S"
 
-#: src/Dialogs.vala:1835
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -1240,7 +2136,7 @@ msgstr ""
 "Exponeringsögonblicket kommer att flyttas framåt med\n"
 "%d %s, %d %s, %d %s och %d %s."
 
-#: src/Dialogs.vala:1836
+#: ../src/Dialogs.vala:1898
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -1249,31 +2145,31 @@ msgstr ""
 "Exponeringsögonblicket kommer att flyttas bakåt med\n"
 "%d %s, %d %s, %d %s och %d %s."
 
-#: src/Dialogs.vala:1838
+#: ../src/Dialogs.vala:1900
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dagar"
 
-#: src/Dialogs.vala:1839
+#: ../src/Dialogs.vala:1901
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "timme"
 msgstr[1] "timmar"
 
-#: src/Dialogs.vala:1840
+#: ../src/Dialogs.vala:1902
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuter"
 
-#: src/Dialogs.vala:1841
+#: ../src/Dialogs.vala:1903
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekund"
 msgstr[1] "sekunder"
 
-#: src/Dialogs.vala:1885
+#: ../src/Dialogs.vala:1947
 #, c-format
 msgid ""
 "\n"
@@ -1292,87 +2188,91 @@ msgstr[1] ""
 "\n"
 "och %d andra."
 
-#: src/Dialogs.vala:1907 src/Dialogs.vala:1934
+#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
 msgid "Tags (separated by commas):"
 msgstr "Etiketter (separerade med kommatecken):"
 
-#: src/Dialogs.vala:2014
+#: ../src/Dialogs.vala:2076
 msgid "Welcome!"
 msgstr "Välkommen!"
 
-#: src/Dialogs.vala:2021
-#, c-format
+#: ../src/Dialogs.vala:2083
 msgid "Welcome to Shotwell!"
 msgstr "Välkommen till Shotwell!"
 
-#: src/Dialogs.vala:2025
-#, c-format
+#: ../src/Dialogs.vala:2087
 msgid "To get started, import photos in any of these ways:"
 msgstr "Importera bilder på något av dessa sätt för att komma igång:"
 
-#: src/Dialogs.vala:2044
+#: ../src/Dialogs.vala:2106
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Välj <span weight=\"bold\">Arkiv %s Importera från mapp</span>"
 
-#: src/Dialogs.vala:2045
+#: ../src/Dialogs.vala:2107
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Dra och släpp bilder till Shotwell-fönstret"
 
-#: src/Dialogs.vala:2046
+#: ../src/Dialogs.vala:2108
 msgid "Connect a camera to your computer and import"
 msgstr "Anslut en kamera till din dator och importera"
 
-#: src/Dialogs.vala:2056
+#: ../src/Dialogs.vala:2118
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importera bilder från din %s-mapp"
 
-#: src/Dialogs.vala:2063
+#: ../src/Dialogs.vala:2125
 msgid "You can also import photos in any of these ways:"
 msgstr "Du kan även importera bilder på något av dessa sätt:"
 
-#: src/Dialogs.vala:2073
+#: ../src/Dialogs.vala:2135
 msgid "_Don't show this message again"
 msgstr "Visa _inte detta meddelande igen"
 
-#: src/Dialogs.vala:2108
+#: ../src/Dialogs.vala:2170
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Imortera bilder från ditt %s-bibliotek"
 
-#: src/Dialogs.vala:2252 src/Dialogs.vala:2256
+#. We're installed system-wide, so use the system help.
+#. We're being run from the build directory; we'll have to handle clicks to this
+#. link manually ourselves, due to a limitation ghelp: URIs.
+#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
 msgid "(Help)"
 msgstr "(Hjälp)"
 
-#: src/Dialogs.vala:2265
+#: ../src/Dialogs.vala:2324
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "År%sMånad%sDag"
 
-#: src/Dialogs.vala:2267
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth"
 msgstr "År%sMånad"
 
-#: src/Dialogs.vala:2269
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "År%sMånad-Dag"
 
-#: src/Dialogs.vala:2271
+#: ../src/Dialogs.vala:2330
 msgid "Year-Month-Day"
 msgstr "År-Månad-Dag"
 
-#: src/Dialogs.vala:2272 src/editing_tools/EditingTools.vala:777
+#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Anpassad"
 
-#: src/Dialogs.vala:2509
+#. Invalid pattern.
+#: ../src/Dialogs.vala:2568
 msgid "Invalid pattern"
 msgstr "Ogiltigt mönster"
 
-#: src/Dialogs.vala:2612
+#. This function is used to determine whether or not files should be copied or linked when imported.
+#. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
+#: ../src/Dialogs.vala:2670
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -1380,31 +2280,31 @@ msgstr ""
 "Shotwell kan kopiera bildera till din biblioteksmapp eller importera dem "
 "utan att kopiera dem."
 
-#: src/Dialogs.vala:2617
+#: ../src/Dialogs.vala:2675
 msgid "Co_py Photos"
 msgstr "Ko_piera bilder"
 
-#: src/Dialogs.vala:2618
+#: ../src/Dialogs.vala:2676
 msgid "_Import in Place"
 msgstr "_Importera på plats"
 
-#: src/Dialogs.vala:2619
+#: ../src/Dialogs.vala:2677
 msgid "Import to Library"
 msgstr "Importera till biblioteket"
 
-#: src/Dialogs.vala:2629 src/PhotoPage.vala:3075
+#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
 msgid "Remove From Library"
 msgstr "Ta bort från biblioteket"
 
-#: src/Dialogs.vala:2630 src/PhotoPage.vala:3075
+#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
 msgid "Removing Photo From Library"
 msgstr "Tar bort bilder från bibliotek"
 
-#: src/Dialogs.vala:2630
+#: ../src/Dialogs.vala:2688
 msgid "Removing Photos From Library"
 msgstr "Tar bort bilder från bibliotek"
 
-#: src/Dialogs.vala:2644
+#: ../src/Dialogs.vala:2702
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -1427,7 +2327,7 @@ msgstr[1] ""
 "\n"
 "Den här åtgärden kan inte ångras."
 
-#: src/Dialogs.vala:2648
+#: ../src/Dialogs.vala:2706
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -1450,7 +2350,7 @@ msgstr[1] ""
 "\n"
 "Den här åtgärd kan inte ångras."
 
-#: src/Dialogs.vala:2652
+#: ../src/Dialogs.vala:2710
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -1473,7 +2373,7 @@ msgstr[1] ""
 "\n"
 "Den här åtgärden kan inte ångras."
 
-#: src/Dialogs.vala:2684
+#: ../src/Dialogs.vala:2742
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -1486,616 +2386,384 @@ msgstr[1] ""
 "%d bilder eller filmer kan inte flyttas till papperskorgen.  Vill du radera "
 "dessa filer direkt?"
 
-#: src/Dialogs.vala:2701
+#. Alert the user that the files were not removed.
+#: ../src/Dialogs.vala:2759
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
 msgstr[0] "Bilden eller filmen kan inte raderas."
 msgstr[1] "%d bilder eller filmer kan inte raderas."
 
-#: src/folders/Branch.vala:141
-msgid "Folders"
-msgstr "Mappar"
+#: ../src/Dimensions.vala:23
+msgid "Width"
+msgstr "Bredd"
 
-#: src/tags/Branch.vala:127
-msgid "Tags"
-msgstr "Etiketter"
+#: ../src/Dimensions.vala:26
+msgid "Height"
+msgstr "Höjd"
 
-#: src/BatchImport.vala:26
-msgid "Success"
-msgstr "Lyckades"
+#. verify this is a directory
+#: ../src/DirectoryMonitor.vala:889
+#, c-format
+msgid "Unable to monitor %s: Not a directory (%s)"
+msgstr "Kunde inte övervaka %s: Det är inte en mapp (%s)"
 
-#: src/BatchImport.vala:29
-msgid "File error"
-msgstr "Filfel"
+#. if no name, pretty up the start time
+#: ../src/Event.vala:751
+#, c-format
+msgid "Event %s"
+msgstr "Händelse %s"
 
-#: src/BatchImport.vala:32
-msgid "Unable to decode file"
-msgstr "Kunde inte avkoda filen"
+#: ../src/Exporter.vala:232
+#, c-format
+msgid "Unable to generate a temporary file for %s: %s"
+msgstr "Kunde inte skapa en temporärfil för %s: %s"
 
-#: src/BatchImport.vala:35
-msgid "Database error"
-msgstr "Databasfel"
+#: ../src/Exporter.vala:299
+msgid "Exporting"
+msgstr "Exporterar"
 
-#: src/BatchImport.vala:38
-msgid "User aborted import"
-msgstr "Användaren avbröt importen"
+#: ../src/Exporter.vala:317
+#, c-format
+msgid "File %s already exists.  Replace?"
+msgstr "Filen %s finns redan.  Vill du ersätta den?"
 
-#: src/BatchImport.vala:41
-msgid "Not a file"
-msgstr "Inte en fil"
+#: ../src/Exporter.vala:319
+msgid "_Skip"
+msgstr "_Hoppa över"
 
-#: src/BatchImport.vala:44
-msgid "File already exists in database"
-msgstr "Filen finns redan i databasen"
+#: ../src/Exporter.vala:319
+msgid "_Replace"
+msgstr "_Ersätt"
 
-#: src/BatchImport.vala:47
-msgid "Unsupported file format"
-msgstr "Filformatet stöds inte"
+#: ../src/Exporter.vala:319
+msgid "Replace _All"
+msgstr "Ersätt _alla"
 
-#: src/BatchImport.vala:50
-msgid "Not an image file"
-msgstr "Inte en bildfil"
+#: ../src/Exporter.vala:319
+msgid "Export"
+msgstr "Exportera"
 
-#: src/BatchImport.vala:53
-msgid "Disk failure"
-msgstr "Diskfel"
+#: ../src/MediaMonitor.vala:400
+#, c-format
+msgid "Unable to process monitoring updates: %s"
+msgstr "Kunde inte behandla övervakningsuppdateringar: %s"
 
-#: src/BatchImport.vala:56
-msgid "Disk full"
-msgstr "Disken är full"
+#: ../src/MediaPage.vala:157
+msgid "Adjust the size of the thumbnails"
+msgstr "Justera storleken på miniatyrbilderna"
 
-#: src/BatchImport.vala:59
-msgid "Camera error"
-msgstr "Kamerafel"
+#: ../src/MediaPage.vala:339 ../src/PhotoPage.vala:2593
+#: ../src/Resources.vala:188 ../src/direct/DirectPhotoPage.vala:174
+msgid "Zoom _In"
+msgstr "_Förstora"
 
-#: src/BatchImport.vala:62
-msgid "File write error"
-msgstr "Fel vid filskrivning"
+#: ../src/MediaPage.vala:340
+msgid "Increase the magnification of the thumbnails"
+msgstr "Öka förstoringen på miniatyrbilderna"
 
-#: src/BatchImport.vala:65
-msgid "Corrupt image file"
-msgstr ""
+#: ../src/MediaPage.vala:345 ../src/PhotoPage.vala:2599
+#: ../src/Resources.vala:189 ../src/direct/DirectPhotoPage.vala:180
+msgid "Zoom _Out"
+msgstr "_Förminska"
+
+#: ../src/MediaPage.vala:346
+msgid "Decrease the magnification of the thumbnails"
+msgstr "Minska förstoringen på miniatyrbilderna"
+
+#: ../src/MediaPage.vala:413
+msgid "Sort _Photos"
+msgstr "Sortera _bilder"
+
+#: ../src/MediaPage.vala:422
+msgid "_Play Video"
+msgstr "Spela _upp film"
+
+#: ../src/MediaPage.vala:423
+msgid "Open the selected videos in the system video player"
+msgstr "Öppna markerade filmer i systemets filmspelare"
+
+#: ../src/MediaPage.vala:427 ../src/PhotoPage.vala:2642
+msgid "_Developer"
+msgstr "_Utvecklare"
+
+#: ../src/MediaPage.vala:439 ../src/camera/Branch.vala:99
+#: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
+#: ../src/photos/RawSupport.vala:303
+msgid "Camera"
+msgstr "Kamera"
+
+#: ../src/MediaPage.vala:450 ../src/camera/ImportPage.vala:874
+msgid "_Titles"
+msgstr "_Titlar"
+
+#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:875
+msgid "Display the title of each photo"
+msgstr "Visa titeln för varje bild"
+
+#: ../src/MediaPage.vala:456 ../src/events/EventsDirectoryPage.vala:130
+msgid "_Comments"
+msgstr "_Kommentarer"
+
+#: ../src/MediaPage.vala:457
+msgid "Display the comment of each photo"
+msgstr "Visa kommentarer för varje bild"
+
+#: ../src/MediaPage.vala:468 ../src/library/LibraryWindow.vala:375
+msgid "Ta_gs"
+msgstr "_Etiketter"
+
+#: ../src/MediaPage.vala:469
+msgid "Display each photo's tags"
+msgstr "Visa etiketter för varje bild"
+
+#: ../src/MediaPage.vala:485
+msgid "By _Title"
+msgstr "Efter _titel"
+
+#: ../src/MediaPage.vala:486
+msgid "Sort photos by title"
+msgstr "Sortera bilder efter titel"
+
+#: ../src/MediaPage.vala:491
+msgid "By Exposure _Date"
+msgstr "Efter exponerings_ögonblick"
+
+#: ../src/MediaPage.vala:492
+msgid "Sort photos by exposure date"
+msgstr "Sortera bilder efter exponeringsögonblick"
+
+#: ../src/MediaPage.vala:497
+msgid "By _Rating"
+msgstr "Efter _betyg"
+
+#: ../src/MediaPage.vala:498
+msgid "Sort photos by rating"
+msgstr "Sortera bilder efter betyg"
+
+#: ../src/MediaPage.vala:508 ../src/library/LibraryWindow.vala:421
+msgid "_Ascending"
+msgstr "_Stigande"
+
+#: ../src/MediaPage.vala:509 ../src/library/LibraryWindow.vala:422
+msgid "Sort photos in an ascending order"
+msgstr "Sortera bilder i stigande ordning"
 
-#: src/BatchImport.vala:68
+#: ../src/MediaPage.vala:514 ../src/library/LibraryWindow.vala:428
+msgid "D_escending"
+msgstr "_Fallande"
+
+#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:429
+msgid "Sort photos in a descending order"
+msgstr "Sortera bilder i fallande ordning"
+
+#: ../src/MediaPage.vala:716
 #, c-format
-msgid "Imported failed (%d)"
-msgstr "Importen misslyckades (%d)"
+msgid ""
+"Shotwell was unable to play the selected video:\n"
+"%s"
+msgstr ""
+"Shotwell kunde inte spela upp den markerade filmen:\n"
+"%s"
+
+#: ../src/Page.vala:1263
+msgid "No photos/videos"
+msgstr "Inga bilder eller filmer"
+
+#: ../src/Page.vala:1267
+msgid "No photos/videos found"
+msgstr "Inga bilder eller filmer hittades"
+
+#: ../src/Page.vala:2565
+msgid "Photos cannot be exported to this directory."
+msgstr "Bilderna kan inte exporteras till denna mapp."
 
-#: src/Photo.vala:3656
+#: ../src/Photo.vala:3753
 msgid "modified"
 msgstr "ändrad"
 
-#: src/PhotoPage.vala:532
+#. previous button
+#: ../src/PhotoPage.vala:533
 msgid "Previous photo"
 msgstr "Föregående bild"
 
-#: src/PhotoPage.vala:537
+#. next button
+#: ../src/PhotoPage.vala:539
 msgid "Next photo"
 msgstr "Nästa bild"
 
-#: src/PhotoPage.vala:1844
+#: ../src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Källfilen för bilden saknas: %s"
 
-#: src/PhotoPage.vala:2404 src/library/LibraryWindow.vala:360
-#: src/direct/DirectPhotoPage.vala:165
+#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
+#: ../src/library/LibraryWindow.vala:359
 msgid "_View"
 msgstr "_Visa"
 
-#: src/PhotoPage.vala:2408 src/direct/DirectPhotoPage.vala:81
+#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
 msgid "T_ools"
 msgstr "_Verktyg"
 
-#: src/PhotoPage.vala:2413 src/direct/DirectPhotoPage.vala:86
+#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
 msgid "_Previous Photo"
 msgstr "_Föregående bild"
 
-#: src/PhotoPage.vala:2414 src/direct/DirectPhotoPage.vala:87
+#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
 msgid "Previous Photo"
 msgstr "Föregående bild"
 
-#: src/PhotoPage.vala:2419 src/direct/DirectPhotoPage.vala:92
+#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
 msgid "_Next Photo"
 msgstr "_Nästa bild"
 
-#: src/PhotoPage.vala:2420 src/direct/DirectPhotoPage.vala:93
+#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
 msgid "Next Photo"
 msgstr "Nästa bild"
 
-#: src/PhotoPage.vala:2583 src/direct/DirectPhotoPage.vala:174
-#: src/MediaPage.vala:325
-msgid "Zoom _In"
-msgstr "_Förstora"
-
-#: src/PhotoPage.vala:2584 src/direct/DirectPhotoPage.vala:175
+#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
 msgid "Increase the magnification of the photo"
 msgstr "Öka förstoringen av bilden"
 
-#: src/PhotoPage.vala:2589 src/direct/DirectPhotoPage.vala:180
-#: src/MediaPage.vala:331
-msgid "Zoom _Out"
-msgstr "_Förminska"
-
-#: src/PhotoPage.vala:2590 src/direct/DirectPhotoPage.vala:181
+#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
 msgid "Decrease the magnification of the photo"
 msgstr "Minska förstoringen av bilden"
 
-#: src/PhotoPage.vala:2595 src/direct/DirectPhotoPage.vala:186
+#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
 msgid "Fit to _Page"
 msgstr "_Anpassa till sidan"
 
-#: src/PhotoPage.vala:2596 src/direct/DirectPhotoPage.vala:187
+#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
 msgid "Zoom the photo to fit on the screen"
 msgstr "Zooma bilden för att passa på skärmen"
 
-#: src/PhotoPage.vala:2601 src/direct/DirectPhotoPage.vala:192
+#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
+#, no-c-format
 msgid "Zoom _100%"
 msgstr "_Visa 100%"
 
-#: src/PhotoPage.vala:2602 src/direct/DirectPhotoPage.vala:193
-#, fuzzy, c-format
+#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
+#, fuzzy, no-c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "Zooma bilden till 100% förstoring"
 
-#: src/PhotoPage.vala:2607 src/direct/DirectPhotoPage.vala:198
+#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
+#, no-c-format
 msgid "Zoom _200%"
 msgstr "_Visa 200%"
 
-#: src/PhotoPage.vala:2608 src/direct/DirectPhotoPage.vala:199
-#, fuzzy, c-format
+#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
+#, fuzzy, no-c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "Zooma bilden till 200% förstoring"
 
-#: src/PhotoPage.vala:2628 src/MediaPage.vala:413
-msgid "_Developer"
-msgstr "_Utvecklare"
-
-#: src/PhotoPage.vala:3216
+#: ../src/PhotoPage.vala:3231
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Kunde inte exportera %s: %s"
 
-#: src/data_imports/DataImportsPluginHost.vala:65
-#: src/data_imports/DataImportsPluginHost.vala:78
-#, c-format
-msgid "%s Database"
-msgstr "%s-databas"
-
-#: 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 "Importen från %s kan inte fortsätta då ett fel uppstod:"
-
-#: src/data_imports/DataImportsPluginHost.vala:151
-msgid "To try importing from another service, select one from the above menu."
-msgstr ""
-"För att försöka att importera från en annan tjänst, välj en från ovanstående "
-"meny."
-
-#: src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr "Dataimporter"
-
-#: 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 ""
-"Du har inte aktiverat några dataimport-pluginer.\n"
-"\n"
-"För att använda kommandot Importera från program, måste du åtminstone ha en "
-"plugin aktiverad. Pluginer kan aktiveras i programmets inställiningar."
-
-#: src/data_imports/DataImportsUI.vala:100
-msgid "Database file:"
-msgstr "Databasfil:"
-
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:899
-msgid "_Import"
-msgstr "_Importera"
-
-#: src/data_imports/DataImportsUI.vala:216
-msgid "Import From Application"
-msgstr "Importera från program"
-
-#: src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "Importera mediafiler från:"
-
-#: src/data_imports/DataImportsUI.vala:394
-#: src/publishing/PublishingUI.vala:493
-msgid "_Close"
-msgstr "S_täng"
-
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:182
-msgid "Settings"
-msgstr "Inställningar"
-
-#: src/SlideshowPage.vala:141 src/Screensaver.vala:18
-msgid "Slideshow"
-msgstr "Bildspel"
-
-#: src/SlideshowPage.vala:161
-msgid "Back"
-msgstr "Bakåt"
-
-#: src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "Gå till föregående bild"
-
-#: src/SlideshowPage.vala:168 src/SlideshowPage.vala:273
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:274
-msgid "Pause the slideshow"
-msgstr "Pausa bildspelet"
-
-#: src/SlideshowPage.vala:175
-msgid "Next"
-msgstr "Nästa"
-
-#: src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "Gå till nästa bild"
-
-#: src/SlideshowPage.vala:183
-msgid "Change slideshow settings"
-msgstr "Ändra inställningar för bildspel"
-
-#: src/SlideshowPage.vala:237
-msgid "All photo source files are missing."
-msgstr "Alla källbildfiler saknas."
-
-#: src/SlideshowPage.vala:269
-msgid "Play"
-msgstr "Spela upp"
-
-#: src/SlideshowPage.vala:270
-msgid "Continue the slideshow"
-msgstr "Fortsätt bildspelet"
-
-#: src/Commands.vala:733
-msgid "Reverting"
-msgstr "Återställer"
-
-#: src/Commands.vala:733
-msgid "Undoing Revert"
-msgstr "Ångrar återställning"
-
-#: src/Commands.vala:777
-msgid "Enhancing"
-msgstr "Förbättrar"
-
-#: src/Commands.vala:777
-msgid "Undoing Enhance"
-msgstr "Ångrar förbättring"
-
-#: src/Commands.vala:845
-msgid "Applying Color Transformations"
-msgstr ""
-
-#: src/Commands.vala:845
-msgid "Undoing Color Transformations"
-msgstr ""
-
-#: src/Commands.vala:995
-msgid "Creating New Event"
-msgstr "Skapar ny händelse"
-
-#: src/Commands.vala:996
-msgid "Removing Event"
-msgstr "Tar bort händelse"
-
-#: src/Commands.vala:1005
-msgid "Moving Photos to New Event"
-msgstr "Flyttar bilder till ny händelse"
-
-#: src/Commands.vala:1006
-msgid "Setting Photos to Previous Event"
-msgstr "Ställer in bilder till föregående händelse"
-
-#: src/Commands.vala:1063
-msgid "Merging"
-msgstr "Slår ihop"
-
-#: src/Commands.vala:1064
-msgid "Unmerging"
-msgstr "Delar upp"
-
-#: src/Commands.vala:1073
-msgid "Duplicating photos"
-msgstr "Skapar kopior av bilderna"
-
-#: src/Commands.vala:1073
-msgid "Removing duplicated photos"
-msgstr "Raderar kopior på bilderna"
-
-#: src/Commands.vala:1096
-#, 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] "Kunde inte kopiera en bild på grund av en felaktig fil"
-msgstr[1] "Det gick inte kopiera %d bilderna på grund av  felaktiga filer"
-
-#: src/Commands.vala:1183
-msgid "Restoring previous rating"
-msgstr "Återställer tidigare betyg"
-
-#: src/Commands.vala:1193 src/Commands.vala:1194
-msgid "Increasing ratings"
-msgstr "Ökar betyg"
-
-#: src/Commands.vala:1193 src/Commands.vala:1194
-msgid "Decreasing ratings"
-msgstr "Sänker betyg"
-
-#: src/Commands.vala:1244
-msgid "Setting RAW developer"
-msgstr "Ställer in RAW-framkallare"
-
-#: src/Commands.vala:1244
-msgid "Restoring previous RAW developer"
-msgstr "Återställer tidigare RAW-framkallare"
-
-#: src/Commands.vala:1245
-msgid "Set Developer"
-msgstr "Bestäm utvecklare"
-
-#: src/Commands.vala:1335
-msgid "Original photo could not be adjusted."
-msgstr "Den ursprungliga bilden kunde inte justeras."
-
-#: src/Commands.vala:1356
-msgid "Adjusting Date and Time"
-msgstr "Justerar datum och tid"
-
-#: src/Commands.vala:1356
-msgid "Undoing Date and Time Adjustment"
-msgstr "Återställer justering för datum och tid"
-
-#: src/Commands.vala:1387
-msgid "One original photo could not be adjusted."
-msgid_plural "The following original photos could not be adjusted."
-msgstr[0] "Den ursprungliga bilden kunde inte anpassas."
-msgstr[1] "Följande ursprungliga bilder kunde inte anpassas."
-
-#: src/Commands.vala:1389 src/Commands.vala:1413
-msgid "Time Adjustment Error"
-msgstr "Anpassning av tidsfel"
-
-#: src/Commands.vala:1411
-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] "Tidsanpassningen kunde inte återställas för den här bilden."
-msgstr[1] "Tidsanpassningen kunde inte återställas för följande bilder."
-
-#: src/Commands.vala:1625 src/Commands.vala:1648
-msgid "Create Tag"
-msgstr "Skapa etikett"
-
-#: src/Commands.vala:1683
-#, c-format
-msgid "Move Tag \"%s\""
-msgstr "Flytta etiketten \"%s\""
-
-#: src/Commands.vala:2335
-msgid "Move Photos to Trash"
-msgstr "Flytta bilder till papperskorgen"
-
-#: src/Commands.vala:2335
-msgid "Restore Photos from Trash"
-msgstr "Återställ bilder från papperskorgen"
-
-#: src/Commands.vala:2336
-msgid "Move the photos to the Shotwell trash"
-msgstr "Flytta bilderna till Shotwells papperskorg"
-
-#: src/Commands.vala:2336
-msgid "Restore the photos back to the Shotwell library"
-msgstr "Återställ bilder tillbaka till Shotwell-biblioteket"
-
-#: src/Commands.vala:2355
-msgid "Moving Photos to Trash"
-msgstr "Flyttar bilder till papperskorgen"
-
-#: src/Commands.vala:2355
-msgid "Restoring Photos From Trash"
-msgstr "Återställer bilderna från papperskorgen"
-
-#: src/Commands.vala:2441
-msgid "Flag selected photos"
-msgstr "Märk markerade bilder"
-
-#: src/Commands.vala:2442
-msgid "Unflag selected photos"
-msgstr "Återställ märkningen för markerade bilder"
-
-#: src/Commands.vala:2443
-msgid "Flagging selected photos"
-msgstr ""
-
-#: src/Commands.vala:2444
-msgid "Unflagging selected photos"
-msgstr ""
-
-#: src/Commands.vala:2451
-msgid "Flag"
-msgstr "Märk"
-
-#: src/Commands.vala:2451
-msgid "Unflag"
-msgstr "Återställ märkningen"
-
-#: src/photos/RawSupport.vala:134
-msgid "RAW"
-msgstr "RAW"
-
-#: src/photos/RawSupport.vala:297 src/MediaPage.vala:420
-msgid "Shotwell"
-msgstr "Shotwell"
-
-#: src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr "BMP"
-
-#: src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
-
-#: src/photos/JfifSupport.vala:182
-#, c-format
-msgid "Low (%d%%)"
-msgstr "Låg (%d%%)"
-
-#: src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "Mellan (%d%%)"
-
-#: src/photos/JfifSupport.vala:188
-#, c-format
-msgid "High (%d%%)"
-msgstr "Hög (%d%%)"
-
-#: src/photos/JfifSupport.vala:191
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "Maximal (%d%%)"
-
-#: src/photos/PngSupport.vala:30
-msgid "PNG"
-msgstr "PNG"
-
-#: src/photos/TiffSupport.vala:86
-msgid "TIFF"
-msgstr "TIFF"
-
-#: src/Page.vala:1268
-msgid "No photos/videos"
-msgstr "Inga bilder eller filmer"
-
-#: src/Page.vala:1272
-msgid "No photos/videos found"
-msgstr "Inga bilder eller filmer hittades"
-
-#: src/Page.vala:2569
-msgid "Photos cannot be exported to this directory."
-msgstr "Bilderna kan inte exporteras till denna mapp."
-
-#: src/MediaMonitor.vala:400
-#, c-format
-msgid "Unable to process monitoring updates: %s"
-msgstr "Kunde inte behandla övervakningsuppdateringar: %s"
-
-#: src/Printing.vala:255
+#: ../src/Printing.vala:255
 msgid "Fill the entire page"
 msgstr "Fyll hela sidan"
 
-#: src/Printing.vala:256
+#: ../src/Printing.vala:256
 msgid "2 images per page"
 msgstr "Två bilder per sida"
 
-#: src/Printing.vala:257
+#: ../src/Printing.vala:257
 msgid "4 images per page"
 msgstr "Fyra bilder per sida"
 
-#: src/Printing.vala:258
+#: ../src/Printing.vala:258
 msgid "6 images per page"
 msgstr "Sex bilder per sida"
 
-#: src/Printing.vala:259
+#: ../src/Printing.vala:259
 msgid "8 images per page"
 msgstr "Åtta bilder per sida"
 
-#: src/Printing.vala:260
+#: ../src/Printing.vala:260
 msgid "16 images per page"
 msgstr "16 bilder per sida"
 
-#: src/Printing.vala:261
+#: ../src/Printing.vala:261
 msgid "32 images per page"
 msgstr "32 bilder per sida"
 
-#: src/Printing.vala:348
+#: ../src/Printing.vala:348
 msgid "in."
 msgstr "tum"
 
-#: src/Printing.vala:349
+#: ../src/Printing.vala:349
 msgid "cm"
 msgstr "cm"
 
-#: src/Printing.vala:817 src/editing_tools/EditingTools.vala:757
+#: ../src/Printing.vala:817 ../src/editing_tools/EditingTools.vala:761
 msgid "Wallet (2 x 3 in.)"
 msgstr "Plånbokstorlek (2 x 3 tum)"
 
-#: src/Printing.vala:820 src/editing_tools/EditingTools.vala:758
+#: ../src/Printing.vala:820 ../src/editing_tools/EditingTools.vala:762
 msgid "Notecard (3 x 5 in.)"
 msgstr "Anteckningskort (3 x 5 tum)"
 
-#: src/Printing.vala:823 src/editing_tools/EditingTools.vala:759
+#: ../src/Printing.vala:823 ../src/editing_tools/EditingTools.vala:763
 msgid "4 x 6 in."
 msgstr "4 x 6 tum"
 
-#: src/Printing.vala:826 src/editing_tools/EditingTools.vala:760
+#: ../src/Printing.vala:826 ../src/editing_tools/EditingTools.vala:764
 msgid "5 x 7 in."
 msgstr "5 x 7 tum"
 
-#: src/Printing.vala:829 src/editing_tools/EditingTools.vala:761
+#: ../src/Printing.vala:829 ../src/editing_tools/EditingTools.vala:765
 msgid "8 x 10 in."
 msgstr "8 x 10 tum"
 
-#: src/Printing.vala:832 src/editing_tools/EditingTools.vala:763
+#: ../src/Printing.vala:832 ../src/editing_tools/EditingTools.vala:767
 msgid "11 x 14 in."
 msgstr "11 x 14 tum"
 
-#: src/Printing.vala:835 src/editing_tools/EditingTools.vala:765
+#: ../src/Printing.vala:835 ../src/editing_tools/EditingTools.vala:769
 msgid "16 x 20 in."
 msgstr "16 x 20 tum"
 
-#: src/Printing.vala:841 src/editing_tools/EditingTools.vala:767
+#: ../src/Printing.vala:841 ../src/editing_tools/EditingTools.vala:771
 msgid "Metric Wallet (9 x 13 cm)"
 msgstr "Plånboksstorlek i centimeter (9 x 13 cm)"
 
-#: src/Printing.vala:844 src/editing_tools/EditingTools.vala:768
+#: ../src/Printing.vala:844 ../src/editing_tools/EditingTools.vala:772
 msgid "Postcard (10 x 15 cm)"
 msgstr "Vykortsstorlek (10 x 15 cm)"
 
-#: src/Printing.vala:847 src/editing_tools/EditingTools.vala:769
+#: ../src/Printing.vala:847 ../src/editing_tools/EditingTools.vala:773
 msgid "13 x 18 cm"
 msgstr "13 x 18 cm"
 
-#: src/Printing.vala:850 src/editing_tools/EditingTools.vala:770
+#: ../src/Printing.vala:850 ../src/editing_tools/EditingTools.vala:774
 msgid "18 x 24 cm"
 msgstr "18 x 24 cm"
 
-#: src/Printing.vala:853 src/editing_tools/EditingTools.vala:772
+#: ../src/Printing.vala:853 ../src/editing_tools/EditingTools.vala:776
 msgid "20 x 30 cm"
 msgstr "20 x 30 cm"
 
-#: src/Printing.vala:856 src/editing_tools/EditingTools.vala:773
+#: ../src/Printing.vala:856 ../src/editing_tools/EditingTools.vala:777
 msgid "24 x 40 cm"
 msgstr "24 x 40 cm"
 
-#: src/Printing.vala:859 src/editing_tools/EditingTools.vala:774
+#: ../src/Printing.vala:859 ../src/editing_tools/EditingTools.vala:778
 msgid "30 x 40 cm"
 msgstr "30 x 40 cm"
 
-#: src/Printing.vala:875
+#: ../src/Printing.vala:875
 msgid "Image Settings"
 msgstr "Bildinställningar"
 
-#: src/Printing.vala:888
+#: ../src/Printing.vala:888
 msgid "Printing..."
 msgstr "Skriver ut..."
 
-#: src/Printing.vala:908 src/Printing.vala:1111
+#: ../src/Printing.vala:908 ../src/Printing.vala:1111
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -2106,1529 +2774,1931 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
-msgstr "Kunde inte öppna eller skapa bilddatabasen %s: error code %d"
+#: ../src/Properties.vala:84
+msgid "Today"
+msgstr "Idag"
 
-#: src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
-msgstr ""
-"Kunde inte skriva till bilddatabasfilen:\n"
-" %s"
+#: ../src/Properties.vala:86
+msgid "Yesterday"
+msgstr "Igår"
 
-#: src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
-msgstr ""
-"Fel vid åtkomst till databasfilen:\n"
-" %s\n"
-"\n"
-"Felet var: \n"
-"%s"
+#: ../src/Properties.vala:227 ../src/camera/ImportPage.vala:312
+msgid "RAW+JPEG"
+msgstr "RAW+JPEG"
 
-#: src/VideoSupport.vala:464
-msgid "Export Videos"
-msgstr "Exportera filmer"
+#: ../src/Properties.vala:343
+msgid "Items:"
+msgstr "Objekt:"
 
-#: src/DesktopIntegration.vala:118
+#: ../src/Properties.vala:346
 #, c-format
-msgid "Unable to launch Nautilus Send-To: %s"
-msgstr "Kunde inte starta Nautilus Send-To: %s"
-
-#: src/DesktopIntegration.vala:126
-msgid "Send To"
-msgstr "Skicka till"
+msgid "%d Event"
+msgid_plural "%d Events"
+msgstr[0] "%d händelse"
+msgstr[1] "%d händelser"
 
-#: src/DesktopIntegration.vala:171
+#: ../src/Properties.vala:353 ../src/events/EventDirectoryItem.vala:87
 #, c-format
-msgid "Unable to export background to %s: %s"
-msgstr "Kunde inte exportera bakgrund till %s: %s"
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] "%d bild"
+msgstr[1] "%d bilder"
 
-#: src/DesktopIntegration.vala:299
+#: ../src/Properties.vala:355 ../src/events/EventDirectoryItem.vala:85
 #, c-format
-msgid "Unable to prepare desktop slideshow: %s"
-msgstr "Kunde inte förbereda skrivbordsbildspel: %s"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:587
-#: src/SearchFilter.vala:588 src/SearchFilter.vala:990
-msgid "Flagged"
-msgstr "Flaggad"
-
-#: src/library/TrashPage.vala:8
-msgid "Trash"
-msgstr "Papperskorg"
-
-#: src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "Papperskorgen är tom"
-
-#: src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "Radera"
-
-#: src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-msgstr "Raderar bilder"
-
-#: src/library/OfflinePage.vala:8
-msgid "Missing Files"
-msgstr "Saknade filer"
-
-#: src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "Raderar..."
-
-#: src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "Senaste import"
-
-#: src/library/LibraryWindow.vala:301
-msgid "_Import From Folder..."
-msgstr "_Importera från mapp..."
-
-#: src/library/LibraryWindow.vala:302
-msgid "Import photos from disk to library"
-msgstr "Importera bilder från hårddisken till biblioteket"
-
-#: src/library/LibraryWindow.vala:309
-msgid "Import From _Application..."
-msgstr "Importera från _program..."
-
-#: src/library/LibraryWindow.vala:313
-msgid "Sort _Events"
-msgstr "_Sortera händelser"
-
-#: src/library/LibraryWindow.vala:323
-msgid "Empty T_rash"
-msgstr "_Töm papperskorgen"
-
-#: src/library/LibraryWindow.vala:324
-msgid "Delete all photos in the trash"
-msgstr "Radera alla bilder från papperskorgen"
-
-#: src/library/LibraryWindow.vala:329
-msgid "View Eve_nt for Photo"
-msgstr "_Visa bildhändelse"
-
-#: src/library/LibraryWindow.vala:334
-msgid "_Find"
-msgstr "_Sök"
-
-#: src/library/LibraryWindow.vala:335
-msgid "Find photos and videos by search criteria"
-msgstr "Sök efter bilder och filmer med sökordet"
-
-#: src/library/LibraryWindow.vala:352 src/direct/DirectPhotoPage.vala:46
-msgid "_File"
-msgstr "_Fil"
-
-#: src/library/LibraryWindow.vala:356 src/direct/DirectPhotoPage.vala:73
-msgid "_Edit"
-msgstr "_Redigera"
-
-#: src/library/LibraryWindow.vala:364 src/direct/DirectPhotoPage.vala:77
-msgid "_Photo"
-msgstr "_Bild"
-
-#: src/library/LibraryWindow.vala:368
-msgid "_Photos"
-msgstr "_Bilder"
-
-#: src/library/LibraryWindow.vala:372
-msgid "Even_ts"
-msgstr "_Händelser"
-
-#: src/library/LibraryWindow.vala:376 src/MediaPage.vala:454
-msgid "Ta_gs"
-msgstr "_Etiketter"
-
-#: src/library/LibraryWindow.vala:380 src/direct/DirectPhotoPage.vala:169
-msgid "_Help"
-msgstr "_Hjälp"
-
-#: src/library/LibraryWindow.vala:391
-msgid "_Basic Information"
-msgstr "_Grundläggande information"
-
-#: src/library/LibraryWindow.vala:392
-msgid "Display basic information for the selection"
-msgstr "Visa grundläggande information för markeringen"
-
-#: src/library/LibraryWindow.vala:397
-msgid "E_xtended Information"
-msgstr "_Utökad Information"
-
-#: src/library/LibraryWindow.vala:398
-msgid "Display extended information for the selection"
-msgstr "Visa utökad information för markeringen"
-
-#: src/library/LibraryWindow.vala:403
-msgid "_Search Bar"
-msgstr "_Sökfält"
-
-#: src/library/LibraryWindow.vala:404
-msgid "Display the search bar"
-msgstr "Visa sökfältet"
-
-#: src/library/LibraryWindow.vala:409
-msgid "S_idebar"
-msgstr "S_idofält"
-
-#: src/library/LibraryWindow.vala:410
-msgid "Display the sidebar"
-msgstr "Visa sidofältet"
-
-#: src/library/LibraryWindow.vala:422 src/MediaPage.vala:494
-msgid "_Ascending"
-msgstr "_Stigande"
-
-#: src/library/LibraryWindow.vala:423 src/MediaPage.vala:495
-msgid "Sort photos in an ascending order"
-msgstr "Sortera bilder i stigande ordning"
-
-#: src/library/LibraryWindow.vala:429 src/MediaPage.vala:500
-msgid "D_escending"
-msgstr "_Fallande"
-
-#: src/library/LibraryWindow.vala:430 src/MediaPage.vala:501
-msgid "Sort photos in a descending order"
-msgstr "Sortera bilder i fallande ordning"
+msgid "%d Video"
+msgid_plural "%d Videos"
+msgstr[0] "%d film"
+msgstr[1] "%d filemr"
 
-#: src/library/LibraryWindow.vala:668
-msgid "Import From Folder"
-msgstr "Importera från mapp"
+#. display only one date if start and end are the same
+#: ../src/Properties.vala:377
+msgid "Date:"
+msgstr "Datum:"
 
-#: src/library/LibraryWindow.vala:737
-msgid "Empty Trash"
-msgstr "Töm papperskorgen"
+#. display only one time if start and end are the same
+#: ../src/Properties.vala:381
+msgid "Time:"
+msgstr "Tid:"
 
-#: src/library/LibraryWindow.vala:737
-msgid "Emptying Trash..."
-msgstr "Tömmer papperskorgen..."
+#. display time range
+#. display date range
+#: ../src/Properties.vala:384 ../src/Properties.vala:389
+msgid "From:"
+msgstr "Från:"
 
-#: src/library/LibraryWindow.vala:896
-msgid "Shotwell is configured to import photos to your home directory.\n"
-msgstr "Shotwell har ställts in till att importera bilder till din hemmapp.\n"
+#: ../src/Properties.vala:385 ../src/Properties.vala:390
+msgid "To:"
+msgstr "Till:"
 
-#: src/library/LibraryWindow.vala:899
-msgid "Library Location"
-msgstr "Biblioteksplats"
+#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1890
+msgid "Size:"
+msgstr "Storlek:"
 
-#: src/library/LibraryWindow.vala:912
-msgid "Photos cannot be imported from this directory."
-msgstr "Bilder kan inte importeras från denna mapp."
+#: ../src/Properties.vala:404
+msgid "Duration:"
+msgstr "Speltid:"
 
-#: src/library/LibraryWindow.vala:1200
+#: ../src/Properties.vala:404
 #, c-format
-msgid "%s (%d%%)"
-msgstr "%s (%d%%)"
-
-#: src/library/LibraryWindow.vala:1244 src/library/LibraryWindow.vala:1255
-msgid "Updating library..."
-msgstr "Uppdaterar biblioteket..."
-
-#: src/library/LibraryWindow.vala:1261
-msgid "Preparing to auto-import photos..."
-msgstr "Förbereder automatisk importer av bilder..."
-
-#: src/library/LibraryWindow.vala:1266
-msgid "Auto-importing photos..."
-msgstr "Importerar bilder automatiskt..."
-
-#: src/library/LibraryWindow.vala:1274
-msgid "Writing metadata to files..."
-msgstr "Skriver metadata till filer..."
-
-#: src/library/Branch.vala:37
-msgid "Library"
-msgstr "Bibliotek"
+msgid "%.1f seconds"
+msgstr "%.1f sekunder"
 
-#: src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "Importerar..."
+#: ../src/Properties.vala:408
+msgid "Developer:"
+msgstr "Framkallare:"
 
-#: src/library/ImportQueuePage.vala:66
-msgid "_Stop Import"
-msgstr "_Avbryt importen"
+#. fit both on the top line, emit and move on
+#: ../src/Properties.vala:436 ../src/Properties.vala:440
+#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2258
+msgid "Exposure:"
+msgstr "Exponering:"
 
-#: src/library/ImportQueuePage.vala:67
-msgid "Stop importing photos"
-msgstr "Stoppa bildimporten"
+#. nothing special to be done for now for Events
+#: ../src/Properties.vala:583
+msgid "Location:"
+msgstr "Plats:"
 
-#: src/library/ImportQueuePage.vala:123
-msgid "Preparing to import..."
-msgstr "Förbereder import..."
+#: ../src/Properties.vala:586
+msgid "File size:"
+msgstr "Filstorlek:"
 
-#: src/library/ImportQueuePage.vala:150
-#, c-format
-msgid "Imported %s"
-msgstr "Importerade %s"
+#: ../src/Properties.vala:590
+msgid "Current Development:"
+msgstr "Nuvarande framkallare:"
 
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:413
-msgid "_Save"
-msgstr "_Spara"
+#: ../src/Properties.vala:592
+msgid "Original dimensions:"
+msgstr "Ursprungsstorlek:"
 
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Spara bild"
+#: ../src/Properties.vala:595
+msgid "Camera make:"
+msgstr "Kameratillverkare:"
 
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "_Spara som..."
+#: ../src/Properties.vala:598
+msgid "Camera model:"
+msgstr "Kameramodell:"
 
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Spara bilden med ett annat namn"
+#: ../src/Properties.vala:601
+msgid "Flash:"
+msgstr "Blixt:"
 
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Skriv ut bilden till en skrivare ansluten till din dator"
+#: ../src/Properties.vala:603
+msgid "Focal length:"
+msgstr "Brännvidd:"
 
-#: src/direct/DirectPhotoPage.vala:223
-#, c-format
-msgid "%s does not exist."
-msgstr "%s finns inte."
+#: ../src/Properties.vala:606
+msgid "Exposure date:"
+msgstr "Exponeringsögonblick:"
 
-#: src/direct/DirectPhotoPage.vala:225
-#, c-format
-msgid "%s is not a file."
-msgstr "%s är inte en fil."
+#: ../src/Properties.vala:609
+msgid "Exposure time:"
+msgstr "Exponeringstid:"
 
-#: src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr ""
-"%s saknar stöd för filformatet för\n"
-"%s."
+#: ../src/Properties.vala:612
+msgid "Exposure bias:"
+msgstr "Exponeringskompensation:"
 
-#: src/direct/DirectPhotoPage.vala:413
-msgid "_Save a Copy"
-msgstr "_Spara en kopia"
+#: ../src/Properties.vala:614
+msgid "GPS latitude:"
+msgstr "GPS-latitud:"
 
-#: src/direct/DirectPhotoPage.vala:416
-#, c-format
-msgid "Lose changes to %s?"
-msgstr "Förkasta ändringarna i %s?"
+#: ../src/Properties.vala:617
+msgid "GPS longitude:"
+msgstr "GPS-longitud:"
 
-#: src/direct/DirectPhotoPage.vala:417
-msgid "Close _without Saving"
-msgstr "_Stäng utan att spara"
+#: ../src/Properties.vala:620
+msgid "Artist:"
+msgstr "Kostnär:"
 
-#: src/direct/DirectPhotoPage.vala:450
-#, c-format
-msgid "Error while saving to %s: %s"
-msgstr "Fel vid sparande till %s: %s"
+#: ../src/Properties.vala:622
+msgid "Copyright:"
+msgstr "Upphovsrätt:"
 
-#: src/direct/DirectPhotoPage.vala:478 src/direct/DirectPhotoPage.vala:499
-msgid "Save As"
-msgstr "Spara som"
+#: ../src/Properties.vala:624
+msgid "Software:"
+msgstr "Programvara:"
 
-#: src/DirectoryMonitor.vala:889
-#, c-format
-msgid "Unable to monitor %s: Not a directory (%s)"
-msgstr "Kunde inte övervaka %s: Det är inte en mapp (%s)"
+#: ../src/Properties.vala:639
+msgid "Extended Information"
+msgstr "Utökad information"
 
-#: src/Resources.vala:17
+#: ../src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Bildhanterare"
 
-#: src/Resources.vala:18
+#: ../src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Bildvisare"
 
-#: src/Resources.vala:27 plugins/shotwell-publishing/YouTubePublishing.vala:32
-#: plugins/shotwell-publishing/FlickrPublishing.vala:34
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:32
-#: plugins/shotwell-publishing/PicasaPublishing.vala:32
-#: plugins/shotwell-publishing/FacebookPublishing.vala:32
-#: plugins/shotwell-data-imports/FSpotImporter.vala:34
-msgid "Copyright 2009-2013 Yorba Foundation"
-msgstr "Copyright 2009-2013 Yorba Foundation"
-
-#: src/Resources.vala:144
+#: ../src/Resources.vala:144
 msgid "Rotate _Right"
 msgstr "Rotera åt _höger"
 
-#: src/Resources.vala:145 src/Resources.vala:150
+#: ../src/Resources.vala:145 ../src/Resources.vala:150
 msgid "Rotate"
 msgstr "Rotera"
 
-#: src/Resources.vala:146
+#: ../src/Resources.vala:146
 msgid "Rotate Right"
 msgstr "Rotera åt höger"
 
-#: src/Resources.vala:147
+#: ../src/Resources.vala:147
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Rotera bilderna åt höger (tryck Ctrl för att rotera åt vänster)"
 
-#: src/Resources.vala:149
+#: ../src/Resources.vala:149
 msgid "Rotate _Left"
 msgstr "Rotera åt _vänster"
 
-#: src/Resources.vala:151
+#: ../src/Resources.vala:151
 msgid "Rotate Left"
 msgstr "Rotera åt vänster"
 
-#: src/Resources.vala:152
+#: ../src/Resources.vala:152
 msgid "Rotate the photos left"
 msgstr "Rotera bilderna åt vänster"
 
-#: src/Resources.vala:154
+#: ../src/Resources.vala:154
 msgid "Flip Hori_zontally"
 msgstr "Vänd hor_isontellt"
 
-#: src/Resources.vala:155
+#: ../src/Resources.vala:155
 msgid "Flip Horizontally"
 msgstr "Vänd horisontellt"
 
-#: src/Resources.vala:157
+#: ../src/Resources.vala:157
 msgid "Flip Verti_cally"
 msgstr "Vänd verti_kalt"
 
-#: src/Resources.vala:158
+#: ../src/Resources.vala:158
 msgid "Flip Vertically"
 msgstr "Vänd vertikalt"
 
-#: src/Resources.vala:160
+#: ../src/Resources.vala:160
+msgid "_About"
+msgstr "_Om"
+
+#: ../src/Resources.vala:161
+msgid "_Apply"
+msgstr ""
+
+#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
+#: ../src/library/LibraryWindow.vala:355
+msgid "_Edit"
+msgstr "_Redigera"
+
+#: ../src/Resources.vala:165
+#, fuzzy
+#| msgid "_Format:"
+msgid "_Forward"
+msgstr "_Format:"
+
+#: ../src/Resources.vala:166
+msgid "Fulls_creen"
+msgstr "_Helskärm"
+
+#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
+#: ../src/library/LibraryWindow.vala:379
+msgid "_Help"
+msgstr "_Hjälp"
+
+#: ../src/Resources.vala:168
+msgid "Leave _Fullscreen"
+msgstr "Avsluta _helskärmsläge"
+
+#: ../src/Resources.vala:169 ../src/Resources.vala:371
+msgid "_New"
+msgstr "_Nytt"
+
+#: ../src/Resources.vala:170
+#, fuzzy
+#| msgid "Next"
+msgid "_Next"
+msgstr "Nästa"
+
+#: ../src/Resources.vala:171
+msgid "_OK"
+msgstr ""
+
+#: ../src/Resources.vala:172
+#, fuzzy
+#| msgid "Play"
+msgid "_Play"
+msgstr "Spela upp"
+
+#: ../src/Resources.vala:173 ../src/Resources.vala:325
+msgid "_Preferences"
+msgstr "_Inställningar"
+
+#: ../src/Resources.vala:174
+#, fuzzy
+#| msgid "_Previous Photo"
+msgid "_Previous"
+msgstr "_Föregående bild"
+
+#: ../src/Resources.vala:175
+#, fuzzy
+#| msgid "_Print..."
+msgid "_Print"
+msgstr "Skriv _ut..."
+
+#: ../src/Resources.vala:176
+msgid "_Quit"
+msgstr "_Avsluta"
+
+#: ../src/Resources.vala:177
+msgid "_Refresh"
+msgstr ""
+
+#: ../src/Resources.vala:179
+#, fuzzy
+#| msgid "Reverting"
+msgid "_Revert"
+msgstr "Återställer"
+
+#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save"
+msgstr "_Spara"
+
+#: ../src/Resources.vala:181
+#, fuzzy
+#| msgid "Save As"
+msgid "Save _As"
+msgstr "Spara som"
+
+#: ../src/Resources.vala:182
+#, fuzzy
+#| msgid "_Ascending"
+msgid "Sort _Ascending"
+msgstr "_Stigande"
+
+#: ../src/Resources.vala:183
+#, fuzzy
+#| msgid "D_escending"
+msgid "Sort _Descending"
+msgstr "_Fallande"
+
+#: ../src/Resources.vala:184
+msgid "_Stop"
+msgstr ""
+
+#: ../src/Resources.vala:185
+#, fuzzy
+#| msgid "_Delete"
+msgid "_Undelete"
+msgstr "_Radera"
+
+#: ../src/Resources.vala:186
+#, fuzzy
+#| msgid "Original Size"
+msgid "_Normal Size"
+msgstr "Ursprungsstorlek"
+
+#: ../src/Resources.vala:187
+msgid "Best _Fit"
+msgstr ""
+
+#: ../src/Resources.vala:191
 msgid "_Enhance"
 msgstr "Förbä_ttra"
 
-#: src/Resources.vala:161
+#: ../src/Resources.vala:192
 msgid "Enhance"
 msgstr "Förbättra"
 
-#: src/Resources.vala:162
+#: ../src/Resources.vala:193
 msgid "Automatically improve the photo's appearance"
 msgstr "Förbättra visningen av bilden automatiskt"
 
-#: src/Resources.vala:164
+#: ../src/Resources.vala:195
 msgid "_Copy Color Adjustments"
 msgstr ""
 
-#: src/Resources.vala:165
+#: ../src/Resources.vala:196
 msgid "Copy Color Adjustments"
 msgstr ""
 
-#: src/Resources.vala:166
+#: ../src/Resources.vala:197
 msgid "Copy the color adjustments applied to the photo"
 msgstr ""
 
-#: src/Resources.vala:168
+#: ../src/Resources.vala:199
 msgid "_Paste Color Adjustments"
 msgstr ""
 
-#: src/Resources.vala:169
+#: ../src/Resources.vala:200
 msgid "Paste Color Adjustments"
 msgstr ""
 
-#: src/Resources.vala:170
+#: ../src/Resources.vala:201
 msgid "Apply copied color adjustments to the selected photos"
 msgstr ""
 
-#: src/Resources.vala:172
+#: ../src/Resources.vala:203
 msgid "_Crop"
 msgstr "_Beskär"
 
-#: src/Resources.vala:173
+#: ../src/Resources.vala:204
 msgid "Crop"
 msgstr "Beskär"
 
-#: src/Resources.vala:174
+#: ../src/Resources.vala:205
 msgid "Crop the photo's size"
 msgstr "Beskär bildstorlek"
 
-#: src/Resources.vala:176 src/editing_tools/StraightenTool.vala:100
+#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
 msgid "_Straighten"
 msgstr "_Räta upp"
 
-#: src/Resources.vala:177
+#: ../src/Resources.vala:208
 msgid "Straighten"
 msgstr "Räta upp"
 
-#: src/Resources.vala:178
+#: ../src/Resources.vala:209
 msgid "Straighten the photo"
 msgstr "Räta upp bilden"
 
-#: src/Resources.vala:180
+#: ../src/Resources.vala:211
 msgid "_Red-eye"
 msgstr "_Röda ögon"
 
-#: src/Resources.vala:181
+#: ../src/Resources.vala:212
 msgid "Red-eye"
 msgstr "Röda ögon"
 
-#: src/Resources.vala:182
+#: ../src/Resources.vala:213
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Minska eller ta bort röda ögon i bilden"
 
-#: src/Resources.vala:184
+#: ../src/Resources.vala:215
 msgid "_Adjust"
 msgstr "_Justera"
 
-#: src/Resources.vala:185
+#: ../src/Resources.vala:216
 msgid "Adjust"
 msgstr "Justera"
 
-#: src/Resources.vala:186
+#: ../src/Resources.vala:217
 msgid "Adjust the photo's color and tone"
 msgstr "Justera bildfärg och -ton"
 
-#: src/Resources.vala:188
+#: ../src/Resources.vala:219
 msgid "Re_vert to Original"
 msgstr "_Återställ till original"
 
-#: src/Resources.vala:189
+#: ../src/Resources.vala:220
 msgid "Revert to Original"
 msgstr "Återställ till original"
 
-#: src/Resources.vala:191
+#: ../src/Resources.vala:222
 msgid "Revert External E_dits"
 msgstr "Återställ externa r_edigeringar"
 
-#: src/Resources.vala:192
+#: ../src/Resources.vala:223
 msgid "Revert to the master photo"
 msgstr "Återställ till huvudbild"
 
-#: src/Resources.vala:194
+#: ../src/Resources.vala:225
 msgid "Set as _Desktop Background"
 msgstr "Ange som skrivbords_bakgrund"
 
-#: src/Resources.vala:195
+#: ../src/Resources.vala:226
 msgid "Set selected image to be the new desktop background"
 msgstr "Ställ in bilden som ny skrivbordsbakgrund"
 
-#: src/Resources.vala:196
+#: ../src/Resources.vala:227
 msgid "Set as _Desktop Slideshow..."
 msgstr "_Ställ in som skrivbordsbildspel"
 
-#: src/Resources.vala:198
+#: ../src/Resources.vala:229
 msgid "_Undo"
 msgstr "_Ångra"
 
-#: src/Resources.vala:199
+#: ../src/Resources.vala:230
 msgid "Undo"
 msgstr "Ångra"
 
-#: src/Resources.vala:201
+#: ../src/Resources.vala:232
 msgid "_Redo"
 msgstr "_Gör om"
 
-#: src/Resources.vala:202
+#: ../src/Resources.vala:233
 msgid "Redo"
 msgstr "Gör om"
 
-#: src/Resources.vala:204
+#: ../src/Resources.vala:235
 msgid "Re_name Event..."
 msgstr "B_yt namn på händelse..."
 
-#: src/Resources.vala:207
+#: ../src/Resources.vala:238
 msgid "Make _Key Photo for Event"
 msgstr "Gör till _huvudbild för händelsen"
 
-#: src/Resources.vala:208
+#: ../src/Resources.vala:239
 msgid "Make Key Photo for Event"
 msgstr "Gör till huvudbild för händelsen"
 
-#: src/Resources.vala:210
+#: ../src/Resources.vala:241
 msgid "_New Event"
 msgstr "_Ny händelse"
 
-#: src/Resources.vala:211
+#: ../src/Resources.vala:242
 msgid "New Event"
 msgstr "Ny händelse"
 
-#: src/Resources.vala:213
+#: ../src/Resources.vala:244
 msgid "Move Photos"
 msgstr "Flytta bilder"
 
-#: src/Resources.vala:214
+#: ../src/Resources.vala:245
 msgid "Move photos to an event"
 msgstr "Flytta bilder till en händelse"
 
-#: src/Resources.vala:216
+#: ../src/Resources.vala:247
 msgid "_Merge Events"
 msgstr "Sa_mmanfoga händelser"
 
-#: src/Resources.vala:217
+#: ../src/Resources.vala:248
 msgid "Merge"
 msgstr "Sammanfoga"
 
-#: src/Resources.vala:218
+#: ../src/Resources.vala:249
 msgid "Combine events into a single event"
 msgstr "Lägg samman händelser till en enskild händelse"
 
-#: src/Resources.vala:220
+#: ../src/Resources.vala:251
 msgid "_Set Rating"
 msgstr "_Sätt betyg"
 
-#: src/Resources.vala:221
+#: ../src/Resources.vala:252
 msgid "Set Rating"
 msgstr "Sätt betyg"
 
-#: src/Resources.vala:222
+#: ../src/Resources.vala:253
 msgid "Change the rating of your photo"
 msgstr "Ändra betyget för din bild"
 
-#: src/Resources.vala:224
+#: ../src/Resources.vala:255
 msgid "_Increase"
 msgstr "_Höj"
 
-#: src/Resources.vala:225
+#: ../src/Resources.vala:256
 msgid "Increase Rating"
 msgstr "Höj betyg"
 
-#: src/Resources.vala:227
+#: ../src/Resources.vala:258
 msgid "_Decrease"
 msgstr "_Sänk"
 
-#: src/Resources.vala:228
+#: ../src/Resources.vala:259
 msgid "Decrease Rating"
 msgstr "Sänk betyg"
 
-#: src/Resources.vala:230
+#: ../src/Resources.vala:261
 msgid "_Unrated"
 msgstr "_Ej betygsatt"
 
-#: src/Resources.vala:231
+#: ../src/Resources.vala:262
 msgid "Unrated"
 msgstr "Ej betygsatt"
 
-#: src/Resources.vala:232
+#: ../src/Resources.vala:263
 msgid "Rate Unrated"
 msgstr "Ej betygsatt"
 
-#: src/Resources.vala:233
+#: ../src/Resources.vala:264
 msgid "Setting as unrated"
 msgstr "Ställer in som ej betygsatt"
 
-#: src/Resources.vala:234
+#: ../src/Resources.vala:265
 msgid "Remove any ratings"
 msgstr "Ta bort eventuella betyg"
 
-#: src/Resources.vala:236
+#: ../src/Resources.vala:267
 msgid "_Rejected"
 msgstr "_Förkastad"
 
-#: src/Resources.vala:237
+#: ../src/Resources.vala:268
 msgid "Rejected"
 msgstr "Avfärdad"
 
-#: src/Resources.vala:238
+#: ../src/Resources.vala:269
 msgid "Rate Rejected"
 msgstr "Ange som förkastad"
 
-#: src/Resources.vala:239
+#: ../src/Resources.vala:270
 msgid "Setting as rejected"
 msgstr "Ställer in som förkastad"
 
-#: src/Resources.vala:240
+#: ../src/Resources.vala:271
 msgid "Set rating to rejected"
 msgstr "Ange som förkastad"
 
-#: src/Resources.vala:242
+#: ../src/Resources.vala:273
 msgid "Rejected _Only"
 msgstr "_Enbart förkastade"
 
-#: src/Resources.vala:243
+#: ../src/Resources.vala:274
 msgid "Rejected Only"
 msgstr "Enbart nekade"
 
-#: src/Resources.vala:244
+#: ../src/Resources.vala:275
 msgid "Show only rejected photos"
 msgstr "Visa enbart förkastade bilder"
 
-#: src/Resources.vala:246
+#: ../src/Resources.vala:277
 msgid "All + _Rejected"
 msgstr "Alla + _förkastade"
 
-#: src/Resources.vala:247 src/Resources.vala:248
+#: ../src/Resources.vala:278 ../src/Resources.vala:279
 msgid "Show all photos, including rejected"
 msgstr "Visa alla bilder, inklusive förkastade"
 
-#: src/Resources.vala:250
+#: ../src/Resources.vala:281
 msgid "_All Photos"
 msgstr "_Alla bilder"
 
-#: src/Resources.vala:251 src/Resources.vala:252
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:283 ../src/Resources.vala:285
 msgid "Show all photos"
 msgstr "Visa alla bilder"
 
-#: src/Resources.vala:254
+#: ../src/Resources.vala:287
 msgid "_Ratings"
 msgstr "_Betyg"
 
-#: src/Resources.vala:255
+#: ../src/Resources.vala:288
 msgid "Display each photo's rating"
 msgstr "Visa betyg för varje bild"
 
-#: src/Resources.vala:257
+#: ../src/Resources.vala:290
 msgid "_Filter Photos"
 msgstr "_Filtrera bilder"
 
-#: src/Resources.vala:258
+#: ../src/Resources.vala:291
 msgid "Filter Photos"
 msgstr "Filtrera bilder"
 
-#: src/Resources.vala:259
+#: ../src/Resources.vala:292
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Begränsa antalet bilder som visas baserat på ett filter"
 
-#: src/Resources.vala:261
+#: ../src/Resources.vala:294
 msgid "_Duplicate"
 msgstr "_Duplicera"
 
-#: src/Resources.vala:262
+#: ../src/Resources.vala:295
 msgid "Duplicate"
 msgstr "Duplicera"
 
-#: src/Resources.vala:263
+#: ../src/Resources.vala:296
 msgid "Make a duplicate of the photo"
 msgstr "Gör en kopia av bilden"
 
-#: src/Resources.vala:265
+#: ../src/Resources.vala:298
 msgid "_Export..."
 msgstr "_Exportera..."
 
-#: src/Resources.vala:267
+#: ../src/Resources.vala:300
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: src/Resources.vala:269
+#: ../src/Resources.vala:302
 msgid "Pu_blish..."
 msgstr "Pu_blicera..."
 
-#: src/Resources.vala:270
-msgid "Publish"
-msgstr "Publicera"
-
-#: src/Resources.vala:271
+#: ../src/Resources.vala:304
 msgid "Publish to various websites"
 msgstr "Publicera till olika webbplatser"
 
-#: src/Resources.vala:273
+#: ../src/Resources.vala:306
 msgid "Edit _Title..."
 msgstr "Redigera _titel..."
 
-#: src/Resources.vala:276
+#: ../src/Resources.vala:310
 msgid "Edit _Comment..."
 msgstr "Redigera _kommentar..."
 
-#: src/Resources.vala:277
+#. Button label
+#: ../src/Resources.vala:312
 msgid "Edit Comment"
 msgstr "Redigera kommentar"
 
-#: src/Resources.vala:279
+#: ../src/Resources.vala:314
 msgid "Edit Event _Comment..."
 msgstr ""
 
-#: src/Resources.vala:282
+#: ../src/Resources.vala:317
 msgid "_Adjust Date and Time..."
 msgstr "_Justera datum och tid..."
 
-#: src/Resources.vala:283
+#: ../src/Resources.vala:318
 msgid "Adjust Date and Time"
 msgstr "Justera datum och tid"
 
-#: src/Resources.vala:285
+#: ../src/Resources.vala:320
 msgid "Add _Tags..."
 msgstr "Lägg till _etiketter..."
 
-#: src/Resources.vala:286
+#: ../src/Resources.vala:321
 msgid "_Add Tags..."
 msgstr "_Lägg till etiketter"
 
-#: src/Resources.vala:287 src/Resources.vala:318
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:323 ../src/Resources.vala:356
 msgid "Add Tags"
 msgstr "Lägg till etiketter"
 
-#: src/Resources.vala:289
-msgid "_Preferences"
-msgstr "_Inställningar"
-
-#: src/Resources.vala:291
+#: ../src/Resources.vala:327
 msgid "Open With E_xternal Editor"
 msgstr "Öppna med e_xtern redigerare"
 
-#: src/Resources.vala:293
+#: ../src/Resources.vala:329
 msgid "Open With RA_W Editor"
 msgstr "Öppna i RA_W-redigerare"
 
-#: src/Resources.vala:295
+#: ../src/Resources.vala:331
 msgid "Send _To..."
 msgstr "Skicka _till..."
 
-#: src/Resources.vala:296
+#: ../src/Resources.vala:332
 msgid "Send T_o..."
 msgstr "Skicka _till..."
 
-#: src/Resources.vala:298
+#: ../src/Resources.vala:334
 msgid "_Find..."
 msgstr "_Sök..."
 
-#: src/Resources.vala:299
+#: ../src/Resources.vala:335
 msgid "Find"
 msgstr "Sök"
 
-#: src/Resources.vala:300
+#: ../src/Resources.vala:336
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Sök efter en bild genom att skriva något som finns i dess namn eller etikett"
 
-#: src/Resources.vala:302
+#: ../src/Resources.vala:338
 msgid "_Flag"
 msgstr "_Flagga"
 
-#: src/Resources.vala:304
+#: ../src/Resources.vala:340
 msgid "Un_flag"
 msgstr "Avf_lagga"
 
-#: src/Resources.vala:307
+#: ../src/Resources.vala:343
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Kunde inte starta redigerare: %s"
 
-#: src/Resources.vala:312
+#: ../src/Resources.vala:348
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "Lägg till etiketten \"%s\""
 
-#: src/Resources.vala:314
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:351
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "Lägg till etiketterna \"%s\" och \"%s\""
 
-#: src/Resources.vala:322
+#: ../src/Resources.vala:361
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "_Ta bort etikett \"%s\""
 
-#: src/Resources.vala:326
+#: ../src/Resources.vala:365
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "Ta bort etiketten \"%s\""
 
-#: src/Resources.vala:329
+#: ../src/Resources.vala:368
 msgid "Delete Tag"
 msgstr "Ta bort etikett"
 
-#: src/Resources.vala:332
-msgid "_New"
-msgstr "_Nytt"
-
-#: src/Resources.vala:335
+#: ../src/Resources.vala:374
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "B_yt namn på etiketten \"%s\"..."
 
-#: src/Resources.vala:339
+#: ../src/Resources.vala:378
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "Byt namn på etiketten \"%s\" till \"%s\""
 
-#: src/Resources.vala:342
+#: ../src/Resources.vala:381
 msgid "_Rename..."
 msgstr "_Byt namn..."
 
-#: src/Resources.vala:344
+#: ../src/Resources.vala:383
 msgid "Modif_y Tags..."
 msgstr "Än_dra etiketter..."
 
-#: src/Resources.vala:345
+#: ../src/Resources.vala:384
 msgid "Modify Tags"
 msgstr "Ändra etiketter"
 
-#: src/Resources.vala:348
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Lägg till etiketten \"%s\" till bilderna"
 
-#: src/Resources.vala:348
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Lägg till etiketten \"%s\" till bilderna"
 
-#: src/Resources.vala:352
+#: ../src/Resources.vala:391
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "Lägg till etiketten \"%s\" på de markerade bilderna"
 
-#: src/Resources.vala:353
+#: ../src/Resources.vala:392
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "Lägg till etiketten \"%s\" på de markerade bilderna"
 
-#: src/Resources.vala:357
+#: ../src/Resources.vala:396
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "Ta bort etiketten \"%s\" från bilderna"
 
-#: src/Resources.vala:358
+#: ../src/Resources.vala:397
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "Ta bort etiketten \"%s\" från bilderna"
 
-#: src/Resources.vala:362
+#: ../src/Resources.vala:401
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "Ta bort etiketten \"%s\" från bilderna"
 
-#: src/Resources.vala:363
+#: ../src/Resources.vala:402
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "Ta bort etiketten \"%s\" från bilderna"
 
-#: src/Resources.vala:367
+#: ../src/Resources.vala:406
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr "Kunde inte byta namn på etiketten till \"%s\". Etiketten finns redan."
 
-#: src/Resources.vala:371
+#: ../src/Resources.vala:410
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr ""
 "Kunde inte byta namn på sökningen till \"%s\" eftersom sökningen redan finns."
 
-#: src/Resources.vala:374
+#: ../src/Resources.vala:413
 msgid "Saved Search"
 msgstr "Sparad sökning"
 
-#: src/Resources.vala:376
+#: ../src/Resources.vala:415
 msgid "Delete Search"
 msgstr "Ta bort sökning"
 
-#: src/Resources.vala:379
+#: ../src/Resources.vala:418
 msgid "_Edit..."
 msgstr "R_edigera..."
 
-#: src/Resources.vala:380
+#: ../src/Resources.vala:419
 msgid "Re_name..."
 msgstr "Byt _namn..."
 
-#: src/Resources.vala:383
+#: ../src/Resources.vala:422
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "Byt namn på sökningen \"%s\" till \"%s\""
 
-#: src/Resources.vala:387
+#: ../src/Resources.vala:426
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "Ta bort sökningen \"%s\""
 
-#: src/Resources.vala:545
+#: ../src/Resources.vala:584
 #, c-format
 msgid "Rate %s"
 msgstr "Betyg %s"
 
-#: src/Resources.vala:546
+#: ../src/Resources.vala:585
 #, c-format
 msgid "Set rating to %s"
 msgstr "Sätt betyget %s"
 
-#: src/Resources.vala:547
+#: ../src/Resources.vala:586
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Sätt betyget till %s"
 
-#: src/Resources.vala:549
+#: ../src/Resources.vala:588
 #, c-format
 msgid "Display %s"
 msgstr "Visa %s"
 
-#: src/Resources.vala:550
+#: ../src/Resources.vala:589
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Visa endast bilder med betyget %s"
 
-#: src/Resources.vala:551
+#: ../src/Resources.vala:590
 #, c-format
 msgid "%s or Better"
 msgstr "%s eller högre"
 
-#: src/Resources.vala:552
+#: ../src/Resources.vala:591
 #, c-format
 msgid "Display %s or Better"
 msgstr "Visa %s eller högre"
 
-#: src/Resources.vala:553
+#: ../src/Resources.vala:592
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Visa endast bilder med betyget %s eller högre"
 
-#: src/Resources.vala:644
+#: ../src/Resources.vala:683
 msgid "Remove the selected photos from the trash"
 msgstr "Ta bort markerade bilder från papperskorgen"
 
-#: src/Resources.vala:645
+#: ../src/Resources.vala:684
 msgid "Remove the selected photos from the library"
 msgstr "Ta bort markerade bilder från biblioteket"
 
-#: src/Resources.vala:647
+#: ../src/Resources.vala:686
 msgid "_Restore"
 msgstr "Åt_erställ"
 
-#: src/Resources.vala:648
+#: ../src/Resources.vala:687
 msgid "Move the selected photos back into the library"
 msgstr "Flytta tillbaka markerade bilder till biblioteket"
 
-#: src/Resources.vala:650
+#: ../src/Resources.vala:689
 msgid "Show in File Mana_ger"
 msgstr "Öppna med filhanteraren"
 
-#: src/Resources.vala:651
+#: ../src/Resources.vala:690
 msgid "Open the selected photo's directory in the file manager"
 msgstr "Öppna mappen för den markerade bilden i filhanteraren"
 
-#: src/Resources.vala:654
+#: ../src/Resources.vala:693
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Kunde inte öppna i filhanterare: %s"
 
-#: src/Resources.vala:657
+#: ../src/Resources.vala:696
 msgid "R_emove From Library"
 msgstr "Ta _bort från biblioteket"
 
-#: src/Resources.vala:659
+#: ../src/Resources.vala:698
 msgid "_Move to Trash"
 msgstr "_Flytta till papperskorgen"
 
-#: src/Resources.vala:661
+#: ../src/Resources.vala:700
 msgid "Select _All"
 msgstr "Markera _alla"
 
-#: src/Resources.vala:662
+#: ../src/Resources.vala:701
 msgid "Select all items"
 msgstr "Markera alla objekt"
 
-#: src/Resources.vala:740
+#. ...precache the timestamp string...
+#. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:780
 msgid "%-I:%M %p"
 msgstr "%-I:%M %p"
 
-#: src/Resources.vala:741
+#. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:785
 msgid "%-I:%M:%S %p"
 msgstr "%-I:%M:%S %p"
 
-#: src/Resources.vala:742
+#. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:789
 msgid "%a %b %d, %Y"
 msgstr "%a %d %b, %Y"
 
-#: src/Resources.vala:743 src/Resources.vala:745
+#. / Locale-specific starting date format for multi-date strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#. / Locale-specific calendar date format for multi-month strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:794 ../src/Resources.vala:804
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: src/Resources.vala:744
+#. / Locale-specific ending date format for multi-date strings,
+#. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:799
 msgid "%d, %Y"
 msgstr "%d, %Y"
 
-#: src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr "Vinkel:"
+#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
+msgid "Slideshow"
+msgstr "Bildspel"
 
-#: src/editing_tools/StraightenTool.vala:102
-#: src/editing_tools/EditingTools.vala:2204
-msgid "_Reset"
-msgstr "Åt_erställ"
+#. Flagged label and toggle
+#: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
+#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
+msgid "Flagged"
+msgstr "Flaggad"
+
+#: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
+msgid "Photos"
+msgstr "Bilder"
+
+#: ../src/SearchFilter.vala:599 ../src/SearchFilter.vala:600
+msgid "Videos"
+msgstr "Filmer"
+
+#: ../src/SearchFilter.vala:605
+msgid "RAW Photos"
+msgstr "RAW-bilder"
+
+#: ../src/SearchFilter.vala:606
+msgid "RAW photos"
+msgstr "RAW-bilder"
+
+#: ../src/SearchFilter.vala:934
+#, c-format
+msgid "Error loading UI file %s: %s"
+msgstr "Fel vid inläsning av användargränssnittsfilen %s: %s"
+
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: ../src/SearchFilter.vala:945
+#, fuzzy
+#| msgid "_Close"
+msgid "Close"
+msgstr "S_täng"
+
+#. Type label and toggles
+#: ../src/SearchFilter.vala:951
+msgid "Type"
+msgstr "Typ"
+
+#. Rating label and button
+#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
+msgid "Rating"
+msgstr "Betyg"
+
+#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
+msgid "Settings"
+msgstr "Inställningar"
+
+#. Set up toolbar
+#. add toolbar buttons
+#: ../src/SlideshowPage.vala:160
+msgid "Back"
+msgstr "Bakåt"
+
+#: ../src/SlideshowPage.vala:162
+msgid "Go to the previous photo"
+msgstr "Gå till föregående bild"
+
+#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
+msgid "Pause"
+msgstr "Pausa"
+
+#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
+msgid "Pause the slideshow"
+msgstr "Pausa bildspelet"
+
+#: ../src/SlideshowPage.vala:174
+msgid "Next"
+msgstr "Nästa"
+
+#: ../src/SlideshowPage.vala:176
+msgid "Go to the next photo"
+msgstr "Gå till nästa bild"
+
+#: ../src/SlideshowPage.vala:184
+msgid "Change slideshow settings"
+msgstr "Ändra inställningar för bildspel"
+
+#. An entire slideshow set might be missing, so check for a loop.
+#: ../src/SlideshowPage.vala:238
+msgid "All photo source files are missing."
+msgstr "Alla källbildfiler saknas."
+
+#: ../src/SlideshowPage.vala:270
+msgid "Play"
+msgstr "Spela upp"
+
+#: ../src/SlideshowPage.vala:271
+msgid "Continue the slideshow"
+msgstr "Fortsätt bildspelet"
+
+#: ../src/Tag.vala:817
+msgid "untitled"
+msgstr "namnlös"
+
+#. multiple videos
+#: ../src/VideoSupport.vala:489
+msgid "Export Videos"
+msgstr "Exportera filmer"
+
+#: ../src/camera/Branch.vala:85
+msgid "Cameras"
+msgstr "Kameror"
 
-#: src/editing_tools/EditingTools.vala:661
+#: ../src/camera/ImportPage.vala:459
+msgid ""
+"Unable to unmount camera.  Try unmounting the camera from the file manager."
+msgstr ""
+"Kunde inte avmontera kameran.  Försök att avmontera kameran från "
+"filhanteraren."
+
+#. hide duplicates checkbox
+#: ../src/camera/ImportPage.vala:776
+msgid "Hide photos already imported"
+msgstr "Dölj bilder som redan importerats"
+
+#: ../src/camera/ImportPage.vala:777
+msgid "Only display photos that have not been imported"
+msgstr "Visa enbart bilder som inte har importerats"
+
+#. Ticket #3304 - Import page shouldn't display confusing message
+#. prior to import.
+#. TODO: replace this with approved text for "talking to camera,
+#. please wait" once new strings are being accepted.
+#: ../src/camera/ImportPage.vala:847
+msgid "Starting import, please wait..."
+msgstr "Påbörjar importen, var god vänta..."
+
+#: ../src/camera/ImportPage.vala:886
+msgid "Import _Selected"
+msgstr "Importera  _markerade"
+
+#: ../src/camera/ImportPage.vala:887
+msgid "Import the selected photos into your library"
+msgstr "Importera de valda bildera till ditt bibliotek"
+
+#: ../src/camera/ImportPage.vala:892
+msgid "Import _All"
+msgstr "Importera _alla"
+
+#: ../src/camera/ImportPage.vala:893
+msgid "Import all the photos into your library"
+msgstr "Importera alla bilder till ditt bibliotek"
+
+#. it's mounted, offer to unmount for the user
+#: ../src/camera/ImportPage.vala:1014
+msgid ""
+"Shotwell needs to unmount the camera from the filesystem in order to access "
+"it.  Continue?"
+msgstr ""
+"Shotwell behöver avmontera kameran från filsystemet för att kunna komma åt "
+"den. Vill du fortsätta?"
+
+#: ../src/camera/ImportPage.vala:1020
+msgid "_Unmount"
+msgstr "A_vmontera"
+
+#: ../src/camera/ImportPage.vala:1025
+msgid "Please unmount the camera."
+msgstr "Avmontera kameran."
+
+#: ../src/camera/ImportPage.vala:1030
+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 ""
+"Kameran är låst av ett annat program.  Shotwell kan endast komma åt kameran "
+"när den är olåst.  Stäng alla andra program som använder kameran och försök "
+"igen."
+
+#: ../src/camera/ImportPage.vala:1040
+msgid "Please close any other application using the camera."
+msgstr "Stäng alla andra program som använder kameran."
+
+#: ../src/camera/ImportPage.vala:1045
+#, c-format
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
+msgstr ""
+"Kunde inte hämta förhandsvisningar från kameran:\n"
+"%s"
+
+#: ../src/camera/ImportPage.vala:1062
+msgid "Unmounting..."
+msgstr "Avmonterar..."
+
+#: ../src/camera/ImportPage.vala:1168
+msgid "Fetching photo information"
+msgstr "Hämtar bildinformation"
+
+#: ../src/camera/ImportPage.vala:1523
+#, c-format
+msgid "Fetching preview for %s"
+msgstr "Hämtar förhandsvisning av %s"
+
+#: ../src/camera/ImportPage.vala:1639
+#, c-format
+msgid "Unable to lock camera: %s"
+msgstr "Kunde inte låsa kameran: %s"
+
+#: ../src/camera/ImportPage.vala:1724
+#, c-format
+msgid "Delete this photo from camera?"
+msgid_plural "Delete these %d photos from camera?"
+msgstr[0] "Radera denna bild från kameran?"
+msgstr[1] "Radera dessa %d bilder från kameran?"
+
+#: ../src/camera/ImportPage.vala:1727
+#, c-format
+msgid "Delete this video from camera?"
+msgid_plural "Delete these %d videos from camera?"
+msgstr[0] "Radera denna film från kameran?"
+msgstr[1] "Radera dessa %d filmer från kameran?"
+
+#: ../src/camera/ImportPage.vala:1730
+#, c-format
+msgid "Delete this photo/video from camera?"
+msgid_plural "Delete these %d photos/videos from camera?"
+msgstr[0] "Radera denna bild och film från kameran?"
+msgstr[1] "Radera dessa %d bilder och filmer från kameran?"
+
+#: ../src/camera/ImportPage.vala:1733
+#, c-format
+msgid "Delete these files from camera?"
+msgid_plural "Delete these %d files from camera?"
+msgstr[0] "Radera denna fil från kameran?"
+msgstr[1] "Radera dessa %d filer från kameran?"
+
+#: ../src/camera/ImportPage.vala:1760
+msgid "Removing photos/videos from camera"
+msgstr "Tar bort bilder och filmer från kameran"
+
+#: ../src/camera/ImportPage.vala:1764
+#, 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] ""
+"Kunde inte radera %d bild och film från kameran på grund av ett fel."
+msgstr[1] ""
+"Kunde inte radera %d bilder och filmer från kameran på grund av ett fel."
+
+#: ../src/data_imports/DataImports.vala:22
+msgid "Data Imports"
+msgstr "Dataimporter"
+
+#. Send an empty job to the queue to mark the end of the import
+#: ../src/data_imports/DataImportsPluginHost.vala:65
+#: ../src/data_imports/DataImportsPluginHost.vala:78
+#, c-format
+msgid "%s Database"
+msgstr "%s-databas"
+
+#: ../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 "Importen från %s kan inte fortsätta då ett fel uppstod:"
+
+#: ../src/data_imports/DataImportsPluginHost.vala:151
+msgid "To try importing from another service, select one from the above menu."
+msgstr ""
+"För att försöka att importera från en annan tjänst, välj en från ovanstående "
+"meny."
+
+#: ../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 ""
+"Du har inte aktiverat några dataimport-pluginer.\n"
+"\n"
+"För att använda kommandot Importera från program, måste du åtminstone ha en "
+"plugin aktiverad. Pluginer kan aktiveras i programmets inställiningar."
+
+#: ../src/data_imports/DataImportsUI.vala:100
+msgid "Database file:"
+msgstr "Databasfil:"
+
+#: ../src/data_imports/DataImportsUI.vala:112
+#: ../src/library/LibraryWindow.vala:898
+msgid "_Import"
+msgstr "_Importera"
+
+#: ../src/data_imports/DataImportsUI.vala:217
+msgid "Import From Application"
+msgstr "Importera från program"
+
+#: ../src/data_imports/DataImportsUI.vala:369
+#: ../src/publishing/PublishingUI.vala:470
+msgid "_Close"
+msgstr "S_täng"
+
+#: ../src/db/DatabaseTable.vala:37
+#, c-format
+msgid "Unable to open/create photo database %s: error code %d"
+msgstr "Kunde inte öppna eller skapa bilddatabasen %s: error code %d"
+
+#: ../src/db/DatabaseTable.vala:46
+#, c-format
+msgid ""
+"Unable to write to photo database file:\n"
+" %s"
+msgstr ""
+"Kunde inte skriva till bilddatabasfilen:\n"
+" %s"
+
+#: ../src/db/DatabaseTable.vala:48
+#, c-format
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
+msgstr ""
+"Fel vid åtkomst till databasfilen:\n"
+" %s\n"
+"\n"
+"Felet var: \n"
+"%s"
+
+#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:351
+msgid "_File"
+msgstr "_Fil"
+
+#: ../src/direct/DirectPhotoPage.vala:52
+msgid "Save photo"
+msgstr "Spara bild"
+
+#: ../src/direct/DirectPhotoPage.vala:57
+msgid "Save _As..."
+msgstr "_Spara som..."
+
+#: ../src/direct/DirectPhotoPage.vala:58
+msgid "Save photo with a different name"
+msgstr "Spara bilden med ett annat namn"
+
+#: ../src/direct/DirectPhotoPage.vala:69
+msgid "Print the photo to a printer connected to your computer"
+msgstr "Skriv ut bilden till en skrivare ansluten till din dator"
+
+#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:363
+msgid "_Photo"
+msgstr "_Bild"
+
+#: ../src/direct/DirectPhotoPage.vala:227
+#, c-format
+msgid "%s does not exist."
+msgstr "%s finns inte."
+
+#: ../src/direct/DirectPhotoPage.vala:229
+#, c-format
+msgid "%s is not a file."
+msgstr "%s är inte en fil."
+
+#: ../src/direct/DirectPhotoPage.vala:231
+#, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
+msgstr ""
+"%s saknar stöd för filformatet för\n"
+"%s."
+
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save a Copy"
+msgstr "_Spara en kopia"
+
+#: ../src/direct/DirectPhotoPage.vala:425
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "Förkasta ändringarna i %s?"
+
+#: ../src/direct/DirectPhotoPage.vala:426
+msgid "Close _without Saving"
+msgstr "_Stäng utan att spara"
+
+#: ../src/direct/DirectPhotoPage.vala:459
+#, c-format
+msgid "Error while saving to %s: %s"
+msgstr "Fel vid sparande till %s: %s"
+
+#: ../src/direct/DirectPhotoPage.vala:487
+#: ../src/direct/DirectPhotoPage.vala:508
+msgid "Save As"
+msgstr "Spara som"
+
+#: ../src/editing_tools/EditingTools.vala:665
 msgid "Return to current photo dimensions"
 msgstr "Återgå till befintliga bilddimensioner"
 
-#: src/editing_tools/EditingTools.vala:664
+#: ../src/editing_tools/EditingTools.vala:668
 msgid "Set the crop for this photo"
 msgstr "Ställ in beskärningen för den här bilden"
 
-#: src/editing_tools/EditingTools.vala:676
+#: ../src/editing_tools/EditingTools.vala:680
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Växla mellan porträtt- och landskapsläge"
 
-#: src/editing_tools/EditingTools.vala:749
+#: ../src/editing_tools/EditingTools.vala:753
 msgid "Unconstrained"
 msgstr "Obegränsad"
 
-#: src/editing_tools/EditingTools.vala:750
+#: ../src/editing_tools/EditingTools.vala:754
 msgid "Square"
 msgstr "Kvadrat"
 
-#: src/editing_tools/EditingTools.vala:751
+#: ../src/editing_tools/EditingTools.vala:755
 msgid "Screen"
 msgstr "Skärm"
 
-#: src/editing_tools/EditingTools.vala:752
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
-msgid "Original Size"
-msgstr "Ursprungsstorlek"
-
-#: src/editing_tools/EditingTools.vala:753
-#: src/editing_tools/EditingTools.vala:756
-#: src/editing_tools/EditingTools.vala:766
-#: src/editing_tools/EditingTools.vala:776
+#: ../src/editing_tools/EditingTools.vala:757
+#: ../src/editing_tools/EditingTools.vala:760
+#: ../src/editing_tools/EditingTools.vala:770
+#: ../src/editing_tools/EditingTools.vala:780
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:754
+#: ../src/editing_tools/EditingTools.vala:758
 msgid "SD Video (4 : 3)"
 msgstr "SD-video (4 : 3)"
 
-#: src/editing_tools/EditingTools.vala:755
+#: ../src/editing_tools/EditingTools.vala:759
 msgid "HD Video (16 : 9)"
 msgstr "HD-video (16 : 9)"
 
-#: src/editing_tools/EditingTools.vala:762
+#: ../src/editing_tools/EditingTools.vala:766
 msgid "Letter (8.5 x 11 in.)"
 msgstr "Letter (8.5 x 11 tum)"
 
-#: src/editing_tools/EditingTools.vala:764
+#: ../src/editing_tools/EditingTools.vala:768
 msgid "Tabloid (11 x 17 in.)"
 msgstr "Tabloid (11 x 17 tum)"
 
-#: src/editing_tools/EditingTools.vala:771
+#: ../src/editing_tools/EditingTools.vala:775
 msgid "A4 (210 x 297 mm)"
 msgstr "A4 (210 x 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:775
+#: ../src/editing_tools/EditingTools.vala:779
 msgid "A3 (297 x 420 mm)"
 msgstr "A3 (297 x 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1865
+#: ../src/editing_tools/EditingTools.vala:1905
 msgid "Close the red-eye tool"
 msgstr "Stäng röda ögon-verktyget"
 
-#: src/editing_tools/EditingTools.vala:1868
+#: ../src/editing_tools/EditingTools.vala:1908
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Ta bort eventuella röda ögon i det markerade området"
 
-#: src/editing_tools/EditingTools.vala:2226
+#: ../src/editing_tools/EditingTools.vala:2244
+#: ../src/editing_tools/StraightenTool.vala:102
+msgid "_Reset"
+msgstr "Åt_erställ"
+
+#: ../src/editing_tools/EditingTools.vala:2266
 msgid "Saturation:"
 msgstr "Mättnad:"
 
-#: src/editing_tools/EditingTools.vala:2234
+#: ../src/editing_tools/EditingTools.vala:2274
 msgid "Tint:"
 msgstr "Färgton:"
 
-#: src/editing_tools/EditingTools.vala:2243
+#: ../src/editing_tools/EditingTools.vala:2283
 msgid "Temperature:"
 msgstr "Färgtemperatur:"
 
-#: src/editing_tools/EditingTools.vala:2251
+#: ../src/editing_tools/EditingTools.vala:2291
 msgid "Shadows:"
 msgstr "Skuggor:"
 
-#: src/editing_tools/EditingTools.vala:2259
+#: ../src/editing_tools/EditingTools.vala:2299
 msgid "Highlights:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2313
+#: ../src/editing_tools/EditingTools.vala:2353
 msgid "Reset Colors"
 msgstr "Återställ färger"
 
-#: src/editing_tools/EditingTools.vala:2313
+#: ../src/editing_tools/EditingTools.vala:2353
 msgid "Reset all color adjustments to original"
 msgstr "Återställ alla färgjusteringar till de ursprungliga värdena"
 
-#: src/editing_tools/EditingTools.vala:2665
+#: ../src/editing_tools/EditingTools.vala:2705
 msgid "Temperature"
 msgstr "Färgtemperatur"
 
-#: src/editing_tools/EditingTools.vala:2678
+#: ../src/editing_tools/EditingTools.vala:2718
 msgid "Tint"
 msgstr "Färgton"
 
-#: src/editing_tools/EditingTools.vala:2691
+#: ../src/editing_tools/EditingTools.vala:2731
 msgid "Saturation"
 msgstr "Mättnad"
 
-#: src/editing_tools/EditingTools.vala:2704
+#: ../src/editing_tools/EditingTools.vala:2744
 msgid "Exposure"
 msgstr "Exponering"
 
-#: src/editing_tools/EditingTools.vala:2717
+#: ../src/editing_tools/EditingTools.vala:2757
 msgid "Shadows"
 msgstr "Skuggor"
 
-#: src/editing_tools/EditingTools.vala:2730
+#: ../src/editing_tools/EditingTools.vala:2770
 msgid "Highlights"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2740
+#: ../src/editing_tools/EditingTools.vala:2780
 msgid "Contrast Expansion"
 msgstr "Kontrastökning"
 
-#: src/AppWindow.vala:49
-msgid "Pin Toolbar"
-msgstr "Fäst verktygsrad"
+#: ../src/editing_tools/StraightenTool.vala:99
+msgid "Angle:"
+msgstr "Vinkel:"
 
-#: src/AppWindow.vala:50
-msgid "Pin the toolbar open"
-msgstr "Fäst verktygsraden i öppet läge"
+#: ../src/events/EventDirectoryItem.vala:83
+#, c-format
+msgid "%d Photo/Video"
+msgid_plural "%d Photos/Videos"
+msgstr[0] "%d bild/video"
+msgstr[1] "%d bilder/filmer"
 
-#: src/AppWindow.vala:53 src/AppWindow.vala:131
-msgid "Leave fullscreen"
-msgstr "Avsluta helskärmsläge"
+#: ../src/events/EventPage.vala:129
+msgid "No Event"
+msgstr "Ingen händelse"
 
-#: src/AppWindow.vala:130
-msgid "Leave _Fullscreen"
-msgstr "Avsluta _helskärmsläge"
+#: ../src/events/EventsDirectoryPage.vala:131
+msgid "Display the comment of each event"
+msgstr "Visa kommentaren för varje händelse"
 
-#: src/AppWindow.vala:491
-msgid "_Quit"
-msgstr "_Avsluta"
+#: ../src/events/EventsDirectoryPage.vala:155
+msgid "No events"
+msgstr "Inga händelser"
 
-#: src/AppWindow.vala:496
-msgid "_About"
-msgstr "_Om"
+#: ../src/events/EventsDirectoryPage.vala:159
+msgid "No events found"
+msgstr "Inga händelser hittades"
 
-#: src/AppWindow.vala:501
-msgid "Fulls_creen"
-msgstr "_Helskärm"
+#: ../src/events/EventsDirectoryPage.vala:230
+msgid "Events"
+msgstr "Händelser"
 
-#: src/AppWindow.vala:506
-msgid "_Contents"
-msgstr "_Innehåll"
+#: ../src/events/EventsDirectoryPage.vala:244
+msgid "Undated"
+msgstr "Odaterad"
 
-#: src/AppWindow.vala:511
-msgid "_Frequently Asked Questions"
-msgstr "Återkommande frågor"
+#: ../src/events/EventsDirectoryPage.vala:245
+msgid "%Y"
+msgstr "%Y"
 
-#: src/AppWindow.vala:516
-msgid "_Report a Problem..."
-msgstr "_Rapportera ett problem..."
+#: ../src/events/EventsDirectoryPage.vala:246
+msgid "%B"
+msgstr "%B"
 
-#: src/AppWindow.vala:663
-#, c-format
-msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
-"continue.\n"
-"\n"
-"%s"
-msgstr ""
-"Ett allvarligt fel inträffade vid åtkomsten till Shotwells bibliotek.  "
-"Shotwell kan inte fortsätta.\n"
-"\n"
-"%s"
+#: ../src/folders/Branch.vala:141
+msgid "Folders"
+msgstr "Mappar"
 
-#: src/AppWindow.vala:683 plugins/common/Resources.vala:9
-msgid "Visit the Yorba web site"
-msgstr "Besök Yorbas webbplats"
+#: ../src/library/Branch.vala:36 ../ui/shotwell.glade.h:32
+msgid "Library"
+msgstr "Bibliotek"
 
-#: src/AppWindow.vala:686 plugins/common/Resources.vala:28
-msgid "translator-credits"
-msgstr ""
-"Daniel Nylander <po@danielnylander.se>\n"
-"Olof Nord <olof_nord_@hotmail.com>\n"
-"Alexander Styre <lessneurope@yandex.com>\n"
-"Joachim Johansson <joachim.j@gmail.com>"
+#: ../src/library/ImportQueuePage.vala:8
+msgid "Importing..."
+msgstr "Importerar..."
 
-#: src/AppWindow.vala:695
-#, c-format
-msgid "Unable to display help: %s"
-msgstr "Kunde inte visa hjälp: %s"
+#: ../src/library/ImportQueuePage.vala:67
+msgid "_Stop Import"
+msgstr "_Avbryt importen"
 
-#: src/AppWindow.vala:703
-#, c-format
-msgid "Unable to navigate to bug database: %s"
-msgstr "Det går inte att komma åt bugg-databasen: %s"
+#: ../src/library/ImportQueuePage.vala:68
+msgid "Stop importing photos"
+msgstr "Stoppa bildimporten"
 
-#: src/AppWindow.vala:711
+#: ../src/library/ImportQueuePage.vala:124
+msgid "Preparing to import..."
+msgstr "Förbereder import..."
+
+#: ../src/library/ImportQueuePage.vala:151
 #, c-format
-msgid "Unable to display FAQ: %s"
-msgstr "Kunde inte visa återkommande frågor: %s"
+msgid "Imported %s"
+msgstr "Importerade %s"
 
-#: src/Tag.vala:817
-msgid "untitled"
-msgstr "namnlös"
+#: ../src/library/LastImportPage.vala:8
+msgid "Last Import"
+msgstr "Senaste import"
 
-#: src/Dimensions.vala:17
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1250
-msgid "Original size"
-msgstr "Ursprungsstorlek"
+#: ../src/library/LibraryWindow.vala:301
+msgid "_Import From Folder..."
+msgstr "_Importera från mapp..."
 
-#: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Bredd eller höjd"
+#: ../src/library/LibraryWindow.vala:302
+msgid "Import photos from disk to library"
+msgstr "Importera bilder från hårddisken till biblioteket"
 
-#: src/Dimensions.vala:23
-msgid "Width"
-msgstr "Bredd"
+#: ../src/library/LibraryWindow.vala:309
+msgid "Import From _Application..."
+msgstr "Importera från _program..."
 
-#: src/Dimensions.vala:26
-msgid "Height"
-msgstr "Höjd"
+#: ../src/library/LibraryWindow.vala:313
+msgid "Sort _Events"
+msgstr "_Sortera händelser"
 
-#: src/MediaPage.vala:143
-msgid "Adjust the size of the thumbnails"
-msgstr "Justera storleken på miniatyrbilderna"
+#: ../src/library/LibraryWindow.vala:323
+msgid "Empty T_rash"
+msgstr "_Töm papperskorgen"
 
-#: src/MediaPage.vala:326
-msgid "Increase the magnification of the thumbnails"
-msgstr "Öka förstoringen på miniatyrbilderna"
+#: ../src/library/LibraryWindow.vala:324
+msgid "Delete all photos in the trash"
+msgstr "Radera alla bilder från papperskorgen"
 
-#: src/MediaPage.vala:332
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Minska förstoringen på miniatyrbilderna"
+#: ../src/library/LibraryWindow.vala:329
+msgid "View Eve_nt for Photo"
+msgstr "_Visa bildhändelse"
 
-#: src/MediaPage.vala:399
-msgid "Sort _Photos"
-msgstr "Sortera _bilder"
+#: ../src/library/LibraryWindow.vala:333
+msgid "_Find"
+msgstr "_Sök"
 
-#: src/MediaPage.vala:408
-msgid "_Play Video"
-msgstr "Spela _upp film"
+#: ../src/library/LibraryWindow.vala:334
+msgid "Find photos and videos by search criteria"
+msgstr "Sök efter bilder och filmer med sökordet"
 
-#: src/MediaPage.vala:409
-msgid "Open the selected videos in the system video player"
-msgstr "Öppna markerade filmer i systemets filmspelare"
+#: ../src/library/LibraryWindow.vala:345 ../src/searches/Branch.vala:77
+#: ../src/sidebar/Tree.vala:185
+msgid "Ne_w Saved Search..."
+msgstr "_Ny sparad sökning..."
 
-#: src/MediaPage.vala:442 src/events/EventsDirectoryPage.vala:130
-msgid "_Comments"
-msgstr "_Kommentarer"
+#: ../src/library/LibraryWindow.vala:367
+msgid "_Photos"
+msgstr "_Bilder"
 
-#: src/MediaPage.vala:443
-msgid "Display the comment of each photo"
-msgstr "Visa kommentarer för varje bild"
+#: ../src/library/LibraryWindow.vala:371
+msgid "Even_ts"
+msgstr "_Händelser"
 
-#: src/MediaPage.vala:455
-msgid "Display each photo's tags"
-msgstr "Visa etiketter för varje bild"
+#: ../src/library/LibraryWindow.vala:390
+msgid "_Basic Information"
+msgstr "_Grundläggande information"
 
-#: src/MediaPage.vala:471
-msgid "By _Title"
-msgstr "Efter _titel"
+#: ../src/library/LibraryWindow.vala:391
+msgid "Display basic information for the selection"
+msgstr "Visa grundläggande information för markeringen"
 
-#: src/MediaPage.vala:472
-msgid "Sort photos by title"
-msgstr "Sortera bilder efter titel"
+#: ../src/library/LibraryWindow.vala:396
+msgid "E_xtended Information"
+msgstr "_Utökad Information"
 
-#: src/MediaPage.vala:477
-msgid "By Exposure _Date"
-msgstr "Efter exponerings_ögonblick"
+#: ../src/library/LibraryWindow.vala:397
+msgid "Display extended information for the selection"
+msgstr "Visa utökad information för markeringen"
 
-#: src/MediaPage.vala:478
-msgid "Sort photos by exposure date"
-msgstr "Sortera bilder efter exponeringsögonblick"
+#: ../src/library/LibraryWindow.vala:402
+msgid "_Search Bar"
+msgstr "_Sökfält"
 
-#: src/MediaPage.vala:483
-msgid "By _Rating"
-msgstr "Efter _betyg"
+#: ../src/library/LibraryWindow.vala:403
+msgid "Display the search bar"
+msgstr "Visa sökfältet"
 
-#: src/MediaPage.vala:484
-msgid "Sort photos by rating"
-msgstr "Sortera bilder efter betyg"
+#: ../src/library/LibraryWindow.vala:408
+msgid "S_idebar"
+msgstr "S_idofält"
+
+#: ../src/library/LibraryWindow.vala:409
+msgid "Display the sidebar"
+msgstr "Visa sidofältet"
+
+#: ../src/library/LibraryWindow.vala:667
+msgid "Import From Folder"
+msgstr "Importera från mapp"
+
+#: ../src/library/LibraryWindow.vala:736
+msgid "Empty Trash"
+msgstr "Töm papperskorgen"
+
+#: ../src/library/LibraryWindow.vala:736
+msgid "Emptying Trash..."
+msgstr "Tömmer papperskorgen..."
 
-#: src/MediaPage.vala:702
+#: ../src/library/LibraryWindow.vala:895
 #, c-format
 msgid ""
-"Shotwell was unable to play the selected video:\n"
-"%s"
+"Shotwell is configured to import photos to your home directory.\n"
+"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
+"span>.\n"
+"Do you want to continue importing photos?"
 msgstr ""
-"Shotwell kunde inte spela upp den markerade filmen:\n"
-"%s"
 
-#: src/events/EventDirectoryItem.vala:83
+#: ../src/library/LibraryWindow.vala:898 ../ui/shotwell.glade.h:18
+msgid "Library Location"
+msgstr "Biblioteksplats"
+
+#. TODO: Specify which directory/file.
+#: ../src/library/LibraryWindow.vala:911
+msgid "Photos cannot be imported from this directory."
+msgstr "Bilder kan inte importeras från denna mapp."
+
+#: ../src/library/LibraryWindow.vala:1199
 #, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] "%d bild/video"
-msgstr[1] "%d bilder/filmer"
+msgid "%s (%d%%)"
+msgstr "%s (%d%%)"
 
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Visa kommentaren för varje händelse"
+#: ../src/library/LibraryWindow.vala:1243
+#: ../src/library/LibraryWindow.vala:1254
+msgid "Updating library..."
+msgstr "Uppdaterar biblioteket..."
 
-#: src/events/EventsDirectoryPage.vala:155
-msgid "No events"
-msgstr "Inga händelser"
+#: ../src/library/LibraryWindow.vala:1260
+msgid "Preparing to auto-import photos..."
+msgstr "Förbereder automatisk importer av bilder..."
 
-#: src/events/EventsDirectoryPage.vala:159
-msgid "No events found"
-msgstr "Inga händelser hittades"
+#: ../src/library/LibraryWindow.vala:1265
+msgid "Auto-importing photos..."
+msgstr "Importerar bilder automatiskt..."
 
-#: src/events/EventsDirectoryPage.vala:230
-msgid "Events"
-msgstr "Händelser"
+#: ../src/library/LibraryWindow.vala:1273
+msgid "Writing metadata to files..."
+msgstr "Skriver metadata till filer..."
 
-#: src/events/EventsDirectoryPage.vala:244
-msgid "Undated"
-msgstr "Odaterad"
+#: ../src/library/OfflinePage.vala:8
+msgid "Missing Files"
+msgstr "Saknade filer"
 
-#: src/events/EventsDirectoryPage.vala:245
-msgid "%Y"
-msgstr "%Y"
+#: ../src/library/OfflinePage.vala:106
+msgid "Deleting..."
+msgstr "Raderar..."
 
-#: src/events/EventsDirectoryPage.vala:246
-msgid "%B"
-msgstr "%B"
+#: ../src/library/TrashPage.vala:8
+msgid "Trash"
+msgstr "Papperskorg"
 
-#: src/events/EventPage.vala:129
-msgid "No Event"
-msgstr "Ingen händelse"
+#: ../src/library/TrashPage.vala:108
+msgid "Trash is empty"
+msgstr "Papperskorgen är tom"
 
-#: src/AppDirs.vala:48 src/AppDirs.vala:99
-#, c-format
-msgid "Unable to create cache directory %s: %s"
-msgstr "Det går inte att skapa cache-mappen %s: %s"
+#: ../src/library/TrashPage.vala:112
+msgid "Delete"
+msgstr "Radera"
 
-#: src/AppDirs.vala:58 src/AppDirs.vala:88
+#: ../src/library/TrashPage.vala:113
+msgid "Deleting Photos"
+msgstr "Raderar bilder"
+
+#: ../src/main.vala:54
 #, c-format
-msgid "Unable to create data directory %s: %s"
-msgstr "Kunde inte skapa datakatalogen %s: %s"
+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 ""
+"Ditt bildbibliotek är inte kompatibelt med denna version av Shotwell.  Det "
+"verkar som det skapades med Shotwell %s (schema %d).  Denna version är %s "
+"(schema %d).  Använd den senaste versionen av Shotwell."
 
-#: src/AppDirs.vala:152
-msgid "Pictures"
-msgstr "Bilder"
+#: ../src/main.vala:59
+#, 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 ""
+"Shotwell kunde inte uppgradera din bildbibliotek från version %s (schema %d) "
+"till %s (schema %d).  För ytterligare information, läs Shotwells wiki-sida "
+"på %s"
 
-#: src/AppDirs.vala:190
+#: ../src/main.vala:65
 #, c-format
-msgid "Unable to create temporary directory %s: %s"
-msgstr "Kunde inte skapa den temporära katalogen %s: %s"
+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 ""
+"Ditt bildbibliotek är inte kompatibelt med denna version av Shotwell.  Det "
+"verkar som om det skapades med Shotwell %s (schema %d).  Denna version är %s "
+"(schema %d).  Töm ditt bibliotek genom att ta bort %s och importera dina "
+"bilder igen."
 
-#: src/AppDirs.vala:207 src/AppDirs.vala:223
+#: ../src/main.vala:71
 #, c-format
-msgid "Unable to create data subdirectory %s: %s"
-msgstr "Kunde inte skapa den underliggande datakatalogen %s: %s"
+msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgstr "Okänt fel vid försök att verifiera Shotwells databas: %s"
 
-#: src/slideshow/TransitionEffects.vala:98
-msgid "(None)"
-msgstr "(Ingen)"
+#: ../src/main.vala:104
+msgid "Loading Shotwell"
+msgstr "Läser in Shotwell"
 
-#: src/slideshow/TransitionEffects.vala:287
-msgid "None"
-msgstr "Ingen"
+#: ../src/main.vala:294
+msgid "Path to Shotwell's private data"
+msgstr "Sökväg till Shotwells privata data"
 
-#: src/slideshow/TransitionEffects.vala:339
-msgid "Random"
-msgstr "Slumpmässigt"
+#: ../src/main.vala:294
+msgid "DIRECTORY"
+msgstr "DIRECTORY"
 
-#: src/slideshow/Slideshow.vala:22
-msgid "Slideshow Transitions"
-msgstr "Bildspelsövergångar"
+#: ../src/main.vala:298
+msgid "Do not monitor library directory at runtime for changes"
+msgstr "Sök inte efter ändringar i biblioteket medan programmet används"
+
+#: ../src/main.vala:302
+msgid "Don't display startup progress meter"
+msgstr "Visa inte hur uppstarten framskrider"
+
+#: ../src/main.vala:306
+msgid "Show the application's version"
+msgstr "Visa programversion"
+
+#. init GTK (valac has already called g_threads_init())
+#: ../src/main.vala:338
+msgid "[FILE]"
+msgstr "[FILE]"
 
-#: src/Exporter.vala:232
+#: ../src/main.vala:342
 #, c-format
-msgid "Unable to generate a temporary file for %s: %s"
-msgstr "Kunde inte skapa en temporärfil för %s: %s"
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Kör \"%s --help\" för en komplett lista över tillgängliga "
+"kommandoradsalternativ.\n"
 
-#: src/Exporter.vala:299
-msgid "Exporting"
-msgstr "Exporterar"
+#: ../src/photos/BmpSupport.vala:32
+msgid "BMP"
+msgstr "BMP"
+
+#: ../src/photos/JfifSupport.vala:84
+msgid "JPEG"
+msgstr "JPEG"
 
-#: src/Exporter.vala:317
+#: ../src/photos/JfifSupport.vala:185
 #, c-format
-msgid "File %s already exists.  Replace?"
-msgstr "Filen %s finns redan.  Vill du ersätta den?"
+msgid "Low (%d%%)"
+msgstr "Låg (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "_Skip"
-msgstr "_Hoppa över"
+#: ../src/photos/JfifSupport.vala:188
+#, c-format
+msgid "Medium (%d%%)"
+msgstr "Mellan (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "_Replace"
-msgstr "_Ersätt"
+#: ../src/photos/JfifSupport.vala:191
+#, c-format
+msgid "High (%d%%)"
+msgstr "Hög (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "Replace _All"
-msgstr "Ersätt _alla"
+#: ../src/photos/JfifSupport.vala:194
+#, c-format
+msgid "Maximum (%d%%)"
+msgstr "Maximal (%d%%)"
 
-#: src/Exporter.vala:319
-msgid "Export"
-msgstr "Exportera"
+#: ../src/photos/PngSupport.vala:30
+msgid "PNG"
+msgstr "PNG"
 
-#: src/SearchFilter.vala:593 src/SearchFilter.vala:594
-msgid "Photos"
-msgstr "Bilder"
+#: ../src/photos/RawSupport.vala:134
+msgid "RAW"
+msgstr "RAW"
 
-#: src/SearchFilter.vala:599 src/SearchFilter.vala:600
-msgid "Videos"
-msgstr "Filmer"
+#: ../src/photos/TiffSupport.vala:86
+msgid "TIFF"
+msgstr "TIFF"
 
-#: src/SearchFilter.vala:605
-msgid "RAW Photos"
-msgstr "RAW-bilder"
+#: ../src/publishing/Publishing.vala:16
+msgid "Publishing"
+msgstr "Publicering"
 
-#: src/SearchFilter.vala:606
-msgid "RAW photos"
-msgstr "RAW-bilder"
+#: ../src/publishing/PublishingPluginHost.vala:11
+msgid "Preparing for upload"
+msgstr "Förbereder uppladdning"
 
-#: src/SearchFilter.vala:952
+#: ../src/publishing/PublishingPluginHost.vala:12
 #, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Fel vid inläsning av användargränssnittsfilen %s: %s"
+msgid "Uploading %d of %d"
+msgstr "Laddar upp %d av %d"
 
-#: src/SearchFilter.vala:969
-msgid "Type"
-msgstr "Typ"
+#: ../src/publishing/PublishingPluginHost.vala:81
+#, c-format
+msgid "Publishing to %s can't continue because an error occurred:"
+msgstr ""
+"Publiceringen till %s kan inte fortsätta på grund av att ett fel inträffade:"
 
-#: src/publishing/Publishing.vala:16
-msgid "Publishing"
-msgstr "Publicering"
+#: ../src/publishing/PublishingPluginHost.vala:84
+msgid "To try publishing to another service, select one from the above menu."
+msgstr ""
+"För att försöka att publicera till en annan tjänst, välj en från ovanstående "
+"meny."
 
-#: src/publishing/PublishingUI.vala:105
+#: ../src/publishing/PublishingUI.vala:105
 msgid "The selected photos/videos were successfully published."
 msgstr "De valda bilderna eller filmerna publicerades."
 
-#: src/publishing/PublishingUI.vala:107
+#: ../src/publishing/PublishingUI.vala:107
 msgid "The selected videos were successfully published."
 msgstr "De valda filmerna publicerades."
 
-#: src/publishing/PublishingUI.vala:109
+#: ../src/publishing/PublishingUI.vala:109
 msgid "The selected photos were successfully published."
 msgstr "De valda bilderna publicerades."
 
-#: src/publishing/PublishingUI.vala:112
+#: ../src/publishing/PublishingUI.vala:112
 msgid "The selected video was successfully published."
 msgstr "Den markerade filmen publicerades."
 
-#: src/publishing/PublishingUI.vala:114
+#: ../src/publishing/PublishingUI.vala:114
 msgid "The selected photo was successfully published."
 msgstr "Den markerade bilden publicerades."
 
-#: src/publishing/PublishingUI.vala:122
+#: ../src/publishing/PublishingUI.vala:122
 msgid "Fetching account information..."
 msgstr "Hämtar kontoinformation..."
 
-#: src/publishing/PublishingUI.vala:128
+#: ../src/publishing/PublishingUI.vala:128
 msgid "Logging in..."
 msgstr "Loggar in..."
 
-#: src/publishing/PublishingUI.vala:183
+#: ../src/publishing/PublishingUI.vala:185
 msgid "Publish Photos"
 msgstr "Publicera bilder"
 
-#: src/publishing/PublishingUI.vala:184
+#: ../src/publishing/PublishingUI.vala:186
 msgid "Publish photos _to:"
 msgstr "Publicera bilder _till:"
 
-#: src/publishing/PublishingUI.vala:186
+#: ../src/publishing/PublishingUI.vala:188
 msgid "Publish Videos"
 msgstr "Publicera filmer"
 
-#: src/publishing/PublishingUI.vala:187
+#: ../src/publishing/PublishingUI.vala:189
 msgid "Publish videos _to"
 msgstr "Publicera filmer _till"
 
-#: src/publishing/PublishingUI.vala:189
+#: ../src/publishing/PublishingUI.vala:191
 msgid "Publish Photos and Videos"
 msgstr "Publicera bilder och filmer"
 
-#: src/publishing/PublishingUI.vala:190
+#: ../src/publishing/PublishingUI.vala:192
 msgid "Publish photos and videos _to"
 msgstr "Publicera bilder och filmer _till"
 
-#: src/publishing/PublishingUI.vala:383
+#. There are no enabled publishing services that accept this media type,
+#. warn the user.
+#: ../src/publishing/PublishingUI.vala:360
 msgid "Unable to publish"
 msgstr "Kunde inte publicera"
 
-#: src/publishing/PublishingUI.vala:384
+#: ../src/publishing/PublishingUI.vala:361
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -3641,965 +4711,429 @@ msgstr ""
 "Inställningar</b> och aktivera en eller flera av de insticksmoduler för "
 "publicering som finns under fliken <b>Insticksmoduler</b>."
 
-#: src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr "Förbereder uppladdning"
-
-#: src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
-msgstr "Laddar upp %d av %d"
-
-#: src/publishing/PublishingPluginHost.vala:81
-#, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
-msgstr ""
-"Publiceringen till %s kan inte fortsätta på grund av att ett fel inträffade:"
+#: ../src/searches/Branch.vala:68
+msgid "Saved Searches"
+msgstr "Sparade sökningar"
 
-#: src/publishing/PublishingPluginHost.vala:84
-msgid "To try publishing to another service, select one from the above menu."
-msgstr ""
-"För att försöka att publicera till en annan tjänst, välj en från ovanstående "
-"meny."
+#. Ordering must correspond with SearchConditionText.Context
+#: ../src/searches/SavedSearchDialog.vala:168
+msgid "contains"
+msgstr "innehåller"
 
-#: src/sidebar/Tree.vala:199
-msgid "New _Tag..."
-msgstr "_Ny etikett..."
+#. Ordering must correspond with Context
+#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:500
+msgid "is exactly"
+msgstr "är exakt"
 
-#: plugins/common/RESTSupport.vala:424
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:971
-#, fuzzy
-msgid "A temporary file needed for publishing is unavailable"
-msgstr ""
-"En temporärfil som krävs för publicering finns inte tillgänglig"
+#: ../src/searches/SavedSearchDialog.vala:170
+msgid "starts with"
+msgstr "börjar med"
 
-#: plugins/common/RESTSupport.vala:1138
-msgid ""
-"You have already logged in and out of a Google service during this Shotwell "
-"session.\n"
-"\n"
-"To continue publishing to Google services, quit and restart Shotwell, then "
-"try publishing again."
-msgstr ""
-"Du har redan loggat in och ut från Google under denna Shotwell-session.\n"
-"För att fortsätta att publicera till Google så måste du starta om Shotwell "
-"och försök att publicera igen."
+#: ../src/searches/SavedSearchDialog.vala:171
+msgid "ends with"
+msgstr "slutar med"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:57
-msgid ""
-"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 ""
-"Du är för närvarande inte inloggad på YouTube.\n"
-"\n"
-"Du måste redan ha registrerat ett Google-konto och konfigurerat det för "
-"användning med YouTube för att fortsätta. Du kan konfigurera de flesta "
-"konton genom att logga in på YouTube med din webbläsare."
+#: ../src/searches/SavedSearchDialog.vala:172
+msgid "does not contain"
+msgstr "innehåller inte"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:362
-msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
-"continue."
-msgstr ""
-"En fil som krävs för publiceringen saknas. Därför kan publiceringen till "
-"YouTube inte fortsätta."
+#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:504
+msgid "is not set"
+msgstr "är inte inställd"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:461
-#, c-format
-msgid "You are logged into YouTube as %s."
-msgstr "Du är inloggad på YouTube som %s."
+#: ../src/searches/SavedSearchDialog.vala:174
+#, fuzzy
+#| msgid "is not set"
+msgid "is set"
+msgstr "är inte inställd"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:463
-#, c-format
-msgid "Videos will appear in '%s'"
-msgstr "Filmer kommer att visas i \"%s\""
+#. Ordering must correspond with SearchConditionMediaType.Context
+#: ../src/searches/SavedSearchDialog.vala:248
+#: ../src/searches/SavedSearchDialog.vala:379
+#: ../src/searches/SavedSearchDialog.vala:444
+msgid "is"
+msgstr "är"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:495
-msgid "Public listed"
-msgstr "Publikt listad"
+#: ../src/searches/SavedSearchDialog.vala:249
+msgid "is not"
+msgstr "är inte"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
-msgid "Public unlisted"
-msgstr "Publikt olistad"
+#. Ordering must correspond with SearchConditionMediaType.MediaType
+#: ../src/searches/SavedSearchDialog.vala:255
+msgid "any photo"
+msgstr "valfri bild"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
-msgid "Private"
-msgstr "Privat"
+#: ../src/searches/SavedSearchDialog.vala:256
+msgid "a raw photo"
+msgstr "en råfil"
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr "Standardtjänster för publicering"
+#: ../src/searches/SavedSearchDialog.vala:257
+msgid "a video"
+msgstr "en film"
 
-#: 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."
+#: ../src/searches/SavedSearchDialog.vala:311
+msgid "has"
 msgstr ""
-"Du är för närvarande inte inloggad på Flickr.\n"
-"\n"
-"Klicka på Logga in för att logga in på Flickr med din webbläsare. Du måste "
-"specifikt godkänna att Shotwell Connect kan länka till ditt Flickr-konto."
 
-#: 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."
+#: ../src/searches/SavedSearchDialog.vala:312
+msgid "has no"
 msgstr ""
-"Du har redan loggat in och ut från Flickr under denna Shotwell-session.\n"
-"För att fortsätta att publicera till Flickr, starta om Shotwell och försök "
-"att publicera igen."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:375
-msgid "Preparing for login..."
-msgstr "Förbereder inloggning..."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:595
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can't "
-"continue."
+#: ../src/searches/SavedSearchDialog.vala:317
+msgid "modifications"
 msgstr ""
-"En fil som krävs för publiceringen saknas. Därför kan publiceringen till "
-"Flickr inte fortsätta."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "Verifierar behörighet..."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1153
-#, c-format
-msgid ""
-"You are logged into Flickr as %s.\n"
-"\n"
+#: ../src/searches/SavedSearchDialog.vala:318
+msgid "internal modifications"
 msgstr ""
-"Du är inloggad på Flickr som %s.\n"
-"\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
-#, 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."
+#: ../src/searches/SavedSearchDialog.vala:319
+msgid "external modifications"
 msgstr ""
-"Ditt gratiskonto på Flickr begränsar hur mycket data som du kan skicka\n"
-"upp per månad. Denna månad har du %d megabyte kvar att ladda upp."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1157
-msgid "Your Flickr Pro account entitles you to unlimited uploads."
-msgstr "Ditt Flickr Pro-konto låter dig ladda upp obegränsat med data."
+#. Ordering must correspond with SearchConditionFlagged.State
+#: ../src/searches/SavedSearchDialog.vala:373
+msgid "flagged"
+msgstr "flaggad"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1162
-msgid "Photos _visible to:"
-msgstr "Bilderna _visas för:"
+#: ../src/searches/SavedSearchDialog.vala:374
+msgid "not flagged"
+msgstr "oflaggad"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
-msgid "Videos _visible to:"
-msgstr "Filmerna _visas för:"
+#: ../src/searches/SavedSearchDialog.vala:437
+msgid "and higher"
+msgstr "och högre"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1167
-msgid "Photos and videos _visible to:"
-msgstr "Bilder och filmer _visas för:"
+#: ../src/searches/SavedSearchDialog.vala:438
+msgid "only"
+msgstr "endast"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1234
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1182
-msgid "Everyone"
-msgstr "Alla"
+#: ../src/searches/SavedSearchDialog.vala:439
+msgid "and lower"
+msgstr "och lägre"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
-msgid "Friends & family only"
-msgstr "Endast vänner och familj"
+#: ../src/searches/SavedSearchDialog.vala:501
+msgid "is after"
+msgstr "är efter"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-msgid "Family only"
-msgstr "endast familj"
+#: ../src/searches/SavedSearchDialog.vala:502
+msgid "is before"
+msgstr "är före"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
-msgid "Friends only"
-msgstr "endast vänner"
+#: ../src/searches/SavedSearchDialog.vala:503
+msgid "is between"
+msgstr "är mellan"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1180
-msgid "Just me"
-msgstr "Bara jag"
+#: ../src/searches/SavedSearchDialog.vala:516
+msgid "and"
+msgstr "och"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1229
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1246
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "500 x 375 pixels"
-msgstr "500 x 375 pixlar"
+#: ../src/searches/SavedSearchDialog.vala:695
+msgid "Search"
+msgstr "Sök"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1230
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1247
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:108
+#: ../src/searches/SavedSearchDialog.vala:700
 #, fuzzy
-msgid "1024 x 768 pixels"
-msgstr ""
-"1024 x 768 pixlar"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1248
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 pixlar"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1249
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 pixlar"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:746
-#, c-format
-msgid "Creating album %s..."
-msgstr "Skapar album %s..."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:917
-msgid "An error message occurred when publishing to Piwigo. Please try again."
-msgstr "Ett felmeddelande visades vid publiceringen till Piwigo. Försök igen."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:998
-msgid ""
-"Enter the URL of your Piwigo photo library as well as the username and "
-"password associated with your Piwigo account for that library."
-msgstr ""
-"Skriv in länken till ditt Piwigo-bildbibliotek, samt ditt Piwigo-"
-"användarnamn och -lösenord."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:999
-msgid ""
-"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
-"entered"
-msgstr ""
-"Shotwell kan inte nå ditt Piwigo-bildbibliotek. Kontrollera länkadressen "
-"igen."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1000
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:590
-msgid "Username and/or password invalid. Please try again"
-msgstr "Användarnamn och/eller lösenord ogiltigt. Var god försök igen"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1032
-#, c-format
-msgid "Invalid URL"
-msgstr "Ogiltig länkadress"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1037
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:620
-#, c-format
-msgid "Invalid User Name or Password"
-msgstr "Ogiltigt användarnamn eller lösenord"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1127
-#: plugins/shotwell-publishing/PicasaPublishing.vala:59
-#: plugins/shotwell-publishing/FacebookPublishing.vala:61
-msgid "Shotwell Connect"
-msgstr "Shotwell Connect"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1235
-msgid "Admins, Family, Friends, Contacts"
-msgstr "Administratörer, familj, vänner, kontakter"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1236
-msgid "Admins, Family, Friends"
-msgstr "Administratörer, familj, vänner"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1237
-msgid "Admins, Family"
-msgstr "Administratörer, familj"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1238
-msgid "Admins"
-msgstr "Administratörer"
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:58
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have "
-"to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
-"Du är för närvarande inte inloggad på Picasa Web Albums.\n"
-"\n"
-"Klicka på Logga in för att logga in på Picasa Web Albums med din webbläsare. "
-"Du måste specifikt godkänna att Shotwell Connect kan länka till ditt Picasa-"
-"konto."
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "_Avbryt"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:361
-msgid ""
-"A file required for publishing is unavailable. Publishing to Picasa can't "
-"continue."
+#: ../src/searches/SavedSearchDialog.vala:701
+msgid "OK"
 msgstr ""
-"En fil som krävs för publiceringen saknas. Därför kan publiceringen till "
-"Picasa inte fortsätta."
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
-#: plugins/shotwell-publishing/FacebookPublishing.vala:347
-msgid "Creating album..."
-msgstr "Skapar album..."
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:659
-#, c-format
-msgid "You are logged into Picasa Web Albums as %s."
-msgstr "Du är inloggad på Picasa webbalbum som %s."
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
-msgid "Videos will appear in:"
-msgstr "Filmer kommer att visas i:"
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:670
-msgid "Photos will appear in:"
-msgstr "Bilder kommer att visas i:"
+#: ../src/searches/SavedSearchDialog.vala:719
+msgid "any"
+msgstr "någon"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "Liten (640 x 480 bildpunkter)"
+#: ../src/searches/SavedSearchDialog.vala:720
+msgid "all"
+msgstr "alla"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "Medel (1024 x 768 bildpunkter)"
+#: ../src/searches/SavedSearchDialog.vala:721
+msgid "none"
+msgstr "ingen"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Rekommenderad (1600 x 1200 bildpunkter)"
+#: ../src/searches/SearchBoolean.vala:157
+msgid "Any text"
+msgstr "Valfri text"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Google+ (2048 x 1536 pixlar)"
+#: ../src/searches/SearchBoolean.vala:160
+msgid "Title"
+msgstr "Titel"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:63
-msgid ""
-"You are not currently logged into Facebook.\n"
-"\n"
-"If you don't yet have a Facebook account, you can create one during the "
-"login process. During login, Shotwell Connect may ask you for permission to "
-"upload photos and publish to your feed. These permissions are required for "
-"Shotwell Connect to function."
-msgstr ""
-"Du är för närvarande inte inloggad på Facebook.\n"
-"\n"
-"Om du ännu inte har ett Facebook-konto så kan du skapa ett under "
-"inloggningsprocessen. Under inloggningen kan Shotwell fråga dig om "
-"behörighet att skicka upp bilder och publicera till din logg. Dessa "
-"behörigheter krävs för att Shotwell Connect ska fungera."
+#: ../src/searches/SearchBoolean.vala:163
+msgid "Tag"
+msgstr "Etikett"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:65
-msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Du har redan loggat in och ut från Facebook under denna Shotwell-session.\n"
-"För att fortsätta att publicera på Facebook, starta om Shotwell och försök "
-"att publicera igen."
+#: ../src/searches/SearchBoolean.vala:166
+msgid "Comment"
+msgstr "Kommentar"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:86
-msgid "Standard (720 pixels)"
-msgstr "Standard (720 pixlar)"
+#: ../src/searches/SearchBoolean.vala:169
+msgid "Event name"
+msgstr "Händelsenamn"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:89
-msgid "Large (2048 pixels)"
-msgstr "Stor (2048 pixlar)"
+#: ../src/searches/SearchBoolean.vala:172
+msgid "File name"
+msgstr "Filnamn"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:254
-msgid "Testing connection to Facebook..."
-msgstr "Testar anslutningen till Facebook..."
+#: ../src/searches/SearchBoolean.vala:175
+msgid "Media type"
+msgstr "Mediatyp"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:374
-msgid ""
-"A file required for publishing is unavailable. Publishing to Facebook can't "
-"continue."
-msgstr ""
-"En fil som krävs för publiceringen saknas. Därför kan publiceringen till "
-"Facebook inte fortsätta."
+#: ../src/searches/SearchBoolean.vala:178
+msgid "Flag state"
+msgstr "Flaggtillstånd"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1019
-#, c-format
-msgid ""
-"You are logged into Facebook as %s.\n"
-"\n"
+#: ../src/searches/SearchBoolean.vala:181
+msgid "Photo state"
 msgstr ""
-"Du är inloggad på Facebook som %s.\n"
-"\n"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1020
-msgid "Where would you like to publish the selected photos?"
-msgstr "Var vill du publicera de markerade bildera?"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1021
-msgid "Upload _size:"
-msgstr "_Storlek att ladda upp:"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1181
-msgid "Friends"
-msgstr "Vänner"
 
-#: plugins/shotwell-transitions/CrumbleEffect.vala:20
-msgid "Crumble"
-msgstr "Smula sönder"
-
-#: plugins/shotwell-transitions/ChessEffect.vala:20
-msgid "Chess"
-msgstr "Schackrutig"
-
-#: plugins/shotwell-transitions/CirclesEffect.vala:20
-msgid "Circles"
-msgstr "Cirklar"
-
-#: plugins/shotwell-transitions/BlindsEffect.vala:20
-msgid "Blinds"
-msgstr "Persienner"
-
-#: plugins/shotwell-transitions/StripesEffect.vala:20
-msgid "Stripes"
-msgstr "Randig"
-
-#: plugins/shotwell-transitions/ClockEffect.vala:20
-msgid "Clock"
-msgstr "Klocka"
-
-#: plugins/shotwell-transitions/CircleEffect.vala:20
-msgid "Circle"
-msgstr "Cirkel"
-
-#: plugins/shotwell-transitions/shotwell-transitions.vala:28
-msgid "Core Slideshow Transitions"
-msgstr "Standardövergångar för bildspel"
-
-#: plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
-msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
-
-#: plugins/shotwell-transitions/SlideEffect.vala:20
-msgid "Slide"
-msgstr "Glid"
-
-#: plugins/shotwell-transitions/FadeEffect.vala:20
-msgid "Fade"
-msgstr "Tona ut"
-
-#: plugins/shotwell-transitions/SquaresEffect.vala:20
-msgid "Squares"
-msgstr "Rutor"
+#: ../src/searches/SearchBoolean.vala:187
+msgid "Date"
+msgstr "Datum"
 
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Core Data-importtjänster"
+#: ../src/sidebar/Tree.vala:189
+msgid "New _Tag..."
+msgstr "_Ny etikett..."
 
-#: 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 ""
-"Välkommen till tjänsten för import av F-Spot-bilbliotek.\n"
-"\n"
-"Välj ett bibliotek att importera, antingen det som Shotwell automatiskt "
-"hittar, eller ett du väljer manuellt."
+#: ../src/slideshow/Slideshow.vala:22
+msgid "Slideshow Transitions"
+msgstr "Bildspelsövergångar"
 
-#: 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 ""
-"Välkommen till tjänsten för import av F-Spot-bilbliotek.\n"
-"\n"
-"Välj en F-Spot-databasfil."
+#: ../src/slideshow/TransitionEffects.vala:98
+msgid "(None)"
+msgstr "(Ingen)"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Välj manuellt den F-Spot-databasfil du vill importera:"
+#: ../src/slideshow/TransitionEffects.vala:287
+msgid "None"
+msgstr "Ingen"
 
-#: 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 ""
-"Det går inte att öppna den F-Spot-databasfil som du har valt: antingen "
-"saknas filen, eller så är det inte en F-Spot-databas."
+#: ../src/slideshow/TransitionEffects.vala:339
+msgid "Random"
+msgstr "Slumpmässigt"
 
-#: 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 ""
-"Det går inte att öppna den valda F-Spot-databasfilen: den här versionen av F-"
-"Spot-databasen stöds inte av Shotwell"
+#: ../src/tags/Branch.vala:127
+msgid "Tags"
+msgstr "Etiketter"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Det går inte att läsa den valda F-Spot-databasfilen: ett fel uppstod när "
-"etikettabellen skulle läsas."
+#: ../ui/set_background_dialog.glade.h:1
+#, fuzzy
+#| msgid "Set as _Desktop Background"
+msgid "Set as Desktop Background"
+msgstr "Ange som skrivbords_bakgrund"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
+#: ../ui/set_background_dialog.glade.h:2
+#: ../ui/set_background_slideshow_dialog.glade.h:6
+msgid "Use for Desktop"
 msgstr ""
-"Det går inte att läsa den valda F-Spot-databasfilen: ett fel uppstod när "
-"bildtabellen skulle läsas."
 
-#: 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."
+#: ../ui/set_background_dialog.glade.h:3
+#: ../ui/set_background_slideshow_dialog.glade.h:7
+msgid "Use for Lock Screen"
 msgstr ""
-"Shotwell har hittat %d bilder i F-Spot-biblioteket och importerar dem nu. "
-"Dubbletter kommer att hittas och tas bort automatiskt.\n"
-"\n"
-"Du kan stänga den här dialogrutan. Importen kommer att fortsätta bakgrunden."
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:84
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "F-Spot-bibliotek: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:416
-msgid "Preparing to import"
-msgstr "Förbereder import"
-
-#: ui/set_background_dialog.glade:14
+#: ../ui/set_background_slideshow_dialog.glade.h:1
 msgid "Set as Desktop Slideshow"
 msgstr "Ange som skrivbordsbildspel"
 
-#: ui/set_background_dialog.glade:55
-msgid "Generate desktop background slideshow"
-msgstr "Skapa bildspel för skrivbordsbakgrunden"
-
-#: ui/set_background_dialog.glade:82
+#: ../ui/set_background_slideshow_dialog.glade.h:2
 msgid "Show each photo for"
 msgstr "Visa varje bild i"
 
-#: ui/set_background_dialog.glade:94
+#: ../ui/set_background_slideshow_dialog.glade.h:3
 msgid "period of time"
 msgstr "tidsperiod"
 
-#: ui/set_background_dialog.glade:116
+#: ../ui/set_background_slideshow_dialog.glade.h:4
+msgid "Generate desktop background slideshow"
+msgstr "Skapa bildspel för skrivbordsbakgrunden"
+
+#: ../ui/set_background_slideshow_dialog.glade.h:5
 msgid "How long each photo is shown on the desktop background"
 msgstr "Hur länge varje bild ska visas på skrivbordsbakgrunden"
 
-#: ui/shotwell.glade:7
-msgid "Search"
-msgstr "Sök"
-
-#: ui/shotwell.glade:47
+#: ../ui/shotwell.glade.h:1
 msgid "_Name of search:"
 msgstr "_Namn på sökningen:"
 
-#: ui/shotwell.glade:108
+#: ../ui/shotwell.glade.h:2
 msgid "_Match"
 msgstr "_Matcha"
 
-#: ui/shotwell.glade:137
+#: ../ui/shotwell.glade.h:3
 msgid "of the following:"
 msgstr "följande:"
 
-#: ui/shotwell.glade:218
+#: ../ui/shotwell.glade.h:4
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Storlek på utskriften</b>"
 
-#: ui/shotwell.glade:235
+#: ../ui/shotwell.glade.h:5
 msgid "Use a _standard size:"
 msgstr "Använd en _standardstorlek:"
 
-#: ui/shotwell.glade:278
+#: ../ui/shotwell.glade.h:6
 msgid "Use a c_ustom size:"
 msgstr "Använd en _anpassad storlek:"
 
-#: ui/shotwell.glade:368
+#: ../ui/shotwell.glade.h:7
 msgid "_Match photo aspect ratio"
 msgstr "_Matcha sidförhållande"
 
-#: ui/shotwell.glade:392
+#: ../ui/shotwell.glade.h:8
 msgid "_Autosize:"
 msgstr "_Automatisk storlek:"
 
-#: ui/shotwell.glade:432
+#: ../ui/shotwell.glade.h:9
 msgid "<b>Titles</b>"
 msgstr "<b>Titlar</b>"
 
-#: ui/shotwell.glade:449
+#: ../ui/shotwell.glade.h:10
 msgid "Print image _title"
 msgstr "Skriv ut bild _titel"
 
-#: ui/shotwell.glade:493
+#: ../ui/shotwell.glade.h:11
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Upplösning</b>"
 
-#: ui/shotwell.glade:513
+#: ../ui/shotwell.glade.h:12
 msgid "_Output photo at:"
 msgstr "_Skriv ut bild till:"
 
-#: ui/shotwell.glade:548
+#: ../ui/shotwell.glade.h:13
 msgid "pixels per inch"
 msgstr "pixlar per tum"
 
-#: ui/shotwell.glade:581 ui/shotwell.glade:623
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:27
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:27
-msgid "label"
-msgstr "etikett"
-
-#: ui/shotwell.glade:719
+#: ../ui/shotwell.glade.h:15
 msgid "Shotwell Preferences"
 msgstr "Inställningar för Shotwell"
 
-#: ui/shotwell.glade:796
+#: ../ui/shotwell.glade.h:16
 msgid "white"
 msgstr "vit"
 
-#: ui/shotwell.glade:823
+#: ../ui/shotwell.glade.h:17
 msgid "black"
 msgstr "svart"
 
-#: ui/shotwell.glade:871
+#: ../ui/shotwell.glade.h:19
 msgid "_Watch library directory for new files"
 msgstr "_Bevaka biblioteksmappen efter nya filer"
 
-#: ui/shotwell.glade:900
+#: ../ui/shotwell.glade.h:20
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ui/shotwell.glade:920
+#: ../ui/shotwell.glade.h:21
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "Skriv etiketter, titlar och annan _metadata till bildfilerna"
 
-#: ui/shotwell.glade:946
+#: ../ui/shotwell.glade.h:22
 msgid "Display"
 msgstr "Visning"
 
-#: ui/shotwell.glade:967
+#: ../ui/shotwell.glade.h:23
 msgid "_Import photos to:"
 msgstr "_Importera bilder till:"
 
-#: ui/shotwell.glade:990
+#: ../ui/shotwell.glade.h:24
 msgid "_Background:"
 msgstr "_Bakgrund:"
 
-#: ui/shotwell.glade:1013
+#: ../ui/shotwell.glade.h:25
 msgid "Importing"
 msgstr "Import"
 
-#: ui/shotwell.glade:1036
+#: ../ui/shotwell.glade.h:26
 msgid "_Directory structure:"
 msgstr "_Mappstruktur:"
 
-#: ui/shotwell.glade:1075
+#: ../ui/shotwell.glade.h:27
 msgid "_Pattern:"
 msgstr "_Mönster:"
 
-#: ui/shotwell.glade:1157
+#: ../ui/shotwell.glade.h:28
 msgid "Example:"
 msgstr "Exempel:"
 
-#: ui/shotwell.glade:1174
+#: ../ui/shotwell.glade.h:29
 msgid "R_ename imported files to lowercase"
 msgstr "B_yt namn på importerade filer till enbart gemener"
 
-#: ui/shotwell.glade:1203
+#: ../ui/shotwell.glade.h:30
 msgid "RAW Developer"
 msgstr "RAW-redigerare"
 
-#: ui/shotwell.glade:1238
+#: ../ui/shotwell.glade.h:31
 msgid "De_fault:"
 msgstr "_Standard:"
 
-#: ui/shotwell.glade:1292
+#: ../ui/shotwell.glade.h:33
 msgid "E_xternal photo editor:"
 msgstr "E_xtern bildredigerare:"
 
-#: ui/shotwell.glade:1308
+#: ../ui/shotwell.glade.h:34
 msgid "External _RAW editor:"
 msgstr "Extern _RAW-redigerare:"
 
-#: ui/shotwell.glade:1373
+#: ../ui/shotwell.glade.h:35
 msgid "External Editors"
 msgstr "Externa redigerare"
 
-#: ui/shotwell.glade:1400
+#: ../ui/shotwell.glade.h:36
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
-#: ui/shotwell.glade:1469
+#: ../ui/shotwell.glade.h:37
 msgid "_Delay:"
 msgstr "_Fördröjning:"
 
-#: ui/shotwell.glade:1485
+#: ../ui/shotwell.glade.h:38
 msgid "_Transition effect:"
 msgstr "_Övergångseffekt:"
 
-#: ui/shotwell.glade:1501
+#: ../ui/shotwell.glade.h:39
 msgid "Transition d_elay:"
 msgstr "_Övergångsfördröjning:"
 
-#: ui/shotwell.glade:1513
+#: ../ui/shotwell.glade.h:40
 msgid "Show t_itle"
 msgstr "_Visa rubrik"
 
-#: ui/shotwell.glade:1603 ui/shotwell.glade:1616
+#: ../ui/shotwell.glade.h:41
 msgid "seconds"
 msgstr "sekunder"
 
-#: ui/shotwell.glade:1696
-msgid "_Login"
-msgstr "_Logga in"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:21
-msgid ""
-" (text depends on fb username and is modified in the app - \n"
-"anything put into this field won't display)"
-msgstr ""
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:39
-msgid "Publish to an e_xisting album:"
-msgstr "Publicera till ett _befintligt album:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:57
-msgid "Create a _new album named:"
-msgstr "Skapa ett _nytt album med namnet:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:139
-msgid "Videos and new photo albums _visible to:"
-msgstr "Videor och nya fotoalbum är _synliga för:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:175
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:102
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:178
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:226
-msgid ""
-"_Remove location, camera, and other identifying information before uploading"
-msgstr ""
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:197
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:137
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:229
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:99
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:115
-msgid "_Logout"
-msgstr "_Logga ut"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:212
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:153
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:243
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:115
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:129
-msgid "_Publish"
-msgstr "_Publicera"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:16
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:37
-msgid "Authorization _Number:"
-msgstr ""
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:19
-msgid ""
-"You are logged into Flickr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-msgstr ""
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:44
-msgid "_visibility label (populated in the code)"
-msgstr ""
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:61
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:60
-msgid "Photo _size:"
-msgstr "Bild_storlek:"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:18
-msgid ""
-"'you are logged in as $name'\n"
-"(populated in the application code)"
-msgstr ""
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:75
-msgid "An _existing album:"
-msgstr "Ett _befintligt album:"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:94
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:52
-msgid "A _new album named:"
-msgstr "Ett _nytt album med namnet:"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:113
-msgid "L_ist album in public gallery"
-msgstr "L_ista album i publikt galleri"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:134
-msgid ""
-"$mediatype will appear in\n"
-"(populated in code)"
-msgstr ""
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:150
-msgid "Photo _size preset:"
-msgstr "Förval för foto_storlek:"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:49
-msgid "_URL of your Piwigo photo library"
-msgstr "_URL till ditt Piwigo-fotobibliotek"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:59
-msgid "User _name"
-msgstr "Användar_namn"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:73
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:59
-msgid "_Password"
-msgstr "_Lösenord"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:130
-msgid "_Remember Password"
-msgstr "_Kom ihåg lösenord"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:151
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:107
-msgid "Login"
-msgstr "Logga in"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:40
-msgid "An _existing category:"
-msgstr "En _befintlig kategori:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:121
-msgid "Photos will be _visible by:"
-msgstr "Foton kommer att kunna _ses av:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:149
-msgid "Photo size:"
-msgstr "Foto_storlek:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:176
-msgid "within category:"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:210
-msgid "Album comment:"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:242
-msgid "_If a title is set and comment unset, use title as comment"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:258
-msgid "_Do no upload tags"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:278
-msgid "Logout"
-msgstr "Logga ut"
-
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:55
-msgid "Video privacy _setting:"
-msgstr "Integritetsinställningar för video:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:38
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:109
-msgid "1280 x 853 pixels"
-msgstr "1280 x 853 pixlar"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:313
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:323
-#, c-format
-msgid "'%s' isn't a valid response to an OAuth authentication request"
-msgstr "'%s' är inte ett giltigt svar på autentiseringsförsöket med OAuth."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:561
-msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): går inte att starta. Detta publiceringsverktyg "
-"går inte att starta om."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:589
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr "Fyll i användarnamn och lösenord för ditt Tumblr-konto."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:639
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:760
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "Kunde inte ladda användargränssnittet: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:742
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Du är inloggad på Tumblr som %s.\n"
-"\n"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:24
-msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:27
-msgid "Visit the Yandex.Fotki web site"
-msgstr "Besök webbplatsen för Yandex.Fotki"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:635
-msgid "You are not currently logged into Yandex.Fotki."
-msgstr "Du är för närvarande inte inloggad på Yandex.Fotki."
-
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:49
-msgid "_Email address"
-msgstr "_E-postadress"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:19
-msgid ""
-"You are logged into Tumblr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-msgstr ""
-"Du är nu inloggad på Tumblr som (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:43
-msgid "Blogs:"
-msgstr "Bloggar:"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:24
-msgid "_Albums (or write new):"
-msgstr "_Album (eller skriv nytt):"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:38
-msgid "Access _type:"
-msgstr "Åtkomst_typ:"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:81
-msgid "Disable _comments"
-msgstr "Inaktivera _kommentarer"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:96
-msgid "_Forbid downloading original photo"
-msgstr "_Förbjud nedladdning av ursprunglig bild"
+#, fuzzy
+#~| msgid ""
+#~| "A file required for publishing is unavailable. Publishing to Flickr "
+#~| "can't continue."
+#~ msgid "A file required for publishing is unavailable. Publishing to "
+#~ msgstr ""
+#~ "En fil som krävs för publiceringen saknas. Därför kan publiceringen till "
+#~ "Flickr inte fortsätta."
+
+#~ msgid "Import media _from:"
+#~ msgstr "Importera mediafiler från:"
+
+#~ msgid "Only _Remove"
+#~ msgstr "Ta _endast bort"
+
+#~ msgid "Shotwell is configured to import photos to your home directory.\n"
+#~ msgstr ""
+#~ "Shotwell har ställts in till att importera bilder till din hemmapp.\n"
+
+#~ msgid ""
+#~ "You are logged into Tumblr as (name).\n"
+#~ "\n"
+#~ "(this label's string is populated and set inside the code, \n"
+#~ "so changes made here will not display)"
+#~ msgstr ""
+#~ "Du är nu inloggad på Tumblr som (name).\n"
+#~ "\n"
+#~ "(this label's string is populated and set inside the code, \n"
+#~ "so changes made here will not display)"
diff --git a/po/vi.po b/po/vi.po
index 662d47e..31ad5a6 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,632 +1,1435 @@
 # po/shotwell-core/shotwell.pot
 # PO message string template file for Shotwell Core Components
-# Copyright (C) 2009-2013 Yorba Foundation
+# Copyright (C) 2009-2015 Yorba Foundation
 # See COPYING for license.
 #
 #
 # Translators:
-# Lê Trường An <truongan@linuxmail.org>, 2011
+# Lê Trường An <truongan@linuxmail.org>, 2011, 2012
 # Vu Hung Nguyen <vuhung16plus@gmail.com>, 2011
 # truong <truongungminh@gmail.com>, 2012
-# Lê Trường An <truongan@linuxmail.org>, 2011, 2012
-#, fuzzy
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2015.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: shotwell-0.15\n"
-"Report-Msgid-Bugs-To: shotwell@yorba.org\n"
-"POT-Creation-Date: 2013-09-20 11:55-0700\n"
-"PO-Revision-Date: 2013-09-20 19:30+0000\n"
-"Last-Translator: yorbajim <jim@yorba.org>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/shotwell/"
-"language/vi/)\n"
+"Project-Id-Version: shotwell master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
+"POT-Creation-Date: 2015-03-19 23:55+0000\n"
+"PO-Revision-Date: 2015-03-20 08:40+0700\n"
+"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
+"Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/Event.vala:737
-#, c-format
-msgid "Event %s"
-msgstr ""
+#: ../plugins/common/RESTSupport.vala:424
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
+msgid "A temporary file needed for publishing is unavailable"
+msgstr "Tập tin tạm là cần thiết để xuất bản lại không sẵn sàng"
 
-#: src/camera/Branch.vala:87
-msgid "Cameras"
-msgstr "Máy ảnh"
+#: ../plugins/common/RESTSupport.vala:1138
+msgid ""
+"You have already logged in and out of a Google service during this Shotwell "
+"session.\n"
+"\n"
+"To continue publishing to Google services, quit and restart Shotwell, then "
+"try publishing again."
+msgstr ""
+"Bạn đã đăng nhập và xuất khỏi dịch vụ Google trong suốt phiên làm việc "
+"Shotwell này.\n"
+"\n"
+"Để tiếp tục xuất bản đến dịch vụ Google, thoát và khởi động lại Shotwell, "
+"sau đó lại xuất bản lần nữa."
 
-#: src/camera/Branch.vala:101 src/camera/ImportPage.vala:711
-#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:300
-#: src/MediaPage.vala:425
-msgid "Camera"
-msgstr "Camera"
+#: ../plugins/common/Resources.vala:9
+msgid "Visit the Shotwell home page"
+msgstr "Viếng thăm trang thông tin điện tử của Shotwell"
 
-#: src/camera/ImportPage.vala:312 src/Properties.vala:227
-#, c-format
-msgid "RAW+JPEG"
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
+msgid "translator-credits"
+msgstr "Nhóm dịch GNOME <gnome-vi-list@gnome.org>"
+
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:32
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:34
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:32
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
+#: ../src/Resources.vala:27
+msgid "Copyright 2009-2015 Yorba Foundation"
+msgstr "Bản quyền (C) 2009-2015 Quỹ Yorba"
+
+#: ../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 ""
+"Chào mừng dùng dịch vụ nhập thư viện F-Spot.\n"
+"\n"
+"Vui lòng chọn thư viện muốn nhập vào, hoặc là chọn một thư viện được "
+"Shotwell tìm thấy hoặc là chọn một tập tin cơ sở dữ liệu F-Spot thay thế."
 
-#: src/camera/ImportPage.vala:459
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:58
 msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
+"Welcome to the F-Spot library import service.\n"
+"\n"
+"Please select an F-Spot database file."
 msgstr ""
-"Không thể tháo gắn kết máy ảnh. Thử tháo gắn kết từ trình quản lí tập tin."
+"Chào mừng dùng dịch vụ nhập thư viện F-Spot.\n"
+"\n"
+"Vui lòng chọn tập tin cơ sở dữ liệu F-Spot."
 
-#: src/camera/ImportPage.vala:776
-msgid "Hide photos already imported"
-msgstr "Ẩn các ảnh đã nhập"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
+msgid "Manually select an F-Spot database file to import:"
+msgstr "Chọn tập tin cơ sở dữ liệu F-Spot để nhập vào một cách thủ công:"
 
-#: src/camera/ImportPage.vala:777
-msgid "Only display photos that have not been imported"
-msgstr "Chỉ hiện các ảnh chưa nhập"
+#: ../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 ""
+"Không thể mở tập tin cơ sở dữ liệu F-Spot đã chọn: tập tin không tồn tại "
+"hoặc không phải là cơ sở dữ liệu F-Spot"
 
-#: src/camera/ImportPage.vala:845
-msgid "Starting import, please wait..."
+#: ../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 ""
+"Không thể mở tập tin cơ sở dữ liệu F-Spot đã chọn: phiên bản cơ sở dữ liệu F-"
+"Spot không được Shotwell hỗ trợ"
 
-#: src/camera/ImportPage.vala:872 src/MediaPage.vala:436
-msgid "_Titles"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading tags table"
 msgstr ""
+"Không thể đọc tập tin cơ sở dữ liệu F-Spot đã chọn: có lỗi xảy ra khi đọc "
+"bảng thẻ"
 
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:437
-msgid "Display the title of each photo"
-msgstr "Hiện tựa đề của mỗi ảnh"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:68
+msgid ""
+"Cannot read the selected F-Spot database file: error while reading photos "
+"table"
+msgstr ""
+"Không thể đọc tập tin cơ sở dữ liệu F-Spot đã chọn: có lỗi xảy ra khi đọc "
+"bảng ảnh"
 
-#: src/camera/ImportPage.vala:884
-msgid "Import _Selected"
+#: ../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 ""
+"Shotwell đã tìm được %d ảnh trong thư viện F-Spot và hiện đang nhập chúng "
+"vào. Việc trùng lặp sẽ được tìm ra một cách tự động và sẽ bị gỡ bỏ.\n"
+"\n"
+"Bạn có thể đóng cửa sổ hộp thoại này và bắt đầu dùng Shotwell trong việc "
+"nhập được thực hiện ở dưới nền hệ thống."
 
-#: src/camera/ImportPage.vala:885
-msgid "Import the selected photos into your library"
-msgstr "Nhập những ảnh đã chọn vào thư viện"
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
+#, c-format
+msgid "F-Spot library: %s"
+msgstr "Thư viện F-Spot: %s"
 
-#: src/camera/ImportPage.vala:890
-msgid "Import _All"
-msgstr ""
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
+msgid "Preparing to import"
+msgstr "Chuẩn bị nhập"
 
-#: src/camera/ImportPage.vala:891
-msgid "Import all the photos into your library"
-msgstr "Nhập tất cả ảnh vào thư viện"
+#: ../plugins/shotwell-data-imports/shotwell-data-imports.vala:22
+msgid "Core Data Import Services"
+msgstr "Dịch vụ nhập khẩu dữ liệu lõi"
 
-#: src/camera/ImportPage.vala:1012
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+msgid "Gallery3 publishing module"
+msgstr "Mô-đun xuất bản Gallery3"
+
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
 msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
+"You are not currently logged into your Gallery.\n"
+"\n"
+"You must have already signed up for a Gallery3 account to complete the login "
+"process."
 msgstr ""
+"Bạn chưa đăng nhập vào Gallery.\n"
+"\n"
+"Bạn phải đăng ký tài khoản ở Gallery3 để hoàn tất quá trình đăng nhập."
 
-#: src/camera/ImportPage.vala:1018
-msgid "_Unmount"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: ../src/MediaPage.vala:435 ../src/photos/RawSupport.vala:300
+msgid "Shotwell"
+msgstr "Shotwell"
 
-#: src/camera/ImportPage.vala:1023
-msgid "Please unmount the camera."
-msgstr "Vui lòng tháo gắn kết máy ảnh."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+msgid "Shotwell default directory"
+msgstr "Thư mục Shotwell mặc định"
 
-#: src/camera/ImportPage.vala:1028
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:801
+#, c-format
 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."
+"\n"
+"\n"
+"The file \"%s\" may not be supported by or may be too large for this "
+"instance of Gallery3."
 msgstr ""
-"Máy ảnh này bị khoá bởi ứng dụng khác. Shotwell chỉ có thể truy cập vào máy "
-"ảnh khi nó được mở khoá. Vui lòng đóng ứng dụng khác nếu nó dùng máy ảnh và "
-"thử lại."
+"\n"
+"\n"
+"Tập tin \"%s\" có lẽ không được hỗ trợ hoặc là nó quá lớn với minh dụ này "
+"của Gallery3."
 
-#: src/camera/ImportPage.vala:1038
-msgid "Please close any other application using the camera."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:802
+msgid ""
+"\n"
+"Note that Gallery3 only supports the video types that Flowplayer does."
 msgstr ""
+"\n"
+"Chú ý rằng Gallery3 chỉ hỗ trợ kiểu phim mà Flowplayer thực hiện được."
 
-#: src/camera/ImportPage.vala:1043
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
 #, c-format
 msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
+"A file required for publishing is unavailable. Publishing to %s can't "
+"continue."
 msgstr ""
+"Tập tin được yêu cầu cho việc xuất bản không sẵn sàng. Việc xuất bản lên %s "
+"không thể tiếp tục được."
 
-#: src/camera/ImportPage.vala:1060
-msgid "Unmounting..."
-msgstr "Đang tháo gắn kết..."
+#. populate any widgets whose contents are
+#. programmatically-generated
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
+#, c-format
+msgid "Publishing to %s as %s."
+msgstr "Xuất bản đến %s là %s."
 
-#: src/camera/ImportPage.vala:1166
-msgid "Fetching photo information"
-msgstr "Đang nạp thông tin ảnh"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
+msgid ""
+"Enter the URL for your Gallery3 site and the username and password (or API "
+"key) for your Gallery3 account."
+msgstr ""
+"Nhập địa chỉ URL cho địa chỉ Gallery3 của bạn và tài khoản và mật khẩu (hay "
+"khóa API) cho tài khoản Gallery3 của bạn."
 
-#: src/camera/ImportPage.vala:1521
-#, c-format
-msgid "Fetching preview for %s"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
+msgid ""
+"The username and password or API key were incorrect. To try again, re-enter "
+"your username and password below."
 msgstr ""
+"Tài khoản và mật khẩu hay khóa API không đúng. Hãy thử lại, nhập lại tài "
+"khoản và mật khẩu vào dưới đây."
 
-#: src/camera/ImportPage.vala:1637
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "Không thể khoá máy ảnh: %s"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
+msgid ""
+"The URL entered does not appear to be the main directory of a Gallery3 "
+"instance. Please make sure you typed it correctly and it does not have any "
+"trailing components (e.g., index.php)."
+msgstr ""
+"URL đã nhập có vẻ không phải là thư mục chính của minh dụ Gallery3. Hãy chắc "
+"chắn là bạn gõ vào đúng và không chứa các thành phần thừa nào (như là index."
+"php chẳng hạn)."
 
-#: src/camera/ImportPage.vala:1722
-#, c-format
-msgid "Delete this photo from camera?"
-msgid_plural "Delete these %d photos from camera?"
-msgstr[0] "Xoá %d ảnh này khỏi máy ảnh?"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
+msgid "Unrecognized User"
+msgstr "Không nhận ra người dùng"
 
-#: src/camera/ImportPage.vala:1725
-#, c-format
-msgid "Delete this video from camera?"
-msgid_plural "Delete these %d videos from camera?"
-msgstr[0] "Xoá %d đoạn video khỏi máy ảnh?"
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
+msgid " Site Not Found"
+msgstr " Không tìm thấy trang"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
+msgid "Copyright (C) 2013 rajce.net"
+msgstr "Tác quyền (C) năm 2013 rajce.net"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
+msgid "An error message occurred when publishing to Rajce. Please try again."
+msgstr "Có lỗi xảy ra khi xuất bản lên Rajce. Vui lòng thử lại."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
+msgid "Enter email and password associated with your Rajce account."
+msgstr "Nhập vào thư và mật khẩu liên đới đến tài khoản Rajce của bạn."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
+msgid "Invalid email and/or password. Please try again"
+msgstr "Hộp thư điện tử hoặc mật khẩu không hợp lệ. Vui lòng thử lại"
 
-#: src/camera/ImportPage.vala:1728
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
+msgid "Invalid User Email or Password"
+msgstr "Tên tài khoản hoặc mật khẩu không hợp lệ"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:890
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:2
+msgid "_Email address"
+msgstr "Đị_a chỉ thư :"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:891
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:3
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
+msgid "_Password"
+msgstr "_Mật khẩu"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
+msgid "_Remember"
+msgstr "_Nhớ mật khẩu"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
+msgid "Login"
+msgstr "Đăng nhập"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:5
+msgid "_Hide album"
+msgstr "Ẩ_n tuyển tập ảnh"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
-msgid "Delete this photo/video from camera?"
-msgid_plural "Delete these %d photos/videos from camera?"
-msgstr[0] "Xoá %d ảnh/video khỏi máy ảnh?"
+msgid "You are logged into Rajce as %s."
+msgstr "Bạn đã đăng nhập Rajce với tên %s."
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
+msgid "Photos will appear in:"
+msgstr "Ảnh sẽ xuất hiện trong:"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
+msgid "An _existing album:"
+msgstr "Tuyển tập ảnh _sẵn có:"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
+msgid "A _new album named:"
+msgstr "Tê_n mới của album:"
 
-#: src/camera/ImportPage.vala:1731
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:6
+msgid "Open target _album in browser"
+msgstr "Mở tậ_p ảnh đích trong trình duyệt"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:8
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:4
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:7
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
+msgid "_Publish"
+msgstr "_Xuất bản"
+
+#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:3
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
+msgid "_Logout"
+msgstr "Đăng _xuất"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Bản quyền (C) 2012 BJA Electronics"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
+msgid "500 x 375 pixels"
+msgstr "500 x 375 điểm ảnh"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
+msgid "1024 x 768 pixels"
+msgstr "1024 x 768 điểm ảnh"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
+msgid "1280 x 853 pixels"
+msgstr "1280 x 853 điểm ảnh"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:310
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:320
 #, c-format
-msgid "Delete these files from camera?"
-msgid_plural "Delete these %d files from camera?"
-msgstr[0] "Xoá %d tập tin này khỏi máy ảnh?"
+msgid "'%s' isn't a valid response to an OAuth authentication request"
+msgstr "“%s” không phải là trả lời hợp lệ tới yêu cầu xác thực OAuth"
 
-#: src/camera/ImportPage.vala:1739 src/Dialogs.vala:1328
-msgid "_Keep"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:558
+msgid ""
+"TumblrPublisher: start( ): can't start; this publisher is not restartable."
 msgstr ""
+"TumblrPublisher: start( ): không thể khởi chạy; bộ xuất bản này không có khả "
+"năng khởi động lại."
 
-#: src/camera/ImportPage.vala:1758
-msgid "Removing photos/videos from camera"
-msgstr "Đang loại bỏ ảnh/video khỏi máy ảnh"
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "Nhập vào tài khoản và mật khẩu từ tài khoản Tumblr của bạn."
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
+msgid "Username and/or password invalid. Please try again"
+msgstr "Tên người dùng và/hoặc mật khẩu không hợp lệ. Vui lòng thử lại"
 
-#: src/camera/ImportPage.vala:1762
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:617
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
+msgid "Invalid User Name or Password"
+msgstr "Tên người dùng hay mật khẩu không hợp lệ"
+
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:636
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
 #, 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] "Không thể xoá %d ảnh/video khỏi máy ảnh do lỗi."
+msgid "Could not load UI: %s"
+msgstr "Không thể tải UI: %s"
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2623
-msgid "S_lideshow"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:739
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr "Bạn đã đăng nhập Tumblr với tên %s.\n"
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2624
-msgid "Play a slideshow"
-msgstr "Phát trình chiếu"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
+msgstr "Bản quyền (C) 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 
-#: src/CollectionPage.vala:456
-msgid "Export Photo/Video"
-msgstr "Xuất ảnh/video"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:25
+msgid "Visit the Yandex.Fotki web site"
+msgstr "Xem trang web của Yandex.Fotki"
 
-#: src/CollectionPage.vala:456
-msgid "Export Photos/Videos"
-msgstr "Xuất ảnh/video"
+#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:632
+msgid "You are not currently logged into Yandex.Fotki."
+msgstr "Hiện bạn chưa đăng nhập vào Yandex.Fotki."
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:58 src/PhotoPage.vala:3196
-msgid "Export Photo"
-msgstr "Xuất ảnh"
+#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+msgid "Shotwell Extra Publishing Services"
+msgstr "Dịch vụ xuất bản Shotwell mở rộng"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:87
-msgid "Export Photos"
-msgstr "Xuất ảnh"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
+msgid "Go _Back"
+msgstr "Trở _lại"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Rotating"
-msgstr "Xoay ảnh"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
+#: ../ui/shotwell.glade.h:42
+msgid "_Login"
+msgstr "Đăng nhậ_p"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Undoing Rotate"
-msgstr "Hủy thao tác xoay"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
+msgid "Intro message replaced at runtime"
+msgstr "Lời giới thiệu được thay thế lúc chạy"
 
-#: src/CollectionPage.vala:570
-msgid "Flipping Horizontally"
-msgstr "Rộng hơn theo chiều ngang"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
+msgid "_Gallery3 URL:"
+msgstr "_Gallery3 URL:"
 
-#: src/CollectionPage.vala:571
-msgid "Undoing Flip Horizontally"
-msgstr "Hủy thao tác làm rộng hơn theo chiều ngang"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
+msgid "_User name:"
+msgstr "Tài khoả_n:"
 
-#: src/CollectionPage.vala:580
-msgid "Flipping Vertically"
-msgstr "Làm rộng hơn theo chiều dọc"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
+msgid "_Password:"
+msgstr "_Mật khẩu:"
 
-#: src/CollectionPage.vala:581
-msgid "Undoing Flip Vertically"
-msgstr "Hủy thao tác làm rộng hơn theo chiều dọc"
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:7
+msgid "API _Key:"
+msgstr "_Khóa API:"
 
-#: src/searches/SearchBoolean.vala:157
-msgid "Any text"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
+msgid "or"
+msgstr "hoặc"
 
-#: src/searches/SearchBoolean.vala:160
-msgid "Title"
-msgstr "Tựa đề"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
+msgid "A _new album"
+msgstr "Tuyển tuyển tập ảnh _mới"
 
-#: src/searches/SearchBoolean.vala:163
-msgid "Tag"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
+msgid "An _existing album"
+msgstr "Tuyển tập ảnh _sẵn có"
 
-#: src/searches/SearchBoolean.vala:166
-msgid "Comment"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
+msgid "_Remove location, tag and camera-identifying data before uploading"
+msgstr "_Xóa bỏ vị trí, thẻ và dữ liệu định danh máy ảnh trước khi tải lên"
 
-#: src/searches/SearchBoolean.vala:169
-msgid "Event name"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
+msgid "'Publishing to $url as $username' (populated in application code)"
 msgstr ""
+"“Đang xuất bản lên $url trên danh nghĩa $username” (cư trú trong mã ứng dụng)"
 
-#: src/searches/SearchBoolean.vala:172
-msgid "File name"
-msgstr "Tên tập tin"
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
+msgid "Scaling constraint:"
+msgstr "Hằng số co giãn"
 
-#: src/searches/SearchBoolean.vala:175
-msgid "Media type"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
+msgid "pixels"
+msgstr "điểm ảnh"
 
-#: src/searches/SearchBoolean.vala:178
-msgid "Flag state"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
+#: ../src/Dimensions.vala:17
+msgid "Original size"
+msgstr "Kích cỡ gốc"
 
-#: src/searches/SearchBoolean.vala:181
-msgid "Photo state"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:10
+#: ../src/Dimensions.vala:20
+msgid "Width or height"
+msgstr "Rộng hoặc cao"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1003
-msgid "Rating"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
+#: ../ui/shotwell.glade.h:14
+msgid "label"
+msgstr "nhãn"
 
-#: src/searches/SearchBoolean.vala:187
-msgid "Date"
-msgstr "Ngày"
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
+msgid "Blogs:"
+msgstr "Blogs:"
 
-#: src/searches/SavedSearchDialog.vala:169
-msgid "contains"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:1
+msgid "Photo _size:"
+msgstr "_Cỡ ảnh:"
 
-#: src/searches/SavedSearchDialog.vala:170
-#: src/searches/SavedSearchDialog.vala:497
-msgid "is exactly"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
+msgid "you are logged in rajce as $name"
+msgstr "bạn đã đăng nhập vào rajce dưới tên $name"
 
-#: src/searches/SavedSearchDialog.vala:171
-msgid "starts with"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
+msgid "$mediatype will appear in"
+msgstr "$mediatype sẽ xuất hiện trong"
 
-#: src/searches/SavedSearchDialog.vala:172
-msgid "ends with"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
+msgid "_Albums (or write new):"
+msgstr "_Album (hoặc ghi mới):"
 
-#: src/searches/SavedSearchDialog.vala:173
-msgid "does not contain"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:2
+msgid "Access _type:"
+msgstr "_Kiểu truy cập:"
 
-#: src/searches/SavedSearchDialog.vala:174
-#: src/searches/SavedSearchDialog.vala:501
-msgid "is not set"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
+msgid "Disable _comments"
+msgstr "Tắt _bình luận"
 
-#: src/searches/SavedSearchDialog.vala:245
-#: src/searches/SavedSearchDialog.vala:376
-#: src/searches/SavedSearchDialog.vala:441
-msgid "is"
-msgstr "-"
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:4
+msgid "_Forbid downloading original photo"
+msgstr "_Không cho tải ảnh gốc"
 
-#: src/searches/SavedSearchDialog.vala:246
-msgid "is not"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
+msgid "Public"
+msgstr "Công cộng"
 
-#: src/searches/SavedSearchDialog.vala:252
-msgid "any photo"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:8
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1181
+msgid "Friends"
+msgstr "Bạn bè"
 
-#: src/searches/SavedSearchDialog.vala:253
-msgid "a raw photo"
-msgstr ""
+#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:9
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
+msgid "Private"
+msgstr "Riêng tư"
 
-#: src/searches/SavedSearchDialog.vala:254
-msgid "a video"
-msgstr ""
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:59
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1127
+msgid "Shotwell Connect"
+msgstr "Kết nối Shotwell"
 
-#: src/searches/SavedSearchDialog.vala:308
-msgid "has"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:63
+msgid ""
+"You are not currently logged into Facebook.\n"
+"\n"
+"If you don't yet have a Facebook account, you can create one during the "
+"login process. During login, Shotwell Connect may ask you for permission to "
+"upload photos and publish to your feed. These permissions are required for "
+"Shotwell Connect to function."
 msgstr ""
+"Bạn hiện tại chưa đăng nhập vào Facebook.\n"
+"\n"
+"Nếu bạn chưa có tài khoản Facebook, bạn có thể tạo nó khi thực hiện đăng "
+"nhập. Trong quá trình đăng nhập, Kết nối Shotwell có lẽ hỏi bạn quyền để tải "
+"ảnh lên và xuất bản đến phản hồi của bạn. Những quyền được yêu cầu cho Kết "
+"nối Shotwell đến hàm."
 
-#: src/searches/SavedSearchDialog.vala:309
-msgid "has no"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:65
+msgid ""
+"You have already logged in and out of Facebook during this Shotwell "
+"session.\n"
+"To continue publishing to Facebook, quit and restart Shotwell, then try "
+"publishing again."
 msgstr ""
+"Bạn đã đăng nhập và xuất khỏi dịch vụ Facebook trong suốt phiên làm việc "
+"Shotwell này.\n"
+"\n"
+"Để tiếp tục xuất bản đến dịch vụ Facebook, thoát và khởi động lại Shotwell, "
+"sau đó lại xuất bản lần nữa."
 
-#: src/searches/SavedSearchDialog.vala:314
-msgid "modifications"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:86
+msgid "Standard (720 pixels)"
+msgstr "Chuẩn (720 điểm ảnh)"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:89
+msgid "Large (2048 pixels)"
+msgstr "Rộng (2048 điểm ảnh)"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:254
+msgid "Testing connection to Facebook..."
+msgstr "Đang kiểm tra kết nối đến Facebook…"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:347
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
+msgid "Creating album..."
+msgstr "Đang tạo album…"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:374
+msgid ""
+"A file required for publishing is unavailable. Publishing to Facebook can't "
+"continue."
 msgstr ""
+"Tập tin được yêu cầu cho việc xuất bản không sẵn sàng. Việc xuất bản lên "
+"Facebook không thể tiếp tục được."
 
-#: src/searches/SavedSearchDialog.vala:315
-msgid "internal modifications"
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1019
+#, c-format
+msgid ""
+"You are logged into Facebook as %s.\n"
+"\n"
+msgstr "Bạn đã đăng nhập Facebook với tên %s.\n"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1020
+msgid "Where would you like to publish the selected photos?"
+msgstr "Bạn muốn xuất bản các ảnh đã chọn lên đâu?"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1021
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
+msgid "Upload _size:"
+msgstr "_Cỡ tải lên:"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
+msgid "Just me"
+msgstr "Cá nhân tôi"
+
+#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+msgid "Everyone"
+msgstr "Mọi người"
+
+#: ../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 ""
+"Bạn hiện chưa đăng nhập vào Flickr.\n"
+"\n"
+"Bấm vào “Đăng nhập” để đăng nhập vào Flickr trong trình duyệt Web của bạn. "
+"Bạn sẽ phải ủy quyền cho Kết nối Shotwell để liên kết với tài khoản Flickr "
+"của mình."
 
-#: src/searches/SavedSearchDialog.vala:316
-msgid "external modifications"
+#: ../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 ""
+"Bạn đã đăng nhập và xuất khỏi dịch vụ Flickr trong suốt phiên làm việc "
+"Shotwell này.\n"
+"\n"
+"Để tiếp tục xuất bản đến dịch vụ Flickr, thoát và khởi động lại Shotwell, "
+"sau đó lại xuất bản lần nữa."
 
-#: src/searches/SavedSearchDialog.vala:370
-msgid "flagged"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:375
+msgid "Preparing for login..."
+msgstr "Chuẩn bị đăng nhập…"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:444
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:595
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can't "
+"continue."
 msgstr ""
+"Tập tin được yêu cầu cho việc xuất bản không sẵn sàng. Việc xuất bản lên "
+"Flickr không thể tiếp tục được."
 
-#: src/searches/SavedSearchDialog.vala:371
-msgid "not flagged"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:457
+msgid "Verifying authorization..."
+msgstr "Đang thẩm tra xác thực…"
+
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1153
+#, c-format
+msgid ""
+"You are logged into Flickr as %s.\n"
+"\n"
 msgstr ""
+"Bạn đã đăng nhập Flickr với tên %s.\n"
+"\n"
 
-#: src/searches/SavedSearchDialog.vala:434
-msgid "and higher"
-msgstr "và cao hơn"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
+#, c-format
+msgid ""
+"Your free Flickr account limits how much data you can upload per month.\n"
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
+"Tài khoản Flickr miễn phí giới hạn lượng tải dữ liệu lên mỗi tháng.\n"
+"Tháng này bạn còn lại %d megabyte trong lượng hạn ngạch tải lên."
 
-#: src/searches/SavedSearchDialog.vala:435
-msgid "only"
-msgstr "chỉ"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
+msgid "Your Flickr Pro account entitles you to unlimited uploads."
+msgstr "Tài khoản Flickr Pro cho phép bạn tải lên không giới hạn."
 
-#: src/searches/SavedSearchDialog.vala:436
-msgid "and lower"
-msgstr "và thấp hơn"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
+msgid "Photos _visible to:"
+msgstr "Ảnh chỉ _dành cho:"
 
-#: src/searches/SavedSearchDialog.vala:498
-msgid "is after"
-msgstr "sau"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+msgid "Videos _visible to:"
+msgstr "Phim chỉ _dành cho:"
 
-#: src/searches/SavedSearchDialog.vala:499
-msgid "is before"
-msgstr "trước"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
+msgid "Photos and videos _visible to:"
+msgstr "Ảnh và phim chỉ _dành cho:"
 
-#: src/searches/SavedSearchDialog.vala:500
-msgid "is between"
-msgstr "giữa"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+msgid "Friends & family only"
+msgstr "Chỉ bạn bè và gia đình"
 
-#: src/searches/SavedSearchDialog.vala:513
-msgid "and"
-msgstr "và"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
+msgid "Family only"
+msgstr "Chỉ gia đình"
 
-#: src/searches/SavedSearchDialog.vala:720
-msgid "any"
-msgstr ""
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
+msgid "Friends only"
+msgstr "Chỉ bạn bè"
 
-#: src/searches/SavedSearchDialog.vala:721
-msgid "all"
-msgstr "tất cả"
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
+msgid "2048 x 1536 pixels"
+msgstr "2048 x 1536 điểm ảnh"
 
-#: src/searches/SavedSearchDialog.vala:722
-msgid "none"
-msgstr ""
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
+msgid "4096 x 3072 pixels"
+msgstr "4096 x 3072 điểm ảnh"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:58
+msgid ""
+"You are not currently logged into Picasa Web Albums.\n"
+"\n"
+"Click Login to log into Picasa Web Albums in your Web browser. You will have "
+"to authorize Shotwell Connect to link to your Picasa Web Albums account."
 msgstr ""
+"Bạn hiện chưa đăng nhập vào Picasa Web Albums.\n"
+"\n"
+"Bấm vào Đăng nhập để đăng nhập vào Picasa Web Albums bằng trình duyệt của "
+"bạn. Bạn sẽ phải ủy quyền Kết nối Shotwell liên kết đến tài khoản Picasa Web "
+"Albums của bạn."
 
-#: src/searches/Branch.vala:77 src/library/LibraryWindow.vala:346
-#: src/sidebar/Tree.vala:195
-msgid "Ne_w Saved Search..."
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:361
+msgid ""
+"A file required for publishing is unavailable. Publishing to Picasa can't "
+"continue."
 msgstr ""
+"Tập tin được yêu cầu cho việc xuất bản không sẵn sàng. Việc xuất bản lên "
+"Picasa không thể tiếp tục được."
 
-#: src/main.vala:54
+#. populate any widgets whose contents are programmatically-generated.
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:659
 #, 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 ""
+msgid "You are logged into Picasa Web Albums as %s."
+msgstr "Bạn đăng nhập vào Picasa Web Albums với tên %s."
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:665
+msgid "Videos will appear in:"
+msgstr "Phim sẽ xuất hiện trong:"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
+msgid "Small (640 x 480 pixels)"
+msgstr "Nhỏ (640 x 480 điểm ảnh)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:747
+msgid "Medium (1024 x 768 pixels)"
+msgstr "Trung bình (1024 x 768 điểm ảnh)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:748
+msgid "Recommended (1600 x 1200 pixels)"
+msgstr "Nên dùng (1600 x 1200 điểm ảnh)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:749
+msgid "Google+ (2048 x 1536 pixels)"
+msgstr "Google+ (2048 x 1536 điểm ảnh)"
+
+#: ../plugins/shotwell-publishing/PicasaPublishing.vala:750
+#: ../src/editing_tools/EditingTools.vala:756
+msgid "Original Size"
+msgstr "Kích thước ban đầu"
 
-#: src/main.vala:59
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
 #, c-format
+msgid "Creating album %s..."
+msgstr "Đang tạo tuyển tập ảnh %s…"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:917
+msgid "An error message occurred when publishing to Piwigo. Please try again."
+msgstr "Có lỗi xảy ra khi xuất bản lên Piwigo. Vui lòng thử lại."
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:998
 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"
+"Enter the URL of your Piwigo photo library as well as the username and "
+"password associated with your Piwigo account for that library."
 msgstr ""
+"Nhập vào URL của thư viện ảnh Piwigo của bạn cũng tốt như là tổ hợp tài "
+"khoản và mật khẩu với tài khoản Piwigo cho thư viện đó."
 
-#: src/main.vala:65
-#, c-format
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:999
 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."
+"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
+"entered"
 msgstr ""
+"Shotwell không thể liên lạc với thư viện ảnh Piwigo của bạn. Vui lòng xem "
+"lại URL đã nhập"
 
-#: src/main.vala:71
-#, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
-msgstr ""
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+msgid "Invalid URL"
+msgstr "URL không hợp lệ"
 
-#: src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "Đang nạp Shotwell"
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+msgid "Admins, Family, Friends, Contacts"
+msgstr "Quản trị, Gia đình, Bạn bè, Liên lạc"
 
-#: src/main.vala:294
-msgid "Path to Shotwell's private data"
-msgstr ""
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+msgid "Admins, Family, Friends"
+msgstr "Quản trị, Gia đình, Bạn bè"
 
-#: src/main.vala:294
-msgid "DIRECTORY"
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+msgid "Admins, Family"
+msgstr "Quản trị, Gia đình"
+
+#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+msgid "Admins"
+msgstr "Quản trị"
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:57
+msgid ""
+"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 ""
+"Bạn chưa đăng nhập vào Youtube.\n"
+"\n"
+"Bạn phải đăng nhập vào tài khoản Google và thiết lập để sử dụng Youtube. Bạn "
+"có thể thiết lập cho hầu hết các tài khoản bằng cách dùng trình duyệt đăng "
+"nhập vào Youtube ít nhất một lần."
 
-#: src/main.vala:298
-msgid "Do not monitor library directory at runtime for changes"
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
+msgid ""
+"A file required for publishing is unavailable. Publishing to Youtube can't "
+"continue."
 msgstr ""
+"Tập tin được yêu cầu cho việc xuất bản không sẵn sàng. Việc xuất bản lên "
+"Youtube không thể tiếp tục được."
 
-#: src/main.vala:302
-msgid "Don't display startup progress meter"
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:461
+#, c-format
+msgid "You are logged into YouTube as %s."
+msgstr "Bạn đã đăng nhập Youtube với tên %s."
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:463
+#, c-format
+msgid "Videos will appear in '%s'"
+msgstr "Phim sẽ xuất hiện trong “%s”"
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:495
+msgid "Public listed"
+msgstr "Công đã liệt kê"
+
+#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
+msgid "Public unlisted"
+msgstr "Công chưa liệt kê"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
+msgid "Publish to an e_xisting album:"
+msgstr "Xuất bản một tập _sẵn có:"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:2
+msgid "Create a _new album named:"
+msgstr "Tạo tập ả_nh mới mang tên:"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
+msgid "Videos and new photo albums _visible to:"
+msgstr "Phim và tạo tuyển tuyển tập ảnh mới khả kiến _với:"
+
+#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:5
+#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:2
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:5
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:8
+msgid ""
+"_Remove location, camera, and other identifying information before uploading"
 msgstr ""
+"_Xóa bỏ vị trí, máy ảnh và các thông tin định danh khác trước khi tải lên"
 
-#: src/main.vala:306
-msgid "Show the application's version"
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
+msgid ""
+"Enter the confirmation number which appears after you log into Flickr in "
+"your Web browser."
 msgstr ""
+"Nhập vào số xác thực cái mà xuất hiện sau khi bạn đăng nhập vào Flickr bằng "
+"trình duyệt Web."
 
-#: src/main.vala:338
-msgid "[FILE]"
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
+msgid "Authorization _Number:"
+msgstr "_Số ủy quyền:"
+
+#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:3
+#: ../src/Dialogs.vala:131
+msgid "Con_tinue"
+msgstr "_Tiếp tục"
+
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
+msgid "L_ist album in public gallery"
+msgstr "L_iệt kê các tuyển tuyển tập ảnh trong phòng trưng bày công"
+
+#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
+msgid "Photo _size preset:"
+msgstr "Đặt trước _cỡ ảnh"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
+msgid "_URL of your Piwigo photo library"
+msgstr "Địa chỉ _URL của thư viện ảnh Piwigo"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
+msgid "User _name"
+msgstr "Tê_n người dùng"
+
+#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
+msgid "_Remember Password"
+msgstr "N_hớ mật khẩu"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
+msgid "An _existing category:"
+msgstr "Thể loại _sẵn có:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:4
+msgid "Photos will be _visible by:"
+msgstr "Ảnh sẽ được khả kiến _với:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:5
+msgid "Photo size:"
+msgstr "Cỡ ảnh:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:6
+msgid "within category:"
+msgstr "có trong thể loại:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
+msgid "Album comment:"
+msgstr "Ghi chú tuyển tập ảnh:"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
+msgid "_If a title is set and comment unset, use title as comment"
 msgstr ""
+"_Nếu tựa đề được đặt và phần ghi chú thì không, vậy thì dùng tựa đề làm ghi "
+"chú"
 
-#: src/main.vala:342
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:10
+msgid "_Do no upload tags"
+msgstr "Đừn_g tải thẻ lên"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
+msgid "Logout"
+msgstr "Đăng xuất"
+
+#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
+#: ../src/Resources.vala:303
+msgid "Publish"
+msgstr "Xuất bản"
+
+#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
+msgid "Core Publishing Services"
+msgstr "Dịch vụ xuất bản liệu lõi"
+
+#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
+msgid "Video privacy _setting:"
+msgstr "Cài đặt chính _sách riêng tư với phim:"
+
+#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+msgid "Blinds"
+msgstr "Blinds"
+
+#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+msgid "Chess"
+msgstr "Ô cờ"
+
+#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+msgid "Circle"
+msgstr "Hình tròn"
+
+#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+msgid "Circles"
+msgstr "Các hình tròn"
+
+#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+msgid "Clock"
+msgstr "Đồng hồ"
+
+#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+msgid "Crumble"
+msgstr "Vỡ vụn"
+
+#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+msgid "Fade"
+msgstr "Mờ dần"
+
+#: ../plugins/shotwell-transitions/SlideEffect.vala:20
+msgid "Slide"
+msgstr "Trượt"
+
+#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
+msgid "Squares"
+msgstr "Vuông"
+
+#: ../plugins/shotwell-transitions/StripesEffect.vala:20
+msgid "Stripes"
+msgstr "Sọc vằn"
+
+#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
+msgid "Core Slideshow Transitions"
+msgstr "Chuyển trình diễn lõi"
+
+#: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+msgstr "Bản quyền (C) 2010 Maxim Kartashev, Bản quyền (C) 2011-2015 Quỹ Yorba"
+
+#: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
 #, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "Chạy '%s --help' để xem danh sách đầy đủ các tùy chỉnh dòng lệnh.\n"
+msgid "Unable to create cache directory %s: %s"
+msgstr "Không thể tạo thư mục nhớ đệm tạm thời %s: %s"
 
-#: src/Properties.vala:84
-msgid "Today"
-msgstr "Hôm nay"
+#: ../src/AppDirs.vala:58 ../src/AppDirs.vala:88
+#, c-format
+msgid "Unable to create data directory %s: %s"
+msgstr "Không thể tạo thư mục dữ liệu %s: %s"
 
-#: src/Properties.vala:86
-msgid "Yesterday"
-msgstr "Hôm qua"
+#. If XDG yarfed, use ~/Pictures
+#: ../src/AppDirs.vala:152
+msgid "Pictures"
+msgstr "Hình ảnh"
 
-#: src/Properties.vala:340 src/Dialogs.vala:1273
-msgid "Title:"
-msgstr "Tựa đề:"
+#: ../src/AppDirs.vala:190
+#, c-format
+msgid "Unable to create temporary directory %s: %s"
+msgstr "Không thể tạo thư mục tạm %s: %s"
 
-#: src/Properties.vala:343
-msgid "Items:"
+#: ../src/AppDirs.vala:207 ../src/AppDirs.vala:223
+#, c-format
+msgid "Unable to create data subdirectory %s: %s"
+msgstr "Không thể tạo thư mục dữ liệu con %s: %s"
+
+#: ../src/AppWindow.vala:53
+msgid "Pin Toolbar"
+msgstr "Cố định thanh công cụ"
+
+#: ../src/AppWindow.vala:54
+msgid "Pin the toolbar open"
+msgstr "Cố định thanh công cụ"
+
+#: ../src/AppWindow.vala:59
+msgid "Leave fullscreen"
+msgstr "Thoát chế độ toàn màn hình"
+
+#: ../src/AppWindow.vala:525
+msgid "_Contents"
+msgstr "_Mục lục"
+
+#: ../src/AppWindow.vala:530
+msgid "_Frequently Asked Questions"
+msgstr "_Thắc mắc hay gặp phải"
+
+#: ../src/AppWindow.vala:535
+msgid "_Report a Problem..."
+msgstr "_Báo cáo trục trặc…"
+
+#: ../src/AppWindow.vala:634 ../src/AppWindow.vala:655
+#: ../src/AppWindow.vala:672 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
+#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441 ../src/Resources.vala:162
+#: ../src/data_imports/DataImportsUI.vala:374
+#: ../src/publishing/PublishingUI.vala:475
+msgid "_Cancel"
+msgstr "Thô_i"
+
+#: ../src/AppWindow.vala:682
+#, c-format
+msgid ""
+"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
+"continue.\n"
+"\n"
+"%s"
 msgstr ""
+"Một lỗi tai hại đã xảy ra khi truy cập vào thư viện của Shotwell. Shotwell "
+"không thể tiếp tục.⏎ ⏎ %s"
 
-#: src/Properties.vala:346
+#: ../src/AppWindow.vala:702
+msgid "Visit the Yorba web site"
+msgstr "Xem trang web Yorba"
+
+#: ../src/AppWindow.vala:714
 #, c-format
-msgid "%d Event"
-msgid_plural "%d Events"
-msgstr[0] ""
+msgid "Unable to display help: %s"
+msgstr "Không thể hiển thị trợ giúp: %s"
 
-#: src/Properties.vala:353 src/events/EventDirectoryItem.vala:87
+#: ../src/AppWindow.vala:722
 #, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] ""
+msgid "Unable to navigate to bug database: %s"
+msgstr "Không thể chuyển đến cơ sở dữ liệu lỗi: %s"
 
-#: src/Properties.vala:355 src/events/EventDirectoryItem.vala:85
+#: ../src/AppWindow.vala:730
 #, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] ""
+msgid "Unable to display FAQ: %s"
+msgstr "Không thể hiển thị FAQ: %s"
 
-#: src/Properties.vala:377
-msgid "Date:"
-msgstr "Ngày:"
+#: ../src/BatchImport.vala:26
+msgid "Success"
+msgstr "Thành công"
 
-#: src/Properties.vala:381
-msgid "Time:"
-msgstr "Thời gian:"
+#: ../src/BatchImport.vala:29
+msgid "File error"
+msgstr "Lỗi tập tin"
 
-#: src/Properties.vala:384 src/Properties.vala:389
-msgid "From:"
-msgstr "Từ:"
+#: ../src/BatchImport.vala:32
+msgid "Unable to decode file"
+msgstr "Không thể giải mã tập tin"
 
-#: src/Properties.vala:385 src/Properties.vala:390
-msgid "To:"
-msgstr "Đến:"
+#: ../src/BatchImport.vala:35
+msgid "Database error"
+msgstr "Lỗi cơ sở dữ liệu"
 
-#: src/Properties.vala:395 src/editing_tools/EditingTools.vala:1850
-msgid "Size:"
-msgstr "Kích thước:"
+#: ../src/BatchImport.vala:38
+msgid "User aborted import"
+msgstr "Người dùng đã hủy bỏ nhập ảnh"
 
-#: src/Properties.vala:404
-msgid "Duration:"
-msgstr ""
+#: ../src/BatchImport.vala:41
+msgid "Not a file"
+msgstr "Không phải tập tin"
+
+#: ../src/BatchImport.vala:44
+msgid "File already exists in database"
+msgstr "Tập tin đã tồn tại trong cơ sở dữ liệu"
+
+#: ../src/BatchImport.vala:47
+msgid "Unsupported file format"
+msgstr "Định dạng tập tin không được hỗ trợ"
+
+#: ../src/BatchImport.vala:50
+msgid "Not an image file"
+msgstr "Không phải tập tin ảnh"
+
+#: ../src/BatchImport.vala:53
+msgid "Disk failure"
+msgstr "Lỗi đĩa"
+
+#: ../src/BatchImport.vala:56
+msgid "Disk full"
+msgstr "Đĩa đầy"
+
+#: ../src/BatchImport.vala:59
+msgid "Camera error"
+msgstr "Lỗi máy ảnh"
+
+#: ../src/BatchImport.vala:62
+msgid "File write error"
+msgstr "Lỗi ghi tập tin"
 
-#: src/Properties.vala:404
+#: ../src/BatchImport.vala:65
+msgid "Corrupt image file"
+msgstr "Tập tin ảnh hư hỏng"
+
+#: ../src/BatchImport.vala:68
 #, c-format
-msgid "%.1f seconds"
-msgstr "%.1f giây"
+msgid "Imported failed (%d)"
+msgstr "Nhập thất bại (%d)"
 
-#: src/Properties.vala:408
-msgid "Developer:"
-msgstr ""
+#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
+msgid "S_lideshow"
+msgstr "_Trình chiếu"
 
-#: src/Properties.vala:436 src/Properties.vala:440 src/Properties.vala:447
-#: src/editing_tools/EditingTools.vala:2218
-msgid "Exposure:"
-msgstr ""
+#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
+msgid "Play a slideshow"
+msgstr "Phát trình chiếu"
 
-#: src/Properties.vala:585
-msgid "Location:"
-msgstr ""
+#: ../src/CollectionPage.vala:456
+msgid "Export Photo/Video"
+msgstr "Xuất ảnh/phim"
 
-#: src/Properties.vala:588
-msgid "File size:"
-msgstr "Dung lượng tập tin:"
+#: ../src/CollectionPage.vala:456
+msgid "Export Photos/Videos"
+msgstr "Xuất ảnh/phim"
 
-#: src/Properties.vala:592
-msgid "Current Development:"
-msgstr ""
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
+#: ../src/PhotoPage.vala:3211
+msgid "Export Photo"
+msgstr "Xuất ảnh"
 
-#: src/Properties.vala:594
-msgid "Original dimensions:"
-msgstr ""
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:87
+msgid "Export Photos"
+msgstr "Xuất ảnh"
 
-#: src/Properties.vala:597
-msgid "Camera make:"
-msgstr ""
+#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+msgid "Rotating"
+msgstr "Xoay ảnh"
 
-#: src/Properties.vala:600
-msgid "Camera model:"
-msgstr ""
+#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+msgid "Undoing Rotate"
+msgstr "Hủy thao tác xoay"
 
-#: src/Properties.vala:603
-msgid "Flash:"
-msgstr ""
+#: ../src/CollectionPage.vala:570
+msgid "Flipping Horizontally"
+msgstr "Rộng hơn theo chiều ngang"
 
-#: src/Properties.vala:605
-msgid "Focal length:"
-msgstr ""
+#: ../src/CollectionPage.vala:571
+msgid "Undoing Flip Horizontally"
+msgstr "Hủy thao tác làm rộng hơn theo chiều ngang"
 
-#: src/Properties.vala:608
-msgid "Exposure date:"
-msgstr ""
+#: ../src/CollectionPage.vala:580
+msgid "Flipping Vertically"
+msgstr "Làm rộng hơn theo chiều dọc"
 
-#: src/Properties.vala:611
-msgid "Exposure time:"
-msgstr ""
+#: ../src/CollectionPage.vala:581
+msgid "Undoing Flip Vertically"
+msgstr "Hủy thao tác làm rộng hơn theo chiều dọc"
 
-#: src/Properties.vala:614
-msgid "Exposure bias:"
-msgstr ""
+#: ../src/Commands.vala:733
+msgid "Reverting"
+msgstr "Hoàn nguyên"
 
-#: src/Properties.vala:616
-msgid "GPS latitude:"
-msgstr "VĨ độ GPS:"
+#: ../src/Commands.vala:733
+msgid "Undoing Revert"
+msgstr "Hủy thao tác hoàn nguyên"
 
-#: src/Properties.vala:619
-msgid "GPS longitude:"
-msgstr "Kinh độ GPS:"
+#: ../src/Commands.vala:777
+msgid "Enhancing"
+msgstr "Tăng cường"
 
-#: src/Properties.vala:622
-msgid "Artist:"
-msgstr "Nghệ sĩ:"
+#: ../src/Commands.vala:777
+msgid "Undoing Enhance"
+msgstr "Hủy thao tác tăng cường"
 
-#: src/Properties.vala:624
-msgid "Copyright:"
-msgstr "Bản quyền:"
+#: ../src/Commands.vala:853
+msgid "Applying Color Transformations"
+msgstr "Đang áp dụng chuyển đổi màu"
 
-#: src/Properties.vala:626
-msgid "Software:"
-msgstr "Phần mềm:"
+#: ../src/Commands.vala:853
+msgid "Undoing Color Transformations"
+msgstr "Hủy bỏ thao tác chuyển màu"
 
-#: src/Properties.vala:630 src/Dialogs.vala:1288
-msgid "Comment:"
-msgstr ""
+#: ../src/Commands.vala:1003
+msgid "Creating New Event"
+msgstr "Tạo sự kiện mới"
 
-#: src/Properties.vala:639
-msgid "Extended Information"
-msgstr "Thông tin mở rộng"
+#: ../src/Commands.vala:1004
+msgid "Removing Event"
+msgstr "Loại bỏ sự kiện"
+
+#: ../src/Commands.vala:1013
+msgid "Moving Photos to New Event"
+msgstr "Chuyển ảnh sang sự kiện mới"
+
+#: ../src/Commands.vala:1014
+msgid "Setting Photos to Previous Event"
+msgstr "Đang cài đặt các ảnh thành sự kiện kế trước"
+
+#: ../src/Commands.vala:1071
+msgid "Merging"
+msgstr "Hòa trộn"
+
+#: ../src/Commands.vala:1072
+msgid "Unmerging"
+msgstr "Thôi hòa trộn"
+
+#: ../src/Commands.vala:1081
+msgid "Duplicating photos"
+msgstr "Nhân đôi ảnh"
+
+#: ../src/Commands.vala:1081
+msgid "Removing duplicated photos"
+msgstr "Xóa bỏ ảnh trùng lặp"
+
+#: ../src/Commands.vala:1104
+#, 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] "Không thể nhân đôi %d ảnh bởi vì các lỗi liên quan đến tập tin"
+
+#: ../src/Commands.vala:1191
+msgid "Restoring previous rating"
+msgstr "Hoàn nguyên lại đánh giá trước"
+
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+msgid "Increasing ratings"
+msgstr "Tăng mức đánh giá"
+
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+msgid "Decreasing ratings"
+msgstr "Giảm mức đánh giá"
+
+#: ../src/Commands.vala:1252
+msgid "Setting RAW developer"
+msgstr "Đặt trình hiển thị ảnh RAW"
+
+#: ../src/Commands.vala:1252
+msgid "Restoring previous RAW developer"
+msgstr "Hoàn nguyên lại trình hiển thị ảnh RAW trước đây"
+
+#: ../src/Commands.vala:1253
+msgid "Set Developer"
+msgstr "Đặt trình hiển thị"
+
+#: ../src/Commands.vala:1343
+msgid "Original photo could not be adjusted."
+msgstr "Ảnh gốc không thể được chỉnh sửa."
+
+#: ../src/Commands.vala:1364
+msgid "Adjusting Date and Time"
+msgstr "Chỉnh ngày và giờ"
+
+#: ../src/Commands.vala:1364
+msgid "Undoing Date and Time Adjustment"
+msgstr "Hủy thao tác chỉnh ngày và giờ"
+
+#: ../src/Commands.vala:1395
+msgid "One original photo could not be adjusted."
+msgid_plural "The following original photos could not be adjusted."
+msgstr[0] "Ảnh gốc không thể bị chỉnh sửa."
+
+#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
+msgid "Time Adjustment Error"
+msgstr "Lỗi chỉnh giờ"
+
+#: ../src/Commands.vala:1419
+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] ""
+"Chỉnh giờ là thao tác không hoàn lại được trên những tập tin ảnh sau đây."
+
+#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
+msgid "Create Tag"
+msgstr "Tạo thẻ"
 
-#: src/Dialogs.vala:16
+#: ../src/Commands.vala:1691
+#, c-format
+msgid "Move Tag \"%s\""
+msgstr "Di chuyển thẻ \"%s\""
+
+#: ../src/Commands.vala:2343
+msgid "Move Photos to Trash"
+msgstr "Chuyển ảnh vào Thùng rác"
+
+#: ../src/Commands.vala:2343
+msgid "Restore Photos from Trash"
+msgstr "Phục hồi ảnh từ Thùng rác"
+
+#: ../src/Commands.vala:2344
+msgid "Move the photos to the Shotwell trash"
+msgstr "Chuyển ảnh vào Thùng rác của Shotwell"
+
+#: ../src/Commands.vala:2344
+msgid "Restore the photos back to the Shotwell library"
+msgstr "Phục hồi ảnh trở về thư viện của Shotwell"
+
+#: ../src/Commands.vala:2363
+msgid "Moving Photos to Trash"
+msgstr "Chuyển ảnh vào Thùng rác"
+
+#: ../src/Commands.vala:2363
+msgid "Restoring Photos From Trash"
+msgstr "Phục hồi ảnh từ Thùng rác"
+
+#: ../src/Commands.vala:2449
+msgid "Flag selected photos"
+msgstr "Gắn cờ cho ảnh đã chọn"
+
+#: ../src/Commands.vala:2450
+msgid "Unflag selected photos"
+msgstr "Gỡ cờ các ảnh đã chọn"
+
+#: ../src/Commands.vala:2451
+msgid "Flagging selected photos"
+msgstr "Đang đánh thẻ các ảnh đã chọn"
+
+#: ../src/Commands.vala:2452
+msgid "Unflagging selected photos"
+msgstr "Đang xóa bỏ thẻ các ảnh đã chọn"
+
+#: ../src/Commands.vala:2459
+msgid "Flag"
+msgstr "Gắn cờ"
+
+#: ../src/Commands.vala:2459
+msgid "Unflag"
+msgstr "Gỡ cờ"
+
+#: ../src/DesktopIntegration.vala:121
+#, c-format
+msgid "Unable to launch Nautilus Send-To: %s"
+msgstr "Không thể khởi chạy \"Gửi đến\" từ Nautilus: %s"
+
+#: ../src/DesktopIntegration.vala:129
+msgid "Send To"
+msgstr "Gửi đến"
+
+#: ../src/DesktopIntegration.vala:174
+#, c-format
+msgid "Unable to export background to %s: %s"
+msgstr "Không thể xuất ảnh nền đến %s: %s"
+
+#: ../src/DesktopIntegration.vala:311
+#, c-format
+msgid "Unable to prepare desktop slideshow: %s"
+msgstr "Không thể chuẩn bị trình chiếu màn hình nền: %s"
+
+#: ../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] "Loại bỏ thẻ \"%s\" khỏi %d ảnh. Tiếp tục?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1361
-#: src/Dialogs.vala:1384 src/data_imports/DataImportsUI.vala:399
-#: src/AppWindow.vala:615 src/AppWindow.vala:636 src/AppWindow.vala:653
-#: src/publishing/PublishingUI.vala:498
-msgid "_Cancel"
-msgstr "_Hủy"
-
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1329
-#: src/Resources.vala:330 src/Resources.vala:378 src/Resources.vala:643
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
+#: ../src/Resources.vala:163 ../src/Resources.vala:369
+#: ../src/Resources.vala:417 ../src/Resources.vala:682
 msgid "_Delete"
-msgstr ""
+msgstr "_Xóa"
 
-#: src/Dialogs.vala:25
+#: ../src/Dialogs.vala:25
 #, c-format
 msgid "This will remove the saved search \"%s\".  Continue?"
 msgstr "Loại bỏ tìm kiếm đã lưu \"%s\". Tiếp tục?"
 
-#: src/Dialogs.vala:35
-#, c-format
+#: ../src/Dialogs.vala:35
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
 "Shotwell"
@@ -634,16 +1437,23 @@ msgid_plural ""
 "Switching developers will undo all changes you have made to these photos in "
 "Shotwell"
 msgstr[0] ""
+"Chuyển các trình hiển thị ảnh sẽ hoàn nguyên lại tất cả các thay đổi về ảnh "
+"mà bạn đã thực hiện trong Shotwell"
 
-#: src/Dialogs.vala:39
+#: ../src/Dialogs.vala:39
 msgid "_Switch Developer"
-msgstr ""
+msgstr "_Chuyển bộ hiển thị ảnh"
 
-#: src/Dialogs.vala:58
+#: ../src/Dialogs.vala:58
 msgid "Export Video"
-msgstr "Xuất video"
+msgstr "Xuất phim"
 
-#: src/Dialogs.vala:115
+#. Ticket #3023
+#. Attempt to replace the system error with something friendlier
+#. if we can't copy an image over for editing in an external tool.
+#. Did we fail because we can't write to this directory?
+#. Yes - display an alternate error message here.
+#: ../src/Dialogs.vala:115
 #, c-format
 msgid ""
 "Shotwell couldn't create a file for editing this photo because you do not "
@@ -652,7 +1462,7 @@ msgstr ""
 "Shotwell không thể tạo tập tin để chỉnh sửa ảnh này vì bạn không có đủ quyền "
 "để ghi vào %s."
 
-#: src/Dialogs.vala:124
+#: ../src/Dialogs.vala:124
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -660,7 +1470,7 @@ msgstr ""
 "Không thể xuất ảnh sau do lỗi tập tin.\n"
 "\n"
 
-#: src/Dialogs.vala:130
+#: ../src/Dialogs.vala:130
 msgid ""
 "\n"
 "\n"
@@ -670,159 +1480,188 @@ msgstr ""
 "\n"
 "Bạn có muốn tiếp tục xuất?"
 
-#: src/Dialogs.vala:131
-msgid "Con_tinue"
-msgstr ""
-
-#: src/Dialogs.vala:147
+#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
+#. aren't formats so much as they are operating modes that determine specific formats.
+#. Hereafter we'll refer to these as "special formats."
+#: ../src/Dialogs.vala:147
 msgid "Unmodified"
 msgstr "Chưa chỉnh sửa"
 
-#: src/Dialogs.vala:148
+#: ../src/Dialogs.vala:148
 msgid "Current"
 msgstr "Hiện tại"
 
-#: src/Dialogs.vala:212
+#. layout controls
+#: ../src/Dialogs.vala:213
 msgid "_Format:"
-msgstr ""
+msgstr "Định _dạng:"
 
-#: src/Dialogs.vala:215
+#: ../src/Dialogs.vala:216
 msgid "_Quality:"
-msgstr ""
+msgstr "_Chất lượng:"
 
-#: src/Dialogs.vala:218
+#: ../src/Dialogs.vala:219
 msgid "_Scaling constraint:"
-msgstr ""
+msgstr "Hằng số co _giãn:"
 
-#: src/Dialogs.vala:221
-msgid " _pixels"
-msgstr ""
+#: ../src/Dialogs.vala:222
+msgid "_Pixels:"
+msgstr "Điể_m ảnh:"
 
-#: src/Dialogs.vala:229
+#: ../src/Dialogs.vala:225
 msgid "Export metadata"
 msgstr "Xuất thông tin"
 
-#: src/Dialogs.vala:465
+#: ../src/Dialogs.vala:459
 msgid "Save Details..."
-msgstr ""
+msgstr "Chi tiết lưu…"
 
-#: src/Dialogs.vala:466
+#: ../src/Dialogs.vala:460
 msgid "Save Details"
-msgstr ""
+msgstr "Chi tiết lưu"
 
-#: src/Dialogs.vala:481
+#: ../src/Dialogs.vala:475
 #, c-format
 msgid "(and %d more)\n"
-msgstr ""
+msgstr "(và %d nữa)\n"
 
-#: src/Dialogs.vala:534
+#: ../src/Dialogs.vala:528
 msgid "Import Results Report"
-msgstr ""
+msgstr "Báo cáo kết quả nhập"
 
-#: src/Dialogs.vala:538
+#: ../src/Dialogs.vala:532
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
-msgstr[0] ""
+msgstr[0] "Đã thử nhập %d tập tin."
 
-#: src/Dialogs.vala:541
+#: ../src/Dialogs.vala:535
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
-msgstr[0] ""
+msgstr[0] "Trong số chúng, %d tập tin đã được nhập thành công."
 
-#: src/Dialogs.vala:553
+#.
+#. Duplicates
+#.
+#: ../src/Dialogs.vala:547
 msgid "Duplicate Photos/Videos Not Imported:"
-msgstr ""
+msgstr "Ảnh/Phim trùng lặp không được nhập vào:"
 
-#: src/Dialogs.vala:557
+#: ../src/Dialogs.vala:551
 msgid "duplicates existing media item"
-msgstr ""
+msgstr "nhân bản hạng mục đa phương tiện sẵn có"
 
-#: src/Dialogs.vala:568
+#.
+#. Files Not Imported Due to Camera Errors
+#.
+#: ../src/Dialogs.vala:562
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
-msgstr ""
+msgstr "Ảnh/Phim không nhập được vì có lỗi của máy ảnh:"
 
-#: src/Dialogs.vala:571 src/Dialogs.vala:586 src/Dialogs.vala:601
-#: src/Dialogs.vala:617 src/Dialogs.vala:632 src/Dialogs.vala:646
+#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
+#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
 msgid "error message:"
-msgstr ""
+msgstr "thông báo lỗi:"
 
-#: src/Dialogs.vala:582
+#.
+#. Files Not Imported Because They Weren't Recognized as Photos or Videos
+#.
+#: ../src/Dialogs.vala:576
 msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgstr ""
+"Các tập tin không thể nhập được bởi vì chúng không được xem như là Ảnh hay "
+"Phim:"
 
-#: src/Dialogs.vala:597
+#.
+#. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
+#.
+#: ../src/Dialogs.vala:591
 msgid ""
 "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
 "Understands:"
 msgstr ""
+"Các tập tin không thể nhập được bởi vì chúng không được xem như là định dạng "
+"Ảnh hay Phim mà Shotwell hiểu được:"
 
-#: src/Dialogs.vala:612
+#.
+#. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
+#.
+#: ../src/Dialogs.vala:606
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
 "Library:"
 msgstr ""
+"Các tập tin không thể nhập được bởi vì Shotwell không thể chép chúng vào thư "
+"viện:"
 
-#: src/Dialogs.vala:616
+#: ../src/Dialogs.vala:610
 #, c-format
 msgid ""
 "couldn't copy %s\n"
 "\tto %s"
 msgstr ""
+"không thể chép %s\n"
+"\tvào %s"
 
-#: src/Dialogs.vala:628
+#.
+#. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
+#.
+#: ../src/Dialogs.vala:622
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
-msgstr ""
+msgstr "Ảnh/Phim không được nhập vào bởi vì các tập tin đã hỏng:"
 
-#: src/Dialogs.vala:643
+#.
+#. Photos/Videos Not Imported for Other Reasons
+#.
+#: ../src/Dialogs.vala:637
 msgid "Photos/Videos Not Imported for Other Reasons:"
-msgstr ""
+msgstr "Ảnh/Phim không được nhập vào bởi vì khác:"
 
-#: src/Dialogs.vala:663
+#: ../src/Dialogs.vala:657
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "%d ảnh giống nhau không được nhập:\n"
 
-#: src/Dialogs.vala:666
+#: ../src/Dialogs.vala:660
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
-msgstr[0] "%d video giống nhau không được nhập:\n"
+msgstr[0] "%d phim trùng lặp không được nhập:\n"
 
-#: src/Dialogs.vala:669
+#: ../src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
-msgstr[0] "%d ảnh/video giống nhau không được nhập:\n"
+msgstr[0] "%d ảnh/phim trùng lặp không được nhập:\n"
 
-#: src/Dialogs.vala:683
+#: ../src/Dialogs.vala:677
 #, 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] "%d ảnh không được nhập do lỗi tập tin hay phần cứng:\n"
 
-#: src/Dialogs.vala:686
+#: ../src/Dialogs.vala:680
 #, 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] "%d video không được nhập do lỗi tập tin hay phần cứng:\n"
+msgstr[0] "%d phim không được nhập do lỗi tập tin hay phần cứng:\n"
 
-#: src/Dialogs.vala:689
+#: ../src/Dialogs.vala:683
 #, 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] "%d ảnh/video không được nhập do lỗi tập tin hay phần cứng:\n"
+msgstr[0] "%d ảnh/phim không được nhập do lỗi tập tin hay phần cứng:\n"
 
-#: src/Dialogs.vala:692
+#: ../src/Dialogs.vala:686
 #, 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] "%d tập tin không được nhập do lỗi tập tin hay phần cứng:\n"
 
-#: src/Dialogs.vala:706
+#: ../src/Dialogs.vala:700
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -832,7 +1671,7 @@ msgid_plural ""
 msgstr[0] ""
 "%d ảnh không được nhập vì không có quyền ghi vào thư mục thư viện:\n"
 
-#: src/Dialogs.vala:709
+#: ../src/Dialogs.vala:703
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -840,9 +1679,9 @@ msgid_plural ""
 "%d videos failed to import because the photo library folder was not "
 "writable:\n"
 msgstr[0] ""
-"%d video không được nhập vì không có quyền ghi vào thư mục thư viện:\n"
+"%d phim không được nhập vì không có quyền ghi vào thư mục thư viện:\n"
 
-#: src/Dialogs.vala:712
+#: ../src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -851,9 +1690,9 @@ msgid_plural ""
 "%d photos/videos failed to import because the photo library folder was not "
 "writable:\n"
 msgstr[0] ""
-"%d ảnh/video không được nhập vì không có quyền ghi vào thư mục thư viện:\n"
+"%d ảnh/phim không được nhập vì không có quyền ghi vào thư mục thư viện:\n"
 
-#: src/Dialogs.vala:715
+#: ../src/Dialogs.vala:709
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -863,296 +1702,324 @@ msgid_plural ""
 msgstr[0] ""
 "%d tập tin không được nhập vì không có quyền ghi vào thư mục thư viện:\n"
 
-#: src/Dialogs.vala:729
+#: ../src/Dialogs.vala:723
 #, 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] "%d ảnh không được nhập do lỗi máy ảnh:\n"
 
-#: src/Dialogs.vala:732
+#: ../src/Dialogs.vala:726
 #, 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] "%d video không được nhập do lỗi máy ảnh:\n"
+msgstr[0] "%d phim không được nhập do lỗi máy ảnh:\n"
 
-#: src/Dialogs.vala:735
+#: ../src/Dialogs.vala:729
 #, 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] "%d ảnh/video không được nhập do lỗi máy ảnh:\n"
+msgstr[0] "%d ảnh/phim không được nhập do lỗi máy ảnh:\n"
 
-#: src/Dialogs.vala:738
+#: ../src/Dialogs.vala:732
 #, 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] "%d tập tin không được nhập do lỗi máy ảnh:\n"
 
-#: src/Dialogs.vala:752
+#: ../src/Dialogs.vala:746
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
-msgstr[0] ""
+msgstr[0] "%d ảnh không được nhập vì chúng bị hỏng:\n"
 
-#: src/Dialogs.vala:755
+#: ../src/Dialogs.vala:749
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
-msgstr[0] ""
+msgstr[0] "%d phim không được nhập vì chúng bị hỏng:\n"
 
-#: src/Dialogs.vala:758
+#: ../src/Dialogs.vala:752
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
-msgstr[0] ""
+msgstr[0] "%d tập tin hay phim không được nhập vì chúng bị hỏng:\n"
 
-#: src/Dialogs.vala:761
+#: ../src/Dialogs.vala:755
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
-msgstr[0] ""
+msgstr[0] "%d tập tin không được nhập vì chúng bị hỏng:\n"
 
-#: src/Dialogs.vala:778
+#. we have no notion of "unsupported" video files right now in Shotwell (all
+#. standard container formats are supported, it's just that the streams in them
+#. might or might not be interpretable), so this message does not need to be
+#. media specific
+#: ../src/Dialogs.vala:772
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
 msgstr[0] "%d ảnh không được hỗ trợ bị bỏ qua:\n"
 
-#: src/Dialogs.vala:793
+#. we have no notion of "non-video" video files right now in Shotwell, so this
+#. message doesn't need to be media specific
+#: ../src/Dialogs.vala:787
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "%d tập tin không phải ảnh bị bỏ qua.\n"
 
-#: src/Dialogs.vala:804
+#: ../src/Dialogs.vala:798
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
-msgstr[0] "%d ảnh bị bỏ qua do người dùng chỉ định:\n"
+msgstr[0] "%d ảnh bị bỏ qua do người dùng yêu cầu:\n"
 
-#: src/Dialogs.vala:807
+#: ../src/Dialogs.vala:801
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
-msgstr[0] "%d video bị bỏ qua do người dùng chỉ định:\n"
+msgstr[0] "%d phim bị bỏ qua do người dùng yêu cầu:\n"
 
-#: src/Dialogs.vala:810
+#: ../src/Dialogs.vala:804
 #, 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] "%d ảnh/video bị bỏ qua do người dùng chỉ định:\n"
+msgstr[0] "%d ảnh/phim bị bỏ qua do người dùng chỉ định:\n"
 
-#: src/Dialogs.vala:813
+#: ../src/Dialogs.vala:807
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "%d tập tin bị bỏ qua do người dùng chỉ định:\n"
 
-#: src/Dialogs.vala:827
+#: ../src/Dialogs.vala:821
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "%d ảnh đã được nhập.\n"
 
-#: src/Dialogs.vala:830
+#: ../src/Dialogs.vala:824
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
-msgstr[0] "%d video đã được nhập.\n"
+msgstr[0] "%d phim đã được nhập.\n"
 
-#: src/Dialogs.vala:833
+#: ../src/Dialogs.vala:827
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
-msgstr[0] "%d ảnh/video đã được nhập.\n"
+msgstr[0] "%d ảnh/phim đã được nhập.\n"
 
-#: src/Dialogs.vala:849
+#. if no media items were imported at all (i.e. an empty directory attempted), need to at least
+#. report that nothing was imported
+#: ../src/Dialogs.vala:843
 msgid "No photos or videos imported.\n"
-msgstr "Không có ảnh hoặc video được nhập.\n"
+msgstr "Không có ảnh hoặc phim được nhập.\n"
 
-#: src/Dialogs.vala:856 src/Dialogs.vala:875
+#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
 msgid "Import Complete"
 msgstr "Đã nhập xong"
 
-#: src/Dialogs.vala:1103
+#: ../src/Dialogs.vala:1155
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d giây"
 
-#: src/Dialogs.vala:1106
+#: ../src/Dialogs.vala:1158
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d phút"
 
-#: src/Dialogs.vala:1110
+#: ../src/Dialogs.vala:1162
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d giờ"
 
-#: src/Dialogs.vala:1113
+#: ../src/Dialogs.vala:1165
 msgid "1 day"
 msgstr "1 ngày"
 
-#: src/Dialogs.vala:1263 src/Resources.vala:205
+#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
 msgid "Rename Event"
-msgstr ""
+msgstr "Đổi tên sự kiện"
 
-#: src/Dialogs.vala:1263
+#: ../src/Dialogs.vala:1315
 msgid "Name:"
 msgstr "Tên:"
 
-#: src/Dialogs.vala:1273 src/Resources.vala:274
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
 msgid "Edit Title"
-msgstr ""
+msgstr "Sửa tựa đề"
+
+#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
+msgid "Title:"
+msgstr "Tựa đề:"
 
-#: src/Dialogs.vala:1287 src/Resources.vala:280
+#. Dialog title
+#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
 msgid "Edit Event Comment"
-msgstr ""
+msgstr "Sửa ghi chú sự kiện"
 
-#: src/Dialogs.vala:1287
+#: ../src/Dialogs.vala:1344
 msgid "Edit Photo/Video Comment"
-msgstr ""
+msgstr "Sửa phần ghi chú của phim hay ảnh"
 
-#: src/Dialogs.vala:1304
-msgid "_Trash File"
-msgid_plural "_Trash Files"
-msgstr[0] ""
+#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
+msgid "Comment:"
+msgstr "Ghi chú:"
 
-#: src/Dialogs.vala:1308
-msgid "Only _Remove"
-msgstr ""
+#: ../src/Dialogs.vala:1361
+msgid "Remove and _Trash File"
+msgid_plural "Remove and _Trash Files"
+msgstr[0] "Xóa bỏ và đưa vào _Thùng rác"
 
-#: src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1365
+msgid "_Remove From Library"
+msgstr "_Loại khỏi thư viện"
+
+#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
+msgid "_Keep"
+msgstr "_Giữ lại"
+
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edit?"
-msgstr ""
+msgstr "Hoàn lại sửa đổi bên ngoài?"
 
-#: src/Dialogs.vala:1351
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edits?"
-msgstr ""
+msgstr "Hoàn lại các sửa đổi bên ngoài?"
 
-#: src/Dialogs.vala:1353
+#: ../src/Dialogs.vala:1410
 #, 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] ""
+"Việc này sẽ phá hủy toàn bộ các thay đổi với %d tập tin bên ngoài. Tiếp tục?"
 
-#: src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edit"
-msgstr ""
+msgstr "H_oàn lại sửa đổi bên ngoài"
 
-#: src/Dialogs.vala:1357
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edits"
-msgstr ""
+msgstr "H_oàn lại các sửa đổi bên ngoài"
 
-#: src/Dialogs.vala:1378
+#: ../src/Dialogs.vala:1435
 #, 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] "Loại bỏ %d ảnh khỏi thư viện. Bạn có muốn tiếp tục?"
 
-#: src/Dialogs.vala:1385
+#: ../src/Dialogs.vala:1442 ../src/Resources.vala:178
 msgid "_Remove"
-msgstr ""
+msgstr "_Xóa bỏ"
 
-#: src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photo From Library"
 msgstr "Loại bỏ ảnh khỏi thư viện"
 
-#: src/Dialogs.vala:1386
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photos From Library"
 msgstr "Loại bỏ ảnh khỏi thư viện"
 
-#: src/Dialogs.vala:1479
+#: ../src/Dialogs.vala:1536
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1626
+#: ../src/Dialogs.vala:1688
 msgid "AM"
-msgstr "sáng"
+msgstr "Sáng"
 
-#: src/Dialogs.vala:1627
+#: ../src/Dialogs.vala:1689
 msgid "PM"
-msgstr "chiều"
+msgstr "Chiều"
 
-#: src/Dialogs.vala:1628
+#: ../src/Dialogs.vala:1690
 msgid "24 Hr"
 msgstr "24 giờ"
 
-#: src/Dialogs.vala:1643
+#: ../src/Dialogs.vala:1705
 msgid "_Shift photos/videos by the same amount"
-msgstr ""
+msgstr "_Dịch chuyển phim/ảnh theo cùng số lượng"
 
-#: src/Dialogs.vala:1648
+#: ../src/Dialogs.vala:1710
 msgid "Set _all photos/videos to this time"
-msgstr ""
+msgstr "Đặt _mọi phim/ảnh thành thời điểm này"
 
-#: src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo file"
-msgstr ""
+msgstr "_Sửa tập tin ảnh gốc"
 
-#: src/Dialogs.vala:1655
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo files"
-msgstr ""
+msgstr "_Sửa các tập tin ảnh gốc"
 
-#: src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original file"
-msgstr ""
+msgstr "_Sửa tập tin gốc"
 
-#: src/Dialogs.vala:1658
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original files"
-msgstr ""
+msgstr "_Sửa các tập tin gốc"
 
-#: src/Dialogs.vala:1744
+#: ../src/Dialogs.vala:1806
 msgid "Original: "
-msgstr ""
+msgstr "Gốc: "
 
-#: src/Dialogs.vala:1745
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%d/%m/%Y, %H:%M:%S"
+msgstr "%H:%M:%S, %d/%m/%Y"
 
-#: src/Dialogs.vala:1746
+#: ../src/Dialogs.vala:1808
 msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%d/%m/%Y, %I:%M:%S %p"
+msgstr "%I:%M:%S %p, %d/%m/%Y"
 
-#: src/Dialogs.vala:1835
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
 "%d %s, %d %s, %d %s, and %d %s."
 msgstr ""
+"Thời gian phơi sáng sẽ được dịch về phía trước theo\n"
+"%d %s, %d %s, %d %s, và %d %s."
 
-#: src/Dialogs.vala:1836
+#: ../src/Dialogs.vala:1898
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
 "%d %s, %d %s, %d %s, and %d %s."
 msgstr ""
+"Thời gian phơi sáng sẽ được dịch về phía sau theo\n"
+"%d %s, %d %s, %d %s, và %d %s."
 
-#: src/Dialogs.vala:1838
+#: ../src/Dialogs.vala:1900
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ngày"
 
-#: src/Dialogs.vala:1839
+#: ../src/Dialogs.vala:1901
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "giờ"
 
-#: src/Dialogs.vala:1840
+#: ../src/Dialogs.vala:1902
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "phút"
 
-#: src/Dialogs.vala:1841
+#: ../src/Dialogs.vala:1903
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "giây"
 
-#: src/Dialogs.vala:1885
+#: ../src/Dialogs.vala:1947
 #, c-format
 msgid ""
 "\n"
@@ -1163,88 +2030,95 @@ msgid_plural ""
 "\n"
 "And %d others."
 msgstr[0] ""
+"\n"
+"\n"
+"Và %d cái khác."
 
-#: src/Dialogs.vala:1907 src/Dialogs.vala:1934
+#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
 msgid "Tags (separated by commas):"
 msgstr "Thẻ (ngăn cách bằng dấu phẩy):"
 
-#: src/Dialogs.vala:2014
+#: ../src/Dialogs.vala:2076
 msgid "Welcome!"
 msgstr "Chào mừng!"
 
-#: src/Dialogs.vala:2021
-#, c-format
+#: ../src/Dialogs.vala:2083
 msgid "Welcome to Shotwell!"
 msgstr "Chào mừng đến với Shotwell!"
 
-#: src/Dialogs.vala:2025
-#, c-format
+#: ../src/Dialogs.vala:2087
 msgid "To get started, import photos in any of these ways:"
 msgstr "Để bắt đầu, nhập ảnh bằng một trong những cách dưới đây:"
 
-#: src/Dialogs.vala:2044
+#: ../src/Dialogs.vala:2106
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Chọn <span weight=\"bold\">Tập tin %s nhập từ thư mục</span>"
 
-#: src/Dialogs.vala:2045
+#: ../src/Dialogs.vala:2107
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Kéo và thả ảnh vào cửa sổ Shotwell"
 
-#: src/Dialogs.vala:2046
+#: ../src/Dialogs.vala:2108
 msgid "Connect a camera to your computer and import"
 msgstr "Kết nối máy ảnh vào máy tính và nhập"
 
-#: src/Dialogs.vala:2056
+#: ../src/Dialogs.vala:2118
 #, c-format
 msgid "_Import photos from your %s folder"
-msgstr ""
+msgstr "Nhậ_p các ảnh từ thư mục %s của bạn"
 
-#: src/Dialogs.vala:2063
+#: ../src/Dialogs.vala:2125
 msgid "You can also import photos in any of these ways:"
-msgstr ""
+msgstr "Bạn còn có thể nhập ảnh từ bất kỳ những cách sau:"
 
-#: src/Dialogs.vala:2073
+#: ../src/Dialogs.vala:2135
 msgid "_Don't show this message again"
-msgstr ""
+msgstr "Đừn_g hiện lời nhắc này nữa"
 
-#: src/Dialogs.vala:2108
+#: ../src/Dialogs.vala:2170
 #, c-format
 msgid "Import photos from your %s library"
-msgstr ""
+msgstr "Nhập những ảnh từ thư viện %s của bạn"
 
-#: src/Dialogs.vala:2252 src/Dialogs.vala:2256
+#. We're installed system-wide, so use the system help.
+#. We're being run from the build directory; we'll have to handle clicks to this
+#. link manually ourselves, due to a limitation ghelp: URIs.
+#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
 msgid "(Help)"
 msgstr "(Trợ giúp)"
 
-#: src/Dialogs.vala:2265
+#: ../src/Dialogs.vala:2324
 #, c-format
 msgid "Year%sMonth%sDay"
-msgstr ""
+msgstr "Năm%sTháng%sNgày"
 
-#: src/Dialogs.vala:2267
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth"
-msgstr ""
+msgstr "Năm%sTháng"
 
-#: src/Dialogs.vala:2269
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth-Day"
-msgstr ""
+msgstr "Năm%sTháng-Ngày"
 
-#: src/Dialogs.vala:2271
+#: ../src/Dialogs.vala:2330
 msgid "Year-Month-Day"
-msgstr ""
+msgstr "Năm-Tháng-Ngày"
 
-#: src/Dialogs.vala:2272 src/editing_tools/EditingTools.vala:777
+#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Tùy chọn"
 
-#: src/Dialogs.vala:2509
+#. Invalid pattern.
+#: ../src/Dialogs.vala:2568
 msgid "Invalid pattern"
 msgstr "Mẫu không hợp lệ"
 
-#: src/Dialogs.vala:2612
+#. This function is used to determine whether or not files should be copied or linked when imported.
+#. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
+#: ../src/Dialogs.vala:2670
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -1252,31 +2126,31 @@ msgstr ""
 "Shotwell có thể chép ảnh vào thư mục thư viện hay nhập chúng mà không cần "
 "sao chép."
 
-#: src/Dialogs.vala:2617
+#: ../src/Dialogs.vala:2675
 msgid "Co_py Photos"
-msgstr ""
+msgstr "_Chép ảnh"
 
-#: src/Dialogs.vala:2618
+#: ../src/Dialogs.vala:2676
 msgid "_Import in Place"
-msgstr ""
+msgstr "_Nhập vào từ Chỗ"
 
-#: src/Dialogs.vala:2619
+#: ../src/Dialogs.vala:2677
 msgid "Import to Library"
-msgstr ""
+msgstr "Nhập vào thư viện"
 
-#: src/Dialogs.vala:2629 src/PhotoPage.vala:3075
+#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
 msgid "Remove From Library"
 msgstr "Loại khỏi thư viện"
 
-#: src/Dialogs.vala:2630 src/PhotoPage.vala:3075
+#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
 msgid "Removing Photo From Library"
-msgstr "Loại bỏ ảnh khỏi thư viện"
+msgstr "Đang loại bỏ ảnh khỏi thư viện"
 
-#: src/Dialogs.vala:2630
+#: ../src/Dialogs.vala:2688
 msgid "Removing Photos From Library"
-msgstr ""
+msgstr "Đang loại bỏ các ảnh khỏi thư viện"
 
-#: src/Dialogs.vala:2644
+#: ../src/Dialogs.vala:2702
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -1289,8 +2163,12 @@ msgid_plural ""
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
+"Sẽ xóa bỏ %d phim/ảnh khỏi thư viện Shotwell. Bạn có muốn chuyển những tập "
+"tin này vào thùng rác trên máy tính không?\n"
+"\n"
+"Hành động này không thể hoàn lại được."
 
-#: src/Dialogs.vala:2648
+#: ../src/Dialogs.vala:2706
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -1303,8 +2181,12 @@ msgid_plural ""
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
+"Sẽ xóa bỏ %d phim khỏi thư viện Shotwell. Bạn có muốn chuyển những tập tin "
+"này vào thùng rác trên máy tính không?\n"
+"\n"
+"Hành động này không thể hồi lại được."
 
-#: src/Dialogs.vala:2652
+#: ../src/Dialogs.vala:2710
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -1317,615 +2199,404 @@ msgid_plural ""
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
+"Sẽ xóa bỏ %d ảnh khỏi thư viện Shotwell. Bạn có muốn chuyển những tập tin "
+"này vào thùng rác trên máy tính không?\n"
+"\n"
+"Hành động này không thể hồi lại được."
 
-#: src/Dialogs.vala:2684
+#: ../src/Dialogs.vala:2742
 #, 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] "Không thể chuyển %d ảnh/video vào sọt rác. Xoá những tập tin này?"
+msgstr[0] "Không thể chuyển %d ảnh/phim vào Thùng rác. Xóa những tập tin này?"
 
-#: src/Dialogs.vala:2701
+#. Alert the user that the files were not removed.
+#: ../src/Dialogs.vala:2759
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
-msgstr[0] "Không thể xoá %d ảnh/video."
-
-#: src/folders/Branch.vala:141
-msgid "Folders"
-msgstr ""
-
-#: src/tags/Branch.vala:127
-msgid "Tags"
-msgstr "Thẻ"
-
-#: src/BatchImport.vala:26
-msgid "Success"
-msgstr "Thành công"
-
-#: src/BatchImport.vala:29
-msgid "File error"
-msgstr "Lỗi tập tin"
-
-#: src/BatchImport.vala:32
-msgid "Unable to decode file"
-msgstr "Không thể giải mã tập tin"
-
-#: src/BatchImport.vala:35
-msgid "Database error"
-msgstr "Lỗi cơ sở dữ liệu"
-
-#: src/BatchImport.vala:38
-msgid "User aborted import"
-msgstr "Người dùng đã hủy bỏ nhập ảnh"
-
-#: src/BatchImport.vala:41
-msgid "Not a file"
-msgstr "Không phải tập tin"
-
-#: src/BatchImport.vala:44
-msgid "File already exists in database"
-msgstr "Tập tin đã tồn tại trong cơ sở dữ liệu"
-
-#: src/BatchImport.vala:47
-msgid "Unsupported file format"
-msgstr "Định dạng tập tin không được hỗ trợ"
-
-#: src/BatchImport.vala:50
-msgid "Not an image file"
-msgstr "Không phải tập tin ảnh"
-
-#: src/BatchImport.vala:53
-msgid "Disk failure"
-msgstr ""
+msgstr[0] "Không thể xóa %d ảnh/phim."
 
-#: src/BatchImport.vala:56
-msgid "Disk full"
-msgstr "Đĩa đầy"
-
-#: src/BatchImport.vala:59
-msgid "Camera error"
-msgstr "Lỗi camera"
-
-#: src/BatchImport.vala:62
-msgid "File write error"
-msgstr "Lỗi ghi tập tin"
+#: ../src/Dimensions.vala:23
+msgid "Width"
+msgstr "Rộng"
 
-#: src/BatchImport.vala:65
-msgid "Corrupt image file"
-msgstr ""
+#: ../src/Dimensions.vala:26
+msgid "Height"
+msgstr "Cao"
 
-#: src/BatchImport.vala:68
+#. verify this is a directory
+#: ../src/DirectoryMonitor.vala:889
 #, c-format
-msgid "Imported failed (%d)"
-msgstr "Nhập thất bại (%d)"
+msgid "Unable to monitor %s: Not a directory (%s)"
+msgstr "Không thể theo dõi %s: Không phải một thư mục (%s)"
 
-#: src/Photo.vala:3656
-msgid "modified"
-msgstr ""
+#. if no name, pretty up the start time
+#: ../src/Event.vala:751
+#, c-format
+msgid "Event %s"
+msgstr "Sự kiện %s"
 
-#: src/PhotoPage.vala:532
-msgid "Previous photo"
-msgstr "Ảnh trước"
+#: ../src/Exporter.vala:232
+#, c-format
+msgid "Unable to generate a temporary file for %s: %s"
+msgstr "Không thể tạo tập tin tạm cho %s: %s"
 
-#: src/PhotoPage.vala:537
-msgid "Next photo"
-msgstr "Ảnh sau"
+#: ../src/Exporter.vala:299
+msgid "Exporting"
+msgstr "Đang xuất"
 
-#: src/PhotoPage.vala:1844
+#: ../src/Exporter.vala:317
 #, c-format
-msgid "Photo source file missing: %s"
-msgstr "Không thấy tập tin ảnh nguồn: %s"
+msgid "File %s already exists.  Replace?"
+msgstr "Tập tin %s đã tồn tại. Thay thế?"
 
-#: src/PhotoPage.vala:2404 src/library/LibraryWindow.vala:360
-#: src/direct/DirectPhotoPage.vala:165
-msgid "_View"
-msgstr "H_iển thị"
+#: ../src/Exporter.vala:319
+msgid "_Skip"
+msgstr "_Bỏ qua"
 
-#: src/PhotoPage.vala:2408 src/direct/DirectPhotoPage.vala:81
-msgid "T_ools"
-msgstr ""
+#: ../src/Exporter.vala:319
+msgid "_Replace"
+msgstr "T_hay thế"
 
-#: src/PhotoPage.vala:2413 src/direct/DirectPhotoPage.vala:86
-msgid "_Previous Photo"
-msgstr ""
+#: ../src/Exporter.vala:319
+msgid "Replace _All"
+msgstr "Thay thế _tất cả"
 
-#: src/PhotoPage.vala:2414 src/direct/DirectPhotoPage.vala:87
-msgid "Previous Photo"
-msgstr "Ảnh trước"
+#: ../src/Exporter.vala:319
+msgid "Export"
+msgstr "Xuất"
 
-#: src/PhotoPage.vala:2419 src/direct/DirectPhotoPage.vala:92
-msgid "_Next Photo"
-msgstr ""
+#: ../src/MediaMonitor.vala:400
+#, c-format
+msgid "Unable to process monitoring updates: %s"
+msgstr "Không thể xử lý các cập nhật theo dõi: %s"
 
-#: src/PhotoPage.vala:2420 src/direct/DirectPhotoPage.vala:93
-msgid "Next Photo"
-msgstr "Ảnh sau"
+#: ../src/MediaPage.vala:158
+msgid "Adjust the size of the thumbnails"
+msgstr "Chỉnh cỡ của ảnh thu nhỏ"
 
-#: src/PhotoPage.vala:2583 src/direct/DirectPhotoPage.vala:174
-#: src/MediaPage.vala:325
+#: ../src/MediaPage.vala:340 ../src/PhotoPage.vala:2593
+#: ../src/Resources.vala:188 ../src/direct/DirectPhotoPage.vala:174
 msgid "Zoom _In"
-msgstr ""
+msgstr "Phóng _to"
 
-#: src/PhotoPage.vala:2584 src/direct/DirectPhotoPage.vala:175
-msgid "Increase the magnification of the photo"
-msgstr "Tăng độ phóng đại của ảnh"
+#: ../src/MediaPage.vala:341
+msgid "Increase the magnification of the thumbnails"
+msgstr "Phóng to ảnh thu nhỏ"
 
-#: src/PhotoPage.vala:2589 src/direct/DirectPhotoPage.vala:180
-#: src/MediaPage.vala:331
+#: ../src/MediaPage.vala:346 ../src/PhotoPage.vala:2599
+#: ../src/Resources.vala:189 ../src/direct/DirectPhotoPage.vala:180
 msgid "Zoom _Out"
-msgstr ""
-
-#: src/PhotoPage.vala:2590 src/direct/DirectPhotoPage.vala:181
-msgid "Decrease the magnification of the photo"
-msgstr "Giảm độ phóng đại của ảnh"
-
-#: src/PhotoPage.vala:2595 src/direct/DirectPhotoPage.vala:186
-msgid "Fit to _Page"
-msgstr ""
-
-#: src/PhotoPage.vala:2596 src/direct/DirectPhotoPage.vala:187
-msgid "Zoom the photo to fit on the screen"
-msgstr ""
+msgstr "Thu _nhỏ"
 
-#: src/PhotoPage.vala:2601 src/direct/DirectPhotoPage.vala:192
-msgid "Zoom _100%"
-msgstr ""
+#: ../src/MediaPage.vala:347
+msgid "Decrease the magnification of the thumbnails"
+msgstr "Giảm cỡ của ảnh thu nhỏ"
 
-#: src/PhotoPage.vala:2602 src/direct/DirectPhotoPage.vala:193
-#, c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr ""
+#: ../src/MediaPage.vala:414
+msgid "Sort _Photos"
+msgstr "Sắ_p xếp ảnh"
 
-#: src/PhotoPage.vala:2607 src/direct/DirectPhotoPage.vala:198
-msgid "Zoom _200%"
-msgstr ""
+#: ../src/MediaPage.vala:423
+msgid "_Play Video"
+msgstr "P_hát phim"
 
-#: src/PhotoPage.vala:2608 src/direct/DirectPhotoPage.vala:199
-#, c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr ""
+#: ../src/MediaPage.vala:424
+msgid "Open the selected videos in the system video player"
+msgstr "Phát phim được chọn trong ứng dụng phát phim của hệ thống"
 
-#: src/PhotoPage.vala:2628 src/MediaPage.vala:413
+#: ../src/MediaPage.vala:428 ../src/PhotoPage.vala:2642
 msgid "_Developer"
-msgstr ""
+msgstr "_Trình hiển thị ảnh"
 
-#: src/PhotoPage.vala:3216
-#, c-format
-msgid "Unable to export %s: %s"
-msgstr "Không thể xuất %s: %s"
-
-#: src/data_imports/DataImportsPluginHost.vala:65
-#: src/data_imports/DataImportsPluginHost.vala:78
-#, c-format
-msgid "%s Database"
-msgstr "Cơ sở dữ liệu %s"
-
-#: 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/data_imports/DataImportsPluginHost.vala:151
-msgid "To try importing from another service, select one from the above menu."
-msgstr ""
-
-#: src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr ""
-
-#: 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/data_imports/DataImportsUI.vala:100
-msgid "Database file:"
-msgstr ""
-
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:899
-msgid "_Import"
-msgstr "_Nhập"
-
-#: src/data_imports/DataImportsUI.vala:216
-msgid "Import From Application"
-msgstr ""
-
-#: src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr ""
-
-#: src/data_imports/DataImportsUI.vala:394
-#: src/publishing/PublishingUI.vala:493
-msgid "_Close"
-msgstr ""
-
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:182
-msgid "Settings"
-msgstr "Thiết lập"
-
-#: src/SlideshowPage.vala:141 src/Screensaver.vala:18
-msgid "Slideshow"
-msgstr "Trình chiếu"
-
-#: src/SlideshowPage.vala:161
-msgid "Back"
-msgstr "Trở lại"
-
-#: src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "Đến ảnh trước"
-
-#: src/SlideshowPage.vala:168 src/SlideshowPage.vala:273
-msgid "Pause"
-msgstr "Tạm dừng"
-
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:274
-msgid "Pause the slideshow"
-msgstr "Tạm dừng trình chiếu"
-
-#: src/SlideshowPage.vala:175
-msgid "Next"
-msgstr "Tiếp theo"
-
-#: src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "Đến ảnh kế tiếp"
+#: ../src/MediaPage.vala:440 ../src/camera/Branch.vala:99
+#: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
+#: ../src/photos/RawSupport.vala:303
+msgid "Camera"
+msgstr "Máy ảnh"
 
-#: src/SlideshowPage.vala:183
-msgid "Change slideshow settings"
-msgstr "Đổi thiết lập trình chiếu"
+#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:874
+msgid "_Titles"
+msgstr "_Tựa đề"
 
-#: src/SlideshowPage.vala:237
-msgid "All photo source files are missing."
-msgstr "Thiếu tất cả tập tin ảnh nguồn."
+#: ../src/MediaPage.vala:452 ../src/camera/ImportPage.vala:875
+msgid "Display the title of each photo"
+msgstr "Hiện tựa đề của mỗi ảnh"
 
-#: src/SlideshowPage.vala:269
-msgid "Play"
-msgstr "Phát"
+#: ../src/MediaPage.vala:457 ../src/events/EventsDirectoryPage.vala:130
+msgid "_Comments"
+msgstr "Ghi _chú"
 
-#: src/SlideshowPage.vala:270
-msgid "Continue the slideshow"
-msgstr "Tiếp tục trình chiếu"
+#: ../src/MediaPage.vala:458
+msgid "Display the comment of each photo"
+msgstr "Hiển thị ghi chú cho từng ảnh"
 
-#: src/Commands.vala:733
-msgid "Reverting"
-msgstr "Trở lại"
+#: ../src/MediaPage.vala:469 ../src/library/LibraryWindow.vala:360
+msgid "Ta_gs"
+msgstr "T_hẻ"
 
-#: src/Commands.vala:733
-msgid "Undoing Revert"
-msgstr "Hủy thao tác Trở lại"
+#: ../src/MediaPage.vala:470
+msgid "Display each photo's tags"
+msgstr "Hiện thị thẻ của mỗi ảnh"
 
-#: src/Commands.vala:777
-msgid "Enhancing"
-msgstr "Tăng cường"
+#: ../src/MediaPage.vala:486
+msgid "By _Title"
+msgstr "Theo _Tựa đề"
 
-#: src/Commands.vala:777
-msgid "Undoing Enhance"
-msgstr "Hủy thao tác tăng cường"
+#: ../src/MediaPage.vala:487
+msgid "Sort photos by title"
+msgstr "Xếp ảnh theo tựa đề"
 
-#: src/Commands.vala:845
-msgid "Applying Color Transformations"
-msgstr ""
+#: ../src/MediaPage.vala:492
+msgid "By Exposure _Date"
+msgstr "Theo _Ngày phơi sáng"
 
-#: src/Commands.vala:845
-msgid "Undoing Color Transformations"
-msgstr ""
+#: ../src/MediaPage.vala:493
+msgid "Sort photos by exposure date"
+msgstr "Sắp xếp các ảnh theo ngày phơi sáng"
 
-#: src/Commands.vala:995
-msgid "Creating New Event"
-msgstr "Tạo sự kiện mới"
+#: ../src/MediaPage.vala:498
+msgid "By _Rating"
+msgstr "Theo đánh _giá"
 
-#: src/Commands.vala:996
-msgid "Removing Event"
-msgstr "Loại bỏ sự kiện"
+#: ../src/MediaPage.vala:499
+msgid "Sort photos by rating"
+msgstr "Sắp xếp theo mức đánh giá"
 
-#: src/Commands.vala:1005
-msgid "Moving Photos to New Event"
-msgstr "Chuyển ảnh sang sự kiện mới"
+#: ../src/MediaPage.vala:504
+msgid "By _Filename"
+msgstr "Theo tê_n tập tin"
 
-#: src/Commands.vala:1006
-msgid "Setting Photos to Previous Event"
-msgstr ""
+#: ../src/MediaPage.vala:505
+msgid "Sort photos by filename"
+msgstr "Sắp xếp ảnh theo tên tập tin"
 
-#: src/Commands.vala:1063
-msgid "Merging"
-msgstr ""
+#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:406
+msgid "_Ascending"
+msgstr "_Tăng dần"
 
-#: src/Commands.vala:1064
-msgid "Unmerging"
-msgstr ""
+#: ../src/MediaPage.vala:516 ../src/library/LibraryWindow.vala:407
+msgid "Sort photos in an ascending order"
+msgstr "Sắp xếp ảnh theo thứ tự tăng dần"
 
-#: src/Commands.vala:1073
-msgid "Duplicating photos"
-msgstr ""
+#: ../src/MediaPage.vala:521 ../src/library/LibraryWindow.vala:413
+msgid "D_escending"
+msgstr "_Giảm dần"
 
-#: src/Commands.vala:1073
-msgid "Removing duplicated photos"
-msgstr ""
+#: ../src/MediaPage.vala:522 ../src/library/LibraryWindow.vala:414
+msgid "Sort photos in a descending order"
+msgstr "Sắp xếp ảnh theo thứ tự giảm dần"
 
-#: src/Commands.vala:1096
+#: ../src/MediaPage.vala:723
 #, 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] ""
-
-#: src/Commands.vala:1183
-msgid "Restoring previous rating"
-msgstr ""
-
-#: src/Commands.vala:1193 src/Commands.vala:1194
-msgid "Increasing ratings"
-msgstr "Tăng mức đánh giá"
-
-#: src/Commands.vala:1193 src/Commands.vala:1194
-msgid "Decreasing ratings"
-msgstr "Giảm mức đánh giá"
-
-#: src/Commands.vala:1244
-msgid "Setting RAW developer"
-msgstr ""
-
-#: src/Commands.vala:1244
-msgid "Restoring previous RAW developer"
-msgstr ""
-
-#: src/Commands.vala:1245
-msgid "Set Developer"
-msgstr ""
-
-#: src/Commands.vala:1335
-msgid "Original photo could not be adjusted."
+msgid ""
+"Shotwell was unable to play the selected video:\n"
+"%s"
 msgstr ""
+"Shotwell không thể phát phim đã chọn:\n"
+"%s"
 
-#: src/Commands.vala:1356
-msgid "Adjusting Date and Time"
-msgstr "Chỉnh ngày và giờ"
+#: ../src/Page.vala:1263
+msgid "No photos/videos"
+msgstr "Không có ảnh/phim"
 
-#: src/Commands.vala:1356
-msgid "Undoing Date and Time Adjustment"
-msgstr "Hủy thao tác chỉnh ngày và giờ"
+#: ../src/Page.vala:1267
+msgid "No photos/videos found"
+msgstr "Không tìm thấy ảnh/phim"
 
-#: src/Commands.vala:1387
-msgid "One original photo could not be adjusted."
-msgid_plural "The following original photos could not be adjusted."
-msgstr[0] "Ảnh gốc không thể bị chỉnh sửa."
+#: ../src/Page.vala:2565
+msgid "Photos cannot be exported to this directory."
+msgstr "Các ảnh không thể được xuất từ thư mục này."
 
-#: src/Commands.vala:1389 src/Commands.vala:1413
-msgid "Time Adjustment Error"
-msgstr ""
+#: ../src/Photo.vala:3753
+msgid "modified"
+msgstr "đã sửa"
 
-#: src/Commands.vala:1411
-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] ""
+#. previous button
+#: ../src/PhotoPage.vala:533
+msgid "Previous photo"
+msgstr "Ảnh trước"
 
-#: src/Commands.vala:1625 src/Commands.vala:1648
-msgid "Create Tag"
-msgstr "Tạo thẻ"
+#. next button
+#: ../src/PhotoPage.vala:539
+msgid "Next photo"
+msgstr "Ảnh sau"
 
-#: src/Commands.vala:1683
+#: ../src/PhotoPage.vala:1847
 #, c-format
-msgid "Move Tag \"%s\""
-msgstr ""
-
-#: src/Commands.vala:2335
-msgid "Move Photos to Trash"
-msgstr "Chuyển ảnh vào sọt rác"
-
-#: src/Commands.vala:2335
-msgid "Restore Photos from Trash"
-msgstr "Phục hồi ảnh trong sọt rác"
-
-#: src/Commands.vala:2336
-msgid "Move the photos to the Shotwell trash"
-msgstr "Chuyển ảnh vào sọt rác của Shotwell"
-
-#: src/Commands.vala:2336
-msgid "Restore the photos back to the Shotwell library"
-msgstr "Phục hồi ảnh trở về thư viện của Shotwell"
-
-#: src/Commands.vala:2355
-msgid "Moving Photos to Trash"
-msgstr "Chuyển ảnh vào sọt rác"
-
-#: src/Commands.vala:2355
-msgid "Restoring Photos From Trash"
-msgstr "Phục hồi ảnh từ sọt rác"
-
-#: src/Commands.vala:2441
-msgid "Flag selected photos"
-msgstr "Gắn cờ cho ảnh đã chọn"
-
-#: src/Commands.vala:2442
-msgid "Unflag selected photos"
-msgstr "Gỡ cờ các ảnh đã chọn"
-
-#: src/Commands.vala:2443
-msgid "Flagging selected photos"
-msgstr ""
-
-#: src/Commands.vala:2444
-msgid "Unflagging selected photos"
-msgstr ""
-
-#: src/Commands.vala:2451
-msgid "Flag"
-msgstr "Gắn cờ"
+msgid "Photo source file missing: %s"
+msgstr "Không thấy tập tin ảnh nguồn: %s"
 
-#: src/Commands.vala:2451
-msgid "Unflag"
-msgstr "Gỡ cờ"
+#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
+#: ../src/library/LibraryWindow.vala:344
+msgid "_View"
+msgstr "H_iển thị"
 
-#: src/photos/RawSupport.vala:134
-msgid "RAW"
-msgstr "RAW"
+#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
+msgid "T_ools"
+msgstr "_Công cụ"
 
-#: src/photos/RawSupport.vala:297 src/MediaPage.vala:420
-msgid "Shotwell"
-msgstr "Shotwell"
+#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
+msgid "_Previous Photo"
+msgstr "Ảnh t_rước"
 
-#: src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr "BMP"
+#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
+msgid "Previous Photo"
+msgstr "Ảnh trước"
 
-#: src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
+#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
+msgid "_Next Photo"
+msgstr "Ảnh _sau"
 
-#: src/photos/JfifSupport.vala:182
-#, c-format
-msgid "Low (%d%%)"
-msgstr "Thấp (%d%%)"
+#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
+msgid "Next Photo"
+msgstr "Ảnh sau"
 
-#: src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "Trung bình (%d%%)"
+#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
+msgid "Increase the magnification of the photo"
+msgstr "Tăng độ phóng đại của ảnh"
 
-#: src/photos/JfifSupport.vala:188
-#, c-format
-msgid "High (%d%%)"
-msgstr "Cao (%d%%)"
+#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
+msgid "Decrease the magnification of the photo"
+msgstr "Giảm độ phóng đại của ảnh"
 
-#: src/photos/JfifSupport.vala:191
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "Tối đa (%d%%)"
+#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
+msgid "Fit to _Page"
+msgstr "_Vừa khít trang"
 
-#: src/photos/PngSupport.vala:30
-msgid "PNG"
-msgstr "PNG"
+#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
+msgid "Zoom the photo to fit on the screen"
+msgstr "Phóng ảnh cho vừa khít màn hình"
 
-#: src/photos/TiffSupport.vala:86
-msgid "TIFF"
-msgstr "TIFF"
+#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
+#, no-c-format
+msgid "Zoom _100%"
+msgstr "Phóng _100%"
 
-#: src/Page.vala:1268
-msgid "No photos/videos"
-msgstr "Không có ảnh/video"
+#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
+#, no-c-format
+msgid "Zoom the photo to 100% magnification"
+msgstr "Phóng ảnh lên 100%"
 
-#: src/Page.vala:1272
-msgid "No photos/videos found"
-msgstr "Không tìm thấy ảnh/video"
+#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
+#, no-c-format
+msgid "Zoom _200%"
+msgstr "Phóng _200%"
 
-#: src/Page.vala:2569
-msgid "Photos cannot be exported to this directory."
-msgstr ""
+#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
+#, no-c-format
+msgid "Zoom the photo to 200% magnification"
+msgstr "Phóng ảnh lên 200%"
 
-#: src/MediaMonitor.vala:400
+#: ../src/PhotoPage.vala:3231
 #, c-format
-msgid "Unable to process monitoring updates: %s"
-msgstr ""
+msgid "Unable to export %s: %s"
+msgstr "Không thể xuất %s: %s"
 
-#: src/Printing.vala:255
+#: ../src/Printing.vala:255
 msgid "Fill the entire page"
 msgstr "Lấp đầy trang hiện tại"
 
-#: src/Printing.vala:256
+#: ../src/Printing.vala:256
 msgid "2 images per page"
 msgstr "2 ảnh mỗi trang"
 
-#: src/Printing.vala:257
+#: ../src/Printing.vala:257
 msgid "4 images per page"
 msgstr "4 ảnh mỗi trang"
 
-#: src/Printing.vala:258
+#: ../src/Printing.vala:258
 msgid "6 images per page"
 msgstr "6 ảnh mỗi trang"
 
-#: src/Printing.vala:259
+#: ../src/Printing.vala:259
 msgid "8 images per page"
 msgstr "8 ảnh mỗi trang"
 
-#: src/Printing.vala:260
+#: ../src/Printing.vala:260
 msgid "16 images per page"
 msgstr "16 ảnh mỗi trang"
 
-#: src/Printing.vala:261
+#: ../src/Printing.vala:261
 msgid "32 images per page"
 msgstr "32 ảnh mỗi trang"
 
-#: src/Printing.vala:348
+#: ../src/Printing.vala:348
 msgid "in."
 msgstr "in."
 
-#: src/Printing.vala:349
+#: ../src/Printing.vala:349
 msgid "cm"
 msgstr "cm"
 
-#: src/Printing.vala:817 src/editing_tools/EditingTools.vala:757
+#: ../src/Printing.vala:817 ../src/editing_tools/EditingTools.vala:761
 msgid "Wallet (2 x 3 in.)"
-msgstr ""
+msgstr "Ví (2 x 3 in.)"
 
-#: src/Printing.vala:820 src/editing_tools/EditingTools.vala:758
+#: ../src/Printing.vala:820 ../src/editing_tools/EditingTools.vala:762
 msgid "Notecard (3 x 5 in.)"
-msgstr ""
+msgstr "Tờ ghi chú (3 x 5 in.)"
 
-#: src/Printing.vala:823 src/editing_tools/EditingTools.vala:759
+#: ../src/Printing.vala:823 ../src/editing_tools/EditingTools.vala:763
 msgid "4 x 6 in."
 msgstr "4 x 6 in."
 
-#: src/Printing.vala:826 src/editing_tools/EditingTools.vala:760
+#: ../src/Printing.vala:826 ../src/editing_tools/EditingTools.vala:764
 msgid "5 x 7 in."
 msgstr "5 x 7 in."
 
-#: src/Printing.vala:829 src/editing_tools/EditingTools.vala:761
+#: ../src/Printing.vala:829 ../src/editing_tools/EditingTools.vala:765
 msgid "8 x 10 in."
 msgstr "8 x 10 in."
 
-#: src/Printing.vala:832 src/editing_tools/EditingTools.vala:763
+#: ../src/Printing.vala:832 ../src/editing_tools/EditingTools.vala:767
 msgid "11 x 14 in."
 msgstr "11 x 14 in."
 
-#: src/Printing.vala:835 src/editing_tools/EditingTools.vala:765
+#: ../src/Printing.vala:835 ../src/editing_tools/EditingTools.vala:769
 msgid "16 x 20 in."
 msgstr "16 x 20 in."
 
-#: src/Printing.vala:841 src/editing_tools/EditingTools.vala:767
+#: ../src/Printing.vala:841 ../src/editing_tools/EditingTools.vala:771
 msgid "Metric Wallet (9 x 13 cm)"
-msgstr ""
+msgstr "Ví hệ mét (9 x 13 cm)"
 
-#: src/Printing.vala:844 src/editing_tools/EditingTools.vala:768
+#: ../src/Printing.vala:844 ../src/editing_tools/EditingTools.vala:772
 msgid "Postcard (10 x 15 cm)"
-msgstr ""
+msgstr "Bưu thiếp (10 x 15 cm)"
 
-#: src/Printing.vala:847 src/editing_tools/EditingTools.vala:769
+#: ../src/Printing.vala:847 ../src/editing_tools/EditingTools.vala:773
 msgid "13 x 18 cm"
 msgstr "13 x 18 cm"
 
-#: src/Printing.vala:850 src/editing_tools/EditingTools.vala:770
+#: ../src/Printing.vala:850 ../src/editing_tools/EditingTools.vala:774
 msgid "18 x 24 cm"
 msgstr "18 x 24 cm"
 
-#: src/Printing.vala:853 src/editing_tools/EditingTools.vala:772
+#: ../src/Printing.vala:853 ../src/editing_tools/EditingTools.vala:776
 msgid "20 x 30 cm"
 msgstr "20 x 30 cm"
 
-#: src/Printing.vala:856 src/editing_tools/EditingTools.vala:773
+#: ../src/Printing.vala:856 ../src/editing_tools/EditingTools.vala:777
 msgid "24 x 40 cm"
 msgstr "24 x 40 cm"
 
-#: src/Printing.vala:859 src/editing_tools/EditingTools.vala:774
+#: ../src/Printing.vala:859 ../src/editing_tools/EditingTools.vala:778
 msgid "30 x 40 cm"
 msgstr "30 x 40 cm"
 
-#: src/Printing.vala:875
+#: ../src/Printing.vala:875
 msgid "Image Settings"
-msgstr "Thiết lập ảnh"
+msgstr "Cài đặt ảnh"
 
-#: src/Printing.vala:888
+#: ../src/Printing.vala:888
 msgid "Printing..."
-msgstr "Đang in..."
+msgstr "Đang in…"
 
-#: src/Printing.vala:908 src/Printing.vala:1111
+#: ../src/Printing.vala:908 ../src/Printing.vala:1111
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -1936,2409 +2607,2299 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
-msgstr "Không thể mở/tạo cở sở dữ liệu ảnh %s: mã lỗi %d"
+#: ../src/Properties.vala:84
+msgid "Today"
+msgstr "Hôm nay"
 
-#: src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
-msgstr ""
-"Không thể ghi vào tập tin cơ sở dữ liệu ảnh:\n"
-"%s"
+#: ../src/Properties.vala:86
+msgid "Yesterday"
+msgstr "Hôm qua"
 
-#: src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
-msgstr ""
-"Lỗi khi truy cập tập tin cơ sở dữ liệu:\n"
-"%s\n"
-"\n"
-"Lỗi: \n"
-"%s"
+#: ../src/Properties.vala:227 ../src/camera/ImportPage.vala:312
+msgid "RAW+JPEG"
+msgstr "RAW+JPEG"
 
-#: src/VideoSupport.vala:464
-msgid "Export Videos"
-msgstr "Xuất video"
+#: ../src/Properties.vala:343
+msgid "Items:"
+msgstr "Hạng mục:"
 
-#: src/DesktopIntegration.vala:118
+#: ../src/Properties.vala:346
 #, c-format
-msgid "Unable to launch Nautilus Send-To: %s"
-msgstr ""
-
-#: src/DesktopIntegration.vala:126
-msgid "Send To"
-msgstr "Gửi đến"
+msgid "%d Event"
+msgid_plural "%d Events"
+msgstr[0] "%d sự kiện"
 
-#: src/DesktopIntegration.vala:171
+#: ../src/Properties.vala:353 ../src/events/EventDirectoryItem.vala:87
 #, c-format
-msgid "Unable to export background to %s: %s"
-msgstr ""
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] "%d ảnh"
 
-#: src/DesktopIntegration.vala:299
+#: ../src/Properties.vala:355 ../src/events/EventDirectoryItem.vala:85
 #, c-format
-msgid "Unable to prepare desktop slideshow: %s"
-msgstr ""
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:587
-#: src/SearchFilter.vala:588 src/SearchFilter.vala:990
-msgid "Flagged"
-msgstr "Được đánh dấu"
+msgid "%d Video"
+msgid_plural "%d Videos"
+msgstr[0] "%d phim"
 
-#: src/library/TrashPage.vala:8
-msgid "Trash"
-msgstr "Sọt rác"
+#. display only one date if start and end are the same
+#: ../src/Properties.vala:377
+msgid "Date:"
+msgstr "Ngày:"
 
-#: src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "Sọt rác trống"
+#. display only one time if start and end are the same
+#: ../src/Properties.vala:381
+msgid "Time:"
+msgstr "Giờ:"
 
-#: src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "Xóa"
+#. display time range
+#. display date range
+#: ../src/Properties.vala:384 ../src/Properties.vala:389
+msgid "From:"
+msgstr "Từ:"
 
-#: src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-msgstr "Xóa ảnh"
+#: ../src/Properties.vala:385 ../src/Properties.vala:390
+msgid "To:"
+msgstr "Đến:"
 
-#: src/library/OfflinePage.vala:8
-msgid "Missing Files"
-msgstr "Tập tin bị thiếu"
+#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1890
+msgid "Size:"
+msgstr "Kích thước:"
 
-#: src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "Đang xóa..."
+#: ../src/Properties.vala:404
+msgid "Duration:"
+msgstr "Thời lượng:"
 
-#: src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "Lần nhập gần nhất"
+#: ../src/Properties.vala:404
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f giây"
 
-#: src/library/LibraryWindow.vala:301
-msgid "_Import From Folder..."
-msgstr "_Nhập từ thư mục..."
+#: ../src/Properties.vala:408
+msgid "Developer:"
+msgstr "Trình hiển thị ảnh:"
 
-#: src/library/LibraryWindow.vala:302
-msgid "Import photos from disk to library"
-msgstr "Nhập ảnh từ đĩa vào thư viện"
+#. fit both on the top line, emit and move on
+#: ../src/Properties.vala:436 ../src/Properties.vala:440
+#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2258
+msgid "Exposure:"
+msgstr "Phơi sáng:"
 
-#: src/library/LibraryWindow.vala:309
-msgid "Import From _Application..."
-msgstr ""
+#. nothing special to be done for now for Events
+#: ../src/Properties.vala:583
+msgid "Location:"
+msgstr "Vị trí:"
 
-#: src/library/LibraryWindow.vala:313
-msgid "Sort _Events"
-msgstr "Sắp xếp _Sự kiện"
+#: ../src/Properties.vala:586
+msgid "File size:"
+msgstr "Dung lượng tập tin:"
 
-#: src/library/LibraryWindow.vala:323
-msgid "Empty T_rash"
-msgstr "Xóa _thùng rác"
+#: ../src/Properties.vala:590
+msgid "Current Development:"
+msgstr "Sự phát triển hiện tại:"
 
-#: src/library/LibraryWindow.vala:324
-msgid "Delete all photos in the trash"
-msgstr "Xóa tất cả ảnh trong sọt rác"
+#: ../src/Properties.vala:592
+msgid "Original dimensions:"
+msgstr "Kích thước gốc:"
 
-#: src/library/LibraryWindow.vala:329
-msgid "View Eve_nt for Photo"
-msgstr "Xem sự _kiện của ảnh"
+#: ../src/Properties.vala:595
+msgid "Camera make:"
+msgstr "Nhà sản xuất máy ảnh:"
 
-#: src/library/LibraryWindow.vala:334
-msgid "_Find"
-msgstr "Tìm _kiếm"
+#: ../src/Properties.vala:598
+msgid "Camera model:"
+msgstr "Mô hình máy ảnh:"
 
-#: src/library/LibraryWindow.vala:335
-msgid "Find photos and videos by search criteria"
-msgstr "Tìm kiếm ảnh và movie "
+#: ../src/Properties.vala:601
+msgid "Flash:"
+msgstr "Đèn nháy:"
 
-#: src/library/LibraryWindow.vala:352 src/direct/DirectPhotoPage.vala:46
-msgid "_File"
-msgstr "_Tập tin"
+#: ../src/Properties.vala:603
+msgid "Focal length:"
+msgstr "Chiều dài lấy nét:"
 
-#: src/library/LibraryWindow.vala:356 src/direct/DirectPhotoPage.vala:73
-msgid "_Edit"
-msgstr "_Chỉnh sửa"
+#: ../src/Properties.vala:606
+msgid "Exposure date:"
+msgstr "Ngày phơi sáng:"
 
-#: src/library/LibraryWindow.vala:364 src/direct/DirectPhotoPage.vala:77
-msgid "_Photo"
-msgstr "Ả_nh"
+#: ../src/Properties.vala:609
+msgid "Exposure time:"
+msgstr "Giờ phơi sáng:"
 
-#: src/library/LibraryWindow.vala:368
-msgid "_Photos"
-msgstr "Ả_nh"
+#: ../src/Properties.vala:612
+msgid "Exposure bias:"
+msgstr "Khuynh hướng phơi sáng:"
 
-#: src/library/LibraryWindow.vala:372
-msgid "Even_ts"
-msgstr "Sự _kiện"
+#: ../src/Properties.vala:614
+msgid "GPS latitude:"
+msgstr "Vĩ độ GPS:"
 
-#: src/library/LibraryWindow.vala:376 src/MediaPage.vala:454
-msgid "Ta_gs"
-msgstr "T_hẻ"
+#: ../src/Properties.vala:617
+msgid "GPS longitude:"
+msgstr "Kinh độ GPS:"
 
-#: src/library/LibraryWindow.vala:380 src/direct/DirectPhotoPage.vala:169
-msgid "_Help"
-msgstr "Trợ _giúp"
+#: ../src/Properties.vala:620
+msgid "Artist:"
+msgstr "Nghệ sĩ:"
 
-#: src/library/LibraryWindow.vala:391
-msgid "_Basic Information"
-msgstr "Thông tin cơ _bản"
+#: ../src/Properties.vala:622
+msgid "Copyright:"
+msgstr "Bản quyền:"
 
-#: src/library/LibraryWindow.vala:392
-msgid "Display basic information for the selection"
-msgstr "Hiện thông tin cơ bản cho phần chọn"
+#: ../src/Properties.vala:624
+msgid "Software:"
+msgstr "Phần mềm:"
 
-#: src/library/LibraryWindow.vala:397
-msgid "E_xtended Information"
+#: ../src/Properties.vala:639
+msgid "Extended Information"
 msgstr "Thông tin mở rộng"
 
-#: src/library/LibraryWindow.vala:398
-msgid "Display extended information for the selection"
-msgstr "Hiện thông tin mở rộng cho phần đã chọn"
-
-#: src/library/LibraryWindow.vala:403
-msgid "_Search Bar"
-msgstr "Thanh _tìm kiếm"
-
-#: src/library/LibraryWindow.vala:404
-msgid "Display the search bar"
-msgstr "Hiện thanh tìm kiếm"
-
-#: src/library/LibraryWindow.vala:409
-msgid "S_idebar"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:410
-msgid "Display the sidebar"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:422 src/MediaPage.vala:494
-msgid "_Ascending"
-msgstr "_Tăng dần"
-
-#: src/library/LibraryWindow.vala:423 src/MediaPage.vala:495
-msgid "Sort photos in an ascending order"
-msgstr "Sắp xếp ảnh theo thứ tự tăng dần"
-
-#: src/library/LibraryWindow.vala:429 src/MediaPage.vala:500
-msgid "D_escending"
-msgstr "_Giảm dần"
-
-#: src/library/LibraryWindow.vala:430 src/MediaPage.vala:501
-msgid "Sort photos in a descending order"
-msgstr "Sắp xếp ảnh theo thứ tự giảm dần"
-
-#: src/library/LibraryWindow.vala:668
-msgid "Import From Folder"
-msgstr "Nhập từ thư mục"
-
-#: src/library/LibraryWindow.vala:737
-msgid "Empty Trash"
-msgstr "Xóa thùng rác"
-
-#: src/library/LibraryWindow.vala:737
-msgid "Emptying Trash..."
-msgstr "Xóa thùng rác..."
-
-#: src/library/LibraryWindow.vala:896
-msgid "Shotwell is configured to import photos to your home directory.\n"
-msgstr "Shotwell được cấu hình để nhập ảnh vào thư mục chính của bạn.\n"
-
-#: src/library/LibraryWindow.vala:899
-msgid "Library Location"
-msgstr "Vị trí thư viện"
-
-#: src/library/LibraryWindow.vala:912
-msgid "Photos cannot be imported from this directory."
-msgstr "Không thể nhập ảnh từ thư mục này."
-
-#: src/library/LibraryWindow.vala:1200
-#, c-format
-msgid "%s (%d%%)"
-msgstr "%s (%d%%)"
-
-#: src/library/LibraryWindow.vala:1244 src/library/LibraryWindow.vala:1255
-msgid "Updating library..."
-msgstr "Đang cập nhật thư viện"
+#: ../src/Resources.vala:17
+msgid "Photo Manager"
+msgstr "Trình quản lý ảnh"
 
-#: src/library/LibraryWindow.vala:1261
-msgid "Preparing to auto-import photos..."
-msgstr "Đang chuẩn bị tự động nhập ảnh..."
+#: ../src/Resources.vala:18
+msgid "Photo Viewer"
+msgstr "Trình xem ảnh"
 
-#: src/library/LibraryWindow.vala:1266
-msgid "Auto-importing photos..."
-msgstr "Tự động nhập ảnh..."
+#: ../src/Resources.vala:144
+msgid "Rotate _Right"
+msgstr "Xoay _phải"
 
-#: src/library/LibraryWindow.vala:1274
-msgid "Writing metadata to files..."
-msgstr "Đang ghi thông tin vào tập tin..."
+#: ../src/Resources.vala:145 ../src/Resources.vala:150
+msgid "Rotate"
+msgstr "Xoay"
 
-#: src/library/Branch.vala:37
-msgid "Library"
-msgstr "Thư viện"
+#: ../src/Resources.vala:146
+msgid "Rotate Right"
+msgstr "Xoay phải"
 
-#: src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "Đang nhập..."
+#: ../src/Resources.vala:147
+msgid "Rotate the photos right (press Ctrl to rotate left)"
+msgstr "Xoay ảnh sang phải (nhấn Ctrl để quay trái)"
 
-#: src/library/ImportQueuePage.vala:66
-msgid "_Stop Import"
-msgstr "_Dừng nhập"
+#: ../src/Resources.vala:149
+msgid "Rotate _Left"
+msgstr "Xoay _trái"
 
-#: src/library/ImportQueuePage.vala:67
-msgid "Stop importing photos"
-msgstr "Dừng nhập ảnh"
+#: ../src/Resources.vala:151
+msgid "Rotate Left"
+msgstr "Xoay trái"
 
-#: src/library/ImportQueuePage.vala:123
-msgid "Preparing to import..."
-msgstr "Đang chuẩn bị nhập..."
+#: ../src/Resources.vala:152
+msgid "Rotate the photos left"
+msgstr "Xoay ảnh sang trái"
 
-#: src/library/ImportQueuePage.vala:150
-#, c-format
-msgid "Imported %s"
-msgstr "Đã nhập %s"
+#: ../src/Resources.vala:154
+msgid "Flip Hori_zontally"
+msgstr "Lật _ngang"
 
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:413
-msgid "_Save"
-msgstr ""
+#: ../src/Resources.vala:155
+msgid "Flip Horizontally"
+msgstr "Lật ngang"
 
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Lưu ảnh"
+#: ../src/Resources.vala:157
+msgid "Flip Verti_cally"
+msgstr "Lật dọ_c"
 
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr ""
+#: ../src/Resources.vala:158
+msgid "Flip Vertically"
+msgstr "Lật dọc"
 
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr ""
+#: ../src/Resources.vala:160
+msgid "_About"
+msgstr "_Giới thiệu"
 
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr ""
+#: ../src/Resources.vala:161
+msgid "_Apply"
+msgstr "Á_p dụng"
 
-#: src/direct/DirectPhotoPage.vala:223
-#, c-format
-msgid "%s does not exist."
-msgstr "%s không tồn tại."
+#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
+#: ../src/library/LibraryWindow.vala:340
+msgid "_Edit"
+msgstr "_Chỉnh sửa"
 
-#: src/direct/DirectPhotoPage.vala:225
-#, c-format
-msgid "%s is not a file."
-msgstr "%s không phải là tập tin."
+#: ../src/Resources.vala:165
+msgid "_Forward"
+msgstr "Chuyển t_iếp"
 
-#: src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr ""
-"%s không hỗ trợ định dạng tập tin\n"
-"%s."
+#: ../src/Resources.vala:166
+msgid "Fulls_creen"
+msgstr "Toàn_Màn hình"
 
-#: src/direct/DirectPhotoPage.vala:413
-msgid "_Save a Copy"
-msgstr ""
+#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
+#: ../src/library/LibraryWindow.vala:364
+msgid "_Help"
+msgstr "Trợ _giúp"
 
-#: src/direct/DirectPhotoPage.vala:416
-#, c-format
-msgid "Lose changes to %s?"
-msgstr "Không lưu các thay đổi của %s?"
+#: ../src/Resources.vala:168
+msgid "Leave _Fullscreen"
+msgstr "Thoát _Toàn màn hình"
 
-#: src/direct/DirectPhotoPage.vala:417
-msgid "Close _without Saving"
-msgstr ""
+#: ../src/Resources.vala:169 ../src/Resources.vala:371
+msgid "_New"
+msgstr "Mớ_i"
 
-#: src/direct/DirectPhotoPage.vala:450
-#, c-format
-msgid "Error while saving to %s: %s"
-msgstr ""
+#: ../src/Resources.vala:170
+msgid "_Next"
+msgstr "_Kế"
 
-#: src/direct/DirectPhotoPage.vala:478 src/direct/DirectPhotoPage.vala:499
-msgid "Save As"
-msgstr "Lưu mới"
+#: ../src/Resources.vala:171
+msgid "_OK"
+msgstr "Đồn_g ý"
 
-#: src/DirectoryMonitor.vala:889
-#, c-format
-msgid "Unable to monitor %s: Not a directory (%s)"
-msgstr ""
+#: ../src/Resources.vala:172
+msgid "_Play"
+msgstr "_Phát"
 
-#: src/Resources.vala:17
-msgid "Photo Manager"
-msgstr "Trình quản lí ảnh"
+#: ../src/Resources.vala:173 ../src/Resources.vala:325
+msgid "_Preferences"
+msgstr "Tù_y thích"
 
-#: src/Resources.vala:18
-msgid "Photo Viewer"
-msgstr "Trình xem ảnh"
+#: ../src/Resources.vala:174
+msgid "_Previous"
+msgstr "T_rước"
 
-#: src/Resources.vala:27 plugins/shotwell-publishing/YouTubePublishing.vala:32
-#: plugins/shotwell-publishing/FlickrPublishing.vala:34
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:32
-#: plugins/shotwell-publishing/PicasaPublishing.vala:32
-#: plugins/shotwell-publishing/FacebookPublishing.vala:32
-#: plugins/shotwell-data-imports/FSpotImporter.vala:34
-msgid "Copyright 2009-2013 Yorba Foundation"
-msgstr ""
+#: ../src/Resources.vala:175
+msgid "_Print"
+msgstr "_In"
 
-#: src/Resources.vala:144
-msgid "Rotate _Right"
-msgstr ""
+#: ../src/Resources.vala:176
+msgid "_Quit"
+msgstr "_Thoát"
 
-#: src/Resources.vala:145 src/Resources.vala:150
-msgid "Rotate"
-msgstr "Xoay"
+#: ../src/Resources.vala:177
+msgid "_Refresh"
+msgstr "Cậ_p nhật"
 
-#: src/Resources.vala:146
-msgid "Rotate Right"
-msgstr ""
+#: ../src/Resources.vala:179
+msgid "_Revert"
+msgstr "_Hoàn nguyên"
 
-#: src/Resources.vala:147
-msgid "Rotate the photos right (press Ctrl to rotate left)"
-msgstr ""
+#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save"
+msgstr "_Lưu"
 
-#: src/Resources.vala:149
-msgid "Rotate _Left"
-msgstr ""
+#: ../src/Resources.vala:181
+msgid "Save _As"
+msgstr "Lư_u dạng"
 
-#: src/Resources.vala:151
-msgid "Rotate Left"
-msgstr ""
+#: ../src/Resources.vala:182
+msgid "Sort _Ascending"
+msgstr "Sắp xếp _tăng dần"
 
-#: src/Resources.vala:152
-msgid "Rotate the photos left"
-msgstr ""
+#: ../src/Resources.vala:183
+msgid "Sort _Descending"
+msgstr "Sắp xếp _giảm dần"
 
-#: src/Resources.vala:154
-msgid "Flip Hori_zontally"
-msgstr ""
+#: ../src/Resources.vala:184
+msgid "_Stop"
+msgstr "_Dừng"
 
-#: src/Resources.vala:155
-msgid "Flip Horizontally"
-msgstr ""
+#: ../src/Resources.vala:185
+msgid "_Undelete"
+msgstr "_Phục hồi xóa"
 
-#: src/Resources.vala:157
-msgid "Flip Verti_cally"
-msgstr ""
+#: ../src/Resources.vala:186
+msgid "_Normal Size"
+msgstr "Cỡ _thường"
 
-#: src/Resources.vala:158
-msgid "Flip Vertically"
-msgstr ""
+#: ../src/Resources.vala:187
+msgid "Best _Fit"
+msgstr "_Vừa khít nhất"
 
-#: src/Resources.vala:160
+#: ../src/Resources.vala:191
 msgid "_Enhance"
-msgstr ""
+msgstr "_Tăng cường"
 
-#: src/Resources.vala:161
+#: ../src/Resources.vala:192
 msgid "Enhance"
-msgstr ""
+msgstr "Tăng cường"
 
-#: src/Resources.vala:162
+#: ../src/Resources.vala:193
 msgid "Automatically improve the photo's appearance"
-msgstr ""
+msgstr "Tự động nâng cao diện mạo của ảnh"
 
-#: src/Resources.vala:164
+#: ../src/Resources.vala:195
 msgid "_Copy Color Adjustments"
-msgstr ""
+msgstr "_Chép chỉnh sửa màu"
 
-#: src/Resources.vala:165
+#: ../src/Resources.vala:196
 msgid "Copy Color Adjustments"
-msgstr ""
+msgstr "Chép chỉnh sửa màu"
 
-#: src/Resources.vala:166
+#: ../src/Resources.vala:197
 msgid "Copy the color adjustments applied to the photo"
-msgstr ""
+msgstr "Chép chỉnh sửa màu đã áp dụng cho ảnh"
 
-#: src/Resources.vala:168
+#: ../src/Resources.vala:199
 msgid "_Paste Color Adjustments"
-msgstr ""
+msgstr "_Dán chỉnh sửa màu"
 
-#: src/Resources.vala:169
+#: ../src/Resources.vala:200
 msgid "Paste Color Adjustments"
-msgstr ""
+msgstr "Dán chỉnh sửa màu"
 
-#: src/Resources.vala:170
+#: ../src/Resources.vala:201
 msgid "Apply copied color adjustments to the selected photos"
-msgstr ""
+msgstr "Áp dụng phần chỉnh sửa màu đã chép cho ảnh đã chọn"
 
-#: src/Resources.vala:172
+#: ../src/Resources.vala:203
 msgid "_Crop"
 msgstr "_Cắt"
 
-#: src/Resources.vala:173
+#: ../src/Resources.vala:204
 msgid "Crop"
 msgstr "Cắt"
 
-#: src/Resources.vala:174
+#: ../src/Resources.vala:205
 msgid "Crop the photo's size"
-msgstr "Cắt ảnh"
+msgstr "Xén cho ảnh nhỏ bớt"
 
-#: src/Resources.vala:176 src/editing_tools/StraightenTool.vala:100
+#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
 msgid "_Straighten"
-msgstr ""
+msgstr "_Vuốt thẳng"
 
-#: src/Resources.vala:177
+#: ../src/Resources.vala:208
 msgid "Straighten"
-msgstr ""
+msgstr "Vuốt thẳng"
 
-#: src/Resources.vala:178
+#: ../src/Resources.vala:209
 msgid "Straighten the photo"
-msgstr ""
+msgstr "Vuốt thẳng ảnh"
 
-#: src/Resources.vala:180
+#: ../src/Resources.vala:211
 msgid "_Red-eye"
-msgstr ""
+msgstr "_Giảm mắt đỏ"
 
-#: src/Resources.vala:181
+#: ../src/Resources.vala:212
 msgid "Red-eye"
-msgstr ""
+msgstr "Giảm mắt đỏ"
 
-#: src/Resources.vala:182
+#: ../src/Resources.vala:213
 msgid "Reduce or eliminate any red-eye effects in the photo"
-msgstr ""
+msgstr "Giảm hay khử bỏ hiệu ứng mắt đỏ trong ảnh"
 
-#: src/Resources.vala:184
+#: ../src/Resources.vala:215
 msgid "_Adjust"
-msgstr ""
+msgstr "Điề_u chỉnh"
 
-#: src/Resources.vala:185
+#: ../src/Resources.vala:216
 msgid "Adjust"
-msgstr ""
+msgstr "Điều chỉnh"
 
-#: src/Resources.vala:186
+#: ../src/Resources.vala:217
 msgid "Adjust the photo's color and tone"
-msgstr ""
+msgstr "Điều chỉnh màu và tông của ảnh"
 
-#: src/Resources.vala:188
+#: ../src/Resources.vala:219
 msgid "Re_vert to Original"
-msgstr ""
+msgstr "H_oàn nguyên về nguyên bản"
 
-#: src/Resources.vala:189
+#: ../src/Resources.vala:220
 msgid "Revert to Original"
-msgstr ""
+msgstr "Hoàn nguyên về nguyên bản"
 
-#: src/Resources.vala:191
+#: ../src/Resources.vala:222
 msgid "Revert External E_dits"
-msgstr ""
+msgstr "Hoàn nguyên các _sửa chữa bên ngoài"
 
-#: src/Resources.vala:192
+#: ../src/Resources.vala:223
 msgid "Revert to the master photo"
-msgstr ""
+msgstr "Hoàn nguyên lại ảnh chính"
 
-#: src/Resources.vala:194
+#: ../src/Resources.vala:225
 msgid "Set as _Desktop Background"
-msgstr ""
+msgstr "Đặt làm ảnh _màn hình nền"
 
-#: src/Resources.vala:195
+#: ../src/Resources.vala:226
 msgid "Set selected image to be the new desktop background"
-msgstr ""
+msgstr "Đặt ảnh đã chọn làm nền mới cho mành hình máy tính"
 
-#: src/Resources.vala:196
+#: ../src/Resources.vala:227
 msgid "Set as _Desktop Slideshow..."
-msgstr ""
+msgstr "Đặt làm t_rình diễn trên màn hình nền…"
 
-#: src/Resources.vala:198
+#: ../src/Resources.vala:229
 msgid "_Undo"
 msgstr "_Hủy thao tác"
 
-#: src/Resources.vala:199
+#: ../src/Resources.vala:230
 msgid "Undo"
 msgstr "Hủy thao tác"
 
-#: src/Resources.vala:201
+#: ../src/Resources.vala:232
 msgid "_Redo"
-msgstr ""
+msgstr "Hoàn _lại"
 
-#: src/Resources.vala:202
+#: ../src/Resources.vala:233
 msgid "Redo"
-msgstr ""
+msgstr "Hoàn lại"
 
-#: src/Resources.vala:204
+#: ../src/Resources.vala:235
 msgid "Re_name Event..."
-msgstr ""
+msgstr "Đổ_i tên sự kiện…"
 
-#: src/Resources.vala:207
+#: ../src/Resources.vala:238
 msgid "Make _Key Photo for Event"
-msgstr ""
+msgstr "Tạo _khóa ảnh cho sự kiện"
 
-#: src/Resources.vala:208
+#: ../src/Resources.vala:239
 msgid "Make Key Photo for Event"
-msgstr ""
+msgstr "Tạo khóa ảnh cho sự kiện"
 
-#: src/Resources.vala:210
+#: ../src/Resources.vala:241
 msgid "_New Event"
 msgstr "Sự kiện _mới"
 
-#: src/Resources.vala:211
+#: ../src/Resources.vala:242
 msgid "New Event"
 msgstr "Sự kiện mới"
 
-#: src/Resources.vala:213
+#: ../src/Resources.vala:244
 msgid "Move Photos"
 msgstr "Di chuyển ảnh"
 
-#: src/Resources.vala:214
+#: ../src/Resources.vala:245
 msgid "Move photos to an event"
 msgstr "Chuyển ảnh sang một sự kiện"
 
-#: src/Resources.vala:216
+#: ../src/Resources.vala:247
 msgid "_Merge Events"
-msgstr ""
+msgstr "_Hòa trộn sự kiện"
 
-#: src/Resources.vala:217
+#: ../src/Resources.vala:248
 msgid "Merge"
-msgstr ""
+msgstr "Hòa trộn"
 
-#: src/Resources.vala:218
+#: ../src/Resources.vala:249
 msgid "Combine events into a single event"
-msgstr ""
+msgstr "Hòa các sự kiện thành một"
 
-#: src/Resources.vala:220
+#: ../src/Resources.vala:251
 msgid "_Set Rating"
-msgstr ""
+msgstr "Đánh _giá"
 
-#: src/Resources.vala:221
+#: ../src/Resources.vala:252
 msgid "Set Rating"
-msgstr ""
+msgstr "Đánh giá"
 
-#: src/Resources.vala:222
+#: ../src/Resources.vala:253
 msgid "Change the rating of your photo"
 msgstr "Đổi mức đánh giá của ảnh"
 
-#: src/Resources.vala:224
+#: ../src/Resources.vala:255
 msgid "_Increase"
-msgstr ""
+msgstr "_Tăng"
 
-#: src/Resources.vala:225
+#: ../src/Resources.vala:256
 msgid "Increase Rating"
-msgstr ""
+msgstr "Tăng đánh giá"
 
-#: src/Resources.vala:227
+#: ../src/Resources.vala:258
 msgid "_Decrease"
-msgstr ""
+msgstr "_Giảm"
 
-#: src/Resources.vala:228
+#: ../src/Resources.vala:259
 msgid "Decrease Rating"
-msgstr ""
+msgstr "Giảm đánh giá"
 
-#: src/Resources.vala:230
+#: ../src/Resources.vala:261
 msgid "_Unrated"
-msgstr ""
+msgstr "_Chưa đánh giá"
 
-#: src/Resources.vala:231
+#: ../src/Resources.vala:262
 msgid "Unrated"
-msgstr ""
+msgstr "Chưa đánh giá"
 
-#: src/Resources.vala:232
+#: ../src/Resources.vala:263
 msgid "Rate Unrated"
-msgstr ""
+msgstr "Đánh giá chưa đánh giá"
 
-#: src/Resources.vala:233
+#: ../src/Resources.vala:264
 msgid "Setting as unrated"
-msgstr ""
+msgstr "Đặt là chưa đánh giá"
 
-#: src/Resources.vala:234
+#: ../src/Resources.vala:265
 msgid "Remove any ratings"
-msgstr "Loại bỏ đánh giá"
+msgstr "Loại bỏ mọi đánh giá"
 
-#: src/Resources.vala:236
+#: ../src/Resources.vala:267
 msgid "_Rejected"
-msgstr ""
+msgstr "_Loại bỏ"
 
-#: src/Resources.vala:237
+#: ../src/Resources.vala:268
 msgid "Rejected"
-msgstr ""
+msgstr "Loại bỏ"
 
-#: src/Resources.vala:238
+#: ../src/Resources.vala:269
 msgid "Rate Rejected"
-msgstr ""
+msgstr "Đánh giá là bị loại"
 
-#: src/Resources.vala:239
+#: ../src/Resources.vala:270
 msgid "Setting as rejected"
-msgstr ""
+msgstr "Đặt thành loại bỏ"
 
-#: src/Resources.vala:240
+#: ../src/Resources.vala:271
 msgid "Set rating to rejected"
-msgstr ""
+msgstr "Đặt đánh giá thành bị loại bỏ"
 
-#: src/Resources.vala:242
+#: ../src/Resources.vala:273
 msgid "Rejected _Only"
-msgstr ""
+msgstr "_Chỉ loại bỏ"
 
-#: src/Resources.vala:243
+#: ../src/Resources.vala:274
 msgid "Rejected Only"
-msgstr ""
+msgstr "Chỉ loại bỏ"
 
-#: src/Resources.vala:244
+#: ../src/Resources.vala:275
 msgid "Show only rejected photos"
-msgstr ""
+msgstr "Chỉ hiển thị những ảnh loại bỏ"
 
-#: src/Resources.vala:246
+#: ../src/Resources.vala:277
 msgid "All + _Rejected"
-msgstr ""
+msgstr "Tất + _Loại bỏ"
 
-#: src/Resources.vala:247 src/Resources.vala:248
+#: ../src/Resources.vala:278 ../src/Resources.vala:279
 msgid "Show all photos, including rejected"
-msgstr ""
+msgstr "Hiển thị mọi ảnh, bao gồm cả những ảnh đánh giá là loại bỏ"
 
-#: src/Resources.vala:250
+#: ../src/Resources.vala:281
 msgid "_All Photos"
-msgstr ""
+msgstr "Mọ_i ảnh"
 
-#: src/Resources.vala:251 src/Resources.vala:252
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:283 ../src/Resources.vala:285
 msgid "Show all photos"
 msgstr "Hiện tất cả ảnh"
 
-#: src/Resources.vala:254
+#: ../src/Resources.vala:287
 msgid "_Ratings"
-msgstr ""
+msgstr "_Đánh giá"
 
-#: src/Resources.vala:255
+#: ../src/Resources.vala:288
 msgid "Display each photo's rating"
-msgstr ""
+msgstr "Hiển thị đánh giá của từng ảnh"
 
-#: src/Resources.vala:257
+#: ../src/Resources.vala:290
 msgid "_Filter Photos"
-msgstr ""
+msgstr "_Lọc ảnh"
 
-#: src/Resources.vala:258
+#: ../src/Resources.vala:291
 msgid "Filter Photos"
-msgstr ""
+msgstr "Lọc ảnh"
 
-#: src/Resources.vala:259
+#: ../src/Resources.vala:292
 msgid "Limit the number of photos displayed based on a filter"
-msgstr ""
+msgstr "Giới hạn số lượng ảnh được hiển thị dựa trên một bộ lọc"
 
-#: src/Resources.vala:261
+#: ../src/Resources.vala:294
 msgid "_Duplicate"
-msgstr ""
+msgstr "_Nhân đôi"
 
-#: src/Resources.vala:262
+#: ../src/Resources.vala:295
 msgid "Duplicate"
-msgstr ""
+msgstr "Nhân đôi"
 
-#: src/Resources.vala:263
+#: ../src/Resources.vala:296
 msgid "Make a duplicate of the photo"
-msgstr ""
+msgstr "Tạo một bản sao của ảnh"
 
-#: src/Resources.vala:265
+#: ../src/Resources.vala:298
 msgid "_Export..."
-msgstr ""
+msgstr "_Xuất…"
 
-#: src/Resources.vala:267
+#: ../src/Resources.vala:300
 msgid "_Print..."
-msgstr ""
+msgstr "_In…"
 
-#: src/Resources.vala:269
+#: ../src/Resources.vala:302
 msgid "Pu_blish..."
-msgstr ""
-
-#: src/Resources.vala:270
-msgid "Publish"
-msgstr "Xuất bản"
+msgstr "Xuất _bản…"
 
-#: src/Resources.vala:271
+#: ../src/Resources.vala:304
 msgid "Publish to various websites"
-msgstr ""
+msgstr "Xuất bản lên các trang khác nhau"
 
-#: src/Resources.vala:273
+#: ../src/Resources.vala:306
 msgid "Edit _Title..."
-msgstr ""
+msgstr "Sửa _tựa đề…"
 
-#: src/Resources.vala:276
+#: ../src/Resources.vala:310
 msgid "Edit _Comment..."
-msgstr ""
+msgstr "Sửa _Chú thích…"
 
-#: src/Resources.vala:277
+#. Button label
+#: ../src/Resources.vala:312
 msgid "Edit Comment"
-msgstr ""
+msgstr "Sửa chú thích"
 
-#: src/Resources.vala:279
+#: ../src/Resources.vala:314
 msgid "Edit Event _Comment..."
-msgstr ""
+msgstr "Sửa ghi _chú sự kiện…"
 
-#: src/Resources.vala:282
+#: ../src/Resources.vala:317
 msgid "_Adjust Date and Time..."
-msgstr ""
+msgstr "_Chỉnh ngày và giờ…"
 
-#: src/Resources.vala:283
+#: ../src/Resources.vala:318
 msgid "Adjust Date and Time"
-msgstr ""
+msgstr "Chỉnh ngày và giờ"
 
-#: src/Resources.vala:285
+#: ../src/Resources.vala:320
 msgid "Add _Tags..."
-msgstr "Thêm _thẻ..."
+msgstr "Thêm _thẻ…"
 
-#: src/Resources.vala:286
+#: ../src/Resources.vala:321
 msgid "_Add Tags..."
-msgstr ""
+msgstr "T_hêm thẻ…"
 
-#: src/Resources.vala:287 src/Resources.vala:318
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:323 ../src/Resources.vala:356
 msgid "Add Tags"
 msgstr "Thêm thẻ"
 
-#: src/Resources.vala:289
-msgid "_Preferences"
-msgstr ""
-
-#: src/Resources.vala:291
+#: ../src/Resources.vala:327
 msgid "Open With E_xternal Editor"
-msgstr ""
+msgstr "Mở bằng trình biên soạn bên n_goài"
 
-#: src/Resources.vala:293
+#: ../src/Resources.vala:329
 msgid "Open With RA_W Editor"
-msgstr ""
+msgstr "Mở bằng trình biên soạn RA_W"
 
-#: src/Resources.vala:295
+#: ../src/Resources.vala:331
 msgid "Send _To..."
-msgstr ""
+msgstr "Gửi đế_n…"
 
-#: src/Resources.vala:296
+#: ../src/Resources.vala:332
 msgid "Send T_o..."
-msgstr ""
+msgstr "Gử_i đến…"
 
-#: src/Resources.vala:298
+#: ../src/Resources.vala:334
 msgid "_Find..."
-msgstr ""
+msgstr "_Tìm…"
 
-#: src/Resources.vala:299
+#: ../src/Resources.vala:335
 msgid "Find"
 msgstr "Tìm"
 
-#: src/Resources.vala:300
+#: ../src/Resources.vala:336
 msgid "Find an image by typing text that appears in its name or tags"
-msgstr ""
+msgstr "Tìm ảnh bằng gõ các chữ xuất hiện trong tên thẻ của nó"
 
-#: src/Resources.vala:302
+#: ../src/Resources.vala:338
 msgid "_Flag"
-msgstr ""
+msgstr "Gắn _cờ"
 
-#: src/Resources.vala:304
+#: ../src/Resources.vala:340
 msgid "Un_flag"
-msgstr ""
+msgstr "Bỏ _cờ"
 
-#: src/Resources.vala:307
+#: ../src/Resources.vala:343
 #, c-format
 msgid "Unable to launch editor: %s"
-msgstr ""
+msgstr "Không thể khởi chạy trình biên soạn: %s"
 
-#: src/Resources.vala:312
+#: ../src/Resources.vala:348
 #, c-format
 msgid "Add Tag \"%s\""
-msgstr ""
+msgstr "Thêm thẻ \"%s\""
 
-#: src/Resources.vala:314
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:351
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
-msgstr ""
+msgstr "Thêm thẻ \"%s\" và \"%s\""
 
-#: src/Resources.vala:322
+#: ../src/Resources.vala:361
 #, c-format
 msgid "_Delete Tag \"%s\""
-msgstr ""
+msgstr "_Xóa thẻ \"%s\""
 
-#: src/Resources.vala:326
+#: ../src/Resources.vala:365
 #, c-format
 msgid "Delete Tag \"%s\""
-msgstr "Xoá thẻ \"%s\""
+msgstr "Xóa thẻ \"%s\""
 
-#: src/Resources.vala:329
+#: ../src/Resources.vala:368
 msgid "Delete Tag"
-msgstr "Xoá thẻ"
+msgstr "Xóa thẻ"
 
-#: src/Resources.vala:332
-msgid "_New"
-msgstr ""
-
-#: src/Resources.vala:335
+#: ../src/Resources.vala:374
 #, c-format
 msgid "Re_name Tag \"%s\"..."
-msgstr ""
+msgstr "Đổ_i tên thẻ \"%s\"…"
 
-#: src/Resources.vala:339
+#: ../src/Resources.vala:378
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
-msgstr ""
+msgstr "Đổi tên thẻ \"%s\" thành \"%s\""
 
-#: src/Resources.vala:342
+#: ../src/Resources.vala:381
 msgid "_Rename..."
-msgstr ""
+msgstr "Đổ_i tên…"
 
-#: src/Resources.vala:344
+#: ../src/Resources.vala:383
 msgid "Modif_y Tags..."
-msgstr "_Sửa thẻ..."
+msgstr "_Sửa thẻ…"
 
-#: src/Resources.vala:345
+#: ../src/Resources.vala:384
 msgid "Modify Tags"
 msgstr "Chỉnh sửa thẻ"
 
-#: src/Resources.vala:348
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photo as \"%s\""
-msgstr ""
+msgstr "Đánh thẻ ảnh thành \"%s\""
 
-#: src/Resources.vala:348
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photos as \"%s\""
-msgstr ""
+msgstr "Đánh thẻ ảnh thành \"%s\""
 
-#: src/Resources.vala:352
+#: ../src/Resources.vala:391
 #, c-format
 msgid "Tag the selected photo as \"%s\""
-msgstr ""
+msgstr "Đánh thẻ ảnh đã chọn thành \"%s\""
 
-#: src/Resources.vala:353
+#: ../src/Resources.vala:392
 #, c-format
 msgid "Tag the selected photos as \"%s\""
-msgstr ""
+msgstr "Đánh thẻ các ảnh đã chọn thành \"%s\""
 
-#: src/Resources.vala:357
+#: ../src/Resources.vala:396
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
-msgstr ""
+msgstr "Xóa bỏ thẻ \"%s\" khỏi Ả_nh"
 
-#: src/Resources.vala:358
+#: ../src/Resources.vala:397
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
-msgstr ""
+msgstr "Xóa bỏ thẻ \"%s\" khỏi các Ả_nh"
 
-#: src/Resources.vala:362
+#: ../src/Resources.vala:401
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
-msgstr ""
+msgstr "Xóa bỏ thẻ \"%s\" khỏi Ảnh"
 
-#: src/Resources.vala:363
+#: ../src/Resources.vala:402
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
-msgstr ""
+msgstr "Xóa bỏ thẻ \"%s\" khỏi các Ảnh"
 
-#: src/Resources.vala:367
+#: ../src/Resources.vala:406
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
-msgstr ""
+msgstr "Không thể đổi tên thẻ thành “%s” bởi vì thẻ này đã có rồi."
 
-#: src/Resources.vala:371
+#: ../src/Resources.vala:410
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
-msgstr ""
+msgstr "Không thể đổi tên tìm kiếm thành “%s” bởi vì nó đã có rồi."
 
-#: src/Resources.vala:374
+#: ../src/Resources.vala:413
 msgid "Saved Search"
 msgstr "Tìm kiếm đã lưu"
 
-#: src/Resources.vala:376
+#: ../src/Resources.vala:415
 msgid "Delete Search"
-msgstr "Xoá tìm kiếm"
+msgstr "Xóa tìm kiếm"
 
-#: src/Resources.vala:379
+#: ../src/Resources.vala:418
 msgid "_Edit..."
-msgstr "Chỉnh _sửa..."
+msgstr "Chỉnh _sửa…"
 
-#: src/Resources.vala:380
+#: ../src/Resources.vala:419
 msgid "Re_name..."
-msgstr ""
+msgstr "Đổi tê_n:"
 
-#: src/Resources.vala:383
+#: ../src/Resources.vala:422
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "Đổi tên tìm kiếm \"%s\" sang \"%s\""
 
-#: src/Resources.vala:387
+#: ../src/Resources.vala:426
 #, c-format
 msgid "Delete Search \"%s\""
-msgstr ""
+msgstr "Xóa tìm kiếm “%s”"
 
-#: src/Resources.vala:545
+#: ../src/Resources.vala:584
 #, c-format
 msgid "Rate %s"
-msgstr ""
+msgstr "Đánh giá %s"
 
-#: src/Resources.vala:546
+#: ../src/Resources.vala:585
 #, c-format
 msgid "Set rating to %s"
-msgstr "Đặt mức đánh giá %s"
+msgstr "Đặt mức đánh giá thành %s"
 
-#: src/Resources.vala:547
+#: ../src/Resources.vala:586
 #, c-format
 msgid "Setting rating to %s"
-msgstr ""
+msgstr "Đang đặt mức đánh giá thành %s"
 
-#: src/Resources.vala:549
+#: ../src/Resources.vala:588
 #, c-format
 msgid "Display %s"
 msgstr "Hiển thị %s"
 
-#: src/Resources.vala:550
+#: ../src/Resources.vala:589
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Chỉ hiện ảnh với mức đánh giá %s"
 
-#: src/Resources.vala:551
+#: ../src/Resources.vala:590
 #, c-format
 msgid "%s or Better"
 msgstr "%s hay cao hơn"
 
-#: src/Resources.vala:552
+#: ../src/Resources.vala:591
 #, c-format
 msgid "Display %s or Better"
-msgstr ""
+msgstr "Hiển thị %s hoặc hơn"
 
-#: src/Resources.vala:553
+#: ../src/Resources.vala:592
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Chỉ hiện ảnh với mức đánh giá %s hoặc cao hơn"
 
-#: src/Resources.vala:644
+#: ../src/Resources.vala:683
 msgid "Remove the selected photos from the trash"
-msgstr "Loại bỏ ảnh đã chọn khỏi sọt rác"
+msgstr "Loại bỏ ảnh đã chọn khỏi thùng rác"
 
-#: src/Resources.vala:645
+#: ../src/Resources.vala:684
 msgid "Remove the selected photos from the library"
 msgstr "Loại bỏ ảnh đã chọn khỏi thư viện"
 
-#: src/Resources.vala:647
+#: ../src/Resources.vala:686
 msgid "_Restore"
-msgstr ""
+msgstr "_Khôi phục"
 
-#: src/Resources.vala:648
+#: ../src/Resources.vala:687
 msgid "Move the selected photos back into the library"
-msgstr ""
+msgstr "Chuyển các ảnh đã chọn trở lại thư viện"
 
-#: src/Resources.vala:650
+#: ../src/Resources.vala:689
 msgid "Show in File Mana_ger"
-msgstr ""
+msgstr "Hiển thị trong Bộ _quản lý tập tin"
 
-#: src/Resources.vala:651
+#: ../src/Resources.vala:690
 msgid "Open the selected photo's directory in the file manager"
 msgstr "Mở thư mục chứa ảnh đã chọn"
 
-#: src/Resources.vala:654
+#: ../src/Resources.vala:693
 #, c-format
 msgid "Unable to open in file manager: %s"
-msgstr ""
+msgstr "Không thể mở ứng dụng duyệt tập tin: %s"
 
-#: src/Resources.vala:657
+#: ../src/Resources.vala:696
 msgid "R_emove From Library"
-msgstr ""
+msgstr "Xó_a khỏi thư viện"
 
-#: src/Resources.vala:659
+#: ../src/Resources.vala:698
 msgid "_Move to Trash"
-msgstr ""
+msgstr "Chu_yển vào thùng rác"
 
-#: src/Resources.vala:661
+#: ../src/Resources.vala:700
 msgid "Select _All"
-msgstr ""
+msgstr "Chọn _tất cả"
 
-#: src/Resources.vala:662
+#: ../src/Resources.vala:701
 msgid "Select all items"
 msgstr "Chọn tất cả các mục"
 
-#: src/Resources.vala:740
+#. ...precache the timestamp string...
+#. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:780
 msgid "%-I:%M %p"
-msgstr ""
+msgstr "%-I:%M %p"
 
-#: src/Resources.vala:741
+#. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:785
 msgid "%-I:%M:%S %p"
-msgstr ""
+msgstr "%-I:%M:%S %p"
 
-#: src/Resources.vala:742
+#. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:789
 msgid "%a %b %d, %Y"
 msgstr "%a %b %d, %Y"
 
-#: src/Resources.vala:743 src/Resources.vala:745
+#. / Locale-specific starting date format for multi-date strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#. / Locale-specific calendar date format for multi-month strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:794 ../src/Resources.vala:804
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: src/Resources.vala:744
+#. / Locale-specific ending date format for multi-date strings,
+#. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/Resources.vala:799
 msgid "%d, %Y"
 msgstr "%d, %Y"
 
-#: src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr ""
+#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
+msgid "Slideshow"
+msgstr "Trình chiếu"
 
-#: src/editing_tools/StraightenTool.vala:102
-#: src/editing_tools/EditingTools.vala:2204
-msgid "_Reset"
-msgstr ""
+#. Flagged label and toggle
+#: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
+#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
+msgid "Flagged"
+msgstr "Được đánh dấu"
 
-#: src/editing_tools/EditingTools.vala:661
-msgid "Return to current photo dimensions"
-msgstr ""
+#: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
+#: ../src/library/Branch.vala:97
+msgid "Photos"
+msgstr "Ảnh"
 
-#: src/editing_tools/EditingTools.vala:664
-msgid "Set the crop for this photo"
-msgstr "Cắt ảnh"
+#: ../src/SearchFilter.vala:599 ../src/SearchFilter.vala:600
+msgid "Videos"
+msgstr "Phim"
 
-#: src/editing_tools/EditingTools.vala:676
-msgid "Pivot the crop rectangle between portrait and landscape orientations"
-msgstr ""
+#: ../src/SearchFilter.vala:605
+msgid "RAW Photos"
+msgstr "Ảnh RAW"
 
-#: src/editing_tools/EditingTools.vala:749
-msgid "Unconstrained"
-msgstr "Không bắt buộc"
+#: ../src/SearchFilter.vala:606
+msgid "RAW photos"
+msgstr "Ảnh thô"
 
-#: src/editing_tools/EditingTools.vala:750
-msgid "Square"
-msgstr "Vuông"
+#: ../src/SearchFilter.vala:934
+#, c-format
+msgid "Error loading UI file %s: %s"
+msgstr "Gặp lỗi khi tải tập tin UI %s: %s"
+
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: ../src/SearchFilter.vala:945
+msgid "Close"
+msgstr "Đóng"
+
+#. Type label and toggles
+#: ../src/SearchFilter.vala:951
+msgid "Type"
+msgstr "Kiểu"
 
-#: src/editing_tools/EditingTools.vala:751
-msgid "Screen"
-msgstr "Màn hình"
+#. Rating label and button
+#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
+msgid "Rating"
+msgstr "Đánh giá"
 
-#: src/editing_tools/EditingTools.vala:752
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
-msgid "Original Size"
-msgstr "Kích thước ban đầu"
+#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
+msgid "Settings"
+msgstr "Cài đặt"
 
-#: src/editing_tools/EditingTools.vala:753
-#: src/editing_tools/EditingTools.vala:756
-#: src/editing_tools/EditingTools.vala:766
-#: src/editing_tools/EditingTools.vala:776
-msgid "-"
-msgstr "-"
+#. Set up toolbar
+#. add toolbar buttons
+#: ../src/SlideshowPage.vala:160
+msgid "Back"
+msgstr "Trở lại"
 
-#: src/editing_tools/EditingTools.vala:754
-msgid "SD Video (4 : 3)"
-msgstr "SD Video (4 : 3)"
+#: ../src/SlideshowPage.vala:162
+msgid "Go to the previous photo"
+msgstr "Đến ảnh trước"
 
-#: src/editing_tools/EditingTools.vala:755
-msgid "HD Video (16 : 9)"
-msgstr "HD Video (16 : 9)"
+#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
+msgid "Pause"
+msgstr "Tạm dừng"
 
-#: src/editing_tools/EditingTools.vala:762
-msgid "Letter (8.5 x 11 in.)"
-msgstr ""
+#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
+msgid "Pause the slideshow"
+msgstr "Tạm dừng trình chiếu"
 
-#: src/editing_tools/EditingTools.vala:764
-msgid "Tabloid (11 x 17 in.)"
-msgstr ""
+#: ../src/SlideshowPage.vala:174
+msgid "Next"
+msgstr "Tiếp theo"
 
-#: src/editing_tools/EditingTools.vala:771
-msgid "A4 (210 x 297 mm)"
-msgstr ""
+#: ../src/SlideshowPage.vala:176
+msgid "Go to the next photo"
+msgstr "Đến ảnh kế tiếp"
 
-#: src/editing_tools/EditingTools.vala:775
-msgid "A3 (297 x 420 mm)"
-msgstr ""
+#: ../src/SlideshowPage.vala:184
+msgid "Change slideshow settings"
+msgstr "Đổi cài đặt trình chiếu"
 
-#: src/editing_tools/EditingTools.vala:1865
-msgid "Close the red-eye tool"
-msgstr ""
+#. An entire slideshow set might be missing, so check for a loop.
+#: ../src/SlideshowPage.vala:238
+msgid "All photo source files are missing."
+msgstr "Thiếu tất cả tập tin ảnh nguồn."
 
-#: src/editing_tools/EditingTools.vala:1868
-msgid "Remove any red-eye effects in the selected region"
-msgstr ""
+#: ../src/SlideshowPage.vala:270
+msgid "Play"
+msgstr "Phát"
 
-#: src/editing_tools/EditingTools.vala:2226
-msgid "Saturation:"
-msgstr ""
+#: ../src/SlideshowPage.vala:271
+msgid "Continue the slideshow"
+msgstr "Tiếp tục trình chiếu"
 
-#: src/editing_tools/EditingTools.vala:2234
-msgid "Tint:"
-msgstr ""
+#: ../src/Tag.vala:817
+msgid "untitled"
+msgstr "chưa có tên"
 
-#: src/editing_tools/EditingTools.vala:2243
-msgid "Temperature:"
-msgstr ""
+#. multiple videos
+#: ../src/VideoSupport.vala:489
+msgid "Export Videos"
+msgstr "Xuất phim"
 
-#: src/editing_tools/EditingTools.vala:2251
-msgid "Shadows:"
-msgstr ""
+#: ../src/camera/Branch.vala:85
+msgid "Cameras"
+msgstr "Máy ảnh"
 
-#: src/editing_tools/EditingTools.vala:2259
-msgid "Highlights:"
+#: ../src/camera/ImportPage.vala:459
+msgid ""
+"Unable to unmount camera.  Try unmounting the camera from the file manager."
 msgstr ""
+"Không thể tháo gắn kết máy ảnh. Thử tháo gắn kết từ trình quản lí tập tin."
 
-#: src/editing_tools/EditingTools.vala:2313
-msgid "Reset Colors"
-msgstr ""
+#. hide duplicates checkbox
+#: ../src/camera/ImportPage.vala:776
+msgid "Hide photos already imported"
+msgstr "Ẩn các ảnh đã nhập"
 
-#: src/editing_tools/EditingTools.vala:2313
-msgid "Reset all color adjustments to original"
-msgstr ""
+#: ../src/camera/ImportPage.vala:777
+msgid "Only display photos that have not been imported"
+msgstr "Chỉ hiện các ảnh chưa nhập"
 
-#: src/editing_tools/EditingTools.vala:2665
-msgid "Temperature"
-msgstr ""
+#. Ticket #3304 - Import page shouldn't display confusing message
+#. prior to import.
+#. TODO: replace this with approved text for "talking to camera,
+#. please wait" once new strings are being accepted.
+#: ../src/camera/ImportPage.vala:847
+msgid "Starting import, please wait..."
+msgstr "Bắt đầu nhập, vui lòng chờ…"
 
-#: src/editing_tools/EditingTools.vala:2678
-msgid "Tint"
-msgstr ""
+#: ../src/camera/ImportPage.vala:886
+msgid "Import _Selected"
+msgstr "Nhập cái đã _chọn"
 
-#: src/editing_tools/EditingTools.vala:2691
-msgid "Saturation"
-msgstr ""
+#: ../src/camera/ImportPage.vala:887
+msgid "Import the selected photos into your library"
+msgstr "Nhập những ảnh đã chọn vào thư viện"
 
-#: src/editing_tools/EditingTools.vala:2704
-msgid "Exposure"
-msgstr "Độ sáng"
+#: ../src/camera/ImportPage.vala:892
+msgid "Import _All"
+msgstr "Nhập _tất cả"
 
-#: src/editing_tools/EditingTools.vala:2717
-msgid "Shadows"
+#: ../src/camera/ImportPage.vala:893
+msgid "Import all the photos into your library"
+msgstr "Nhập tất cả ảnh vào thư viện"
+
+#. it's mounted, offer to unmount for the user
+#: ../src/camera/ImportPage.vala:1014
+msgid ""
+"Shotwell needs to unmount the camera from the filesystem in order to access "
+"it.  Continue?"
 msgstr ""
+"Shotwell cần bỏ gắn máy ảnh khỏi hệ thống tập tin để có thể truy cập nó.  "
+"Tiếp tục?"
 
-#: src/editing_tools/EditingTools.vala:2730
-msgid "Highlights"
+#: ../src/camera/ImportPage.vala:1020
+msgid "_Unmount"
+msgstr "_Bỏ gắn"
+
+#: ../src/camera/ImportPage.vala:1025
+msgid "Please unmount the camera."
+msgstr "Vui lòng tháo gắn kết máy ảnh."
+
+#: ../src/camera/ImportPage.vala:1030
+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 ""
+"Máy ảnh này bị khóa bởi ứng dụng khác. Shotwell chỉ có thể truy cập vào máy "
+"ảnh khi nó được mở khóa. Vui lòng đóng ứng dụng khác nếu nó dùng máy ảnh và "
+"thử lại."
 
-#: src/editing_tools/EditingTools.vala:2740
-msgid "Contrast Expansion"
+#: ../src/camera/ImportPage.vala:1040
+msgid "Please close any other application using the camera."
+msgstr "Vui lòng đóng bất kỳ ứng dụng nào khác cũng đang dùng máy ảnh."
+
+#: ../src/camera/ImportPage.vala:1045
+#, c-format
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
 msgstr ""
+"Không thể lấy phần xem thử từ máy ảnh:\n"
+"%s"
 
-#: src/AppWindow.vala:49
-msgid "Pin Toolbar"
-msgstr "Cố định thanh công cụ"
+#: ../src/camera/ImportPage.vala:1062
+msgid "Unmounting..."
+msgstr "Đang tháo gắn kết…"
 
-#: src/AppWindow.vala:50
-msgid "Pin the toolbar open"
-msgstr "Cố định thanh công cụ"
+#: ../src/camera/ImportPage.vala:1168
+msgid "Fetching photo information"
+msgstr "Đang nạp thông tin ảnh"
 
-#: src/AppWindow.vala:53 src/AppWindow.vala:131
-msgid "Leave fullscreen"
-msgstr "Thoát chế độ toàn màn hình"
+#: ../src/camera/ImportPage.vala:1523
+#, c-format
+msgid "Fetching preview for %s"
+msgstr "Lấy phần xem thử cho %s"
 
-#: src/AppWindow.vala:130
-msgid "Leave _Fullscreen"
-msgstr "Thoát_Toàn màn hình"
+#: ../src/camera/ImportPage.vala:1639
+#, c-format
+msgid "Unable to lock camera: %s"
+msgstr "Không thể khóa máy ảnh: %s"
 
-#: src/AppWindow.vala:491
-msgid "_Quit"
-msgstr "_Thoát"
+#: ../src/camera/ImportPage.vala:1724
+#, c-format
+msgid "Delete this photo from camera?"
+msgid_plural "Delete these %d photos from camera?"
+msgstr[0] "Xóa %d ảnh này khỏi máy ảnh?"
 
-#: src/AppWindow.vala:496
-msgid "_About"
-msgstr "_Giới thiệu"
+#: ../src/camera/ImportPage.vala:1727
+#, c-format
+msgid "Delete this video from camera?"
+msgid_plural "Delete these %d videos from camera?"
+msgstr[0] "Xóa %d phim khỏi máy ảnh?"
 
-#: src/AppWindow.vala:501
-msgid "Fulls_creen"
-msgstr "Toàn_Màn hình"
+#: ../src/camera/ImportPage.vala:1730
+#, c-format
+msgid "Delete this photo/video from camera?"
+msgid_plural "Delete these %d photos/videos from camera?"
+msgstr[0] "Xóa %d ảnh/phim khỏi máy ảnh?"
 
-#: src/AppWindow.vala:506
-msgid "_Contents"
-msgstr "_Mục lục"
+#: ../src/camera/ImportPage.vala:1733
+#, c-format
+msgid "Delete these files from camera?"
+msgid_plural "Delete these %d files from camera?"
+msgstr[0] "Xóa %d tập tin này khỏi máy ảnh?"
 
-#: src/AppWindow.vala:511
-msgid "_Frequently Asked Questions"
-msgstr "_Thắc mắc hay gặp phải"
+#: ../src/camera/ImportPage.vala:1760
+msgid "Removing photos/videos from camera"
+msgstr "Đang loại bỏ ảnh/phim khỏi máy ảnh"
 
-#: src/AppWindow.vala:516
-msgid "_Report a Problem..."
-msgstr ""
+#: ../src/camera/ImportPage.vala:1764
+#, 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] "Không thể xóa %d ảnh/phim khỏi máy ảnh do lỗi."
+
+#: ../src/data_imports/DataImports.vala:22
+msgid "Data Imports"
+msgstr "Nhập dữ liệu"
 
-#: src/AppWindow.vala:663
+#. Send an empty job to the queue to mark the end of the import
+#: ../src/data_imports/DataImportsPluginHost.vala:65
+#: ../src/data_imports/DataImportsPluginHost.vala:78
 #, c-format
+msgid "%s Database"
+msgstr "Cơ sở dữ liệu %s"
+
+#: ../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 "Không thể tiếp tục nhập từ %s bởi vì đã xảy ra lỗi:"
+
+#: ../src/data_imports/DataImportsPluginHost.vala:151
+msgid "To try importing from another service, select one from the above menu."
+msgstr "Để thử nhập từ các dịch vụ khác, hãy chọn một từ trình đơn bên trên."
+
+#: ../src/data_imports/DataImportsUI.vala:10
 msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
-"continue.\n"
+"You do not have any data imports plugins enabled.\n"
 "\n"
-"%s"
+"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 ""
-"Một lỗi tai hại đã xảy ra khi truy cập vào thư viện của Shotwell. Shotwell "
-"không thể tiếp tục.⏎ ⏎ %s"
+"Bạn không có phần bổ xung nhập dữ liệu nào được bật cả.\n"
+"\n"
+"Để có thể dùng chức năng “Nhập từ ứng dụng”, bạn cần có ít nhất một phần bổ "
+"xung nhập dữ liệu được bật. Phần bổ xung có thể bật từ hộp thoại “Tùy thích”."
 
-#: src/AppWindow.vala:683 plugins/common/Resources.vala:9
-msgid "Visit the Yorba web site"
-msgstr "Xem trang web Yorba"
+#: ../src/data_imports/DataImportsUI.vala:100
+msgid "Database file:"
+msgstr "Tập tin cơ sở dữ liệu:"
 
-#: src/AppWindow.vala:686 plugins/common/Resources.vala:28
-msgid "translator-credits"
-msgstr "Dự án MOST <du-an-most@lists.hanoilug.org>"
+#: ../src/data_imports/DataImportsUI.vala:112
+#: ../src/library/LibraryWindow.vala:883
+msgid "_Import"
+msgstr "_Nhập"
 
-#: src/AppWindow.vala:695
+#: ../src/data_imports/DataImportsUI.vala:217
+msgid "Import From Application"
+msgstr "Nhập từ ứng dụng"
+
+#: ../src/data_imports/DataImportsUI.vala:369
+#: ../src/publishing/PublishingUI.vala:470
+msgid "_Close"
+msgstr "Đó_ng"
+
+#: ../src/db/DatabaseTable.vala:37
 #, c-format
-msgid "Unable to display help: %s"
-msgstr "Không thể hiển thị trợ giúp: %s"
+msgid "Unable to open/create photo database %s: error code %d"
+msgstr "Không thể mở/tạo cở sở dữ liệu ảnh %s: mã lỗi %d"
 
-#: src/AppWindow.vala:703
+#: ../src/db/DatabaseTable.vala:46
 #, c-format
-msgid "Unable to navigate to bug database: %s"
+msgid ""
+"Unable to write to photo database file:\n"
+" %s"
 msgstr ""
+"Không thể ghi vào tập tin cơ sở dữ liệu ảnh:\n"
+"%s"
 
-#: src/AppWindow.vala:711
+#: ../src/db/DatabaseTable.vala:48
 #, c-format
-msgid "Unable to display FAQ: %s"
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
 msgstr ""
+"Lỗi khi truy cập tập tin cơ sở dữ liệu:\n"
+"%s\n"
+"\n"
+"Lỗi: \n"
+"%s"
 
-#: src/Tag.vala:817
-msgid "untitled"
-msgstr "chưa có tên"
+#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:336
+msgid "_File"
+msgstr "_Tập tin"
 
-#: src/Dimensions.vala:17
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1250
-msgid "Original size"
-msgstr "Kích cỡ gốc"
+#: ../src/direct/DirectPhotoPage.vala:52
+msgid "Save photo"
+msgstr "Lưu ảnh"
 
-#: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Rộng hoặc cao"
+#: ../src/direct/DirectPhotoPage.vala:57
+msgid "Save _As..."
+msgstr "Lư_u dạng…"
 
-#: src/Dimensions.vala:23
-msgid "Width"
-msgstr "Rộng"
+#: ../src/direct/DirectPhotoPage.vala:58
+msgid "Save photo with a different name"
+msgstr "Lưu ảnh tại với tên khác"
 
-#: src/Dimensions.vala:26
-msgid "Height"
-msgstr "Cao"
+#: ../src/direct/DirectPhotoPage.vala:69
+msgid "Print the photo to a printer connected to your computer"
+msgstr "In ảnh ra máy in kết nối đến máy tính của bạn"
 
-#: src/MediaPage.vala:143
-msgid "Adjust the size of the thumbnails"
-msgstr ""
+#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:348
+msgid "_Photo"
+msgstr "Ả_nh"
 
-#: src/MediaPage.vala:326
-msgid "Increase the magnification of the thumbnails"
-msgstr ""
+#: ../src/direct/DirectPhotoPage.vala:227
+#, c-format
+msgid "%s does not exist."
+msgstr "%s không tồn tại."
 
-#: src/MediaPage.vala:332
-msgid "Decrease the magnification of the thumbnails"
-msgstr ""
+#: ../src/direct/DirectPhotoPage.vala:229
+#, c-format
+msgid "%s is not a file."
+msgstr "%s không phải là tập tin."
 
-#: src/MediaPage.vala:399
-msgid "Sort _Photos"
+#: ../src/direct/DirectPhotoPage.vala:231
+#, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
 msgstr ""
+"%s không hỗ trợ định dạng tập tin\n"
+"%s."
 
-#: src/MediaPage.vala:408
-msgid "_Play Video"
-msgstr ""
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save a Copy"
+msgstr "_Lưu một bản sao"
 
-#: src/MediaPage.vala:409
-msgid "Open the selected videos in the system video player"
-msgstr ""
+#: ../src/direct/DirectPhotoPage.vala:425
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "Không lưu các thay đổi của %s?"
 
-#: src/MediaPage.vala:442 src/events/EventsDirectoryPage.vala:130
-msgid "_Comments"
-msgstr ""
+#: ../src/direct/DirectPhotoPage.vala:426
+msgid "Close _without Saving"
+msgstr "Đóng _không Lưu"
 
-#: src/MediaPage.vala:443
-msgid "Display the comment of each photo"
-msgstr ""
+#: ../src/direct/DirectPhotoPage.vala:459
+#, c-format
+msgid "Error while saving to %s: %s"
+msgstr "Gặp lỗi khi ghi vào “%s”: %s"
 
-#: src/MediaPage.vala:455
-msgid "Display each photo's tags"
-msgstr "Hiện thẻ của mỗi ảnh"
+#: ../src/direct/DirectPhotoPage.vala:487
+#: ../src/direct/DirectPhotoPage.vala:508
+msgid "Save As"
+msgstr "Lưu mới"
 
-#: src/MediaPage.vala:471
-msgid "By _Title"
-msgstr ""
+#: ../src/editing_tools/EditingTools.vala:665
+msgid "Return to current photo dimensions"
+msgstr "Trở lại kích thước ảnh hiện tại"
 
-#: src/MediaPage.vala:472
-msgid "Sort photos by title"
-msgstr ""
+#: ../src/editing_tools/EditingTools.vala:668
+msgid "Set the crop for this photo"
+msgstr "Cắt ảnh"
 
-#: src/MediaPage.vala:477
-msgid "By Exposure _Date"
-msgstr ""
+#: ../src/editing_tools/EditingTools.vala:680
+msgid "Pivot the crop rectangle between portrait and landscape orientations"
+msgstr "Chốt hình chữ nhật cắt giữa hướng thẳng đứng và ngang"
 
-#: src/MediaPage.vala:478
-msgid "Sort photos by exposure date"
-msgstr ""
+#: ../src/editing_tools/EditingTools.vala:753
+msgid "Unconstrained"
+msgstr "Không bắt buộc"
 
-#: src/MediaPage.vala:483
-msgid "By _Rating"
-msgstr ""
+#: ../src/editing_tools/EditingTools.vala:754
+msgid "Square"
+msgstr "Vuông"
 
-#: src/MediaPage.vala:484
-msgid "Sort photos by rating"
-msgstr ""
+#: ../src/editing_tools/EditingTools.vala:755
+msgid "Screen"
+msgstr "Màn hình"
 
-#: src/MediaPage.vala:702
-#, c-format
-msgid ""
-"Shotwell was unable to play the selected video:\n"
-"%s"
-msgstr ""
+#: ../src/editing_tools/EditingTools.vala:757
+#: ../src/editing_tools/EditingTools.vala:760
+#: ../src/editing_tools/EditingTools.vala:770
+#: ../src/editing_tools/EditingTools.vala:780
+msgid "-"
+msgstr "-"
+
+#: ../src/editing_tools/EditingTools.vala:758
+msgid "SD Video (4 : 3)"
+msgstr "Phim SD (4 : 3)"
+
+#: ../src/editing_tools/EditingTools.vala:759
+msgid "HD Video (16 : 9)"
+msgstr "Phim HD (16 : 9)"
+
+#: ../src/editing_tools/EditingTools.vala:766
+msgid "Letter (8.5 x 11 in.)"
+msgstr "Thư (8.5 x 11 in.)"
+
+#: ../src/editing_tools/EditingTools.vala:768
+msgid "Tabloid (11 x 17 in.)"
+msgstr "Báo lá cải (11 x 17 in.)"
+
+#: ../src/editing_tools/EditingTools.vala:775
+msgid "A4 (210 x 297 mm)"
+msgstr "A4 (210 x 297 mm)"
+
+#: ../src/editing_tools/EditingTools.vala:779
+msgid "A3 (297 x 420 mm)"
+msgstr "A3 (297 x 420 mm)"
+
+#: ../src/editing_tools/EditingTools.vala:1905
+msgid "Close the red-eye tool"
+msgstr "Đóng công cụ chống mắt đỏ"
 
-#: src/events/EventDirectoryItem.vala:83
+#: ../src/editing_tools/EditingTools.vala:1908
+msgid "Remove any red-eye effects in the selected region"
+msgstr "Xóa bỏ bất kỳ hiệu ứng mắt đỏ trong vùng đã chọn"
+
+#: ../src/editing_tools/EditingTools.vala:2244
+#: ../src/editing_tools/StraightenTool.vala:102
+msgid "_Reset"
+msgstr "Đặ_t lại"
+
+#: ../src/editing_tools/EditingTools.vala:2266
+msgid "Saturation:"
+msgstr "Độ bão hòa:"
+
+# <http://en.wikipedia.org/wiki/Tints_and_shades>
+#: ../src/editing_tools/EditingTools.vala:2274
+msgid "Tint:"
+msgstr "Thêm sáng:"
+
+#: ../src/editing_tools/EditingTools.vala:2283
+msgid "Temperature:"
+msgstr "Nhiệt độ:"
+
+#: ../src/editing_tools/EditingTools.vala:2291
+msgid "Shadows:"
+msgstr "Bóng:"
+
+#: ../src/editing_tools/EditingTools.vala:2299
+msgid "Highlights:"
+msgstr "Tô sáng:"
+
+#: ../src/editing_tools/EditingTools.vala:2353
+msgid "Reset Colors"
+msgstr "Đặt lại màu"
+
+#: ../src/editing_tools/EditingTools.vala:2353
+msgid "Reset all color adjustments to original"
+msgstr "Đặt lại mọi chỉnh sửa màu thành nguyên gốc"
+
+#: ../src/editing_tools/EditingTools.vala:2705
+msgid "Temperature"
+msgstr "Nhiệt độ"
+
+# <http://en.wikipedia.org/wiki/Tints_and_shades>
+#: ../src/editing_tools/EditingTools.vala:2718
+msgid "Tint"
+msgstr "Thêm sáng"
+
+#: ../src/editing_tools/EditingTools.vala:2731
+msgid "Saturation"
+msgstr "Độ bão hòa"
+
+#: ../src/editing_tools/EditingTools.vala:2744
+msgid "Exposure"
+msgstr "Phơi sáng"
+
+#: ../src/editing_tools/EditingTools.vala:2757
+msgid "Shadows"
+msgstr "Bóng"
+
+#: ../src/editing_tools/EditingTools.vala:2770
+msgid "Highlights"
+msgstr "Tô sáng"
+
+#: ../src/editing_tools/EditingTools.vala:2780
+msgid "Contrast Expansion"
+msgstr "Khai triển Tương phản"
+
+#: ../src/editing_tools/StraightenTool.vala:99
+msgid "Angle:"
+msgstr "Góc:"
+
+#: ../src/events/Branch.vala:25
+msgid "Events"
+msgstr "Sự kiện"
+
+#: ../src/events/EventDirectoryItem.vala:83
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
-msgstr[0] ""
+msgstr[0] "%d Ảnh/Phim"
 
-#: src/events/EventsDirectoryPage.vala:131
+#: ../src/events/EventPage.vala:129
+msgid "No Event"
+msgstr "Không có sự kiện"
+
+#: ../src/events/EventsDirectoryPage.vala:131
 msgid "Display the comment of each event"
-msgstr ""
+msgstr "Hiện ghi chú của mỗi ảnh"
 
-#: src/events/EventsDirectoryPage.vala:155
+#: ../src/events/EventsDirectoryPage.vala:155
 msgid "No events"
-msgstr ""
+msgstr "Không có sự kiện nào"
 
-#: src/events/EventsDirectoryPage.vala:159
+#: ../src/events/EventsDirectoryPage.vala:159
 msgid "No events found"
-msgstr ""
+msgstr "Không tìm thấy sự kiện nào"
 
-#: src/events/EventsDirectoryPage.vala:230
-msgid "Events"
-msgstr "Sự kiện"
+#: ../src/events/EventsDirectoryPage.vala:230
+msgid "All Events"
+msgstr "Mọi sự kiện"
 
-#: src/events/EventsDirectoryPage.vala:244
+#: ../src/events/EventsDirectoryPage.vala:244
 msgid "Undated"
-msgstr ""
+msgstr "Không ngày tháng"
 
-#: src/events/EventsDirectoryPage.vala:245
+#: ../src/events/EventsDirectoryPage.vala:245
 msgid "%Y"
-msgstr ""
+msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:246
+#: ../src/events/EventsDirectoryPage.vala:246
 msgid "%B"
-msgstr ""
+msgstr "%B"
 
-#: src/events/EventPage.vala:129
-msgid "No Event"
-msgstr ""
+#: ../src/folders/Branch.vala:141
+msgid "Folders"
+msgstr "Thư mục"
 
-#: src/AppDirs.vala:48 src/AppDirs.vala:99
-#, c-format
-msgid "Unable to create cache directory %s: %s"
-msgstr ""
+#: ../src/library/Branch.vala:30 ../src/library/Branch.vala:130
+#: ../ui/shotwell.glade.h:32
+msgid "Library"
+msgstr "Thư viện"
 
-#: src/AppDirs.vala:58 src/AppDirs.vala:88
-#, c-format
-msgid "Unable to create data directory %s: %s"
-msgstr "Không thể tạo thư mục dữ liệu %s: %s"
+#: ../src/library/ImportQueuePage.vala:8
+msgid "Importing..."
+msgstr "Đang nhập…"
 
-#: src/AppDirs.vala:152
-msgid "Pictures"
-msgstr "Hình ảnh"
+#: ../src/library/ImportQueuePage.vala:67
+msgid "_Stop Import"
+msgstr "_Dừng nhập"
 
-#: src/AppDirs.vala:190
-#, c-format
-msgid "Unable to create temporary directory %s: %s"
-msgstr "Không thể tạo thư mục tạm %s: %s"
+#: ../src/library/ImportQueuePage.vala:68
+msgid "Stop importing photos"
+msgstr "Dừng nhập ảnh"
 
-#: src/AppDirs.vala:207 src/AppDirs.vala:223
-#, c-format
-msgid "Unable to create data subdirectory %s: %s"
-msgstr "Không thể tạo thư mục dữ liệu con %s: %s"
+#: ../src/library/ImportQueuePage.vala:124
+msgid "Preparing to import..."
+msgstr "Đang chuẩn bị nhập…"
 
-#: src/slideshow/TransitionEffects.vala:98
-msgid "(None)"
-msgstr ""
+#: ../src/library/ImportQueuePage.vala:151
+#, c-format
+msgid "Imported %s"
+msgstr "Đã nhập %s"
 
-#: src/slideshow/TransitionEffects.vala:287
-msgid "None"
-msgstr ""
+#: ../src/library/LastImportPage.vala:8
+msgid "Last Import"
+msgstr "Lần nhập gần nhất"
 
-#: src/slideshow/TransitionEffects.vala:339
-msgid "Random"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:286
+msgid "_Import From Folder..."
+msgstr "_Nhập từ thư mục…"
 
-#: src/slideshow/Slideshow.vala:22
-msgid "Slideshow Transitions"
-msgstr "Hiệu ứng trình chiếu"
+#: ../src/library/LibraryWindow.vala:287
+msgid "Import photos from disk to library"
+msgstr "Nhập ảnh từ đĩa vào thư viện"
 
-#: src/Exporter.vala:232
-#, c-format
-msgid "Unable to generate a temporary file for %s: %s"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:294
+msgid "Import From _Application..."
+msgstr "_Nhập từ ứng dụng…"
 
-#: src/Exporter.vala:299
-msgid "Exporting"
-msgstr "Đang xuất"
+#: ../src/library/LibraryWindow.vala:298
+msgid "Sort _Events"
+msgstr "Sắp xếp _Sự kiện"
 
-#: src/Exporter.vala:317
-#, c-format
-msgid "File %s already exists.  Replace?"
-msgstr "Tập tin %s đã tồn tại. Thay thế?"
+#: ../src/library/LibraryWindow.vala:308
+msgid "Empty T_rash"
+msgstr "Đổ _rác"
 
-#: src/Exporter.vala:319
-msgid "_Skip"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:309
+msgid "Delete all photos in the trash"
+msgstr "Xóa tất cả ảnh trong thùng rác"
 
-#: src/Exporter.vala:319
-msgid "_Replace"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:314
+msgid "View Eve_nt for Photo"
+msgstr "Xem sự _kiện của ảnh"
 
-#: src/Exporter.vala:319
-msgid "Replace _All"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:318
+msgid "_Find"
+msgstr "Tìm _kiếm"
 
-#: src/Exporter.vala:319
-msgid "Export"
-msgstr "Xuất"
+#: ../src/library/LibraryWindow.vala:319
+msgid "Find photos and videos by search criteria"
+msgstr "Tìm kiếm ảnh và phim theo điều kiện đưa ra "
 
-#: src/SearchFilter.vala:593 src/SearchFilter.vala:594
-msgid "Photos"
-msgstr "Ảnh"
+#: ../src/library/LibraryWindow.vala:330 ../src/searches/Branch.vala:77
+#: ../src/sidebar/Tree.vala:199
+msgid "Ne_w Saved Search..."
+msgstr "Tạo tìm kiếm ghi lại _mới…"
 
-#: src/SearchFilter.vala:599 src/SearchFilter.vala:600
-msgid "Videos"
-msgstr "Video"
+#: ../src/library/LibraryWindow.vala:352
+msgid "_Photos"
+msgstr "Ả_nh"
 
-#: src/SearchFilter.vala:605
-msgid "RAW Photos"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:356
+msgid "Even_ts"
+msgstr "Sự _kiện"
 
-#: src/SearchFilter.vala:606
-msgid "RAW photos"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:375
+msgid "_Basic Information"
+msgstr "Thông tin cơ _bản"
 
-#: src/SearchFilter.vala:952
-#, c-format
-msgid "Error loading UI file %s: %s"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:376
+msgid "Display basic information for the selection"
+msgstr "Hiện thông tin cơ bản cho phần chọn"
 
-#: src/SearchFilter.vala:969
-msgid "Type"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:381
+msgid "E_xtended Information"
+msgstr "Thông tin mở rộng"
 
-#: src/publishing/Publishing.vala:16
-msgid "Publishing"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:382
+msgid "Display extended information for the selection"
+msgstr "Hiện thông tin mở rộng cho phần đã chọn"
 
-#: src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr ""
+#: ../src/library/LibraryWindow.vala:387
+msgid "_Search Bar"
+msgstr "Thanh _tìm kiếm"
 
-#: src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr ""
+#: ../src/library/LibraryWindow.vala:388
+msgid "Display the search bar"
+msgstr "Hiện thanh tìm kiếm"
 
-#: src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr ""
+#: ../src/library/LibraryWindow.vala:393
+msgid "S_idebar"
+msgstr "K_hung bên"
 
-#: src/publishing/PublishingUI.vala:112
-msgid "The selected video was successfully published."
-msgstr ""
+#: ../src/library/LibraryWindow.vala:394
+msgid "Display the sidebar"
+msgstr "Hiển thị khung bên"
 
-#: src/publishing/PublishingUI.vala:114
-msgid "The selected photo was successfully published."
-msgstr ""
+#: ../src/library/LibraryWindow.vala:652
+msgid "Import From Folder"
+msgstr "Nhập từ thư mục"
 
-#: src/publishing/PublishingUI.vala:122
-msgid "Fetching account information..."
-msgstr ""
+#: ../src/library/LibraryWindow.vala:721
+msgid "Empty Trash"
+msgstr "Đổ rác"
 
-#: src/publishing/PublishingUI.vala:128
-msgid "Logging in..."
-msgstr "Đang đăng nhập..."
+#: ../src/library/LibraryWindow.vala:721
+msgid "Emptying Trash..."
+msgstr "Đang đổ rác…"
 
-#: src/publishing/PublishingUI.vala:183
-msgid "Publish Photos"
+#: ../src/library/LibraryWindow.vala:880
+#, c-format
+msgid ""
+"Shotwell is configured to import photos to your home directory.\n"
+"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
+"span>.\n"
+"Do you want to continue importing photos?"
 msgstr ""
+"Shotwell được cấu hình để nhập ảnh từ thư mục cá nhân của bạn.\n"
+"Chúng tôi khuyên bạn thay đổi nó trong <span weight=\"bold\">Sửa %s Tùy "
+"thích</span>.\n"
+"Bạn có muốn tiếp tục nhập ảnh vào không?"
 
-#: src/publishing/PublishingUI.vala:184
-msgid "Publish photos _to:"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:883 ../ui/shotwell.glade.h:18
+msgid "Library Location"
+msgstr "Vị trí thư viện"
 
-#: src/publishing/PublishingUI.vala:186
-msgid "Publish Videos"
-msgstr ""
+#. TODO: Specify which directory/file.
+#: ../src/library/LibraryWindow.vala:896
+msgid "Photos cannot be imported from this directory."
+msgstr "Không thể nhập ảnh từ thư mục này."
 
-#: src/publishing/PublishingUI.vala:187
-msgid "Publish videos _to"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:1184
+#, c-format
+msgid "%s (%d%%)"
+msgstr "%s (%d%%)"
 
-#: src/publishing/PublishingUI.vala:189
-msgid "Publish Photos and Videos"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:1228
+#: ../src/library/LibraryWindow.vala:1239
+msgid "Updating library..."
+msgstr "Đang cập nhật thư viện"
 
-#: src/publishing/PublishingUI.vala:190
-msgid "Publish photos and videos _to"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:1245
+msgid "Preparing to auto-import photos..."
+msgstr "Đang chuẩn bị tự động nhập ảnh…"
 
-#: src/publishing/PublishingUI.vala:383
-msgid "Unable to publish"
-msgstr ""
+#: ../src/library/LibraryWindow.vala:1250
+msgid "Auto-importing photos..."
+msgstr "Đang tự động nhập ảnh…"
 
-#: src/publishing/PublishingUI.vala:384
-#, 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/library/LibraryWindow.vala:1258
+msgid "Writing metadata to files..."
+msgstr "Đang ghi thông tin vào tập tin…"
 
-#: src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr ""
+#: ../src/library/OfflinePage.vala:8
+msgid "Missing Files"
+msgstr "Tập tin bị thiếu"
 
-#: src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
-msgstr "Đang tải lên %d trong số %d"
+#: ../src/library/OfflinePage.vala:106
+msgid "Deleting..."
+msgstr "Đang xóa…"
 
-#: src/publishing/PublishingPluginHost.vala:81
-#, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
-msgstr ""
+#: ../src/library/TrashPage.vala:8
+msgid "Trash"
+msgstr "Thùng rác"
 
-#: src/publishing/PublishingPluginHost.vala:84
-msgid "To try publishing to another service, select one from the above menu."
-msgstr ""
+#: ../src/library/TrashPage.vala:108
+msgid "Trash is empty"
+msgstr "Thùng rác trống rỗng"
 
-#: src/sidebar/Tree.vala:199
-msgid "New _Tag..."
-msgstr ""
+#: ../src/library/TrashPage.vala:112
+msgid "Delete"
+msgstr "Xóa"
 
-#: plugins/common/RESTSupport.vala:424
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:971
-msgid "A temporary file needed for publishing is unavailable"
-msgstr ""
+#: ../src/library/TrashPage.vala:113
+msgid "Deleting Photos"
+msgstr "Xóa ảnh"
 
-#: plugins/common/RESTSupport.vala:1138
+#: ../src/main.vala:54
+#, c-format
 msgid ""
-"You have already logged in and out of a Google service during this Shotwell "
-"session.\n"
-"\n"
-"To continue publishing to Google services, quit and restart Shotwell, then "
-"try publishing again."
+"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 ""
+"Thư viện ảnh của bạn không tương thích với phiên bản này của Shotwell. Nó có "
+"vẻ được tạo bởi Shotwell %s (lược đồ %d). Phiên bản này là %s (lược đồ %d). "
+"Vui lòng dùng bản Shotwell mới nhất."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:57
+#: ../src/main.vala:59
+#, c-format
 msgid ""
-"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."
+"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 ""
-"Bạn chưa đăng nhập vào Youtube.\n"
-"\n"
-"Bạn phải đăng nhập vào tài khoản Google và thiết lập để sử dụng Youtube. Bạn "
-"có thể thiết lập cho hầu hết các tài khoản bằng cách dùng trình duyệt đăng "
-"nhập vào Youtube ít nhất một lần."
+"Shotwell không thể nâng cấp thư viện ảnh của bạn từ phiên bản %s (lược đồ "
+"%d) lên %s (lược đồ %d).  Để biết thêm chi tiết vui lòng xem Shotwell Wiki "
+"tại %s"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:362
+#: ../src/main.vala:65
+#, c-format
 msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
-"continue."
+"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 ""
+"Thư viện ảnh của bạn không tương thích với phiên bản này của Shotwell.  Nó "
+"có vẻ được tạo bởi Shotwell %s (lược đồ %d).  Phiên bản này là %s (lược đồ "
+"%d).  Vui lòng xóa thư viện của bạn bằng cachs xóa %s và nhập lại các ảnh."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:461
+#: ../src/main.vala:71
 #, c-format
-msgid "You are logged into YouTube as %s."
-msgstr "Bạn đã đăng nhập Youtube với tên %s."
+msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgstr "Gặp lỗi chưa biết khi thẩm tra cơ sở dữ liệu của Shotwell: %s"
+
+#: ../src/main.vala:104
+msgid "Loading Shotwell"
+msgstr "Đang tải Shotwell"
+
+#: ../src/main.vala:294
+msgid "Path to Shotwell's private data"
+msgstr "Đường dẫn đến dữ liệu riêng của Shotwell"
+
+#: ../src/main.vala:294
+msgid "DIRECTORY"
+msgstr "THƯ_MỤC"
+
+#: ../src/main.vala:298
+msgid "Do not monitor library directory at runtime for changes"
+msgstr "Đừng theo dõi thư mục thư viện lúc chạy cho thay đổi"
+
+#: ../src/main.vala:302
+msgid "Don't display startup progress meter"
+msgstr "Đừng hiển thị thanh đo diễn biến khởi động"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:463
+#: ../src/main.vala:306
+msgid "Show the application's version"
+msgstr "Hiển thị phiên bản của ứng dụng"
+
+#. init GTK (valac has already called g_threads_init())
+#: ../src/main.vala:338
+msgid "[FILE]"
+msgstr "[TẬP_TIN]"
+
+#: ../src/main.vala:342
 #, c-format
-msgid "Videos will appear in '%s'"
-msgstr "Video sẽ xuất hiện trong '%s'"
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr "Chạy “%s --help” để xem danh sách đầy đủ các tùy chỉnh dòng lệnh.\n"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:495
-msgid "Public listed"
-msgstr ""
+#: ../src/photos/BmpSupport.vala:32
+msgid "BMP"
+msgstr "BMP"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
-msgid "Public unlisted"
-msgstr ""
+#: ../src/photos/JfifSupport.vala:84
+msgid "JPEG"
+msgstr "JPEG"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
-msgid "Private"
-msgstr "Riêng tư"
+#: ../src/photos/JfifSupport.vala:185
+#, c-format
+msgid "Low (%d%%)"
+msgstr "Thấp (%d%%)"
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr ""
+#: ../src/photos/JfifSupport.vala:188
+#, c-format
+msgid "Medium (%d%%)"
+msgstr "Trung bình (%d%%)"
 
-#: 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/photos/JfifSupport.vala:191
+#, c-format
+msgid "High (%d%%)"
+msgstr "Cao (%d%%)"
 
-#: 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/photos/JfifSupport.vala:194
+#, c-format
+msgid "Maximum (%d%%)"
+msgstr "Tối đa (%d%%)"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:375
-msgid "Preparing for login..."
-msgstr ""
+#: ../src/photos/PngSupport.vala:30
+msgid "PNG"
+msgstr "PNG"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:595
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can't "
-"continue."
-msgstr ""
+#: ../src/photos/RawSupport.vala:134
+msgid "RAW"
+msgstr "RAW"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr ""
+#: ../src/photos/TiffSupport.vala:86
+msgid "TIFF"
+msgstr "TIFF"
+
+#: ../src/publishing/Publishing.vala:16
+msgid "Publishing"
+msgstr "Xuất bản"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1153
+#: ../src/publishing/PublishingPluginHost.vala:11
+msgid "Preparing for upload"
+msgstr "Chuẩn bị xuất bản…"
+
+#: ../src/publishing/PublishingPluginHost.vala:12
 #, c-format
-msgid ""
-"You are logged into Flickr as %s.\n"
-"\n"
-msgstr ""
+msgid "Uploading %d of %d"
+msgstr "Đang tải lên %d trong số %d"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: ../src/publishing/PublishingPluginHost.vala:81
 #, 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 ""
+msgid "Publishing to %s can't continue because an error occurred:"
+msgstr "Việc xuất bản đến %s không thể tiếp tục bởi vì có lỗi phát sinh:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1157
-msgid "Your Flickr Pro account entitles you to unlimited uploads."
-msgstr ""
+#: ../src/publishing/PublishingPluginHost.vala:84
+msgid "To try publishing to another service, select one from the above menu."
+msgstr "Thử xuất bản đến các dịch vụ khác, chọn một từ trình đơn bên trên."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1162
-msgid "Photos _visible to:"
-msgstr ""
+#: ../src/publishing/PublishingUI.vala:105
+msgid "The selected photos/videos were successfully published."
+msgstr "Ảnh/Phim đã chọn được xuất bản thành công."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
-msgid "Videos _visible to:"
-msgstr ""
+#: ../src/publishing/PublishingUI.vala:107
+msgid "The selected videos were successfully published."
+msgstr "Phim đã chọn được xuất bản thành công."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1167
-msgid "Photos and videos _visible to:"
-msgstr ""
+#: ../src/publishing/PublishingUI.vala:109
+msgid "The selected photos were successfully published."
+msgstr "Ảnh đã chọn được xuất bản thành công."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1234
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1182
-msgid "Everyone"
-msgstr "Mọi người"
+#: ../src/publishing/PublishingUI.vala:112
+msgid "The selected video was successfully published."
+msgstr "Phim đã chọn được xuất bản thành công."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
-msgid "Friends & family only"
-msgstr ""
+#: ../src/publishing/PublishingUI.vala:114
+msgid "The selected photo was successfully published."
+msgstr "Ảnh đã chọn được xuất bản thành công."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-msgid "Family only"
-msgstr ""
+#: ../src/publishing/PublishingUI.vala:122
+msgid "Fetching account information..."
+msgstr "Đang lấy thông tin tài khoản…"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
-msgid "Friends only"
-msgstr ""
+#: ../src/publishing/PublishingUI.vala:128
+msgid "Logging in..."
+msgstr "Đang đăng nhập…"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1180
-msgid "Just me"
-msgstr "Cá nhân tôi"
+#: ../src/publishing/PublishingUI.vala:185
+msgid "Publish Photos"
+msgstr "Xuất bản ảnh"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1229
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1246
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "500 x 375 pixels"
-msgstr "500 x 375 điểm ảnh"
+#: ../src/publishing/PublishingUI.vala:186
+msgid "Publish photos _to:"
+msgstr "Xuất bản ảnh _lên:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1230
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1247
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:108
-msgid "1024 x 768 pixels"
-msgstr "1024 x 768 điểm ảnh"
+#: ../src/publishing/PublishingUI.vala:188
+msgid "Publish Videos"
+msgstr "Xuất bản phim"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1248
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 điểm ảnh"
+#: ../src/publishing/PublishingUI.vala:189
+msgid "Publish videos _to"
+msgstr "Xuất bản phim _lên"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1249
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 điểm ảnh"
+#: ../src/publishing/PublishingUI.vala:191
+msgid "Publish Photos and Videos"
+msgstr "Xuất bản phim và ảnh"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:746
-#, c-format
-msgid "Creating album %s..."
-msgstr ""
+#: ../src/publishing/PublishingUI.vala:192
+msgid "Publish photos and videos _to"
+msgstr "Xuất bản phim và ảnh _lên"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:917
-msgid "An error message occurred when publishing to Piwigo. Please try again."
-msgstr ""
+#. There are no enabled publishing services that accept this media type,
+#. warn the user.
+#: ../src/publishing/PublishingUI.vala:360
+msgid "Unable to publish"
+msgstr "Không thể xuất bản"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:998
+#: ../src/publishing/PublishingUI.vala:361
+#, c-format
 msgid ""
-"Enter the URL of your Piwigo photo library as well as the username and "
-"password associated with your Piwigo account for that library."
+"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 ""
+"Shotwell không thể xuất bản các hạng mục đã chọn bởi vì bạn không có phần bổ "
+"xung xuất bản tương thích nào được bật cả. Để sửa chữa, hãy chọn <b>Sửa %s "
+"Tùy thích</b> rồi bật một hay nhiều phần bổ xung xuất bản trên bảng <b>Phần "
+"bổ xung</b>."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:999
-msgid ""
-"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
-"entered"
-msgstr ""
+#: ../src/searches/Branch.vala:68
+msgid "Saved Searches"
+msgstr "Tìm kiếm đã lưu"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1000
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:590
-msgid "Username and/or password invalid. Please try again"
-msgstr ""
+#. Ordering must correspond with SearchConditionText.Context
+#: ../src/searches/SavedSearchDialog.vala:168
+msgid "contains"
+msgstr "có chứa"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1032
-#, c-format
-msgid "Invalid URL"
-msgstr ""
+#. Ordering must correspond with Context
+#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:500
+msgid "is exactly"
+msgstr "đúng bằng"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1037
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:620
-#, c-format
-msgid "Invalid User Name or Password"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:170
+msgid "starts with"
+msgstr "bắt đầu bằng"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1127
-#: plugins/shotwell-publishing/PicasaPublishing.vala:59
-#: plugins/shotwell-publishing/FacebookPublishing.vala:61
-msgid "Shotwell Connect"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:171
+msgid "ends with"
+msgstr "kết thúc với"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1235
-msgid "Admins, Family, Friends, Contacts"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:172
+msgid "does not contain"
+msgstr "không chứa"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1236
-msgid "Admins, Family, Friends"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:504
+msgid "is not set"
+msgstr "chưa được đặt"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1237
-msgid "Admins, Family"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:174
+msgid "is set"
+msgstr "được đặt"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1238
-msgid "Admins"
-msgstr ""
+#. Ordering must correspond with SearchConditionMediaType.Context
+#: ../src/searches/SavedSearchDialog.vala:248
+#: ../src/searches/SavedSearchDialog.vala:379
+#: ../src/searches/SavedSearchDialog.vala:444
+msgid "is"
+msgstr "là"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:58
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have "
-"to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:249
+msgid "is not"
+msgstr "không là"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:361
-msgid ""
-"A file required for publishing is unavailable. Publishing to Picasa can't "
-"continue."
-msgstr ""
+#. Ordering must correspond with SearchConditionMediaType.MediaType
+#: ../src/searches/SavedSearchDialog.vala:255
+msgid "any photo"
+msgstr "mọi ảnh"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
-#: plugins/shotwell-publishing/FacebookPublishing.vala:347
-msgid "Creating album..."
-msgstr "Đang tạo album..."
+#: ../src/searches/SavedSearchDialog.vala:256
+msgid "a raw photo"
+msgstr "ảnh thô"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:659
-#, c-format
-msgid "You are logged into Picasa Web Albums as %s."
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:257
+msgid "a video"
+msgstr "một phim"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
-msgid "Videos will appear in:"
-msgstr "Video sẽ xuất hiện trong:"
+#: ../src/searches/SavedSearchDialog.vala:311
+msgid "has"
+msgstr "có"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:670
-msgid "Photos will appear in:"
-msgstr "Ảnh sẽ xuất hiện trong:"
+#: ../src/searches/SavedSearchDialog.vala:312
+msgid "has no"
+msgstr "không có"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "Nhỏ (640 x 480 điểm ảnh)"
+#: ../src/searches/SavedSearchDialog.vala:317
+msgid "modifications"
+msgstr "sửa đổi"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "Trung bình (1024 x 768 điểm ảnh)"
+#: ../src/searches/SavedSearchDialog.vala:318
+msgid "internal modifications"
+msgstr "sửa đổi bên trong"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Nên dùng (1600 x 1200 điểm ảnh)"
+#: ../src/searches/SavedSearchDialog.vala:319
+msgid "external modifications"
+msgstr "sửa đổi bên ngoài"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr ""
+#. Ordering must correspond with SearchConditionFlagged.State
+#: ../src/searches/SavedSearchDialog.vala:373
+msgid "flagged"
+msgstr "đánh thẻ"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:63
-msgid ""
-"You are not currently logged into Facebook.\n"
-"\n"
-"If you don't yet have a Facebook account, you can create one during the "
-"login process. During login, Shotwell Connect may ask you for permission to "
-"upload photos and publish to your feed. These permissions are required for "
-"Shotwell Connect to function."
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:374
+msgid "not flagged"
+msgstr "không được đánh thẻ"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:65
-msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:437
+msgid "and higher"
+msgstr "và cao hơn"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:86
-msgid "Standard (720 pixels)"
-msgstr "Chuẩn (720 điểm ảnh)"
+#: ../src/searches/SavedSearchDialog.vala:438
+msgid "only"
+msgstr "chỉ"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:89
-msgid "Large (2048 pixels)"
-msgstr "Rộng (2048 điểm ảnh)"
+#: ../src/searches/SavedSearchDialog.vala:439
+msgid "and lower"
+msgstr "và thấp hơn"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:254
-msgid "Testing connection to Facebook..."
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:501
+msgid "is after"
+msgstr "sau"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:374
-msgid ""
-"A file required for publishing is unavailable. Publishing to Facebook can't "
-"continue."
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:502
+msgid "is before"
+msgstr "trước"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1019
-#, c-format
-msgid ""
-"You are logged into Facebook as %s.\n"
-"\n"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:503
+msgid "is between"
+msgstr "giữa"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1020
-msgid "Where would you like to publish the selected photos?"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:516
+msgid "and"
+msgstr "và"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1021
-msgid "Upload _size:"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:697
+msgid "Search"
+msgstr "Tìm"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1181
-msgid "Friends"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:702
+msgid "Cancel"
+msgstr "Hủy bỏ"
 
-#: plugins/shotwell-transitions/CrumbleEffect.vala:20
-msgid "Crumble"
-msgstr "Crumble"
+#: ../src/searches/SavedSearchDialog.vala:703
+msgid "OK"
+msgstr "Đồng ý"
 
-#: plugins/shotwell-transitions/ChessEffect.vala:20
-msgid "Chess"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:721
+msgid "any"
+msgstr "bất kỳ"
 
-#: plugins/shotwell-transitions/CirclesEffect.vala:20
-msgid "Circles"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:722
+msgid "all"
+msgstr "tất cả"
 
-#: plugins/shotwell-transitions/BlindsEffect.vala:20
-msgid "Blinds"
-msgstr ""
+#: ../src/searches/SavedSearchDialog.vala:723
+msgid "none"
+msgstr "không gì cả"
 
-#: plugins/shotwell-transitions/StripesEffect.vala:20
-msgid "Stripes"
-msgstr ""
+#: ../src/searches/SearchBoolean.vala:157
+msgid "Any text"
+msgstr "Chữ bất kỳ"
 
-#: plugins/shotwell-transitions/ClockEffect.vala:20
-msgid "Clock"
-msgstr ""
+#: ../src/searches/SearchBoolean.vala:160
+msgid "Title"
+msgstr "Tựa đề"
 
-#: plugins/shotwell-transitions/CircleEffect.vala:20
-msgid "Circle"
-msgstr ""
+#: ../src/searches/SearchBoolean.vala:163
+msgid "Tag"
+msgstr "Thẻ"
 
-#: plugins/shotwell-transitions/shotwell-transitions.vala:28
-msgid "Core Slideshow Transitions"
-msgstr ""
+#: ../src/searches/SearchBoolean.vala:166
+msgid "Comment"
+msgstr "Ghi chú"
 
-#: plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
-msgstr ""
+#: ../src/searches/SearchBoolean.vala:169
+msgid "Event name"
+msgstr "Tên sự kiện"
 
-#: plugins/shotwell-transitions/SlideEffect.vala:20
-msgid "Slide"
-msgstr "Slide"
+#: ../src/searches/SearchBoolean.vala:172
+msgid "File name"
+msgstr "Tên tập tin"
 
-#: plugins/shotwell-transitions/FadeEffect.vala:20
-msgid "Fade"
-msgstr "Fade"
+#: ../src/searches/SearchBoolean.vala:175
+msgid "Media type"
+msgstr "Kiểu đa phương tiện"
 
-#: plugins/shotwell-transitions/SquaresEffect.vala:20
-msgid "Squares"
-msgstr ""
+#: ../src/searches/SearchBoolean.vala:178
+msgid "Flag state"
+msgstr "Trạng thái cờ"
 
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr ""
+#: ../src/searches/SearchBoolean.vala:181
+msgid "Photo state"
+msgstr "Trạng thái ảnh"
 
-#: 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 ""
+#: ../src/searches/SearchBoolean.vala:187
+msgid "Date"
+msgstr "Ngày"
 
-#: 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 ""
+#: ../src/sidebar/Tree.vala:203
+msgid "New _Tag..."
+msgstr "_Thẻ mới…"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid "Manually select an F-Spot database file to import:"
-msgstr ""
+#: ../src/slideshow/Slideshow.vala:22
+msgid "Slideshow Transitions"
+msgstr "Hiệu ứng trình chiếu"
 
-#: 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 ""
+#: ../src/slideshow/TransitionEffects.vala:98
+msgid "(None)"
+msgstr "(Không có)"
 
-#: 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 ""
+#: ../src/slideshow/TransitionEffects.vala:287
+msgid "None"
+msgstr "Không có"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
+#: ../src/slideshow/TransitionEffects.vala:339
+msgid "Random"
+msgstr "Ngẫu nhiên"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
+#: ../src/tags/Branch.vala:131
+msgid "Tags"
+msgstr "Thẻ"
 
-#: 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 ""
+#: ../ui/set_background_dialog.glade.h:1
+msgid "Set as Desktop Background"
+msgstr "Đặt làm ảnh màn hình nền"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:84
-#, c-format
-msgid "F-Spot library: %s"
-msgstr ""
+#: ../ui/set_background_dialog.glade.h:2
+#: ../ui/set_background_slideshow_dialog.glade.h:6
+msgid "Use for Desktop"
+msgstr "Dùng cho màn hình nền"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:416
-msgid "Preparing to import"
-msgstr ""
+#: ../ui/set_background_dialog.glade.h:3
+#: ../ui/set_background_slideshow_dialog.glade.h:7
+msgid "Use for Lock Screen"
+msgstr "Dùng cho màn hình khóa"
 
-#: ui/set_background_dialog.glade:14
+#: ../ui/set_background_slideshow_dialog.glade.h:1
 msgid "Set as Desktop Slideshow"
-msgstr ""
+msgstr "Đặt làm trình diễn trên màn hình nền"
 
-#: ui/set_background_dialog.glade:55
-msgid "Generate desktop background slideshow"
-msgstr ""
-
-#: ui/set_background_dialog.glade:82
+#: ../ui/set_background_slideshow_dialog.glade.h:2
 msgid "Show each photo for"
-msgstr ""
+msgstr "Hiển thị từng ảnh cho"
 
-#: ui/set_background_dialog.glade:94
+#: ../ui/set_background_slideshow_dialog.glade.h:3
 msgid "period of time"
-msgstr ""
+msgstr "thời điểm kết thúc"
 
-#: ui/set_background_dialog.glade:116
-msgid "How long each photo is shown on the desktop background"
-msgstr ""
+#: ../ui/set_background_slideshow_dialog.glade.h:4
+msgid "Generate desktop background slideshow"
+msgstr "Tạo bản trình chiếu trên màn hình nền"
 
-#: ui/shotwell.glade:7
-msgid "Search"
-msgstr "Tìm"
+#: ../ui/set_background_slideshow_dialog.glade.h:5
+msgid "How long each photo is shown on the desktop background"
+msgstr "Mỗi ảnh trên màn hình nền được chiếu trong vòng bao lâu"
 
-#: ui/shotwell.glade:47
+#: ../ui/shotwell.glade.h:1
 msgid "_Name of search:"
-msgstr ""
+msgstr "_Tên tìm kiếm:"
 
-#: ui/shotwell.glade:108
+#: ../ui/shotwell.glade.h:2
 msgid "_Match"
-msgstr ""
+msgstr "_Khớp"
 
-#: ui/shotwell.glade:137
+#: ../ui/shotwell.glade.h:3
 msgid "of the following:"
-msgstr ""
+msgstr "thứ sau đây:"
 
-#: ui/shotwell.glade:218
+#: ../ui/shotwell.glade.h:4
 msgid "<b>Printed Image Size</b>"
-msgstr ""
+msgstr "<b>Cỡ ảnh được in</b>"
 
-#: ui/shotwell.glade:235
+#: ../ui/shotwell.glade.h:5
 msgid "Use a _standard size:"
-msgstr ""
+msgstr "Dùng cỡ ch_uẩn:"
 
-#: ui/shotwell.glade:278
+#: ../ui/shotwell.glade.h:6
 msgid "Use a c_ustom size:"
-msgstr ""
+msgstr "Dùng cỡ tù_y chọn:"
 
-#: ui/shotwell.glade:368
+#: ../ui/shotwell.glade.h:7
 msgid "_Match photo aspect ratio"
-msgstr ""
+msgstr "_Khớp về tỷ lệ hình thể ảnh"
 
-#: ui/shotwell.glade:392
+#: ../ui/shotwell.glade.h:8
 msgid "_Autosize:"
-msgstr ""
+msgstr "Cỡ _tự động:"
 
-#: ui/shotwell.glade:432
+#: ../ui/shotwell.glade.h:9
 msgid "<b>Titles</b>"
-msgstr ""
+msgstr "<b>Tựa đề</b>"
 
-#: ui/shotwell.glade:449
+#: ../ui/shotwell.glade.h:10
 msgid "Print image _title"
-msgstr ""
+msgstr "In _tựa đề ảnh"
 
-#: ui/shotwell.glade:493
+#: ../ui/shotwell.glade.h:11
 msgid "<b>Pixel Resolution</b>"
-msgstr ""
+msgstr "<b>Phân giải điểm ảnh</b>"
 
-#: ui/shotwell.glade:513
+#: ../ui/shotwell.glade.h:12
 msgid "_Output photo at:"
-msgstr ""
+msgstr "_Xuất ảnh tại:"
 
-#: ui/shotwell.glade:548
+#: ../ui/shotwell.glade.h:13
 msgid "pixels per inch"
-msgstr ""
-
-#: ui/shotwell.glade:581 ui/shotwell.glade:623
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:27
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:27
-msgid "label"
-msgstr "nhãn"
+msgstr "điểm ảnh mỗi insơ"
 
-#: ui/shotwell.glade:719
+#: ../ui/shotwell.glade.h:15
 msgid "Shotwell Preferences"
 msgstr "Tùy chỉnh Shotwell"
 
-#: ui/shotwell.glade:796
+#: ../ui/shotwell.glade.h:16
 msgid "white"
 msgstr "trắng"
 
-#: ui/shotwell.glade:823
+#: ../ui/shotwell.glade.h:17
 msgid "black"
 msgstr "đen"
 
-#: ui/shotwell.glade:871
+#: ../ui/shotwell.glade.h:19
 msgid "_Watch library directory for new files"
 msgstr "_Phát hiện tập tin mới trong thư viện"
 
-#: ui/shotwell.glade:900
+#: ../ui/shotwell.glade.h:20
 msgid "Metadata"
 msgstr "Thông tin"
 
-#: ui/shotwell.glade:920
+#: ../ui/shotwell.glade.h:21
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "_Ghi thẻ, tựa đề, và các thông tin khác lên tập tin ảnh"
 
-#: ui/shotwell.glade:946
+#: ../ui/shotwell.glade.h:22
 msgid "Display"
 msgstr "Hiển thị"
 
-#: ui/shotwell.glade:967
+#: ../ui/shotwell.glade.h:23
 msgid "_Import photos to:"
 msgstr "Nhập ảnh _vào:"
 
-#: ui/shotwell.glade:990
+#: ../ui/shotwell.glade.h:24
 msgid "_Background:"
 msgstr "Ảnh _nền:"
 
-#: ui/shotwell.glade:1013
+#: ../ui/shotwell.glade.h:25
 msgid "Importing"
 msgstr "Nhập ảnh"
 
-#: ui/shotwell.glade:1036
+#: ../ui/shotwell.glade.h:26
 msgid "_Directory structure:"
 msgstr "_Cấu trúc thư mục:"
 
-#: ui/shotwell.glade:1075
+#: ../ui/shotwell.glade.h:27
 msgid "_Pattern:"
 msgstr "_Mẫu:"
 
-#: ui/shotwell.glade:1157
+#: ../ui/shotwell.glade.h:28
 msgid "Example:"
 msgstr "Ví dụ:"
 
-#: ui/shotwell.glade:1174
+#: ../ui/shotwell.glade.h:29
 msgid "R_ename imported files to lowercase"
 msgstr "Đổi _tên tập tin đã nhập sang chữ thường"
 
-#: ui/shotwell.glade:1203
+#: ../ui/shotwell.glade.h:30
 msgid "RAW Developer"
-msgstr ""
+msgstr "RAW Developer"
 
-#: ui/shotwell.glade:1238
+#: ../ui/shotwell.glade.h:31
 msgid "De_fault:"
-msgstr ""
+msgstr "_Mặc định:"
 
-#: ui/shotwell.glade:1292
+#: ../ui/shotwell.glade.h:33
 msgid "E_xternal photo editor:"
 msgstr "Chương trình sửa ảnh _khác:"
 
-#: ui/shotwell.glade:1308
+#: ../ui/shotwell.glade.h:34
 msgid "External _RAW editor:"
 msgstr "Chương trình sửa ảnh RAW:"
 
-#: ui/shotwell.glade:1373
+#: ../ui/shotwell.glade.h:35
 msgid "External Editors"
 msgstr "Chương trình khác"
 
-#: ui/shotwell.glade:1400
+#: ../ui/shotwell.glade.h:36
 msgid "Plugins"
 msgstr "Trình cắm"
 
-#: ui/shotwell.glade:1469
+#: ../ui/shotwell.glade.h:37
 msgid "_Delay:"
-msgstr ""
+msgstr "Khoảng _trễ:"
 
-#: ui/shotwell.glade:1485
+#: ../ui/shotwell.glade.h:38
 msgid "_Transition effect:"
-msgstr ""
+msgstr "Hiệu ứng ch_uyển:"
 
-#: ui/shotwell.glade:1501
+#: ../ui/shotwell.glade.h:39
 msgid "Transition d_elay:"
-msgstr ""
+msgstr "Tạ_m nghỉ giữa hai lần chuyển:"
 
-#: ui/shotwell.glade:1513
+#: ../ui/shotwell.glade.h:40
 msgid "Show t_itle"
-msgstr ""
+msgstr "Hiện tự_a đề"
 
-#: ui/shotwell.glade:1603 ui/shotwell.glade:1616
+#: ../ui/shotwell.glade.h:41
 msgid "seconds"
 msgstr "giây"
 
-#: ui/shotwell.glade:1696
-msgid "_Login"
-msgstr ""
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:21
-msgid ""
-" (text depends on fb username and is modified in the app - \n"
-"anything put into this field won't display)"
-msgstr ""
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:39
-msgid "Publish to an e_xisting album:"
-msgstr ""
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:57
-msgid "Create a _new album named:"
-msgstr ""
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:139
-msgid "Videos and new photo albums _visible to:"
-msgstr ""
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:175
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:102
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:178
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:226
-msgid ""
-"_Remove location, camera, and other identifying information before uploading"
-msgstr ""
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:197
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:137
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:229
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:99
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:115
-msgid "_Logout"
-msgstr "Đăng _xuất"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:212
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:153
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:243
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:115
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:129
-msgid "_Publish"
-msgstr "_Xuất bản"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:16
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:37
-msgid "Authorization _Number:"
-msgstr ""
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:19
-msgid ""
-"You are logged into Flickr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-msgstr ""
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:44
-msgid "_visibility label (populated in the code)"
-msgstr ""
-
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:61
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:60
-msgid "Photo _size:"
-msgstr ""
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:18
-msgid ""
-"'you are logged in as $name'\n"
-"(populated in the application code)"
-msgstr ""
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:75
-msgid "An _existing album:"
-msgstr ""
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:94
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:52
-msgid "A _new album named:"
-msgstr "Tê_n mới của album:"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:113
-msgid "L_ist album in public gallery"
-msgstr ""
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:134
-msgid ""
-"$mediatype will appear in\n"
-"(populated in code)"
-msgstr ""
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:150
-msgid "Photo _size preset:"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:49
-msgid "_URL of your Piwigo photo library"
-msgstr "Địa chỉ _URL của thư viện ảnh Piwigo"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:59
-msgid "User _name"
-msgstr "Tê_n người dùng"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:73
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:59
-msgid "_Password"
-msgstr "_Mật khẩu"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:130
-msgid "_Remember Password"
-msgstr "_Nhớ mật khẩu"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:151
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:107
-msgid "Login"
-msgstr "Đăng nhập"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:40
-msgid "An _existing category:"
-msgstr "Một mục lục đã _tồn tại:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:121
-msgid "Photos will be _visible by:"
-msgstr "Ảnh sẽ được hiển thị _bởi:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:149
-msgid "Photo size:"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:176
-msgid "within category:"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:210
-msgid "Album comment:"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:242
-msgid "_If a title is set and comment unset, use title as comment"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:258
-msgid "_Do no upload tags"
-msgstr ""
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:278
-msgid "Logout"
-msgstr "Đăng xuất"
-
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:55
-msgid "Video privacy _setting:"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:38
-msgid "Copyright 2012 BJA Electronics"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:109
-msgid "1280 x 853 pixels"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:313
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:323
-#, c-format
-msgid "'%s' isn't a valid response to an OAuth authentication request"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:561
-msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:589
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:639
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:760
-#, c-format
-msgid "Could not load UI: %s"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:742
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:24
-msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:27
-msgid "Visit the Yandex.Fotki web site"
-msgstr "Xem trang web của Yandex.Fotki"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:635
-msgid "You are not currently logged into Yandex.Fotki."
-msgstr "Hiện bạn chưa đăng nhập vào Yandex.Fotki."
-
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade:49
-msgid "_Email address"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:19
-msgid ""
-"You are logged into Tumblr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade:43
-msgid "Blogs:"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:24
-msgid "_Albums (or write new):"
-msgstr "_Album (hoặc ghi mới):"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:38
-msgid "Access _type:"
-msgstr "_Kiểu truy cập:"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:81
-msgid "Disable _comments"
-msgstr "Tắt _bình luận"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.glade:96
-msgid "_Forbid downloading original photo"
-msgstr "_Không cho tải ảnh gốc"
+#~ msgid "Shotwell is configured to import photos to your home directory.\n"
+#~ msgstr "Shotwell được cấu hình để nhập ảnh vào thư mục chính của bạn.\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f1037b0..29e92bf 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -15,17 +15,17 @@ msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2014-05-27 20:10+0000\n"
-"PO-Revision-Date: 2014-06-22 17:02+0800\n"
+"POT-Creation-Date: 2015-03-19 11:55+0000\n"
+"PO-Revision-Date: 2015-03-19 22:02+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
-"shotwell/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/shotwell/"
+"language/zh_TW/)\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.7.1\n"
 
 #: ../plugins/common/RESTSupport.vala:424
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
@@ -37,8 +37,8 @@ msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
 "\n"
-"To continue publishing to Google services, quit and restart Shotwell, then "
-"try publishing again."
+"To continue publishing to Google services, quit and restart Shotwell, then try "
+"publishing again."
 msgstr ""
 "您已在 Shotwell 工作階段中登入並登出 Google 服務。\n"
 "\n"
@@ -48,9 +48,9 @@ msgstr ""
 msgid "Visit the Shotwell home page"
 msgstr "造訪 Shotwell 網頁"
 
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:691
+#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
 msgid "translator-credits"
-msgstr "Cheng-Chia Tseng <pswo10680@gmail.com>"
+msgstr "Cheng-Chia Tseng <pswo10680@gmail.com>, 2011-2015"
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:32
@@ -59,22 +59,20 @@ msgstr "Cheng-Chia Tseng <pswo10680@gmail.com>"
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
 #: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
 #: ../src/Resources.vala:27
-#| msgid "Copyright 2009-2013 Yorba Foundation"
-msgid "Copyright 2009-2014 Yorba Foundation"
-msgstr "著作權 2009-2014 Yorba Foundation"
+msgid "Copyright 2009-2015 Yorba Foundation"
+msgstr "著作權所有 2009-2015 Yorba Foundation"
 
 #: ../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."
+"libraries found by Shotwell or by selecting an alternative F-Spot database file."
 msgstr ""
 "歡迎光臨 F-Spot 珍藏館匯入服務。\n"
 "\n"
-"請選取要匯入的珍藏館，您可以選取 Shotwell 找到的既有珍藏館之一，或是選取其他 "
-"F-Spot 資料庫檔案。"
+"請選取要匯入的珍藏館，您可以選取 Shotwell 找到的既有珍藏館之一，或是選取其他 F-"
+"Spot 資料庫檔案。"
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:58
 msgid ""
@@ -92,8 +90,8 @@ msgstr "手動選取要匯入的 F-Spot 資料庫檔案："
 
 #: ../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"
+"Cannot open the selected F-Spot database file: the file does not exist or is not "
+"an F-Spot database"
 msgstr "無法開啟所選的 F-Spot 資料庫檔案：檔案不存在或不是 F-Spot 資料庫"
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:64
@@ -110,21 +108,20 @@ msgstr "無法讀取所選的 F-Spot 資料庫檔案：當讀取標籤表時發�
 
 #: ../plugins/shotwell-data-imports/FSpotImporter.vala:68
 msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
+"Cannot read the selected F-Spot database file: error while reading photos table"
 msgstr "無法讀取所選的 F-Spot 資料庫檔案：當讀取相片表時發生錯誤"
 
 #: ../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"
+"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."
+"You can close this dialog and start using Shotwell while the import is taking "
+"place in the background."
 msgstr ""
-"Shotwell 已從 F-Spot 珍藏館中找到 %d 張相片，目前正在匯入。複本會被自動偵測出"
-"來並移除。\n"
+"Shotwell 已從 F-Spot 珍藏館中找到 %d 張相片，目前正在匯入。複本會被自動偵測出來並"
+"移除。\n"
 "\n"
 "您可以關閉對話盒並繼續使用 Shotwell，匯入程序會在背景執行。"
 
@@ -133,7 +130,7 @@ msgstr ""
 msgid "F-Spot library: %s"
 msgstr "F-Spot 珍藏館：%s"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:416
+#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
 msgid "Preparing to import"
 msgstr "正在準備匯入"
 
@@ -146,12 +143,6 @@ msgid "Gallery3 publishing module"
 msgstr "Gallery3 發布模組"
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
-#| msgid ""
-#| "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."
 msgid ""
 "You are not currently logged into your Gallery.\n"
 "\n"
@@ -163,12 +154,11 @@ msgstr ""
 "您必須已經註冊 Gallery3 帳號才能完成登入程序。"
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: ../src/MediaPage.vala:420 ../src/photos/RawSupport.vala:297
+#: ../src/MediaPage.vala:435 ../src/photos/RawSupport.vala:300
 msgid "Shotwell"
 msgstr "Shotwell"
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
-#| msgid "Shotwell Preferences"
 msgid "Shotwell default directory"
 msgstr "Shotwell 預設目錄"
 
@@ -177,8 +167,8 @@ msgstr "Shotwell 預設目錄"
 msgid ""
 "\n"
 "\n"
-"The file \"%s\" may not be supported by or may be too large for this "
-"instance of Gallery3."
+"The file \"%s\" may not be supported by or may be too large for this instance of "
+"Gallery3."
 msgstr ""
 "\n"
 "\n"
@@ -193,79 +183,67 @@ msgstr ""
 "請注意，Gallery3 僅支援 Flowplayer 支援的視訊類型。"
 
 #: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1774
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Flickr can't "
-#| "continue."
-msgid "A file required for publishing is unavailable. Publishing to "
-msgstr "發布所需的某個檔案無法使用。發布至 "
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+#, c-format
+msgid ""
+"A file required for publishing is unavailable. Publishing to %s can't continue."
+msgstr "發布所需的某個檔案無法使用。無法繼續發布至 %s。"
 
 #. populate any widgets whose contents are
 #. programmatically-generated
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
 #, c-format
-#| msgid "Publish Photos and Videos"
 msgid "Publishing to %s as %s."
 msgstr "正發布至 %s，使用者身份為 %s。"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1816
-#| msgid ""
-#| "Enter the URL of your Piwigo photo library as well as the username and "
-#| "password associated with your Piwigo account for that library."
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
 msgid ""
-"Enter the URL for your Gallery3 site and the username and password (or API "
-"key) for your Gallery3 account."
+"Enter the URL for your Gallery3 site and the username and password (or API key) "
+"for your Gallery3 account."
 msgstr ""
-"輸入您 Gallery3 網站的網址，以及 Gallery3 帳戶的使用者名稱、密碼 (或 API 金"
-"鑰)。"
+"輸入您 Gallery3 網站的網址，以及 Gallery3 帳戶的使用者名稱、密碼 (或 API 金鑰)。"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
 msgid ""
-"The username and password or API key were incorrect. To try again, re-enter "
-"your username and password below."
+"The username and password or API key were incorrect. To try again, re-enter your "
+"username and password below."
 msgstr ""
-"使用者與密碼或 API 金鑰不正確。請重試，或是在下方重新輸入您的使用者名稱與密"
-"碼。"
+"使用者與密碼或 API 金鑰不正確。請重試，或是在下方重新輸入您的使用者名稱與密碼。"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
 msgid ""
-"The URL entered does not appear to be the main directory of a Gallery3 "
-"instance. Please make sure you typed it correctly and it does not have any "
-"trailing components (e.g., index.php)."
+"The URL entered does not appear to be the main directory of a Gallery3 instance. "
+"Please make sure you typed it correctly and it does not have any trailing "
+"components (e.g., index.php)."
 msgstr ""
-"輸入的網址似乎不是 Gallery3 實體的主要目錄。請確認您輸入的內容正確無誤，且不"
-"必包含任何綴尾部份 (例如：index.php)。"
+"輸入的網址似乎不是 Gallery3 實體的主要目錄。請確認您輸入的內容正確無誤，且不必包含"
+"任何綴尾部份 (例如：index.php)。"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1871
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
 msgid "Unrecognized User"
 msgstr "無法辨認的使用者"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1876
+#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
 msgid " Site Not Found"
 msgstr "找不到網站"
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
 msgid "Copyright (C) 2013 rajce.net"
-msgstr "著作權 (C) 2013 rajce.net"
+msgstr "著作權所有 (C) 2013 rajce.net"
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
-#| msgid ""
-#| "An error message occurred when publishing to Piwigo. Please try again."
 msgid "An error message occurred when publishing to Rajce. Please try again."
 msgstr "當發布至 Rajce 時得到錯誤訊息。請重試。"
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
-#| msgid "Enter the username and password associated with your Tumblr account."
 msgid "Enter email and password associated with your Rajce account."
 msgstr "請輸入與您 Rajce 帳戶相關聯的電子郵件與密碼。"
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
-#| msgid "Username and/or password invalid. Please try again"
 msgid "Invalid email and/or password. Please try again"
 msgstr "電子郵件與/或密碼無效。請重試"
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
-#| msgid "Invalid User Name or Password"
 msgid "Invalid User Email or Password"
 msgstr "無效的使用者名稱或密碼"
 
@@ -284,7 +262,6 @@ msgstr "密碼(_P)"
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
 #: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
-#| msgid "_Remember Password"
 msgid "_Remember"
 msgstr "記住(_R)"
 
@@ -302,9 +279,6 @@ msgstr "隱藏相簿(_H)"
 
 #: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
-#| msgid ""
-#| "You are logged into Facebook as %s.\n"
-#| "\n"
 msgid "You are logged into Rajce as %s."
 msgstr "您正以 %s 身分登入 Rajce。"
 
@@ -358,16 +332,16 @@ msgstr "登出(_L)"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
 msgid "Copyright 2012 BJA Electronics"
-msgstr "著作權 2012 BJA Electronics"
+msgstr "著作權所有 2012 BJA Electronics"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1229
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
 msgid "500 x 375 pixels"
 msgstr "500 x 375 畫素"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1230
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
 msgid "1024 x 768 pixels"
 msgstr "1024 x 768 畫素"
@@ -383,8 +357,7 @@ msgid "'%s' isn't a valid response to an OAuth authentication request"
 msgstr "「%s」不是個對 OAuth 驗證請求的有效回應"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:558
-msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
+msgid "TumblrPublisher: start( ): can't start; this publisher is not restartable."
 msgstr "TumblrPublisher: start( )：無法啟動；此發布器不能重新啟動。"
 
 #: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
@@ -418,7 +391,7 @@ msgstr ""
 
 #: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-msgstr "著作權 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
+msgstr "著作權所有 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 
 #: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:25
 msgid "Visit the Yandex.Fotki web site"
@@ -433,12 +406,11 @@ msgid "Shotwell Extra Publishing Services"
 msgstr "Shotwell 額外發布服務"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
-#| msgid "Back"
 msgid "Go _Back"
 msgstr "返回(_B)"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
-#: ../ui/shotwell.glade.h:43
+#: ../ui/shotwell.glade.h:42
 msgid "_Login"
 msgstr "登入(_L)"
 
@@ -451,12 +423,10 @@ msgid "_Gallery3 URL:"
 msgstr "_Gallery3 URL："
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
-#| msgid "User _name"
 msgid "_User name:"
 msgstr "使用者名稱(_N)："
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
-#| msgid "_Password"
 msgid "_Password:"
 msgstr "密碼(_P)："
 
@@ -465,47 +435,35 @@ msgid "API _Key:"
 msgstr "API 金鑰(_K)："
 
 #: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
-#| msgid "hour"
-#| msgid_plural "hours"
 msgid "or"
 msgstr "或"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
-#| msgid "A _new album named:"
 msgid "A _new album"
 msgstr "新的相簿(_N)"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
-#| msgid "An _existing album:"
 msgid "An _existing album"
 msgstr "現有的相簿(_E)"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
-#| msgid ""
-#| "_Remove location, camera, and other identifying information before "
-#| "uploading"
 msgid "_Remove location, tag and camera-identifying data before uploading"
 msgstr "上傳前先移除地理位置、標籤、以及其他可供辨識的資訊(_R)"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
-#| msgid ""
-#| "'you are logged in as $name'\n"
-#| "(populated in the application code)"
 msgid "'Publishing to $url as $username' (populated in application code)"
 msgstr "'您正以 $username 身份發布至 $url' (在應用程式代碼中取出)"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
-#| msgid "_Scaling constraint:"
 msgid "Scaling constraint:"
 msgstr "縮放限制："
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
-#| msgid " _pixels"
 msgid "pixels"
 msgstr "畫素"
 
 #: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
 #: ../src/Dimensions.vala:17
 msgid "Original size"
@@ -519,7 +477,7 @@ msgstr "寬度或高度"
 #: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
 #: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
 #: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
-#: ../ui/shotwell.glade.h:15
+#: ../ui/shotwell.glade.h:14
 msgid "label"
 msgstr "標籤"
 
@@ -533,14 +491,10 @@ msgid "Photo _size:"
 msgstr "相片大小(_S)："
 
 #: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
-#| msgid ""
-#| "You are logged into Facebook as %s.\n"
-#| "\n"
 msgid "you are logged in rajce as $name"
 msgstr "您正在以 $name 身分登入 rajce"
 
 #: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
-#| msgid "Videos will appear in:"
 msgid "$mediatype will appear in"
 msgstr "$mediatype 將顯現於"
 
@@ -584,21 +538,20 @@ msgstr "Shotwell 連線"
 msgid ""
 "You are not currently logged into Facebook.\n"
 "\n"
-"If you don't yet have a Facebook account, you can create one during the "
-"login process. During login, Shotwell Connect may ask you for permission to "
-"upload photos and publish to your feed. These permissions are required for "
-"Shotwell Connect to function."
+"If you don't yet have a Facebook account, you can create one during the login "
+"process. During login, Shotwell Connect may ask you for permission to upload "
+"photos and publish to your feed. These permissions are required for Shotwell "
+"Connect to function."
 msgstr ""
 "您目前尚未登入 Facebook。\n"
 "\n"
-"若您尚未擁有 Facebook 帳號，您可以在登入程序內建立一份帳號。在登入期間，"
-"Shotwell Connect 可能會詢問您上傳相片並且發布至您饋流的許可。Shotwell "
-"Connect 需要取得這些許可權限才能運作。"
+"若您尚未擁有 Facebook 帳號，您可以在登入程序內建立一份帳號。在登入期間，Shotwell "
+"Connect 可能會詢問您上傳相片並且發布至您饋流的許可。Shotwell Connect 需要取得這些"
+"許可權限才能運作。"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:65
 msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
+"You have already logged in and out of Facebook during this Shotwell session.\n"
 "To continue publishing to Facebook, quit and restart Shotwell, then try "
 "publishing again."
 msgstr ""
@@ -647,12 +600,12 @@ msgid "Upload _size:"
 msgstr "上傳大小(_S)："
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
 msgid "Just me"
 msgstr "只有我"
 
 #: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
 msgid "Everyone"
 msgstr "每個人"
@@ -661,19 +614,19 @@ msgstr "每個人"
 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."
+"Click Login to log into Flickr in your Web browser.  You will have to authorize "
+"Shotwell Connect to link to your Flickr account."
 msgstr ""
 "您目前尚未登入 Flickr。\n"
 "\n"
-"點擊「登入」來從您的網路瀏覽器中登入 Flickr。您必須授權 Shotwell Connect 可以"
-"連結至您的 Flickr 帳號。"
+"點擊「登入」來從您的網路瀏覽器中登入 Flickr。您必須授權 Shotwell Connect 可以連結"
+"至您的 Flickr 帳號。"
 
 #: ../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."
+"To continue publishing to Flickr, quit and restart Shotwell, then try publishing "
+"again."
 msgstr ""
 "您已經在此 Shotwell 作業階段內登入過並接著登出 Flickr。\n"
 "若要繼續發布至 Flickr，請退出並重新啟動 Shotwell，接著再次嘗試發布。"
@@ -702,49 +655,52 @@ msgstr ""
 "您正在以 %s 身分登入 Flickr。\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
 #, 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 ""
+"This month you have %d megabyte remaining in your upload quota."
+msgid_plural ""
+"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[0] ""
 "您的免費 Flickr 帳號限制您每月只能上傳某個量的資料。\n"
-"這個月，您的上傳配額剩餘 %d MB。"
+"這個月您的上傳配額還剩 %d MB。"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1157
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "您的 Flickr Pro 帳號賦予您無限制的上傳量。"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1162
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
 msgid "Photos _visible to:"
 msgstr "誰能看見這些相片(_V)："
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
 msgid "Videos _visible to:"
 msgstr "誰能看見這些視訊(_V)："
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
 msgid "Photos and videos _visible to:"
 msgstr "誰能看見這些相片與視訊(_V)："
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
 msgid "Friends & family only"
 msgstr "僅朋友與家人"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
 msgid "Family only"
 msgstr "僅家人"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Friends only"
 msgstr "僅朋友"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
 msgid "2048 x 1536 pixels"
 msgstr "2048 x 1536 畫素"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
 msgid "4096 x 3072 pixels"
 msgstr "4096 x 3072 畫素"
@@ -753,8 +709,8 @@ msgstr "4096 x 3072 畫素"
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have "
-"to authorize Shotwell Connect to link to your Picasa Web Albums account."
+"Click Login to log into Picasa Web Albums in your Web browser. You will have to "
+"authorize Shotwell Connect to link to your Picasa Web Albums account."
 msgstr ""
 "您目前尚未登入 Picasa 網頁相簿。\n"
 "\n"
@@ -809,11 +765,11 @@ msgstr "當發布至 Piwigo 時得到錯誤訊息。請重試。"
 
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:998
 msgid ""
-"Enter the URL of your Piwigo photo library as well as the username and "
-"password associated with your Piwigo account for that library."
+"Enter the URL of your Piwigo photo library as well as the username and password "
+"associated with your Piwigo account for that library."
 msgstr ""
-"輸入您 Piwigo 相片珍藏館的網址，以及與該珍藏館相關聯的 Piwigo 帳戶其使用者名"
-"稱、密碼。"
+"輸入您 Piwigo 相片珍藏館的網址，以及與該珍藏館相關聯的 Piwigo 帳戶其使用者名稱、密"
+"碼。"
 
 #: ../plugins/shotwell-publishing/PiwigoPublishing.vala:999
 msgid ""
@@ -845,14 +801,14 @@ msgstr "管理員"
 msgid ""
 "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."
+"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 ""
 "您目前尚未登入 YouTube。\n"
 "\n"
-"您必須已經註冊 Google 帳號並將它設定好可以使用 YouTube 才能繼續。對大多數的帳"
-"號來說，您都可以使用瀏覽器登入 YouTube 至少一次來將它設定好。"
+"您必須已經註冊 Google 帳號並將它設定好可以使用 YouTube 才能繼續。對大多數的帳號來"
+"說，您都可以使用瀏覽器登入 YouTube 至少一次來將它設定好。"
 
 #: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
 msgid ""
@@ -894,14 +850,13 @@ msgstr "誰能看見這些視訊與新的相簿(_V)："
 #: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:2
 #: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:5
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:8
-msgid ""
-"_Remove location, camera, and other identifying information before uploading"
+msgid "_Remove location, camera, and other identifying information before uploading"
 msgstr "上傳前先移除地理位置、相機、以及其他可供辨識的資訊(_R)"
 
 #: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
 msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
+"Enter the confirmation number which appears after you log into Flickr in your Web "
+"browser."
 msgstr "請輸入您登入 Flickr 後在您瀏覽器中出現的確認號碼。"
 
 #: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
@@ -966,7 +921,7 @@ msgid "Logout"
 msgstr "登出"
 
 #: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:268
+#: ../src/Resources.vala:303
 msgid "Publish"
 msgstr "發布"
 
@@ -1023,9 +978,8 @@ msgid "Core Slideshow Transitions"
 msgstr "核心投影秀轉場"
 
 #: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
-#| msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
-msgstr "著作權 2010 Maxim Kartashev，著作權 2011-2014 Yorba Foundation"
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+msgstr "著作權所有 2010 Maxim Kartashev，著作權所有 2011-2015 Yorba Foundation"
 
 #: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
 #, c-format
@@ -1052,56 +1006,39 @@ msgstr "無法建立暫時目錄 %s：%s"
 msgid "Unable to create data subdirectory %s: %s"
 msgstr "無法建立資料子目錄 %s：%s"
 
-#. restore pin state
-#: ../src/AppWindow.vala:52
+#: ../src/AppWindow.vala:53
 msgid "Pin Toolbar"
 msgstr "釘住工具列"
 
-#: ../src/AppWindow.vala:53
+#: ../src/AppWindow.vala:54
 msgid "Pin the toolbar open"
 msgstr "開啟釘住工具列功能"
 
-#: ../src/AppWindow.vala:57 ../src/AppWindow.vala:135
+#: ../src/AppWindow.vala:59
 msgid "Leave fullscreen"
 msgstr "離開全螢幕"
 
-#: ../src/AppWindow.vala:134
-msgid "Leave _Fullscreen"
-msgstr "離開全螢幕(_F)"
-
-#: ../src/AppWindow.vala:496
-msgid "_Quit"
-msgstr "退出(_Q)"
-
-#: ../src/AppWindow.vala:501
-msgid "_About"
-msgstr "關於(_A)"
-
-#: ../src/AppWindow.vala:506
-msgid "Fulls_creen"
-msgstr "全螢幕(_C)"
-
-#: ../src/AppWindow.vala:511
+#: ../src/AppWindow.vala:525
 msgid "_Contents"
 msgstr "內容(_C)"
 
-#: ../src/AppWindow.vala:516
+#: ../src/AppWindow.vala:530
 msgid "_Frequently Asked Questions"
 msgstr "常見問答集(_F)"
 
-#: ../src/AppWindow.vala:521
+#: ../src/AppWindow.vala:535
 msgid "_Report a Problem..."
 msgstr "回報問題(_R)..."
 
-#: ../src/AppWindow.vala:620 ../src/AppWindow.vala:641
-#: ../src/AppWindow.vala:658 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1417 ../src/Dialogs.vala:1440
-#: ../src/data_imports/DataImportsUI.vala:399
-#: ../src/publishing/PublishingUI.vala:498
+#: ../src/AppWindow.vala:634 ../src/AppWindow.vala:655 ../src/AppWindow.vala:672
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1418
+#: ../src/Dialogs.vala:1441 ../src/Resources.vala:162
+#: ../src/data_imports/DataImportsUI.vala:374
+#: ../src/publishing/PublishingUI.vala:475
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/AppWindow.vala:668
+#: ../src/AppWindow.vala:682
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
@@ -1113,21 +1050,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/AppWindow.vala:688
+#: ../src/AppWindow.vala:702
 msgid "Visit the Yorba web site"
 msgstr "造訪 Yorba 網站"
 
-#: ../src/AppWindow.vala:700
+#: ../src/AppWindow.vala:714
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "無法顯示幫助：%s"
 
-#: ../src/AppWindow.vala:708
+#: ../src/AppWindow.vala:722
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "無法瀏覽臭蟲資料庫：%s"
 
-#: ../src/AppWindow.vala:716
+#: ../src/AppWindow.vala:730
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "無法顯示 FAQ：%s"
@@ -1193,11 +1130,11 @@ msgstr "損毀影像檔"
 msgid "Imported failed (%d)"
 msgstr "匯入失敗 (%d)"
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2634
+#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
 msgid "S_lideshow"
 msgstr "投影秀(_L)"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2635
+#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
 msgid "Play a slideshow"
 msgstr "播放投影秀"
 
@@ -1209,8 +1146,7 @@ msgstr "匯出相片/視訊"
 msgid "Export Photos/Videos"
 msgstr "匯出相片/視訊"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3207
+#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58 ../src/PhotoPage.vala:3211
 msgid "Export Photo"
 msgstr "匯出相片"
 
@@ -1258,157 +1194,156 @@ msgstr "正在優化"
 msgid "Undoing Enhance"
 msgstr "正在復原優化"
 
-#: ../src/Commands.vala:845
+#: ../src/Commands.vala:853
 msgid "Applying Color Transformations"
 msgstr "正在套用色彩轉換"
 
-#: ../src/Commands.vala:845
+#: ../src/Commands.vala:853
 msgid "Undoing Color Transformations"
 msgstr "正在復原色彩轉換"
 
-#: ../src/Commands.vala:995
+#: ../src/Commands.vala:1003
 msgid "Creating New Event"
 msgstr "正在建立新事件"
 
-#: ../src/Commands.vala:996
+#: ../src/Commands.vala:1004
 msgid "Removing Event"
 msgstr "正在移除事件"
 
-#: ../src/Commands.vala:1005
+#: ../src/Commands.vala:1013
 msgid "Moving Photos to New Event"
 msgstr "正在將相片移動至新事件"
 
-#: ../src/Commands.vala:1006
+#: ../src/Commands.vala:1014
 msgid "Setting Photos to Previous Event"
 msgstr "正在將相片設定為上個事件"
 
-#: ../src/Commands.vala:1063
+#: ../src/Commands.vala:1071
 msgid "Merging"
 msgstr "正在合併"
 
-#: ../src/Commands.vala:1064
+#: ../src/Commands.vala:1072
 msgid "Unmerging"
 msgstr "正在取消合併"
 
-#: ../src/Commands.vala:1073
+#: ../src/Commands.vala:1081
 msgid "Duplicating photos"
 msgstr "正在製作相片複本"
 
-#: ../src/Commands.vala:1073
+#: ../src/Commands.vala:1081
 msgid "Removing duplicated photos"
 msgstr "正在移除相片複本"
 
-#: ../src/Commands.vala:1096
+#: ../src/Commands.vala:1104
 #, 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] "由於檔案錯誤，無法製作 %d 張相片的複本"
 
-#: ../src/Commands.vala:1183
+#: ../src/Commands.vala:1191
 msgid "Restoring previous rating"
 msgstr "正在復原前次評等"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
 msgid "Increasing ratings"
 msgstr "正在增加評等"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
 msgid "Decreasing ratings"
 msgstr "正在降低評等"
 
-#: ../src/Commands.vala:1244
+#: ../src/Commands.vala:1252
 msgid "Setting RAW developer"
 msgstr "正在設定 RAW 顯影器"
 
-#: ../src/Commands.vala:1244
+#: ../src/Commands.vala:1252
 msgid "Restoring previous RAW developer"
 msgstr "正在還原前個 RAW 顯影器"
 
-#: ../src/Commands.vala:1245
+#: ../src/Commands.vala:1253
 msgid "Set Developer"
 msgstr "設定顯影器"
 
-#: ../src/Commands.vala:1335
+#: ../src/Commands.vala:1343
 msgid "Original photo could not be adjusted."
 msgstr "無法調整原始相片。"
 
-#: ../src/Commands.vala:1356
+#: ../src/Commands.vala:1364
 msgid "Adjusting Date and Time"
 msgstr "正在調整日期與時間"
 
-#: ../src/Commands.vala:1356
+#: ../src/Commands.vala:1364
 msgid "Undoing Date and Time Adjustment"
 msgstr "正在復原日期與時間調整"
 
-#: ../src/Commands.vala:1387
+#: ../src/Commands.vala:1395
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
 msgstr[0] "下列原始相片無法調整。"
 
-#: ../src/Commands.vala:1389 ../src/Commands.vala:1413
+#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
 msgid "Time Adjustment Error"
 msgstr "時間調整發生錯誤"
 
-#: ../src/Commands.vala:1411
+#: ../src/Commands.vala:1419
 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."
+msgid_plural "Time adjustments could not be undone on the following photo files."
 msgstr[0] "下列相片檔案的時間調整無法復原。"
 
-#: ../src/Commands.vala:1625 ../src/Commands.vala:1648
+#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
 msgid "Create Tag"
 msgstr "建立標籤"
 
-#: ../src/Commands.vala:1683
+#: ../src/Commands.vala:1691
 #, c-format
 msgid "Move Tag \"%s\""
 msgstr "移動標籤「%s」"
 
-#: ../src/Commands.vala:2335
+#: ../src/Commands.vala:2343
 msgid "Move Photos to Trash"
 msgstr "將相片移至回收筒"
 
-#: ../src/Commands.vala:2335
+#: ../src/Commands.vala:2343
 msgid "Restore Photos from Trash"
 msgstr "從回收筒還原檔案"
 
-#: ../src/Commands.vala:2336
+#: ../src/Commands.vala:2344
 msgid "Move the photos to the Shotwell trash"
 msgstr "將相片移至 Shotwell 回收筒"
 
-#: ../src/Commands.vala:2336
+#: ../src/Commands.vala:2344
 msgid "Restore the photos back to the Shotwell library"
 msgstr "將相片還原至 Shotwell 珍藏館"
 
-#: ../src/Commands.vala:2355
+#: ../src/Commands.vala:2363
 msgid "Moving Photos to Trash"
 msgstr "正在將相片移至回收筒"
 
-#: ../src/Commands.vala:2355
+#: ../src/Commands.vala:2363
 msgid "Restoring Photos From Trash"
 msgstr "正在從回收筒還原相片"
 
-#: ../src/Commands.vala:2441
+#: ../src/Commands.vala:2449
 msgid "Flag selected photos"
 msgstr "將所選相片加上旗幟"
 
-#: ../src/Commands.vala:2442
+#: ../src/Commands.vala:2450
 msgid "Unflag selected photos"
 msgstr "移除所選相片的旗幟"
 
-#: ../src/Commands.vala:2443
+#: ../src/Commands.vala:2451
 msgid "Flagging selected photos"
 msgstr "正為所選相片加上旗幟"
 
-#: ../src/Commands.vala:2444
+#: ../src/Commands.vala:2452
 msgid "Unflagging selected photos"
 msgstr "正為所選相片移除旗幟"
 
-#: ../src/Commands.vala:2451
+#: ../src/Commands.vala:2459
 msgid "Flag"
 msgstr "加上旗幟"
 
-#: ../src/Commands.vala:2451
+#: ../src/Commands.vala:2459
 msgid "Unflag"
 msgstr "移除旗幟"
 
@@ -1437,9 +1372,9 @@ 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] "這會移除「%s」標籤，共 %d 張相片。要繼續嗎？"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1385
-#: ../src/Resources.vala:328 ../src/Resources.vala:376
-#: ../src/Resources.vala:641
+#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
+#: ../src/Resources.vala:163 ../src/Resources.vala:369 ../src/Resources.vala:417
+#: ../src/Resources.vala:682
 msgid "_Delete"
 msgstr "刪除(_D)"
 
@@ -1450,8 +1385,7 @@ msgstr "這會移除儲存的「%s」搜尋。要繼續嗎？"
 
 #: ../src/Dialogs.vala:35
 msgid ""
-"Switching developers will undo all changes you have made to this photo in "
-"Shotwell"
+"Switching developers will undo all changes you have made to this photo in Shotwell"
 msgid_plural ""
 "Switching developers will undo all changes you have made to these photos in "
 "Shotwell"
@@ -1473,8 +1407,8 @@ msgstr "匯出視訊"
 #: ../src/Dialogs.vala:115
 #, c-format
 msgid ""
-"Shotwell couldn't create a file for editing this photo because you do not "
-"have permission to write to %s."
+"Shotwell couldn't create a file for editing this photo because you do not have "
+"permission to write to %s."
 msgstr "因為您尚未獲取寫入 %s 的授權，Shotwell 無法建立檔案以供此相片編輯。"
 
 #: ../src/Dialogs.vala:124
@@ -1507,50 +1441,50 @@ msgid "Current"
 msgstr "目前"
 
 #. layout controls
-#: ../src/Dialogs.vala:212
+#: ../src/Dialogs.vala:213
 msgid "_Format:"
 msgstr "格式(_F)："
 
-#: ../src/Dialogs.vala:215
+#: ../src/Dialogs.vala:216
 msgid "_Quality:"
 msgstr "品質(_Q)："
 
-#: ../src/Dialogs.vala:218
+#: ../src/Dialogs.vala:219
 msgid "_Scaling constraint:"
 msgstr "縮放限制(_S)："
 
-#: ../src/Dialogs.vala:221
-msgid " _pixels"
-msgstr "畫素(_P)"
+#: ../src/Dialogs.vala:222
+msgid "_Pixels:"
+msgstr "畫素(_P)："
 
-#: ../src/Dialogs.vala:229
+#: ../src/Dialogs.vala:225
 msgid "Export metadata"
 msgstr "匯出中介資料"
 
-#: ../src/Dialogs.vala:465
+#: ../src/Dialogs.vala:459
 msgid "Save Details..."
 msgstr "儲存細節..."
 
-#: ../src/Dialogs.vala:466
+#: ../src/Dialogs.vala:460
 msgid "Save Details"
 msgstr "儲存細節"
 
-#: ../src/Dialogs.vala:481
+#: ../src/Dialogs.vala:475
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(還有 %d 項)\n"
 
-#: ../src/Dialogs.vala:534
+#: ../src/Dialogs.vala:528
 msgid "Import Results Report"
 msgstr "匯入成果報告"
 
-#: ../src/Dialogs.vala:538
+#: ../src/Dialogs.vala:532
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "試圖匯入 %d 份檔案。"
 
-#: ../src/Dialogs.vala:541
+#: ../src/Dialogs.vala:535
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -1559,52 +1493,50 @@ msgstr[0] "其中有 %d 份檔案已成功匯入。"
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:553
+#: ../src/Dialogs.vala:547
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "重複的相片/視訊並未匯入："
 
-#: ../src/Dialogs.vala:557
+#: ../src/Dialogs.vala:551
 msgid "duplicates existing media item"
 msgstr "媒體項目與既有媒體重複"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: ../src/Dialogs.vala:568
+#: ../src/Dialogs.vala:562
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "相片/視訊因相機錯誤而未匯入："
 
-#: ../src/Dialogs.vala:571 ../src/Dialogs.vala:586 ../src/Dialogs.vala:601
-#: ../src/Dialogs.vala:617 ../src/Dialogs.vala:632 ../src/Dialogs.vala:646
+#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
+#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
 msgid "error message:"
 msgstr "錯誤訊息："
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: ../src/Dialogs.vala:582
+#: ../src/Dialogs.vala:576
 msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgstr "檔案因無法辨識出是相片或視訊而未匯入："
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: ../src/Dialogs.vala:597
+#: ../src/Dialogs.vala:591
 msgid ""
-"Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
-"Understands:"
+"Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands:"
 msgstr "相片/視訊因格式並非 Shotwell 所能認識而未匯入："
 
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: ../src/Dialogs.vala:612
+#: ../src/Dialogs.vala:606
 msgid ""
-"Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
-"Library:"
+"Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library:"
 msgstr "相片/視訊因 Shotwell 無法將它們複製到珍藏館中而未匯入："
 
-#: ../src/Dialogs.vala:616
+#: ../src/Dialogs.vala:610
 #, c-format
 msgid ""
 "couldn't copy %s\n"
@@ -1616,79 +1548,76 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: ../src/Dialogs.vala:628
+#: ../src/Dialogs.vala:622
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "相片/視訊因檔案損毀而未匯入："
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: ../src/Dialogs.vala:643
+#: ../src/Dialogs.vala:637
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "相片/視訊因其他原因而未匯入："
 
-#: ../src/Dialogs.vala:663
+#: ../src/Dialogs.vala:657
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "%d 份相片複本未被匯入：\n"
 
-#: ../src/Dialogs.vala:666
+#: ../src/Dialogs.vala:660
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "%d 份視訊複本未被匯入：\n"
 
-#: ../src/Dialogs.vala:669
+#: ../src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "%d 份相片/視訊複本未被匯入：\n"
 
-#: ../src/Dialogs.vala:683
+#: ../src/Dialogs.vala:677
 #, 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] "由於檔案或硬體錯誤，%d 張相片匯入失敗：\n"
 
-#: ../src/Dialogs.vala:686
+#: ../src/Dialogs.vala:680
 #, 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] "由於檔案或硬體錯誤，%d 份視訊匯入失敗：\n"
 
-#: ../src/Dialogs.vala:689
+#: ../src/Dialogs.vala:683
 #, 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"
+msgid_plural "%d photos/videos failed to import due to a file or hardware error:\n"
 msgstr[0] "由於檔案或硬體錯誤，%d 份相片/視訊匯入失敗：\n"
 
-#: ../src/Dialogs.vala:692
+#: ../src/Dialogs.vala:686
 #, 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] "由於檔案或硬體錯誤，%d 份檔案未能匯入：\n"
 
-#: ../src/Dialogs.vala:706
+#: ../src/Dialogs.vala:700
 #, 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"
+"%d photos failed to import because the photo library folder was not writable:\n"
 msgstr[0] "因為相片珍藏館資料夾無法寫入，%d 份視訊匯入失敗：\n"
 
-#: ../src/Dialogs.vala:709
+#: ../src/Dialogs.vala:703
 #, 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"
+"%d videos failed to import because the photo library folder was not writable:\n"
 msgstr[0] "因為相片珍藏館資料夾無法寫入，%d 份視訊匯入失敗：\n"
 
-#: ../src/Dialogs.vala:712
+#: ../src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1698,58 +1627,56 @@ msgid_plural ""
 "writable:\n"
 msgstr[0] "因為相片珍藏館資料夾無法寫入，%d 份相片/視訊匯入失敗：\n"
 
-#: ../src/Dialogs.vala:715
+#: ../src/Dialogs.vala:709
 #, c-format
-msgid ""
-"1 file failed to import because the photo library folder was not writable:\n"
+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"
+"%d files failed to import because the photo library folder was not writable:\n"
 msgstr[0] "因為相片珍藏館資料夾無法寫入，%d 份檔案未能匯入：\n"
 
-#: ../src/Dialogs.vala:729
+#: ../src/Dialogs.vala:723
 #, 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] "由於相機錯誤，%d 張相片匯入失敗：\n"
 
-#: ../src/Dialogs.vala:732
+#: ../src/Dialogs.vala:726
 #, 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] "由於相機錯誤，%d 份視訊匯入失敗：\n"
 
-#: ../src/Dialogs.vala:735
+#: ../src/Dialogs.vala:729
 #, 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] "由於相機錯誤，%d 份相片/視訊匯入失敗：\n"
 
-#: ../src/Dialogs.vala:738
+#: ../src/Dialogs.vala:732
 #, 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] "%d 份檔案因相機錯誤而未能匯入：\n"
 
-#: ../src/Dialogs.vala:752
+#: ../src/Dialogs.vala:746
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
 msgstr[0] "%d 張相片因相片損毀而未能匯入：\n"
 
-#: ../src/Dialogs.vala:755
+#: ../src/Dialogs.vala:749
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
 msgstr[0] "%d 份視訊因視訊損毀而未能匯入：\n"
 
-#: ../src/Dialogs.vala:758
+#: ../src/Dialogs.vala:752
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
 msgstr[0] "%d 份相片/視訊因損毀而未能匯入：\n"
 
-#: ../src/Dialogs.vala:761
+#: ../src/Dialogs.vala:755
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
@@ -1759,7 +1686,7 @@ msgstr[0] "%d 份檔案因損毀而未能匯入：\n"
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: ../src/Dialogs.vala:778
+#: ../src/Dialogs.vala:772
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1767,49 +1694,49 @@ msgstr[0] "已略過 %d 張未支援相片：\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: ../src/Dialogs.vala:793
+#: ../src/Dialogs.vala:787
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "已略過 %d 份非影像檔案。\n"
 
-#: ../src/Dialogs.vala:804
+#: ../src/Dialogs.vala:798
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "由於使用者取消，已略過 %d 張相片：\n"
 
-#: ../src/Dialogs.vala:807
+#: ../src/Dialogs.vala:801
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "由於使用者取消，已略過 %d 份視訊：\n"
 
-#: ../src/Dialogs.vala:810
+#: ../src/Dialogs.vala:804
 #, 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] "由於使用者取消，已略過 %d 份相片/視訊：\n"
 
-#: ../src/Dialogs.vala:813
+#: ../src/Dialogs.vala:807
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "%d 檔案已略過，因為使用者取消：\n"
 
-#: ../src/Dialogs.vala:827
+#: ../src/Dialogs.vala:821
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "已成功匯入 %d 張相片。\n"
 
-#: ../src/Dialogs.vala:830
+#: ../src/Dialogs.vala:824
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "已成功匯入 %d 份視訊。\n"
 
-#: ../src/Dialogs.vala:833
+#: ../src/Dialogs.vala:827
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -1817,175 +1744,174 @@ msgstr[0] "已成功匯入 %d 份相片/視訊。\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: ../src/Dialogs.vala:849
+#: ../src/Dialogs.vala:843
 msgid "No photos or videos imported.\n"
 msgstr "沒有匯入相片或視訊。\n"
 
-#: ../src/Dialogs.vala:856 ../src/Dialogs.vala:875
+#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
 msgid "Import Complete"
 msgstr "完成匯入"
 
-#: ../src/Dialogs.vala:1161
+#: ../src/Dialogs.vala:1155
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 
-#: ../src/Dialogs.vala:1164
+#: ../src/Dialogs.vala:1158
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分鐘"
 
-#: ../src/Dialogs.vala:1168
+#: ../src/Dialogs.vala:1162
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 
-#: ../src/Dialogs.vala:1171
+#: ../src/Dialogs.vala:1165
 msgid "1 day"
 msgstr "1 天"
 
-#: ../src/Dialogs.vala:1319 ../src/Resources.vala:203
+#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
 msgid "Rename Event"
 msgstr "重新命名事件"
 
-#: ../src/Dialogs.vala:1319
+#: ../src/Dialogs.vala:1315
 msgid "Name:"
 msgstr "名稱："
 
-#: ../src/Dialogs.vala:1329 ../src/Resources.vala:272
+#. Dialog title
+#. Button label
+#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
 msgid "Edit Title"
 msgstr "編輯標題"
 
-#: ../src/Dialogs.vala:1329 ../src/Properties.vala:340
+#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
 msgid "Title:"
 msgstr "標題："
 
-#: ../src/Dialogs.vala:1343 ../src/Resources.vala:278
+#. Dialog title
+#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
 msgid "Edit Event Comment"
 msgstr "編輯事件評註"
 
-#: ../src/Dialogs.vala:1343
+#: ../src/Dialogs.vala:1344
 msgid "Edit Photo/Video Comment"
 msgstr "編輯相片/視訊評註"
 
-#: ../src/Dialogs.vala:1344 ../src/Properties.vala:630
+#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
 msgid "Comment:"
 msgstr "評註："
 
-#: ../src/Dialogs.vala:1360
-#| msgid "_Trash File"
-#| msgid_plural "_Trash Files"
+#: ../src/Dialogs.vala:1361
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "移除並將檔案移至回收筒(_T)"
 
-#: ../src/Dialogs.vala:1364
-#| msgid "Remove From Library"
+#: ../src/Dialogs.vala:1365
 msgid "_Remove From Library"
 msgstr "從珍藏館移除(_R)"
 
-#: ../src/Dialogs.vala:1384 ../src/camera/ImportPage.vala:1739
+#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
 msgid "_Keep"
 msgstr "保留(_K)"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edit?"
 msgstr "是否還原外部編輯？"
 
-#: ../src/Dialogs.vala:1407
+#: ../src/Dialogs.vala:1408
 msgid "Revert External Edits?"
 msgstr "要還原外部編輯嗎？"
 
-#: ../src/Dialogs.vala:1409
+#: ../src/Dialogs.vala:1410
 #, 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?"
+msgid_plural "This will destroy all changes made to %d external files.  Continue?"
 msgstr[0] "這會破壞 %d 份外部檔案的所有變更。要繼續嗎？"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edit"
 msgstr "還原外部編輯(_V)"
 
-#: ../src/Dialogs.vala:1413
+#: ../src/Dialogs.vala:1414
 msgid "Re_vert External Edits"
 msgstr "還原外部編輯(_V)"
 
-#: ../src/Dialogs.vala:1434
+#: ../src/Dialogs.vala:1435
 #, 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] "這會從珍藏館移除 %d 張相片。要繼續嗎？"
 
-#: ../src/Dialogs.vala:1441
+#: ../src/Dialogs.vala:1442 ../src/Resources.vala:178
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photo From Library"
 msgstr "從珍藏館移除相片"
 
-#: ../src/Dialogs.vala:1442
+#: ../src/Dialogs.vala:1443
 msgid "Remove Photos From Library"
 msgstr "從珍藏館移除相片"
 
-#: ../src/Dialogs.vala:1535
+#: ../src/Dialogs.vala:1536
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1682
+#: ../src/Dialogs.vala:1688
 msgid "AM"
 msgstr "上午"
 
-#: ../src/Dialogs.vala:1683
+#: ../src/Dialogs.vala:1689
 msgid "PM"
 msgstr "下午"
 
-#: ../src/Dialogs.vala:1684
+#: ../src/Dialogs.vala:1690
 msgid "24 Hr"
 msgstr "24 時制"
 
-#: ../src/Dialogs.vala:1699
+#: ../src/Dialogs.vala:1705
 msgid "_Shift photos/videos by the same amount"
 msgstr "以相同的量挪動相片/視訊(_S)"
 
-#: ../src/Dialogs.vala:1704
+#: ../src/Dialogs.vala:1710
 msgid "Set _all photos/videos to this time"
 msgstr "將全部相片/視訊設定為本時間(_A)"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo file"
 msgstr "修改原始相片檔案(_M)"
 
-#: ../src/Dialogs.vala:1711
+#: ../src/Dialogs.vala:1717
 msgid "_Modify original photo files"
 msgstr "修改原始相片檔案(_M)"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original file"
 msgstr "修改原始檔案(_M)"
 
-#: ../src/Dialogs.vala:1714
+#: ../src/Dialogs.vala:1720
 msgid "_Modify original files"
 msgstr "修改原始檔案(_M)"
 
-#: ../src/Dialogs.vala:1800
+#: ../src/Dialogs.vala:1806
 msgid "Original: "
 msgstr "原始："
 
-#: ../src/Dialogs.vala:1801
+#: ../src/Dialogs.vala:1807
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%Y/%m/%d %H:%M:%S"
 
-#: ../src/Dialogs.vala:1802
+#: ../src/Dialogs.vala:1808
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%Y/%m/%d %p %I:%M:%S"
 
-#: ../src/Dialogs.vala:1891
+#: ../src/Dialogs.vala:1897
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -1994,7 +1920,7 @@ msgstr ""
 "曝光時間將往前挪動\n"
 "%d %s、%d %s、%d %s、%d %s。"
 
-#: ../src/Dialogs.vala:1892
+#: ../src/Dialogs.vala:1898
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2003,27 +1929,27 @@ msgstr ""
 "曝光時間將往後挪動\n"
 "%d %s、%d %s、%d %s、%d %s。"
 
-#: ../src/Dialogs.vala:1894
+#: ../src/Dialogs.vala:1900
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: ../src/Dialogs.vala:1895
+#: ../src/Dialogs.vala:1901
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: ../src/Dialogs.vala:1896
+#: ../src/Dialogs.vala:1902
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分鐘"
 
-#: ../src/Dialogs.vala:1897
+#: ../src/Dialogs.vala:1903
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"
 
-#: ../src/Dialogs.vala:1941
+#: ../src/Dialogs.vala:1947
 #, c-format
 msgid ""
 "\n"
@@ -2038,49 +1964,49 @@ msgstr[0] ""
 "\n"
 "與其它 %d 項。"
 
-#: ../src/Dialogs.vala:1963 ../src/Dialogs.vala:1990
+#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
 msgid "Tags (separated by commas):"
 msgstr "標籤 (以半形逗號 \",\" 隔開)："
 
-#: ../src/Dialogs.vala:2070
+#: ../src/Dialogs.vala:2076
 msgid "Welcome!"
 msgstr "歡迎！"
 
-#: ../src/Dialogs.vala:2077
+#: ../src/Dialogs.vala:2083
 msgid "Welcome to Shotwell!"
 msgstr "歡迎使用 Shotwell!"
 
-#: ../src/Dialogs.vala:2081
+#: ../src/Dialogs.vala:2087
 msgid "To get started, import photos in any of these ways:"
 msgstr "若要開始操作，請以這些方式之一匯入相片："
 
-#: ../src/Dialogs.vala:2100
+#: ../src/Dialogs.vala:2106
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "選擇 <span weight=\"bold\">檔案 %s 從資料夾匯入</span>"
 
-#: ../src/Dialogs.vala:2101
+#: ../src/Dialogs.vala:2107
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "將相片拖放至 Shotwell 視窗"
 
-#: ../src/Dialogs.vala:2102
+#: ../src/Dialogs.vala:2108
 msgid "Connect a camera to your computer and import"
 msgstr "將相機連接至您的電腦並匯入"
 
-#: ../src/Dialogs.vala:2112
+#: ../src/Dialogs.vala:2118
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "從您的 %s 目錄匯入相片(_I)"
 
-#: ../src/Dialogs.vala:2119
+#: ../src/Dialogs.vala:2125
 msgid "You can also import photos in any of these ways:"
 msgstr "您可以藉這些方式之一匯入相片："
 
-#: ../src/Dialogs.vala:2129
+#: ../src/Dialogs.vala:2135
 msgid "_Don't show this message again"
 msgstr "不要再次顯示此訊息(_D)"
 
-#: ../src/Dialogs.vala:2164
+#: ../src/Dialogs.vala:2170
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "從您的 %s 珍藏館匯入相片"
@@ -2088,134 +2014,133 @@ msgstr "從您的 %s 珍藏館匯入相片"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2308 ../src/Dialogs.vala:2312
+#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
 msgid "(Help)"
 msgstr "(幫助)"
 
-#: ../src/Dialogs.vala:2321
+#: ../src/Dialogs.vala:2324
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "年%s月%s日"
 
-#: ../src/Dialogs.vala:2323
+#: ../src/Dialogs.vala:2326
 #, c-format
 msgid "Year%sMonth"
 msgstr "年%s月"
 
-#: ../src/Dialogs.vala:2325
+#: ../src/Dialogs.vala:2328
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "年%s月-日"
 
-#: ../src/Dialogs.vala:2327
+#: ../src/Dialogs.vala:2330
 msgid "Year-Month-Day"
 msgstr "年-月-日"
 
-#: ../src/Dialogs.vala:2328 ../src/editing_tools/EditingTools.vala:781
+#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "自訂"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2565
+#: ../src/Dialogs.vala:2568
 msgid "Invalid pattern"
 msgstr "無效的樣式"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: ../src/Dialogs.vala:2668
+#: ../src/Dialogs.vala:2670
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
 msgstr "Shotwell 可以複製相片至您的珍藏館，或是直接將它們匯入而不必複製。"
 
-#: ../src/Dialogs.vala:2673
+#: ../src/Dialogs.vala:2675
 msgid "Co_py Photos"
 msgstr "複製相片(_P)"
 
-#: ../src/Dialogs.vala:2674
+#: ../src/Dialogs.vala:2676
 msgid "_Import in Place"
 msgstr "匯入位置(_I)"
 
-#: ../src/Dialogs.vala:2675
+#: ../src/Dialogs.vala:2677
 msgid "Import to Library"
 msgstr "匯入至珍藏館"
 
-#: ../src/Dialogs.vala:2685 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
 msgid "Remove From Library"
 msgstr "從珍藏館移除"
 
-#: ../src/Dialogs.vala:2686 ../src/PhotoPage.vala:3086
+#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
 msgid "Removing Photo From Library"
 msgstr "正在從珍藏館移除相片"
 
-#: ../src/Dialogs.vala:2686
+#: ../src/Dialogs.vala:2688
 msgid "Removing Photos From Library"
 msgstr "正在從珍藏館移除相片"
 
-#: ../src/Dialogs.vala:2700
+#: ../src/Dialogs.vala:2702
 #, 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"
+"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"
+"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] ""
-"這會從您的 Shotwell 珍藏館移除 %d 份相片/視訊。您是否也想要將這些檔案移至您的"
-"桌面回收筒呢？\n"
+"這會從您的 Shotwell 珍藏館移除 %d 份相片/視訊。您是否也想要將這些檔案移至您的桌面"
+"回收筒呢？\n"
 "\n"
 "這個動作無法還原。"
 
-#: ../src/Dialogs.vala:2704
+#: ../src/Dialogs.vala:2706
 #, 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"
+"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"
+"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] ""
-"這會從您的 Shotwell 珍藏館移除 %d 份視訊。您是否也想要將這些檔案移至您的桌面"
-"回收筒呢？\n"
+"這會從您的 Shotwell 珍藏館移除 %d 份視訊。您是否也想要將這些檔案移至您的桌面回收筒"
+"呢？\n"
 "\n"
 "這個動作無法還原。"
 
-#: ../src/Dialogs.vala:2708
+#: ../src/Dialogs.vala:2710
 #, 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"
+"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"
+"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] ""
-"這會從您的 Shotwell 珍藏館移除 %d 張相片。您是否也想要將這些檔案移至您的桌面"
-"回收筒呢？\n"
+"這會從您的 Shotwell 珍藏館移除 %d 張相片。您是否也想要將這些檔案移至您的桌面回收筒"
+"呢？\n"
 "\n"
 "這個動作無法還原。"
 
-#: ../src/Dialogs.vala:2740
+#: ../src/Dialogs.vala:2742
 #, c-format
-msgid ""
-"The photo or video cannot be moved to your desktop trash.  Delete this file?"
+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] "%d 份相片/視訊無法移至您的桌面回收筒。要刪除這些檔案嗎？"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2757
+#: ../src/Dialogs.vala:2759
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -2276,115 +2201,123 @@ msgstr "匯出"
 msgid "Unable to process monitoring updates: %s"
 msgstr "無法處理監視更新：%s"
 
-#: ../src/MediaPage.vala:143
+#: ../src/MediaPage.vala:158
 msgid "Adjust the size of the thumbnails"
 msgstr "調整縮圖大小"
 
-#: ../src/MediaPage.vala:325 ../src/PhotoPage.vala:2590
+#: ../src/MediaPage.vala:340 ../src/PhotoPage.vala:2593 ../src/Resources.vala:188
 #: ../src/direct/DirectPhotoPage.vala:174
 msgid "Zoom _In"
 msgstr "拉近(_I)"
 
-#: ../src/MediaPage.vala:326
+#: ../src/MediaPage.vala:341
 msgid "Increase the magnification of the thumbnails"
 msgstr "放大縮圖"
 
-#: ../src/MediaPage.vala:331 ../src/PhotoPage.vala:2596
+#: ../src/MediaPage.vala:346 ../src/PhotoPage.vala:2599 ../src/Resources.vala:189
 #: ../src/direct/DirectPhotoPage.vala:180
 msgid "Zoom _Out"
 msgstr "拉遠(_O)"
 
-#: ../src/MediaPage.vala:332
+#: ../src/MediaPage.vala:347
 msgid "Decrease the magnification of the thumbnails"
 msgstr "縮小縮圖"
 
-#: ../src/MediaPage.vala:399
+#: ../src/MediaPage.vala:414
 msgid "Sort _Photos"
 msgstr "排序相片(_P)"
 
-#: ../src/MediaPage.vala:408
+#: ../src/MediaPage.vala:423
 msgid "_Play Video"
 msgstr "播放視訊(_P)"
 
-#: ../src/MediaPage.vala:409
+#: ../src/MediaPage.vala:424
 msgid "Open the selected videos in the system video player"
 msgstr "在系統影片播放程式內開啟所選的視訊"
 
-#: ../src/MediaPage.vala:413 ../src/PhotoPage.vala:2639
+#: ../src/MediaPage.vala:428 ../src/PhotoPage.vala:2642
 msgid "_Developer"
 msgstr "顯影器(_D)"
 
-#: ../src/MediaPage.vala:425 ../src/camera/Branch.vala:101
+#: ../src/MediaPage.vala:440 ../src/camera/Branch.vala:99
 #: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
-#: ../src/photos/RawSupport.vala:300
+#: ../src/photos/RawSupport.vala:303
 msgid "Camera"
 msgstr "相機"
 
-#: ../src/MediaPage.vala:436 ../src/camera/ImportPage.vala:872
+#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:874
 msgid "_Titles"
 msgstr "標題(_T)"
 
-#: ../src/MediaPage.vala:437 ../src/camera/ImportPage.vala:873
+#: ../src/MediaPage.vala:452 ../src/camera/ImportPage.vala:875
 msgid "Display the title of each photo"
 msgstr "顯示每張相片的標題"
 
-#: ../src/MediaPage.vala:442 ../src/events/EventsDirectoryPage.vala:130
+#: ../src/MediaPage.vala:457 ../src/events/EventsDirectoryPage.vala:130
 msgid "_Comments"
 msgstr "評註(_C)"
 
-#: ../src/MediaPage.vala:443
+#: ../src/MediaPage.vala:458
 msgid "Display the comment of each photo"
 msgstr "顯示每張相片的評註"
 
-#: ../src/MediaPage.vala:454 ../src/library/LibraryWindow.vala:376
+#: ../src/MediaPage.vala:469 ../src/library/LibraryWindow.vala:360
 msgid "Ta_gs"
 msgstr "標籤(_G)"
 
-#: ../src/MediaPage.vala:455
+#: ../src/MediaPage.vala:470
 msgid "Display each photo's tags"
 msgstr "顯示每張相片的標籤"
 
-#: ../src/MediaPage.vala:471
+#: ../src/MediaPage.vala:486
 msgid "By _Title"
 msgstr "依標題(_T)"
 
-#: ../src/MediaPage.vala:472
+#: ../src/MediaPage.vala:487
 msgid "Sort photos by title"
 msgstr "依標題排序相片"
 
-#: ../src/MediaPage.vala:477
+#: ../src/MediaPage.vala:492
 msgid "By Exposure _Date"
 msgstr "依拍攝日期(_D)"
 
-#: ../src/MediaPage.vala:478
+#: ../src/MediaPage.vala:493
 msgid "Sort photos by exposure date"
 msgstr "依拍攝日期排序照片"
 
-#: ../src/MediaPage.vala:483
+#: ../src/MediaPage.vala:498
 msgid "By _Rating"
 msgstr "依評等(_R)"
 
-#: ../src/MediaPage.vala:484
+#: ../src/MediaPage.vala:499
 msgid "Sort photos by rating"
 msgstr "依評等排序相片"
 
-#: ../src/MediaPage.vala:494 ../src/library/LibraryWindow.vala:422
+#: ../src/MediaPage.vala:504
+msgid "By _Filename"
+msgstr "依檔名(_F)"
+
+#: ../src/MediaPage.vala:505
+msgid "Sort photos by filename"
+msgstr "依檔案名稱排序相片"
+
+#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:406
 msgid "_Ascending"
 msgstr "遞增(_A)"
 
-#: ../src/MediaPage.vala:495 ../src/library/LibraryWindow.vala:423
+#: ../src/MediaPage.vala:516 ../src/library/LibraryWindow.vala:407
 msgid "Sort photos in an ascending order"
 msgstr "以遞增方式排序相片"
 
-#: ../src/MediaPage.vala:500 ../src/library/LibraryWindow.vala:429
+#: ../src/MediaPage.vala:521 ../src/library/LibraryWindow.vala:413
 msgid "D_escending"
 msgstr "遞減(_E)"
 
-#: ../src/MediaPage.vala:501 ../src/library/LibraryWindow.vala:430
+#: ../src/MediaPage.vala:522 ../src/library/LibraryWindow.vala:414
 msgid "Sort photos in a descending order"
 msgstr "以遞減方式排序相片"
 
-#: ../src/MediaPage.vala:702
+#: ../src/MediaPage.vala:723
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -2393,99 +2326,99 @@ msgstr ""
 "Shotwell 無法播放所選的視訊：\n"
 "%s"
 
-#: ../src/Page.vala:1268
+#: ../src/Page.vala:1263
 msgid "No photos/videos"
 msgstr "無相片/視訊"
 
-#: ../src/Page.vala:1272
+#: ../src/Page.vala:1267
 msgid "No photos/videos found"
 msgstr "找不到相片或視訊"
 
-#: ../src/Page.vala:2569
+#: ../src/Page.vala:2565
 msgid "Photos cannot be exported to this directory."
 msgstr "無法匯出相片至此目錄。"
 
-#: ../src/Photo.vala:3656
+#: ../src/Photo.vala:3753
 msgid "modified"
 msgstr "已修改"
 
 #. previous button
-#: ../src/PhotoPage.vala:532
+#: ../src/PhotoPage.vala:533
 msgid "Previous photo"
 msgstr "上一張相片"
 
 #. next button
-#: ../src/PhotoPage.vala:537
+#: ../src/PhotoPage.vala:539
 msgid "Next photo"
 msgstr "下一張相片"
 
-#: ../src/PhotoPage.vala:1844
+#: ../src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "相片來源檔案遺失：%s"
 
-#: ../src/PhotoPage.vala:2411 ../src/direct/DirectPhotoPage.vala:165
-#: ../src/library/LibraryWindow.vala:360
+#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
+#: ../src/library/LibraryWindow.vala:344
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/PhotoPage.vala:2415 ../src/direct/DirectPhotoPage.vala:81
+#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
 msgid "T_ools"
 msgstr "工具(_O)"
 
-#: ../src/PhotoPage.vala:2420 ../src/direct/DirectPhotoPage.vala:86
+#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
 msgid "_Previous Photo"
 msgstr "上一張相片(_P)"
 
-#: ../src/PhotoPage.vala:2421 ../src/direct/DirectPhotoPage.vala:87
+#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
 msgid "Previous Photo"
 msgstr "上一張相片"
 
-#: ../src/PhotoPage.vala:2426 ../src/direct/DirectPhotoPage.vala:92
+#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
 msgid "_Next Photo"
 msgstr "下一張相片(_N)"
 
-#: ../src/PhotoPage.vala:2427 ../src/direct/DirectPhotoPage.vala:93
+#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
 msgid "Next Photo"
 msgstr "下一張相片"
 
-#: ../src/PhotoPage.vala:2591 ../src/direct/DirectPhotoPage.vala:175
+#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
 msgid "Increase the magnification of the photo"
 msgstr "增加相片放大倍率"
 
-#: ../src/PhotoPage.vala:2597 ../src/direct/DirectPhotoPage.vala:181
+#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
 msgid "Decrease the magnification of the photo"
 msgstr "降低相片放大倍率"
 
-#: ../src/PhotoPage.vala:2602 ../src/direct/DirectPhotoPage.vala:186
+#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
 msgid "Fit to _Page"
 msgstr "使其適合頁面(_P)"
 
-#: ../src/PhotoPage.vala:2603 ../src/direct/DirectPhotoPage.vala:187
+#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
 msgid "Zoom the photo to fit on the screen"
 msgstr "將相片拉至適合螢幕大小"
 
-#: ../src/PhotoPage.vala:2609 ../src/direct/DirectPhotoPage.vala:193
+#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
 #, no-c-format
 msgid "Zoom _100%"
 msgstr "拉至 _100%"
 
-#: ../src/PhotoPage.vala:2611 ../src/direct/DirectPhotoPage.vala:195
+#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
 #, no-c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "將相片拉至 100% 倍率"
 
-#: ../src/PhotoPage.vala:2617 ../src/direct/DirectPhotoPage.vala:201
+#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
 #, no-c-format
 msgid "Zoom _200%"
 msgstr "拉至 _200%"
 
-#: ../src/PhotoPage.vala:2619 ../src/direct/DirectPhotoPage.vala:203
+#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
 #, no-c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "將相片拉至 200% 倍率"
 
-#: ../src/PhotoPage.vala:3227
+#: ../src/PhotoPage.vala:3231
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "無法匯出 %s：%s"
@@ -2673,73 +2606,73 @@ msgid "Developer:"
 msgstr "顯影器："
 
 #. fit both on the top line, emit and move on
-#: ../src/Properties.vala:436 ../src/Properties.vala:440
-#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2258
+#: ../src/Properties.vala:436 ../src/Properties.vala:440 ../src/Properties.vala:447
+#: ../src/editing_tools/EditingTools.vala:2258
 msgid "Exposure:"
 msgstr "曝光："
 
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:585
+#: ../src/Properties.vala:583
 msgid "Location:"
 msgstr "位置："
 
-#: ../src/Properties.vala:588
+#: ../src/Properties.vala:586
 msgid "File size:"
 msgstr "檔案大小："
 
-#: ../src/Properties.vala:592
+#: ../src/Properties.vala:590
 msgid "Current Development:"
 msgstr "目前顯影："
 
-#: ../src/Properties.vala:594
+#: ../src/Properties.vala:592
 msgid "Original dimensions:"
 msgstr "原始維度："
 
-#: ../src/Properties.vala:597
+#: ../src/Properties.vala:595
 msgid "Camera make:"
 msgstr "相機製造商："
 
-#: ../src/Properties.vala:600
+#: ../src/Properties.vala:598
 msgid "Camera model:"
 msgstr "相機型號："
 
-#: ../src/Properties.vala:603
+#: ../src/Properties.vala:601
 msgid "Flash:"
 msgstr "閃光："
 
-#: ../src/Properties.vala:605
+#: ../src/Properties.vala:603
 msgid "Focal length:"
 msgstr "焦距："
 
-#: ../src/Properties.vala:608
+#: ../src/Properties.vala:606
 msgid "Exposure date:"
 msgstr "曝光日期："
 
-#: ../src/Properties.vala:611
+#: ../src/Properties.vala:609
 msgid "Exposure time:"
 msgstr "曝光時間："
 
-#: ../src/Properties.vala:614
+#: ../src/Properties.vala:612
 msgid "Exposure bias:"
 msgstr "曝光補償："
 
-#: ../src/Properties.vala:616
+#: ../src/Properties.vala:614
 msgid "GPS latitude:"
 msgstr "GPS 緯度："
 
-#: ../src/Properties.vala:619
+#: ../src/Properties.vala:617
 msgid "GPS longitude:"
 msgstr "GPS 經度："
 
-#: ../src/Properties.vala:622
+#: ../src/Properties.vala:620
 msgid "Artist:"
 msgstr "藝人："
 
-#: ../src/Properties.vala:624
+#: ../src/Properties.vala:622
 msgid "Copyright:"
 msgstr "著作權："
 
-#: ../src/Properties.vala:626
+#: ../src/Properties.vala:624
 msgid "Software:"
 msgstr "軟體："
 
@@ -2755,651 +2688,752 @@ msgstr "相片管理員"
 msgid "Photo Viewer"
 msgstr "相片檢視器"
 
-#: ../src/Resources.vala:142
+#: ../src/Resources.vala:144
 msgid "Rotate _Right"
 msgstr "向右旋轉(_R)"
 
-#: ../src/Resources.vala:143 ../src/Resources.vala:148
+#: ../src/Resources.vala:145 ../src/Resources.vala:150
 msgid "Rotate"
 msgstr "旋轉"
 
-#: ../src/Resources.vala:144
+#: ../src/Resources.vala:146
 msgid "Rotate Right"
 msgstr "向右旋轉"
 
-#: ../src/Resources.vala:145
+#: ../src/Resources.vala:147
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "將相片向右旋轉 (按下 Ctrl 鍵以向左旋轉)"
 
-#: ../src/Resources.vala:147
+#: ../src/Resources.vala:149
 msgid "Rotate _Left"
 msgstr "向左旋轉(_L)"
 
-#: ../src/Resources.vala:149
+#: ../src/Resources.vala:151
 msgid "Rotate Left"
 msgstr "向左旋轉"
 
-#: ../src/Resources.vala:150
+#: ../src/Resources.vala:152
 msgid "Rotate the photos left"
 msgstr "將相片向左旋轉"
 
-#: ../src/Resources.vala:152
+#: ../src/Resources.vala:154
 msgid "Flip Hori_zontally"
 msgstr "水平翻轉(_Z)"
 
-#: ../src/Resources.vala:153
+#: ../src/Resources.vala:155
 msgid "Flip Horizontally"
 msgstr "水平翻轉"
 
-#: ../src/Resources.vala:155
+#: ../src/Resources.vala:157
 msgid "Flip Verti_cally"
 msgstr "垂直翻轉(_C)"
 
-#: ../src/Resources.vala:156
+#: ../src/Resources.vala:158
 msgid "Flip Vertically"
 msgstr "垂直翻轉"
 
-#: ../src/Resources.vala:158
+#: ../src/Resources.vala:160
+msgid "_About"
+msgstr "關於(_A)"
+
+#: ../src/Resources.vala:161
+msgid "_Apply"
+msgstr "套用(_A)"
+
+#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
+#: ../src/library/LibraryWindow.vala:340
+msgid "_Edit"
+msgstr "編輯(_E)"
+
+#: ../src/Resources.vala:165
+msgid "_Forward"
+msgstr "前進(_F)"
+
+#: ../src/Resources.vala:166
+msgid "Fulls_creen"
+msgstr "全螢幕(_C)"
+
+#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
+#: ../src/library/LibraryWindow.vala:364
+msgid "_Help"
+msgstr "幫助(_H)"
+
+#: ../src/Resources.vala:168
+msgid "Leave _Fullscreen"
+msgstr "離開全螢幕(_F)"
+
+#: ../src/Resources.vala:169 ../src/Resources.vala:371
+msgid "_New"
+msgstr "新增(_N)"
+
+#: ../src/Resources.vala:170
+msgid "_Next"
+msgstr "下一張(_N)"
+
+#: ../src/Resources.vala:171
+msgid "_OK"
+msgstr "確定(_O)"
+
+#: ../src/Resources.vala:172
+msgid "_Play"
+msgstr "播放(_P)"
+
+#: ../src/Resources.vala:173 ../src/Resources.vala:325
+msgid "_Preferences"
+msgstr "偏好設定(_P)"
+
+#: ../src/Resources.vala:174
+msgid "_Previous"
+msgstr "上一張(_P)"
+
+#: ../src/Resources.vala:175
+msgid "_Print"
+msgstr "列印(_P)"
+
+#: ../src/Resources.vala:176
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: ../src/Resources.vala:177
+msgid "_Refresh"
+msgstr "重新整理(_R)"
+
+#: ../src/Resources.vala:179
+msgid "_Revert"
+msgstr "還原(_R)"
+
+#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
+#: ../src/direct/DirectPhotoPage.vala:422
+msgid "_Save"
+msgstr "儲存(_S)"
+
+#: ../src/Resources.vala:181
+msgid "Save _As"
+msgstr "另存新檔(_A)"
+
+#: ../src/Resources.vala:182
+msgid "Sort _Ascending"
+msgstr "遞增排序(_A)"
+
+#: ../src/Resources.vala:183
+msgid "Sort _Descending"
+msgstr "遞減排序(_E)"
+
+#: ../src/Resources.vala:184
+msgid "_Stop"
+msgstr "停止(_S)"
+
+#: ../src/Resources.vala:185
+msgid "_Undelete"
+msgstr "取消刪除(_U)"
+
+#: ../src/Resources.vala:186
+msgid "_Normal Size"
+msgstr "正常大小(_N)"
+
+#: ../src/Resources.vala:187
+msgid "Best _Fit"
+msgstr "自動調整(_F)"
+
+#: ../src/Resources.vala:191
 msgid "_Enhance"
 msgstr "優化(_E)"
 
-#: ../src/Resources.vala:159
+#: ../src/Resources.vala:192
 msgid "Enhance"
 msgstr "優化"
 
-#: ../src/Resources.vala:160
+#: ../src/Resources.vala:193
 msgid "Automatically improve the photo's appearance"
 msgstr "自動優化相片外觀"
 
-#: ../src/Resources.vala:162
+#: ../src/Resources.vala:195
 msgid "_Copy Color Adjustments"
 msgstr "複製色彩調整(_C)"
 
-#: ../src/Resources.vala:163
+#: ../src/Resources.vala:196
 msgid "Copy Color Adjustments"
 msgstr "複製色彩調整"
 
-#: ../src/Resources.vala:164
+#: ../src/Resources.vala:197
 msgid "Copy the color adjustments applied to the photo"
 msgstr "複製套用至該相片的色彩調整"
 
-#: ../src/Resources.vala:166
+#: ../src/Resources.vala:199
 msgid "_Paste Color Adjustments"
 msgstr "貼上色彩調整(_P)"
 
-#: ../src/Resources.vala:167
+#: ../src/Resources.vala:200
 msgid "Paste Color Adjustments"
 msgstr "貼上色彩調整"
 
-#: ../src/Resources.vala:168
+#: ../src/Resources.vala:201
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "將複製的色彩調整套用至所選的相片上"
 
-#: ../src/Resources.vala:170
+#: ../src/Resources.vala:203
 msgid "_Crop"
 msgstr "裁切(_C)"
 
-#: ../src/Resources.vala:171
+#: ../src/Resources.vala:204
 msgid "Crop"
 msgstr "裁切"
 
-#: ../src/Resources.vala:172
+#: ../src/Resources.vala:205
 msgid "Crop the photo's size"
 msgstr "裁切相片大小"
 
-#: ../src/Resources.vala:174 ../src/editing_tools/StraightenTool.vala:100
+#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
 msgid "_Straighten"
 msgstr "拉直(_S)"
 
-#: ../src/Resources.vala:175
+#: ../src/Resources.vala:208
 msgid "Straighten"
 msgstr "拉直"
 
-#: ../src/Resources.vala:176
+#: ../src/Resources.vala:209
 msgid "Straighten the photo"
 msgstr "拉直相片"
 
-#: ../src/Resources.vala:178
+#: ../src/Resources.vala:211
 msgid "_Red-eye"
 msgstr "紅眼(_R)"
 
-#: ../src/Resources.vala:179
+#: ../src/Resources.vala:212
 msgid "Red-eye"
 msgstr "紅眼"
 
-#: ../src/Resources.vala:180
+#: ../src/Resources.vala:213
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "減少或消除相片中的紅眼效應"
 
-#: ../src/Resources.vala:182
+#: ../src/Resources.vala:215
 msgid "_Adjust"
 msgstr "調整(_A)"
 
-#: ../src/Resources.vala:183
+#: ../src/Resources.vala:216
 msgid "Adjust"
 msgstr "調整"
 
-#: ../src/Resources.vala:184
+#: ../src/Resources.vala:217
 msgid "Adjust the photo's color and tone"
 msgstr "調整相片的色彩與色調"
 
-#: ../src/Resources.vala:186
+#: ../src/Resources.vala:219
 msgid "Re_vert to Original"
 msgstr "還原至原始(_V)"
 
-#: ../src/Resources.vala:187
+#: ../src/Resources.vala:220
 msgid "Revert to Original"
 msgstr "還原至原始"
 
-#: ../src/Resources.vala:189
+#: ../src/Resources.vala:222
 msgid "Revert External E_dits"
 msgstr "還原外部編輯(_D)"
 
-#: ../src/Resources.vala:190
+#: ../src/Resources.vala:223
 msgid "Revert to the master photo"
 msgstr "還原至主相片"
 
-#: ../src/Resources.vala:192
+#: ../src/Resources.vala:225
 msgid "Set as _Desktop Background"
 msgstr "設為桌面背景(_D)"
 
-#: ../src/Resources.vala:193
+#: ../src/Resources.vala:226
 msgid "Set selected image to be the new desktop background"
 msgstr "將所選的影像設為新的桌面背景"
 
-#: ../src/Resources.vala:194
+#: ../src/Resources.vala:227
 msgid "Set as _Desktop Slideshow..."
 msgstr "設為桌面投影秀(_D)..."
 
-#: ../src/Resources.vala:196
+#: ../src/Resources.vala:229
 msgid "_Undo"
 msgstr "復原(_U)"
 
-#: ../src/Resources.vala:197
+#: ../src/Resources.vala:230
 msgid "Undo"
 msgstr "復原"
 
-#: ../src/Resources.vala:199
+#: ../src/Resources.vala:232
 msgid "_Redo"
 msgstr "取消復原(_R)"
 
-#: ../src/Resources.vala:200
+#: ../src/Resources.vala:233
 msgid "Redo"
 msgstr "取消復原"
 
-#: ../src/Resources.vala:202
+#: ../src/Resources.vala:235
 msgid "Re_name Event..."
 msgstr "重新命名事件(_N)..."
 
-#: ../src/Resources.vala:205
+#: ../src/Resources.vala:238
 msgid "Make _Key Photo for Event"
 msgstr "作為事件的代表性相片(_K)"
 
-#: ../src/Resources.vala:206
+#: ../src/Resources.vala:239
 msgid "Make Key Photo for Event"
 msgstr "作為事件的代表性相片"
 
-#: ../src/Resources.vala:208
+#: ../src/Resources.vala:241
 msgid "_New Event"
 msgstr "新事件(_N)"
 
-#: ../src/Resources.vala:209
+#: ../src/Resources.vala:242
 msgid "New Event"
 msgstr "新事件"
 
-#: ../src/Resources.vala:211
+#: ../src/Resources.vala:244
 msgid "Move Photos"
 msgstr "移動相片"
 
-#: ../src/Resources.vala:212
+#: ../src/Resources.vala:245
 msgid "Move photos to an event"
 msgstr "移動相片至某事件"
 
-#: ../src/Resources.vala:214
+#: ../src/Resources.vala:247
 msgid "_Merge Events"
 msgstr "合併事件(_M)"
 
-#: ../src/Resources.vala:215
+#: ../src/Resources.vala:248
 msgid "Merge"
 msgstr "合併"
 
-#: ../src/Resources.vala:216
+#: ../src/Resources.vala:249
 msgid "Combine events into a single event"
 msgstr "合併多事件為單一事件"
 
-#: ../src/Resources.vala:218
+#: ../src/Resources.vala:251
 msgid "_Set Rating"
 msgstr "設定評等(_S)"
 
-#: ../src/Resources.vala:219
+#: ../src/Resources.vala:252
 msgid "Set Rating"
 msgstr "設定評等"
 
-#: ../src/Resources.vala:220
+#: ../src/Resources.vala:253
 msgid "Change the rating of your photo"
 msgstr "變更您相片的評等"
 
-#: ../src/Resources.vala:222
+#: ../src/Resources.vala:255
 msgid "_Increase"
 msgstr "增加(_I)"
 
-#: ../src/Resources.vala:223
+#: ../src/Resources.vala:256
 msgid "Increase Rating"
 msgstr "增加評等"
 
-#: ../src/Resources.vala:225
+#: ../src/Resources.vala:258
 msgid "_Decrease"
 msgstr "降低(_D)"
 
-#: ../src/Resources.vala:226
+#: ../src/Resources.vala:259
 msgid "Decrease Rating"
 msgstr "降低評等"
 
-#: ../src/Resources.vala:228
+#: ../src/Resources.vala:261
 msgid "_Unrated"
 msgstr "無評等(_U)"
 
-#: ../src/Resources.vala:229
+#: ../src/Resources.vala:262
 msgid "Unrated"
 msgstr "未評等"
 
-#: ../src/Resources.vala:230
+#: ../src/Resources.vala:263
 msgid "Rate Unrated"
 msgstr "無評等"
 
-#: ../src/Resources.vala:231
+#: ../src/Resources.vala:264
 msgid "Setting as unrated"
 msgstr "設定為無評等"
 
-#: ../src/Resources.vala:232
+#: ../src/Resources.vala:265
 msgid "Remove any ratings"
 msgstr "移除任何評等"
 
-#: ../src/Resources.vala:234
+#: ../src/Resources.vala:267
 msgid "_Rejected"
 msgstr "退絕(_R)"
 
-#: ../src/Resources.vala:235
+#: ../src/Resources.vala:268
 msgid "Rejected"
 msgstr "退絕"
 
-#: ../src/Resources.vala:236
+#: ../src/Resources.vala:269
 msgid "Rate Rejected"
 msgstr "評等退絕"
 
-#: ../src/Resources.vala:237
+#: ../src/Resources.vala:270
 msgid "Setting as rejected"
 msgstr "設定為退絕"
 
-#: ../src/Resources.vala:238
+#: ../src/Resources.vala:271
 msgid "Set rating to rejected"
 msgstr "將評等設為退絕"
 
-#: ../src/Resources.vala:240
+#: ../src/Resources.vala:273
 msgid "Rejected _Only"
 msgstr "只有退絕(_O)"
 
-#: ../src/Resources.vala:241
+#: ../src/Resources.vala:274
 msgid "Rejected Only"
 msgstr "只有退絕"
 
-#: ../src/Resources.vala:242
+#: ../src/Resources.vala:275
 msgid "Show only rejected photos"
 msgstr "只顯示退絕的相片"
 
-#: ../src/Resources.vala:244
+#: ../src/Resources.vala:277
 msgid "All + _Rejected"
 msgstr "全部 + 退絕(_R)"
 
-#: ../src/Resources.vala:245 ../src/Resources.vala:246
+#: ../src/Resources.vala:278 ../src/Resources.vala:279
 msgid "Show all photos, including rejected"
 msgstr "顯示全部相片，包括退絕項目"
 
-#: ../src/Resources.vala:248
+#: ../src/Resources.vala:281
 msgid "_All Photos"
 msgstr "全部相片(_A)"
 
-#: ../src/Resources.vala:249 ../src/Resources.vala:250
+#. Button label
+#. Button tooltip
+#: ../src/Resources.vala:283 ../src/Resources.vala:285
 msgid "Show all photos"
 msgstr "顯示全部相片"
 
-#: ../src/Resources.vala:252
+#: ../src/Resources.vala:287
 msgid "_Ratings"
 msgstr "評等(_R)"
 
-#: ../src/Resources.vala:253
+#: ../src/Resources.vala:288
 msgid "Display each photo's rating"
 msgstr "顯示每張相片的評等"
 
-#: ../src/Resources.vala:255
+#: ../src/Resources.vala:290
 msgid "_Filter Photos"
 msgstr "過濾相片(_F)"
 
-#: ../src/Resources.vala:256
+#: ../src/Resources.vala:291
 msgid "Filter Photos"
 msgstr "過濾相片"
 
-#: ../src/Resources.vala:257
+#: ../src/Resources.vala:292
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "限制過濾條件所顯示的相片數目"
 
-#: ../src/Resources.vala:259
+#: ../src/Resources.vala:294
 msgid "_Duplicate"
 msgstr "製作複本(_D)"
 
-#: ../src/Resources.vala:260
+#: ../src/Resources.vala:295
 msgid "Duplicate"
 msgstr "製作複本"
 
-#: ../src/Resources.vala:261
+#: ../src/Resources.vala:296
 msgid "Make a duplicate of the photo"
 msgstr "建立相片的複本"
 
-#: ../src/Resources.vala:263
+#: ../src/Resources.vala:298
 msgid "_Export..."
 msgstr "匯出(_E)..."
 
-#: ../src/Resources.vala:265
+#: ../src/Resources.vala:300
 msgid "_Print..."
 msgstr "列印(_P)..."
 
-#: ../src/Resources.vala:267
+#: ../src/Resources.vala:302
 msgid "Pu_blish..."
 msgstr "發布(_B)..."
 
-#: ../src/Resources.vala:269
+#: ../src/Resources.vala:304
 msgid "Publish to various websites"
 msgstr "發布至多種網站"
 
-#: ../src/Resources.vala:271
+#: ../src/Resources.vala:306
 msgid "Edit _Title..."
 msgstr "編輯標題(_T)..."
 
-#: ../src/Resources.vala:274
+#: ../src/Resources.vala:310
 msgid "Edit _Comment..."
 msgstr "編輯評註(_C)..."
 
-#: ../src/Resources.vala:275
+#. Button label
+#: ../src/Resources.vala:312
 msgid "Edit Comment"
 msgstr "編輯評註"
 
-#: ../src/Resources.vala:277
+#: ../src/Resources.vala:314
 msgid "Edit Event _Comment..."
 msgstr "編輯事件評註(_C)..."
 
-#: ../src/Resources.vala:280
+#: ../src/Resources.vala:317
 msgid "_Adjust Date and Time..."
 msgstr "調整日期與時間(_A)..."
 
-#: ../src/Resources.vala:281
+#: ../src/Resources.vala:318
 msgid "Adjust Date and Time"
 msgstr "調整日期與時間"
 
-#: ../src/Resources.vala:283
+#: ../src/Resources.vala:320
 msgid "Add _Tags..."
 msgstr "加入標籤(_A)..."
 
-#: ../src/Resources.vala:284
+#: ../src/Resources.vala:321
 msgid "_Add Tags..."
 msgstr "添加標籤(_A)..."
 
-#: ../src/Resources.vala:285 ../src/Resources.vala:316
+#. Dialog title
+#. Undo/Redo command name (in Edit menu)
+#: ../src/Resources.vala:323 ../src/Resources.vala:356
 msgid "Add Tags"
 msgstr "加入標籤"
 
-#: ../src/Resources.vala:287
-msgid "_Preferences"
-msgstr "偏好設定(_P)"
-
-#: ../src/Resources.vala:289
+#: ../src/Resources.vala:327
 msgid "Open With E_xternal Editor"
 msgstr "以外部編輯器開啟(_X)"
 
-#: ../src/Resources.vala:291
+#: ../src/Resources.vala:329
 msgid "Open With RA_W Editor"
 msgstr "以 RA_W 編輯器開啟"
 
-#: ../src/Resources.vala:293
+#: ../src/Resources.vala:331
 msgid "Send _To..."
 msgstr "傳送至(_T)..."
 
-#: ../src/Resources.vala:294
+#: ../src/Resources.vala:332
 msgid "Send T_o..."
 msgstr "傳送至(_O)..."
 
-#: ../src/Resources.vala:296
+#: ../src/Resources.vala:334
 msgid "_Find..."
 msgstr "尋找(_F)..."
 
-#: ../src/Resources.vala:297
+#: ../src/Resources.vala:335
 msgid "Find"
 msgstr "尋找"
 
-#: ../src/Resources.vala:298
+#: ../src/Resources.vala:336
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "輸入出現在影像的名稱內或標籤上的文字來尋找影像"
 
-#: ../src/Resources.vala:300
+#: ../src/Resources.vala:338
 msgid "_Flag"
 msgstr "加上旗幟(_F)"
 
-#: ../src/Resources.vala:302
+#: ../src/Resources.vala:340
 msgid "Un_flag"
 msgstr "移除旗幟(_F)"
 
-#: ../src/Resources.vala:305
+#: ../src/Resources.vala:343
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "無法開啟編輯器：%s"
 
-#: ../src/Resources.vala:310
+#: ../src/Resources.vala:348
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "加入標籤「%s」"
 
-#: ../src/Resources.vala:312
+#. Used when adding two tags to photo(s)
+#: ../src/Resources.vala:351
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "加入標籤「%s」與「%s」"
 
-#: ../src/Resources.vala:320
+#: ../src/Resources.vala:361
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "刪除「%s」標籤(_D)"
 
-#: ../src/Resources.vala:324
+#: ../src/Resources.vala:365
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "刪除「%s」標籤"
 
-#: ../src/Resources.vala:327
+#: ../src/Resources.vala:368
 msgid "Delete Tag"
 msgstr "刪除標籤"
 
-#: ../src/Resources.vala:330
-msgid "_New"
-msgstr "新增(_N)"
-
-#: ../src/Resources.vala:333
+#: ../src/Resources.vala:374
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "刪除標籤「%s」..."
 
-#: ../src/Resources.vala:337
+#: ../src/Resources.vala:378
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "重新命名標籤「%s」為「%s」"
 
-#: ../src/Resources.vala:340
+#: ../src/Resources.vala:381
 msgid "_Rename..."
 msgstr "重新命名(_R)..."
 
-#: ../src/Resources.vala:342
+#: ../src/Resources.vala:383
 msgid "Modif_y Tags..."
 msgstr "修改標籤(_Y)..."
 
-#: ../src/Resources.vala:343
+#: ../src/Resources.vala:384
 msgid "Modify Tags"
 msgstr "修改標籤"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "將相片加上「%s」標籤"
 
-#: ../src/Resources.vala:346
+#: ../src/Resources.vala:387
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "將相片加入「%s」標籤"
 
-#: ../src/Resources.vala:350
+#: ../src/Resources.vala:391
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "將所選相片加上「%s」標籤"
 
-#: ../src/Resources.vala:351
+#: ../src/Resources.vala:392
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "將所選的相片加入「%s」標籤"
 
-#: ../src/Resources.vala:355
+#: ../src/Resources.vala:396
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "從相片移除「%s」標籤(_P)"
 
-#: ../src/Resources.vala:356
+#: ../src/Resources.vala:397
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "從相片移除「%s」標籤(_P)"
 
-#: ../src/Resources.vala:360
+#: ../src/Resources.vala:401
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "從相片移除「%s」標籤"
 
-#: ../src/Resources.vala:361
+#: ../src/Resources.vala:402
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "從相片移除「%s」標籤"
 
-#: ../src/Resources.vala:365
+#: ../src/Resources.vala:406
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr "「%s」標籤已存在，因而無法重新命名標籤。"
 
-#: ../src/Resources.vala:369
+#: ../src/Resources.vala:410
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr "因為該搜尋已經存在，無法重新命名搜尋為「%s」。"
 
-#: ../src/Resources.vala:372
+#: ../src/Resources.vala:413
 msgid "Saved Search"
 msgstr "儲存的搜尋"
 
-#: ../src/Resources.vala:374
+#: ../src/Resources.vala:415
 msgid "Delete Search"
 msgstr "刪除搜尋"
 
-#: ../src/Resources.vala:377
+#: ../src/Resources.vala:418
 msgid "_Edit..."
 msgstr "編輯(_E)..."
 
-#: ../src/Resources.vala:378
+#: ../src/Resources.vala:419
 msgid "Re_name..."
 msgstr "重新命名(_N)..."
 
-#: ../src/Resources.vala:381
+#: ../src/Resources.vala:422
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "重新命名「%s」搜尋為「%s」"
 
-#: ../src/Resources.vala:385
+#: ../src/Resources.vala:426
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "刪除「%s」搜尋"
 
-#: ../src/Resources.vala:543
+#: ../src/Resources.vala:584
 #, c-format
 msgid "Rate %s"
 msgstr "為 %s 評等"
 
-#: ../src/Resources.vala:544
+#: ../src/Resources.vala:585
 #, c-format
 msgid "Set rating to %s"
 msgstr "設定評等為 %s"
 
-#: ../src/Resources.vala:545
+#: ../src/Resources.vala:586
 #, c-format
 msgid "Setting rating to %s"
 msgstr "正在設定評等為 %s"
 
-#: ../src/Resources.vala:547
+#: ../src/Resources.vala:588
 #, c-format
 msgid "Display %s"
 msgstr "顯示 %s"
 
-#: ../src/Resources.vala:548
+#: ../src/Resources.vala:589
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "只顯示評等為 %s 的相片"
 
-#: ../src/Resources.vala:549
+#: ../src/Resources.vala:590
 #, c-format
 msgid "%s or Better"
 msgstr "%s 或更高"
 
-#: ../src/Resources.vala:550
+#: ../src/Resources.vala:591
 #, c-format
 msgid "Display %s or Better"
 msgstr "顯示 %s 或更高"
 
-#: ../src/Resources.vala:551
+#: ../src/Resources.vala:592
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "只顯示評等為 %s 或更高的相片"
 
-#: ../src/Resources.vala:642
+#: ../src/Resources.vala:683
 msgid "Remove the selected photos from the trash"
 msgstr "從回收筒移除所選的相片"
 
-#: ../src/Resources.vala:643
+#: ../src/Resources.vala:684
 msgid "Remove the selected photos from the library"
 msgstr "從珍藏館移除所選的相片"
 
-#: ../src/Resources.vala:645
+#: ../src/Resources.vala:686
 msgid "_Restore"
 msgstr "還原(_R)"
 
-#: ../src/Resources.vala:646
+#: ../src/Resources.vala:687
 msgid "Move the selected photos back into the library"
 msgstr "將所選的相片移回珍藏館"
 
-#: ../src/Resources.vala:648
+#: ../src/Resources.vala:689
 msgid "Show in File Mana_ger"
 msgstr "以檔案管理員開啟(_G)"
 
-#: ../src/Resources.vala:649
+#: ../src/Resources.vala:690
 msgid "Open the selected photo's directory in the file manager"
 msgstr "在檔案管理員內開啟所選的相片目錄"
 
-#: ../src/Resources.vala:652
+#: ../src/Resources.vala:693
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "無法於檔案管理員內開啟：%s"
 
-#: ../src/Resources.vala:655
+#: ../src/Resources.vala:696
 msgid "R_emove From Library"
 msgstr "從珍藏館移除(_E)"
 
-#: ../src/Resources.vala:657
+#: ../src/Resources.vala:698
 msgid "_Move to Trash"
 msgstr "移至回收筒(_M)"
 
-#: ../src/Resources.vala:659
+#: ../src/Resources.vala:700
 msgid "Select _All"
 msgstr "全選(_A)"
 
-#: ../src/Resources.vala:660
+#: ../src/Resources.vala:701
 msgid "Select all items"
 msgstr "選取全部項目"
 
@@ -3407,20 +3441,20 @@ msgstr "選取全部項目"
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:741
+#: ../src/Resources.vala:780
 msgid "%-I:%M %p"
 msgstr "%p%-I:%M"
 
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:746
+#: ../src/Resources.vala:785
 msgid "%-I:%M:%S %p"
 msgstr "%p%-I:%M:%S"
 
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:750
+#: ../src/Resources.vala:789
 msgid "%a %b %d, %Y"
 msgstr "%Y年%b%d日(%a)"
 
@@ -3430,14 +3464,14 @@ msgstr "%Y年%b%d日(%a)"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:755 ../src/Resources.vala:765
+#: ../src/Resources.vala:794 ../src/Resources.vala:804
 msgid "%a %b %d"
 msgstr "%Y年%b%d日(%a)"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:760
+#: ../src/Resources.vala:799
 msgid "%d, %Y"
 msgstr "%d日"
 
@@ -3447,11 +3481,12 @@ msgstr "投影秀"
 
 #. Flagged label and toggle
 #: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
-#: ../src/SearchFilter.vala:990 ../src/library/FlaggedPage.vala:8
+#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
 msgid "Flagged"
 msgstr "已加上旗幟"
 
 #: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
+#: ../src/library/Branch.vala:97
 msgid "Photos"
 msgstr "相片"
 
@@ -3467,28 +3502,37 @@ msgstr "RAW 相片"
 msgid "RAW photos"
 msgstr "RAW 相片"
 
-#: ../src/SearchFilter.vala:952
+#: ../src/SearchFilter.vala:934
 #, c-format
 msgid "Error loading UI file %s: %s"
 msgstr "載入 UI 檔 %s 時發生錯誤：%s"
 
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: ../src/SearchFilter.vala:945
+msgid "Close"
+msgstr "關閉"
+
 #. Type label and toggles
-#: ../src/SearchFilter.vala:969
+#: ../src/SearchFilter.vala:951
 msgid "Type"
 msgstr "類型"
 
 #. Rating label and button
-#: ../src/SearchFilter.vala:1003 ../src/searches/SearchBoolean.vala:184
+#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
 msgid "Rating"
 msgstr "評等"
 
-#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:182
+#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
 msgid "Settings"
 msgstr "設定值"
 
 #. Set up toolbar
 #. add toolbar buttons
-#: ../src/SlideshowPage.vala:161
+#: ../src/SlideshowPage.vala:160
 msgid "Back"
 msgstr "返回"
 
@@ -3496,15 +3540,15 @@ msgstr "返回"
 msgid "Go to the previous photo"
 msgstr "前往上一張相片"
 
-#: ../src/SlideshowPage.vala:168 ../src/SlideshowPage.vala:273
+#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
 msgid "Pause"
 msgstr "暫停"
 
-#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:274
+#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
 msgid "Pause the slideshow"
 msgstr "暫停投影秀"
 
-#: ../src/SlideshowPage.vala:175
+#: ../src/SlideshowPage.vala:174
 msgid "Next"
 msgstr "下一張"
 
@@ -3512,20 +3556,20 @@ msgstr "下一張"
 msgid "Go to the next photo"
 msgstr "前往下一張相片"
 
-#: ../src/SlideshowPage.vala:183
+#: ../src/SlideshowPage.vala:184
 msgid "Change slideshow settings"
 msgstr "變更投影秀設定值"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: ../src/SlideshowPage.vala:237
+#: ../src/SlideshowPage.vala:238
 msgid "All photo source files are missing."
 msgstr "遺失全部相片來源檔。"
 
-#: ../src/SlideshowPage.vala:269
+#: ../src/SlideshowPage.vala:270
 msgid "Play"
 msgstr "播放"
 
-#: ../src/SlideshowPage.vala:270
+#: ../src/SlideshowPage.vala:271
 msgid "Continue the slideshow"
 msgstr "繼續投影秀"
 
@@ -3534,17 +3578,16 @@ msgid "untitled"
 msgstr "無標題"
 
 #. multiple videos
-#: ../src/VideoSupport.vala:486
+#: ../src/VideoSupport.vala:489
 msgid "Export Videos"
 msgstr "匯出視訊"
 
-#: ../src/camera/Branch.vala:87
+#: ../src/camera/Branch.vala:85
 msgid "Cameras"
 msgstr "相機"
 
 #: ../src/camera/ImportPage.vala:459
-msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
+msgid "Unable to unmount camera.  Try unmounting the camera from the file manager."
 msgstr "無法卸載相機。請從檔案管理員內嘗試卸載該相機。"
 
 #. hide duplicates checkbox
@@ -3560,55 +3603,55 @@ msgstr "只顯示尚未匯入的相片"
 #. prior to import.
 #. TODO: replace this with approved text for "talking to camera,
 #. please wait" once new strings are being accepted.
-#: ../src/camera/ImportPage.vala:845
+#: ../src/camera/ImportPage.vala:847
 msgid "Starting import, please wait..."
 msgstr "正開始匯入，請稍候..."
 
-#: ../src/camera/ImportPage.vala:884
+#: ../src/camera/ImportPage.vala:886
 msgid "Import _Selected"
 msgstr "匯入所選(_S)"
 
-#: ../src/camera/ImportPage.vala:885
+#: ../src/camera/ImportPage.vala:887
 msgid "Import the selected photos into your library"
 msgstr "將所選的相片匯入您的珍藏館"
 
-#: ../src/camera/ImportPage.vala:890
+#: ../src/camera/ImportPage.vala:892
 msgid "Import _All"
 msgstr "匯入全部(_A)"
 
-#: ../src/camera/ImportPage.vala:891
+#: ../src/camera/ImportPage.vala:893
 msgid "Import all the photos into your library"
 msgstr "將全部的相片匯入您的珍藏館"
 
 #. it's mounted, offer to unmount for the user
-#: ../src/camera/ImportPage.vala:1012
+#: ../src/camera/ImportPage.vala:1014
 msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
+"Shotwell needs to unmount the camera from the filesystem in order to access it.  "
+"Continue?"
 msgstr "Shotwell 需要從檔案系統卸載相機才能存取它。要繼續嗎？"
 
-#: ../src/camera/ImportPage.vala:1018
+#: ../src/camera/ImportPage.vala:1020
 msgid "_Unmount"
 msgstr "卸載(_U)"
 
-#: ../src/camera/ImportPage.vala:1023
+#: ../src/camera/ImportPage.vala:1025
 msgid "Please unmount the camera."
 msgstr "請卸載該相機。"
 
-#: ../src/camera/ImportPage.vala:1028
+#: ../src/camera/ImportPage.vala:1030
 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."
+"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 ""
-"相機已被另一個應用程式鎖住。Shotwell 只能在相機沒被鎖住的情況下存取它。請關閉"
-"任何其它正在使用該相機的應用程式並重試。"
+"相機已被另一個應用程式鎖住。Shotwell 只能在相機沒被鎖住的情況下存取它。請關閉任何"
+"其它正在使用該相機的應用程式並重試。"
 
-#: ../src/camera/ImportPage.vala:1038
+#: ../src/camera/ImportPage.vala:1040
 msgid "Please close any other application using the camera."
 msgstr "請關閉任何其它正在使用相機的應用程式。"
 
-#: ../src/camera/ImportPage.vala:1043
+#: ../src/camera/ImportPage.vala:1045
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -3617,53 +3660,53 @@ msgstr ""
 "無法從相機擷取預覽：\n"
 "%s"
 
-#: ../src/camera/ImportPage.vala:1060
+#: ../src/camera/ImportPage.vala:1062
 msgid "Unmounting..."
 msgstr "正在卸載..."
 
-#: ../src/camera/ImportPage.vala:1166
+#: ../src/camera/ImportPage.vala:1168
 msgid "Fetching photo information"
 msgstr "正在擷取相片資訊"
 
-#: ../src/camera/ImportPage.vala:1521
+#: ../src/camera/ImportPage.vala:1523
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "正在為 %s 擷取預覽"
 
-#: ../src/camera/ImportPage.vala:1637
+#: ../src/camera/ImportPage.vala:1639
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "無法鎖住相機：%s"
 
-#: ../src/camera/ImportPage.vala:1722
+#: ../src/camera/ImportPage.vala:1724
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "要從相機刪除這 %d 張相片嗎？"
 
-#: ../src/camera/ImportPage.vala:1725
+#: ../src/camera/ImportPage.vala:1727
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] "要從相機刪除這 %d 份視訊嗎？"
 
-#: ../src/camera/ImportPage.vala:1728
+#: ../src/camera/ImportPage.vala:1730
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "要從相機刪除這 %d 份相片/視訊嗎？"
 
-#: ../src/camera/ImportPage.vala:1731
+#: ../src/camera/ImportPage.vala:1733
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] "要從相機刪除這 %d 份檔案嗎？"
 
-#: ../src/camera/ImportPage.vala:1758
+#: ../src/camera/ImportPage.vala:1760
 msgid "Removing photos/videos from camera"
 msgstr "正在從相機移除相片/視訊"
 
-#: ../src/camera/ImportPage.vala:1762
+#: ../src/camera/ImportPage.vala:1764
 #, 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."
@@ -3694,34 +3737,29 @@ msgstr "若要從其他服務匯入，請從上方選單選取其中一項。"
 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."
+"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 ""
 "您尚未啟用任何資料匯入插件。\n"
 "\n"
-"為了使用「從應用程式匯入」的功能，您至少需要啟用一項資料匯入插件。插件可以透"
-"過「偏好設定」對話盒中啟用。"
+"為了使用「從應用程式匯入」的功能，您至少需要啟用一項資料匯入插件。插件可以透過「偏"
+"好設定」對話盒中啟用。"
 
 #: ../src/data_imports/DataImportsUI.vala:100
 msgid "Database file:"
 msgstr "資料庫檔案："
 
-#: ../src/data_imports/DataImportsUI.vala:112
-#: ../src/library/LibraryWindow.vala:899
+#: ../src/data_imports/DataImportsUI.vala:112 ../src/library/LibraryWindow.vala:883
 msgid "_Import"
 msgstr "匯入(_I)"
 
-#: ../src/data_imports/DataImportsUI.vala:216
+#: ../src/data_imports/DataImportsUI.vala:217
 msgid "Import From Application"
 msgstr "從應用程式匯入"
 
-#: ../src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "從何處匯入媒體(_F)："
-
-#: ../src/data_imports/DataImportsUI.vala:394
-#: ../src/publishing/PublishingUI.vala:493
+#: ../src/data_imports/DataImportsUI.vala:369
+#: ../src/publishing/PublishingUI.vala:470
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -3754,15 +3792,10 @@ msgstr ""
 "錯誤為：\n"
 "%s"
 
-#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:352
+#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:336
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../src/direct/DirectPhotoPage.vala:51
-#: ../src/direct/DirectPhotoPage.vala:417
-msgid "_Save"
-msgstr "儲存(_S)"
-
 #: ../src/direct/DirectPhotoPage.vala:52
 msgid "Save photo"
 msgstr "儲存相片"
@@ -3779,19 +3812,10 @@ msgstr "以不同名稱儲存相片"
 msgid "Print the photo to a printer connected to your computer"
 msgstr "將該相片以連結至您電腦的印表機列印"
 
-#: ../src/direct/DirectPhotoPage.vala:73 ../src/library/LibraryWindow.vala:356
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:364
+#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:348
 msgid "_Photo"
 msgstr "相片(_P)"
 
-#: ../src/direct/DirectPhotoPage.vala:169
-#: ../src/library/LibraryWindow.vala:380
-msgid "_Help"
-msgstr "幫助(_H)"
-
 #: ../src/direct/DirectPhotoPage.vala:227
 #, c-format
 msgid "%s does not exist."
@@ -3811,26 +3835,25 @@ msgstr ""
 "%s 不支援檔案格式\n"
 "%s。"
 
-#: ../src/direct/DirectPhotoPage.vala:417
+#: ../src/direct/DirectPhotoPage.vala:422
 msgid "_Save a Copy"
 msgstr "儲存複本(_S)"
 
-#: ../src/direct/DirectPhotoPage.vala:420
+#: ../src/direct/DirectPhotoPage.vala:425
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "放棄對 %s 所作出的變更？"
 
-#: ../src/direct/DirectPhotoPage.vala:421
+#: ../src/direct/DirectPhotoPage.vala:426
 msgid "Close _without Saving"
 msgstr "關閉而不儲存(_W)"
 
-#: ../src/direct/DirectPhotoPage.vala:454
+#: ../src/direct/DirectPhotoPage.vala:459
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "當儲存至 %s 時發生錯誤：%s"
 
-#: ../src/direct/DirectPhotoPage.vala:482
-#: ../src/direct/DirectPhotoPage.vala:503
+#: ../src/direct/DirectPhotoPage.vala:487 ../src/direct/DirectPhotoPage.vala:508
 msgid "Save As"
 msgstr "另存新檔"
 
@@ -3962,6 +3985,10 @@ msgstr "對比擴展"
 msgid "Angle:"
 msgstr "角度："
 
+#: ../src/events/Branch.vala:25
+msgid "Events"
+msgstr "事件"
+
 #: ../src/events/EventDirectoryItem.vala:83
 #, c-format
 msgid "%d Photo/Video"
@@ -3985,8 +4012,8 @@ msgid "No events found"
 msgstr "找不到事件"
 
 #: ../src/events/EventsDirectoryPage.vala:230
-msgid "Events"
-msgstr "事件"
+msgid "All Events"
+msgstr "所有事件"
 
 #: ../src/events/EventsDirectoryPage.vala:244
 msgid "Undated"
@@ -3994,17 +4021,18 @@ msgstr "未限定日期"
 
 #: ../src/events/EventsDirectoryPage.vala:245
 msgid "%Y"
-msgstr "%Y"
+msgstr "%Y年"
 
 #: ../src/events/EventsDirectoryPage.vala:246
 msgid "%B"
-msgstr "%B"
+msgstr "%b"
 
 #: ../src/folders/Branch.vala:141
 msgid "Folders"
 msgstr "資料夾"
 
-#: ../src/library/Branch.vala:37 ../ui/shotwell.glade.h:33
+#: ../src/library/Branch.vala:30 ../src/library/Branch.vala:130
+#: ../ui/shotwell.glade.h:32
 msgid "Library"
 msgstr "珍藏館"
 
@@ -4012,19 +4040,19 @@ msgstr "珍藏館"
 msgid "Importing..."
 msgstr "正在匯入..."
 
-#: ../src/library/ImportQueuePage.vala:66
+#: ../src/library/ImportQueuePage.vala:67
 msgid "_Stop Import"
 msgstr "停止匯入(_S)"
 
-#: ../src/library/ImportQueuePage.vala:67
+#: ../src/library/ImportQueuePage.vala:68
 msgid "Stop importing photos"
 msgstr "停止匯入相片"
 
-#: ../src/library/ImportQueuePage.vala:123
+#: ../src/library/ImportQueuePage.vala:124
 msgid "Preparing to import..."
 msgstr "正在準備匯入..."
 
-#: ../src/library/ImportQueuePage.vala:150
+#: ../src/library/ImportQueuePage.vala:151
 #, c-format
 msgid "Imported %s"
 msgstr "已匯入 %s"
@@ -4033,139 +4061,137 @@ msgstr "已匯入 %s"
 msgid "Last Import"
 msgstr "上次匯入"
 
-#: ../src/library/LibraryWindow.vala:301
+#: ../src/library/LibraryWindow.vala:286
 msgid "_Import From Folder..."
 msgstr "從資料夾匯入(_I)..."
 
-#: ../src/library/LibraryWindow.vala:302
+#: ../src/library/LibraryWindow.vala:287
 msgid "Import photos from disk to library"
 msgstr "從磁碟匯入相片至珍藏館"
 
-#: ../src/library/LibraryWindow.vala:309
+#: ../src/library/LibraryWindow.vala:294
 msgid "Import From _Application..."
 msgstr "從應用程式匯入(_A)..."
 
-#: ../src/library/LibraryWindow.vala:313
+#: ../src/library/LibraryWindow.vala:298
 msgid "Sort _Events"
 msgstr "排序事件(_E)"
 
-#: ../src/library/LibraryWindow.vala:323
+#: ../src/library/LibraryWindow.vala:308
 msgid "Empty T_rash"
 msgstr "清空回收筒(_R)"
 
-#: ../src/library/LibraryWindow.vala:324
+#: ../src/library/LibraryWindow.vala:309
 msgid "Delete all photos in the trash"
 msgstr "刪除回收筒中的所有相片"
 
-#: ../src/library/LibraryWindow.vala:329
+#: ../src/library/LibraryWindow.vala:314
 msgid "View Eve_nt for Photo"
 msgstr "檢視相片的事件(_N)"
 
-#: ../src/library/LibraryWindow.vala:334
+#: ../src/library/LibraryWindow.vala:318
 msgid "_Find"
 msgstr "尋找(_F)"
 
-#: ../src/library/LibraryWindow.vala:335
+#: ../src/library/LibraryWindow.vala:319
 msgid "Find photos and videos by search criteria"
 msgstr "根據搜尋準則尋找相片與視訊"
 
-#: ../src/library/LibraryWindow.vala:346 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:195
+#: ../src/library/LibraryWindow.vala:330 ../src/searches/Branch.vala:77
+#: ../src/sidebar/Tree.vala:199
 msgid "Ne_w Saved Search..."
 msgstr "新的儲存搜尋(_W)..."
 
-#: ../src/library/LibraryWindow.vala:368
+#: ../src/library/LibraryWindow.vala:352
 msgid "_Photos"
 msgstr "相片(_P)"
 
-#: ../src/library/LibraryWindow.vala:372
+#: ../src/library/LibraryWindow.vala:356
 msgid "Even_ts"
 msgstr "事件(_T)"
 
-#: ../src/library/LibraryWindow.vala:391
+#: ../src/library/LibraryWindow.vala:375
 msgid "_Basic Information"
 msgstr "基本資訊(_B)"
 
-#: ../src/library/LibraryWindow.vala:392
+#: ../src/library/LibraryWindow.vala:376
 msgid "Display basic information for the selection"
 msgstr "顯示選取項目的基礎資訊"
 
-#: ../src/library/LibraryWindow.vala:397
+#: ../src/library/LibraryWindow.vala:381
 msgid "E_xtended Information"
 msgstr "擴充資訊(_X)"
 
-#: ../src/library/LibraryWindow.vala:398
+#: ../src/library/LibraryWindow.vala:382
 msgid "Display extended information for the selection"
 msgstr "顯示選取項目的擴充資訊"
 
-#: ../src/library/LibraryWindow.vala:403
+#: ../src/library/LibraryWindow.vala:387
 msgid "_Search Bar"
 msgstr "搜尋列(_S)"
 
-#: ../src/library/LibraryWindow.vala:404
+#: ../src/library/LibraryWindow.vala:388
 msgid "Display the search bar"
 msgstr "顯示搜尋列"
 
-#: ../src/library/LibraryWindow.vala:409
+#: ../src/library/LibraryWindow.vala:393
 msgid "S_idebar"
 msgstr "側邊欄(_I)"
 
-#: ../src/library/LibraryWindow.vala:410
+#: ../src/library/LibraryWindow.vala:394
 msgid "Display the sidebar"
 msgstr "顯示側邊欄"
 
-#: ../src/library/LibraryWindow.vala:668
+#: ../src/library/LibraryWindow.vala:652
 msgid "Import From Folder"
 msgstr "從資料夾匯入"
 
-#: ../src/library/LibraryWindow.vala:737
+#: ../src/library/LibraryWindow.vala:721
 msgid "Empty Trash"
 msgstr "清空回收筒"
 
-#: ../src/library/LibraryWindow.vala:737
+#: ../src/library/LibraryWindow.vala:721
 msgid "Emptying Trash..."
 msgstr "正在清空回收筒..."
 
-#: ../src/library/LibraryWindow.vala:896
+#: ../src/library/LibraryWindow.vala:880
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
-"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
-"span>.\n"
+"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</span>.\n"
 "Do you want to continue importing photos?"
 msgstr ""
 "Shotwell 已設置為將相片匯入您的家屋目錄中。\n"
 "我們建議您在 <span weight=\"bold\">編輯 %s 偏好設定</span> 中更改此設定。\n"
 "您是否想要繼續匯入相片？"
 
-#: ../src/library/LibraryWindow.vala:899 ../ui/shotwell.glade.h:19
+#: ../src/library/LibraryWindow.vala:883 ../ui/shotwell.glade.h:18
 msgid "Library Location"
 msgstr "珍藏館位置"
 
 #. TODO: Specify which directory/file.
-#: ../src/library/LibraryWindow.vala:912
+#: ../src/library/LibraryWindow.vala:896
 msgid "Photos cannot be imported from this directory."
 msgstr "相片無法從此目錄匯入。"
 
-#: ../src/library/LibraryWindow.vala:1200
+#: ../src/library/LibraryWindow.vala:1184
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: ../src/library/LibraryWindow.vala:1244
-#: ../src/library/LibraryWindow.vala:1255
+#: ../src/library/LibraryWindow.vala:1228 ../src/library/LibraryWindow.vala:1239
 msgid "Updating library..."
 msgstr "正在更新珍藏館..."
 
-#: ../src/library/LibraryWindow.vala:1261
+#: ../src/library/LibraryWindow.vala:1245
 msgid "Preparing to auto-import photos..."
 msgstr "正在準備自動匯入相片..."
 
-#: ../src/library/LibraryWindow.vala:1266
+#: ../src/library/LibraryWindow.vala:1250
 msgid "Auto-importing photos..."
 msgstr "正在自動匯入相片..."
 
-#: ../src/library/LibraryWindow.vala:1274
+#: ../src/library/LibraryWindow.vala:1258
 msgid "Writing metadata to files..."
 msgstr "正在寫入中介資料至檔案中..."
 
@@ -4196,34 +4222,32 @@ msgstr "正在刪除相片"
 #: ../src/main.vala:54
 #, 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."
+"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 ""
-"您的相片珍藏館與此版本的 Shotwell 不相容。該珍藏館似乎是由 Shotwell %s "
-"(schema %d) 所建立。此版本為 %s (schema %d)。請使用最新版的 Shotwell。"
+"您的相片珍藏館與此版本的 Shotwell 不相容。該珍藏館似乎是由 Shotwell %s (schema "
+"%d) 所建立。此版本為 %s (schema %d)。請使用最新版的 Shotwell。"
 
 #: ../src/main.vala:59
 #, 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"
+"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 ""
-"Shotwell 無法將您的珍藏館從版本 %s (schema %d)升級至 %s (schema %d)。若要瞭解"
-"更多資訊，請查看位於 %s 的 Shotwell Wiki"
+"Shotwell 無法將您的珍藏館從版本 %s (schema %d)升級至 %s (schema %d)。若要瞭解更多"
+"資訊，請查看位於 %s 的 Shotwell Wiki"
 
 #: ../src/main.vala:65
 #, 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."
+"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 ""
-"您的珍藏館與此版本的 Shotwell 不相容。該珍藏館似乎是由 Shotwell %s (schema "
-"%d) 所建立的。此版本為 %s (schema %d)。請刪除 %s 來清除您的珍藏館，並且重新匯"
-"入您的相片。"
+"您的珍藏館與此版本的 Shotwell 不相容。該珍藏館似乎是由 Shotwell %s (schema %d) 所"
+"建立的。此版本為 %s (schema %d)。請刪除 %s 來清除您的珍藏館，並且重新匯入您的相"
+"片。"
 
 #: ../src/main.vala:71
 #, c-format
@@ -4272,22 +4296,22 @@ msgstr "BMP"
 msgid "JPEG"
 msgstr "JPEG"
 
-#: ../src/photos/JfifSupport.vala:182
+#: ../src/photos/JfifSupport.vala:185
 #, c-format
 msgid "Low (%d%%)"
 msgstr "低 (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:185
+#: ../src/photos/JfifSupport.vala:188
 #, c-format
 msgid "Medium (%d%%)"
 msgstr "中 (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:188
+#: ../src/photos/JfifSupport.vala:191
 #, c-format
 msgid "High (%d%%)"
 msgstr "高 (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:191
+#: ../src/photos/JfifSupport.vala:194
 #, c-format
 msgid "Maximum (%d%%)"
 msgstr "最佳 (%d%%)"
@@ -4354,169 +4378,184 @@ msgstr "正在擷取帳號資訊..."
 msgid "Logging in..."
 msgstr "正在登入..."
 
-#: ../src/publishing/PublishingUI.vala:183
+#: ../src/publishing/PublishingUI.vala:185
 msgid "Publish Photos"
 msgstr "發布相片"
 
-#: ../src/publishing/PublishingUI.vala:184
+#: ../src/publishing/PublishingUI.vala:186
 msgid "Publish photos _to:"
 msgstr "將相片發布至(_T)："
 
-#: ../src/publishing/PublishingUI.vala:186
+#: ../src/publishing/PublishingUI.vala:188
 msgid "Publish Videos"
 msgstr "發布視訊"
 
-#: ../src/publishing/PublishingUI.vala:187
+#: ../src/publishing/PublishingUI.vala:189
 msgid "Publish videos _to"
 msgstr "將視訊發布至(_T)"
 
-#: ../src/publishing/PublishingUI.vala:189
+#: ../src/publishing/PublishingUI.vala:191
 msgid "Publish Photos and Videos"
 msgstr "發布相片與視訊"
 
-#: ../src/publishing/PublishingUI.vala:190
+#: ../src/publishing/PublishingUI.vala:192
 msgid "Publish photos and videos _to"
 msgstr "將相片與視訊發布至(_T)"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: ../src/publishing/PublishingUI.vala:383
+#: ../src/publishing/PublishingUI.vala:360
 msgid "Unable to publish"
 msgstr "無法發布"
 
-#: ../src/publishing/PublishingUI.vala:384
+#: ../src/publishing/PublishingUI.vala:361
 #, 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."
+"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 ""
-"Shotwell 無法發布所選的項目，因為您尚未啟用相容的發布插件。若要修正此問題，請"
-"選擇 <b>編輯 %s 偏好設定</b> 並在 <b>插件</b> 分頁啟用一項或多項發布用插件。"
+"Shotwell 無法發布所選的項目，因為您尚未啟用相容的發布插件。若要修正此問題，請選擇 "
+"<b>編輯 %s 偏好設定</b> 並在 <b>插件</b> 分頁啟用一項或多項發布用插件。"
 
 #: ../src/searches/Branch.vala:68
 msgid "Saved Searches"
 msgstr "儲存的搜尋"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:168
 msgid "contains"
 msgstr "包含"
 
 #. Ordering must correspond with Context
-#: ../src/searches/SavedSearchDialog.vala:170
-#: ../src/searches/SavedSearchDialog.vala:497
+#: ../src/searches/SavedSearchDialog.vala:169
+#: ../src/searches/SavedSearchDialog.vala:500
 msgid "is exactly"
 msgstr "完全是"
 
-#: ../src/searches/SavedSearchDialog.vala:171
+#: ../src/searches/SavedSearchDialog.vala:170
 msgid "starts with"
 msgstr "開頭為"
 
-#: ../src/searches/SavedSearchDialog.vala:172
+#: ../src/searches/SavedSearchDialog.vala:171
 msgid "ends with"
 msgstr "結尾為"
 
-#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:172
 msgid "does not contain"
 msgstr "不包含"
 
-#: ../src/searches/SavedSearchDialog.vala:174
-#: ../src/searches/SavedSearchDialog.vala:501
+#: ../src/searches/SavedSearchDialog.vala:173
+#: ../src/searches/SavedSearchDialog.vala:504
 msgid "is not set"
 msgstr "未設定"
 
+#: ../src/searches/SavedSearchDialog.vala:174
+msgid "is set"
+msgstr "有設定"
+
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: ../src/searches/SavedSearchDialog.vala:245
-#: ../src/searches/SavedSearchDialog.vala:376
-#: ../src/searches/SavedSearchDialog.vala:441
+#: ../src/searches/SavedSearchDialog.vala:248
+#: ../src/searches/SavedSearchDialog.vala:379
+#: ../src/searches/SavedSearchDialog.vala:444
 msgid "is"
 msgstr "是"
 
-#: ../src/searches/SavedSearchDialog.vala:246
+#: ../src/searches/SavedSearchDialog.vala:249
 msgid "is not"
 msgstr "不是"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:252
+#: ../src/searches/SavedSearchDialog.vala:255
 msgid "any photo"
 msgstr "任意相片"
 
-#: ../src/searches/SavedSearchDialog.vala:253
+#: ../src/searches/SavedSearchDialog.vala:256
 msgid "a raw photo"
 msgstr "RAW 相片"
 
-#: ../src/searches/SavedSearchDialog.vala:254
+#: ../src/searches/SavedSearchDialog.vala:257
 msgid "a video"
 msgstr "視訊"
 
-#: ../src/searches/SavedSearchDialog.vala:308
+#: ../src/searches/SavedSearchDialog.vala:311
 msgid "has"
 msgstr "有"
 
-#: ../src/searches/SavedSearchDialog.vala:309
+#: ../src/searches/SavedSearchDialog.vala:312
 msgid "has no"
 msgstr "沒有"
 
-#: ../src/searches/SavedSearchDialog.vala:314
+#: ../src/searches/SavedSearchDialog.vala:317
 msgid "modifications"
 msgstr "修改"
 
-#: ../src/searches/SavedSearchDialog.vala:315
+#: ../src/searches/SavedSearchDialog.vala:318
 msgid "internal modifications"
 msgstr "內部修改"
 
-#: ../src/searches/SavedSearchDialog.vala:316
+#: ../src/searches/SavedSearchDialog.vala:319
 msgid "external modifications"
 msgstr "外部修改"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:370
+#: ../src/searches/SavedSearchDialog.vala:373
 msgid "flagged"
 msgstr "已加上旗幟"
 
-#: ../src/searches/SavedSearchDialog.vala:371
+#: ../src/searches/SavedSearchDialog.vala:374
 msgid "not flagged"
 msgstr "未加上旗幟"
 
-#: ../src/searches/SavedSearchDialog.vala:434
+#: ../src/searches/SavedSearchDialog.vala:437
 msgid "and higher"
 msgstr "與更高"
 
-#: ../src/searches/SavedSearchDialog.vala:435
+#: ../src/searches/SavedSearchDialog.vala:438
 msgid "only"
 msgstr "只有"
 
-#: ../src/searches/SavedSearchDialog.vala:436
+#: ../src/searches/SavedSearchDialog.vala:439
 msgid "and lower"
 msgstr "與更低"
 
-#: ../src/searches/SavedSearchDialog.vala:498
+#: ../src/searches/SavedSearchDialog.vala:501
 msgid "is after"
 msgstr "晚於"
 
-#: ../src/searches/SavedSearchDialog.vala:499
+#: ../src/searches/SavedSearchDialog.vala:502
 msgid "is before"
 msgstr "早於"
 
-#: ../src/searches/SavedSearchDialog.vala:500
+#: ../src/searches/SavedSearchDialog.vala:503
 msgid "is between"
 msgstr "介於"
 
-#: ../src/searches/SavedSearchDialog.vala:513
+#: ../src/searches/SavedSearchDialog.vala:516
 msgid "and"
 msgstr "與"
 
-#: ../src/searches/SavedSearchDialog.vala:720
+#: ../src/searches/SavedSearchDialog.vala:697
+msgid "Search"
+msgstr "搜尋"
+
+#: ../src/searches/SavedSearchDialog.vala:702
+msgid "Cancel"
+msgstr "取消"
+
+#: ../src/searches/SavedSearchDialog.vala:703
+msgid "OK"
+msgstr "確定"
+
+#: ../src/searches/SavedSearchDialog.vala:721
 msgid "any"
 msgstr "任何"
 
-#: ../src/searches/SavedSearchDialog.vala:721
+#: ../src/searches/SavedSearchDialog.vala:722
 msgid "all"
 msgstr "全部"
 
-#: ../src/searches/SavedSearchDialog.vala:722
+#: ../src/searches/SavedSearchDialog.vala:723
 msgid "none"
 msgstr "無"
 
@@ -4560,7 +4599,7 @@ msgstr "相片狀態"
 msgid "Date"
 msgstr "日期"
 
-#: ../src/sidebar/Tree.vala:199
+#: ../src/sidebar/Tree.vala:203
 msgid "New _Tag..."
 msgstr "新增標籤(_T)..."
 
@@ -4580,12 +4619,11 @@ msgstr "無"
 msgid "Random"
 msgstr "隨機"
 
-#: ../src/tags/Branch.vala:127
+#: ../src/tags/Branch.vala:131
 msgid "Tags"
 msgstr "標籤"
 
 #: ../ui/set_background_dialog.glade.h:1
-#| msgid "Set as _Desktop Background"
 msgid "Set as Desktop Background"
 msgstr "設為桌面背景"
 
@@ -4620,161 +4658,166 @@ msgid "How long each photo is shown on the desktop background"
 msgstr "每張相片要顯示為桌面背景多久"
 
 #: ../ui/shotwell.glade.h:1
-msgid "Search"
-msgstr "搜尋"
-
-#: ../ui/shotwell.glade.h:2
 msgid "_Name of search:"
 msgstr "搜尋的名稱(_N)："
 
-#: ../ui/shotwell.glade.h:3
+#: ../ui/shotwell.glade.h:2
 msgid "_Match"
 msgstr "比對(_M)"
 
-#: ../ui/shotwell.glade.h:4
+#: ../ui/shotwell.glade.h:3
 msgid "of the following:"
 msgstr "的下列條件："
 
-#: ../ui/shotwell.glade.h:5
+#: ../ui/shotwell.glade.h:4
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>列印的影像大小</b>"
 
-#: ../ui/shotwell.glade.h:6
+#: ../ui/shotwell.glade.h:5
 msgid "Use a _standard size:"
 msgstr "使用標準大小(_S)："
 
-#: ../ui/shotwell.glade.h:7
+#: ../ui/shotwell.glade.h:6
 msgid "Use a c_ustom size:"
 msgstr "使用自訂大小(_C)："
 
-#: ../ui/shotwell.glade.h:8
+#: ../ui/shotwell.glade.h:7
 msgid "_Match photo aspect ratio"
 msgstr "符合相片寬高比(_M)"
 
-#: ../ui/shotwell.glade.h:9
+#: ../ui/shotwell.glade.h:8
 msgid "_Autosize:"
 msgstr "自動大小(_A)："
 
-#: ../ui/shotwell.glade.h:10
+#: ../ui/shotwell.glade.h:9
 msgid "<b>Titles</b>"
 msgstr "<b>標題</b>"
 
-#: ../ui/shotwell.glade.h:11
+#: ../ui/shotwell.glade.h:10
 msgid "Print image _title"
 msgstr "列印影像標題(_T)"
 
-#: ../ui/shotwell.glade.h:12
+#: ../ui/shotwell.glade.h:11
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>畫素解析度</b>"
 
-#: ../ui/shotwell.glade.h:13
+#: ../ui/shotwell.glade.h:12
 msgid "_Output photo at:"
 msgstr "輸出相片於(_O)："
 
-#: ../ui/shotwell.glade.h:14
+#: ../ui/shotwell.glade.h:13
 msgid "pixels per inch"
 msgstr "每英吋畫素"
 
-#: ../ui/shotwell.glade.h:16
+#: ../ui/shotwell.glade.h:15
 msgid "Shotwell Preferences"
 msgstr "Shotwell 偏好設定"
 
-#: ../ui/shotwell.glade.h:17
+#: ../ui/shotwell.glade.h:16
 msgid "white"
 msgstr "白"
 
-#: ../ui/shotwell.glade.h:18
+#: ../ui/shotwell.glade.h:17
 msgid "black"
 msgstr "黑"
 
-#: ../ui/shotwell.glade.h:20
+#: ../ui/shotwell.glade.h:19
 msgid "_Watch library directory for new files"
 msgstr "監視珍藏館目錄是否有新檔案(_W)"
 
-#: ../ui/shotwell.glade.h:21
+#: ../ui/shotwell.glade.h:20
 msgid "Metadata"
 msgstr "中介資料"
 
-#: ../ui/shotwell.glade.h:22
+#: ../ui/shotwell.glade.h:21
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "寫入標籤、標題與其它中介資料至相片檔案(_M)"
 
-#: ../ui/shotwell.glade.h:23
+#: ../ui/shotwell.glade.h:22
 msgid "Display"
 msgstr "顯示"
 
-#: ../ui/shotwell.glade.h:24
+#: ../ui/shotwell.glade.h:23
 msgid "_Import photos to:"
 msgstr "匯入相片至(_I)："
 
-#: ../ui/shotwell.glade.h:25
+#: ../ui/shotwell.glade.h:24
 msgid "_Background:"
 msgstr "背景(_B)："
 
-#: ../ui/shotwell.glade.h:26
+#: ../ui/shotwell.glade.h:25
 msgid "Importing"
 msgstr "匯入"
 
-#: ../ui/shotwell.glade.h:27
+#: ../ui/shotwell.glade.h:26
 msgid "_Directory structure:"
 msgstr "目錄結構(_D)："
 
-#: ../ui/shotwell.glade.h:28
+#: ../ui/shotwell.glade.h:27
 msgid "_Pattern:"
 msgstr "樣式(_P)："
 
-#: ../ui/shotwell.glade.h:29
+#: ../ui/shotwell.glade.h:28
 msgid "Example:"
 msgstr "範例："
 
-#: ../ui/shotwell.glade.h:30
+#: ../ui/shotwell.glade.h:29
 msgid "R_ename imported files to lowercase"
 msgstr "將匯入的檔案重新命名為小寫(_E)"
 
-#: ../ui/shotwell.glade.h:31
+#: ../ui/shotwell.glade.h:30
 msgid "RAW Developer"
 msgstr "RAW 顯影器"
 
-#: ../ui/shotwell.glade.h:32
+#: ../ui/shotwell.glade.h:31
 msgid "De_fault:"
 msgstr "預設(_F)："
 
-#: ../ui/shotwell.glade.h:34
+#: ../ui/shotwell.glade.h:33
 msgid "E_xternal photo editor:"
 msgstr "外部編輯器(_X)："
 
-#: ../ui/shotwell.glade.h:35
+#: ../ui/shotwell.glade.h:34
 msgid "External _RAW editor:"
 msgstr "外部 _RAW 編輯器："
 
-#: ../ui/shotwell.glade.h:36
+#: ../ui/shotwell.glade.h:35
 msgid "External Editors"
 msgstr "外部編輯器"
 
-#: ../ui/shotwell.glade.h:37
+#: ../ui/shotwell.glade.h:36
 msgid "Plugins"
 msgstr "插件"
 
-#: ../ui/shotwell.glade.h:38
+#: ../ui/shotwell.glade.h:37
 msgid "_Delay:"
 msgstr "延遲(_D)："
 
-#: ../ui/shotwell.glade.h:39
+#: ../ui/shotwell.glade.h:38
 msgid "_Transition effect:"
 msgstr "轉場效果(_T)："
 
-#: ../ui/shotwell.glade.h:40
+#: ../ui/shotwell.glade.h:39
 msgid "Transition d_elay:"
 msgstr "轉場延遲(_D)："
 
-#: ../ui/shotwell.glade.h:41
+#: ../ui/shotwell.glade.h:40
 msgid "Show t_itle"
 msgstr "顯示標題(_I)"
 
-#: ../ui/shotwell.glade.h:42
+#: ../ui/shotwell.glade.h:41
 msgid "seconds"
 msgstr "秒"
 
+#~| msgid ""
+#~| "A file required for publishing is unavailable. Publishing to Flickr can't "
+#~| "continue."
+#~ msgid "A file required for publishing is unavailable. Publishing to "
+#~ msgstr "發布所需的某個檔案無法使用。發布至 "
+
+#~ msgid "Import media _from:"
+#~ msgstr "從何處匯入媒體(_F)："
+
 #~ msgid ""
 #~ "You are logged into Tumblr as (name).\n"
 #~ "\n"
diff --git a/settings-migrator/shotwell-settings-migrator b/settings-migrator/shotwell-settings-migrator
index 9bb40eb..dcbe2c5 100644
--- a/settings-migrator/shotwell-settings-migrator
+++ b/settings-migrator/shotwell-settings-migrator
@@ -2,7 +2,7 @@
 
 ################################################################################
 #
-# Copyright 2012-2014 Yorba Foundation
+# Copyright 2012-2015 Yorba Foundation
 #
 # This software is licensed under the GNU LGPL (version 2.1 or later).
 # See the COPYING file in this distribution.
diff --git a/src/AppDirs.vala b/src/AppDirs.vala
index 6bf6759..1421314 100644
--- a/src/AppDirs.vala
+++ b/src/AppDirs.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index 5a8e9c4..d294114 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -10,8 +10,8 @@ public class FullscreenWindow : PageWindow {
     public const int TOOLBAR_CHECK_DISMISSAL_MSEC = 500;
     
     private Gtk.Window toolbar_window = new Gtk.Window(Gtk.WindowType.POPUP);
-    private Gtk.ToolButton close_button = new Gtk.ToolButton.from_stock(Gtk.Stock.LEAVE_FULLSCREEN);
-    private Gtk.ToggleToolButton pin_button = new Gtk.ToggleToolButton.from_stock(Resources.PIN_TOOLBAR);
+    private Gtk.ToolButton close_button = new Gtk.ToolButton(null, null);
+    private Gtk.ToggleToolButton pin_button = new Gtk.ToggleToolButton();
     private bool is_toolbar_shown = false;
     private bool waiting_for_invoke = false;
     private time_t left_toolbar_time = 0;
@@ -49,11 +49,13 @@ public class FullscreenWindow : PageWindow {
         // restore pin state
         is_toolbar_dismissal_enabled = Config.Facade.get_instance().get_pin_toolbar_state();
         
+        pin_button.set_icon_name("pin-toolbar");
         pin_button.set_label(_("Pin Toolbar"));
         pin_button.set_tooltip_text(_("Pin the toolbar open"));
         pin_button.set_active(!is_toolbar_dismissal_enabled);
         pin_button.clicked.connect(update_toolbar_dismissal);
         
+        close_button.set_icon_name("view-restore");
         close_button.set_tooltip_text(_("Leave fullscreen"));
         close_button.clicked.connect(on_close);
         
@@ -129,10 +131,10 @@ public class FullscreenWindow : PageWindow {
     private Gtk.ActionEntry[] create_actions() {
         Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
         
-        Gtk.ActionEntry leave_fullscreen = { "LeaveFullscreen", Gtk.Stock.LEAVE_FULLSCREEN,
+        Gtk.ActionEntry leave_fullscreen = { "LeaveFullscreen", Resources.LEAVE_FULLSCREEN_LABEL,
             TRANSLATABLE, "F11", TRANSLATABLE, on_close };
-        leave_fullscreen.label = _("Leave _Fullscreen");
-        leave_fullscreen.tooltip = _("Leave fullscreen");
+        leave_fullscreen.label = Resources.LEAVE_FULLSCREEN_LABEL;
+        leave_fullscreen.tooltip = Resources.LEAVE_FULLSCREEN_LABEL;
         actions += leave_fullscreen;
 
         return actions;
@@ -490,27 +492,35 @@ public abstract class AppWindow : PageWindow {
         
         ui.ensure_update();
         add_accel_group(ui.get_accel_group());
+        
+        Gtk.CssProvider provider = new Gtk.CssProvider();
+        try {
+            provider.load_from_data(Resources.CUSTOM_CSS, -1);
+            Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        } catch (Error err) {
+            debug("Unable to load custom CSS: %s", err.message);
+        }
     }
     
     private Gtk.ActionEntry[] create_common_actions() {
         Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
         
-        Gtk.ActionEntry quit = { "CommonQuit", Gtk.Stock.QUIT, TRANSLATABLE, "<Ctrl>Q",
+        Gtk.ActionEntry quit = { "CommonQuit", Resources.QUIT_LABEL, TRANSLATABLE, "<Ctrl>Q",
             TRANSLATABLE, on_quit };
-        quit.label = _("_Quit");
+        quit.label = Resources.QUIT_LABEL;
         actions += quit;
 
-        Gtk.ActionEntry about = { "CommonAbout", Gtk.Stock.ABOUT, TRANSLATABLE, null,
+        Gtk.ActionEntry about = { "CommonAbout", Resources.ABOUT_LABEL, TRANSLATABLE, null,
             TRANSLATABLE, on_about };
-        about.label = _("_About");
+        about.label = Resources.ABOUT_LABEL;
         actions += about;
 
-        Gtk.ActionEntry fullscreen = { "CommonFullscreen", Gtk.Stock.FULLSCREEN,
+        Gtk.ActionEntry fullscreen = { "CommonFullscreen", Resources.FULLSCREEN_LABEL,
             TRANSLATABLE, "F11", TRANSLATABLE, on_fullscreen };
-        fullscreen.label = _("Fulls_creen");
+        fullscreen.label = Resources.FULLSCREEN_LABEL;
         actions += fullscreen;
 
-        Gtk.ActionEntry help_contents = { "CommonHelpContents", Gtk.Stock.HELP,
+        Gtk.ActionEntry help_contents = { "CommonHelpContents", Resources.HELP_LABEL,
             TRANSLATABLE, "F1", TRANSLATABLE, on_help_contents };
         help_contents.label = _("_Contents");
         actions += help_contents;
@@ -525,22 +535,22 @@ public abstract class AppWindow : PageWindow {
         help_report_problem.label = _("_Report a Problem...");
         actions += help_report_problem;
 
-        Gtk.ActionEntry undo = { "CommonUndo", Gtk.Stock.UNDO, TRANSLATABLE, "<Ctrl>Z",
+        Gtk.ActionEntry undo = { "CommonUndo", Resources.UNDO_MENU, TRANSLATABLE, "<Ctrl>Z",
             TRANSLATABLE, on_undo };
         undo.label = Resources.UNDO_MENU;
         actions += undo;
         
-        Gtk.ActionEntry redo = { "CommonRedo", Gtk.Stock.REDO, TRANSLATABLE, "<Ctrl><Shift>Z",
+        Gtk.ActionEntry redo = { "CommonRedo", Resources.REDO_MENU, TRANSLATABLE, "<Ctrl><Shift>Z",
             TRANSLATABLE, on_redo };
         redo.label = Resources.REDO_MENU;
         actions += redo;
 
-        Gtk.ActionEntry jump_to_file = { "CommonJumpToFile", Gtk.Stock.JUMP_TO, TRANSLATABLE, 
+        Gtk.ActionEntry jump_to_file = { "CommonJumpToFile", Resources.JUMP_TO_FILE_MENU, TRANSLATABLE, 
             "<Ctrl><Shift>M", TRANSLATABLE, on_jump_to_file };
         jump_to_file.label = Resources.JUMP_TO_FILE_MENU;
         actions += jump_to_file;
         
-        Gtk.ActionEntry select_all = { "CommonSelectAll", Gtk.Stock.SELECT_ALL, TRANSLATABLE,
+        Gtk.ActionEntry select_all = { "CommonSelectAll", Resources.SELECT_ALL_MENU, TRANSLATABLE,
             "<Ctrl>A", TRANSLATABLE, on_select_all };
         select_all.label = Resources.SELECT_ALL_MENU;
         actions += select_all;
diff --git a/src/Application.vala b/src/Application.vala
index 95163cf..fa81832 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/BatchImport.vala b/src/BatchImport.vala
index d4298ed..13feabe 100644
--- a/src/BatchImport.vala
+++ b/src/BatchImport.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/Box.vala b/src/Box.vala
index f48bcfb..253f0b6 100644
--- a/src/Box.vala
+++ b/src/Box.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/CheckerboardLayout.vala b/src/CheckerboardLayout.vala
index 6d0ce61..b71870c 100644
--- a/src/CheckerboardLayout.vala
+++ b/src/CheckerboardLayout.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/CollectionPage.vala b/src/CollectionPage.vala
index 22dcdee..95cbf01 100644
--- a/src/CollectionPage.vala
+++ b/src/CollectionPage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -142,7 +142,7 @@ public abstract class CollectionPage : MediaPage {
     protected override Gtk.ActionEntry[] init_collect_action_entries() {
         Gtk.ActionEntry[] actions = base.init_collect_action_entries();
 
-        Gtk.ActionEntry print = { "Print", Gtk.Stock.PRINT, TRANSLATABLE, "<Ctrl>P",
+        Gtk.ActionEntry print = { "Print", Resources.PRINT_LABEL, TRANSLATABLE, "<Ctrl>P",
             TRANSLATABLE, on_print };
         print.label = Resources.PRINT_MENU;
         actions += print;
@@ -193,7 +193,7 @@ public abstract class CollectionPage : MediaPage {
         paste_adjustments.tooltip = Resources.PASTE_ADJUSTMENTS_TOOLTIP;
         actions += paste_adjustments;
 
-        Gtk.ActionEntry revert = { "Revert", Gtk.Stock.REVERT_TO_SAVED, TRANSLATABLE, null,
+        Gtk.ActionEntry revert = { "Revert", null, TRANSLATABLE, null,
             TRANSLATABLE, on_revert };
         revert.label = Resources.REVERT_MENU;
         actions += revert;
@@ -215,7 +215,7 @@ public abstract class CollectionPage : MediaPage {
         adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
         actions += adjust_date_time;
         
-        Gtk.ActionEntry external_edit = { "ExternalEdit", Gtk.Stock.EDIT, TRANSLATABLE, "<Ctrl>Return",
+        Gtk.ActionEntry external_edit = { "ExternalEdit", Resources.EDIT_LABEL, TRANSLATABLE, "<Ctrl>Return",
             TRANSLATABLE, on_external_edit };
         external_edit.label = Resources.EXTERNAL_EDIT_MENU;
         actions += external_edit;
diff --git a/src/ColorTransformation.vala b/src/ColorTransformation.vala
index 74e4cf2..1e3e4a8 100644
--- a/src/ColorTransformation.vala
+++ b/src/ColorTransformation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/CommandManager.vala b/src/CommandManager.vala
index 070bc73..379b259 100644
--- a/src/CommandManager.vala
+++ b/src/CommandManager.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/Commands.vala b/src/Commands.vala
index 04b771c..d1a0593 100644
--- a/src/Commands.vala
+++ b/src/Commands.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/CustomComponents.vala b/src/CustomComponents.vala
index 4ace52c..d9e4916 100644
--- a/src/CustomComponents.vala
+++ b/src/CustomComponents.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/Debug.vala b/src/Debug.vala
index ad626f4..c8e8de5 100644
--- a/src/Debug.vala
+++ b/src/Debug.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/DesktopIntegration.vala b/src/DesktopIntegration.vala
index 9978803..1ee3c59 100644
--- a/src/DesktopIntegration.vala
+++ b/src/DesktopIntegration.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/Dialogs.vala b/src/Dialogs.vala
index 1f6a5ce..d760e73 100644
--- a/src/Dialogs.vala
+++ b/src/Dialogs.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -35,7 +35,7 @@ public bool confirm_warn_developer_changed(int number) {
         "<span weight=\"bold\" size=\"larger\">%s</span>".printf(ngettext("Switching developers will undo all changes you have made to this photo in Shotwell",
         "Switching developers will undo all changes you have made to these photos in Shotwell", number)));
 
-    dialog.add_buttons(Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
+    dialog.add_buttons(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL);
     dialog.add_buttons(_("_Switch Developer"), Gtk.ResponseType.YES);
     
     int response = dialog.run();
@@ -58,8 +58,8 @@ public File? choose_file(string current_file_basename) {
         _("Export Video") : _("Export Photo");
         
     Gtk.FileChooserDialog chooser = new Gtk.FileChooserDialog(file_chooser_title,
-        AppWindow.get_instance(), Gtk.FileChooserAction.SAVE, Gtk.Stock.CANCEL, 
-        Gtk.ResponseType.CANCEL, Gtk.Stock.SAVE, Gtk.ResponseType.ACCEPT, null);
+        AppWindow.get_instance(), Gtk.FileChooserAction.SAVE, Resources.CANCEL_LABEL, 
+        Gtk.ResponseType.CANCEL, Resources.SAVE_LABEL, Gtk.ResponseType.ACCEPT, null);
     chooser.set_do_overwrite_confirmation(true);
     chooser.set_current_folder(current_export_dir.get_path());
     chooser.set_current_name(current_file_basename);
@@ -87,8 +87,8 @@ public File? choose_dir(string? user_title = null) {
         user_title = _("Export Photos");
 
     Gtk.FileChooserDialog chooser = new Gtk.FileChooserDialog(user_title,
-        AppWindow.get_instance(), Gtk.FileChooserAction.SELECT_FOLDER, Gtk.Stock.CANCEL, 
-        Gtk.ResponseType.CANCEL, Gtk.Stock.OK, Gtk.ResponseType.ACCEPT, null);
+        AppWindow.get_instance(), Gtk.FileChooserAction.SELECT_FOLDER, Resources.CANCEL_LABEL, 
+        Gtk.ResponseType.CANCEL, Resources.OK_LABEL, Gtk.ResponseType.ACCEPT, null);
     chooser.set_current_folder(current_export_dir.get_path());
     chooser.set_local_only(false);
     
@@ -168,6 +168,8 @@ public class ExportDialog : Gtk.Dialog {
     private bool in_insert = false;
     
     public ExportDialog(string title) {
+        Object (use_header_bar: 1);
+        
         this.title = title;
         resizable = false;
 
@@ -198,7 +200,6 @@ public class ExportDialog : Gtk.Dialog {
 
         pixels_entry = new Gtk.Entry();
         pixels_entry.set_max_length(6);
-        pixels_entry.set_size_request(60, -1);
         pixels_entry.set_text("%d".printf(current_scale));
         
         // register after preparation to avoid signals during init
@@ -218,30 +219,23 @@ public class ExportDialog : Gtk.Dialog {
         add_label(_("_Scaling constraint:"), 0, 2, constraint_combo);
         add_control(constraint_combo, 1, 2);
 
-        Gtk.Label pixels_label = new Gtk.Label.with_mnemonic(_(" _pixels"));
-        pixels_label.set_mnemonic_widget(pixels_entry);
-        
-        Gtk.Box pixels_box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
-        pixels_box.pack_start(pixels_entry, false, false, 0);
-        pixels_box.pack_end(pixels_label, false, false, 0);
-        add_control(pixels_box, 1, 3);
+        add_label(_("_Pixels:"), 0, 3, pixels_entry);
+        add_control(pixels_entry, 1, 3);
         
         export_metadata = new Gtk.CheckButton.with_label(_("Export metadata"));
         add_control(export_metadata, 1, 4);
         export_metadata.active = true;
         
-        table.set_row_spacing(4);
-        table.set_column_spacing(4);
-        table.set_margin_top(4);
-        table.set_margin_bottom(4);
-        table.set_margin_left(4);
-        table.set_margin_right(4);
+        table.set_row_spacing(5);
+        table.set_column_spacing(5);
+        table.set_border_width(3);
         
         ((Gtk.Box) get_content_area()).add(table);
         
         // add buttons to action area
-        add_button(Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
-        ok_button = add_button(Gtk.Stock.OK, Gtk.ResponseType.OK);
+        add_button(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL);
+        ok_button = add_button(Resources.OK_LABEL, Gtk.ResponseType.OK);
+        set_default_response(Gtk.ResponseType.OK);
         
         ok_button.set_can_default(true);
         ok_button.has_default = true;
@@ -357,7 +351,7 @@ public class ExportDialog : Gtk.Dialog {
     }
     
     private void add_label(string text, int x, int y, Gtk.Widget? widget = null) {
-        Gtk.Alignment left_aligned = new Gtk.Alignment(0.0f, 0.5f, 0, 0);
+        Gtk.Alignment left_aligned = new Gtk.Alignment(1, 0.5f, 0, 0);
         
         Gtk.Label new_label = new Gtk.Label.with_mnemonic(text);
         new_label.set_use_underline(true);
@@ -371,7 +365,7 @@ public class ExportDialog : Gtk.Dialog {
     }
     
     private void add_control(Gtk.Widget widget, int x, int y) {
-        Gtk.Alignment left_aligned = new Gtk.Alignment(0, 0.5f, 0, 0);
+        Gtk.Alignment left_aligned = new Gtk.Alignment(0, 0.5f, 1, 0);
         left_aligned.add(widget);
         
         table.attach(left_aligned, x, y, 1, 1);
@@ -857,7 +851,7 @@ public bool report_manifest(ImportManifest manifest, bool show_dest_id,
         Gtk.Widget save_results_button = dialog.add_button(ImportUI.SAVE_RESULTS_BUTTON_NAME,
             ImportUI.SAVE_RESULTS_RESPONSE_ID);
         save_results_button.set_visible(manifest.success.size < manifest.all.size);
-        Gtk.Widget ok_button = dialog.add_button(Gtk.Stock.OK, Gtk.ResponseType.OK);
+        Gtk.Widget ok_button = dialog.add_button(Resources.OK_LABEL, Gtk.ResponseType.OK);
         dialog.set_default(ok_button);
         
         Gtk.Window dialog_parent = (Gtk.Window) dialog.get_parent();
@@ -896,7 +890,7 @@ public bool report_manifest(ImportManifest manifest, bool show_dest_id,
 internal void save_import_results(Gtk.Window? chooser_dialog_parent, string results_log) {
     Gtk.FileChooserDialog chooser_dialog = new Gtk.FileChooserDialog(
         ImportUI.SAVE_RESULTS_FILE_CHOOSER_TITLE, chooser_dialog_parent, Gtk.FileChooserAction.SAVE,
-        Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL, Gtk.Stock.SAVE, Gtk.ResponseType.ACCEPT, null);
+        Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL, Resources.SAVE_AS_LABEL, Gtk.ResponseType.ACCEPT, null);
     chooser_dialog.set_do_overwrite_confirmation(true);
     chooser_dialog.set_current_folder(Environment.get_home_dir());
     chooser_dialog.set_current_name("Shotwell Import Log.txt");
@@ -1196,6 +1190,10 @@ public class TextEntryDialog : Gtk.Dialog {
     private Gtk.Button button2;
     private Gtk.ButtonBox action_area_box;
     
+    public TextEntryDialog() {
+        Object (use_header_bar: 1);
+    }
+    
     public void set_builder(Gtk.Builder builder) {
         this.builder = builder;
     }
@@ -1204,7 +1202,6 @@ public class TextEntryDialog : Gtk.Dialog {
         string? initial_text, Gee.Collection<string>? completion_list, string? completion_delimiter) {
         set_title(title);
         set_resizable(true);
-        set_default_size (350, 104);
         set_parent_window(AppWindow.get_instance().get_parent_window());
         set_transient_for(AppWindow.get_instance());
         on_modify_validate = modify_validate;
@@ -1220,8 +1217,8 @@ public class TextEntryDialog : Gtk.Dialog {
         action_area_box = (Gtk.ButtonBox) get_action_area();
         action_area_box.set_layout(Gtk.ButtonBoxStyle.END);
         
-        button1 = (Gtk.Button) add_button(Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
-        button2 = (Gtk.Button) add_button(Gtk.Stock.SAVE, Gtk.ResponseType.OK);
+        button1 = (Gtk.Button) add_button(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL);
+        button2 = (Gtk.Button) add_button(Resources.SAVE_LABEL, Gtk.ResponseType.OK);
         set_default_response(Gtk.ResponseType.OK);
         
         if (completion_list != null) { // Textfield with autocompletion
@@ -1266,6 +1263,10 @@ public class MultiTextEntryDialog : Gtk.Dialog {
     private Gtk.Button button2;
     private Gtk.ButtonBox action_area_box;
     
+    public MultiTextEntryDialog() {
+        Object (use_header_bar: 1);
+    }
+    
     public void set_builder(Gtk.Builder builder) {
         this.builder = builder;
     }
@@ -1278,12 +1279,6 @@ public class MultiTextEntryDialog : Gtk.Dialog {
         set_transient_for(AppWindow.get_instance());
         on_modify_validate = modify_validate;
         
-        Gtk.Label name_label = builder.get_object("label9") as Gtk.Label;
-        name_label.set_text(label);
-        
-        Gtk.ScrolledWindow scrolled = builder.get_object("scrolledwindow1") as Gtk.ScrolledWindow;
-        scrolled.set_shadow_type (Gtk.ShadowType.ETCHED_IN);
-        
         entry = builder.get_object("textview1") as Gtk.TextView;
         entry.set_wrap_mode (Gtk.WrapMode.WORD);
         entry.buffer = new Gtk.TextBuffer(null);
@@ -1294,8 +1289,9 @@ public class MultiTextEntryDialog : Gtk.Dialog {
         action_area_box = (Gtk.ButtonBox) get_action_area();
         action_area_box.set_layout(Gtk.ButtonBoxStyle.END);
         
-        button1 = (Gtk.Button) add_button(Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
-        button2 = (Gtk.Button) add_button(Gtk.Stock.SAVE, Gtk.ResponseType.OK);
+        button1 = (Gtk.Button) add_button(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL);
+        button2 = (Gtk.Button) add_button(Resources.SAVE_LABEL, Gtk.ResponseType.OK);
+        set_default_response(Gtk.ResponseType.OK);
         
         set_has_resize_grip(true);
     }
@@ -1326,7 +1322,9 @@ public class EventRenameDialog : TextEntryDialogMediator {
 
 public class EditTitleDialog : TextEntryDialogMediator {
     public EditTitleDialog(string? photo_title) {
-        base (_("Edit Title"), _("Title:"), photo_title);
+        // Dialog title
+        base (_("Edit Title"),
+            _("Title:"), photo_title);
     }
     
     public virtual string? execute() {
@@ -1340,7 +1338,10 @@ public class EditTitleDialog : TextEntryDialogMediator {
 
 public class EditCommentDialog : MultiTextEntryDialogMediator {
     public EditCommentDialog(string? comment, bool is_event = false) {
-        string title_tmp = (is_event) ? _("Edit Event Comment") : _("Edit Photo/Video Comment");
+        string title_tmp = (is_event)
+            // Dialog title
+            ? _("Edit Event Comment")
+            : _("Edit Photo/Video Comment");
         base(title_tmp, _("Comment:"), comment);
     }
     
@@ -1477,7 +1478,7 @@ public class ProgressDialog : Gtk.Window {
         vbox_bar.pack_start(progress_bar, true, false, 0);
         
         if (cancellable != null) {
-            cancel_button = new Gtk.Button.from_stock(Gtk.Stock.CANCEL);
+            cancel_button = new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL);
             cancel_button.clicked.connect(on_cancel);
             delete_event.connect(on_window_closed);
         }
@@ -1648,12 +1649,14 @@ public class AdjustDateTimeDialog : Gtk.Dialog {
         bool contains_video = false, bool only_video = false) {
         assert(source != null);
 
+        Object(use_header_bar: 1);
+        
         set_modal(true);
         set_resizable(false);
         set_transient_for(AppWindow.get_instance());
 
-        add_buttons(Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
-                    Gtk.Stock.OK, Gtk.ResponseType.OK);
+        add_buttons(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL,
+                    Resources.OK_LABEL, Gtk.ResponseType.OK);
         set_title(Resources.ADJUST_DATE_TIME_LABEL);
 
         calendar = new Gtk.Calendar();
@@ -1669,13 +1672,16 @@ public class AdjustDateTimeDialog : Gtk.Dialog {
 
         hour.output.connect(on_spin_button_output);
         hour.set_width_chars(2);  
+        hour.set_max_width_chars(2);
 
         minute = new Gtk.SpinButton.with_range(0, 59, 1);
         minute.set_width_chars(2);
+        minute.set_max_width_chars(2);
         minute.output.connect(on_spin_button_output);
 
         second = new Gtk.SpinButton.with_range(0, 59, 1);
         second.set_width_chars(2);
+        second.set_max_width_chars(2);
         second.output.connect(on_spin_button_output);
 
         system = new Gtk.ComboBoxText();
@@ -1684,14 +1690,14 @@ public class AdjustDateTimeDialog : Gtk.Dialog {
         system.append_text(_("24 Hr"));
         system.changed.connect(on_time_system_changed);
 
-        Gtk.Box clock = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
+        Gtk.Box clock = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 3);
 
-        clock.pack_start(hour, false, false, 3);
-        clock.pack_start(new Gtk.Label(":"), false, false, 3); // internationalize?
-        clock.pack_start(minute, false, false, 3);
-        clock.pack_start(new Gtk.Label(":"), false, false, 3);
-        clock.pack_start(second, false, false, 3);
-        clock.pack_start(system, false, false, 3);
+        clock.pack_start(hour, false, false, 0);
+        clock.pack_start(new Gtk.Label(":"), false, false, 0); // internationalize?
+        clock.pack_start(minute, false, false, 0);
+        clock.pack_start(new Gtk.Label(":"), false, false, 0);
+        clock.pack_start(second, false, false, 0);
+        clock.pack_start(system, false, false, 0);
 
         set_default_response(Gtk.ResponseType.OK);
         
@@ -1719,15 +1725,15 @@ public class AdjustDateTimeDialog : Gtk.Dialog {
         modify_originals_check_button.sensitive = (!only_video) &&
             (!Config.Facade.get_instance().get_commit_metadata_to_masters() && display_options);
 
-        Gtk.Box time_content = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+        Gtk.Box time_content = new Gtk.Box(Gtk.Orientation.VERTICAL, 5);
 
-        time_content.pack_start(calendar, true, false, 3);
-        time_content.pack_start(clock, true, false, 3);
+        time_content.pack_start(calendar, true, false, 0);
+        time_content.pack_start(clock, true, false, 0);
 
         if (display_options) {
-            time_content.pack_start(relativity_radio_button, true, false, 3);
-            time_content.pack_start(batch_radio_button, true, false, 3);
-            time_content.pack_start(modify_originals_check_button, true, false, 3);
+            time_content.pack_start(relativity_radio_button, true, false, 0);
+            time_content.pack_start(batch_radio_button, true, false, 0);
+            time_content.pack_start(modify_originals_check_button, true, false, 0);
         }
 
         Gdk.Pixbuf preview = null;
@@ -1740,26 +1746,26 @@ public class AdjustDateTimeDialog : Gtk.Dialog {
         }
         
         Gtk.Box image_content = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+        image_content.set_valign(Gtk.Align.START);
+        image_content.set_homogeneous(true);
         Gtk.Image image = (preview != null) ? new Gtk.Image.from_pixbuf(preview) : new Gtk.Image();
         original_time_label = new Gtk.Label(null);
-        image_content.pack_start(image, true, false, 3);
-        image_content.pack_start(original_time_label, true, false, 3);
+        image_content.pack_start(image, true, false, 0);
+        image_content.pack_start(original_time_label, true, false, 0);
 
-        Gtk.Box hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
-        hbox.pack_start(image_content, true, false, 6);
-        hbox.pack_start(time_content, true, false, 6);
+        Gtk.Box hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 10);
+        hbox.set_border_width(3);
+        hbox.pack_start(image_content, true, false, 0);
+        hbox.pack_start(time_content, true, false, 0);
 
         Gtk.Alignment hbox_alignment = new Gtk.Alignment(0.5f, 0.5f, 0, 0);
-        hbox_alignment.set_padding(6, 3, 6, 6);
         hbox_alignment.add(hbox);
 
-        ((Gtk.Box) get_content_area()).pack_start(hbox_alignment, true, false, 6);
+        ((Gtk.Box) get_content_area()).pack_start(hbox_alignment, true, false, 0);
 
         notification = new Gtk.Label("");
         notification.set_line_wrap(true);
         notification.set_justify(Gtk.Justification.CENTER);
-        notification.set_size_request(-1, -1);
-        notification.set_padding(12, 6);
 
         ((Gtk.Box) get_content_area()).pack_start(notification, true, true, 0);
         
@@ -1779,8 +1785,8 @@ public class AdjustDateTimeDialog : Gtk.Dialog {
         calendar.select_day(time.day);
 
         if (Config.Facade.get_instance().get_use_24_hour_time()) {
-            hour.set_value(time.hour);
             system.set_active(TimeSystem.24HR);
+            hour.set_value(time.hour);
         } else {
             int AMPM_hour = time.hour % 12;
             hour.set_value((AMPM_hour == 0) ? 12 : AMPM_hour);
@@ -2066,7 +2072,7 @@ public class WelcomeDialog : Gtk.Dialog {
     public WelcomeDialog(Gtk.Window owner) {
         import_meta_host = new Spit.DataImports.WelcomeImportMetaHost(this);
         bool show_system_pictures_import = is_system_pictures_import_possible();
-        Gtk.Widget ok_button = add_button(Gtk.Stock.OK, Gtk.ResponseType.OK);
+        Gtk.Widget ok_button = add_button(Resources.OK_LABEL, Gtk.ResponseType.OK);
         set_title(_("Welcome!"));
         set_resizable(false);
         set_type_hint(Gdk.WindowTypeHint.DIALOG);
@@ -2265,7 +2271,6 @@ public class PreferencesDialog {
     private Gee.ArrayList<PathFormat> path_formats = new Gee.ArrayList<PathFormat>();
     private GLib.DateTime example_date = new GLib.DateTime.local(2009, 3, 10, 18, 16, 11);
     private Gtk.CheckButton lowercase;
-    private Gtk.Button close_button;
     private Plugins.ManifestWidgetMediator plugins_mediator = new Plugins.ManifestWidgetMediator();
     private Gtk.ComboBoxText default_raw_developer_combo;
 
@@ -2289,8 +2294,6 @@ public class PreferencesDialog {
 
         library_dir_button = builder.get_object("library_dir_button") as Gtk.FileChooserButton;
         
-        close_button = builder.get_object("close_button") as Gtk.Button;
-        
         photo_editor_combo = builder.get_object("external_photo_editor_combo") as Gtk.ComboBox;
         raw_editor_combo = builder.get_object("external_raw_editor_combo") as Gtk.ComboBox;
         
@@ -2563,20 +2566,19 @@ public class PreferencesDialog {
          if (is_string_empty(example) && !is_string_empty(dir_pattern_entry.text)) {
             // Invalid pattern.
             dir_pattern_example.set_text(_("Invalid pattern"));
-            dir_pattern_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, Gtk.Stock.DIALOG_ERROR);
+            dir_pattern_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "dialog-error");
             dir_pattern_entry.set_icon_activatable(Gtk.EntryIconPosition.SECONDARY, false);
             set_allow_closing(false);
          } else {
             // Valid pattern.
             dir_pattern_example.set_text(example);
-            dir_pattern_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, null);
+            dir_pattern_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, null);
             set_allow_closing(true);
          }
     }
     
     private void set_allow_closing(bool allow) {
         dialog.set_deletable(allow);
-        close_button.set_sensitive(allow);
         allow_closing = allow;
     }
     
diff --git a/src/Dimensions.vala b/src/Dimensions.vala
index f689aca..42188d3 100644
--- a/src/Dimensions.vala
+++ b/src/Dimensions.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/DirectoryMonitor.vala b/src/DirectoryMonitor.vala
index 1778fe4..468425f 100644
--- a/src/DirectoryMonitor.vala
+++ b/src/DirectoryMonitor.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/Event.vala b/src/Event.vala
index ed0af76..cbc3485 100644
--- a/src/Event.vala
+++ b/src/Event.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/Exporter.vala b/src/Exporter.vala
index a930c4c..6a1b377 100644
--- a/src/Exporter.vala
+++ b/src/Exporter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/International.vala b/src/International.vala
index 1bf242b..a51d0a2 100644
--- a/src/International.vala
+++ b/src/International.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/LibraryFiles.vala b/src/LibraryFiles.vala
index 4cffe94..918ed1e 100644
--- a/src/LibraryFiles.vala
+++ b/src/LibraryFiles.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/LibraryMonitor.vala b/src/LibraryMonitor.vala
index 363213b..4793f7d 100644
--- a/src/LibraryMonitor.vala
+++ b/src/LibraryMonitor.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/MediaDataRepresentation.vala b/src/MediaDataRepresentation.vala
index 6a54718..31b9cc8 100644
--- a/src/MediaDataRepresentation.vala
+++ b/src/MediaDataRepresentation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/MediaInterfaces.vala b/src/MediaInterfaces.vala
index 96c5d49..e5f078c 100644
--- a/src/MediaInterfaces.vala
+++ b/src/MediaInterfaces.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/MediaMetadata.vala b/src/MediaMetadata.vala
index ad0d719..22ee96b 100644
--- a/src/MediaMetadata.vala
+++ b/src/MediaMetadata.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/MediaMonitor.vala b/src/MediaMonitor.vala
index aeb2952..5d9c488 100644
--- a/src/MediaMonitor.vala
+++ b/src/MediaMonitor.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/MediaPage.vala b/src/MediaPage.vala
index 9f98466..6496503 100644
--- a/src/MediaPage.vala
+++ b/src/MediaPage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -9,6 +9,7 @@ public class MediaSourceItem : CheckerboardItem {
     private static Gdk.Pixbuf current_sprocket_pixbuf = null;
 
     private bool enable_sprockets = false;
+    private string? natural_collation_key = null;
 
     // preserve the same constructor arguments and semantics as CheckerboardItem so that we're
     // a drop-in replacement
@@ -93,6 +94,19 @@ public class MediaSourceItem : CheckerboardItem {
     public void set_enable_sprockets(bool enable_sprockets) {
         this.enable_sprockets = enable_sprockets;
     }
+    
+    public new void set_title(string text, bool marked_up = false,
+        Pango.Alignment alignment = Pango.Alignment.LEFT) {
+        base.set_title(text, marked_up, alignment);
+        this.natural_collation_key = null;
+    }
+    
+    public string get_natural_collation_key() {
+        if (this.natural_collation_key == null) {
+            this.natural_collation_key = NaturalCollate.collate_key(this.get_title());
+        }
+        return this.natural_collation_key;
+    }
 }
 
 public abstract class MediaPage : CheckerboardPage {
@@ -108,7 +122,8 @@ public abstract class MediaPage : CheckerboardPage {
         TITLE = 1,
         EXPOSURE_DATE = 2,
         RATING = 3,
-        MAX = 3
+        FILENAME = 4,
+        MAX = 4
     }
 
     protected class ZoomSliderAssembly : Gtk.ToolItem {
@@ -271,7 +286,7 @@ public abstract class MediaPage : CheckerboardPage {
     protected override Gtk.ActionEntry[] init_collect_action_entries() {
         Gtk.ActionEntry[] actions = base.init_collect_action_entries();
         
-        Gtk.ActionEntry export = { "Export", Gtk.Stock.SAVE_AS, TRANSLATABLE, "<Ctrl><Shift>E",
+        Gtk.ActionEntry export = { "Export", Resources.SAVE_AS_LABEL, TRANSLATABLE, "<Ctrl><Shift>E",
             TRANSLATABLE, on_export };
         export.label = Resources.EXPORT_MENU;
         actions += export;
@@ -288,7 +303,7 @@ public abstract class MediaPage : CheckerboardPage {
         send_to_context_menu.label = Resources.SEND_TO_CONTEXT_MENU;
         actions += send_to_context_menu;
         
-        Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", Gtk.Stock.REMOVE, TRANSLATABLE,
+        Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", Resources.REMOVE_LABEL, TRANSLATABLE,
             "<Shift>Delete", TRANSLATABLE, on_remove_from_library };
         remove_from_library.label = Resources.REMOVE_FROM_LIBRARY_MENU;
         actions += remove_from_library;
@@ -298,7 +313,7 @@ public abstract class MediaPage : CheckerboardPage {
         move_to_trash.label = Resources.MOVE_TO_TRASH_MENU;
         actions += move_to_trash;
         
-        Gtk.ActionEntry new_event = { "NewEvent", Gtk.Stock.NEW, TRANSLATABLE, "<Ctrl>N",
+        Gtk.ActionEntry new_event = { "NewEvent", Resources.NEW_LABEL, TRANSLATABLE, "<Ctrl>N",
             TRANSLATABLE, on_new_event };
         new_event.label = Resources.NEW_EVENT_MENU;
         actions += new_event;
@@ -320,13 +335,13 @@ public abstract class MediaPage : CheckerboardPage {
         modify_tags.label = Resources.MODIFY_TAGS_MENU;
         actions += modify_tags;
 
-        Gtk.ActionEntry increase_size = { "IncreaseSize", Gtk.Stock.ZOOM_IN, TRANSLATABLE,
+        Gtk.ActionEntry increase_size = { "IncreaseSize", Resources.ZOOM_IN_LABEL, TRANSLATABLE,
             "<Ctrl>plus", TRANSLATABLE, on_increase_size };
         increase_size.label = _("Zoom _In");
         increase_size.tooltip = _("Increase the magnification of the thumbnails");
         actions += increase_size;
 
-        Gtk.ActionEntry decrease_size = { "DecreaseSize", Gtk.Stock.ZOOM_OUT, TRANSLATABLE,
+        Gtk.ActionEntry decrease_size = { "DecreaseSize", Resources.ZOOM_OUT_LABEL, TRANSLATABLE,
             "<Ctrl>minus", TRANSLATABLE, on_decrease_size };
         decrease_size.label = _("Zoom _Out");
         decrease_size.tooltip = _("Decrease the magnification of the thumbnails");
@@ -403,7 +418,7 @@ public abstract class MediaPage : CheckerboardPage {
         filter_photos.label = Resources.FILTER_PHOTOS_MENU;
         actions += filter_photos;
         
-        Gtk.ActionEntry play = { "PlayVideo", Gtk.Stock.MEDIA_PLAY, TRANSLATABLE, "<Ctrl>Y",
+        Gtk.ActionEntry play = { "PlayVideo", Resources.PLAY_LABEL, TRANSLATABLE, "<Ctrl>Y",
             TRANSLATABLE, on_play_video };
         play.label = _("_Play Video");
         play.tooltip = _("Open the selected videos in the system video player");
@@ -484,18 +499,24 @@ public abstract class MediaPage : CheckerboardPage {
         by_rating.tooltip = _("Sort photos by rating");
         sort_crit_actions += by_rating;
         
+        Gtk.RadioActionEntry by_filename = { "SortByFilename", null, TRANSLATABLE, null,
+            TRANSLATABLE, SortBy.FILENAME };
+        by_filename.label = _("By _Filename");
+        by_filename.tooltip = _("Sort photos by filename");
+        sort_crit_actions += by_filename;
+
         action_group.add_radio_actions(sort_crit_actions, sort_by, on_sort_changed);
         
         // Sort order.
         Gtk.RadioActionEntry[] sort_order_actions = new Gtk.RadioActionEntry[0];
         
-        Gtk.RadioActionEntry ascending = { "SortAscending", Gtk.Stock.SORT_ASCENDING,
+        Gtk.RadioActionEntry ascending = { "SortAscending", Resources.SORT_ASCENDING_LABEL,
             TRANSLATABLE, null, TRANSLATABLE, SORT_ORDER_ASCENDING };
         ascending.label = _("_Ascending");
         ascending.tooltip = _("Sort photos in an ascending order");
         sort_order_actions += ascending;
         
-        Gtk.RadioActionEntry descending = { "SortDescending", Gtk.Stock.SORT_DESCENDING,
+        Gtk.RadioActionEntry descending = { "SortDescending", Resources.SORT_DESCENDING_LABEL,
             TRANSLATABLE, null, TRANSLATABLE, SORT_ORDER_DESCENDING };
         descending.label = _("D_escending");
         descending.tooltip = _("Sort photos in a descending order");
@@ -1206,6 +1227,13 @@ public abstract class MediaPage : CheckerboardPage {
                 predicate = Thumbnail.rating_comparator_predicate;
                 break;
             
+            case SortBy.FILENAME:
+                if (ascending)
+                    comparator = Thumbnail.filename_ascending_comparator;
+                else comparator = Thumbnail.filename_descending_comparator;
+                predicate = Thumbnail.filename_comparator_predicate;
+                break;
+
             default:
                 debug("Unknown sort criteria: %s", get_menu_sort_by().to_string());
                 comparator = Thumbnail.title_descending_comparator;
@@ -1226,6 +1254,9 @@ public abstract class MediaPage : CheckerboardPage {
             
             case SortBy.RATING:
                 return "/MenuBar/ViewMenu/SortPhotos/SortByRating";
+
+            case SortBy.FILENAME:
+                return "/MenuBar/ViewMenu/SortPhotos/SortByFilename";
             
             default:
                 debug("Unknown sort criteria: %d", sort_by);
diff --git a/src/MediaViewTracker.vala b/src/MediaViewTracker.vala
index 879dc84..0c48f2d 100644
--- a/src/MediaViewTracker.vala
+++ b/src/MediaViewTracker.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/MetadataWriter.vala b/src/MetadataWriter.vala
index aee5855..969506e 100644
--- a/src/MetadataWriter.vala
+++ b/src/MetadataWriter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -23,6 +23,8 @@ public class MetadataWriter : Object {
         public Photo.ReimportMasterState reimport_master_state = null;
         public Photo.ReimportEditableState reimport_editable_state = null;
         public Error? err = null;
+        public bool wrote_master = false;
+        public bool wrote_editable = false;
         
         public CommitJob(MetadataWriter owner, LibraryPhoto photo, Gee.Set<string>? keywords) {
             base (owner, owner.on_update_completed, new Cancellable(), owner.on_update_cancelled);
@@ -58,6 +60,8 @@ public class MetadataWriter : Object {
                     LibraryMonitor.unblacklist_file(photo.get_master_file());
                 }
             }
+            
+            wrote_master = true;
         }
         
         private void commit_editable() throws Error {
@@ -75,6 +79,8 @@ public class MetadataWriter : Object {
                     LibraryMonitor.unblacklist_file(photo.get_editable_file());
                 }
             }
+            
+            wrote_editable = true;
         }
         
         private bool update_metadata(PhotoMetadata metadata, bool skip_orientation = false) {
@@ -617,10 +623,21 @@ public class MetadataWriter : Object {
     private void on_update_completed(BackgroundJob j) {
         CommitJob job = (CommitJob) j;
         
-        if (job.err != null)
-            warning("Unable to update metadata for %s: %s", job.photo.to_string(), job.err.message);
-        else
-            message("Completed writing metadata for %s", job.photo.to_string());
+        if (job.err != null) {
+            warning("Unable to write metadata to %s: %s", job.photo.to_string(), job.err.message);
+        } else {
+            if (job.wrote_master)
+                message("Completed writing metadata to %s", job.photo.get_master_file().get_path());
+            else
+                message("Unable to write metadata to %s", job.photo.get_master_file().get_path());
+            
+            if (job.photo.get_editable_file() != null) {
+                if (job.wrote_editable)
+                    message("Completed writing metadata to %s", job.photo.get_editable_file().get_path());
+                else
+                    message("Unable to write metadata to %s", job.photo.get_editable_file().get_path());
+            }
+        }
         
         bool removed = pending.unset(job.photo);
         assert(removed);
diff --git a/src/NaturalCollate.vala b/src/NaturalCollate.vala
new file mode 100644
index 0000000..4adb027
--- /dev/null
+++ b/src/NaturalCollate.vala
@@ -0,0 +1,98 @@
+/**
+ * NaturalCollate
+ * Simple helper class for natural sorting in Vala.
+ *
+ * (c) Tobia Tesan <tobia.tesan@gmail.com>, 2014
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the Lesser GNU General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; see the file COPYING.  If not,
+ * see <http://www.gnu.org/licenses/>.
+ */
+
+namespace NaturalCollate {
+
+private const unichar SUPERDIGIT = ':';
+private const unichar NUM_SENTINEL = 0x2; // glib uses these, so do we
+private const string  COLLATION_SENTINEL = "\x01\x01\x01";
+
+private static int read_number(owned string s, ref int byte_index) {
+    /*
+     * Given a string in the form [numerals]*[everythingelse]*
+     * returns the int value of the first block and increments index
+     * by its length as a side effect.
+     * Notice that "numerals" is not just 0-9 but everything else 
+     * Unicode considers a numeral (see: string::isdigit())
+     */
+    int number = 0;
+
+    while (s.length != 0 && s.get_char(0).isdigit()) {
+        number = number*10;
+        number += s.get_char(0).digit_value();
+        int second_char = s.index_of_nth_char(1);
+        s = s.substring(second_char);
+        byte_index += second_char;
+    }
+    return number;
+}
+
+public static int compare(string str1, string str2) {
+    return strcmp(collate_key(str1), collate_key(str2));
+}
+
+public static string collate_key(owned string str) {
+    /*
+     * Computes a collate key.
+     * Has roughly the same effect as g_utf8_collate_key_for_file, except that it doesn't
+     * handle the dot as a special char.
+     */
+    assert (str.validate());
+    string result = "";
+    bool eos = (str.length == 0);
+
+    while (!eos) {
+        assert(str.validate());
+        int position = 0;
+        while (!(str.get_char(position).to_string() in "0123456789")) {
+            // We only care about plain old 0123456789, aping what g_utf8_collate_key_for_filename does
+            position++;
+        }
+
+        // (0... position( is a bunch of non-numerical chars, so we compute and append the collate key...
+        result = result + (str.substring(0, position).collate_key());
+
+        // ...then throw them away
+        str = str.substring(position);
+
+        eos = (str.length == 0);
+        position = 0;
+
+        if (!eos) {
+            // We have some numbers to handle in front of us
+            int number = read_number(str, ref position);
+            str = str.substring(position);
+            int number_of_superdigits = number.to_string().length;
+            string to_append = "";
+            for (int i = 1; i < number_of_superdigits; i++) {
+                // We append n - 1 superdigits where n is the number of digits
+                to_append = to_append + SUPERDIGIT.to_string();
+            }
+            to_append = to_append + (number.to_string()); // We append the actual number
+            result = result +
+                     COLLATION_SENTINEL +
+                     NUM_SENTINEL.to_string() +
+                     to_append;
+        }
+        eos = (str.length == 0);
+    }
+
+    result = result + NUM_SENTINEL.to_string();
+    // No specific reason except that glib does it
+
+    return result;
+}
+}
diff --git a/src/Orientation.vala b/src/Orientation.vala
index b31c22d..e9f0cd0 100644
--- a/src/Orientation.vala
+++ b/src/Orientation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/Page.vala b/src/Page.vala
index 807a926..72613e0 100644
--- a/src/Page.vala
+++ b/src/Page.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -95,8 +95,6 @@ public abstract class Page : Gtk.ScrolledWindow {
         init_ui();
         
         realize.connect(attach_view_signals);
-        
-        Resources.style_widget(this, Resources.SCROLL_FRAME_STYLESHEET);
     }
     
     ~Page() {
@@ -218,6 +216,7 @@ public abstract class Page : Gtk.ScrolledWindow {
             toolbar = toolbar_path == null ? new Gtk.Toolbar() :
                                              ui.get_widget(toolbar_path) as Gtk.Toolbar;
             toolbar.get_style_context().add_class("bottom-toolbar");  // for elementary theme
+            toolbar.set_icon_size(Gtk.IconSize.SMALL_TOOLBAR);
         }
         return toolbar;
     }
@@ -1210,8 +1209,6 @@ public abstract class CheckerboardPage : Page {
         viewport.set_border_width(0);
         viewport.set_shadow_type(Gtk.ShadowType.NONE);
         
-        Resources.style_widget(viewport, Resources.VIEWPORT_STYLESHEET);
-        
         viewport.add(layout);
         
         // want to set_adjustments before adding to ScrolledWindow to let our signal handlers
@@ -1228,8 +1225,6 @@ public abstract class CheckerboardPage : Page {
         
         // scrollbar policy
         set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
-        
-        Resources.style_widget(this, Resources.PAGE_STYLESHEET);
     }
     
     public void init_item_context_menu(string path) {
@@ -1952,9 +1947,6 @@ public abstract class SinglePhotoPage : Page {
         canvas.draw.connect(on_canvas_exposed);
         
         set_event_source(canvas);
-        
-        // style the viewport
-        Resources.style_widget(viewport, Resources.VIEWPORT_STYLESHEET);
     }
     
     public bool is_transition_in_progress() {
diff --git a/src/Photo.vala b/src/Photo.vala
index 98a3175..2f2b7a5 100644
--- a/src/Photo.vala
+++ b/src/Photo.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/PhotoMonitor.vala b/src/PhotoMonitor.vala
index d7f2929..58725a4 100644
--- a/src/PhotoMonitor.vala
+++ b/src/PhotoMonitor.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index 8db84a1..c4175a3 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -398,8 +398,8 @@ public abstract class EditingHostPage : SinglePhotoPage {
     private Gtk.ToggleToolButton straighten_button = null;
     private Gtk.ToolButton enhance_button = null;
     private Gtk.Scale zoom_slider = null;
-    private Gtk.ToolButton prev_button = new Gtk.ToolButton.from_stock(Gtk.Stock.GO_BACK);
-    private Gtk.ToolButton next_button = new Gtk.ToolButton.from_stock(Gtk.Stock.GO_FORWARD);
+    private Gtk.ToolButton prev_button = new Gtk.ToolButton(null, Resources.PREVIOUS_LABEL);
+    private Gtk.ToolButton next_button = new Gtk.ToolButton(null, Resources.NEXT_LABEL);
     private EditingTools.EditingTool current_tool = null;
     private Gtk.ToggleToolButton current_editing_toggle = null;
     private Gdk.Pixbuf cancel_editing_pixbuf = null;
@@ -467,7 +467,8 @@ public abstract class EditingHostPage : SinglePhotoPage {
         toolbar.insert(redeye_button, -1);
         
         // adjust tool
-        adjust_button = new Gtk.ToggleToolButton.from_stock(Resources.ADJUST);
+        adjust_button = new Gtk.ToggleToolButton();
+        adjust_button.set_icon_name(Resources.ADJUST);
         adjust_button.set_label(Resources.ADJUST_LABEL);
         adjust_button.set_tooltip_text(Resources.ADJUST_TOOLTIP);
         adjust_button.toggled.connect(on_adjust_toggled);
@@ -475,8 +476,8 @@ public abstract class EditingHostPage : SinglePhotoPage {
         toolbar.insert(adjust_button, -1);
 
         // enhance tool
-        enhance_button = new Gtk.ToolButton.from_stock(Resources.ENHANCE);
-        enhance_button.set_label(Resources.ENHANCE_LABEL);
+        enhance_button = new Gtk.ToolButton(null, Resources.ENHANCE_LABEL);
+        enhance_button.set_icon_name(Resources.ENHANCE);
         enhance_button.set_tooltip_text(Resources.ENHANCE_TOOLTIP);
         enhance_button.clicked.connect(on_enhance);
         enhance_button.is_important = true;
@@ -530,11 +531,13 @@ public abstract class EditingHostPage : SinglePhotoPage {
 
         // previous button
         prev_button.set_tooltip_text(_("Previous photo"));
+        prev_button.set_icon_name("go-previous");
         prev_button.clicked.connect(on_previous_photo);
         toolbar.insert(prev_button, -1);
         
         // next button
         next_button.set_tooltip_text(_("Next photo"));
+        next_button.set_icon_name("go-next");
         next_button.clicked.connect(on_next_photo);
         toolbar.insert(next_button, -1);
     }
@@ -1157,7 +1160,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
         }
         if (pixbuf == null) {
             // Create empty pixbuf.
-            pixbuf = AppWindow.get_instance().render_icon(Gtk.Stock.MISSING_IMAGE, 
+            pixbuf = AppWindow.get_instance().render_icon("image-missing", 
                 Gtk.IconSize.DIALOG, null);
             get_canvas_scaling().perform_on_pixbuf(pixbuf, Gdk.InterpType.NEAREST, true);
             
@@ -2381,12 +2384,12 @@ public class LibraryPhotoPage : EditingHostPage {
     protected override Gtk.ActionEntry[] init_collect_action_entries() {
         Gtk.ActionEntry[] actions = base.init_collect_action_entries();
         
-        Gtk.ActionEntry export = { "Export", Gtk.Stock.SAVE_AS, TRANSLATABLE, "<Ctrl><Shift>E",
+        Gtk.ActionEntry export = { "Export", Resources.SAVE_AS_LABEL, TRANSLATABLE, "<Ctrl><Shift>E",
             TRANSLATABLE, on_export };
         export.label = Resources.EXPORT_MENU;
         actions += export;
 
-        Gtk.ActionEntry print = { "Print", Gtk.Stock.PRINT, TRANSLATABLE, "<Ctrl>P",
+        Gtk.ActionEntry print = { "Print", Resources.PRINT_LABEL, TRANSLATABLE, "<Ctrl>P",
             TRANSLATABLE, on_print };
         print.label = Resources.PRINT_MENU;
         actions += print;
@@ -2397,7 +2400,7 @@ public class LibraryPhotoPage : EditingHostPage {
         publish.tooltip = Resources.PUBLISH_TOOLTIP;
         actions += publish;
         
-        Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", Gtk.Stock.REMOVE, TRANSLATABLE,
+        Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", Resources.REMOVE_LABEL, TRANSLATABLE,
             "<Shift>Delete", TRANSLATABLE, on_remove_from_library };
         remove_from_library.label = Resources.REMOVE_FROM_LIBRARY_MENU;
         actions += remove_from_library;
@@ -2415,13 +2418,13 @@ public class LibraryPhotoPage : EditingHostPage {
         tools.label = _("T_ools");
         actions += tools;
         
-        Gtk.ActionEntry prev = { "PrevPhoto", Gtk.Stock.GO_BACK, TRANSLATABLE, null,
+        Gtk.ActionEntry prev = { "PrevPhoto", Resources.PREVIOUS_LABEL, TRANSLATABLE, null,
             TRANSLATABLE, on_previous_photo };
         prev.label = _("_Previous Photo");
         prev.tooltip = _("Previous Photo");
         actions += prev;
 
-        Gtk.ActionEntry next = { "NextPhoto", Gtk.Stock.GO_FORWARD, TRANSLATABLE, null,
+        Gtk.ActionEntry next = { "NextPhoto", Resources.NEXT_LABEL, TRANSLATABLE, null,
             TRANSLATABLE, on_next_photo };
         next.label = _("_Next Photo");
         next.tooltip = _("Next Photo");
@@ -2473,7 +2476,7 @@ public class LibraryPhotoPage : EditingHostPage {
         crop.tooltip = Resources.CROP_TOOLTIP;
         actions += crop;
         
-        Gtk.ActionEntry straighten = { "Straighten", Gtk.Stock.REFRESH, TRANSLATABLE, "<Ctrl>A",
+        Gtk.ActionEntry straighten = { "Straighten", Resources.REFRESH_LABEL, TRANSLATABLE, "<Ctrl>A",
             TRANSLATABLE, toggle_straighten };
         straighten.label = Resources.STRAIGHTEN_MENU;
         straighten.tooltip = Resources.STRAIGHTEN_TOOLTIP;
@@ -2491,7 +2494,7 @@ public class LibraryPhotoPage : EditingHostPage {
         adjust.tooltip = Resources.ADJUST_TOOLTIP;
         actions += adjust;
         
-        Gtk.ActionEntry revert = { "Revert", Gtk.Stock.REVERT_TO_SAVED, TRANSLATABLE,
+        Gtk.ActionEntry revert = { "Revert", Resources.REVERT_TO_SAVED_LABEL, TRANSLATABLE,
             null, TRANSLATABLE, on_revert };
         revert.label = Resources.REVERT_MENU;
         actions += revert;
@@ -2511,7 +2514,7 @@ public class LibraryPhotoPage : EditingHostPage {
         adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
         actions += adjust_date_time;
         
-        Gtk.ActionEntry external_edit = { "ExternalEdit", Gtk.Stock.EDIT, TRANSLATABLE,
+        Gtk.ActionEntry external_edit = { "ExternalEdit", Resources.EDIT_LABEL, TRANSLATABLE,
             "<Ctrl>Return", TRANSLATABLE, on_external_edit };
         external_edit.label = Resources.EXTERNAL_EDIT_MENU;
         actions += external_edit;
@@ -2585,25 +2588,25 @@ public class LibraryPhotoPage : EditingHostPage {
         rate_five.label = Resources.rating_menu(Rating.FIVE);
         actions += rate_five;
 
-        Gtk.ActionEntry increase_size = { "IncreaseSize", Gtk.Stock.ZOOM_IN, TRANSLATABLE,
+        Gtk.ActionEntry increase_size = { "IncreaseSize", Resources.ZOOM_IN_LABEL, TRANSLATABLE,
             "<Ctrl>plus", TRANSLATABLE, on_increase_size };
         increase_size.label = _("Zoom _In");
         increase_size.tooltip = _("Increase the magnification of the photo");
         actions += increase_size;
 
-        Gtk.ActionEntry decrease_size = { "DecreaseSize", Gtk.Stock.ZOOM_OUT, TRANSLATABLE,
+        Gtk.ActionEntry decrease_size = { "DecreaseSize", Resources.ZOOM_OUT_LABEL, TRANSLATABLE,
             "<Ctrl>minus", TRANSLATABLE, on_decrease_size };
         decrease_size.label = _("Zoom _Out");
         decrease_size.tooltip = _("Decrease the magnification of the photo");
         actions += decrease_size;
 
-        Gtk.ActionEntry best_fit = { "ZoomFit", Gtk.Stock.ZOOM_FIT, TRANSLATABLE,
+        Gtk.ActionEntry best_fit = { "ZoomFit", Resources.ZOOM_FIT_LABEL, TRANSLATABLE,
             "<Ctrl>0", TRANSLATABLE, snap_zoom_to_min };
         best_fit.label = _("Fit to _Page");
         best_fit.tooltip = _("Zoom the photo to fit on the screen");
         actions += best_fit;
 
-        Gtk.ActionEntry actual_size = { "Zoom100", Gtk.Stock.ZOOM_100, TRANSLATABLE,
+        Gtk.ActionEntry actual_size = { "Zoom100", Resources.ZOOM_100_LABEL, TRANSLATABLE,
             "<Ctrl>1", TRANSLATABLE, snap_zoom_to_isomorphic };
         /// xgettext:no-c-format
         actual_size.label = _("Zoom _100%");
@@ -3029,15 +3032,13 @@ public class LibraryPhotoPage : EditingHostPage {
     }
     
     protected override bool on_double_click(Gdk.EventButton event) {
-        if (!(get_container() is FullscreenWindow)) {
+        FullscreenWindow? fs = get_container() as FullscreenWindow;
+        if (fs == null)
             return_to_collection_on_release = true;
-            
-            return true;
-        }
-        
-        AppWindow.get_instance().end_fullscreen();
+        else
+            fs.close();
         
-        return base.on_double_click(event);
+        return true;
     }
     
     protected override bool on_left_released(Gdk.EventButton event) {
diff --git a/src/PixbufCache.vala b/src/PixbufCache.vala
index 0708f5e..e3723ae 100644
--- a/src/PixbufCache.vala
+++ b/src/PixbufCache.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/Printing.vala b/src/Printing.vala
index 8e37997..b0a2cf0 100644
--- a/src/Printing.vala
+++ b/src/Printing.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/Properties.vala b/src/Properties.vala
index 9edb4fb..88e0e1d 100644
--- a/src/Properties.vala
+++ b/src/Properties.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -453,8 +453,6 @@ private class BasicProperties : Properties {
 
 private class ExtendedPropertiesWindow : Gtk.Dialog {
     private ExtendedProperties properties = null;
-    private const int FRAME_BORDER = 6;
-    private Gtk.Button close_button;
 
     private class ExtendedProperties : Properties {
         private const string NO_VALUE = "";
@@ -632,13 +630,13 @@ private class ExtendedPropertiesWindow : Gtk.Dialog {
     }
 
     public ExtendedPropertiesWindow(Gtk.Window owner) {
+        Object(use_header_bar: 1);
+        
         add_events(Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.KEY_PRESS_MASK);
         focus_on_map = true;
         set_accept_focus(true);
         set_can_focus(true);
         set_title(_("Extended Information"));
-        set_size_request(300,-1);
-        set_default_size(520, -1);
         set_position(Gtk.WindowPosition.CENTER);
         set_transient_for(owner);
         set_type_hint(Gdk.WindowTypeHint.DIALOG);
@@ -648,20 +646,8 @@ private class ExtendedPropertiesWindow : Gtk.Dialog {
         properties = new ExtendedProperties();
         Gtk.Alignment alignment = new Gtk.Alignment(0.5f,0.5f,1,1);
         alignment.add(properties);
-        alignment.set_padding(4, 4, 4, 4);
+        alignment.set_border_width(3);
         ((Gtk.Box) get_content_area()).add(alignment);
-        close_button = new Gtk.Button.from_stock(Gtk.Stock.CLOSE);
-        close_button.clicked.connect(on_close_clicked);
-    
-        Gtk.Alignment action_alignment = new Gtk.Alignment(1, 0.5f, 1, 1);
-        action_alignment.add(close_button);
-        ((Gtk.Container) get_action_area()).add(action_alignment);
-        
-        set_has_resize_grip(false);
-    }
-
-    ~ExtendedPropertiesWindow() {
-        close_button.clicked.disconnect(on_close_clicked);
     }
 
     public override bool button_press_event(Gdk.EventButton event) {
@@ -674,10 +660,6 @@ private class ExtendedPropertiesWindow : Gtk.Dialog {
         return true;
     }
 
-    private void on_close_clicked() {
-        hide();
-    }
-
     public override bool key_press_event(Gdk.EventKey event) {
         // hide properties
         if (Gdk.keyval_name(event.keyval) == "Escape") {
diff --git a/src/Resources.vala b/src/Resources.vala
index c8f02c4..54118f8 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -24,7 +24,7 @@ namespace Resources {
     public const string? GIT_VERSION = null;
 #endif
 
-    public const string COPYRIGHT = _("Copyright 2009-2014 Yorba Foundation");
+    public const string COPYRIGHT = _("Copyright 2009-2015 Yorba Foundation");
     public const string APP_GETTEXT_PACKAGE = GETTEXT_PACKAGE;
     
     public const string HOME_URL = "https://wiki.gnome.org/Apps/Shotwell";
@@ -73,7 +73,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string CROP = "shotwell-crop";
     public const string STRAIGHTEN = "shotwell-straighten";
     public const string REDEYE = "shotwell-redeye";
-    public const string ADJUST = "shotwell-adjust";
+    public const string ADJUST = "image-adjust";
     public const string PIN_TOOLBAR = "shotwell-pin-toolbar";
     public const string MAKE_PRIMARY = "shotwell-make-primary";
     public const string IMPORT = "shotwell-import";
@@ -82,6 +82,9 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string CROP_PIVOT_RETICLE = "shotwell-crop-pivot-reticle";
     public const string PUBLISH = "applications-internet";
     public const string MERGE = "shotwell-merge-events";
+    
+    public const string GO_NEXT = "go-next";
+    public const string GO_PREVIOUS = "go-previous";
 
     public const string ICON_APP = "shotwell.svg";
     public const string ICON_APP16 = "shotwell-16.svg";
@@ -117,8 +120,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string ICON_NO_EVENT = "no-event";
     public const string ICON_ONE_TAG = "one-tag";
     public const string ICON_TAGS = "multiple-tags";
-    public const string ICON_FOLDER_CLOSED = "folder";
-    public const string ICON_FOLDER_OPEN = "folder-open";
+    public const string ICON_FOLDER = "folder";
     public const string ICON_FOLDER_DOCUMENTS = "folder-documents";
     public const string ICON_IMPORTING = "go-down";
     public const string ICON_LAST_IMPORT = "document-open-recent";
@@ -155,6 +157,37 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string VFLIP_MENU = _("Flip Verti_cally");
     public const string VFLIP_LABEL = _("Flip Vertically");
     
+    public const string ABOUT_LABEL = _("_About");
+    public const string APPLY_LABEL = _("_Apply");
+    public const string CANCEL_LABEL = _("_Cancel");
+    public const string DELETE_LABEL = _("_Delete");
+    public const string EDIT_LABEL = _("_Edit");
+    public const string FORWARD_LABEL = _("_Forward");
+    public const string FULLSCREEN_LABEL = _("Fulls_creen");
+    public const string HELP_LABEL = _("_Help");
+    public const string LEAVE_FULLSCREEN_LABEL = _("Leave _Fullscreen");
+    public const string NEW_LABEL = _("_New");
+    public const string NEXT_LABEL = _("_Next");
+    public const string OK_LABEL = _("_OK");
+    public const string PLAY_LABEL = _("_Play");
+    public const string PREFERENCES_LABEL = _("_Preferences");
+    public const string PREVIOUS_LABEL = _("_Previous");
+    public const string PRINT_LABEL = _("_Print");
+    public const string QUIT_LABEL = _("_Quit");
+    public const string REFRESH_LABEL = _("_Refresh");
+    public const string REMOVE_LABEL = _("_Remove");
+    public const string REVERT_TO_SAVED_LABEL = _("_Revert");
+    public const string SAVE_LABEL = _("_Save");
+    public const string SAVE_AS_LABEL = _("Save _As");
+    public const string SORT_ASCENDING_LABEL = _("Sort _Ascending");
+    public const string SORT_DESCENDING_LABEL = _("Sort _Descending");
+    public const string STOP_LABEL = _("_Stop");
+    public const string UNDELETE_LABEL = _("_Undelete");
+    public const string ZOOM_100_LABEL = _("_Normal Size");
+    public const string ZOOM_FIT_LABEL = _("Best _Fit");
+    public const string ZOOM_IN_LABEL = _("Zoom _In");
+    public const string ZOOM_OUT_LABEL = _("Zoom _Out");
+    
     public const string ENHANCE_MENU = _("_Enhance");
     public const string ENHANCE_LABEL = _("Enhance");
     public const string ENHANCE_TOOLTIP = _("Automatically improve the photo's appearance");
@@ -246,7 +279,9 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string DISPLAY_REJECTED_OR_HIGHER_TOOLTIP = _("Show all photos, including rejected");
     
     public const string DISPLAY_UNRATED_OR_HIGHER_MENU = _("_All Photos");
+    // Button label
     public const string DISPLAY_UNRATED_OR_HIGHER_LABEL = _("Show all photos");
+    // Button tooltip
     public const string DISPLAY_UNRATED_OR_HIGHER_TOOLTIP = _("Show all photos");
 
     public const string VIEW_RATINGS_MENU = _("_Ratings");
@@ -269,9 +304,11 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string PUBLISH_TOOLTIP = _("Publish to various websites");
 
     public const string EDIT_TITLE_MENU = _("Edit _Title...");
+    // Button label
     public const string EDIT_TITLE_LABEL = _("Edit Title");
 
     public const string EDIT_COMMENT_MENU = _("Edit _Comment...");
+    // Button label
     public const string EDIT_COMMENT_LABEL = _("Edit Comment");
 
     public const string EDIT_EVENT_COMMENT_MENU = _("Edit Event _Comment...");
@@ -282,6 +319,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     
     public const string ADD_TAGS_MENU = _("Add _Tags...");
     public const string ADD_TAGS_CONTEXT_MENU = _("_Add Tags...");
+    // Dialog title
     public const string ADD_TAGS_TITLE = _("Add Tags");
 
     public const string PREFERENCES_MENU = _("_Preferences");
@@ -306,14 +344,17 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     }
     
     public string add_tags_label(string[] names) {
-        if (names.length == 1)
+        if (names.length == 1) {
             return _("Add Tag \"%s\"").printf(HierarchicalTagUtilities.get_basename(names[0]));
-        else if (names.length == 2)
+        } else if (names.length == 2) {
+            // Used when adding two tags to photo(s)
             return _("Add Tags \"%s\" and \"%s\"").printf(
-            HierarchicalTagUtilities.get_basename(names[0]),
-            HierarchicalTagUtilities.get_basename(names[1]));
-        else
+                HierarchicalTagUtilities.get_basename(names[0]),
+                HierarchicalTagUtilities.get_basename(names[1]));
+        } else {
+            // Undo/Redo command name (in Edit menu)
             return _("Add Tags");
+        }
     }
     
     public string delete_tag_menu(string name) {
@@ -677,13 +718,11 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
         File icons_dir = AppDirs.get_resources_dir().get_child("icons");
         add_stock_icon(icons_dir.get_child("crop.svg"), CROP);
         add_stock_icon(icons_dir.get_child("redeye.png"), REDEYE);
-        add_stock_icon(icons_dir.get_child("image-adjust.svg"), ADJUST);
-        add_stock_icon(icons_dir.get_child("pin-toolbar.svg"), PIN_TOOLBAR);
         add_stock_icon(icons_dir.get_child("make-primary.svg"), MAKE_PRIMARY);
         add_stock_icon(icons_dir.get_child("import.svg"), IMPORT);
         add_stock_icon(icons_dir.get_child("straighten.svg"), STRAIGHTEN);
         add_stock_icon(icons_dir.get_child("import-all.png"), IMPORT_ALL);
-        add_stock_icon(icons_dir.get_child("enhance.png"), ENHANCE);
+        add_stock_icon(icons_dir.get_child("shotwell-auto-enhance.png"), ENHANCE);
         add_stock_icon(icons_dir.get_child("crop-pivot-reticle.png"), CROP_PIVOT_RETICLE);
         add_stock_icon(icons_dir.get_child("merge.svg"), MERGE);
         add_stock_icon_from_themed_icon(new GLib.ThemedIcon(ICON_FLAGGED_PAGE), ICON_FLAGGED_PAGE);
@@ -1046,97 +1085,20 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
 
         providers.set(widget, styler);
     }
-    
-    public const string INSET_FRAME_STYLESHEET =
-        """ .frame {
-               border-style: inset;
-               border-width: 1px;
-           }""";
-           
-    public const string SCROLL_FRAME_STYLESHEET =
-        """ GtkScrolledWindow {
-               border-width: 0;
-               border-style: none;
-               border-radius: 0;
-               padding: 0;
-           }
-           
-            .frame {
-                border-width: 1px;
-                border-style: inset;
-            }""";
 
-    public const string PAGE_STYLESHEET =
-        """ .frame {
-               border-width: 1px;
-               border-style: inset;
-               border-radius: 0;
-               
-               padding: 0;
-           }""";
-    
-    public const string VIEWPORT_STYLESHEET =
-        """ GtkViewport {
-               border-width: 1px;
-               border-style: inset;
-               border-radius: 0;
-               padding: 0;
-           }""";
-
-    public const string TOOLBAR_STYLESHEET_TEMPLATE =
-        """
-             @define-color primary-bg %s;
-             
-            .toolbar {
-                background-color: @primary-bg;
-                border-width: 1px;
-                border-color: shade (@primary-bg, 0.75);
-                border-style: solid;
-            }""";
-
-    public const string SEARCH_BUTTON_STYLESHEET_TEMPLATE =
-        """ 
-             @define-color primary-bg %s;
-             
-            .button {
-                background-image: none;
-                background-color: @primary-bg;
-                border-image: none;
-                border-color: shade (@primary-bg, 0.75) @primary-bg shade (@primary-bg, 0.75) @primary-bg;
-                border-style: solid;
-                margin: 5px;
-                
-                -unico-border-gradient: none;
-                -unico-outer-stroke-width: 0;
-                -unico-outer-stroke-gradient: none;
-                -unico-glow-radius: 0;
-                -unico-inner-stroke-width: 0;
-                -unico-inner-stroke-color: shade (@primary-bg, 1.1);
+    public const string CUSTOM_CSS =
+        """LibraryWindow {
+               -GtkPaned-handle-size: 1;
             }
-            
-            .button:prelight {
-                border-style: solid;
-                border-width: 1px;
-                border-color: shade (@primary-bg, 1.1);
-                
-                -unico-inner-stroke-color: shade (@primary-bg, 1.1);
-                -unico-inner-stroke-width: 0;
-
-                -unico-outer-stroke-width: 1px;
-                -unico-outer-stroke-color: shade (@primary-bg, 0.8);
+            LibraryWindow .pane-separator {
+               background-color: @borders;
             }
-            
-            .button:active {
-                background-image: none;
-                background-color: shade (@primary-bg, 0.75);
-                border-style: solid;
-                border-width: 1px;
-                border-color: shade (@primary-bg, 0.6);
-                
-                -unico-outer-stroke-width: 1px;
-                -unico-outer-stroke-color: shade (@primary-bg, 1.1);
+            SearchFilterToolbar {
+               border-width: 0 0 1px 0;
+               border-style: solid;
+               border-color: @borders;
             }""";
-    
+
     public const string ONIMAGE_FONT_COLOR = "#000000";
     public const string ONIMAGE_FONT_BACKGROUND = "rgba(255,255,255,0.5)";
 }
diff --git a/src/Screensaver.vala b/src/Screensaver.vala
index d00af21..836df5b 100644
--- a/src/Screensaver.vala
+++ b/src/Screensaver.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala
index e8f0986..3fc5d8b 100644
--- a/src/SearchFilter.vala
+++ b/src/SearchFilter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -646,7 +646,8 @@ public class SearchFilterActions {
     }
 }
 
-public class SearchFilterToolbar : Gtk.Toolbar {
+public class SearchFilterToolbar : Gtk.Revealer {
+    private Gtk.Toolbar toolbar;
     private const int FILTER_BUTTON_MARGIN = 12; // the distance between icon and edge of button
     private const float FILTER_ICON_STAR_SCALE = 0.65f; // changes the size of the filter icon
     private const float FILTER_ICON_SCALE = 0.75f; // changes the size of the all photos icon
@@ -671,10 +672,6 @@ public class SearchFilterToolbar : Gtk.Toolbar {
                 add(label);
             }
         }
-        
-        public void set_color(Gdk.RGBA color) {
-            label.override_color(Gtk.StateFlags.NORMAL, color);
-        }
     }
     
     private class ToggleActionToolButton : Gtk.ToolItem {
@@ -688,8 +685,8 @@ public class SearchFilterToolbar : Gtk.Toolbar {
             button.set_active(action.active);
             button.clicked.connect(on_button_activate);
             button.set_has_tooltip(true);
-
-            restyle();
+            button.set_relief(Gtk.ReliefStyle.NONE);
+            button.set_margin_start(2);
             
             this.add(button);
         }
@@ -711,21 +708,13 @@ public class SearchFilterToolbar : Gtk.Toolbar {
 
             button.set_image(image);
         }
-        
-        public void restyle() {
-            string bgcolorname =
-                Resources.to_css_color(Config.Facade.get_instance().get_bg_color());
-            string stylesheet = Resources.SEARCH_BUTTON_STYLESHEET_TEMPLATE.printf(bgcolorname);
-            
-            Resources.style_widget(button, stylesheet);
-        }
     }
     
     // Ticket #3260 - Add a 'close' context menu to
     // the searchbar.
     // The close menu. Populated below in the constructor.
     private Gtk.Menu close_menu = new Gtk.Menu();
-    private Gtk.ImageMenuItem close_item = new Gtk.ImageMenuItem.from_stock(Gtk.Stock.CLOSE, null);
+    private Gtk.MenuItem close_item = new Gtk.MenuItem();
 
     // Text search box.
     protected class SearchBox : Gtk.ToolItem {
@@ -812,10 +801,10 @@ public class SearchFilterToolbar : Gtk.Toolbar {
             button = new Gtk.Button();
             button.set_image(get_filter_icon(RatingFilter.UNRATED_OR_HIGHER));
             button.set_can_focus(false);
+            button.set_relief(Gtk.ReliefStyle.NONE);
+            button.set_margin_start(2);
 
             button.clicked.connect(on_clicked);
-
-            restyle();
             
             set_homogeneous(false);
             
@@ -911,14 +900,6 @@ public class SearchFilterToolbar : Gtk.Toolbar {
         private int get_filter_button_size(RatingFilter filter) {
             return get_filter_icon_size(filter) + 2 * FILTER_BUTTON_MARGIN;
         }
-
-        public void restyle() {
-            string bgcolorname =
-                Resources.to_css_color(Config.Facade.get_instance().get_bg_color());
-            string stylesheet = Resources.SEARCH_BUTTON_STYLESHEET_TEMPLATE.printf(bgcolorname);
-            
-            Resources.style_widget(button, stylesheet);
-        }
     }
     
     public Gtk.UIManager ui = new Gtk.UIManager();
@@ -939,11 +920,12 @@ public class SearchFilterToolbar : Gtk.Toolbar {
     
     public SearchFilterToolbar(SearchFilterActions actions) {
         this.actions = actions;
+        toolbar = new Gtk.Toolbar();
         actions.media_context_changed.connect(on_media_context_changed);
         search_box = new SearchBox(actions.text);
         
-        set_name("search-filter-toolbar");
-        set_icon_size(Gtk.IconSize.SMALL_TOOLBAR);
+        toolbar.set_name("search-filter-toolbar");
+        toolbar.set_icon_size(Gtk.IconSize.SMALL_TOOLBAR);
         
         File ui_file = Resources.get_ui("search_bar.ui");
         try {
@@ -960,14 +942,14 @@ public class SearchFilterToolbar : Gtk.Toolbar {
         // Prepare the close menu for use, but don't
         // display it yet; we'll connect it to secondary
         // click later on.
-        ((Gtk.MenuItem) close_item).show();
-        close_item.always_show_image = true;
+        close_item.set_label(_("Close"));
+        close_item.show();
         close_item.activate.connect(on_context_menu_close_chosen);
         close_menu.append(close_item);
        
         // Type label and toggles
         label_type = new LabelToolItem(_("Type"), 10, 5);
-        insert(label_type, -1);
+        toolbar.insert(label_type, -1);
         
         toolbtn_photos = new ToggleActionToolButton(actions.photos);
         toolbtn_photos.set_tooltip_text(actions.get_action_group().get_action("CommonDisplayPhotos").tooltip);
@@ -978,47 +960,45 @@ public class SearchFilterToolbar : Gtk.Toolbar {
         toolbtn_raw = new ToggleActionToolButton(actions.raw);
         toolbtn_raw.set_tooltip_text(actions.get_action_group().get_action("CommonDisplayRaw").tooltip);
         
-        insert(toolbtn_photos, -1);
-        insert(toolbtn_videos, -1);
-        insert(toolbtn_raw, -1);
+        toolbar.insert(toolbtn_photos, -1);
+        toolbar.insert(toolbtn_videos, -1);
+        toolbar.insert(toolbtn_raw, -1);
         
         // separator
         sepr_mediatype_flagged = new Gtk.SeparatorToolItem();
-        insert(sepr_mediatype_flagged, -1);
+        toolbar.insert(sepr_mediatype_flagged, -1);
         
         // Flagged label and toggle
         label_flagged = new LabelToolItem(_("Flagged"));
-        insert(label_flagged, -1);
+        toolbar.insert(label_flagged, -1);
         
         toolbtn_flag = new ToggleActionToolButton(actions.flagged);
         toolbtn_flag.set_tooltip_text(actions.get_action_group().get_action("CommonDisplayFlagged").tooltip);
         
-        insert(toolbtn_flag, -1);
+        toolbar.insert(toolbtn_flag, -1);
         
         // separator
         sepr_flagged_rating = new Gtk.SeparatorToolItem();
-        insert(sepr_flagged_rating, -1);
+        toolbar.insert(sepr_flagged_rating, -1);
         
         // Rating label and button
         label_rating = new LabelToolItem(_("Rating"));
-        insert(label_rating, -1);
+        toolbar.insert(label_rating, -1);
         rating_button.filter_popup = (Gtk.Menu) ui.get_widget("/FilterPopupMenu");
         rating_button.set_expand(false);
         rating_button.clicked.connect(on_filter_button_clicked);
-        insert(rating_button, -1);
+        toolbar.insert(rating_button, -1);
         
         // Separator to right-align the text box
         Gtk.SeparatorToolItem separator_align = new Gtk.SeparatorToolItem();
         separator_align.set_expand(true);
         separator_align.set_draw(false);
-        insert(separator_align, -1);
+        toolbar.insert(separator_align, -1);
         
         // Search box.
-        insert(search_box, -1);
-        
-        // Set background color of toolbar and update them when the configuration is updated
-        Config.Facade.get_instance().bg_color_name_changed.connect(on_bg_color_name_changed);
-        on_bg_color_name_changed();
+        toolbar.insert(search_box, -1);
+
+        add(toolbar);
         
         // hook up signals to actions to be notified when they change
         actions.flagged_toggled.connect(on_flagged_toggled);
@@ -1030,14 +1010,13 @@ public class SearchFilterToolbar : Gtk.Toolbar {
         actions.criteria_changed.connect(on_criteria_changed);
         
         // #3260 part II Hook up close menu.
-        popup_context_menu.connect(on_context_menu_requested);
+        toolbar.popup_context_menu.connect(on_context_menu_requested);
         
         on_media_context_changed(actions.get_has_photos(), actions.get_has_videos(),
             actions.get_has_raw(), actions.get_has_flagged());
     }
     
     ~SearchFilterToolbar() {
-        Config.Facade.get_instance().bg_color_name_changed.disconnect(on_bg_color_name_changed);
         
         actions.media_context_changed.disconnect(on_media_context_changed);
 
@@ -1049,7 +1028,7 @@ public class SearchFilterToolbar : Gtk.Toolbar {
         actions.text_changed.disconnect(on_search_text_changed);
         actions.criteria_changed.disconnect(on_criteria_changed);
         
-        popup_context_menu.disconnect(on_context_menu_requested); 
+        toolbar.popup_context_menu.disconnect(on_context_menu_requested); 
     }
     
     private void on_media_context_changed(bool has_photos, bool has_videos, bool has_raw,
@@ -1075,24 +1054,6 @@ public class SearchFilterToolbar : Gtk.Toolbar {
             toolbtn_flag.set_icon_name(Resources.ICON_FILTER_FLAGGED_DISABLED);
     }
     
-    private void on_bg_color_name_changed() {
-        string bgcolorname =
-            Resources.to_css_color(Config.Facade.get_instance().get_bg_color());
-        string toolbar_stylesheet = Resources.TOOLBAR_STYLESHEET_TEMPLATE.printf(bgcolorname);
-        Resources.style_widget(this, toolbar_stylesheet);
-        
-        label_type.set_color(Config.Facade.get_instance().get_unselected_color());
-        label_flagged.set_color(Config.Facade.get_instance().get_unselected_color());
-        label_rating.set_color(Config.Facade.get_instance().get_unselected_color());
-        
-        toolbtn_photos.restyle();
-        toolbtn_videos.restyle();
-        toolbtn_raw.restyle();
-        toolbtn_flag.restyle();
-        rating_button.restyle();
-        
-    }
-    
     // Ticket #3260 part IV - display the context menu on secondary click
     private bool on_context_menu_requested(int x, int y, int button) { 
         close_menu.popup(null, null, null, button, Gtk.get_current_event_time()); 
diff --git a/src/SlideshowPage.vala b/src/SlideshowPage.vala
index f22fd53..654576d 100644
--- a/src/SlideshowPage.vala
+++ b/src/SlideshowPage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -44,8 +44,8 @@ class SlideshowPage : SinglePhotoPage {
             set_modal(true);
             set_transient_for(AppWindow.get_fullscreen());
             
-            add_buttons(Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL, 
-                Gtk.Stock.OK, Gtk.ResponseType.OK);
+            add_buttons(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL, 
+                Resources.OK_LABEL, Gtk.ResponseType.OK);
             set_title(_("Settings"));
             
             Gtk.Adjustment adjustment = new Gtk.Adjustment(delay, Config.Facade.SLIDESHOW_DELAY_MIN, Config.Facade.SLIDESHOW_DELAY_MAX, 0.1, 1, 0);
@@ -157,28 +157,29 @@ class SlideshowPage : SinglePhotoPage {
         Gtk.Toolbar toolbar = get_toolbar();
         
         // add toolbar buttons
-        Gtk.ToolButton previous_button = new Gtk.ToolButton.from_stock(Gtk.Stock.GO_BACK);
-        previous_button.set_label(_("Back"));
+        Gtk.ToolButton previous_button = new Gtk.ToolButton(null, _("Back"));
+        previous_button.set_icon_name("go-previous");
         previous_button.set_tooltip_text(_("Go to the previous photo"));
         previous_button.clicked.connect(on_previous_photo);
         
         toolbar.insert(previous_button, -1);
         
-        play_pause_button = new Gtk.ToolButton.from_stock(Gtk.Stock.MEDIA_PAUSE);
-        play_pause_button.set_label(_("Pause"));
+        play_pause_button = new Gtk.ToolButton(null, _("Pause"));
+        play_pause_button.set_icon_name("media-playback-pause");
         play_pause_button.set_tooltip_text(_("Pause the slideshow"));
         play_pause_button.clicked.connect(on_play_pause);
         
         toolbar.insert(play_pause_button, -1);
         
-        Gtk.ToolButton next_button = new Gtk.ToolButton.from_stock(Gtk.Stock.GO_FORWARD);
-        next_button.set_label(_("Next"));
+        Gtk.ToolButton next_button = new Gtk.ToolButton(null, _("Next"));
+        next_button.set_icon_name("go-next");
         next_button.set_tooltip_text(_("Go to the next photo"));
         next_button.clicked.connect(on_next_photo);
         
         toolbar.insert(next_button, -1);
 
-        settings_button = new Gtk.ToolButton.from_stock(Gtk.Stock.PREFERENCES);
+        settings_button = new Gtk.ToolButton(null, null);
+        settings_button.set_icon_name("preferences-system");
         settings_button.set_label(_("Settings"));
         settings_button.set_tooltip_text(_("Change slideshow settings"));
         settings_button.clicked.connect(on_change_settings);
@@ -265,11 +266,11 @@ class SlideshowPage : SinglePhotoPage {
 
     private void on_play_pause() {
         if (playing) {
-            play_pause_button.set_stock_id(Gtk.Stock.MEDIA_PLAY);
+            play_pause_button.set_icon_name("media-playback-start");
             play_pause_button.set_label(_("Play"));
             play_pause_button.set_tooltip_text(_("Continue the slideshow"));
         } else {
-            play_pause_button.set_stock_id(Gtk.Stock.MEDIA_PAUSE);
+            play_pause_button.set_icon_name("media-playback-pause");
             play_pause_button.set_label(_("Pause"));
             play_pause_button.set_tooltip_text(_("Pause the slideshow"));
         }
diff --git a/src/SortedList.vala b/src/SortedList.vala
index 791f9e0..ed8313f 100644
--- a/src/SortedList.vala
+++ b/src/SortedList.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/Tag.vala b/src/Tag.vala
index 450af20..8218a88 100644
--- a/src/Tag.vala
+++ b/src/Tag.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/Thumbnail.vala b/src/Thumbnail.vala
index c33d43b..4ce9e81 100644
--- a/src/Thumbnail.vala
+++ b/src/Thumbnail.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -161,8 +161,7 @@ public class Thumbnail : MediaSourceItem {
     }
     
     public static int64 title_ascending_comparator(void *a, void *b) {
-        int64 result = strcmp(((Thumbnail *) a)->media.get_name(), ((Thumbnail *) b)->media.get_name());
-        
+        int64 result = strcmp(((Thumbnail *) a)->get_natural_collation_key(), ((Thumbnail *) b)->get_natural_collation_key());
         return (result != 0) ? result : photo_id_ascending_comparator(a, b);
     }
     
@@ -194,6 +193,10 @@ public class Thumbnail : MediaSourceItem {
         return alteration.has_detail("metadata", "exposure-time");
     }
     
+    public static bool filename_comparator_predicate(DataObject object, Alteration alteration) {
+        return alteration.has_detail("metadata", "filename");
+    }
+
     public static int64 filename_ascending_comparator(void *a, void *b) {
         string path_a = ((Thumbnail *) a)->media.get_file().get_basename().down();
         string path_b = ((Thumbnail *) b)->media.get_file().get_basename().down();
diff --git a/src/ThumbnailCache.vala b/src/ThumbnailCache.vala
index c24087c..6408a1a 100644
--- a/src/ThumbnailCache.vala
+++ b/src/ThumbnailCache.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -86,6 +86,7 @@ public class ThumbnailCache : Object {
         public Gdk.Pixbuf scaled = null;
         public Error err = null;
         public bool fetched = false;
+        public bool replace = false;
         
         public AsyncFetchJob(ThumbnailCache cache, string thumbnail_name,
             ThumbnailSource source, Gdk.Pixbuf? prefetched, Dimensions dim,
@@ -131,38 +132,33 @@ public class ThumbnailCache : Object {
                 // scale if specified
                 scaled = dim.has_area() ? resize_pixbuf(unscaled, dim, interp) : unscaled;
             } catch (Error err) {
-                // Is the problem that the thumbnail couldn't be read? If so, it's recoverable;
-                // we'll just create it and leave this.err as null if creation works.
                 if (err is FileError) {
                     try {
-                        Photo photo = source as Photo;
-                        Video video = source as Video;
-
-                        if (photo != null) {
-                            unscaled = photo.get_pixbuf(Scaling.for_best_fit(dim.width, true));
-                            photo.notify_altered(new Alteration("image","thumbnail"));
-                            return;
-                        }
-
-                        if (video != null) {
-                            unscaled = video.create_thumbnail(dim.width);
-                            scaled = resize_pixbuf(unscaled, dim, interp);
-                            cache.save_thumbnail(cache.get_source_cached_file(source),
-                                unscaled, source);
-                            replace(source, cache.size, unscaled);
-                            return;
-                        }
-
-                    } catch (Error e) {
-                        // Creating the thumbnail failed; tell the rest of the app.
-                        this.err = e;
-                        return;
+                        generate_thumbnail();
+                    } catch (Error generr) {
+                        // save thumbnail generation error, not original, for processing in callback
+                        err = generr;
                     }
+                } else {
+                    // save error for processing in callback
+                    this.err = err;
                 }
-
-                // ...the original error wasn't from reading the file, but something else;
-                // tell the rest of the app.
-                this.err = err;
+            }
+        }
+        
+        private void generate_thumbnail() throws Error {
+            Photo? photo = source as Photo;
+            if (photo != null) {
+                unscaled = photo.get_pixbuf(Scaling.for_best_fit(dim.width, true));
+            } else {
+                Video? video = source as Video;
+                if (video != null)
+                    unscaled = video.create_thumbnail(dim.width);
+            }
+            
+            if (unscaled != null) {
+                scaled = resize_pixbuf(unscaled, dim, interp);
+                replace = true;
             }
         }
     }
@@ -420,6 +416,16 @@ public class ThumbnailCache : Object {
     private static void async_fetch_completion_callback(BackgroundJob background_job) {
         AsyncFetchJob job = (AsyncFetchJob) background_job;
         
+        // Is the problem that the thumbnail couldn't be read? If so, it's recoverable;
+        // we'll just create it and leave this.err as null if creation works.
+        if (job.replace && job.unscaled != null) {
+            try {
+                replace(job.source, job.cache.size, job.unscaled);
+            } catch (Error err) {
+                job.err = err;
+            }
+        }
+        
         if (job.unscaled != null) {
             if (job.fetched) {
                 // only store in cache if fetched, not pre-fetched
diff --git a/src/TimedQueue.vala b/src/TimedQueue.vala
index 7001421..d175c8d 100644
--- a/src/TimedQueue.vala
+++ b/src/TimedQueue.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/Tombstone.vala b/src/Tombstone.vala
index d25b979..6a95881 100644
--- a/src/Tombstone.vala
+++ b/src/Tombstone.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/UnityProgressBar.vala b/src/UnityProgressBar.vala
index fcf36bc..d28428e 100644
--- a/src/UnityProgressBar.vala
+++ b/src/UnityProgressBar.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/Upgrades.vala b/src/Upgrades.vala
index 7fef59a..d7ccf6f 100644
--- a/src/Upgrades.vala
+++ b/src/Upgrades.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/VideoMetadata.vala b/src/VideoMetadata.vala
index 100a040..5dfa812 100644
--- a/src/VideoMetadata.vala
+++ b/src/VideoMetadata.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/VideoMonitor.vala b/src/VideoMonitor.vala
index f062999..7f2fd3b 100644
--- a/src/VideoMonitor.vala
+++ b/src/VideoMonitor.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/VideoSupport.vala b/src/VideoSupport.vala
index e23ba37..4e6f3ed 100644
--- a/src/VideoSupport.vala
+++ b/src/VideoSupport.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -197,8 +197,11 @@ public class VideoReader {
             // (and the corresponding output struct) in order to implement #2836.
             Date? video_date = null;
             if (info.get_tags() != null && info.get_tags().get_date(Gst.Tags.DATE, out video_date)) {
-                timestamp = new DateTime.local(video_date.get_year(), video_date.get_month(), 
-                    video_date.get_day(), 0, 0, 0);
+                // possible for get_date() to return true and a null Date
+                if (video_date != null) {
+                    timestamp = new DateTime.local(video_date.get_year(), video_date.get_month(),
+                        video_date.get_day(), 0, 0, 0);
+                }
             }
         } catch (Error e) {
             debug("Video read error: %s", e.message);
diff --git a/src/camera/Branch.vala b/src/camera/Branch.vala
index 63a5443..83f3f56 100644
--- a/src/camera/Branch.vala
+++ b/src/camera/Branch.vala
@@ -1,17 +1,17 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
 public class Camera.Branch : Sidebar.Branch {
-    internal static Icon? cameras_icon = null;
+    internal static string? cameras_icon = Resources.ICON_CAMERAS;
     
     private Gee.HashMap<DiscoveredCamera, Camera.SidebarEntry> camera_map = new Gee.HashMap<
         DiscoveredCamera, Camera.SidebarEntry>();
     
     public Branch() {
-        base (new Camera.Grouping(),
+        base (new Camera.Header(),
             Sidebar.Branch.Options.HIDE_IF_EMPTY | Sidebar.Branch.Options.AUTO_OPEN_ON_NEW_CHILD,
             camera_comparator);
         
@@ -23,11 +23,9 @@ public class Camera.Branch : Sidebar.Branch {
     }
     
     internal static void init() {
-        cameras_icon = new GLib.ThemedIcon(Resources.ICON_CAMERAS);
     }
     
     internal static void terminate() {
-        cameras_icon = null;
     }
     
     private static int camera_comparator(Sidebar.Entry a, Sidebar.Entry b) {
@@ -82,9 +80,9 @@ public class Camera.Branch : Sidebar.Branch {
     }
 }
 
-public class Camera.Grouping : Sidebar.Grouping {
-    public Grouping() {
-        base (_("Cameras"), Camera.Branch.cameras_icon);
+public class Camera.Header : Sidebar.Header {
+    public Header() {
+        base (_("Cameras"));
     }
 }
 
@@ -101,7 +99,7 @@ public class Camera.SidebarEntry : Sidebar.SimplePageEntry {
         return camera.display_name ?? _("Camera");
     }
     
-    public override Icon? get_sidebar_icon() {
+    public override string? get_sidebar_icon() {
         return camera.icon ?? Camera.Branch.cameras_icon;
     }
     
diff --git a/src/camera/Camera.vala b/src/camera/Camera.vala
index f6d1f4b..84fff8e 100644
--- a/src/camera/Camera.vala
+++ b/src/camera/Camera.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/camera/CameraTable.vala b/src/camera/CameraTable.vala
index 8466388..bdeac54 100644
--- a/src/camera/CameraTable.vala
+++ b/src/camera/CameraTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -8,9 +8,9 @@ public class DiscoveredCamera {
     public GPhoto.Camera gcamera;
     public string uri;
     public string display_name;
-    public GLib.Icon? icon;
+    public string? icon;
     
-    public DiscoveredCamera(GPhoto.Camera gcamera, string uri, string display_name, GLib.Icon? icon) {
+    public DiscoveredCamera(GPhoto.Camera gcamera, string uri, string display_name, string? icon) {
         this.gcamera = gcamera;
         this.uri = uri;
         this.display_name = display_name;
@@ -221,10 +221,10 @@ public class CameraTable {
         return null;
     }
     
-    private GLib.Icon? get_icon_for_uuid(string uuid) {
+    private string? get_icon_for_uuid(string uuid) {
         foreach (Volume volume in volume_monitor.get_volumes()) {
             if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
-                return volume.get_icon();
+                return volume.get_icon().to_string();
             }
         }
         return null;
@@ -323,7 +323,7 @@ public class CameraTable {
         foreach (string port in detected_map.keys) {
             string name = detected_map.get(port);
             string display_name = null;
-            GLib.Icon? icon = null;
+            string? icon = null;
             string uri = get_port_uri(port);
 
             if (camera_map.has_key(uri)) {
diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala
index a1a46cb..41af0b2 100644
--- a/src/camera/GPhoto.vala
+++ b/src/camera/GPhoto.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index 823a458..ba66990 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -289,7 +289,7 @@ class ImportPreview : MediaSourceItem {
         bool using_placeholder = (pixbuf == null);
         if (pixbuf == null) {
             if (placeholder_preview == null) {
-                placeholder_preview = AppWindow.get_instance().render_icon(Gtk.Stock.MISSING_IMAGE, 
+                placeholder_preview = AppWindow.get_instance().render_icon("image-missing", 
                     Gtk.IconSize.DIALOG, null);
                 placeholder_preview = scale_pixbuf(placeholder_preview, MAX_SCALE,
                     Gdk.InterpType.BILINEAR, true);
@@ -691,7 +691,7 @@ public class ImportPage : CheckerboardPage {
     private string camera_name;
     private VolumeMonitor volume_monitor = null;
     private ImportPage? local_ref = null;
-    private GLib.Icon? icon;
+    private string? icon;
     private ImportPageSearchViewFilter search_filter = new ImportPageSearchViewFilter();
     private HideImportedViewFilter hide_imported_filter = new HideImportedViewFilter();
     private CameraViewTracker tracker;
@@ -707,7 +707,7 @@ public class ImportPage : CheckerboardPage {
         LIBRARY_ERROR
     }
     
-    public ImportPage(GPhoto.Camera camera, string uri, string? display_name = null, GLib.Icon? icon = null) {
+    public ImportPage(GPhoto.Camera camera, string uri, string? display_name = null, string? icon = null) {
         base(_("Camera"));
         this.camera = camera;
         this.uri = uri;
@@ -810,13 +810,15 @@ public class ImportPage : CheckerboardPage {
             toolbar.insert(new Gtk.SeparatorToolItem(), -1);
             
             // Import selected
-            Gtk.ToolButton import_selected_button = new Gtk.ToolButton.from_stock(Resources.IMPORT);
+            Gtk.ToolButton import_selected_button = new Gtk.ToolButton(null, null);
+            import_selected_button.set_icon_name(Resources.IMPORT);
             import_selected_button.set_related_action(get_action("ImportSelected"));
             
             toolbar.insert(import_selected_button, -1);
             
             // Import all
-            Gtk.ToolButton import_all_button = new Gtk.ToolButton.from_stock(Resources.IMPORT_ALL);
+            Gtk.ToolButton import_all_button = new Gtk.ToolButton(null, null);
+            import_all_button.set_icon_name(Resources.IMPORT_ALL);
             import_all_button.set_related_action(get_action("ImportAll"));
             
             toolbar.insert(import_all_button, -1);
@@ -1736,7 +1738,7 @@ public class ImportPage : CheckerboardPage {
                 photos_string, videos_string, both_string, neither_string);
 
             ImportUI.QuestionParams question = new ImportUI.QuestionParams(
-                question_string, Gtk.Stock.DELETE, _("_Keep"));
+                question_string, Resources.DELETE_LABEL, _("_Keep"));
         
             if (!ImportUI.report_manifest(manifest, false, question))
                 return;
diff --git a/src/config/Config.vala b/src/config/Config.vala
index 2095107..588c466 100644
--- a/src/config/Config.vala
+++ b/src/config/Config.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/config/ConfigurationInterfaces.vala b/src/config/ConfigurationInterfaces.vala
index 42a591a..41ae188 100644
--- a/src/config/ConfigurationInterfaces.vala
+++ b/src/config/ConfigurationInterfaces.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/config/GSettingsEngine.vala b/src/config/GSettingsEngine.vala
index 0b2e691..1586684 100644
--- a/src/config/GSettingsEngine.vala
+++ b/src/config/GSettingsEngine.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/core/Alteration.vala b/src/core/Alteration.vala
index 865be84..ecb8142 100644
--- a/src/core/Alteration.vala
+++ b/src/core/Alteration.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/core/ContainerSourceCollection.vala b/src/core/ContainerSourceCollection.vala
index 655cfa0..24e2d89 100644
--- a/src/core/ContainerSourceCollection.vala
+++ b/src/core/ContainerSourceCollection.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/core/Core.vala b/src/core/Core.vala
index 1b9958e..b646f02 100644
--- a/src/core/Core.vala
+++ b/src/core/Core.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/core/DataCollection.vala b/src/core/DataCollection.vala
index 615c6ac..0e8041d 100644
--- a/src/core/DataCollection.vala
+++ b/src/core/DataCollection.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/core/DataObject.vala b/src/core/DataObject.vala
index 1fe133d..85ec63f 100644
--- a/src/core/DataObject.vala
+++ b/src/core/DataObject.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/core/DataSet.vala b/src/core/DataSet.vala
index ebb5500..dc11422 100644
--- a/src/core/DataSet.vala
+++ b/src/core/DataSet.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/core/DataSource.vala b/src/core/DataSource.vala
index e4d2d34..514ef9b 100644
--- a/src/core/DataSource.vala
+++ b/src/core/DataSource.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/core/DataSourceTypes.vala b/src/core/DataSourceTypes.vala
index 9f23ac6..f7ebec1 100644
--- a/src/core/DataSourceTypes.vala
+++ b/src/core/DataSourceTypes.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/core/DataView.vala b/src/core/DataView.vala
index 07cd4fc..c70b9b4 100644
--- a/src/core/DataView.vala
+++ b/src/core/DataView.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/core/DataViewTypes.vala b/src/core/DataViewTypes.vala
index fac7602..fe7bffd 100644
--- a/src/core/DataViewTypes.vala
+++ b/src/core/DataViewTypes.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/core/DatabaseSourceCollection.vala b/src/core/DatabaseSourceCollection.vala
index 0c704bb..917c50d 100644
--- a/src/core/DatabaseSourceCollection.vala
+++ b/src/core/DatabaseSourceCollection.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/core/SourceCollection.vala b/src/core/SourceCollection.vala
index 020df0e..9e2af57 100644
--- a/src/core/SourceCollection.vala
+++ b/src/core/SourceCollection.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/core/SourceHoldingTank.vala b/src/core/SourceHoldingTank.vala
index adfec8b..a3fb1c6 100644
--- a/src/core/SourceHoldingTank.vala
+++ b/src/core/SourceHoldingTank.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/core/SourceInterfaces.vala b/src/core/SourceInterfaces.vala
index 59956d3..958e4b3 100644
--- a/src/core/SourceInterfaces.vala
+++ b/src/core/SourceInterfaces.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/core/Tracker.vala b/src/core/Tracker.vala
index e72992b..3f5d39a 100644
--- a/src/core/Tracker.vala
+++ b/src/core/Tracker.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/core/ViewCollection.vala b/src/core/ViewCollection.vala
index a34e23e..5577681 100644
--- a/src/core/ViewCollection.vala
+++ b/src/core/ViewCollection.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/core/util.vala b/src/core/util.vala
index 1846380..0460454 100644
--- a/src/core/util.vala
+++ b/src/core/util.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/data_imports/DataImportJob.vala b/src/data_imports/DataImportJob.vala
index b27997c..df5aebe 100644
--- a/src/data_imports/DataImportJob.vala
+++ b/src/data_imports/DataImportJob.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -157,6 +157,10 @@ public class DataImportJob : BatchImportJob {
         string? title = src_photo.get_title();
         if (title != null)
             photo.set_title(title);
+        // exposure time
+        time_t? date_time = src_photo.get_exposure_time();
+        if (date_time != null)
+            photo.set_exposure_time(date_time);
         // import ID
         photo.set_import_id(import_roll.import_id);
         
diff --git a/src/data_imports/DataImportSource.vala b/src/data_imports/DataImportSource.vala
index d7e8ec8..f60c06d 100644
--- a/src/data_imports/DataImportSource.vala
+++ b/src/data_imports/DataImportSource.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -48,9 +48,16 @@ public class DataImportSource {
                 warning("Could not get file metadata for %s: %s", get_filename(), e.message);
                 metadata = null;
             }
-            
-            title = (metadata != null) ? metadata.get_title() : null;
-            exposure_time = (metadata != null) ? metadata.get_exposure_date_time() : null;
+            title = db_photo.get_title();
+            if (title == null) {
+                title = (metadata != null) ? metadata.get_title() : null;
+            }
+            time_t? date_time = db_photo.get_exposure_time();
+            if (date_time != null) {
+                exposure_time = new MetadataDateTime(date_time);
+            } else {
+                exposure_time = (metadata != null) ? metadata.get_exposure_date_time() : null;
+            }
             PhotoPreview? preview = metadata != null ? metadata.get_preview(0) : null;
             if (preview != null) {
                 try {
diff --git a/src/data_imports/DataImports.vala b/src/data_imports/DataImports.vala
index 72c8b4d..1406d71 100644
--- a/src/data_imports/DataImports.vala
+++ b/src/data_imports/DataImports.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/data_imports/DataImportsPluginHost.vala b/src/data_imports/DataImportsPluginHost.vala
index f92bc53..f783e1f 100644
--- a/src/data_imports/DataImportsPluginHost.vala
+++ b/src/data_imports/DataImportsPluginHost.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/data_imports/DataImportsUI.vala b/src/data_imports/DataImportsUI.vala
index 9b171b1..7b975a7 100644
--- a/src/data_imports/DataImportsUI.vala
+++ b/src/data_imports/DataImportsUI.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -202,19 +202,19 @@ public class DataImportsDialog : Gtk.Dialog {
     public const int STANDARD_ACTION_BUTTON_WIDTH = 128;
 
     private Gtk.ComboBoxText service_selector_box;
-    private Gtk.Label service_selector_box_label;
     private Gtk.Box central_area_layouter;
     private Gtk.Button close_cancel_button;
     private Spit.DataImports.DialogPane active_pane;
     private Spit.DataImports.ConcreteDataImportsHost host;
 
     protected DataImportsDialog() {
+        Object(use_header_bar: 1);
+        ((Gtk.HeaderBar) get_header_bar()).set_show_close_button(false);
 
         resizable = false;
         delete_event.connect(on_window_close);
         
         string title = _("Import From Application");
-        string label = _("Import media _from:");
         
         set_title(title);
 
@@ -225,9 +225,6 @@ public class DataImportsDialog : Gtk.Dialog {
             // service to select from
             service_selector_box = new Gtk.ComboBoxText();
             service_selector_box.set_active(0);
-            service_selector_box_label = new Gtk.Label.with_mnemonic(label);
-            service_selector_box_label.set_mnemonic_widget(service_selector_box);
-            service_selector_box_label.set_alignment(0.0f, 0.5f);
 
             // get the name of the service the user last used
             string? last_used_service = Config.Facade.get_instance().get_last_used_dataimports_service();
@@ -248,30 +245,6 @@ public class DataImportsDialog : Gtk.Dialog {
                 service_selector_box.set_active(0);
 
             service_selector_box.changed.connect(on_service_changed);
-
-            /* the wrapper is not an extraneous widget -- it's necessary to prevent the service
-               selection box from growing and shrinking whenever its parent's size changes.
-               When wrapped inside a Gtk.Alignment, the Alignment grows and shrinks instead of
-               the service selection box. */
-            Gtk.Alignment service_selector_box_wrapper = new Gtk.Alignment(1.0f, 0.5f, 0.0f, 0.0f);
-            service_selector_box_wrapper.add(service_selector_box);
-
-            Gtk.Box service_selector_layouter = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8);
-            service_selector_layouter.set_border_width(12);
-            service_selector_layouter.add(service_selector_box_label);
-            service_selector_layouter.pack_start(service_selector_box_wrapper, true, true, 0);
-            
-            /* 'service area' is the selector assembly plus the horizontal rule dividing it from the
-               rest of the dialog */
-            Gtk.Box service_area_layouter = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-            service_area_layouter.pack_start(service_selector_layouter, true, true, 0);
-            Gtk.Separator service_central_separator = new Gtk.Separator(Gtk.Orientation.HORIZONTAL);
-            service_area_layouter.add(service_central_separator);
-            
-            Gtk.Alignment service_area_wrapper = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 0.0f);
-            service_area_wrapper.add(service_area_layouter);
-
-            ((Gtk.Box) get_content_area()).pack_start(service_area_wrapper, false, false, 0);
         }
         
         // Intall the central area in all cases
@@ -281,7 +254,9 @@ public class DataImportsDialog : Gtk.Dialog {
         close_cancel_button = new Gtk.Button.with_mnemonic("_Cancel");
         close_cancel_button.set_can_default(true);
         close_cancel_button.clicked.connect(on_close_cancel_clicked);
-        ((Gtk.Box) get_action_area()).add(close_cancel_button);
+
+        ((Gtk.HeaderBar) get_header_bar()).pack_start(close_cancel_button);
+        ((Gtk.HeaderBar) get_header_bar()).pack_end(service_selector_box);
 
         set_standard_window_mode();
         
diff --git a/src/db/DatabaseTable.vala b/src/db/DatabaseTable.vala
index 55d440d..235ac06 100644
--- a/src/db/DatabaseTable.vala
+++ b/src/db/DatabaseTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/db/Db.vala b/src/db/Db.vala
index ced530a..c6b69d9 100644
--- a/src/db/Db.vala
+++ b/src/db/Db.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/db/EventTable.vala b/src/db/EventTable.vala
index 016fa00..04310b8 100644
--- a/src/db/EventTable.vala
+++ b/src/db/EventTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/db/PhotoTable.vala b/src/db/PhotoTable.vala
index 9891fe6..21a8d5e 100644
--- a/src/db/PhotoTable.vala
+++ b/src/db/PhotoTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/db/SavedSearchDBTable.vala b/src/db/SavedSearchDBTable.vala
index d986038..9baab4e 100644
--- a/src/db/SavedSearchDBTable.vala
+++ b/src/db/SavedSearchDBTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/db/TagTable.vala b/src/db/TagTable.vala
index a0fade8..05b2daa 100644
--- a/src/db/TagTable.vala
+++ b/src/db/TagTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/db/TombstoneTable.vala b/src/db/TombstoneTable.vala
index 9e108bd..861cba4 100644
--- a/src/db/TombstoneTable.vala
+++ b/src/db/TombstoneTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/db/VersionTable.vala b/src/db/VersionTable.vala
index 9003b1b..3711b83 100644
--- a/src/db/VersionTable.vala
+++ b/src/db/VersionTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/db/VideoTable.vala b/src/db/VideoTable.vala
index c681dc2..bd45750 100644
--- a/src/db/VideoTable.vala
+++ b/src/db/VideoTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/direct/Direct.vala b/src/direct/Direct.vala
index dd2a847..59680b1 100644
--- a/src/direct/Direct.vala
+++ b/src/direct/Direct.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/direct/DirectPhoto.vala b/src/direct/DirectPhoto.vala
index f7271ba..9cd86f9 100644
--- a/src/direct/DirectPhoto.vala
+++ b/src/direct/DirectPhoto.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/direct/DirectPhotoPage.vala b/src/direct/DirectPhotoPage.vala
index 4dfd520..58d82fc 100644
--- a/src/direct/DirectPhotoPage.vala
+++ b/src/direct/DirectPhotoPage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -46,13 +46,13 @@ public class DirectPhotoPage : EditingHostPage {
         file.label = _("_File");
         actions += file;
 
-        Gtk.ActionEntry save = { "Save", Gtk.Stock.SAVE, TRANSLATABLE, "<Ctrl>S", TRANSLATABLE,
+        Gtk.ActionEntry save = { "Save", Resources.SAVE_LABEL, TRANSLATABLE, "<Ctrl>S", TRANSLATABLE,
             on_save };
         save.label = _("_Save");
         save.tooltip = _("Save photo");
         actions += save;
 
-        Gtk.ActionEntry save_as = { "SaveAs", Gtk.Stock.SAVE_AS, TRANSLATABLE,
+        Gtk.ActionEntry save_as = { "SaveAs", Resources.SAVE_AS_LABEL, TRANSLATABLE,
             "<Ctrl><Shift>S", TRANSLATABLE, on_save_as };
         save_as.label = _("Save _As...");
         save_as.tooltip = _("Save photo with a different name");
@@ -63,7 +63,7 @@ public class DirectPhotoPage : EditingHostPage {
         send_to.label = Resources.SEND_TO_MENU;
         actions += send_to;
 
-        Gtk.ActionEntry print = { "Print", Gtk.Stock.PRINT, TRANSLATABLE, "<Ctrl>P",
+        Gtk.ActionEntry print = { "Print", Resources.PRINT_LABEL, TRANSLATABLE, "<Ctrl>P",
             TRANSLATABLE, on_print };
         print.label = Resources.PRINT_MENU;
         print.tooltip = _("Print the photo to a printer connected to your computer");
@@ -81,13 +81,13 @@ public class DirectPhotoPage : EditingHostPage {
         tools.label = _("T_ools");
         actions += tools;
         
-        Gtk.ActionEntry prev = { "PrevPhoto", Gtk.Stock.GO_BACK, TRANSLATABLE, null,
+        Gtk.ActionEntry prev = { "PrevPhoto", Resources.PREVIOUS_LABEL, TRANSLATABLE, null,
             TRANSLATABLE, on_previous_photo };
         prev.label = _("_Previous Photo");
         prev.tooltip = _("Previous Photo");
         actions += prev;
 
-        Gtk.ActionEntry next = { "NextPhoto", Gtk.Stock.GO_FORWARD, TRANSLATABLE, null,
+        Gtk.ActionEntry next = { "NextPhoto", Resources.NEXT_LABEL, TRANSLATABLE, null,
             TRANSLATABLE, on_next_photo };
         next.label = _("_Next Photo");
         next.tooltip = _("Next Photo");
@@ -127,7 +127,7 @@ public class DirectPhotoPage : EditingHostPage {
         crop.tooltip = Resources.CROP_TOOLTIP;
         actions += crop;
         
-        Gtk.ActionEntry straighten = { "Straighten", Gtk.Stock.REFRESH, TRANSLATABLE, "<Ctrl>A",
+        Gtk.ActionEntry straighten = { "Straighten", Resources.REFRESH_LABEL, TRANSLATABLE, "<Ctrl>A",
             TRANSLATABLE, toggle_straighten };
         straighten.label = Resources.STRAIGHTEN_MENU;
         straighten.tooltip = Resources.STRAIGHTEN_TOOLTIP;
@@ -145,7 +145,7 @@ public class DirectPhotoPage : EditingHostPage {
         adjust.tooltip = Resources.ADJUST_TOOLTIP;
         actions += adjust;
         
-        Gtk.ActionEntry revert = { "Revert", Gtk.Stock.REVERT_TO_SAVED, TRANSLATABLE,
+        Gtk.ActionEntry revert = { "Revert", Resources.REVERT_LABEL, TRANSLATABLE,
             null, TRANSLATABLE, on_revert };
         revert.label = Resources.REVERT_MENU;
         actions += revert;
@@ -169,25 +169,25 @@ public class DirectPhotoPage : EditingHostPage {
         help.label = _("_Help");
         actions += help;
 
-        Gtk.ActionEntry increase_size = { "IncreaseSize", Gtk.Stock.ZOOM_IN, TRANSLATABLE,
+        Gtk.ActionEntry increase_size = { "IncreaseSize", Resources.ZOOM_IN_LABEL, TRANSLATABLE,
             "<Ctrl>plus", TRANSLATABLE, on_increase_size };
         increase_size.label = _("Zoom _In");
         increase_size.tooltip = _("Increase the magnification of the photo");
         actions += increase_size;
 
-        Gtk.ActionEntry decrease_size = { "DecreaseSize", Gtk.Stock.ZOOM_OUT, TRANSLATABLE,
+        Gtk.ActionEntry decrease_size = { "DecreaseSize", Resources.ZOOM_OUT_LABEL, TRANSLATABLE,
             "<Ctrl>minus", TRANSLATABLE, on_decrease_size };
         decrease_size.label = _("Zoom _Out");
         decrease_size.tooltip = _("Decrease the magnification of the photo");
         actions += decrease_size;
 
-        Gtk.ActionEntry best_fit = { "ZoomFit", Gtk.Stock.ZOOM_FIT, TRANSLATABLE,
+        Gtk.ActionEntry best_fit = { "ZoomFit", Resources.ZOOM_FIT_LABEL, TRANSLATABLE,
             "<Ctrl>0", TRANSLATABLE, snap_zoom_to_min };
         best_fit.label = _("Fit to _Page");
         best_fit.tooltip = _("Zoom the photo to fit on the screen");
         actions += best_fit;
 
-        Gtk.ActionEntry actual_size = { "Zoom100", Gtk.Stock.ZOOM_100, TRANSLATABLE,
+        Gtk.ActionEntry actual_size = { "Zoom100", Resources.ZOOM_100_LABEL, TRANSLATABLE,
             "<Ctrl>1", TRANSLATABLE, snap_zoom_to_isomorphic };
         /// xgettext:no-c-format
         actual_size.label = _("Zoom _100%");
@@ -324,10 +324,15 @@ public class DirectPhotoPage : EditingHostPage {
     }
     
     protected override bool on_double_click(Gdk.EventButton event) {
-        AppWindow.get_instance().end_fullscreen();
+        FullscreenWindow? fs = get_container() as FullscreenWindow;
+        if (fs != null) {
+            fs.close();
+            
+            return true;
+        }
         
         return base.on_double_click(event);
-    }    
+    }
     
     protected override void update_ui(bool missing) {
         bool sensitivity = !missing;
@@ -501,8 +506,8 @@ public class DirectPhotoPage : EditingHostPage {
         }
 
         Gtk.FileChooserDialog save_as_dialog = new Gtk.FileChooserDialog(_("Save As"), 
-            AppWindow.get_instance(), Gtk.FileChooserAction.SAVE, Gtk.Stock.CANCEL, 
-            Gtk.ResponseType.CANCEL, Gtk.Stock.OK, Gtk.ResponseType.OK);
+            AppWindow.get_instance(), Gtk.FileChooserAction.SAVE, Resources.CANCEL_LABEL, 
+            Gtk.ResponseType.CANCEL, Resources.OK_LABEL, Gtk.ResponseType.OK);
         save_as_dialog.set_select_multiple(false);
         save_as_dialog.set_current_name(filename);
         save_as_dialog.set_current_folder(current_save_dir.get_path());
diff --git a/src/direct/DirectView.vala b/src/direct/DirectView.vala
index a36ec68..6f37850 100644
--- a/src/direct/DirectView.vala
+++ b/src/direct/DirectView.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/direct/DirectWindow.vala b/src/direct/DirectWindow.vala
index b339ac4..35729b7 100644
--- a/src/direct/DirectWindow.vala
+++ b/src/direct/DirectWindow.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/editing_tools/EditingTools.vala b/src/editing_tools/EditingTools.vala
index f5fb144..6c91011 100644
--- a/src/editing_tools/EditingTools.vala
+++ b/src/editing_tools/EditingTools.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -647,7 +647,7 @@ public class CropTool : EditingTool {
         private const int CONTROL_SPACING = 8;
 
         public Gtk.Button ok_button = new Gtk.Button.with_label(Resources.CROP_LABEL);
-        public Gtk.Button cancel_button = new Gtk.Button.from_stock(Gtk.Stock.CANCEL);
+        public Gtk.Button cancel_button = new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL);
         public Gtk.ComboBox constraint_combo;
         public Gtk.Button pivot_reticle_button = new Gtk.Button();
         public Gtk.Entry custom_width_entry = new Gtk.Entry();
@@ -1890,9 +1890,9 @@ public class RedeyeTool : EditingTool {
         private Gtk.Label slider_label = new Gtk.Label.with_mnemonic(_("Size:"));
 
         public Gtk.Button apply_button =
-            new Gtk.Button.from_stock(Gtk.Stock.APPLY);
+            new Gtk.Button.with_mnemonic(Resources.APPLY_LABEL);
         public Gtk.Button close_button =
-            new Gtk.Button.from_stock(Gtk.Stock.CLOSE);
+            new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL);
         public Gtk.Scale slider = new Gtk.Scale.with_range(Gtk.Orientation.HORIZONTAL,
             RedeyeInstance.MIN_RADIUS, RedeyeInstance.MAX_RADIUS, 1.0);
 
@@ -2240,9 +2240,9 @@ public class AdjustTool : EditingTool {
             HighlightDetailTransformation.MIN_PARAMETER, HighlightDetailTransformation.MAX_PARAMETER,
             1.0);
 
-        public Gtk.Button ok_button = new Gtk.Button.from_stock(Gtk.Stock.OK);
+        public Gtk.Button ok_button = new Gtk.Button.with_mnemonic(Resources.OK_LABEL);
         public Gtk.Button reset_button = new Gtk.Button.with_mnemonic(_("_Reset"));
-        public Gtk.Button cancel_button = new Gtk.Button.from_stock(Gtk.Stock.CANCEL);
+        public Gtk.Button cancel_button = new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL);
         public RGBHistogramManipulator histogram_manipulator = new RGBHistogramManipulator();
 
         public AdjustToolWindow(Gtk.Window container) {
diff --git a/src/editing_tools/StraightenTool.vala b/src/editing_tools/StraightenTool.vala
index 8a778ec..e2b117e 100644
--- a/src/editing_tools/StraightenTool.vala
+++ b/src/editing_tools/StraightenTool.vala
@@ -1,5 +1,5 @@
 
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -98,7 +98,7 @@ public class StraightenTool : EditingTool {
         public Gtk.Label angle_label = new Gtk.Label("");
         public Gtk.Label description_label = new Gtk.Label(_("Angle:"));
         public Gtk.Button ok_button = new Gtk.Button.with_mnemonic(_("_Straighten"));
-        public Gtk.Button cancel_button = new Gtk.Button.from_stock(Gtk.Stock.CANCEL);
+        public Gtk.Button cancel_button = new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL);
         public Gtk.Button reset_button = new Gtk.Button.with_mnemonic(_("_Reset"));
 
         /**
diff --git a/src/events/Branch.vala b/src/events/Branch.vala
index e1b5221..1093411 100644
--- a/src/events/Branch.vala
+++ b/src/events/Branch.vala
@@ -1,15 +1,14 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
 public class Events.Branch : Sidebar.Branch {
-    internal static Icon open_icon;
-    internal static Icon closed_icon;
-    internal static Icon events_icon;
-    internal static Icon single_event_icon;
-    internal static Icon no_event_icon;
+    internal static string icon = Resources.ICON_FOLDER;
+    internal static string events_icon = Resources.ICON_EVENTS;
+    internal static string single_event_icon = Resources.ICON_ONE_EVENT;
+    internal static string no_event_icon = Resources.ICON_NO_EVENT;
     
     // NOTE: Because the comparators must be static methods (due to CompareFunc's stupid impl.)
     // and there's an assumption that only one Events.Branch is ever created, this is a static
@@ -20,11 +19,14 @@ public class Events.Branch : Sidebar.Branch {
         Event, Events.EventEntry>();
     private Events.UndatedDirectoryEntry undated_entry = new Events.UndatedDirectoryEntry();
     private Events.NoEventEntry no_event_entry = new Events.NoEventEntry();
+    private Events.MasterDirectoryEntry all_events_entry = new Events.MasterDirectoryEntry();
     
     public Branch() {
-        base (new Events.MasterDirectoryEntry(), Sidebar.Branch.Options.STARTUP_EXPAND_TO_FIRST_CHILD,
+        base (new Sidebar.Header(_("Events")), Sidebar.Branch.Options.STARTUP_EXPAND_TO_FIRST_CHILD,
             event_year_comparator);
         
+        graft(get_root(), all_events_entry);
+        
         // seed the branch
         foreach (DataObject object in Event.global.get_all())
             add_event((Event) object);
@@ -49,25 +51,18 @@ public class Events.Branch : Sidebar.Branch {
     }
     
     internal static void init() {
-        open_icon = new ThemedIcon(Resources.ICON_FOLDER_OPEN);
-        closed_icon = new ThemedIcon(Resources.ICON_FOLDER_CLOSED);
-        events_icon = new ThemedIcon(Resources.ICON_EVENTS);
-        single_event_icon = new ThemedIcon(Resources.ICON_ONE_EVENT);
-        no_event_icon = new ThemedIcon(Resources.ICON_NO_EVENT);
-        
         sort_ascending = Config.Facade.get_instance().get_events_sort_ascending();
     }
     
     internal static void terminate() {
-        open_icon = null;
-        closed_icon = null;
-        events_icon = null;
-        single_event_icon = null;
-        no_event_icon = null;
+    }
+    
+    public bool is_user_renameable() {
+        return true;
     }
     
     public Events.MasterDirectoryEntry get_master_entry() {
-        return (Events.MasterDirectoryEntry) get_root();
+        return all_events_entry;
     }
     
     private static int event_year_comparator(Sidebar.Entry a, Sidebar.Entry b) {
@@ -91,6 +86,12 @@ public class Events.Branch : Sidebar.Branch {
         else if (b is Events.NoEventEntry)
             return -1;
         
+        // The All events entry should always appear on top
+        if (a is Events.MasterDirectoryEntry)
+            return -1;
+        else if (b is Events.MasterDirectoryEntry)
+            return 1;
+        
         if (!sort_ascending) {
             Sidebar.Entry swap = a;
             a = b;
@@ -312,7 +313,8 @@ public class Events.Branch : Sidebar.Branch {
         int event_year = event_tm.year + 1900;
         
         return find_first_child(get_root(), (entry) => {
-            if ((entry is Events.UndatedDirectoryEntry) || (entry is Events.NoEventEntry))
+            if ((entry is Events.UndatedDirectoryEntry) || (entry is Events.NoEventEntry) || 
+                 entry is Events.MasterDirectoryEntry)
                 return false;
             else
                 return ((Events.YearDirectoryEntry) entry).get_year() == event_year;
@@ -334,11 +336,11 @@ public class Events.Branch : Sidebar.Branch {
     }
     
     private void graft_event(Sidebar.Entry parent, Event event,
-        owned CompareDataFunc<Sidebar.Entry>? comparator = null) {
+        owned CompareFunc<Sidebar.Entry>? comparator = null) {
         Events.EventEntry entry = new Events.EventEntry(event);
         entry_map.set(event, entry);
         
-        graft(parent, entry, (owned) comparator);
+        graft(parent, entry, comparator);
     }
     
     private void reparent_event(Event event, Sidebar.Entry new_parent) {
@@ -372,16 +374,8 @@ public abstract class Events.DirectoryEntry : Sidebar.SimplePageEntry, Sidebar.E
     public DirectoryEntry() {
     }
     
-    public override Icon? get_sidebar_icon() {
-        return null;
-    }
-    
-    public virtual Icon? get_sidebar_open_icon() {
-        return Events.Branch.open_icon;
-    }
-    
-    public virtual Icon? get_sidebar_closed_icon() {
-        return Events.Branch.closed_icon;
+    public override string? get_sidebar_icon() {
+        return Events.Branch.icon;
     }
     
     public bool expand_on_select() {
@@ -397,15 +391,7 @@ public class Events.MasterDirectoryEntry : Events.DirectoryEntry {
         return MasterEventsDirectoryPage.NAME;
     }
     
-    public override Icon? get_sidebar_icon() {
-        return Events.Branch.events_icon;
-    }
-    
-    public override Icon? get_sidebar_open_icon() {
-        return Events.Branch.events_icon;
-    }
-    
-    public override Icon? get_sidebar_closed_icon() {
+    public override string? get_sidebar_icon() {
         return Events.Branch.events_icon;
     }
     
@@ -492,7 +478,7 @@ public class Events.EventEntry : Sidebar.SimplePageEntry, Sidebar.RenameableEntr
         return event.get_name();
     }
     
-    public override Icon? get_sidebar_icon() {
+    public override string? get_sidebar_icon() {
         return Events.Branch.single_event_icon;
     }
     
@@ -500,6 +486,10 @@ public class Events.EventEntry : Sidebar.SimplePageEntry, Sidebar.RenameableEntr
         return new EventPage(event);
     }
     
+    public bool is_user_renameable() {
+        return true;
+    }
+    
     public void rename(string new_name) {
         string? prepped = Event.prep_event_name(new_name);
         if (prepped != null)
@@ -523,6 +513,7 @@ public class Events.EventEntry : Sidebar.SimplePageEntry, Sidebar.RenameableEntr
     }
 }
 
+
 public class Events.NoEventEntry : Sidebar.SimplePageEntry {
     public NoEventEntry() {
     }
@@ -531,7 +522,7 @@ public class Events.NoEventEntry : Sidebar.SimplePageEntry {
         return NoEventPage.NAME;
     }
     
-    public override Icon? get_sidebar_icon() {
+    public override string? get_sidebar_icon() {
         return Events.Branch.no_event_icon;
     }
     
diff --git a/src/events/EventDirectoryItem.vala b/src/events/EventDirectoryItem.vala
index 5b2026b..d3434c2 100644
--- a/src/events/EventDirectoryItem.vala
+++ b/src/events/EventDirectoryItem.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/events/EventPage.vala b/src/events/EventPage.vala
index 3d23f25..ed103a8 100644
--- a/src/events/EventPage.vala
+++ b/src/events/EventPage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/events/Events.vala b/src/events/Events.vala
index dc2b662..f93e33c 100644
--- a/src/events/Events.vala
+++ b/src/events/Events.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/events/EventsDirectoryPage.vala b/src/events/EventsDirectoryPage.vala
index 41a1ac6..99601a0 100644
--- a/src/events/EventsDirectoryPage.vala
+++ b/src/events/EventsDirectoryPage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -227,7 +227,7 @@ public abstract class EventsDirectoryPage : CheckerboardPage {
 }
 
 public class MasterEventsDirectoryPage : EventsDirectoryPage {
-    public const string NAME = _("Events");
+    public const string NAME = _("All Events");
     
     public MasterEventsDirectoryPage() {
         base (NAME, new EventDirectoryManager(), (Gee.Collection<Event>) Event.global.get_all());
diff --git a/src/folders/Branch.vala b/src/folders/Branch.vala
index bc5b578..0904e5c 100644
--- a/src/folders/Branch.vala
+++ b/src/folders/Branch.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2014 Yorba Foundation
+/* Copyright 2012-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -136,9 +136,9 @@ public class Folders.Branch : Sidebar.Branch {
     }
 }
 
-private class Folders.Root : Sidebar.Grouping {
+private class Folders.Root : Sidebar.Header {
     public Root() {
-        base (_("Folders"), Folders.opened_icon, Folders.closed_icon);
+        base (_("Folders"));
     }
 }
 
@@ -172,22 +172,14 @@ public class Folders.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.ExpandableE
         return dir.get_basename();
     }
     
-    public override Icon? get_sidebar_icon() {
-        return count == 0 ? closed_icon : have_photos_icon;
+    public override string? get_sidebar_icon() {
+        return count == 0 ? icon : have_photos_icon;
     }
     
     public override string to_string() {
         return dir.get_path();
     }
     
-    public Icon? get_sidebar_open_icon() {
-        return count == 0 ? opened_icon : have_photos_icon;
-    }
-    
-    public Icon? get_sidebar_closed_icon() {
-        return count == 0 ? closed_icon : have_photos_icon;
-    }
-    
     public bool expand_on_select() {
         return true;
     }
diff --git a/src/folders/Folders.vala b/src/folders/Folders.vala
index 1cc14b1..da6f817 100644
--- a/src/folders/Folders.vala
+++ b/src/folders/Folders.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2014 Yorba Foundation
+/* Copyright 2012-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -15,19 +15,16 @@
 
 namespace Folders {
 
-static Icon? opened_icon = null;
-static Icon? closed_icon = null;
-static Icon? have_photos_icon = null;
+static string? icon = null;
+static string? have_photos_icon = null;
 
 public void init() throws Error {
-    opened_icon = new ThemedIcon(Resources.ICON_FOLDER_OPEN);
-    closed_icon = new ThemedIcon(Resources.ICON_FOLDER_CLOSED);
-    have_photos_icon = new ThemedIcon(Resources.ICON_FOLDER_DOCUMENTS);
+    icon = Resources.ICON_FOLDER;
+    have_photos_icon = Resources.ICON_FOLDER_DOCUMENTS;
 }
 
 public void terminate() {
-    opened_icon = null;
-    closed_icon = null;
+    icon = null;
     have_photos_icon = null;
 }
 
diff --git a/src/folders/Page.vala b/src/folders/Page.vala
index d101e88..eb3a84f 100644
--- a/src/folders/Page.vala
+++ b/src/folders/Page.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2014 Yorba Foundation
+/* Copyright 2012-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/library/Branch.vala b/src/library/Branch.vala
index dc05d60..0e875d2 100644
--- a/src/library/Branch.vala
+++ b/src/library/Branch.vala
@@ -1,31 +1,104 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
-public class Library.Branch : Sidebar.RootOnlyBranch {
+public class Library.Branch : Sidebar.Branch {
+    private const string POSITION_DATA = "x-photos-entry-position";
+
+    public Library.PhotosEntry photos_entry { get; private set; }
+    public Library.FlaggedSidebarEntry flagged_entry { get; private set; }
+    public Library.LastImportSidebarEntry last_imported_entry { get; private set; }
+    public Library.ImportQueueSidebarEntry import_queue_entry { get; private set; }
+    public Library.OfflineSidebarEntry offline_entry { get; private set; }
+    public Library.TrashSidebarEntry trash_entry { get; private set; }
+    
+    // This lists the order of the library items in the sidebar. To re-order, simply move
+    // the item in this list to a new position. These numbers should *not* persist anywhere
+    // outside the app.
+    private enum EntryPosition {
+        PHOTOS,
+        FLAGGED,
+        LAST_IMPORTED,
+        IMPORT_QUEUE,
+        OFFLINE,
+        TRASH
+    }
+    
     public Branch() {
-        base (new Library.SidebarEntry());
+        base(new Sidebar.Header(_("Library")),
+            Sidebar.Branch.Options.STARTUP_OPEN_GROUPING, comparator);
+
+        photos_entry = new Library.PhotosEntry();
+        trash_entry = new Library.TrashSidebarEntry();
+        last_imported_entry = new Library.LastImportSidebarEntry();
+        flagged_entry = new Library.FlaggedSidebarEntry();
+        offline_entry = new Library.OfflineSidebarEntry();
+        import_queue_entry = new Library.ImportQueueSidebarEntry();
+
+        insert(photos_entry, EntryPosition.PHOTOS);
+        insert(trash_entry, EntryPosition.TRASH);
+
+        flagged_entry.visibility_changed.connect(on_flagged_visibility_changed);
+        on_flagged_visibility_changed();
+
+        last_imported_entry.visibility_changed.connect(on_last_imported_visibility_changed);
+        on_last_imported_visibility_changed();
+
+        import_queue_entry.visibility_changed.connect(on_import_queue_visibility_changed);
+        on_import_queue_visibility_changed();
+
+        offline_entry.visibility_changed.connect(on_offline_visibility_changed);
+        on_offline_visibility_changed();
     }
     
-    public Library.MainPage get_main_page() {
-        return (Library.MainPage) ((Library.SidebarEntry) get_root()).get_page();
+    private void insert(Sidebar.Entry entry, int position) {
+        entry.set_data<int>(POSITION_DATA, position);
+        graft(get_root(), entry);
+    }
+
+    private void on_flagged_visibility_changed() {
+        update_entry_visibility(flagged_entry, EntryPosition.FLAGGED);
+    }
+
+    private void on_last_imported_visibility_changed() {
+        update_entry_visibility(last_imported_entry, EntryPosition.LAST_IMPORTED);
+    }
+
+    private void on_import_queue_visibility_changed() {
+        update_entry_visibility(import_queue_entry, EntryPosition.IMPORT_QUEUE);
+    }
+
+    private void on_offline_visibility_changed() {
+        update_entry_visibility(offline_entry, EntryPosition.OFFLINE);
+    }
+
+    private void update_entry_visibility(Library.HideablePageEntry entry, int position) {
+        if (entry.visible) {
+            if (!has_entry(entry))
+                insert(entry, position);
+        } else if (has_entry(entry)) {
+            prune(entry);
+        }
+    }
+
+    private static int comparator(Sidebar.Entry a, Sidebar.Entry b) {
+        return a.get_data<int>(POSITION_DATA) - b.get_data<int>(POSITION_DATA);
     }
 }
 
-public class Library.SidebarEntry : Sidebar.SimplePageEntry {
-    private Icon icon = new ThemedIcon(Resources.ICON_PHOTOS);
+public class Library.PhotosEntry : Sidebar.SimplePageEntry {
     
-    public SidebarEntry() {
+    public PhotosEntry() {
     }
     
     public override string get_sidebar_name() {
-        return Library.MainPage.NAME;
+        return _("Photos");
     }
     
-    public override Icon? get_sidebar_icon() {
-        return icon;
+    public override string? get_sidebar_icon() {
+        return Resources.ICON_PHOTOS;
     }
     
     protected override Page create_page() {
@@ -33,6 +106,26 @@ public class Library.SidebarEntry : Sidebar.SimplePageEntry {
     }
 }
 
+public abstract class Library.HideablePageEntry : Sidebar.SimplePageEntry {
+    // container branch should listen to this signal
+    public signal void visibility_changed(bool visible);
+
+    private bool show_entry = false;
+    public bool visible {
+        get { return show_entry; }
+        set {
+            if (value == show_entry)
+                return;
+
+            show_entry = value;
+            visibility_changed(value);
+        }
+    }
+
+    public HideablePageEntry() {
+    }
+}
+
 public class Library.MainPage : CollectionPage {
     public const string NAME = _("Library");
     
diff --git a/src/library/FlaggedPage.vala b/src/library/FlaggedPage.vala
index 28bc57b..b45cc54 100644
--- a/src/library/FlaggedPage.vala
+++ b/src/library/FlaggedPage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/library/FlaggedBranch.vala b/src/library/FlaggedSidebarEntry.vala
index 472d999..240aaf3 100644
--- a/src/library/FlaggedBranch.vala
+++ b/src/library/FlaggedSidebarEntry.vala
@@ -1,47 +1,28 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
-public class Library.FlaggedBranch : Sidebar.RootOnlyBranch {
-    public FlaggedBranch() {
-        base (new Library.FlaggedSidebarEntry());
-        
+public class Library.FlaggedSidebarEntry : Library.HideablePageEntry, Sidebar.InternalDropTargetEntry {
+    public FlaggedSidebarEntry() {
         foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
             media_sources.flagged_contents_altered.connect(on_flagged_contents_altered);
         
-        set_show_branch(get_total_flagged() != 0);
+        visible = (get_total_flagged() != 0);
     }
     
-    ~FlaggedBranch() {
+    ~FlaggedSidebarEntry() {
         foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
             media_sources.flagged_contents_altered.disconnect(on_flagged_contents_altered);
-    }
-    
-    private void on_flagged_contents_altered() {
-        set_show_branch(get_total_flagged() != 0);
-    }
-    
-    private int get_total_flagged() {
-        int total = 0;
-        foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
-            total += media_sources.get_flagged().size;
-        
-        return total;
-    }
-}
-
-public class Library.FlaggedSidebarEntry : Sidebar.SimplePageEntry, Sidebar.InternalDropTargetEntry {
-    public FlaggedSidebarEntry() {
-    }
-    
+    } 
+       
     public override string get_sidebar_name() {
         return FlaggedPage.NAME;
     }
     
-    public override Icon? get_sidebar_icon() {
-        return new ThemedIcon(Resources.ICON_FLAGGED_PAGE);
+    public override string? get_sidebar_icon() {
+        return Resources.ICON_FLAGGED_PAGE;
     }
     
     protected override Page create_page() {
@@ -57,5 +38,17 @@ public class Library.FlaggedSidebarEntry : Sidebar.SimplePageEntry, Sidebar.Inte
     public bool internal_drop_received_arbitrary(Gtk.SelectionData data) {
         return false;
     }
+
+    private void on_flagged_contents_altered() {
+        visible = (get_total_flagged() != 0);
+    }
+    
+    private int get_total_flagged() {
+        int total = 0;
+        foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
+            total += media_sources.get_flagged().size;
+        
+        return total;
+    }
 }
 
diff --git a/src/library/ImportQueuePage.vala b/src/library/ImportQueuePage.vala
index 5ace1d8..9886f5a 100644
--- a/src/library/ImportQueuePage.vala
+++ b/src/library/ImportQueuePage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -28,7 +28,8 @@ public class ImportQueuePage : SinglePhotoPage {
         Gtk.Toolbar toolbar = get_toolbar();
         
         // Stop button
-        Gtk.ToolButton stop_button = new Gtk.ToolButton.from_stock(Gtk.Stock.STOP);
+        Gtk.ToolButton stop_button = new Gtk.ToolButton(null, null);
+        stop_button.set_icon_name("stop");
         stop_button.set_related_action(get_action("Stop"));
         
         toolbar.insert(stop_button, -1);
@@ -61,7 +62,7 @@ public class ImportQueuePage : SinglePhotoPage {
     protected override Gtk.ActionEntry[] init_collect_action_entries() {
         Gtk.ActionEntry[] actions = base.init_collect_action_entries();
         
-        Gtk.ActionEntry stop = { "Stop", Gtk.Stock.STOP, TRANSLATABLE, null, TRANSLATABLE,
+        Gtk.ActionEntry stop = { "Stop", Resources.STOP_LABEL, TRANSLATABLE, null, TRANSLATABLE,
             on_stop };
         stop.label = _("_Stop Import");
         stop.tooltip = _("Stop importing photos");
diff --git a/src/library/ImportQueueBranch.vala b/src/library/ImportQueueSidebarEntry.vala
index 32a3e0d..5d34ce2 100644
--- a/src/library/ImportQueueBranch.vala
+++ b/src/library/ImportQueueSidebarEntry.vala
@@ -1,38 +1,37 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
-public class Library.ImportQueueBranch : Sidebar.RootOnlyBranch {
-    private Library.ImportQueueSidebarEntry entry;
-    
-    public ImportQueueBranch() {
-        // can't pass to base() an object that was allocated in declaration; see
-        // https://bugzilla.gnome.org/show_bug.cgi?id=646286
-        base (new Library.ImportQueueSidebarEntry());
-        
-        entry = (Library.ImportQueueSidebarEntry) get_root();
-        
+public class Library.ImportQueueSidebarEntry : Library.HideablePageEntry {
+    public ImportQueueSidebarEntry() {
         // only attach signals to the page when it's created
-        entry.page_created.connect(on_page_created);
-        entry.destroying_page.connect(on_destroying_page);
+        page_created.connect(on_page_created);
+        destroying_page.connect(on_destroying_page);
         
         // don't use entry.get_page() or get_queue_page() because (a) we don't want to
         // create the page during initialization, and (b) we know there's no import activity
         // at this moment
-        set_show_branch(false);
+        visible = false;
     }
     
-    ~ImportQueueBranch() {
-        entry.page_created.disconnect(on_page_created);
-        entry.destroying_page.disconnect(on_destroying_page);
+    public override string get_sidebar_name() {
+        return ImportQueuePage.NAME;
     }
     
-    public ImportQueuePage get_queue_page() {
-        return (ImportQueuePage) entry.get_page();
+    public override string? get_sidebar_icon() {
+        return Resources.ICON_IMPORTING;
     }
     
+    protected override Page create_page() {
+        return new ImportQueuePage();
+    }
+
+    private ImportQueuePage get_queue_page() {
+        return get_page() as ImportQueuePage;
+    }
+
     private void on_page_created() {
         get_queue_page().batch_added.connect(on_batch_added_or_removed);
         get_queue_page().batch_removed.connect(on_batch_added_or_removed);
@@ -44,31 +43,14 @@ public class Library.ImportQueueBranch : Sidebar.RootOnlyBranch {
     }
     
     private void on_batch_added_or_removed() {
-        set_show_branch(get_queue_page().get_batch_count() > 0);
+        visible = (get_queue_page().get_batch_count() > 0);
     }
     
     public void enqueue_and_schedule(BatchImport batch_import, bool allow_user_cancel) {
         // want to display the branch before passing to the page because this might result in the
         // page being created, and want it all hooked up in the tree prior to creating the page
-        set_show_branch(true);
+        visible = true;
         get_queue_page().enqueue_and_schedule(batch_import, allow_user_cancel);
     }
 }
 
-public class Library.ImportQueueSidebarEntry : Sidebar.SimplePageEntry {
-    public ImportQueueSidebarEntry() {
-    }
-    
-    public override string get_sidebar_name() {
-        return ImportQueuePage.NAME;
-    }
-    
-    public override Icon? get_sidebar_icon() {
-        return new ThemedIcon(Resources.ICON_IMPORTING);
-    }
-    
-    protected override Page create_page() {
-        return new ImportQueuePage();
-    }
-}
-
diff --git a/src/library/LastImportPage.vala b/src/library/LastImportPage.vala
index 877faa5..ea9045c 100644
--- a/src/library/LastImportPage.vala
+++ b/src/library/LastImportPage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/library/LastImportBranch.vala b/src/library/LastImportSidebarEntry.vala
index bc03ee5..3414130 100644
--- a/src/library/LastImportBranch.vala
+++ b/src/library/LastImportSidebarEntry.vala
@@ -1,47 +1,36 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
-public class Library.LastImportBranch : Sidebar.RootOnlyBranch {
-    public LastImportBranch() {
-        base (new Library.LastImportSidebarEntry());
-        
+public class Library.LastImportSidebarEntry : Library.HideablePageEntry {
+    public LastImportSidebarEntry() {
         foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
             media_sources.import_roll_altered.connect(on_import_rolls_altered);
         
-        set_show_branch(MediaCollectionRegistry.get_instance().get_last_import_id() != null);
+        visible = (MediaCollectionRegistry.get_instance().get_last_import_id() != null);
     }
     
-    ~LastImportBranch() {
+    ~LastImportSidebarEntry() {
         foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
             media_sources.import_roll_altered.disconnect(on_import_rolls_altered);
     }
     
-    public Library.LastImportSidebarEntry get_main_entry() {
-        return (Library.LastImportSidebarEntry) get_root();
-    }
-    
-    private void on_import_rolls_altered() {
-        set_show_branch(MediaCollectionRegistry.get_instance().get_last_import_id() != null);
-    }
-}
-
-public class Library.LastImportSidebarEntry : Sidebar.SimplePageEntry {
-    public LastImportSidebarEntry() {
-    }
-    
     public override string get_sidebar_name() {
         return LastImportPage.NAME;
     }
     
-    public override Icon? get_sidebar_icon() {
-        return new ThemedIcon(Resources.ICON_LAST_IMPORT);
+    public override string? get_sidebar_icon() {
+        return Resources.ICON_LAST_IMPORT;
     }
     
     protected override Page create_page() {
         return new LastImportPage();
     }
+
+    private void on_import_rolls_altered() {
+        visible = (MediaCollectionRegistry.get_instance().get_last_import_id() != null);
+    }
 }
 
diff --git a/src/library/Library.vala b/src/library/Library.vala
index 79a4880..272f3d2 100644
--- a/src/library/Library.vala
+++ b/src/library/Library.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index dab1f6f..a756436 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -42,16 +42,11 @@ public class LibraryWindow : AppWindow {
     // outside the app.
     private enum SidebarRootPosition {
         LIBRARY,
-        FLAGGED,
-        LAST_IMPORTED,
         CAMERAS,
-        IMPORT_QUEUE,
         SAVED_SEARCH,
         EVENTS,
         FOLDERS,
-        TAGS,
-        TRASH,
-        OFFLINE
+        TAGS
     }
     
     public enum TargetType {
@@ -114,12 +109,7 @@ public class LibraryWindow : AppWindow {
     private Library.Branch library_branch = new Library.Branch();
     private Tags.Branch tags_branch = new Tags.Branch();
     private Folders.Branch folders_branch = new Folders.Branch();
-    private Library.TrashBranch trash_branch = new Library.TrashBranch();
     private Events.Branch events_branch = new Events.Branch();
-    private Library.OfflineBranch offline_branch = new Library.OfflineBranch();
-    private Library.FlaggedBranch flagged_branch = new Library.FlaggedBranch();
-    private Library.LastImportBranch last_import_branch = new Library.LastImportBranch();
-    private Library.ImportQueueBranch import_queue_branch = new Library.ImportQueueBranch();
     private Camera.Branch camera_branch = new Camera.Branch();
     private Searches.Branch saved_search_branch = new Searches.Branch();
     private bool page_switching_enabled = true;
@@ -172,12 +162,7 @@ public class LibraryWindow : AppWindow {
         sidebar_tree.graft(library_branch, SidebarRootPosition.LIBRARY);
         sidebar_tree.graft(tags_branch, SidebarRootPosition.TAGS);
         sidebar_tree.graft(folders_branch, SidebarRootPosition.FOLDERS);
-        sidebar_tree.graft(trash_branch, SidebarRootPosition.TRASH);
         sidebar_tree.graft(events_branch, SidebarRootPosition.EVENTS);
-        sidebar_tree.graft(offline_branch, SidebarRootPosition.OFFLINE);
-        sidebar_tree.graft(flagged_branch, SidebarRootPosition.FLAGGED);
-        sidebar_tree.graft(last_import_branch, SidebarRootPosition.LAST_IMPORTED);
-        sidebar_tree.graft(import_queue_branch, SidebarRootPosition.IMPORT_QUEUE);
         sidebar_tree.graft(camera_branch, SidebarRootPosition.CAMERAS);
         sidebar_tree.graft(saved_search_branch, SidebarRootPosition.SAVED_SEARCH);
         
@@ -207,7 +192,7 @@ public class LibraryWindow : AppWindow {
         menubar.no_show_all = true;
         
         // create the main layout & start at the Library page
-        create_layout(library_branch.get_main_page());
+        create_layout(library_branch.photos_entry.get_page());
         
         // settings that should persist between sessions
         load_configuration();
@@ -313,12 +298,12 @@ public class LibraryWindow : AppWindow {
         sort.label = _("Sort _Events");
         actions += sort;
 
-        Gtk.ActionEntry preferences = { "CommonPreferences", Gtk.Stock.PREFERENCES, TRANSLATABLE,
+        Gtk.ActionEntry preferences = { "CommonPreferences", Resources.PREFERENCES_LABEL, TRANSLATABLE,
             null, TRANSLATABLE, on_preferences };
         preferences.label = Resources.PREFERENCES_MENU;
         actions += preferences;
         
-        Gtk.ActionEntry empty = { "CommonEmptyTrash", Gtk.Stock.CLEAR, TRANSLATABLE, null, null,
+        Gtk.ActionEntry empty = { "CommonEmptyTrash", null, TRANSLATABLE, null, null,
             on_empty_trash };
         empty.label = _("Empty T_rash");
         empty.tooltip = _("Delete all photos in the trash");
@@ -329,8 +314,7 @@ public class LibraryWindow : AppWindow {
         jump_to_event.label = _("View Eve_nt for Photo");
         actions += jump_to_event;
         
-        Gtk.ActionEntry find = { "CommonFind", Gtk.Stock.FIND, TRANSLATABLE, null, null,
-            on_find };
+        Gtk.ActionEntry find = { "CommonFind", null, TRANSLATABLE, null, null, on_find };
         find.label = _("_Find");
         find.tooltip = _("Find photos and videos by search criteria");
         actions += find;
@@ -398,7 +382,7 @@ public class LibraryWindow : AppWindow {
         extended_props.tooltip = _("Display extended information for the selection");
         actions += extended_props;
         
-        Gtk.ToggleActionEntry searchbar = { "CommonDisplaySearchbar", Gtk.Stock.FIND, TRANSLATABLE,
+        Gtk.ToggleActionEntry searchbar = { "CommonDisplaySearchbar", "edit-find", TRANSLATABLE,
             "F8", TRANSLATABLE, on_display_searchbar, is_search_toolbar_visible };
         searchbar.label = _("_Search Bar");
         searchbar.tooltip = _("Display the search bar");
@@ -417,14 +401,14 @@ public class LibraryWindow : AppWindow {
         Gtk.RadioActionEntry[] actions = new Gtk.RadioActionEntry[0];
         
         Gtk.RadioActionEntry ascending = { "CommonSortEventsAscending",
-            Gtk.Stock.SORT_ASCENDING, TRANSLATABLE, null, TRANSLATABLE,
+            Resources.SORT_ASCENDING_LABEL, TRANSLATABLE, null, TRANSLATABLE,
             SORT_EVENTS_ORDER_ASCENDING };
         ascending.label = _("_Ascending");
         ascending.tooltip = _("Sort photos in an ascending order");
         actions += ascending;
 
         Gtk.RadioActionEntry descending = { "CommonSortEventsDescending",
-            Gtk.Stock.SORT_DESCENDING, TRANSLATABLE, null, TRANSLATABLE,
+            Resources.SORT_DESCENDING_LABEL, TRANSLATABLE, null, TRANSLATABLE,
             SORT_EVENTS_ORDER_DESCENDING };
         descending.label = _("D_escending");
         descending.tooltip = _("Sort photos in a descending order");
@@ -666,8 +650,8 @@ public class LibraryWindow : AppWindow {
     
     private void on_file_import() {
         Gtk.FileChooserDialog import_dialog = new Gtk.FileChooserDialog(_("Import From Folder"), null,
-            Gtk.FileChooserAction.SELECT_FOLDER, Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL, 
-            Gtk.Stock.OK, Gtk.ResponseType.OK);
+            Gtk.FileChooserAction.SELECT_FOLDER, Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL, 
+            Resources.OK_LABEL, Gtk.ResponseType.OK);
         import_dialog.set_local_only(false);
         import_dialog.set_select_multiple(true);
         import_dialog.set_current_folder(import_dir);
@@ -883,7 +867,7 @@ public class LibraryWindow : AppWindow {
     }
 
     public void enqueue_batch_import(BatchImport batch_import, bool allow_user_cancel) {
-        import_queue_branch.enqueue_and_schedule(batch_import, allow_user_cancel);
+        library_branch.import_queue_entry.enqueue_and_schedule(batch_import, allow_user_cancel);
     }
     
     private void import_reporter(ImportManifest manifest) {
@@ -1029,7 +1013,7 @@ public class LibraryWindow : AppWindow {
     }
     
     public void switch_to_library_page() {
-        switch_to_page(library_branch.get_main_page());
+        switch_to_page(library_branch.photos_entry.get_page());
     }
     
     public void switch_to_event(Event event) {
@@ -1066,7 +1050,7 @@ public class LibraryWindow : AppWindow {
     }
     
     public void switch_to_import_queue_page() {
-        switch_to_page(import_queue_branch.get_queue_page());
+        switch_to_page(library_branch.import_queue_entry.get_page());
     }
     
     private void on_camera_added(DiscoveredCamera camera) {
@@ -1285,52 +1269,36 @@ public class LibraryWindow : AppWindow {
         Gtk.ScrolledWindow scrolled_sidebar = new Gtk.ScrolledWindow(null, null);
         scrolled_sidebar.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         scrolled_sidebar.add(sidebar_tree);
-        scrolled_sidebar.get_style_context().add_class(Gtk.STYLE_CLASS_SIDEBAR);
-        scrolled_sidebar.set_shadow_type(Gtk.ShadowType.IN);
-        get_style_context().add_class("sidebar-pane-separator");
-        
-        // divy the sidebar up into selection tree list, background progress bar, and properties
-        Gtk.Frame top_frame = new Gtk.Frame(null);
-        top_frame.add(scrolled_sidebar);
-        top_frame.set_shadow_type(Gtk.ShadowType.IN);
         
+        background_progress_frame.set_border_width(2);
         background_progress_frame.add(background_progress_bar);
-        background_progress_frame.set_shadow_type(Gtk.ShadowType.IN);
+        background_progress_frame.get_style_context().remove_class("frame");
 
         // pad the bottom frame (properties)
         Gtk.Alignment bottom_alignment = new Gtk.Alignment(0, 0.5f, 1, 0);
-
-        Resources.style_widget(scrolled_sidebar, Resources.SCROLL_FRAME_STYLESHEET);
-        Resources.style_widget(bottom_frame, Resources.INSET_FRAME_STYLESHEET);
         
         bottom_alignment.set_padding(10, 10, 6, 0);
         bottom_alignment.add(basic_properties);
 
         bottom_frame.add(bottom_alignment);
-        bottom_frame.set_shadow_type(Gtk.ShadowType.IN);
+        bottom_frame.get_style_context().remove_class("frame");
         
         // "attach" the progress bar to the sidebar tree, so the movable ridge is to resize the
         // top two and the basic information pane
-        top_section.pack_start(top_frame, true, true, 0);
+        top_section.pack_start(scrolled_sidebar, true, true, 0);
 
         sidebar_paned.pack1(top_section, true, false);
         sidebar_paned.pack2(bottom_frame, false, false);
         sidebar_paned.set_position(1000);
-
-        // layout the selection tree to the left of the collection/toolbar box with an adjustable
-        // gutter between them, framed for presentation
-        Gtk.Frame right_frame = new Gtk.Frame(null);
-        right_frame.set_shadow_type(Gtk.ShadowType.IN);
         
         right_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-        right_frame.add(right_vbox);
         right_vbox.pack_start(search_toolbar, false, false, 0);
         right_vbox.pack_start(notebook, true, true, 0);
         
         client_paned = new Gtk.Paned(Gtk.Orientation.HORIZONTAL);
         client_paned.pack1(sidebar_paned, false, false);
         sidebar_tree.set_size_request(SIDEBAR_MIN_WIDTH, -1);
-        client_paned.pack2(right_frame, true, false);
+        client_paned.pack2(right_vbox, true, false);
         client_paned.set_position(Config.Facade.get_instance().get_sidebar_position());
         // TODO: Calc according to layout's size, to give sidebar a maximum width
         notebook.set_size_request(PAGE_MIN_WIDTH, -1);
@@ -1436,7 +1404,7 @@ public class LibraryWindow : AppWindow {
     
     // Turns the search bar on or off.  Note that if show is true, page must not be null.
     private void toggle_search_bar(bool show, CheckerboardPage? page = null) {
-        search_toolbar.visible = show;
+        search_toolbar.set_reveal_child(show);
         if (show) {
             assert(null != page);
             search_toolbar.set_view_filter(page.get_search_view_filter());
@@ -1457,7 +1425,7 @@ public class LibraryWindow : AppWindow {
     private void on_destroying_page(Sidebar.PageRepresentative entry, Page page) {
         // if page is the current page, switch to fallback before destroying
         if (page == get_current_page())
-            switch_to_page(library_branch.get_main_page());
+            switch_to_page(library_branch.photos_entry.get_page());
         
         remove_from_notebook(page);
         
@@ -1475,9 +1443,11 @@ public class LibraryWindow : AppWindow {
         // if the currently selected item is removed, want to jump to fallback page (which
         // depends on the item that was selected)
         
+        Library.LastImportSidebarEntry last_import_entry = library_branch.last_imported_entry;
+        
         // Importing... -> Last Import (if available)
-        if (selectable is Library.ImportQueueSidebarEntry && last_import_branch.get_show_branch()) {
-            switch_to_page(last_import_branch.get_main_entry().get_page());
+        if (selectable is Library.ImportQueueSidebarEntry && last_import_entry.visible) {
+            switch_to_page(last_import_entry.get_page());
             
             return;
         }
@@ -1497,7 +1467,7 @@ public class LibraryWindow : AppWindow {
         }
         
         // basic all-around default: jump to the Library page
-        switch_to_page(library_branch.get_main_page());
+        switch_to_page(library_branch.photos_entry.get_page());
     }
     
     private void subscribe_for_basic_information(Page page) {
diff --git a/src/library/OfflinePage.vala b/src/library/OfflinePage.vala
index cb6af2d..eecd71b 100644
--- a/src/library/OfflinePage.vala
+++ b/src/library/OfflinePage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -55,7 +55,7 @@ public class OfflinePage : CheckerboardPage {
     protected override Gtk.ActionEntry[] init_collect_action_entries() {
         Gtk.ActionEntry[] actions = base.init_collect_action_entries();
         
-        Gtk.ActionEntry remove = { "RemoveFromLibrary", Gtk.Stock.REMOVE, TRANSLATABLE, "Delete",
+        Gtk.ActionEntry remove = { "RemoveFromLibrary", Resources.REMOVE_LABEL, TRANSLATABLE, "Delete",
             TRANSLATABLE, on_remove_from_library };
         remove.label = Resources.REMOVE_FROM_LIBRARY_MENU;
         remove.tooltip = Resources.DELETE_FROM_LIBRARY_TOOLTIP;
diff --git a/src/library/OfflineBranch.vala b/src/library/OfflineSidebarEntry.vala
index 4ed2e49..34c09a0 100644
--- a/src/library/OfflineBranch.vala
+++ b/src/library/OfflineSidebarEntry.vala
@@ -1,26 +1,25 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
-public class Library.OfflineBranch : Sidebar.RootOnlyBranch {
-    public OfflineBranch() {
-        base (new Library.OfflineSidebarEntry());
+public class Library.OfflineSidebarEntry : Library.HideablePageEntry {
+    public OfflineSidebarEntry() {
         
         foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
             media_sources.offline_contents_altered.connect(on_offline_contents_altered);
         
-        set_show_branch(get_total_offline() != 0);
+        visible = (get_total_offline() != 0);
     }
-    
-    ~OfflineBranch() {
+
+    ~OfflineSidebarEntry() {
         foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
             media_sources.trashcan_contents_altered.disconnect(on_offline_contents_altered);
     }
     
     private void on_offline_contents_altered() {
-        set_show_branch(get_total_offline() != 0);
+        visible = (get_total_offline() != 0);
     }
     
     private int get_total_offline() {
@@ -30,18 +29,13 @@ public class Library.OfflineBranch : Sidebar.RootOnlyBranch {
         
         return total;
     }
-}
-
-public class Library.OfflineSidebarEntry : Sidebar.SimplePageEntry {
-    public OfflineSidebarEntry() {
-    }
     
     public override string get_sidebar_name() {
         return OfflinePage.NAME;
     }
     
-    public override Icon? get_sidebar_icon() {
-        return new ThemedIcon(Resources.ICON_MISSING_FILES);
+    public override string? get_sidebar_icon() {
+        return Resources.ICON_MISSING_FILES;
     }
     
     protected override Page create_page() {
diff --git a/src/library/TrashPage.vala b/src/library/TrashPage.vala
index 2991727..ae80a7b 100644
--- a/src/library/TrashPage.vala
+++ b/src/library/TrashPage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -50,13 +50,13 @@ public class TrashPage : CheckerboardPage {
     protected override Gtk.ActionEntry[] init_collect_action_entries() {
         Gtk.ActionEntry[] actions = base.init_collect_action_entries();
         
-        Gtk.ActionEntry delete_action = { "Delete", Gtk.Stock.DELETE, TRANSLATABLE, "Delete",
+        Gtk.ActionEntry delete_action = { "Delete", Resources.DELETE_LABEL, TRANSLATABLE, "Delete",
             TRANSLATABLE, on_delete };
         delete_action.label = Resources.DELETE_PHOTOS_MENU;
         delete_action.tooltip = Resources.DELETE_FROM_TRASH_TOOLTIP;
         actions += delete_action;
         
-        Gtk.ActionEntry restore = { "Restore", Gtk.Stock.UNDELETE, TRANSLATABLE, null, TRANSLATABLE,
+        Gtk.ActionEntry restore = { "Restore", Resources.UNDELETE_LABEL, TRANSLATABLE, null, TRANSLATABLE,
             on_restore };
         restore.label = Resources.RESTORE_PHOTOS_MENU;
         restore.tooltip = Resources.RESTORE_PHOTOS_TOOLTIP;
diff --git a/src/library/TrashBranch.vala b/src/library/TrashSidebarEntry.vala
index 5ef8b3c..69412b7 100644
--- a/src/library/TrashBranch.vala
+++ b/src/library/TrashSidebarEntry.vala
@@ -1,18 +1,10 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
-public class Library.TrashBranch : Sidebar.RootOnlyBranch {
-    public TrashBranch() {
-        base (new Library.TrashSidebarEntry());
-    }
-}
-
 public class Library.TrashSidebarEntry : Sidebar.SimplePageEntry, Sidebar.InternalDropTargetEntry {
-    private static Icon? full_icon = null;
-    private static Icon? empty_icon = null;
     
     public TrashSidebarEntry() {
         foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
@@ -25,30 +17,26 @@ public class Library.TrashSidebarEntry : Sidebar.SimplePageEntry, Sidebar.Intern
     }
     
     internal static void init() {
-        full_icon = new ThemedIcon(Resources.ICON_TRASH_FULL);
-        empty_icon = new ThemedIcon(Resources.ICON_TRASH_EMPTY);
     }
     
     internal static void terminate() {
-        full_icon = null;
-        empty_icon = null;
     }
     
     public override string get_sidebar_name() {
         return TrashPage.NAME;
     }
     
-    public override Icon? get_sidebar_icon() {
+    public override string? get_sidebar_icon() {
         return get_current_icon();
     }
     
-    private static Icon get_current_icon() {
+    private static string get_current_icon() {
         foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all()) {
             if (media_sources.get_trashcan_count() > 0)
-                return full_icon;
+                return Resources.ICON_TRASH_FULL;
         }
         
-        return empty_icon;
+        return Resources.ICON_TRASH_EMPTY;
     }
     
     public bool internal_drop_received(Gee.List<MediaSource> media) {
diff --git a/src/library/mk/library.mk b/src/library/mk/library.mk
index b4ab790..dc6201f 100644
--- a/src/library/mk/library.mk
+++ b/src/library/mk/library.mk
@@ -13,11 +13,11 @@ UNIT_DIR := library
 UNIT_FILES := \
 	LibraryWindow.vala \
 	Branch.vala \
-	TrashBranch.vala \
-	OfflineBranch.vala \
-	FlaggedBranch.vala \
-	LastImportBranch.vala \
-	ImportQueueBranch.vala \
+        TrashSidebarEntry.vala \
+        OfflineSidebarEntry.vala \
+        FlaggedSidebarEntry.vala \
+        LastImportSidebarEntry.vala \
+        ImportQueueSidebarEntry.vala \
 	FlaggedPage.vala \
 	ImportQueuePage.vala \
 	LastImportPage.vala \
diff --git a/src/main.vala b/src/main.vala
index 8c045fd..6a705a7 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/photos/BmpSupport.vala b/src/photos/BmpSupport.vala
index dbeb64c..677eac3 100644
--- a/src/photos/BmpSupport.vala
+++ b/src/photos/BmpSupport.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/photos/GRaw.vala b/src/photos/GRaw.vala
index 915a861..1aa7ca5 100644
--- a/src/photos/GRaw.vala
+++ b/src/photos/GRaw.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/photos/GdkSupport.vala b/src/photos/GdkSupport.vala
index ed2ff63..05e6854 100644
--- a/src/photos/GdkSupport.vala
+++ b/src/photos/GdkSupport.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/photos/JfifSupport.vala b/src/photos/JfifSupport.vala
index d721441..6ac5e4b 100644
--- a/src/photos/JfifSupport.vala
+++ b/src/photos/JfifSupport.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/photos/PhotoFileAdapter.vala b/src/photos/PhotoFileAdapter.vala
index 38b00ea..735e153 100644
--- a/src/photos/PhotoFileAdapter.vala
+++ b/src/photos/PhotoFileAdapter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/photos/PhotoFileFormat.vala b/src/photos/PhotoFileFormat.vala
index 2ab2f00..b9d3f63 100644
--- a/src/photos/PhotoFileFormat.vala
+++ b/src/photos/PhotoFileFormat.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/photos/PhotoFileSniffer.vala b/src/photos/PhotoFileSniffer.vala
index 3f65ac2..cdbdad2 100644
--- a/src/photos/PhotoFileSniffer.vala
+++ b/src/photos/PhotoFileSniffer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
index 37804bf..be781b6 100644
--- a/src/photos/PhotoMetadata.vala
+++ b/src/photos/PhotoMetadata.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/photos/Photos.vala b/src/photos/Photos.vala
index 3033b92..c9eb357 100644
--- a/src/photos/Photos.vala
+++ b/src/photos/Photos.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/photos/PngSupport.vala b/src/photos/PngSupport.vala
index 2cde6a2..feb409d 100644
--- a/src/photos/PngSupport.vala
+++ b/src/photos/PngSupport.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/photos/RawSupport.vala b/src/photos/RawSupport.vala
index 98bc982..fb5f864 100644
--- a/src/photos/RawSupport.vala
+++ b/src/photos/RawSupport.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/photos/TiffSupport.vala b/src/photos/TiffSupport.vala
index ee8b087..ac1eb6d 100644
--- a/src/photos/TiffSupport.vala
+++ b/src/photos/TiffSupport.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/plugins/DataImportsInterfaces.vala b/src/plugins/DataImportsInterfaces.vala
index 154503b..2f519bd 100644
--- a/src/plugins/DataImportsInterfaces.vala
+++ b/src/plugins/DataImportsInterfaces.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -119,6 +119,8 @@ public interface ImportableMediaItem : GLib.Object {
     public abstract string get_folder_path();
     
     public abstract string get_filename();
+
+    public abstract time_t? get_exposure_time();
 }
 
 /**
diff --git a/src/plugins/ManifestWidget.vala b/src/plugins/ManifestWidget.vala
index 54f2e56..fe32b91 100644
--- a/src/plugins/ManifestWidget.vala
+++ b/src/plugins/ManifestWidget.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/plugins/Plugins.vala b/src/plugins/Plugins.vala
index d0f9185..9a8860b 100644
--- a/src/plugins/Plugins.vala
+++ b/src/plugins/Plugins.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/plugins/PublishingInterfaces.vala b/src/plugins/PublishingInterfaces.vala
index ca74597..7c0a901 100644
--- a/src/plugins/PublishingInterfaces.vala
+++ b/src/plugins/PublishingInterfaces.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/plugins/SpitInterfaces.vala b/src/plugins/SpitInterfaces.vala
index f2fce6f..0a432c2 100644
--- a/src/plugins/SpitInterfaces.vala
+++ b/src/plugins/SpitInterfaces.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/plugins/StandardHostInterface.vala b/src/plugins/StandardHostInterface.vala
index 9bfc0aa..c14d688 100644
--- a/src/plugins/StandardHostInterface.vala
+++ b/src/plugins/StandardHostInterface.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/plugins/TransitionsInterfaces.vala b/src/plugins/TransitionsInterfaces.vala
index eae76cf..917f88d 100644
--- a/src/plugins/TransitionsInterfaces.vala
+++ b/src/plugins/TransitionsInterfaces.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/publishing/APIGlue.vala b/src/publishing/APIGlue.vala
index f282c1f..24e10cc 100644
--- a/src/publishing/APIGlue.vala
+++ b/src/publishing/APIGlue.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/publishing/Publishing.vala b/src/publishing/Publishing.vala
index fb04eab..c245385 100644
--- a/src/publishing/Publishing.vala
+++ b/src/publishing/Publishing.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/publishing/PublishingPluginHost.vala b/src/publishing/PublishingPluginHost.vala
index 1a5ed86..1a95ef3 100644
--- a/src/publishing/PublishingPluginHost.vala
+++ b/src/publishing/PublishingPluginHost.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala
index 4f63f55..a74bfaf 100644
--- a/src/publishing/PublishingUI.vala
+++ b/src/publishing/PublishingUI.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -146,7 +146,6 @@ public class PublishingDialog : Gtk.Dialog {
     
     private Gtk.ListStore service_selector_box_model;
     private Gtk.ComboBox service_selector_box;
-    private Gtk.Label service_selector_box_label;
     private Gtk.Box central_area_layouter;
     private Gtk.Button close_cancel_button;
     private Spit.Publishing.DialogPane active_pane;
@@ -157,6 +156,9 @@ public class PublishingDialog : Gtk.Dialog {
     protected PublishingDialog(Gee.Collection<MediaSource> to_publish) {
         assert(to_publish.size > 0);
 
+        Object(use_header_bar: 1);
+        ((Gtk.HeaderBar) get_header_bar()).set_show_close_button(false);
+        
         resizable = false;
         delete_event.connect(on_window_close);
         
@@ -180,7 +182,7 @@ public class PublishingDialog : Gtk.Dialog {
         string label = null;
         
         if (has_photos && !has_videos) {
-            title = null;_("Publish Photos");
+            title = _("Publish Photos");
             label = _("Publish photos _to:");
         } else if (!has_photos && has_videos) {
             title = _("Publish Videos");
@@ -203,10 +205,6 @@ public class PublishingDialog : Gtk.Dialog {
         service_selector_box.add_attribute(renderer_text, "text", 1);
 
         service_selector_box.set_active(0);
-        
-        service_selector_box_label = new Gtk.Label.with_mnemonic(label);
-        service_selector_box_label.set_mnemonic_widget(service_selector_box);
-        service_selector_box_label.set_alignment(0.0f, 0.5f);
 
         // get the name of the service the user last used
         string? last_used_service = Config.Facade.get_instance().get_last_used_service();
@@ -244,37 +242,16 @@ public class PublishingDialog : Gtk.Dialog {
         }
 
         service_selector_box.changed.connect(on_service_changed);
-
-        /* the wrapper is not an extraneous widget -- it's necessary to prevent the service
-           selection box from growing and shrinking whenever its parent's size changes.
-           When wrapped inside a Gtk.Alignment, the Alignment grows and shrinks instead of
-           the service selection box. */
-        Gtk.Alignment service_selector_box_wrapper = new Gtk.Alignment(1.0f, 0.5f, 0.0f, 0.0f);
-        service_selector_box_wrapper.add(service_selector_box);
-
-        Gtk.Box service_selector_layouter = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8);
-        service_selector_layouter.set_border_width(12);
-        service_selector_layouter.add(service_selector_box_label);
-        service_selector_layouter.pack_start(service_selector_box_wrapper, true, true, 0);
-        
-        /* 'service area' is the selector assembly plus the horizontal rule dividing it from the
-           rest of the dialog */
-        Gtk.Box service_area_layouter = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-        service_area_layouter.add(service_selector_layouter);
-        service_area_layouter.add(new Gtk.Separator(Gtk.Orientation.HORIZONTAL));
-
-        Gtk.Alignment service_area_wrapper = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 0.0f);
-        service_area_wrapper.add(service_area_layouter);
         
         central_area_layouter = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
 
-        get_content_area().pack_start(service_area_wrapper, false, false, 0);
         get_content_area().pack_start(central_area_layouter, true, true, 0);
         
         close_cancel_button = new Gtk.Button.with_mnemonic("_Cancel");
         close_cancel_button.set_can_default(true);
         close_cancel_button.clicked.connect(on_close_cancel_clicked);
-        ((Gtk.Container) get_action_area()).add(close_cancel_button);
+        ((Gtk.HeaderBar) get_header_bar()).pack_start(close_cancel_button);
+        ((Gtk.HeaderBar) get_header_bar()).pack_end(service_selector_box);
 
         set_standard_window_mode();
         
diff --git a/src/searches/Branch.vala b/src/searches/Branch.vala
index 229c710..00a9ea7 100644
--- a/src/searches/Branch.vala
+++ b/src/searches/Branch.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -9,7 +9,7 @@ public class Searches.Branch : Sidebar.Branch {
         new Gee.HashMap<SavedSearch, Searches.SidebarEntry>();
     
     public Branch() {
-        base (new Searches.Grouping(),
+        base (new Searches.Header(),
             Sidebar.Branch.Options.HIDE_IF_EMPTY
                 | Sidebar.Branch.Options.AUTO_OPEN_ON_NEW_CHILD
                 | Sidebar.Branch.Options.STARTUP_EXPAND_TO_FIRST_CHILD,
@@ -60,12 +60,12 @@ public class Searches.Branch : Sidebar.Branch {
     }
 }
 
-public class Searches.Grouping : Sidebar.Grouping, Sidebar.Contextable {
+public class Searches.Header : Sidebar.Header, Sidebar.Contextable {
     private Gtk.UIManager ui = new Gtk.UIManager();
     private Gtk.Menu? context_menu = null;
     
-    public Grouping() {
-        base (_("Saved Searches"), new ThemedIcon(Gtk.Stock.FIND));
+    public Header() {
+        base (_("Saved Searches"));
         setup_context_menu();
     }
     
@@ -104,7 +104,7 @@ public class Searches.Grouping : Sidebar.Grouping, Sidebar.Contextable {
 
 public class Searches.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.RenameableEntry,
     Sidebar.DestroyableEntry {
-    private static Icon single_search_icon;
+    private static string single_search_icon = "find";
     
     private SavedSearch search;
     
@@ -113,11 +113,9 @@ public class Searches.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.Renameable
     }
     
     internal static void init() {
-        single_search_icon = new ThemedIcon(Gtk.Stock.FIND);
     }
     
     internal static void terminate() {
-        single_search_icon = null;
     }
     
     public SavedSearch for_saved_search() {
@@ -128,7 +126,7 @@ public class Searches.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.Renameable
         return search.get_name();
     }
     
-    public override Icon? get_sidebar_icon() {
+    public override string? get_sidebar_icon() {
         return single_search_icon;
     }
     
@@ -136,6 +134,10 @@ public class Searches.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.Renameable
         return new SavedSearchPage(search);
     }
     
+    public bool is_user_renameable() {
+        return true;
+    }
+    
     public void rename(string new_name) {
         if (!SavedSearchTable.get_instance().exists(new_name))
             AppWindow.get_command_manager().execute(new RenameSavedSearchCommand(search, new_name));
diff --git a/src/searches/SavedSearchDialog.vala b/src/searches/SavedSearchDialog.vala
index da7f7db..eb016d3 100644
--- a/src/searches/SavedSearchDialog.vala
+++ b/src/searches/SavedSearchDialog.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -48,13 +48,12 @@ public class SavedSearchDialog {
             set_type_combo_box(SearchCondition.SearchType.ANY_TEXT); // Sets default.
             type_combo.changed.connect(on_type_changed);
             
-            remove_button = new Gtk.Button();
-            remove_button.set_label(" – ");
+            remove_button = new Gtk.Button.from_icon_name("list-remove-symbolic", Gtk.IconSize.BUTTON);
             remove_button.button_press_event.connect(on_removed);
             
             align = new Gtk.Alignment(0,0,0,0);
         
-            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8);
+            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 3);
             box.pack_start(type_combo, false, false, 0);
             box.pack_start(align, false, false, 0);
             box.pack_start(new Gtk.Alignment(0,0,0,0), true, true, 0); // Fill space.
@@ -172,6 +171,7 @@ public class SavedSearchDialog {
             text_context.append_text(_("ends with"));
             text_context.append_text(_("does not contain"));
             text_context.append_text(_("is not set"));
+            text_context.append_text(_("is set"));
             text_context.set_active(0);
             text_context.changed.connect(on_changed);
             
@@ -180,7 +180,7 @@ public class SavedSearchDialog {
             entry.set_activates_default(true);
             entry.changed.connect(on_changed);
             
-            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8);
+            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 3);
             box.pack_start(text_context, false, false, 0);
             box.pack_start(entry, false, false, 0);
             box.show_all();
@@ -212,7 +212,9 @@ public class SavedSearchDialog {
         }
         
         public override bool is_complete() {
-            return entry.text.chomp() != "" || get_text_context() == SearchConditionText.Context.IS_NOT_SET;
+            return entry.text.chomp() != "" ||
+                get_text_context() == SearchConditionText.Context.IS_NOT_SET ||
+                get_text_context() == SearchConditionText.Context.IS_SET;
         }
         
         private SearchConditionText.Context get_text_context() {
@@ -220,7 +222,8 @@ public class SavedSearchDialog {
         }
         
         private void on_changed() {
-            if (get_text_context() == SearchConditionText.Context.IS_NOT_SET) {
+            if (get_text_context() == SearchConditionText.Context.IS_NOT_SET
+                || get_text_context() == SearchConditionText.Context.IS_SET) {
                 entry.hide();
             } else {
                 entry.show();
@@ -255,7 +258,7 @@ public class SavedSearchDialog {
             media_type.set_active(0);
             media_type.changed.connect(on_changed);
             
-            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8);
+            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 3);
             box.pack_start(media_context, false, false, 0);
             box.pack_start(media_type, false, false, 0);
             box.show_all();
@@ -317,7 +320,7 @@ public class SavedSearchDialog {
             modified_state.set_active(0);
             modified_state.changed.connect(on_changed);
             
-            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8);
+            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 3);
             box.pack_start(modified_context, false, false, 0);
             box.pack_start(modified_state, false, false, 0);
             box.show_all();
@@ -372,7 +375,7 @@ public class SavedSearchDialog {
             flagged_state.set_active(0);
             flagged_state.changed.connect(on_changed);
             
-            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8);
+            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 3);
             box.pack_start(new Gtk.Label(_("is")), false, false, 0);
             box.pack_start(flagged_state, false, false, 0);
             box.show_all();
@@ -437,7 +440,7 @@ public class SavedSearchDialog {
             context.set_active(0);
             context.changed.connect(on_changed);
             
-            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8);
+            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 3);
             box.pack_start(new Gtk.Label(_("is")), false, false, 0);
             box.pack_start(rating, false, false, 0);
             box.pack_start(context, false, false, 0);
@@ -512,7 +515,7 @@ public class SavedSearchDialog {
             
             and = new Gtk.Label(_("and"));
             
-            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8);
+            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 3);
             box.pack_start(context, false, false, 0);
             box.pack_start(label_one, false, false, 0);
             box.pack_start(and, false, false, 0);
@@ -604,14 +607,16 @@ public class SavedSearchDialog {
             int orig_month = cal.month;
             int orig_year = cal.year;
             Gtk.Dialog d = new Gtk.Dialog.with_buttons(null, null, 
-                Gtk.DialogFlags.MODAL, Gtk.Stock.CANCEL, Gtk.ResponseType.REJECT, 
-                Gtk.Stock.OK, Gtk.ResponseType.ACCEPT);
+                Gtk.DialogFlags.MODAL, Resources.CANCEL_LABEL, Gtk.ResponseType.REJECT, 
+                Resources.OK_LABEL, Gtk.ResponseType.ACCEPT);
             d.set_modal(true);
             d.set_resizable(false);
             d.set_decorated(false);
             ((Gtk.Box) d.get_content_area()).add(cal);
             ulong id_1 = cal.day_selected.connect(()=>{update_date_labels();});
-            ulong id_2 = cal.day_selected_double_click.connect(()=>{d.close();});
+            ulong id_2 = cal.day_selected_double_click.connect(()=> {
+                  d.response(Gtk.ResponseType.ACCEPT);
+            });
             d.show_all();
             int res = d.run();
             if (res != Gtk.ResponseType.ACCEPT) {
@@ -656,14 +661,7 @@ public class SavedSearchDialog {
         // Default is text search.
         add_text_search();
         row_list.get(0).allow_removal(false);
-        
-        // Add buttons for new search.
-        dialog.add_action_widget(new Gtk.Button.from_stock(Gtk.Stock.CANCEL), Gtk.ResponseType.CANCEL);
-        Gtk.Button ok_button = new Gtk.Button.from_stock(Gtk.Stock.OK);
-        ok_button.can_default = true;
-        dialog.add_action_widget(ok_button, Gtk.ResponseType.OK);
-        dialog.set_default_response(Gtk.ResponseType.OK);
-        
+
         dialog.show_all();
         set_valid(false);
     }
@@ -673,12 +671,6 @@ public class SavedSearchDialog {
         edit_mode = true;
         setup_dialog();
         
-        // Add close button.
-        Gtk.Button close_button = new Gtk.Button.from_stock(Gtk.Stock.CLOSE);
-        close_button.can_default = true;
-        dialog.add_action_widget(close_button, Gtk.ResponseType.OK);
-        dialog.set_default_response(Gtk.ResponseType.OK);
-        
         dialog.show_all();
         
         // Load existing search into dialog.
@@ -701,12 +693,21 @@ public class SavedSearchDialog {
     // Builds the dialog UI.  Doesn't add buttons to the dialog or call dialog.show().
     private void setup_dialog() {
         builder = AppWindow.create_builder();
-        
-        dialog = builder.get_object("Search criteria") as Gtk.Dialog;
-        dialog.set_parent_window(AppWindow.get_instance().get_parent_window());
+
+        dialog = new Gtk.Dialog.with_buttons(_("Search"),
+                                         (Gtk.Window) AppWindow.get_instance().get_parent_window(),
+                                         Gtk.DialogFlags.MODAL |
+                                         Gtk.DialogFlags.DESTROY_WITH_PARENT |
+                                         Gtk.DialogFlags.USE_HEADER_BAR,
+                                         _("Cancel"), Gtk.ResponseType.CANCEL,
+                                         _("OK"), Gtk.ResponseType.OK,
+                                         null);
+        dialog.set_resizable(false);
         dialog.set_transient_for(AppWindow.get_instance());
+        dialog.set_default_response(Gtk.ResponseType.OK);
         dialog.response.connect(on_response);
-        
+        dialog.get_content_area().add(builder.get_object("criteria") as Gtk.Widget);
+
         add_criteria = builder.get_object("Add search button") as Gtk.Button;
         add_criteria.button_press_event.connect(on_add_criteria);
         
diff --git a/src/searches/SavedSearchPage.vala b/src/searches/SavedSearchPage.vala
index 8e6672e..99473fb 100644
--- a/src/searches/SavedSearchPage.vala
+++ b/src/searches/SavedSearchPage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/searches/SearchBoolean.vala b/src/searches/SearchBoolean.vala
index 431e398..8031814 100644
--- a/src/searches/SearchBoolean.vala
+++ b/src/searches/SearchBoolean.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -206,7 +206,8 @@ public class SearchConditionText : SearchCondition {
         STARTS_WITH,
         ENDS_WITH,
         DOES_NOT_CONTAIN,
-        IS_NOT_SET;
+        IS_NOT_SET,
+        IS_SET;
         
         public string to_string() {
             switch (this) {
@@ -228,6 +229,9 @@ public class SearchConditionText : SearchCondition {
                 case Context.IS_NOT_SET:
                     return "IS_NOT_SET";
                 
+                case Context.IS_SET:
+                    return "IS_SET";
+                
                 default:
                     error("unrecognized text search context enumeration value");
             }
@@ -252,6 +256,9 @@ public class SearchConditionText : SearchCondition {
             else if (str == "IS_NOT_SET")
                 return Context.IS_NOT_SET;
             
+            else if (str == "IS_SET")
+                return Context.IS_SET;
+            
             else
                 error("unrecognized text search context name: %s", str);
         }
@@ -287,6 +294,9 @@ public class SearchConditionText : SearchCondition {
 
             case Context.IS_NOT_SET:
                 return (is_string_empty(haystack));
+            
+            case Context.IS_SET:
+                return (!is_string_empty(haystack));
         }
         
         return false;
@@ -298,10 +308,9 @@ public class SearchConditionText : SearchCondition {
         
         // title
         if (SearchType.ANY_TEXT == search_type || SearchType.TITLE == search_type) {
-            string title = source.get_title();
-            if(title != null){
-                ret |= string_match(text, String.remove_diacritics(title.down()));
-            }
+            string? title = (null != source.get_title()) ?
+                String.remove_diacritics(source.get_title().down()) : null;
+            ret |= string_match(text, title);
         }
         
         // tags
diff --git a/src/searches/Searches.vala b/src/searches/Searches.vala
index 478de86..691bcf0 100644
--- a/src/searches/Searches.vala
+++ b/src/searches/Searches.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/sidebar/Branch.vala b/src/sidebar/Branch.vala
index 23badda..a6c3ee8 100644
--- a/src/sidebar/Branch.vala
+++ b/src/sidebar/Branch.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -39,23 +39,22 @@ public class Sidebar.Branch : Object {
         
         public Sidebar.Entry entry;
         public weak Node? parent;
-        public CompareDataFunc<Sidebar.Entry> comparator;
+        public CompareFunc<Sidebar.Entry> comparator;
         public Gee.SortedSet<Node>? children = null;
         
-        public Node(Sidebar.Entry entry, Node? parent,
-            owned CompareDataFunc<Sidebar.Entry> comparator) {
+        public Node(Sidebar.Entry entry, Node? parent, CompareFunc<Sidebar.Entry> comparator) {
             this.entry = entry;
             this.parent = parent;
-            this.comparator = (owned) comparator;
+            this.comparator = comparator;
         }
         
-        private static int comparator_wrapper(Node? a, Node? b) {
-            if (a == b)
+        private static int comparator_wrapper(Node anode, Node bnode) {
+            if (anode == bnode)
                 return 0;
             
-            assert(a.parent == b.parent);
+            assert(anode.parent == bnode.parent);
             
-            return a.parent.comparator(a.entry, b.entry);
+            return anode.parent.comparator(anode.entry, bnode.entry);
         }
         
         public bool has_children() {
@@ -172,16 +171,16 @@ public class Sidebar.Branch : Object {
             cb(this);
         }
         
-        public void change_comparator(owned CompareDataFunc<Sidebar.Entry> comparator, bool recursive,
+        public void change_comparator(CompareFunc<Sidebar.Entry> comparator, bool recursive,
             ChildrenReorderedCallback cb) {
-            this.comparator = (owned) comparator;
+            this.comparator = comparator;
             
             // reorder children, but need to do manual recursion to set comparator
             reorder_children(false, cb);
             
             if (recursive) {
                 foreach (Node child in children)
-                    child.change_comparator((owned) comparator, true, cb);
+                    child.change_comparator(comparator, true, cb);
             }
         }
     }
@@ -189,7 +188,7 @@ public class Sidebar.Branch : Object {
     private Node root;
     private Options options;
     private bool shown = true;
-    private CompareDataFunc<Sidebar.Entry> default_comparator;
+    private CompareFunc<Sidebar.Entry> default_comparator;
     private Gee.HashMap<Sidebar.Entry, Node> map = new Gee.HashMap<Sidebar.Entry, Node>();
     
     public signal void entry_added(Sidebar.Entry entry);
@@ -204,19 +203,11 @@ public class Sidebar.Branch : Object {
     
     public signal void show_branch(bool show);
     
-    public Branch(Sidebar.Entry root, Options options, 
-        owned CompareDataFunc<Sidebar.Entry> default_comparator,
-        owned CompareDataFunc<Sidebar.Entry>? root_comparator = null) {
-        this.default_comparator = (owned) default_comparator;
-        
-        CompareDataFunc<Sidebar.Entry>? broken_ternary_workaround;
-        
-        if (root_comparator != null)
-            broken_ternary_workaround = (owned) root_comparator;
-        else
-            broken_ternary_workaround = (owned) default_comparator;
-
-        this.root = new Node(root, null, (owned) broken_ternary_workaround);
+    public Branch(Sidebar.Entry root, Options options, CompareFunc<Sidebar.Entry> default_comparator,
+        CompareFunc<Sidebar.Entry>? root_comparator = null) {
+        this.default_comparator = default_comparator;
+        this.root = new Node(root, null,
+            (root_comparator != null) ? root_comparator : default_comparator);
         this.options = options;
         
         map.set(root, this.root);
@@ -254,7 +245,7 @@ public class Sidebar.Branch : Object {
     }
     
     public void graft(Sidebar.Entry parent, Sidebar.Entry entry,
-        owned CompareDataFunc<Sidebar.Entry>? comparator = null) {
+        CompareFunc<Sidebar.Entry>? comparator = null) {
         assert(map.has_key(parent));
         assert(!map.has_key(entry));
         
@@ -262,15 +253,8 @@ public class Sidebar.Branch : Object {
             set_show_branch(true);
         
         Node parent_node = map.get(parent);
-        
-        CompareDataFunc<Sidebar.Entry>? broken_ternary_workaround;
-        
-        if (comparator != null)
-            broken_ternary_workaround = (owned) comparator;
-        else
-            broken_ternary_workaround = (owned) default_comparator;
-        
-        Node entry_node = new Node(entry, parent_node, (owned) broken_ternary_workaround);
+        Node entry_node = new Node(entry, parent_node,
+            (comparator != null) ? comparator : default_comparator);
         
         parent_node.add_child(entry_node);
         map.set(entry, entry_node);
@@ -347,16 +331,16 @@ public class Sidebar.Branch : Object {
         entry_node.reorder_children(recursive, children_reordered_callback);
     }
     
-    public void change_all_comparators(owned CompareDataFunc<Sidebar.Entry>? comparator) {
-        root.change_comparator((owned) comparator, true, children_reordered_callback);
+    public void change_all_comparators(CompareFunc<Sidebar.Entry>? comparator) {
+        root.change_comparator(comparator, true, children_reordered_callback);
     }
     
     public void change_comparator(Sidebar.Entry entry, bool recursive,
-        owned CompareDataFunc<Sidebar.Entry>? comparator) {
+        CompareFunc<Sidebar.Entry>? comparator) {
         Node? entry_node = map.get(entry);
         assert(entry_node != null);
         
-        entry_node.change_comparator((owned) comparator, recursive, children_reordered_callback);
+        entry_node.change_comparator(comparator, recursive, children_reordered_callback);
     }
     
     public int get_child_count(Sidebar.Entry parent) {
diff --git a/src/sidebar/Entry.vala b/src/sidebar/Entry.vala
index 4162f21..5a84f74 100644
--- a/src/sidebar/Entry.vala
+++ b/src/sidebar/Entry.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -7,13 +7,13 @@
 public interface Sidebar.Entry : Object {
     public signal void sidebar_tooltip_changed(string? tooltip);
     
-    public signal void sidebar_icon_changed(Icon? icon);
+    public signal void sidebar_icon_changed(string? icon);
     
     public abstract string get_sidebar_name();
     
     public abstract string? get_sidebar_tooltip();
     
-    public abstract Icon? get_sidebar_icon();
+    public abstract string? get_sidebar_icon();
     
     public abstract string to_string();
     
@@ -25,12 +25,6 @@ public interface Sidebar.Entry : Object {
 }
 
 public interface Sidebar.ExpandableEntry : Sidebar.Entry {
-    public signal void sidebar_open_closed_icons_changed(Icon? open, Icon? closed);
-    
-    public abstract Icon? get_sidebar_open_icon();
-    
-    public abstract Icon? get_sidebar_closed_icon();
-    
     public abstract bool expand_on_select();
 }
 
@@ -53,6 +47,15 @@ public interface Sidebar.RenameableEntry : Sidebar.Entry {
     public signal void sidebar_name_changed(string name);
     
     public abstract void rename(string new_name);
+    
+    // Return true to allow the user to rename the sidebar entry in the UI.
+    public abstract bool is_user_renameable();
+}
+
+public interface Sidebar.EmphasizableEntry : Sidebar.Entry {
+    public signal void is_emphasized_changed(bool emphasized);
+    
+    public abstract bool is_emphasized();
 }
 
 public interface Sidebar.DestroyableEntry : Sidebar.Entry {
diff --git a/src/sidebar/Sidebar.vala b/src/sidebar/Sidebar.vala
index 8f6904b..0b4c0da 100644
--- a/src/sidebar/Sidebar.vala
+++ b/src/sidebar/Sidebar.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/sidebar/Tree.vala b/src/sidebar/Tree.vala
index 37da7e0..a020b18 100644
--- a/src/sidebar/Tree.vala
+++ b/src/sidebar/Tree.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -37,8 +37,7 @@ public class Sidebar.Tree : Gtk.TreeView {
     private class RootWrapper : EntryWrapper {
         public int root_position;
         
-        public RootWrapper(Gtk.TreeModel model, Sidebar.Entry entry, Gtk.TreePath path, int root_position) 
-            requires (root_position >= 0) {
+        public RootWrapper(Gtk.TreeModel model, Sidebar.Entry entry, Gtk.TreePath path, int root_position) {
             base (model, entry, path);
             
             this.root_position = root_position;
@@ -49,9 +48,7 @@ public class Sidebar.Tree : Gtk.TreeView {
         NAME,
         TOOLTIP,
         WRAPPER,
-        PIXBUF,
-        CLOSED_PIXBUF,
-        OPEN_PIXBUF,
+        ICON,
         N_COLUMNS
     }
     
@@ -59,17 +56,13 @@ public class Sidebar.Tree : Gtk.TreeView {
         typeof (string),            // NAME
         typeof (string?),           // TOOLTIP
         typeof (EntryWrapper),      // WRAPPER
-        typeof (Gdk.Pixbuf?),       // PIXBUF
-        typeof (Gdk.Pixbuf?),       // CLOSED_PIXBUF
-        typeof (Gdk.Pixbuf?)        // OPEN_PIXBUF
+        typeof (string?)            // ICON
     );
     
     private Gtk.UIManager ui = new Gtk.UIManager();
-    private Gtk.IconTheme icon_theme;
     private Gtk.CellRendererText text_renderer;
     private unowned ExternalDropHandler drop_handler;
     private Gtk.Entry? text_entry = null;
-    private Gee.HashMap<string, Gdk.Pixbuf> icon_cache = new Gee.HashMap<string, Gdk.Pixbuf>();
     private Gee.HashMap<Sidebar.Entry, EntryWrapper> entry_map =
         new Gee.HashMap<Sidebar.Entry, EntryWrapper>();
     private Gee.HashMap<Sidebar.Branch, int> branches = new Gee.HashMap<Sidebar.Branch, int>();
@@ -77,8 +70,11 @@ public class Sidebar.Tree : Gtk.TreeView {
     private bool mask_entry_selected_signal = false;
     private weak EntryWrapper? selected_wrapper = null;
     private Gtk.Menu? default_context_menu = null;
+    private bool expander_called_manually = false;
+    private int expander_special_count = 0;
     private bool is_internal_drag_in_progress = false;
     private Sidebar.Entry? internal_drag_source_entry = null;
+    private Gtk.TreeRowReference? old_path_ref = null;
     
     public signal void entry_selected(Sidebar.SelectableEntry selectable);
     
@@ -97,15 +93,17 @@ public class Sidebar.Tree : Gtk.TreeView {
     public Tree(Gtk.TargetEntry[] target_entries, Gdk.DragAction actions,
         ExternalDropHandler drop_handler) {
         set_model(store);
+        get_style_context().add_class("sidebar");
         
         Gtk.TreeViewColumn text_column = new Gtk.TreeViewColumn();
-        text_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED);
+        text_column.set_expand(true);
         Gtk.CellRendererPixbuf icon_renderer = new Gtk.CellRendererPixbuf();
+        icon_renderer.follow_state = true;
         text_column.pack_start(icon_renderer, false);
-        text_column.add_attribute(icon_renderer, "pixbuf", Columns.PIXBUF);
-        text_column.add_attribute(icon_renderer, "pixbuf_expander_closed", Columns.CLOSED_PIXBUF);
-        text_column.add_attribute(icon_renderer, "pixbuf_expander_open", Columns.OPEN_PIXBUF);
+        text_column.add_attribute(icon_renderer, "icon_name", Columns.ICON);
+        text_column.set_cell_data_func(icon_renderer, icon_renderer_function);
         text_renderer = new Gtk.CellRendererText();
+        text_renderer.ellipsize = Pango.EllipsizeMode.END;
         text_renderer.editing_canceled.connect(on_editing_canceled);
         text_renderer.editing_started.connect(on_editing_started);
         text_column.pack_start(text_renderer, true);
@@ -131,6 +129,9 @@ public class Sidebar.Tree : Gtk.TreeView {
         selection.set_mode(Gtk.SelectionMode.BROWSE);
         selection.set_select_function(on_selection);
         
+        test_expand_row.connect(on_toggle_row);
+        test_collapse_row.connect(on_toggle_row);
+        
         // It Would Be Nice if the target entries and actions were gleaned by querying each 
         // Sidebar.Entry as it was added, but that's a tad too complicated for our needs
         // currently
@@ -145,9 +146,6 @@ public class Sidebar.Tree : Gtk.TreeView {
         
         popup_menu.connect(on_context_menu_keypress);
         
-        icon_theme = Resources.get_icon_theme_engine();
-        icon_theme.changed.connect(on_theme_change);
-        
         setup_default_context_menu();
         
         drag_begin.connect(on_drag_begin);
@@ -158,7 +156,14 @@ public class Sidebar.Tree : Gtk.TreeView {
     ~Tree() {
         text_renderer.editing_canceled.disconnect(on_editing_canceled);
         text_renderer.editing_started.disconnect(on_editing_started);
-        icon_theme.changed.disconnect(on_theme_change);
+    }
+    
+    public void icon_renderer_function(Gtk.CellLayout layout, Gtk.CellRenderer renderer, Gtk.TreeModel model, Gtk.TreeIter iter) {
+        EntryWrapper? wrapper = get_wrapper_at_iter(iter);
+        if (wrapper == null) {
+            return;
+        }
+        renderer.visible = !(wrapper.entry is Sidebar.Header);
     }
     
     private void on_drag_begin(Gdk.DragContext ctx) {
@@ -270,41 +275,72 @@ public class Sidebar.Tree : Gtk.TreeView {
     public bool is_selected(Sidebar.Entry entry) {
         EntryWrapper? wrapper = get_wrapper(entry);
         
-        return (wrapper != null) ? get_selection().path_is_selected(wrapper.get_path()) : false;
+        // Even though get_selection() does not report its return type as nullable, it can be null
+        // if the window has been destroyed.
+        Gtk.TreeSelection selection = get_selection();
+        if (selection == null)
+            return false;
+        
+        return (wrapper != null) ? selection.path_is_selected(wrapper.get_path()) : false;
     }
     
     public bool is_any_selected() {
         return get_selection().count_selected_rows() != 0;
     }
-    
+
     private Gtk.TreePath? get_selected_path() {
         Gtk.TreeModel model;
-        GLib.List<Gtk.TreePath> rows = get_selection().get_selected_rows(out model);
+        Gtk.TreeSelection? selection = get_selection();
+        if (selection == null){
+            return null;
+        }
+        GLib.List<Gtk.TreePath> rows = selection.get_selected_rows(out model);
         assert(rows.length() == 0 || rows.length() == 1);
-        
+
         return rows.length() != 0 ? rows.nth_data(0) : null;
     }
+
+    private string get_name_for_entry(Sidebar.Entry entry) {
+        string name = guarded_markup_escape_text(entry.get_sidebar_name());
+        
+        Sidebar.EmphasizableEntry? emphasizable_entry = entry as Sidebar.EmphasizableEntry;
+        if (emphasizable_entry != null && emphasizable_entry.is_emphasized())
+            name = "<b>%s</b>".printf(name);
+        
+        return name;
+    }
+    
+    public virtual bool accept_cursor_changed() {
+        return true;
+    }
     
     public override void cursor_changed() {
         Gtk.TreePath? path = get_selected_path();
         if (path == null) {
             if (base.cursor_changed != null)
                 base.cursor_changed();
-            
             return;
         }
         
         EntryWrapper? wrapper = get_wrapper_at_path(path);
-      
-        selected_wrapper = wrapper;
-        
-        if (editing_disabled == 0 && wrapper != null)
-            text_renderer.editable = wrapper.entry is Sidebar.RenameableEntry;
         
-        if (wrapper != null && !mask_entry_selected_signal) {
-            Sidebar.SelectableEntry? selectable = wrapper.entry as Sidebar.SelectableEntry;
-            if (selectable != null)
-                entry_selected(selectable);
+        if (selected_wrapper != wrapper) {
+            EntryWrapper old_wrapper = selected_wrapper;
+            selected_wrapper = wrapper;
+            
+            if (editing_disabled == 0 && wrapper != null && wrapper.entry is Sidebar.RenameableEntry)
+                text_renderer.editable = ((Sidebar.RenameableEntry) wrapper.entry).is_user_renameable();
+            
+            if (wrapper != null && !mask_entry_selected_signal) {
+                Sidebar.SelectableEntry? selectable = wrapper.entry as Sidebar.SelectableEntry;
+                if (selectable != null) {
+                    if (accept_cursor_changed()) {
+                        entry_selected(selectable);
+                    } else {
+                        place_cursor(old_wrapper.entry, true);
+                    }
+                }
+            }
         }
         
         if (base.cursor_changed != null)
@@ -320,11 +356,14 @@ public class Sidebar.Tree : Gtk.TreeView {
         Gtk.TreePath? path = get_selected_path();
         if (path != null && editing_disabled > 0 && --editing_disabled == 0) {
             EntryWrapper? wrapper = get_wrapper_at_path(path);
-            text_renderer.editable = (wrapper != null && (wrapper.entry is Sidebar.RenameableEntry));
+            if (wrapper != null && (wrapper.entry is Sidebar.RenameableEntry))
+                text_renderer.editable = ((Sidebar.RenameableEntry) wrapper.entry).
+                    is_user_renameable();
         }
     }
     
     public void toggle_branch_expansion(Gtk.TreePath path, bool expand_all) {
+        expander_called_manually = true;
         if (is_row_expanded(path))
             collapse_row(path);
         else
@@ -332,6 +371,7 @@ public class Sidebar.Tree : Gtk.TreeView {
     }
     
     public bool expand_to_entry(Sidebar.Entry entry) {
+        expander_called_manually = true;
         EntryWrapper? wrapper = get_wrapper(entry);
         if (wrapper == null)
             return false;
@@ -342,6 +382,7 @@ public class Sidebar.Tree : Gtk.TreeView {
     }
     
     public void expand_to_first_child(Sidebar.Entry entry) {
+        expander_called_manually = true;
         EntryWrapper? wrapper = get_wrapper(entry);
         if (wrapper == null)
             return;
@@ -445,7 +486,7 @@ public class Sidebar.Tree : Gtk.TreeView {
         assert(!entry_map.has_key(entry));
         entry_map.set(entry, wrapper);
         
-        store.set(assoc_iter, Columns.NAME, guarded_markup_escape_text(entry.get_sidebar_name()));
+        store.set(assoc_iter, Columns.NAME, get_name_for_entry(entry));
         store.set(assoc_iter, Columns.TOOLTIP, guarded_markup_escape_text(entry.get_sidebar_tooltip()));
         store.set(assoc_iter, Columns.WRAPPER, wrapper);
         load_entry_icons(assoc_iter);
@@ -458,15 +499,15 @@ public class Sidebar.Tree : Gtk.TreeView {
             pageable.page_created.connect(on_sidebar_page_created);
             pageable.destroying_page.connect(on_sidebar_destroying_page);
         }
+
+        Sidebar.EmphasizableEntry? emphasizable = entry as Sidebar.EmphasizableEntry;
+        if (emphasizable != null)
+            emphasizable.is_emphasized_changed.connect(on_is_emphasized_changed);
         
         Sidebar.RenameableEntry? renameable = entry as Sidebar.RenameableEntry;
         if (renameable != null)
             renameable.sidebar_name_changed.connect(on_sidebar_name_changed);
-        
-        Sidebar.ExpandableEntry? expandable = entry as Sidebar.ExpandableEntry;
-        if (expandable != null)
-            expandable.sidebar_open_closed_icons_changed.connect(on_sidebar_open_closed_icons_changed);
-        
+                
         entry.grafted(this);
     }
     
@@ -479,7 +520,7 @@ public class Sidebar.Tree : Gtk.TreeView {
         EntryWrapper new_wrapper = new EntryWrapper(store, entry, store.get_path(new_iter));
         entry_map.set(entry, new_wrapper);
         
-        store.set(new_iter, Columns.NAME, guarded_markup_escape_text(entry.get_sidebar_name()));
+        store.set(new_iter, Columns.NAME, get_name_for_entry(entry));
         store.set(new_iter, Columns.TOOLTIP, guarded_markup_escape_text(entry.get_sidebar_tooltip()));
         store.set(new_iter, Columns.WRAPPER, new_wrapper);
         load_entry_icons(new_iter);
@@ -571,9 +612,9 @@ public class Sidebar.Tree : Gtk.TreeView {
         if (renameable != null)
             renameable.sidebar_name_changed.disconnect(on_sidebar_name_changed);
         
-        Sidebar.ExpandableEntry? expandable = entry as Sidebar.ExpandableEntry;
-        if (expandable != null)
-            expandable.sidebar_open_closed_icons_changed.disconnect(on_sidebar_open_closed_icons_changed);
+        Sidebar.EmphasizableEntry? emphasizable = entry as Sidebar.EmphasizableEntry;
+        if (emphasizable != null)
+            emphasizable.is_emphasized_changed.disconnect(on_is_emphasized_changed);
         
         bool removed = entry_map.unset(entry);
         assert(removed);
@@ -703,88 +744,42 @@ public class Sidebar.Tree : Gtk.TreeView {
         store.set(wrapper.get_iter(), Columns.TOOLTIP, guarded_markup_escape_text(tooltip));
     }
     
-    private void on_sidebar_icon_changed(Sidebar.Entry entry, Icon? icon) {
+    private void on_sidebar_icon_changed(Sidebar.Entry entry, string? icon) {
         EntryWrapper? wrapper = get_wrapper(entry);
         assert(wrapper != null);
         
-        store.set(wrapper.get_iter(), Columns.PIXBUF, fetch_icon_pixbuf(icon));
+        store.set(wrapper.get_iter(), Columns.ICON, icon);
     }
-    
-    private void on_sidebar_page_created(Sidebar.PageRepresentative entry, Page page) {
-        page_created(entry, page);
+
+    private void rename_entry(Sidebar.Entry entry) {
+        EntryWrapper? wrapper = get_wrapper(entry);
+        assert(wrapper != null);
+        
+        store.set(wrapper.get_iter(), Columns.NAME, get_name_for_entry(entry));
     }
     
-    private void on_sidebar_destroying_page(Sidebar.PageRepresentative entry, Page page) {
-        destroying_page(entry, page);
+    private void on_sidebar_name_changed(Sidebar.Entry entry, string name) {
+        rename_entry(entry);
     }
     
-    private void on_sidebar_open_closed_icons_changed(Sidebar.ExpandableEntry entry, Icon? open,
-        Icon? closed) {
-        EntryWrapper? wrapper = get_wrapper(entry);
-        assert(wrapper != null);
-        
-        store.set(wrapper.get_iter(), Columns.OPEN_PIXBUF, fetch_icon_pixbuf(open));
-        store.set(wrapper.get_iter(), Columns.CLOSED_PIXBUF, fetch_icon_pixbuf(closed));
+    private void on_sidebar_page_created(Sidebar.PageRepresentative entry, Page page) {
+        page_created(entry, page);
     }
     
-    private void on_sidebar_name_changed(Sidebar.RenameableEntry entry, string name) {
-        EntryWrapper? wrapper = get_wrapper(entry);
-        assert(wrapper != null);
-        
-        store.set(wrapper.get_iter(), Columns.NAME, guarded_markup_escape_text(name));
+    private void on_is_emphasized_changed(Sidebar.EmphasizableEntry entry, bool is_emphasized) {
+        rename_entry(entry);
     }
     
-    private Gdk.Pixbuf? fetch_icon_pixbuf(GLib.Icon? gicon) {
-        if (gicon == null)
-            return null;
-        
-        try {
-            Gdk.Pixbuf? icon = icon_cache.get(gicon.to_string());
-            if (icon != null)
-                return icon;
-            
-            Gtk.IconInfo? info = icon_theme.lookup_by_gicon(gicon, ICON_SIZE, 0);
-            if (info == null)
-                return null;
-            
-            icon = info.load_icon();
-            if (icon == null)
-                return null;
-            
-            icon_cache.set(gicon.to_string(), icon);
-            
-            return icon;
-        } catch (Error err) {
-            warning("Unable to load icon %s: %s", gicon.to_string(), err.message);
-            
-            return null;
-        }
+    private void on_sidebar_destroying_page(Sidebar.PageRepresentative entry, Page page) {
+        destroying_page(entry, page);
     }
     
     private void load_entry_icons(Gtk.TreeIter iter) {
         EntryWrapper? wrapper = get_wrapper_at_iter(iter);
         if (wrapper == null)
             return;
-        
-        Icon? icon = wrapper.entry.get_sidebar_icon();
-        Icon? open = null;
-        Icon? closed = null;
-        
-        Sidebar.ExpandableEntry? expandable = wrapper.entry as Sidebar.ExpandableEntry;
-        if (expandable != null) {
-            open = expandable.get_sidebar_open_icon();
-            closed = expandable.get_sidebar_closed_icon();
-        }
-        
-        if (open == null)
-            open = icon;
-        
-        if (closed == null)
-            closed = icon;
-        
-        store.set(iter, Columns.PIXBUF, fetch_icon_pixbuf(icon));
-        store.set(iter, Columns.OPEN_PIXBUF, fetch_icon_pixbuf(open));
-        store.set(iter, Columns.CLOSED_PIXBUF, fetch_icon_pixbuf(closed));
+        string? icon = wrapper.entry.get_sidebar_icon();
+        store.set(iter, Columns.ICON, icon);
     }
     
     private void load_branch_icons(Gtk.TreeIter iter) {
@@ -798,15 +793,6 @@ public class Sidebar.Tree : Gtk.TreeView {
         }
     }
     
-    private void on_theme_change() {
-        Gtk.TreeIter iter;
-        if (store.get_iter_first(out iter)) {
-            do {
-                load_branch_icons(iter);
-            } while (store.iter_next(ref iter));
-        }
-    }
-    
     private bool on_selection(Gtk.TreeSelection selection, Gtk.TreeModel model, Gtk.TreePath path,
         bool path_currently_selected) {
         // only allow selection if a page is selectable
@@ -879,6 +865,42 @@ public class Sidebar.Tree : Gtk.TreeView {
         return true;
     }
     
+    public bool on_toggle_row(Gtk.TreeIter iter, Gtk.TreePath path) {
+        // Determine whether to allow the row to toggle
+        EntryWrapper? wrapper = get_wrapper_at_iter(iter);
+        if (wrapper == null) {
+            return false; // don't affect things
+        }
+        
+        // Most of the time, only allow manual toggles
+        bool should_allow_toggle = expander_called_manually;
+        
+        // Cancel out the manual flag
+        expander_called_manually = false;
+        
+        // If we are an expanded parent entry with content
+        if (is_row_expanded(path) && store.iter_has_child(iter) && wrapper.entry is Sidebar.SelectableEntry) {
+            // We are taking a special action
+            expander_special_count++;
+            if (expander_special_count == 1) {
+                // Workaround that prevents arrows from double-toggling
+                return true;
+            } else {
+                // Toggle only if non-manual, as opposed to the usual behavior
+                should_allow_toggle = !should_allow_toggle;
+            }
+        } else {
+            // Reset the special behavior count
+            expander_special_count = 0;
+        }
+        
+        if (should_allow_toggle) {
+            return false;
+        }
+        // Prevent branch expansion toggle
+        return true;
+    }
+    
     public override bool button_press_event(Gdk.EventButton event) {
         Gtk.TreePath? path = get_path_from_event(event);
 
@@ -893,19 +915,29 @@ public class Sidebar.Tree : Gtk.TreeView {
                 popup_context_menu(path, event);
             else
                 popup_default_context_menu(event);
-        } else if (event.button == 1 && event.type == Gdk.EventType.2BUTTON_PRESS) {
-            // double left click
-            if (path != null) {
+        } else if (event.button == 1 && event.type == Gdk.EventType.BUTTON_PRESS) {
+            if (path == null) {
+                old_path_ref = null;
+                return base.button_press_event(event);
+            }
+            
+            EntryWrapper? wrapper = get_wrapper_at_path(path);
+            
+            if (wrapper == null) {
+                old_path_ref = null;
+                return base.button_press_event(event);
+            }
+            
+            // Enable single click to toggle tree entries (bug 4985)
+            if (wrapper.entry is Sidebar.ExpandableEntry
+                || wrapper.entry is Sidebar.InternalDropTargetEntry) {
+                // all labels are InternalDropTargetEntries
                 toggle_branch_expansion(path, false);
-                
-                if (can_rename_path(path))
-                    return false;
             }
-        } else if (event.button == 1 && event.type == Gdk.EventType.BUTTON_PRESS) {
+            
             // Is this a click on an already-highlighted tree item?
-            Gtk.TreePath? cursor_path = null;
-            get_cursor(out cursor_path, null);
-            if ((cursor_path != null) && (cursor_path.compare(path) == 0)) {
+            if ((old_path_ref != null) && (old_path_ref.get_path() != null)
+                && (old_path_ref.get_path().compare(path) == 0)) {
                 // yes, don't allow single-click editing, but 
                 // pass the event on for dragging.
                 text_renderer.editable = false;
@@ -914,9 +946,13 @@ public class Sidebar.Tree : Gtk.TreeView {
             
             // Got click on different tree item, make sure it is editable
             // if it needs to be.
-            if (path != null && get_wrapper_at_path(path).entry is Sidebar.RenameableEntry) {
+            if (wrapper.entry is Sidebar.RenameableEntry &&
+                ((Sidebar.RenameableEntry) wrapper.entry).is_user_renameable()) {
                 text_renderer.editable = true;
             }
+            
+            // Remember what tree item is highlighted for next time.
+            old_path_ref = new Gtk.TreeRowReference(store, path);
         }
 
         return base.button_press_event(event);
@@ -1106,6 +1142,9 @@ public class Sidebar.Tree : Gtk.TreeView {
         if (renameable == null)
             return false;
         
+        if (wrapper.entry is Sidebar.Header)
+            return false;
+        
         get_selection().select_path(path);
         
         return true;
diff --git a/src/sidebar/common.vala b/src/sidebar/common.vala
index 36adfff..0f1bc05 100644
--- a/src/sidebar/common.vala
+++ b/src/sidebar/common.vala
@@ -1,39 +1,42 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
 // A simple grouping Entry that is only expandable
-public class Sidebar.Grouping : Object, Sidebar.Entry, Sidebar.ExpandableEntry {
+public class Sidebar.Grouping : Object, Sidebar.Entry, Sidebar.ExpandableEntry,
+    Sidebar.RenameableEntry {
+    
     private string name;
-    private Icon? open_icon;
-    private Icon? closed_icon;
+    private string? tooltip;
+    private string? icon;
     
-    public Grouping(string name, Icon? open_icon, Icon? closed_icon = null) {
+    public Grouping(string name, string? icon, string? tooltip = null) {
         this.name = name;
-        this.open_icon = open_icon;
-        this.closed_icon = closed_icon ?? open_icon;
+        this.icon = icon;
+        this.tooltip = tooltip;
     }
     
-    public string get_sidebar_name() {
-        return name;
+    public void rename(string name) {
+        this.name = name;
+        sidebar_name_changed(name);
     }
     
-    public string? get_sidebar_tooltip() {
-        return name;
+    public bool is_user_renameable() {
+        return false;
     }
     
-    public Icon? get_sidebar_icon() {
-        return null;
+    public string get_sidebar_name() {
+        return name;
     }
     
-    public Icon? get_sidebar_open_icon() {
-        return open_icon;
+    public string? get_sidebar_tooltip() {
+        return tooltip;
     }
     
-    public Icon? get_sidebar_closed_icon() {
-        return closed_icon;
+    public string? get_sidebar_icon() {
+        return icon;
     }
     
     public string to_string() {
@@ -61,7 +64,7 @@ public abstract class Sidebar.SimplePageEntry : Object, Sidebar.Entry, Sidebar.S
         return get_sidebar_name();
     }
     
-    public abstract Icon? get_sidebar_icon();
+    public abstract string? get_sidebar_icon();
     
     public virtual string to_string() {
         return get_sidebar_name();
@@ -107,6 +110,26 @@ public class Sidebar.RootOnlyBranch : Sidebar.Branch {
     }
 }
 
+/**
+ * A header is an entry that is visually distinguished from its children. Bug 6397 recommends
+ * headers to appear bolded and without any icons. To prevent the icons from rendering, we set the
+ * icons to null in the base class @see Sidebar.Grouping. But we also go a step further by
+ * using a custom cell_data_function (@see Sidebar.Tree::icon_renderer_function) which ensures that
+ * header icons won't be rendered. This approach avoids the blank icon spacing issues.
+ */
+public class Sidebar.Header : Sidebar.Grouping, Sidebar.EmphasizableEntry {
+    private bool emphasized;
+    
+    public Header(string name, bool emphasized = true) {
+        base(name, null);
+        this.emphasized = emphasized;
+    }
+    
+    public bool is_emphasized() {
+        return emphasized;
+    }
+}
+
 public interface Sidebar.Contextable : Object {
     // Return null if the context menu should not be invoked for this event
     public abstract Gtk.Menu? get_sidebar_context_menu(Gdk.EventButton? event);
diff --git a/src/slideshow/Slideshow.vala b/src/slideshow/Slideshow.vala
index d55e3d6..7d20f91 100644
--- a/src/slideshow/Slideshow.vala
+++ b/src/slideshow/Slideshow.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/slideshow/TransitionEffects.vala b/src/slideshow/TransitionEffects.vala
index 7b10543..5acc36d 100644
--- a/src/slideshow/TransitionEffects.vala
+++ b/src/slideshow/TransitionEffects.vala
@@ -1,5 +1,5 @@
 /* Copyright 2010 Maxim Kartashev
- * Copyright 2011-2014 Yorba Foundation
+ * Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/tags/Branch.vala b/src/tags/Branch.vala
index 71bf424..e68b2b1 100644
--- a/src/tags/Branch.vala
+++ b/src/tags/Branch.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -8,7 +8,7 @@ public class Tags.Branch : Sidebar.Branch {
     private Gee.HashMap<Tag, Tags.SidebarEntry> entry_map = new Gee.HashMap<Tag, Tags.SidebarEntry>();
     
     public Branch() {
-        base (new Tags.Grouping(),
+        base (new Tags.Header(),
             Sidebar.Branch.Options.HIDE_IF_EMPTY
                 | Sidebar.Branch.Options.AUTO_OPEN_ON_NEW_CHILD
                 | Sidebar.Branch.Options.STARTUP_OPEN_GROUPING,
@@ -31,6 +31,10 @@ public class Tags.Branch : Sidebar.Branch {
         return entry_map.get(tag);
     }
     
+    public bool is_user_renameable() {
+        return true;
+    }
+    
     private static int comparator(Sidebar.Entry a, Sidebar.Entry b) {
         if (a == b)
             return 0;
@@ -118,13 +122,13 @@ public class Tags.Branch : Sidebar.Branch {
     }
 }
 
-public class Tags.Grouping : Sidebar.Grouping, Sidebar.InternalDropTargetEntry, 
+public class Tags.Header : Sidebar.Header, Sidebar.InternalDropTargetEntry, 
     Sidebar.InternalDragSourceEntry, Sidebar.Contextable {
     private Gtk.UIManager ui = new Gtk.UIManager();
     private Gtk.Menu? context_menu = null;
     
-    public Grouping() {
-        base (_("Tags"), new ThemedIcon(Resources.ICON_TAGS));
+    public Header() {
+        base (_("Tags"));
         setup_context_menu();
     }
     
@@ -199,7 +203,7 @@ public class Tags.Grouping : Sidebar.Grouping, Sidebar.InternalDropTargetEntry,
 public class Tags.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.RenameableEntry,
     Sidebar.DestroyableEntry, Sidebar.InternalDropTargetEntry, Sidebar.ExpandableEntry,
     Sidebar.InternalDragSourceEntry {
-    private static Icon single_tag_icon;
+    private string single_tag_icon = Resources.ICON_ONE_TAG;
     
     private Tag tag;
     
@@ -208,11 +212,9 @@ public class Tags.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.RenameableEntr
     }
     
     internal static void init() {
-        single_tag_icon = new ThemedIcon(Resources.ICON_ONE_TAG);
     }
     
     internal static void terminate() {
-        single_tag_icon = null;
     }
     
     public Tag for_tag() {
@@ -223,7 +225,7 @@ public class Tags.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.RenameableEntr
         return tag.get_user_visible_name();
     }
     
-    public override Icon? get_sidebar_icon() {
+    public override string? get_sidebar_icon() {
         return single_tag_icon;
     }
     
@@ -231,6 +233,10 @@ public class Tags.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.RenameableEntr
         return new TagPage(tag);
     }
     
+    public bool is_user_renameable() {
+        return true;
+    }
+    
     public void rename(string new_name) {
         string? prepped = Tag.prep_tag_name(new_name);
         if (prepped == null)
@@ -290,14 +296,6 @@ public class Tags.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.RenameableEntr
         return false;
     }
 
-    public Icon? get_sidebar_open_icon() {
-        return single_tag_icon;
-    }
-    
-    public Icon? get_sidebar_closed_icon() {
-        return single_tag_icon;
-    }
-    
     public bool expand_on_select() {
         return false;
     }
diff --git a/src/tags/HierarchicalTagIndex.vala b/src/tags/HierarchicalTagIndex.vala
index 58b5f89..abc1f20 100644
--- a/src/tags/HierarchicalTagIndex.vala
+++ b/src/tags/HierarchicalTagIndex.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/tags/HierarchicalTagUtilities.vala b/src/tags/HierarchicalTagUtilities.vala
index dbb7165..a455bbf 100644
--- a/src/tags/HierarchicalTagUtilities.vala
+++ b/src/tags/HierarchicalTagUtilities.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/tags/TagPage.vala b/src/tags/TagPage.vala
index f3ef237..2eebc42 100644
--- a/src/tags/TagPage.vala
+++ b/src/tags/TagPage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/tags/Tags.vala b/src/tags/Tags.vala
index 7d02a2f..0639cdc 100644
--- a/src/tags/Tags.vala
+++ b/src/tags/Tags.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/threads/BackgroundJob.vala b/src/threads/BackgroundJob.vala
index 178211e..8203307 100644
--- a/src/threads/BackgroundJob.vala
+++ b/src/threads/BackgroundJob.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/threads/Semaphore.vala b/src/threads/Semaphore.vala
index dfb0a2f..31d2b2d 100644
--- a/src/threads/Semaphore.vala
+++ b/src/threads/Semaphore.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/threads/Threads.vala b/src/threads/Threads.vala
index 0e1b1ec..b9bcd55 100644
--- a/src/threads/Threads.vala
+++ b/src/threads/Threads.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/threads/Workers.vala b/src/threads/Workers.vala
index 756eb01..a97b557 100644
--- a/src/threads/Workers.vala
+++ b/src/threads/Workers.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/unit/Unit.vala b/src/unit/Unit.vala
index f297974..e6c7228 100644
--- a/src/unit/Unit.vala
+++ b/src/unit/Unit.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/unit/rc/template.vala b/src/unit/rc/template.vala
index 4869700..8199c01 100644
--- a/src/unit/rc/template.vala
+++ b/src/unit/rc/template.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/util/KeyValueMap.vala b/src/util/KeyValueMap.vala
index c1f5a55..cf52719 100644
--- a/src/util/KeyValueMap.vala
+++ b/src/util/KeyValueMap.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/util/Util.vala b/src/util/Util.vala
index c754ff8..701ca04 100644
--- a/src/util/Util.vala
+++ b/src/util/Util.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/util/file.vala b/src/util/file.vala
index 1b6bb6c..8af5ca1 100644
--- a/src/util/file.vala
+++ b/src/util/file.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/util/image.vala b/src/util/image.vala
index e8f93ba..4485fc7 100644
--- a/src/util/image.vala
+++ b/src/util/image.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/util/misc.vala b/src/util/misc.vala
index 73ce428..1507e02 100644
--- a/src/util/misc.vala
+++ b/src/util/misc.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/util/string.vala b/src/util/string.vala
index 9fda007..3574249 100644
--- a/src/util/string.vala
+++ b/src/util/string.vala
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/util/system.vala b/src/util/system.vala
index 9407405..8e5a07f 100644
--- a/src/util/system.vala
+++ b/src/util/system.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/src/util/ui.vala b/src/util/ui.vala
index 9f66de8..b846f22 100644
--- a/src/util/ui.vala
+++ b/src/util/ui.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/thumbnailer/shotwell-video-thumbnailer.vala b/thumbnailer/shotwell-video-thumbnailer.vala
index 93db2aa..e73dc79 100644
--- a/thumbnailer/shotwell-video-thumbnailer.vala
+++ b/thumbnailer/shotwell-video-thumbnailer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  * 
  * This is a Vala-rewrite of GStreamer snapshot example. Adapted from earlier 
  * work from Wim Taymans.
@@ -14,13 +14,11 @@ class ShotwellThumbnailer {
     
     public static int main(string[] args) {
         Gst.Element pipeline, sink;
-        int width, height;
-        Gst.Sample sample;
         string descr;
         Gdk.Pixbuf pixbuf;
+        uint8[]? pngdata;
         int64 duration, position;
         Gst.StateChangeReturn ret;
-        bool res;
         
         Gst.init(ref args);
         
@@ -30,7 +28,7 @@ class ShotwellThumbnailer {
         }
         
         descr = "filesrc location=\"%s\" ! decodebin ! videoconvert ! videoscale ! ".printf(args[1]) +
-            "appsink name=sink caps=\"%s\"".printf(caps_string);
+            "%s ! gdkpixbufsink name=sink".printf(caps_string);
         
         try {
             // Create new pipeline.
@@ -59,7 +57,10 @@ class ShotwellThumbnailer {
             }
 
             /* get the duration */
-            pipeline.query_duration (Gst.Format.TIME, out duration);
+            if (!pipeline.query_duration (Gst.Format.TIME, out duration)) {
+                stderr.printf("Failed to query file for duration\n");
+                return 3;
+            }
 
             position = 1 * Gst.SECOND;
 
@@ -69,61 +70,18 @@ class ShotwellThumbnailer {
              * seek a little more */
             pipeline.seek_simple (Gst.Format.TIME, Gst.SeekFlags.KEY_UNIT | Gst.SeekFlags.FLUSH, position);
 
-            /* get the preroll buffer from appsink, this block untils appsink really
-             * prerolls */
-            GLib.Signal.emit_by_name (sink, "pull-preroll", out sample, null);
+            ret = pipeline.get_state(null, null, 5 * Gst.SECOND);
+            if (ret == Gst.StateChangeReturn.FAILURE) {
+                stderr.printf("Failed to play the file: couldn't get state.\n");
+                return 3;
+            }
 
-            // if we have a buffer now, convert it to a pixbuf. It's possible that we
-            // don't have a buffer because we went EOS right away or had an error.
-            if (sample != null) {
-                Gst.Buffer buffer;
-                Gst.Caps caps;
-                unowned Gst.Structure s;
-                Gst.MapInfo mapinfo;
-                uint8[]? pngdata;
+            sink.get ("last-pixbuf", out pixbuf);
 
-                // Get the snapshot buffer format now. We set the caps on the appsink so
-                // that it can only be an rgb buffer. The only thing we have not specified
-                // on the caps is the height, which is dependent on the pixel-aspect-ratio
-                // of the source material.
-                caps = sample.get_caps();
-                if (caps == null) {
-                    stderr.printf("could not get snapshot format\n");
-                    return 5;
-                }
-                
-                s = caps.get_structure(0);
-                
-                // We need to get the final caps on the buffer to get the size.
-                res = s.get_int("width", out width);
-                res |= s.get_int("height", out height);
-                if (!res) {
-                    stderr.printf("Could not get snapshot dimension\n");
-                    return 6;
-                }
+            // Save the pixbuf.
+            pixbuf.save_to_buffer(out pngdata, "png");
+            stdout.write(pngdata);
 
-                buffer = sample.get_buffer();
-                buffer.map(out mapinfo, Gst.MapFlags.READ);
-                
-                if (mapinfo.data == null || mapinfo.data.length == 0) {
-                    stderr.printf("Could not get snapshot data buffer\n");
-                    return 7;
-                }
-                
-                // Create pixmap from buffer and save, gstreamer video buffers have a stride
-                // that is rounded up to the nearest multiple of 4.
-                pixbuf = new Gdk.Pixbuf.from_data(mapinfo.data, Gdk.Colorspace.RGB, false, 8,
-                    width, height, (((width * 3)+3)&~3), null);
-                
-                // Save the pixbuf.
-                pixbuf.save_to_buffer(out pngdata, "png");
-                stdout.write(pngdata);
-                buffer.unmap(mapinfo);
-            } else {
-                stderr.printf("Could not make snapshot\n");
-                return 10;
-            }
-            
             // cleanup and exit.
             pipeline.set_state(Gst.State.NULL);
             
diff --git a/ui/media.ui b/ui/media.ui
index 52489ef..befd0ed 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -55,6 +55,7 @@
             <separator />
             <menu name="SortPhotos" action="SortPhotos">
                 <menuitem name="SortByTitle" action="SortByTitle" />
+                <menuitem name="SortByFilename" action="SortByFilename" />
                 <menuitem name="SortByExposureDate" action="SortByExposureDate" />
                 <menuitem name="SortByRating" action="SortByRating" />
                 <separator />
diff --git a/ui/set_background_dialog.glade b/ui/set_background_dialog.glade
index 8a0f1a6..f857693 100644
--- a/ui/set_background_dialog.glade
+++ b/ui/set_background_dialog.glade
@@ -28,13 +28,13 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <property name="label">gtk-cancel</property>
+                <property name="label">_Cancel</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -44,14 +44,14 @@
             </child>
             <child>
               <object class="GtkButton" id="ok_button">
-                <property name="label">gtk-ok</property>
+                <property name="label">_OK</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/ui/set_background_slideshow_dialog.glade b/ui/set_background_slideshow_dialog.glade
index f346279..438e565 100644
--- a/ui/set_background_slideshow_dialog.glade
+++ b/ui/set_background_slideshow_dialog.glade
@@ -67,13 +67,13 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <property name="label">gtk-cancel</property>
+                <property name="label">_Cancel</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -83,7 +83,7 @@
             </child>
             <child>
               <object class="GtkButton" id="ok_button">
-                <property name="label">gtk-ok</property>
+                <property name="label">_OK</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -92,7 +92,7 @@
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
                 <property name="tooltip_text" translatable="yes">Generate desktop background slideshow</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/ui/shotwell.glade b/ui/shotwell.glade
index 435152d..de2b15d 100644
--- a/ui/shotwell.glade
+++ b/ui/shotwell.glade
@@ -1,202 +1,179 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkDialog" id="Search criteria">
+  <!-- interface-requires gtk+ 3.12 -->
+  <object class="GtkBox" id="criteria">
+    <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Search</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox6">
+    <property name="orientation">vertical</property>
+    <property name="spacing">5</property>
+    <property name="border_width">3</property>
+    <child>
+      <object class="GtkAlignment" id="title_aln">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="search dialog buttons">
+        <child>
+          <object class="GtkBox" id="hbox3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="spacing">3</property>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="Name of search:">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Name of search:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">Search title</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="Search title">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">•</property>
+                <property name="width_chars">20</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
         </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkHSeparator" id="hseparator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkAlignment" id="alignment9">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <child>
-          <object class="GtkAlignment" id="title_aln">
+          <object class="GtkBox" id="hbox2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="spacing">3</property>
             <child>
-              <object class="GtkBox" id="hbox3">
+              <object class="GtkLabel" id="Match">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkLabel" id="Name of search:">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Name of search:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">Search title</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">8</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="Search title">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">•</property>
-                    <property name="width_chars">20</property>
-                    <property name="primary_icon_activatable">False</property>
-                    <property name="secondary_icon_activatable">False</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="padding">8</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
+                <property name="label" translatable="yes">_Match</property>
+                <property name="use_underline">True</property>
+                <property name="justify">right</property>
+                <property name="mnemonic_widget">Type of search criteria</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHSeparator" id="hseparator1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="padding">8</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkAlignment" id="alignment9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
-              <object class="GtkBox" id="hbox2">
+              <object class="GtkComboBoxText" id="Type of search criteria">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="spacing">10</property>
-                <child>
-                  <object class="GtkLabel" id="Match">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Match</property>
-                    <property name="use_underline">True</property>
-                    <property name="justify">right</property>
-                    <property name="mnemonic_widget">Type of search criteria</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">8</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="Type of search criteria">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">1</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="of the following:">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="ypad">3</property>
-                    <property name="label" translatable="yes">of the following:</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">8</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">1</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="of the following:">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">of the following:</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkButton" id="Add search button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
                 <child>
-                  <object class="GtkButton" id="Add search button">
-                    <property name="label"> + </property>
+                  <object class="GtkImage">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="icon-name">list-add-symbolic</property>
+                    <property name="icon-size">1</property>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">4</property>
-                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">end</property>
+                <property name="position">4</property>
+              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHSeparator" id="hseparator2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="padding">8</property>
-            <property name="position">4</property>
-          </packing>
         </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">3</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkHSeparator" id="hseparator2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">4</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="row_box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">3</property>
         <child>
-          <object class="GtkBox" id="row_box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">5</property>
-          </packing>
+          <placeholder/>
         </child>
       </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">5</property>
+      </packing>
     </child>
   </object>
   <object class="GtkAdjustment" id="bg_color_adjustment">
@@ -572,18 +549,18 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="orientation">vertical</property>
+    <property name="border_width">3</property>
+    <property name="spacing">3</property>
     <child>
       <object class="GtkLabel" id="label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="xpad">4</property>
         <property name="label" translatable="yes">label</property>
       </object>
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="padding">4</property>
         <property name="position">0</property>
       </packing>
     </child>
@@ -591,16 +568,12 @@
       <object class="GtkEntry" id="entry">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
-        <property name="margin_left">7</property>
-        <property name="margin_right">7</property>
-        <property name="margin_bottom">2</property>
         <property name="invisible_char">●</property>
         <property name="activates_default">True</property>
       </object>
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="padding">1</property>
         <property name="position">1</property>
       </packing>
     </child>
@@ -614,21 +587,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkLabel" id="label9">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="xpad">4</property>
-        <property name="label" translatable="yes">label</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="padding">4</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
+    <property name="border_width">3</property>
     <child>
       <object class="GtkScrolledWindow" id="scrolledwindow1">
         <property name="visible">True</property>
@@ -638,12 +597,8 @@
           <object class="GtkTextView" id="textview1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="margin_left">7</property>
-            <property name="margin_right">7</property>
-            <property name="margin_bottom">2</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="border_width">1</property>
             <property name="wrap_mode">word</property>
             <property name="accepts_tab">False</property>
           </object>
@@ -663,6 +618,7 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="orientation">vertical</property>
+    <property name="spacing">12</property>
     <child>
       <object class="GtkAlignment" id="plugin-list-alignment">
         <property name="visible">True</property>
@@ -692,11 +648,11 @@
         <property name="layout_style">end</property>
         <child>
           <object class="GtkButton" id="about-plugin-button">
-            <property name="label">gtk-about</property>
+            <property name="label">_About</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="use_stock">True</property>
+            <property name="use_underline">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -708,56 +664,34 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">False</property>
-        <property name="padding">6</property>
         <property name="position">1</property>
       </packing>
     </child>
   </object>
   <object class="GtkDialog" id="preferences_dialog">
     <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Shotwell Preferences</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="headerbar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="show-close-button">True</property>
+        <property name="title" translatable="yes">Shotwell Preferences</property>
+      </object>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="close_button">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
+        <property name="border_width">0</property>
         <child>
           <object class="GtkNotebook" id="notebook1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="show_border">False</property>
             <child>
               <object class="GtkAlignment" id="alignment1">
                 <property name="visible">True</property>
@@ -1419,9 +1353,6 @@
         </child>
       </object>
     </child>
-    <action-widgets>
-      <action-widget response="-5">close_button</action-widget>
-    </action-widgets>
   </object>
   <object class="GtkBox" id="progress_pane_widget">
     <property name="visible">True</property>
diff --git a/vapi/ExtendedPosix.vapi b/vapi/ExtendedPosix.vapi
index 2eaeffe..d196bda 100644
--- a/vapi/ExtendedPosix.vapi
+++ b/vapi/ExtendedPosix.vapi
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/vapi/LConv.vapi b/vapi/LConv.vapi
index 35de9f5..6854e46 100644
--- a/vapi/LConv.vapi
+++ b/vapi/LConv.vapi
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/vapi/gphoto-2.4/libgphoto2.vapi b/vapi/gphoto-2.4/libgphoto2.vapi
index e90e094..c124b10 100644
--- a/vapi/gphoto-2.4/libgphoto2.vapi
+++ b/vapi/gphoto-2.4/libgphoto2.vapi
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/vapi/gphoto-2.5/libgphoto2.vapi b/vapi/gphoto-2.5/libgphoto2.vapi
index 89aa548..22abf40 100644
--- a/vapi/gphoto-2.5/libgphoto2.vapi
+++ b/vapi/gphoto-2.5/libgphoto2.vapi
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/vapi/gphoto.h b/vapi/gphoto.h
index f40b84c..b55ba5f 100644
--- a/vapi/gphoto.h
+++ b/vapi/gphoto.h
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/vapi/libexif.vapi b/vapi/libexif.vapi
index ff29a76..cf16d42 100644
--- a/vapi/libexif.vapi
+++ b/vapi/libexif.vapi
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/vapi/libraw.vapi b/vapi/libraw.vapi
index ad7de61..4659c5e 100644
--- a/vapi/libraw.vapi
+++ b/vapi/libraw.vapi
@@ -1,4 +1,4 @@
-/* Copyright 2010-2014 Yorba Foundation
+/* Copyright 2010-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.