[shotwell/shotwell-0.30] Update Scottish Gaelic translation

[Translations User D-L <translations src gnome org>]

commit 04c036d5477965b08bbe8b7ea438214f82e928fa
Author: Gun Chleoc <fios foramnagaidhlig net>
Date:   Sat Apr 10 10:07:54 2021 +0000

    Update Scottish Gaelic translation

 po/gd.po | 4981 ++++++++++++++++++++++++++------------------------------------
 1 file changed, 2109 insertions(+), 2872 deletions(-)
---
diff --git a/po/gd.po b/po/gd.po
index 7b6c95b9..aa019c27 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -6,27 +6,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=shotw";
-"ell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-04-02 16:28+0000\n"
-"PO-Revision-Date: 2018-03-02 12:09+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/shotwell/issues\n";
+"POT-Creation-Date: 2020-05-28 09:45+0000\n"
+"PO-Revision-Date: 2021-04-10 11:07+0100\n"
 "Last-Translator: GunChleoc <fios foramnagaidhlig net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
 "Language: gd\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
-"(n > 2 && n < 20) ? 2 : 3;\n"
-"X-Generator: Virtaal 0.7.1\n"
+"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
+"X-Generator: Poedit 2.4.2\n"
 "X-Launchpad-Export-Date: 2014-04-10 15:01+0000\n"
 "X-Project-Style: gnome\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356
-#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
-#: ui/tags.ui:356
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4 
plugins/shotwell-publishing-extras/GalleryConnector.vala:115 src/photos/RawSupport.vala:308 
ui/collection.ui:85 ui/event.ui:356 ui/event.ui:524 ui/faces.ui:356 ui/media.ui:356 ui/photo_context.ui:91 
ui/photo.ui:347 ui/tags.ui:356
 msgid "Shotwell"
 msgstr "Shotwell"
 
@@ -36,89 +30,73 @@ msgstr "Manaidsear dhealbhan mòr-chòrdte"
 
 #: misc/shotwell.appdata.xml.in:11
 msgid ""
-"Shotwell is an easy-to-use, fast photo organizer designed for the GNOME "
-"desktop. It allows you to import photos from your camera or disk, organize "
-"them by date and subject matter, even ratings. It also offers basic photo "
-"editing, like crop, red-eye correction, color adjustments, and straighten. "
-"Shotwell’s non-destructive photo editor does not alter your master photos, "
-"making it easy to experiment and correct errors."
+"Shotwell is an easy-to-use, fast photo organizer designed for the GNOME desktop. It allows you to import 
photos from your camera or disk, organize them by date and subject matter, even ratings. It also offers basic 
photo editing, like crop, red-eye correction, color adjustments, and straighten. Shotwell’s non-destructive "
+"photo editor does not alter your master photos, making it easy to experiment and correct errors."
 msgstr ""
 
 #: misc/shotwell.appdata.xml.in:18
-msgid ""
-"When ready, Shotwell can upload your photos to various web sites, such as "
-"Facebook, Flickr, Picasa (Google Plus), and more."
+msgid "When ready, Shotwell can upload your photos to various web sites, such as Facebook, Flickr, Google 
Photos, and more."
 msgstr ""
 
 #: misc/shotwell.appdata.xml.in:22
 msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
 msgstr ""
 
-#: misc/shotwell.appdata.xml.in:52
+#: misc/shotwell.appdata.xml.in:53
 msgid "The Shotwell developers"
 msgstr "Luchd-leasachaidh Shotwell"
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Manaidsear dhealbhan"
 
-#: misc/shotwell.desktop.in.in:6
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "Cuir rian air na dealbhan agad"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
-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;"
+#: misc/shotwell.desktop.in:8
+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 ""
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
-msgid "shotwell"
-msgstr "shotwell"
-
-#: misc/shotwell-viewer.desktop.in.in:4
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Sealladair Shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Sealladair dhealbhan"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:6
 msgid "authentication token"
-msgstr ""
+msgstr "tòcan dearbhaidh"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:7
 msgid "Yandex-Fotki authentication token, if logged in."
-msgstr ""
+msgstr "Tòcan Yandex-Fotki ma tha thu air do chlàradh a-steach."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:14
 msgid "Token"
-msgstr ""
+msgstr "Tòcan"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:15
 msgid "The token to access tumblr"
-msgstr ""
+msgstr "An tòcan airson tumblr inntrigeadh"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:20
 msgid "Secret token"
-msgstr ""
+msgstr "Tòcan dìomhair"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:21
 msgid "The secret token to sign oauth requests"
-msgstr ""
+msgstr "An tòcan dìomhair airson iarrtasan OAuth a shoidhneadh"
 
-#: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell-extras.gschema.xml:26 misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
-msgstr ""
+msgstr "meud tùsail"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:27
-msgid ""
-"A numeric code representing the default size for photos uploaded to Tumblr"
+msgid "A numeric code representing the default size for photos uploaded to Tumblr"
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:32
@@ -137,10 +115,7 @@ msgstr ""
 msgid "URL of the Rajce server."
 msgstr ""
 
-#: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
+#: misc/org.yorba.shotwell-extras.gschema.xml:46 misc/org.yorba.shotwell.gschema.xml:466 
misc/org.yorba.shotwell.gschema.xml:524 misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "ainm-cleachdaiche"
 
@@ -156,8 +131,7 @@ msgstr ""
 msgid "user token, if remembered."
 msgstr ""
 
-#: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell-extras.gschema.xml:58 misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr "an roinn-seòrsa mu dheireadh"
 
@@ -165,15 +139,12 @@ msgstr "an roinn-seòrsa mu dheireadh"
 msgid "The last selected Rajce category."
 msgstr ""
 
-#: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell-extras.gschema.xml:64 misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr "meud an deilbh mu dheireadh"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:65
-msgid ""
-"A numeric code representing the last photo size preset used when publishing "
-"to Rajce."
+msgid "A numeric code representing the last photo size preset used when publishing to Rajce."
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:70
@@ -197,23 +168,15 @@ msgid "open album in web browser"
 msgstr "fosgal an t-albam ann am brabhsair-lìn"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:83
-msgid ""
-"If true, open target album in the web browser just after uploading photos"
+msgid "If true, open target album in the web browser just after uploading photos"
 msgstr ""
 
-#: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell-extras.gschema.xml:88 misc/org.yorba.shotwell.gschema.xml:446 
misc/org.yorba.shotwell.gschema.xml:484 misc/org.yorba.shotwell.gschema.xml:510 
misc/org.yorba.shotwell.gschema.xml:560 misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:89
-msgid ""
-"Whether images being uploaded to Rajce should have their metadata removed "
-"first"
+msgid "Whether images being uploaded to Rajce should have their metadata removed first"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:23
@@ -229,8 +192,7 @@ msgid "display extended properties"
 msgstr "seall buadhan leudaichte"
 
 #: misc/org.yorba.shotwell.gschema.xml:30
-msgid ""
-"True if the extended properties window is to be displayed, false otherwise."
+msgid "True if the extended properties window is to be displayed, false otherwise."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:35
@@ -262,9 +224,7 @@ msgid "display photo titles"
 msgstr "seall tiotalan nan dealbhan"
 
 #: misc/org.yorba.shotwell.gschema.xml:54
-msgid ""
-"True if photo titles are to be displayed beneath thumbnails in collection "
-"views, false otherwise."
+msgid "True if photo titles are to be displayed beneath thumbnails in collection views, false otherwise."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:59
@@ -272,9 +232,7 @@ msgid "display photo comments"
 msgstr "seall beachdan air dealbhan"
 
 #: misc/org.yorba.shotwell.gschema.xml:60
-msgid ""
-"True if photo comments are to be displayed beneath thumbnails in collection "
-"views, false otherwise."
+msgid "True if photo comments are to be displayed beneath thumbnails in collection views, false otherwise."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:65
@@ -282,9 +240,7 @@ msgid "display event comments"
 msgstr "seall beachdan air tachartasan"
 
 #: misc/org.yorba.shotwell.gschema.xml:66
-msgid ""
-"True if event comments are to be displayed beneath thumbnails in event "
-"views, false otherwise."
+msgid "True if event comments are to be displayed beneath thumbnails in event views, false otherwise."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:71
@@ -292,9 +248,7 @@ msgid "display photo tags"
 msgstr "seall tagaichean nan dealbhan"
 
 #: misc/org.yorba.shotwell.gschema.xml:72
-msgid ""
-"True if photo tags are to be listed beneath thumbnails in collection views, "
-"false otherwise."
+msgid "True if photo tags are to be listed beneath thumbnails in collection views, false otherwise."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:77
@@ -302,9 +256,7 @@ msgid "display photo ratings"
 msgstr "seall rangachaidhean nan dealbhan"
 
 #: misc/org.yorba.shotwell.gschema.xml:78
-msgid ""
-"True if a photo’s rating should be displayed as overlaid trinket, false "
-"otherwise."
+msgid "True if a photo’s rating should be displayed as overlaid trinket, false otherwise."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:83
@@ -312,10 +264,7 @@ msgid "rating filter level"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:84
-msgid ""
-"Determines how to filter photos based on their ratings. 1: Rejected or "
-"better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three "
-"or better, 6: Four or better, 7: Five or better."
+msgid "Determines how to filter photos based on their ratings. 1: Rejected or better, 2: Unrated or better, 
3: One or better, 4: Two or better, 5: Three or better, 6: Four or better, 7: Five or better."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:89
@@ -339,8 +288,7 @@ msgid "sort library photos criteria"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:102
-msgid ""
-"A numeric code that specifies the sort criteria for photos in library views."
+msgid "A numeric code that specifies the sort criteria for photos in library views."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:107
@@ -364,9 +312,7 @@ msgid "use 24 hour time"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:120
-msgid ""
-"True if should display times with a 24 hour clock, false if times should use "
-"AM/PM notation."
+msgid "True if should display times with a 24 hour clock, false if times should use AM/PM notation."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:125
@@ -374,9 +320,7 @@ msgid "keep relative time between photos"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:126
-msgid ""
-"True if when adjusting time/date of photos, relative time should be "
-"maintained. False if all photos should be set to the same time."
+msgid "True if when adjusting time/date of photos, relative time should be maintained. False if all photos 
should be set to the same time."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:131
@@ -384,9 +328,7 @@ msgid "modify original photo files"
 msgstr "atharraich faidhlichean tùsail nan dealbhan"
 
 #: misc/org.yorba.shotwell.gschema.xml:132
-msgid ""
-"True if when adjusting time/date of photos, the original files should be "
-"modified as well. False if changes are made only in the database."
+msgid "True if when adjusting time/date of photos, the original files should be modified as well. False if 
changes are made only in the database."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:137
@@ -394,9 +336,7 @@ msgid "show welcome dialog on startup"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:138
-msgid ""
-"True if, when on startup, a welcome dialog should be shown. False if it "
-"should not be shown."
+msgid "True if, when on startup, a welcome dialog should be shown. False if it should not be shown."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:143
@@ -424,967 +364,860 @@ msgid "Pin toolbar in fullscreen, or not."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:161
-msgid "background color"
-msgstr "dath a’ chùlaibh"
+msgid "prefer GTK+’s dark theme"
+msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:162
-msgid "A grayscale color for use as the background color."
+msgid "Whether to use the dark theme of GTK+ for Shotwell or not."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:167
-msgid "Selection state of “hide photos” option"
+msgid "background for transparent images"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:168
-msgid ""
-"Last used selection state of the “hide photos already imported” option in "
-"the import page."
+msgid "The background to use for transparent images."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:179
+msgid "Selection state of “hide photos” option"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:180
+msgid "Last used selection state of the “hide photos already imported” option in the import page."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr "dàil"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr "dàil an tar-mhùthaidh"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
-msgid ""
-"The time (in seconds) that a transition runs between photos in a slideshow"
+#: misc/org.yorba.shotwell.gschema.xml:194
+msgid "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
 msgstr "id èifeachd an tar-mhùthaidh"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
-msgid ""
-"The name of the transition effect that will be used between photos when "
-"running a slideshow"
+#: misc/org.yorba.shotwell.gschema.xml:200
+msgid "The name of the transition effect that will be used between photos when running a slideshow"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "Seall an tiotal"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:238
-msgid ""
-"The last recorded position of the divider between the sidebar and view in "
-"library application window."
+#: misc/org.yorba.shotwell.gschema.xml:250
+msgid "The last recorded position of the divider between the sidebar and view in library application window."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
 msgstr "ion-phortaich pasgan"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
 msgstr "cum sùil air pasgan na leabhar-lainn airson faidhlichean ùra"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
-msgid ""
-"If true, files added to the library directory are automatically imported."
+#: misc/org.yorba.shotwell.gschema.xml:264
+msgid "If true, files added to the library directory are automatically imported."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
 msgstr "sgrìobh am meata-dàta dha na faidhlichean-maighstir"
 
-#: misc/org.yorba.shotwell.gschema.xml:258
-msgid ""
-"If true, changes to metadata (tags, titles, etc.) are written to the master "
-"photo file."
+#: misc/org.yorba.shotwell.gschema.xml:270
+msgid "If true, changes to metadata (tags, titles, etc.) are written to the master photo file."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:264
-msgid ""
-"If true, Shotwell will convert all filenames to lowercase when importing "
-"photo files"
+#: misc/org.yorba.shotwell.gschema.xml:276
+msgid "If true, Shotwell will convert all filenames to lowercase when importing photo files"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
 msgstr "pàtran nam pasgan"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
-msgid ""
-"A string encoding a naming pattern that will be used to name photo "
-"directories on import."
+#: misc/org.yorba.shotwell.gschema.xml:282
+msgid "A string encoding a naming pattern that will be used to name photo directories on import."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:276
-msgid ""
-"A string encoding a custom naming pattern that will be used to name photo "
-"directories on import."
+#: misc/org.yorba.shotwell.gschema.xml:288
+msgid "A string encoding a custom naming pattern that will be used to name photo directories on import."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
 msgstr "Bun-roghainn an leasaicheir RAW"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:295
-msgid ""
-"A nonzero, positive integer representing the width part of the last custom "
-"crop ratio the user entered."
+#: misc/org.yorba.shotwell.gschema.xml:307
+msgid "A nonzero, positive integer representing the width part of the last custom crop ratio the user 
entered."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:300
-msgid ""
-"A nonzero, positive integer representing the height part of the last custom "
-"crop ratio the user entered."
+#: misc/org.yorba.shotwell.gschema.xml:312
+msgid "A nonzero, positive integer representing the height part of the last custom crop ratio the user 
entered."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr "deasaiche dhealbhan air an taobh a-muigh"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr "deasaiche raw air an taobh a-muigh"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364 misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:358
-#| msgid "Export metadata"
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
 msgstr "às-phortaich am meata-dàta"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr "an t-seirbheis foillseachaidh mu dheireadh"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
-msgid ""
-"A numeric code representing the last service to which photos were published"
+#: misc/org.yorba.shotwell.gschema.xml:403 misc/org.yorba.shotwell.gschema.xml:409
+msgid "A numeric code representing the last service to which photos were published"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr "an t-seirbheis foillseachaidh thùsail"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
 msgstr "tòcan inntrigidh"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr "ainm-cleachdaiche"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440 misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:429
-msgid ""
-"A numeric code representing the default size for photos published to Facebook"
+#: misc/org.yorba.shotwell.gschema.xml:441
+msgid "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:435
-msgid ""
-"Whether images being uploaded to Facebook should have their metadata removed "
-"first"
+#: misc/org.yorba.shotwell.gschema.xml:447
+msgid "Whether images being uploaded to Facebook should have their metadata removed first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:449
-msgid ""
-"The cryptographic secret used to sign requests against the authorization "
-"token for the currently logged in Flickr user, if any"
+#: misc/org.yorba.shotwell.gschema.xml:461
+msgid "The cryptographic secret used to sign requests against the authorization token for the currently 
logged in Flickr user, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:461
-msgid ""
-"A numeric code representing the default size for photos published to Flickr"
+#: misc/org.yorba.shotwell.gschema.xml:473
+msgid "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:467
-msgid ""
-"A numeric code representing the default visibility for photos published to "
-"Flickr"
+#: misc/org.yorba.shotwell.gschema.xml:479
+msgid "A numeric code representing the default visibility for photos published to Flickr"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:473
-msgid ""
-"Whether images being uploaded to Flickr should have their metadata removed "
-"first"
+#: misc/org.yorba.shotwell.gschema.xml:485
+msgid "Whether images being uploaded to Flickr should have their metadata removed first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492 misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:481
-msgid ""
-"The OAuth token used to refresh the Picasa Web Albums session for the "
-"currently logged in user, if any."
+#: misc/org.yorba.shotwell.gschema.xml:493
+msgid "The OAuth token used to refresh the Google Photos session for the currently logged in user, if any."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:487
-msgid ""
-"A numeric code representing the default size for photos uploaded to Picasa "
-"Web Albums"
+#: misc/org.yorba.shotwell.gschema.xml:499
+msgid "A numeric code representing the default size for photos uploaded to Google Photos Albums"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504 misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505 misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:499
-msgid ""
-"Whether images being uploaded to Picasa should have their metadata removed "
-"first"
+#: misc/org.yorba.shotwell.gschema.xml:511
+msgid "Whether images being uploaded to Google Photos should have their metadata removed first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:518
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr "facal-faire"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr "cuimhnich am facal-faire"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:543
-msgid ""
-"A numeric code representing the last photo size preset used when publishing "
-"to Piwigo."
+#: misc/org.yorba.shotwell.gschema.xml:555
+msgid "A numeric code representing the last photo size preset used when publishing to Piwigo."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:549
-msgid ""
-"Whether images being uploaded to Piwigo should have their metadata removed "
-"first"
+#: misc/org.yorba.shotwell.gschema.xml:561
+msgid "Whether images being uploaded to Piwigo should have their metadata removed first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:554
-msgid ""
-"if title is set and comment unset, use title as comment for uploads to Piwigo"
-msgstr ""
-"ma chaidh tiotal a shuidheachadh agus beachd a dhì-shuidheachadh, cleachd an "
-"tiotal mar bheachd le luchdaidhean suas gu Piwigo"
+#: misc/org.yorba.shotwell.gschema.xml:566
+msgid "if title is set and comment unset, use title as comment for uploads to Piwigo"
+msgstr "ma chaidh tiotal a shuidheachadh agus beachd a dhì-shuidheachadh, cleachd an tiotal mar bheachd le 
luchdaidhean suas gu Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
-msgid ""
-"Whether images being uploaded to Piwigo should have their comment set from "
-"the title if title is set and comment unset"
+#: misc/org.yorba.shotwell.gschema.xml:567
+msgid "Whether images being uploaded to Piwigo should have their comment set from the title if title is set 
and comment unset"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:561
-msgid ""
-"Whether images being uploaded to Piwigo should have their tags removed on "
-"upload, such that these tags will not appear on the remote Piwigo server."
+#: misc/org.yorba.shotwell.gschema.xml:573
+msgid "Whether images being uploaded to Piwigo should have their tags removed on upload, such that these 
tags will not appear on the remote Piwigo server."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr "Ainm-cleachdaiche Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr "Iuchair API"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr "Iuchair API Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr "URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr "URL làrach Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:593
-msgid ""
-"Indicates whether images being uploaded to Gallery3 should have their "
-"metadata removed first"
+#: misc/org.yorba.shotwell.gschema.xml:605
+msgid "Indicates whether images being uploaded to Gallery3 should have their metadata removed first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:605
-msgid ""
-"The pixels of the major axis of the picture to be uploaded; used only if "
-"scaling-constraint-id is an appropriate value"
+#: misc/org.yorba.shotwell.gschema.xml:617
+msgid "The pixels of the major axis of the picture to be uploaded; used only if scaling-constraint-id is an 
appropriate value"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:613
-msgid ""
-"The OAuth token used to refresh the YouTube session for the currently logged "
-"in user, if any."
+#: misc/org.yorba.shotwell.gschema.xml:625
+msgid "The OAuth token used to refresh the YouTube session for the currently logged in user, if any."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr "an t-seirbheis ion-phortaidh mu dheireadh"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
-msgid ""
-"A numeric code representing the last service from which photos were imported"
+#: misc/org.yorba.shotwell.gschema.xml:633
+msgid "A numeric code representing the last service from which photos were imported"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:629
-msgid ""
-"A numeric code that captures the state of the GStreamer plug-in environment"
+#: misc/org.yorba.shotwell.gschema.xml:641
+msgid "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:637
-msgid ""
-"A numeric code that describes how photos are laid out on the page during "
-"printing"
+#: misc/org.yorba.shotwell.gschema.xml:649
+msgid "A numeric code that describes how photos are laid out on the page during printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
 msgstr "àirde na susbainte"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:660
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr "aonad na susbainte"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
-msgid ""
-"A numeric code representing unit of measure (inches or centimeters) used "
-"when printing"
+#: misc/org.yorba.shotwell.gschema.xml:673
+msgid "A numeric code representing unit of measure (inches or centimeters) used when printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:667
-msgid ""
-"A numeric code representing the currently selected images per page mode used "
-"when printing"
+#: misc/org.yorba.shotwell.gschema.xml:679
+msgid "A numeric code representing the currently selected images per page mode used when printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:673
-msgid ""
-"The index of the current print size in a pre-defined list of standard sizes"
+#: misc/org.yorba.shotwell.gschema.xml:685
+msgid "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:678
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr "maidsich co-mheas an deilbh"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
-msgid ""
-"Determines whether custom print sizes must match the aspect ratio of the "
-"original photo"
+#: misc/org.yorba.shotwell.gschema.xml:691
+msgid "Determines whether custom print sizes must match the aspect ratio of the original photo"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:684
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr "clò-bhuail tiotalan"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
-msgid ""
-"True if the title of a photo should be printed when the photo is printed, "
-"false otherwise."
+#: misc/org.yorba.shotwell.gschema.xml:697
+msgid "True if the title of a photo should be printed when the photo is printed, false otherwise."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:702
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:714
-msgid "enable picasa publishing plugin"
+#: misc/org.yorba.shotwell.gschema.xml:726
+msgid "enable Google Photos publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:715
-msgid ""
-"True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
+#: misc/org.yorba.shotwell.gschema.xml:727
+msgid "True if the Google Photos publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:720
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:726
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:738
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow crumble transition"
 msgstr "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
-msgid ""
-"True if the Crumble slideshow transition plugin is enabled, false otherwise"
+#: misc/org.yorba.shotwell.gschema.xml:775
+msgid "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow fade transition"
 msgstr "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
-msgid ""
-"True if the Fade slideshow transition plugin is enabled, false otherwise"
+#: misc/org.yorba.shotwell.gschema.xml:781
+msgid "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:786
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow slide transition"
 msgstr "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
-msgid ""
-"True if the Slide slideshow transition plugin is enabled, false otherwise"
+#: misc/org.yorba.shotwell.gschema.xml:787
+msgid "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow clock transition"
 msgstr "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
-msgid ""
-"True if the Clock slideshow transition plugin is enabled, false otherwise"
+#: misc/org.yorba.shotwell.gschema.xml:793
+msgid "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:798
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow circle transition"
 msgstr "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
-msgid ""
-"True if the Circle slideshow transition plugin is enabled, false otherwise"
+#: misc/org.yorba.shotwell.gschema.xml:799
+msgid "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:792
+#: misc/org.yorba.shotwell.gschema.xml:804
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow circles transition"
 msgstr "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: misc/org.yorba.shotwell.gschema.xml:793
-msgid ""
-"True if the Circles slideshow transition plugin is enabled, false otherwise"
+#: misc/org.yorba.shotwell.gschema.xml:805
+msgid "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:798
+#: misc/org.yorba.shotwell.gschema.xml:810
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow blinds transition"
 msgstr "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: misc/org.yorba.shotwell.gschema.xml:799
-msgid ""
-"True if the Blinds slideshow transition plugin is enabled, false otherwise"
+#: misc/org.yorba.shotwell.gschema.xml:811
+msgid "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow squares transition"
 msgstr "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
-msgid ""
-"True if the Squares slideshow transition plugin is enabled, false otherwise"
+#: misc/org.yorba.shotwell.gschema.xml:817
+msgid "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow stripes transition"
 msgstr "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
-msgid ""
-"True if the Stripes slideshow transition plugin is enabled, false otherwise"
+#: misc/org.yorba.shotwell.gschema.xml:823
+msgid "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow chess transition"
 msgstr "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
-msgid ""
-"True if the Chess-Board slideshow transition plugin is enabled, false "
-"otherwise"
+#: misc/org.yorba.shotwell.gschema.xml:829
+msgid "True if the Chess-Board slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
 #: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:166
-#| 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."
 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 ""
 "Cha do rinn thu clàradh a-steach air Facebook.\n"
 "\n"
-"Mur eil cunntas Facebook agad, bidh cothrom agad fear a chruthachadh rè a’ "
-"chlàraidh a-steach. Dh’fhaoidte gun iarr Ceangal Shotwell cead ort dealbhan "
-"a luchdadh suas agus foillseachadh a dhèanamh gun inbhir agad. Feumaidh "
-"Ceangal Shotwell an cead seo mus obraich e."
+"Mur eil cunntas Facebook agad, bidh cothrom agad fear a chruthachadh rè a’ chlàraidh a-steach. Dh’fhaoidte 
gun iarr Ceangal Shotwell cead ort dealbhan a luchdadh suas agus foillseachadh a dhèanamh gun inbhir agad. 
Feumaidh Ceangal Shotwell an cead seo mus obraich e."
 
 #: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:168
 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."
+"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 ""
-"Rinn thu clàradh a-steach is a-mach air Facebook san t-seisean Shotwell seo "
-"mu thràth.\n"
-"Ma tha thu airson leantainn air foillseachadh air Facebook, fàg an-seo, ath-"
-"thòisich Shotwell is feuch ri fhoillseachadh às ùr."
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Cuir a-steach an àireamh-dhearbhaidh a nochdas an dèidh dhut clàradh a-"
-"steach dhan Flickr sa bhrabhsair-lìn agad."
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "_Àireamh ùghdarrais:"
+"Rinn thu clàradh a-steach is a-mach air Facebook san t-seisean Shotwell seo mu thràth.\n"
+"Ma tha thu airson leantainn air foillseachadh air Facebook, fàg an-seo, ath-thòisich Shotwell is feuch ri 
fhoillseachadh às ùr."
 
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
-#: src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "Lean air adhar_t"
-
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
-#| 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."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
-"Click Log in to log into Flickr in your Web browser. You will have to "
-"authorize Shotwell Connect to link to your Flickr account."
+"Click Log in to log into Flickr in your Web browser. You will have to authorize Shotwell Connect to link to 
your Flickr account."
 msgstr ""
 "Cha do rinn thu clàradh a-steach air Flickr.\n"
 "\n"
-"Clàraich a-steach air Flickr sa bhrabhsair-lìn agad. Bidh agad ri cead a "
-"thoirt dha Ceangal Shotwell gus ceangal a dhèanamh ris a’ chunntas Flickr "
-"agad."
+"Clàraich a-steach air Flickr sa bhrabhsair-lìn agad. Bidh agad ri cead a thoirt dha Ceangal Shotwell gus 
ceangal a dhèanamh ris a’ chunntas Flickr agad."
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
-#| msgid "Preparing for login..."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:138
 msgid "Preparing for login…"
 msgstr "Ag ullachadh gus do chlàradh a-steach…"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
-#: plugins/shotwell-publishing/FlickrPublishing.vala:341
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Flickr can't "
-#| "continue."
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:211
+msgid "Flickr authorization failed"
 msgstr ""
-"Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. "
-"Chan urrainn dhuinn foillseachadh air Flickr dhut."
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
-#| msgid "Verifying authorization..."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:218
 msgid "Verifying authorization…"
 msgstr "A’ dearbhadh an ùghdarrais…"
 
-#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118
+#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:144
 msgid ""
-"You have already logged in and out of a Google service during this Shotwell "
-"session.\n"
+"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 ""
-"Chlàraich thu a-steach is a-mach à seirbheis Google rè an t-seisein Shotwell "
-"seo mu thràth.\n"
+"Chlàraich thu a-steach is a-mach à seirbheis Google rè an t-seisein Shotwell seo mu thràth.\n"
 "\n"
-"Airson leantainn air adhart leis an obair-fhoillseachaidh air seirbheisean "
-"Google, fàg Shotwell, ath-thòisich e is feuch ris a-rithist."
+"Airson leantainn air adhart leis an obair-fhoillseachaidh air seirbheisean Google, fàg Shotwell, 
ath-thòisich e is feuch ris a-rithist."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
-#| 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."
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
 msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
+"You are not currently logged into YouTube.\n"
 "\n"
-"Click Log in 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 ""
-"Cha do rinn thu clàradh a-steach air Picasa Web Albums.\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.\n"
+"\n"
+"Shotwell uses the YouTube API services <a 
href=\"https://developers.google.com/youtube\";>https://developers.google.com/youtube</a> for accessing your 
YouTube channel and upload the videos. By using Shotwell to access YouTube, you agree to be bound to the 
YouTube Terms of Service as available at <a href=\"https://www.";
+"youtube.com/t/terms\">https://www.youtube.com/t/terms</a>\n"
 "\n"
-"Briog air “Clàraich a-steach” gus sin a dhèanamh sa bhrabhsair-lìn agad. "
-"Bidh agad ri cead a thoirt dha Ceangal Shotwell gus ceangal a dhèanamh ris "
-"a’ chunntas agad air Picasa Web Albums."
+"Shotwell's privacy policy regarding the use of data related to your Google account in general and YouTube 
in particular can be found in our <a href=\"help:shotwell/privacy-policy\">online services privacy 
policy</a>\n"
+"\n"
+"For Google's own privacy policy, please refer to <a 
href=\"https://policies.google.com/privacy\";>https://policies.google.com/privacy</a>"
+msgstr ""
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:36
 msgid ""
-"You are not currently logged into YouTube.\n"
+"You are not currently logged into Google Photos.\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 ""
-"Cha do rinn thu clàradh a-steach air YouTube.\n"
+"You must have already signed up for a Google account and set it up for use with Google Photos. Shotwell 
uses the Google Photos API services <a 
href=\"https://developers.google.com/photos/\";>https://developers.google.com/photos/</a> for all interaction 
with your Google Photos data.You will have to grant access Shotwell to "
+"your Google Photos library.\n"
 "\n"
-"Feumaidh cunntas Google a bhith agad ro làimh ’s e air a shuidheachadh "
-"airson ’s gun gabh a chleachdadh airson YouTube mus urrainn dhut leantainn "
-"air adhart. ’S urrainn dhut, mar is trice, sin a chur air dòigh ma "
-"chlàraicheas tu a-steach air YouTube sa bhrabhsair-lìn agad co-dhiù aon "
-"turas."
+"Shotwell's privacy policy regarding the use of data related to your Google account in general and Google 
Photos in particular can be found in our <a href=\"help:shotwell/privacy-policy\">online services privacy 
policy</a>For Google's own privacy policy, please refer to <a href=\"https://policies.google.com/privacy";
+"\">https://policies.google.com/privacy</a>"
+msgstr ""
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42 
plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42 
plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "Seòladh _puist-d"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82 
plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82 
plugins/shotwell-publishing-extras/RajcePublishing.vala:893 
plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Facal-faire"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104 
plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120 
plugins/shotwell-publishing-extras/RajcePublishing.vala:895 
plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Clàraich a-steach"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "Cuir a-steach an t-ainm-cleachdaiche agus am facal-faire a tha co-cheangailte ris a’ chunntas Tumblr 
agad."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26 
plugins/shotwell-publishing/PiwigoPublishing.vala:1088
+msgid "Username and/or password invalid. Please try again"
+msgstr "Tha an t-ainm-cleachdaiche agus/no am facal-faire cearr. Nach fheuch thu ris a-rithist?"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53 
plugins/shotwell-publishing/PiwigoPublishing.vala:1124
+msgid "Invalid User Name or Password"
+msgstr "Ainm-cleachdaiche no facal-faire cearr"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72 
plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Cha b’ urrainn dhuinn an eadar-aghaidh a luchdadh: %s"
 
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
@@ -1399,153 +1232,43 @@ msgstr ""
 "  alasdair caimbeul https://launchpad.net/~alexd-deactivatedaccount";
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
-msgid ""
-"⚫ This website presented identification that belongs to a different website."
+#: plugins/common/RESTSupport.vala:220
+msgid "⚫ This website presented identification that belongs to a different website."
 msgstr ""
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:207
-msgid ""
-"⚫ This website’s identification is too old to trust. Check the date on your "
-"computer’s calendar."
+#: plugins/common/RESTSupport.vala:225
+msgid "⚫ This website’s identification is too old to trust. Check the date on your computer’s calendar."
 msgstr ""
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:212
-msgid ""
-"⚫ This website’s identification was not issued by a trusted organization."
+#: plugins/common/RESTSupport.vala:230
+msgid "⚫ This website’s identification was not issued by a trusted organization."
 msgstr ""
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:217
-msgid ""
-"⚫ This website’s identification could not be processed. It may be corrupted."
+#: plugins/common/RESTSupport.vala:235
+msgid "⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr ""
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:222
-msgid ""
-"⚫ This website’s identification has been revoked by the trusted organization "
-"that issued it."
+#: plugins/common/RESTSupport.vala:240
+msgid "⚫ This website’s identification has been revoked by the trusted organization that issued it."
 msgstr ""
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:227
-msgid ""
-"⚫ This website’s identification cannot be trusted because it uses very weak "
-"encryption."
+#: plugins/common/RESTSupport.vala:245
+msgid "⚫ This website’s identification cannot be trusted because it uses very weak encryption."
 msgstr ""
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:232
-msgid ""
-"⚫ This website’s identification is only valid for future dates. Check the "
-"date on your computer’s calendar."
+#: plugins/common/RESTSupport.vala:250
+msgid "⚫ This website’s identification is only valid for future dates. Check the date on your computer’s 
calendar."
 msgstr ""
 
-#: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
+#: plugins/common/RESTSupport.vala:539 plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
-msgstr ""
-"Tha feum air faidhle sealach mus gabh foillseachadh a dhèanamh ach chan eil "
-"e ri làimh"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr ""
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-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àilte do sheirbheis ion-phortadh leabhar-lannan F-Spot.\n"
-"\n"
-"Tagh leabhar-lann a bu mhath leat ion-phortadh ’s tu a’ taghadh leabharlann "
-"a lorg Shotwell no a’ taghadh faidhle stòr-dàta F-Spot eile."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Fàilte do sheirbheis ion-phortadh leabhar-lannan F-Spot.\n"
-"\n"
-"Tagh faidhle stòr-dàta F-Spot."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Tagh faidhle stòr-dàta F-Spot de làimh gus ion-phortadh:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"Cha ghabh am faidhle stòr-dàta F-Spot a thagh thu fhosgladh: chan eil am "
-"faidhle ann no chan e stòr-dàta F-Spot tha ann"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"Cha ghabh am faidhle stòr-dàta F-Spot a thagh thu fhosgladh: chan eil "
-"Shotwell a’ cur taic dhan tionndadh seo de stòr-dàta F-Spot"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Cha ghabh am faidhle stòr-dàta F-Spot a thagh thu a leughadh: thachair "
-"mearachd fhad ’s a bha sinn a’ leughadh clàr nan tagaichean"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"Cha ghabh am faidhle stòr-dàta F-Spot a thagh thu a leughadh: thachair "
-"mearachd fhad ’s a bha sinn a’ leughadh clàr nan dealbhan"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, 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 ""
-"Lorg Shotwell %d dealbh(an) san leabhar-lann F-Spot agus tha e ’gan ion-"
-"phortadh. Mothaichidh sinn do dhealbhan a tha ann iomadh turas gu fèin-"
-"obrachail is bheir sinn air falbh iad.\n"
-"\n"
-"’S urrainn dhut an còmhradh seo a dhùnadh agus tòiseachadh air Shotwell a "
-"chleachdadh fhad ’s a tha sinne ’ga ion-phortadh fhathast sa chùlaibh."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "Leabhar-lann F-Spot: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Ag ullachadh airson ion-phortadh"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Seirbheisean ion-phortadh prìomh-dhàta"
+msgstr "Tha feum air faidhle sealach mus gabh foillseachadh a dhèanamh ach chan eil e ri làimh"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
@@ -1563,9 +1286,7 @@ msgstr "_Facal-faire:"
 msgid "Go _Back"
 msgstr "Ai_r ais"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1105
-#| msgid "_Login"
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125 ui/shotwell.ui:76
 msgid "_Log in"
 msgstr "C_làraich a-steach"
 
@@ -1587,9 +1308,7 @@ msgstr "Alba_m ùr"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
 msgid "_Remove location, tag and camera-identifying data before uploading"
-msgstr ""
-"Thoi_r air falbh an t-ionad, an taga agus fiosrachadh a dh’aithnicheadh an "
-"camara mus luchdaich thu seo suas"
+msgstr "Thoi_r air falbh an t-ionad, an taga agus fiosrachadh a dh’aithnicheadh an camara mus luchdaich thu 
seo suas"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
 msgid "Scaling constraint:"
@@ -1599,40 +1318,23 @@ msgstr "Bacadh sgèilidh:"
 msgid "pixels"
 msgstr "piogsail"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:880
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
-#: src/Dimensions.vala:17
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158 
plugins/shotwell-publishing/FlickrPublishing.vala:687 plugins/shotwell-publishing/PiwigoPublishing.vala:1313 
src/Dimensions.vala:17
 msgid "Original size"
 msgstr "Meud tùsail"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
-#: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Leud no àirde"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:203
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:39
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:105
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:145
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:177
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:125
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:142
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159 src/Dimensions.vala:20
+msgid "Longest edge"
+msgstr ""
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:203 
plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:39 
plugins/shotwell-publishing-extras/RajcePublishing.vala:1019 
plugins/shotwell-publishing-extras/yandex_publish_model.ui:145
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:177 
plugins/shotwell-publishing/flickr_publishing_options_pane.ui:125 
plugins/shotwell-publishing/google_photos_publishing_options_pane.ui:181 
plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:85
 msgid "_Logout"
 msgstr "_Clàraich a-mach"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:216
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:220
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:121
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:192
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:156
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
-#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:216 
plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:220 
plugins/shotwell-publishing-extras/RajcePublishing.vala:1018 
plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:192 
plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141 
plugins/shotwell-publishing/google_photos_publishing_options_pane.ui:195 
plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:100 src/CollectionPage.vala:82 
src/PhotoPage.vala:2492
 msgid "_Publish"
 msgstr "_Foillsich"
 
@@ -1644,13 +1346,11 @@ msgstr "Mòideal foillseachaidh Gallery3"
 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."
+"You must have already signed up for a Gallery3 account to complete the login process."
 msgstr ""
 "Cha do rinn thu clàradh a-steach air a’ ghailearaidh agad.\n"
 "\n"
-"Feumaidh cunntas Gallery3 a bhith agad ro làimh ach an urrainn dhut an "
-"clàradh a-steach a choileanadh."
+"Feumaidh cunntas Gallery3 a bhith agad ro làimh ach an urrainn dhut an clàradh a-steach a choileanadh."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:117
 msgid "Shotwell default directory"
@@ -1658,21 +1358,14 @@ msgstr "Pasgan tùsail 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."
 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"
-"Cha chuirear taic ris an fhaidhle “%s” no tha e ro mhòr airson an ionstans "
-"seo de Gallery3."
+"Cha chuirear taic ris an fhaidhle “%s” no tha e ro mhòr airson an ionstans seo de Gallery3."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:802
 msgid ""
@@ -1680,21 +1373,12 @@ msgid ""
 "Note that Gallery3 only supports the video types that Flowplayer does."
 msgstr ""
 "\n"
-"Thoir an aire nach cuir Gallery3 taic ach ris na seòrsaichean video ris a "
-"chuireas Flowplayer taic."
+"Thoir an aire nach cuir Gallery3 taic ach ris na seòrsaichean video ris a chuireas Flowplayer taic."
 
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021 
plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
 #, c-format
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to %s can't "
-#| "continue."
-msgid ""
-"A file required for publishing is unavailable. Publishing to %s can’t "
-"continue."
-msgstr ""
-"Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. "
-"Chan urrainn dhuinn foillseachadh air %s dhut."
+msgid "A file required for publishing is unavailable. Publishing to %s can’t continue."
+msgstr "Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. Chan urrainn dhuinn 
foillseachadh air %s dhut."
 
 #. populate any widgets whose contents are
 #. programmatically-generated
@@ -1704,32 +1388,16 @@ msgid "Publishing to %s as %s."
 msgstr "’Ga fhoillseachadh gu %s mar %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 ""
-"Cuir a-steach an URL airson an làrach Gallery3 agad ’s an t-ainm-"
-"cleachdaiche ’s am facal-faire (no iuchair API) airson a’ chunntais Gallery3 "
-"agad."
+msgid "Enter the URL for your Gallery3 site and the username and password (or API key) for your Gallery3 
account."
+msgstr "Cuir a-steach an URL airson an làrach Gallery3 agad ’s an t-ainm-cleachdaiche ’s am facal-faire (no 
iuchair API) airson a’ chunntais Gallery3 agad."
 
 #: 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 ""
-"Cha robh an t-ainm-cleachdaiche ’s facal-faire no an iuchair API mar bu "
-"chòir. Cuir a-steach d’ ainm-cleachdaiche ’s facal-faire gu h-ìosal gus "
-"feuchainn ris a-rithist."
+msgid "The username and password or API key were incorrect. To try again, re-enter your username and 
password below."
+msgstr "Cha robh an t-ainm-cleachdaiche ’s facal-faire no an iuchair API mar bu chòir. Cuir a-steach d’ 
ainm-cleachdaiche ’s facal-faire gu h-ìosal gus feuchainn ris a-rithist."
 
 #: 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 ""
-"Chan e am prìomh phasgan aig an ionstans de Gallery3 agad a tha san URL a "
-"chuir thu a-steach a-rèir coltais. Dèan cinnteach gun do sgrìobh thu gu "
-"ceart e ’s nach eil co-phàirtean aig an deireadh (m.e. index.php)."
+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 "Chan e am prìomh phasgan aig an ionstans de Gallery3 agad a tha san URL a chuir thu a-steach a-rèir 
coltais. Dèan cinnteach gun do sgrìobh thu gu ceart e ’s nach eil co-phàirtean aig an deireadh (m.e. 
index.php)."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
 msgid "Unrecognized User"
@@ -1739,73 +1407,41 @@ msgstr "Cleachdaiche nach aithne dhuinn"
 msgid " Site Not Found"
 msgstr " Cha deach an làrach a lorg"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
-msgid "_Email address"
-msgstr "Seòladh _puist-d"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
-msgid "_Password"
-msgstr "_Facal-faire"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100 
plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "_Cuimhnich"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
-#| msgid "Logging in..."
-msgid "Log in"
-msgstr "Clàraich a-steach"
-
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104 
plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
 msgstr "Albam a tha _ann:"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123 
plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
 msgid "A _new album named:"
 msgstr "Albam _ùr air a bhios:"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141 
plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
 msgid "_Hide album"
 msgstr "Falaic_h an t-albam"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:156
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:156 
plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr "Fosgal an t-_albam-uidhe sa bhrabhsair"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
-#| msgid "Copyright (C) 2013 rajce.net"
 msgid "Copyright © 2013 rajce.net"
 msgstr "Còir-lethbhreac © 2013 rajce.net"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
 msgid "An error message occurred when publishing to Rajce. Please try again."
-msgstr ""
-"Thachair mearachd nuair a bha sinn a’ foillsicheadh air Rajce. Nach fheuch "
-"thu ris a-rithist?"
+msgstr "Thachair mearachd nuair a bha sinn a’ foillsicheadh air Rajce. Nach fheuch thu ris a-rithist?"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:833
 msgid "Enter email and password associated with your Rajce account."
-msgstr ""
-"Cuir a-steach an t-ainm-cleachdaiche agus am facal-faire a tha co-"
-"cheangailte ris a’ chunntas Rajce agad."
+msgstr "Cuir a-steach an t-ainm-cleachdaiche agus am facal-faire a tha co-cheangailte ris a’ chunntas Rajce 
agad."
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:834
 msgid "Invalid email and/or password. Please try again"
-msgstr ""
-"Tha am post-d agus/no am facal-faire cearr. Nach fheuch thu ris a-rithist?"
+msgstr "Tha am post-d agus/no am facal-faire cearr. Nach fheuch thu ris a-rithist?"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:865
 msgid "Invalid User Email or Password"
@@ -1816,97 +1452,14 @@ msgstr "Post-d a’ chleachdaiche no facal-faire cearr"
 msgid "You are logged into Rajce as %s."
 msgstr "Chlàraich thu a-steach air Rajce mar %s."
 
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
-#: plugins/shotwell-publishing/PicasaPublishing.vala:571
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014 
plugins/shotwell-publishing/PhotosPublishingPane.vala:69 
plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
 msgid "Photos will appear in:"
 msgstr "Nochdaidh na dealbhan ann an:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Seirbheisean foillseachaidh Shotwell a bharrachd"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-msgid "Blogs:"
-msgstr "Blogaichean:"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
-msgid "Photo _size:"
-msgstr "_Meud an deilbh:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Còir-lethbhreac 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:876
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
-#| msgid "500 x 375 pixels"
-msgid "500 × 375 pixels"
-msgstr "500 × 375 piogsail"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:877
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-#| msgid "1024 x 768 pixels"
-msgid "1024 × 768 pixels"
-msgstr "1024 × 768 piogsail"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-#| msgid "1280 x 853 pixels"
-msgid "1280 × 853 pixels"
-msgstr "1280 × 853 piogsail"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
-#, c-format
-#| msgid "“%s” isn't a valid response to an OAuth authentication request"
-msgid "“%s” isn’t a valid response to an OAuth authentication request"
-msgstr "Chan e freagairt cheart air iarratas dearbhaidh OAuth a tha ann “%s”"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-#| 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( ): Chan urrainn dha tòiseachadh; cha ghabh am "
-"foillsichear seo a thòiseachadh às ùr."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr ""
-"Cuir a-steach an t-ainm-cleachdaiche agus am facal-faire a tha co-"
-"cheangailte ris a’ chunntas Tumblr agad."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-msgid "Username and/or password invalid. Please try again"
-msgstr ""
-"Tha an t-ainm-cleachdaiche agus/no am facal-faire cearr. Nach fheuch thu ris "
-"a-rithist?"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-msgid "Invalid User Name or Password"
-msgstr "Ainm-cleachdaiche no facal-faire cearr"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "Cha b’ urrainn dhuinn an eadar-aghaidh a luchdadh: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Chlàraich thu a-steach air Tumblr mar %s.\n"
-"\n"
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr ioremap net>"
 msgstr "Còir-lethbhreac 2010+ Evgeniy Polyakov <zbr ioremap net>"
@@ -1923,13 +1476,11 @@ msgstr "Cha do chlàraich thu a-steach air Yandex.Fotki."
 msgid "Public"
 msgstr "Poblach"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
-#: plugins/shotwell-publishing/FacebookPublishing.vala:888
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15 
plugins/shotwell-publishing/FacebookPublishing.vala:888
 msgid "Friends"
 msgstr "Caraidean"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
-#: plugins/shotwell-publishing/YouTubePublishing.vala:378
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18 
plugins/shotwell-publishing/YouTubePublishing.vala:378
 msgid "Private"
 msgstr "Prìobhaideach"
 
@@ -1957,8 +1508,7 @@ msgstr "Foillsich gu albam a tha _ann:"
 msgid "Create a _new album named:"
 msgstr "Cruthaich albam _ùr air a bhios:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
-#: plugins/shotwell-publishing/FacebookPublishing.vala:725
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100 
plugins/shotwell-publishing/FacebookPublishing.vala:725
 msgid "Upload _size:"
 msgstr "_Meud an luchdaidh suas:"
 
@@ -1966,19 +1516,15 @@ msgstr "_Meud an luchdaidh suas:"
 msgid "Videos and new photo albums _visible to:"
 msgstr "Cò chì albaman videothan agus dealbhan ùra:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:155
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:92
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:59
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
-msgid ""
-"_Remove location, camera, and other identifying information before uploading"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:155 
plugins/shotwell-publishing/flickr_publishing_options_pane.ui:92 
plugins/shotwell-publishing/google_photos_publishing_options_pane.ui:75 
plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
+msgid "_Remove location, camera, and other identifying information before uploading"
+msgstr "Thoi_r air falbh fiosrachadh an ionaid ’s a’ chamara agus fiosrachadh aithneachaidh eile mus 
luchdaich thu seo suas"
+
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33 
plugins/shotwell-publishing/FlickrPublishing.vala:33 plugins/shotwell-publishing/PiwigoPublishing.vala:33 
plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr ""
-"Thoi_r air falbh fiosrachadh an ionaid ’s a’ chamara agus fiosrachadh "
-"aithneachaidh eile mus luchdaich thu seo suas"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:61
-#: plugins/shotwell-publishing/PicasaPublishing.vala:58
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
+#: plugins/shotwell-publishing/FacebookPublishing.vala:61 plugins/shotwell-publishing/PhotosPublisher.vala:9 
plugins/shotwell-publishing/PiwigoPublishing.vala:1195
 msgid "Shotwell Connect"
 msgstr "Ceangal Shotwell"
 
@@ -1991,20 +1537,12 @@ msgid "Large (2048 pixels)"
 msgstr "Mòr (2048 piogsail)"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:314
-#| msgid "Creating album..."
 msgid "Creating album…"
 msgstr "A’ cruthachadh an albaim…"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:340
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Facebook "
-#| "can't continue."
-msgid ""
-"A file required for publishing is unavailable. Publishing to Facebook can’t "
-"continue."
-msgstr ""
-"Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. "
-"Chan urrainn dhuinn foillseachadh air Facebook dhut."
+msgid "A file required for publishing is unavailable. Publishing to Facebook can’t continue."
+msgstr "Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. Chan urrainn dhuinn 
foillseachadh air Facebook dhut."
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
@@ -2019,18 +1557,23 @@ msgstr ""
 msgid "Where would you like to publish the selected photos?"
 msgstr "Càit a bheil thu airson na dealbhan a thagh thu fhoillseachadh?"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:887
-#: plugins/shotwell-publishing/FlickrPublishing.vala:858
+#: plugins/shotwell-publishing/FacebookPublishing.vala:887 
plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "Mi fhìn a-mhàin"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:889
-#: plugins/shotwell-publishing/FlickrPublishing.vala:854
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
+#: plugins/shotwell-publishing/FacebookPublishing.vala:889 
plugins/shotwell-publishing/FlickrPublishing.vala:661 plugins/shotwell-publishing/PiwigoPublishing.vala:1297
 msgid "Everyone"
 msgstr "A h-uile duine"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:800
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61 
plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "_Meud an deilbh:"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
+msgid "A file required for publishing is unavailable. Publishing to Flickr can’t continue."
+msgstr "Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. Chan urrainn dhuinn 
foillseachadh air Flickr dhut."
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2039,122 +1582,122 @@ msgstr ""
 "Chlàraich thu a-steach air Flickr mar %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:802
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, 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."
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
 "This month you have %s remaining in your upload quota."
 msgstr ""
-"Tha cunntas saor agad air Flickr agus tha sin a’ cuingeachadh uiread a dhàta "
-"as urrainn dhut luchdadh suas gach mìos.\n"
+"Tha cunntas saor agad air Flickr agus tha sin a’ cuingeachadh uiread a dhàta as urrainn dhut luchdadh suas 
gach mìos.\n"
 "Tha %s dheth air fhàgail agad am mìos-sa."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:804
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
-msgstr ""
-"Tha cunntas Flickr Pro agad agus is urrainn dhut na lùigeas tu a dhàta a "
-"luchdadh suas gach mìos."
+msgstr "Tha cunntas Flickr Pro agad agus is urrainn dhut na lùigeas tu a dhàta a luchdadh suas gach mìos."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:809
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "Chì na _daoine a leanas na dealbhan:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:811
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "Chì na _daoine a leanas na videothan:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:814
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "Chì na _daoine a leanas na dealbhan ’s na videothan:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:855
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "Mo theaghlach ⁊ mo charaidean a-mhàin"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:856
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "Mo theaghlach a-mhàin"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:857
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "Mo charaidean a-mhàin"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:878
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
-#| msgid "2048 x 1536 pixels"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683 
plugins/shotwell-publishing/PiwigoPublishing.vala:1309 plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 × 375 piogsail"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684 
plugins/shotwell-publishing/PiwigoPublishing.vala:1310 plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 piogsail"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685 
plugins/shotwell-publishing/PiwigoPublishing.vala:1311
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 piogsail"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:879
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
-#| msgid "4096 x 3072 pixels"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686 
plugins/shotwell-publishing/PiwigoPublishing.vala:1312
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 piogsail"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
-msgid "Photo _size preset:"
-msgstr "Ro-shocraich _meud nan dealbh:"
-
-#. Add album that will push to the default feed for all the new users
-#. Activate last known album id. If none was chosen, either use the old default (Shotwell connect)
-#. or the new "Default album" album for Google Photos
-#: plugins/shotwell-publishing/PicasaPublishing.vala:96
-#: plugins/shotwell-publishing/PicasaPublishing.vala:630
-msgid "Default album"
-msgstr "An t-albam tùsail"
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:291
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Picasa can't "
-#| "continue."
-msgid ""
-"A file required for publishing is unavailable. Publishing to Picasa can’t "
-"continue."
+#: plugins/shotwell-publishing/google_photos_publishing_options_pane.ui:66
+msgid "Shotwell can only publish into albums that it created by itself, so this list might be empty despite 
the fact that you already have albums in your Google Photos account"
 msgstr ""
-"Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. "
-"Chan urrainn dhuinn foillseachadh air Picasa dhut."
 
-#. populate any widgets whose contents are programmatically-generated.
-#: plugins/shotwell-publishing/PicasaPublishing.vala:560
-#, c-format
-msgid "You are logged into Picasa Web Albums as %s."
-msgstr "Chlàraich thu a-steach air Picasa Web Albums mar %s."
+#: plugins/shotwell-publishing/google_photos_publishing_options_pane.ui:96
+#, fuzzy
+#| msgid "Photo _size preset:"
+msgid "Photo _size preset"
+msgstr "Ro-shocraich _meud nan dealbh:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:566
-msgid "Videos will appear in:"
-msgstr "Nochdaidh na videothan ann an:"
+#: plugins/shotwell-publishing/google_photos_publishing_options_pane.ui:117
+#, fuzzy
+#| msgid "An _existing album"
+msgid "An existing album"
+msgstr "Albam a tha _ann"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:610
-#| msgid "Small (640 x 480 pixels)"
+#: plugins/shotwell-publishing/google_photos_publishing_options_pane.ui:132
+#, fuzzy
+#| msgid "A _new album named"
+msgid "A new album named"
+msgstr "Albam _ùr air a bhios"
+
+#: plugins/shotwell-publishing/PhotosPublishingPane.vala:17
 msgid "Small (640 × 480 pixels)"
 msgstr "Beag (640 × 480 piogsail)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:611
-#| msgid "Medium (1024 x 768 pixels)"
+#: plugins/shotwell-publishing/PhotosPublishingPane.vala:18
 msgid "Medium (1024 × 768 pixels)"
 msgstr "Meadhanach (1024 × 768 piogsail)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:612
-#| msgid "Recommended (1600 x 1200 pixels)"
+#: plugins/shotwell-publishing/PhotosPublishingPane.vala:19
 msgid "Recommended (1600 × 1200 pixels)"
 msgstr "Na mholamaid (1600 × 1200 piogsail)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:613
-#| msgid "Google+ (2048 x 1536 pixels)"
+#: plugins/shotwell-publishing/PhotosPublishingPane.vala:20
 msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 piogsail)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:614
-#: src/editing_tools/EditingTools.vala:757
+#: plugins/shotwell-publishing/PhotosPublishingPane.vala:21 src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Am meud tùsail"
 
+#. populate any widgets whose contents are programmatically-generated.
+#: plugins/shotwell-publishing/PhotosPublishingPane.vala:59
+#, fuzzy, c-format
+#| msgid "You are logged into YouTube as %s."
+msgid "You are logged into Google Photos as %s."
+msgstr "Chlàraich thu a-steach air YouTube mar %s."
+
+#: plugins/shotwell-publishing/PhotosPublishingPane.vala:64
+msgid "Videos will appear in:"
+msgstr "Nochdaidh na videothan ann an:"
+
+#. Activate last known album id. If none was chosen, either use the old default (Shotwell connect)
+#. or the new "Default album" album for Google Photos
+#: plugins/shotwell-publishing/PhotosPublishingPane.vala:105
+msgid "Default album"
+msgstr "An t-albam tùsail"
+
+#: plugins/shotwell-publishing/PhotosService.vala:36
+msgid "Copyright 2019 Jens Georg <mail jensge org>"
+msgstr ""
+
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
 msgid "_URL of your Piwigo photo library"
 msgstr "_URL na leabhar-lainn dealbhan Piwigo agad"
@@ -2164,45 +1707,36 @@ msgid "User _name"
 msgstr "_Ainm-cleachdaiche"
 
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
-#| msgid "_Remember Password"
 msgid "Remember Password"
 msgstr "Cuimhnich am facal-faire"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
-#| msgid "An _existing category:"
 msgid "An _existing category"
 msgstr "Roinn-seòrsa a tha _ann"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
-#| msgid "A _new album named:"
 msgid "A _new album named"
 msgstr "Albam _ùr air a bhios"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
-#| msgid "within category:"
 msgid "within category"
 msgstr "san roinn-seòrsa"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
-#| msgid "Album comment:"
 msgid "Album comment"
 msgstr "Beachd mun albam"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
-#| msgid "Photos will be _visible by:"
 msgid "Photos will be _visible by"
 msgstr "Chì na daoine a leanas na _dealbhan:"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
-#| msgid "Photo size:"
 msgid "Photo size"
 msgstr "Meud an deilbh"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
 msgid "_If a title is set and comment unset, use title as comment"
-msgstr ""
-"Ma thè_id tiotal a shuidheachadh agus beachd a dhì-shuidheachadh, cleachd an "
-"tiotal mar bheachd"
+msgstr "Ma thè_id tiotal a shuidheachadh agus beachd a dhì-shuidheachadh, cleachd an tiotal mar bheachd"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
 msgid "_Do no upload tags"
@@ -2212,76 +1746,59 @@ msgstr "Na luch_daich suas na tagaichean"
 msgid "Logout"
 msgstr "Clàraich a-mach"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
-#: src/Resources.vala:296 ui/collection.ui:192
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268 src/Resources.vala:265 
ui/collection.ui:192
 msgid "Publish"
 msgstr "Foillsich"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
-#| msgid "Creating album %s..."
 msgid "Creating album %s…"
 msgstr "A’ cruthachadh an albaim %s…"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:946
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:949
 msgid "An error message occurred when publishing to Piwigo. Please try again."
-msgstr ""
-"Thachair mearachd nuair a bha sinn a’ foillsicheadh air Piwigo. Nach fheuch "
-"thu ris a-rithist?"
+msgstr "Thachair mearachd nuair a bha sinn a’ foillsicheadh air Piwigo. Nach fheuch thu ris a-rithist?"
 
 #. %s is the host name that we tried to connect to
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1030
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1033
 #, c-format
-msgid ""
-"This does not look like the real <b>%s</b>. Attackers might be trying to "
-"steal or alter information going to or from this site (for example, private "
-"messages, credit card information, or passwords)."
+msgid "This does not look like the real <b>%s</b>. Attackers might be trying to steal or alter information 
going to or from this site (for example, private messages, credit card information, or passwords)."
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1052
 #, c-format
 msgid "Certificate of %s"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:167
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1055 src/Resources.vala:136 
ui/multitextentrydialog.ui:40 ui/slideshow_settings.ui:52
 msgid "_OK"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1079
-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 ""
-"Cuir a-steach URL leabhar-lann na dealbhan agad air Piwigo agus an t-ainm-"
-"cleachdaiche ’s am facal-faire agad airson a’ cunntais Piwigo agad a tha co-"
-"cheangailte ris an leabharlann sin."
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1086
+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 "Cuir a-steach URL leabhar-lann na dealbhan agad air Piwigo agus an t-ainm-cleachdaiche ’s am 
facal-faire agad airson a’ cunntais Piwigo agad a tha co-cheangailte ris an leabharlann sin."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1080
-msgid ""
-"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
-"entered"
-msgstr ""
-"Chan urrainn dha Shotwell conaltradh a dhèanamh ri leabhar-lann nan dealbhan "
-"agad air Piwigo. Thoir sùil air an URL a chuir thu a-steach"
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1087
+msgid "Shotwell cannot contact your Piwigo photo library. Please verify the URL you entered"
+msgstr "Chan urrainn dha Shotwell conaltradh a dhèanamh ri leabhar-lann nan dealbhan agad air Piwigo. Thoir 
sùil air an URL a chuir thu a-steach"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1119
 msgid "Invalid URL"
 msgstr "URL mì-dhligheach"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1298
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Rianairean, mo theaghlach, mo charaidean is an luchd-aithne agam"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1299
 msgid "Admins, Family, Friends"
 msgstr "Rianairean, mo theaghlach is mo charaidean"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1300
 msgid "Admins, Family"
 msgstr "Rianairean ’s mo theaghlach"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1301
 msgid "Admins"
 msgstr "Rianairean"
 
@@ -2297,24 +1814,42 @@ msgstr ""
 msgid "I understand, please _proceed."
 msgstr ""
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:55
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Prìomh-sheirbheisean foillseachaidh"
 
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Blogaichean:"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Còir-lethbhreac 2012 BJA Electronics"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 piogsail"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
+msgid "TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr "TumblrPublisher: start( ): Chan urrainn dha tòiseachadh; cha ghabh am foillsichear seo a 
thòiseachadh às ùr."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Chlàraich thu a-steach air Tumblr mar %s.\n"
+"\n"
+
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:41
 msgid "Video privacy _setting:"
 msgstr "Roghainnean _prìobhaideachd video:"
 
 #: plugins/shotwell-publishing/YouTubePublishing.vala:236
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Youtube "
-#| "can't continue."
-msgid ""
-"A file required for publishing is unavailable. Publishing to YouTube can’t "
-"continue."
-msgstr ""
-"Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. "
-"Chan urrainn dhuinn foillseachadh air YouTube dhut."
+msgid "A file required for publishing is unavailable. Publishing to YouTube can’t continue."
+msgstr "Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. Chan urrainn dhuinn 
foillseachadh air YouTube dhut."
 
 #: plugins/shotwell-publishing/YouTubePublishing.vala:344
 #, c-format
@@ -2362,12 +1897,8 @@ msgid "Core Slideshow Transitions"
 msgstr "Prìomh thar-mhùthaidhean nan taisbeanaidhean-shleamhnagan"
 
 #: plugins/shotwell-transitions/shotwell-transitions.vala:76
-msgid ""
-"Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
-"Inc."
-msgstr ""
-"Còir-lethbhreac 2010 Maxim Kartashev, Còir-lethbhreac 2016 Software Freedom "
-"Conservancy Inc."
+msgid "Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Còir-lethbhreac 2010 Maxim Kartashev, Còir-lethbhreac 2016 Software Freedom Conservancy Inc."
 
 #: plugins/shotwell-transitions/SlideEffect.vala:20
 msgid "Slide"
@@ -2429,39 +1960,22 @@ msgstr "Prìnich am bàr-inneal fosgailte"
 msgid "Leave fullscreen"
 msgstr "Fàg an làn-sgrìn"
 
-#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
-#: src/data_imports/DataImportsUI.vala:301
-#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
-#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
-#: src/Resources.vala:158
+#: src/AppWindow.vala:532 src/AppWindow.vala:553 src/AppWindow.vala:570 
src/data_imports/DataImportsUI.vala:302 src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20 
src/Dialogs.vala:28 src/Dialogs.vala:58 src/Dialogs.vala:766 src/Dialogs.vala:789 
src/publishing/PublishingUI.vala:305
+#: src/publishing/PublishingUI.vala:529 src/Resources.vala:127 ui/multitextentrydialog.ui:25 
ui/slideshow_settings.ui:38 ui/textentrydialog.ui:19
 msgid "_Cancel"
 msgstr "_Sguir dheth"
 
-#: src/AppWindow.vala:579
+#: src/AppWindow.vala:580
 #, c-format
-#| msgid ""
-#| "A fatal error occurred when accessing Shotwell's library.  Shotwell "
-#| "cannot continue.\n"
-#| "\n"
-#| "%s"
 msgid ""
-"A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
-"continue.\n"
+"A fatal error occurred when accessing Shotwell’s library. Shotwell cannot continue.\n"
 "\n"
 "%s"
 msgstr ""
-"Thachair mearachd mharbhtach nuair a bha sinn ag inntrigeadh leabhar-lann "
-"Shotwell. Chan urrainn dha Shotwell leantainn air adhart.\n"
+"Thachair mearachd mharbhtach nuair a bha sinn ag inntrigeadh leabhar-lann Shotwell. Chan urrainn dha 
Shotwell leantainn air adhart.\n"
 "\n"
 "%s"
 
-#. translators: %s will be replaced by application version
-#: src/AppWindow.vala:596
-#, c-format
-msgid "%s – “Aachen”"
-msgstr "%s – “Aachen”"
-
 #: src/AppWindow.vala:601
 msgid "Visit the Shotwell web site"
 msgstr "Tadhail air làrach-lìn Shotwell"
@@ -2542,95 +2056,80 @@ msgstr "Tha faidhle an deilbh coirbte"
 msgid "Imported failed (%d)"
 msgstr "Dh’fhàillig ion-phortadh (%d)"
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Camarathan"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316
-#: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
-#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr ""
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711 src/camera/ImportPage.vala:727 
src/photos/RawSupport.vala:311 ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/faces.ui:361 
ui/media.ui:361 ui/photo_context.ui:96 ui/photo.ui:352 ui/tags.ui:361
 msgid "Camera"
 msgstr "Camara"
 
-#: src/camera/ImportPage.vala:311 src/Properties.vala:230
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass 
storage camera (510MB volume)
+#: src/camera/CameraTable.vala:256
+#, fuzzy, c-format
+#| msgid "%s (%d%%)"
+msgid "%s (%s)"
+msgstr "%s (%d%%)"
+
+#: src/camera/ImportPage.vala:307 src/Properties.vala:234
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
 #: src/camera/ImportPage.vala:466
-#| 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 ""
-"Cha ghabh an camara a dhì-mhunntachadh. Feuch is dì-mhunntaich an camara o "
-"mhanaidsear nam faidhlichean."
+msgid "Unable to unmount camera. Try unmounting the camera from the file manager."
+msgstr "Cha ghabh an camara a dhì-mhunntachadh. Feuch is dì-mhunntaich an camara o mhanaidsear nam 
faidhlichean."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Falaich dealbhan a chaidh ion-phortadh mar-thà"
 
-#: src/camera/ImportPage.vala:784
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "Na seall ach dealbhan nach deach ion-phortadh fhathast"
 
-#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:816 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "Ion-phortaich na _thagh thu"
 
-#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Ion-phortaich na _h-uile"
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:850
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr ""
 
-#: src/camera/ImportPage.vala:861
+#: src/camera/ImportPage.vala:854
 msgid "No new photos/videos found on camera"
 msgstr "Cha deach dealbhan/videothan ùra a lorg air a’ chamara"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1021
-#| msgid ""
-#| "Shotwell needs to unmount the camera from the filesystem in order to "
-#| "access it.  Continue?"
-msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it. Continue?"
-msgstr ""
-"Feumaidh Shotwell an camara a dhì-mhunntachadh o shiostam nam faidhlichean "
-"mus gabh e cothrom air. A bheil thu airson leantainn air adhart?"
+#: src/camera/ImportPage.vala:1025
+msgid "Shotwell needs to unmount the camera from the filesystem in order to access it. Continue?"
+msgstr "Feumaidh Shotwell an camara a dhì-mhunntachadh o shiostam nam faidhlichean mus gabh e cothrom air. A 
bheil thu airson leantainn air adhart?"
 
-#: src/camera/ImportPage.vala:1027
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr "_Dì-mhunntaich"
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "Dì-mhunntaich an camara."
 
-#: src/camera/ImportPage.vala:1037
-#| 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."
-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 ""
-"Chaidh an camara a ghlasadh le aplacaid eile. Chan fhaigh Shotwell cothrom "
-"air a’ chamara ach mur eil glas ris. Dùin aplacaid sam bith eile a tha a’ "
-"cleachdadh a’ chamara agus feuch ris a-rithist."
+#: src/camera/ImportPage.vala:1041
+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 "Chaidh an camara a ghlasadh le aplacaid eile. Chan fhaigh Shotwell cothrom air a’ chamara ach mur 
eil glas ris. Dùin aplacaid sam bith eile a tha a’ cleachdadh a’ chamara agus feuch ris a-rithist."
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1051
 msgid "Please close any other application using the camera."
 msgstr "Dùin aplacaid sam bith eile a tha a’ cleachdadh a’ chamara."
 
-#: src/camera/ImportPage.vala:1052
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2639,31 +2138,35 @@ msgstr ""
 "Cha b’ urrainn dhuinn ro-shealladh fhaighinn on chamara:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1069
-#| msgid "Unmounting..."
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "’Ga dhì-mhunntachadh…"
 
-#: src/camera/ImportPage.vala:1160
-#| msgid "Starting import, please wait..."
+#: src/camera/ImportPage.vala:1166
+#, fuzzy
+#| msgid "Starting import, please wait…"
+msgid "Connecting to camera, please wait…"
+msgstr "A’ tòiseachadh air ion-phortadh, fuirich ort…"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "A’ tòiseachadh air ion-phortadh, fuirich ort…"
 
-#: src/camera/ImportPage.vala:1177
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "A’ faighinn fiosrachadh an deilbh"
 
-#: src/camera/ImportPage.vala:1535
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "A’ faighinn ro-shealladh air %s"
 
-#: src/camera/ImportPage.vala:1651
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Chan urrainn dhuinn an camara a ghlasadh: %s"
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1756
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -2672,7 +2175,7 @@ msgstr[1] "A bheil thu airson an %d dhealbh seo a sguabadh às a’ chamara?"
 msgstr[2] "A bheil thu airson na %d dealbhan seo a sguabadh às a’ chamara?"
 msgstr[3] "A bheil thu airson na %d dealbh seo a sguabadh às a’ chamara?"
 
-#: src/camera/ImportPage.vala:1739
+#: src/camera/ImportPage.vala:1759
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -2681,17 +2184,16 @@ msgstr[1] "A bheil thu airson an %d video seo a sguabadh às a’ chamara?"
 msgstr[2] "A bheil thu airson na %d videothan seo a sguabadh às a’ chamara?"
 msgstr[3] "A bheil thu airson na %d video seo a sguabadh às a’ chamara?"
 
-#: src/camera/ImportPage.vala:1742
+#: src/camera/ImportPage.vala:1762
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "A bheil thu airson an %d dealbh/video seo a sguabadh às a’ chamara?"
 msgstr[1] "A bheil thu airson an %d dhealbh/video seo a sguabadh às a’ chamara?"
-msgstr[2] ""
-"A bheil thu airson na %d dealbhan/videothan seo a sguabadh às a’ chamara?"
+msgstr[2] "A bheil thu airson na %d dealbhan/videothan seo a sguabadh às a’ chamara?"
 msgstr[3] "A bheil thu airson na %d dealbh/video seo a sguabadh às a’ chamara?"
 
-#: src/camera/ImportPage.vala:1745
+#: src/camera/ImportPage.vala:1765
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
@@ -2700,54 +2202,40 @@ msgstr[1] "A bheil thu airson an %d fhaidhle seo a sguabadh às a’ chamara?"
 msgstr[2] "A bheil thu airson na %d faidhlichean seo a sguabadh às a’ chamara?"
 msgstr[3] "A bheil thu airson na %d faidhle seo a sguabadh às a’ chamara?"
 
-#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:733
 msgid "_Keep"
 msgstr "_Cum iad"
 
-#: src/camera/ImportPage.vala:1772
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "A’ toirt air falbh nan dealbhan/videothan on chamara"
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1796
 #, 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] ""
-"Tha %d dealbh/video air a’ chamara nach urrainn dhuinn sguabadh às ri linn "
-"mhearachdan."
-msgstr[1] ""
-"Tha %d dhealbh/video air a’ chamara nach urrainn dhuinn sguabadh às ri linn "
-"mhearachdan."
-msgstr[2] ""
-"Tha %d dealbhan/videothan air a’ chamara nach urrainn dhuinn sguabadh às ri "
-"linn mhearachdan."
-msgstr[3] ""
-"Tha %d dealbh/video air a’ chamara nach urrainn dhuinn sguabadh às ri linn "
-"mhearachdan."
+msgstr[0] "Tha %d dealbh/video air a’ chamara nach urrainn dhuinn sguabadh às ri linn mhearachdan."
+msgstr[1] "Tha %d dhealbh/video air a’ chamara nach urrainn dhuinn sguabadh às ri linn mhearachdan."
+msgstr[2] "Tha %d dealbhan/videothan air a’ chamara nach urrainn dhuinn sguabadh às ri linn mhearachdan."
+msgstr[3] "Tha %d dealbh/video air a’ chamara nach urrainn dhuinn sguabadh às ri linn mhearachdan."
 
-#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85
-#: src/PhotoPage.vala:2464 src/Resources.vala:171
-#| msgid "_Print..."
+#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85 src/PhotoPage.vala:2487 
src/Resources.vala:140
 msgid "_Print"
-msgstr "Clò-_bhuail…"
+msgstr "Clò-_bhuail"
 
-#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
-#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
-#| msgid "Send To"
+#: src/CollectionPage.vala:83 src/Resources.vala:293 ui/collection.ui:128 ui/direct_context.ui:23 
ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
 msgstr "Cuir _gu…"
 
-#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90
-#: src/PhotoPage.vala:2474 src/Resources.vala:221
+#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90 src/PhotoPage.vala:2497 
src/Resources.vala:190
 msgid "Set as _Desktop Background"
 msgstr "Suidhich mar chùlaibh an _deasga"
 
-#: src/CollectionPage.vala:92 src/Resources.vala:287
+#: src/CollectionPage.vala:92 src/Resources.vala:256
 msgid "_Duplicate"
 msgstr "_Dùblaich"
 
 #: src/CollectionPage.vala:100
-#| msgid "Fulls_creen"
 msgid "Fullscreen"
 msgstr "Làn-sgrìn"
 
@@ -2755,102 +2243,95 @@ msgstr "Làn-sgrìn"
 msgid "S_lideshow"
 msgstr "T_aisbeanadh-shleamhnagan"
 
-#: src/CollectionPage.vala:110 src/Resources.vala:140 ui/direct.ui:111
-#: ui/photo.ui:200
+#: src/CollectionPage.vala:110 src/Resources.vala:109 ui/direct.ui:111 ui/photo.ui:200
 msgid "Rotate _Right"
 msgstr "Cuairtich gu _deiseil"
 
-#: src/CollectionPage.vala:113 src/Resources.vala:145 ui/direct.ui:116
-#: ui/photo.ui:205
+#: src/CollectionPage.vala:113 src/Resources.vala:114 ui/direct.ui:116 ui/photo.ui:205
 msgid "Rotate _Left"
 msgstr "Cuairtich gu _tuathail"
 
-#: src/CollectionPage.vala:116 src/Resources.vala:150 ui/direct.ui:121
-#: ui/photo.ui:210
+#: src/CollectionPage.vala:116 src/Resources.vala:119 ui/direct.ui:121 ui/photo.ui:210
 msgid "Flip Hori_zontally"
 msgstr "Thoir flip air a’ chòmh_nard"
 
-#: src/CollectionPage.vala:117 src/Resources.vala:153 ui/direct.ui:125
-#: ui/photo.ui:214
+#: src/CollectionPage.vala:117 src/Resources.vala:122 ui/direct.ui:125 ui/photo.ui:214
 msgid "Flip Verti_cally"
 msgstr "Thoir flip gu _h-inghearach"
 
-#: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
-#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:447
-#: ui/photo_context.ui:6 ui/photo.ui:223
+#: src/CollectionPage.vala:119 src/Resources.vala:156 ui/collection.ui:8 ui/direct_context.ui:7 
ui/direct.ui:134 ui/event.ui:447 ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "_Leasaich"
 
-#: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
-#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:452
-#: ui/photo_context.ui:11 ui/photo.ui:250
+#: src/CollectionPage.vala:120 src/Resources.vala:184 ui/collection.ui:13 ui/direct_context.ui:12 
ui/direct.ui:161 ui/event.ui:452 ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "Ti_ll an tionndadh tùsail"
 
-#: src/CollectionPage.vala:122 src/Resources.vala:191 ui/photo.ui:256
+#: src/CollectionPage.vala:122 src/Resources.vala:160 ui/photo.ui:256
 msgid "_Copy Color Adjustments"
 msgstr "Dèan lethbhrea_c de dh’atharraichean nan dathan"
 
-#: src/CollectionPage.vala:125 src/Resources.vala:195 ui/photo.ui:261
+#: src/CollectionPage.vala:125 src/Resources.vala:164 ui/photo.ui:261
 msgid "_Paste Color Adjustments"
 msgstr "Cuir ann atharraichean nan _dathan"
 
 #: src/CollectionPage.vala:135
-#| msgid "Adjust Date and Time"
 msgid "Adjust Date and Time…"
 msgstr "Cuir air gleus an ceann-là agus an t-àm…"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:320
+#: src/CollectionPage.vala:143 src/Resources.vala:289 ui/collection.ui:108 ui/event.ui:547 
ui/photo_context.ui:115 ui/photo.ui:361
 msgid "Open With E_xternal Editor"
 msgstr "Fosgail le deasaiche air an ta_obh a-muigh"
 
-#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
-#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365
+#: src/CollectionPage.vala:146 src/Resources.vala:291 ui/collection.ui:113 ui/event.ui:552 
ui/photo_context.ui:120 ui/photo.ui:366
 msgid "Open With RA_W Editor"
 msgstr "Fosgail le deasaiche RA_W"
 
-#: src/CollectionPage.vala:149 src/Resources.vala:168
-#| msgid "Play"
+#: src/CollectionPage.vala:149 src/Resources.vala:137
 msgid "_Play"
 msgstr "_Cluich"
 
-#: src/CollectionPage.vala:415
+#: src/CollectionPage.vala:410
+#, fuzzy
+#| msgid "Export Photo/Video"
 msgid "Export Photo/Video"
-msgstr "Às-phortaich an dealbh/video"
-
-#: src/CollectionPage.vala:415
-msgid "Export Photos/Videos"
-msgstr "Às-phortaich dealbhan/videothan"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Às-phortaich an dealbh/video"
+msgstr[1] "Às-phortaich an dealbh/video"
+msgstr[2] "Às-phortaich an dealbh/video"
+msgstr[3] "Às-phortaich an dealbh/video"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+#: src/CollectionPage.vala:412 src/Dialogs.vala:74 src/PhotoPage.vala:3021
+#, fuzzy
+#| msgid "Export Photo"
 msgid "Export Photo"
-msgstr "Às-phortaich an dealbh"
-
-#: src/CollectionPage.vala:417 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Às-phortaich dealbhan"
+msgid_plural "Export Photos"
+msgstr[0] "Às-phortaich an dealbh"
+msgstr[1] "Às-phortaich an dealbh"
+msgstr[2] "Às-phortaich an dealbh"
+msgstr[3] "Às-phortaich an dealbh"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "’Ga cuairteachadh"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "A’ neo-dhèanamh a’ chuairteachaidh"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "’Ga fhlipeadh air a’ chòmhnard"
 
-#: src/CollectionPage.vala:530
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "A’ neo-dhèanamh flipeadh air a’ chòmhnard"
 
-#: src/CollectionPage.vala:539
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "’Ga fhlipeadh gu h-inghearach"
 
-#: src/CollectionPage.vala:540
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "A’ neo-dhèanamh flipeadh inghearach"
 
@@ -2878,229 +2359,202 @@ msgstr "A’ cur an sàs atharraichean nan dathan"
 msgid "Undoing Color Transformations"
 msgstr "A’ neo-dhèanamh atharraichean nan dathan"
 
-#: src/Commands.vala:1007
+#: src/Commands.vala:1006
 msgid "Creating New Event"
 msgstr "A’ cruthachadh tachartas ùr"
 
-#: src/Commands.vala:1008
+#: src/Commands.vala:1007
 msgid "Removing Event"
 msgstr "A’ toirt air falbh an tachartais"
 
-#: src/Commands.vala:1017
+#: src/Commands.vala:1016
 msgid "Moving Photos to New Event"
 msgstr "A’ gluasad nan dealbhan gun tachartas ùr"
 
-#: src/Commands.vala:1018
+#: src/Commands.vala:1017
 msgid "Setting Photos to Previous Event"
 msgstr "A’ suidheachadh nan dealbhan gun tachartas roimhe"
 
-#: src/Commands.vala:1075
+#: src/Commands.vala:1074
 msgid "Merging"
 msgstr "’Gan co-aonadh"
 
-#: src/Commands.vala:1076
+#: src/Commands.vala:1075
 msgid "Unmerging"
 msgstr "A’ neo-dhèanamh an co-aonadh"
 
-#: src/Commands.vala:1085
+#: src/Commands.vala:1084
 msgid "Duplicating photos"
 msgstr "A’ dùblachadh nan dealbhan"
 
-#: src/Commands.vala:1085
+#: src/Commands.vala:1084
 msgid "Removing duplicated photos"
 msgstr "A’ toirt air falbh nan dealbhan dùblaichte"
 
-#: src/Commands.vala:1108
+#: src/Commands.vala:1107
 #, 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] ""
-"Tha %d dealbh ann nach urrainn dhuinn dùblachadh ri linn mearachd faidhle"
-msgstr[1] ""
-"Tha %d dhealbh ann nach urrainn dhuinn dùblachadh ri linn mhearachdan faidhle"
-msgstr[2] ""
-"Tha %d dealbhan ann nach urrainn dhuinn dùblachadh ri linn mhearachdan "
-"faidhle"
-msgstr[3] ""
-"Tha %d dealbh ann nach urrainn dhuinn dùblachadh ri linn mhearachdan faidhle"
+msgstr[0] "Tha %d dealbh ann nach urrainn dhuinn dùblachadh ri linn mearachd faidhle"
+msgstr[1] "Tha %d dhealbh ann nach urrainn dhuinn dùblachadh ri linn mhearachdan faidhle"
+msgstr[2] "Tha %d dealbhan ann nach urrainn dhuinn dùblachadh ri linn mhearachdan faidhle"
+msgstr[3] "Tha %d dealbh ann nach urrainn dhuinn dùblachadh ri linn mhearachdan faidhle"
 
-#: src/Commands.vala:1195
+#: src/Commands.vala:1194
 msgid "Restoring previous rating"
 msgstr "Ag aiseag an rangachadh roimhe"
 
-#: src/Commands.vala:1205 src/Commands.vala:1206
+#: src/Commands.vala:1204 src/Commands.vala:1205
 msgid "Increasing ratings"
 msgstr "A’ meudachadh nan rangachaidhean"
 
-#: src/Commands.vala:1205 src/Commands.vala:1206
+#: src/Commands.vala:1204 src/Commands.vala:1205
 msgid "Decreasing ratings"
 msgstr "A’ lùghdachadh nan rangachaidhean"
 
-#: src/Commands.vala:1256
+#: src/Commands.vala:1255
 msgid "Setting RAW developer"
 msgstr "A’ suidheachadh an leasaicheir RAW"
 
-#: src/Commands.vala:1256
+#: src/Commands.vala:1255
 msgid "Restoring previous RAW developer"
 msgstr "Ag aiseag an leasaicheir RAW a bha agad roimhe"
 
-#: src/Commands.vala:1257
+#: src/Commands.vala:1256
 msgid "Set Developer"
 msgstr "Suidhich an leasaichear"
 
-#: src/Commands.vala:1347
+#: src/Commands.vala:1346
 msgid "Original photo could not be adjusted."
 msgstr "Cha b’ urrainn dhuinn an dealbh tùsail a chur air gleus."
 
-#: src/Commands.vala:1368
+#: src/Commands.vala:1367
 msgid "Adjusting Date and Time"
 msgstr "A’ cur air gleus a’ chinn-là agus an ama"
 
-#: src/Commands.vala:1368
+#: src/Commands.vala:1367
 msgid "Undoing Date and Time Adjustment"
 msgstr "A’ neo-dhèanamh gleusadh a’ chinn-là agus an ama"
 
-#: src/Commands.vala:1399
+#: src/Commands.vala:1398
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
-msgstr[0] ""
-"Bha %d dealbh ann nach b’ urrainn dhuinn an tionndadh tùsail aige a chur air "
-"gleus"
-msgstr[1] ""
-"Bha %d dhealbh ann nach b’ urrainn dhuinn an tionndadh tùsail aca a chur air "
-"gleus"
-msgstr[2] ""
-"Bha %d dealbhan ann nach b’ urrainn dhuinn an tionndadh tùsail aca a chur "
-"air gleus"
-msgstr[3] ""
-"Bha %d dealbh ann nach b’ urrainn dhuinn an tionndadh tùsail aca a chur air "
-"gleus"
+msgstr[0] "Bha %d dealbh ann nach b’ urrainn dhuinn an tionndadh tùsail aige a chur air gleus."
+msgstr[1] "Bha %d dhealbh ann nach b’ urrainn dhuinn an tionndadh tùsail aca a chur air gleus."
+msgstr[2] "Bha %d dealbhan ann nach b’ urrainn dhuinn an tionndadh tùsail aca a chur air gleus."
+msgstr[3] "Bha %d dealbh ann nach b’ urrainn dhuinn an tionndadh tùsail aca a chur air gleus."
 
-#: src/Commands.vala:1401 src/Commands.vala:1425
+#: src/Commands.vala:1400 src/Commands.vala:1424
 msgid "Time Adjustment Error"
 msgstr "Mearachd a’ cur air gleus an ama"
 
-#: src/Commands.vala:1423
+#: src/Commands.vala:1422
 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] "Bha %d dealbh ann nach b’ urrainn dhuinn an t-àm aige a chur air gleus."
 msgstr[1] "Bha %d dhealbh ann nach b’ urrainn dhuinn an t-àm aca a chur air gleus."
-msgstr[2] ""
-"Bha %d dealbhan ann nach b’ urrainn dhuinn an t-àm aca a chur air gleus."
+msgstr[2] "Bha %d dealbhan ann nach b’ urrainn dhuinn an t-àm aca a chur air gleus."
 msgstr[3] "Bha %d dealbh ann nach b’ urrainn dhuinn an t-àm aca a chur air gleus."
 
-#: src/Commands.vala:1637 src/Commands.vala:1660
+#: src/Commands.vala:1636 src/Commands.vala:1659
 msgid "Create Tag"
 msgstr "Cruthaich taga"
 
-#: src/Commands.vala:1695
+#: src/Commands.vala:1694
 #, c-format
-#| msgid "Move Tag \"%s\""
 msgid "Move Tag “%s”"
 msgstr "Gluais an taga “%s”"
 
-#: src/Commands.vala:2347
+#: src/Commands.vala:2346
 msgid "Move Photos to Trash"
 msgstr "Gluais na dealbhan dhan sgudal"
 
-#: src/Commands.vala:2347
+#: src/Commands.vala:2346
 msgid "Restore Photos from Trash"
 msgstr "Aisig na dealbhan on sgudal"
 
-#: src/Commands.vala:2348
+#: src/Commands.vala:2347
 msgid "Move the photos to the Shotwell trash"
 msgstr "Gluais na dealbhan do sgudal Shotwell"
 
-#: src/Commands.vala:2348
+#: src/Commands.vala:2347
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Aisig na dealbhan do leabhar-lann Shotwell"
 
-#: src/Commands.vala:2367
+#: src/Commands.vala:2366
 msgid "Moving Photos to Trash"
 msgstr "A’ gluasad nan dealbhan dhan sgudal"
 
-#: src/Commands.vala:2367
+#: src/Commands.vala:2366
 msgid "Restoring Photos From Trash"
 msgstr "Ag aiseag nan dealbhan on sgudal"
 
-#: src/Commands.vala:2453
+#: src/Commands.vala:2452
 msgid "Flag selected photos"
 msgstr "Cuir bratach ris na dealbhan a thagh thu"
 
-#: src/Commands.vala:2454
+#: src/Commands.vala:2453
 msgid "Unflag selected photos"
 msgstr "Thoir air falbh na brataichean o na dealbhan a thagh thu"
 
-#: src/Commands.vala:2455
+#: src/Commands.vala:2454
 msgid "Flagging selected photos"
 msgstr "A’ cur bratach ris na dealbhan a thagh thu"
 
-#: src/Commands.vala:2456
+#: src/Commands.vala:2455
 msgid "Unflagging selected photos"
 msgstr "A’ toirt air falbh nam brataichean o na dealbhan a thagh thu"
 
-#: src/Commands.vala:2463
+#: src/Commands.vala:2462
 msgid "Flag"
 msgstr "Cuir bratach ris"
 
-#: src/Commands.vala:2463
+#: src/Commands.vala:2462
 msgid "Unflag"
 msgstr "Thoir a’ bhratach air falbh"
 
 #. 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
+#: src/data_imports/DataImportsPluginHost.vala:65 src/data_imports/DataImportsPluginHost.vala:78
 #, c-format
 msgid "%s Database"
 msgstr "Stòr-dàta %s"
 
-#: src/data_imports/DataImportsPluginHost.vala:148
-#: src/data_imports/DataImportsPluginHost.vala:294
+#: 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:"
 msgid "Importing from %s can’t continue because an error occurred:"
-msgstr ""
-"Chan urrainn dhuinn leantainn air an ion-phortadh o %s oir thachair "
-"mearachd:"
+msgstr "Chan urrainn dhuinn leantainn air an ion-phortadh o %s oir thachair mearachd:"
 
 #: src/data_imports/DataImportsPluginHost.vala:151
 msgid "To try importing from another service, select one from the above menu."
-msgstr ""
-"Ma tha thu airson feuchainn ri ion-phortadh a dhèanamh o sheirbheis eile, "
-"tagh tè sa chlàr-taice gu h-àrd."
+msgstr "Ma tha thu airson feuchainn ri ion-phortadh a dhèanamh o sheirbheis eile, tagh tè sa chlàr-taice gu 
h-àrd."
 
 #: 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."
+"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 ""
 "Chan eil plugain sam bith an comas leis an urrainn dhut dàta ion-phortadh.\n"
 "\n"
-"Mus urrainn dhut an gleus “Ion-phortaich o aplacaid” a chleachdadh, feumaidh "
-"tu co-dhiù aon phlugan a chur an comas a nì ion-phortadh dàta dhut. ’S "
-"urrainn dhut plugain a chur an comas ann an còmhradh nan roghainnean."
+"Mus urrainn dhut an gleus “Ion-phortaich o aplacaid” a chleachdadh, feumaidh tu co-dhiù aon phlugan a chur 
an comas a nì ion-phortadh dàta dhut. ’S urrainn dhut plugain a chur an comas ann an còmhradh nan 
roghainnean."
 
 #: src/data_imports/DataImportsUI.vala:100
 msgid "Database file:"
 msgstr "Faidhle stòir-dhàta:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:785
 msgid "_Import"
 msgstr "_Ion-phortaich"
 
-#: src/data_imports/DataImportsUI.vala:220
+#: src/data_imports/DataImportsUI.vala:219
 msgid "Import From Application"
 msgstr "Ion-phortaich o aplacaid"
 
-#: src/data_imports/DataImportsUI.vala:221
+#: src/data_imports/DataImportsUI.vala:220
 msgid "Import media _from:"
 msgstr "Ion-phortaich meadhan _o:"
 
-#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
+#: src/data_imports/DataImportsUI.vala:415 src/publishing/PublishingUI.vala:524
 msgid "_Close"
 msgstr "_Dùin"
 
@@ -3111,9 +2565,7 @@ msgstr "Ion-phortadh dàta"
 #: src/db/DatabaseTable.vala:37
 #, c-format
 msgid "Unable to open/create photo database %s: error code %d"
-msgstr ""
-"Cha b’ urrainn dhuinn stòr-dàta nan dealbhan fhosgladh no a chruthachadh %s: "
-"còd mearachd %d"
+msgstr "Cha b’ urrainn dhuinn stòr-dàta nan dealbhan fhosgladh no a chruthachadh %s: còd mearachd %d"
 
 #: src/db/DatabaseTable.vala:46
 #, c-format
@@ -3165,93 +2617,72 @@ msgstr "Chan urrainn dhuinn taisbeanadh-shleamhnagan an deasga ullachadh: %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?"
 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] ""
-"Bheir seo air falbh a’ bhratach “%s” o %d dealbh. A bheil thu airson "
-"leantainn air adhart?"
-msgstr[1] ""
-"Bheir seo air falbh a’ bhratach “%s” o %d dhealbh. A bheil thu airson "
-"leantainn air adhart?"
-msgstr[2] ""
-"Bheir seo air falbh a’ bhratach “%s” o %d dealbhan. A bheil thu airson "
-"leantainn air adhart?"
-msgstr[3] ""
-"Bheir seo air falbh a’ bhratach “%s” o %d dealbh. A bheil thu airson "
-"leantainn air adhart?"
+msgstr[0] "Bheir seo air falbh a’ bhratach “%s” o %d dealbh. A bheil thu airson leantainn air adhart?"
+msgstr[1] "Bheir seo air falbh a’ bhratach “%s” o %d dhealbh. A bheil thu airson leantainn air adhart?"
+msgstr[2] "Bheir seo air falbh a’ bhratach “%s” o %d dealbhan. A bheil thu airson leantainn air adhart?"
+msgstr[3] "Bheir seo air falbh a’ bhratach “%s” o %d dealbh. A bheil thu airson leantainn air adhart?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
-#: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
-#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63
-#: ui/trash.ui:216 ui/trash.ui:258
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:58 src/Dialogs.vala:734 src/Resources.vala:128 
src/Resources.vala:309 src/Resources.vala:340 src/Resources.vala:393 src/Resources.vala:761 
ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63 ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Sguab às"
 
 #: src/Dialogs.vala:25
 #, c-format
-#| msgid "This will remove the saved search \"%s\".  Continue?"
 msgid "This will remove the saved search “%s”. Continue?"
-msgstr ""
-"Bheir seo air falbh an lorg “%s” a shàbhail thu roimhe. A bheil thu airson "
-"leantainn air adhart?"
+msgstr "Bheir seo air falbh an lorg “%s” a shàbhail thu roimhe. A bheil thu airson leantainn air adhart?"
 
 #: src/Dialogs.vala:36
-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] ""
-"Ma thaghas tu leasaichear eile, thèid gach atharrachadh a rinn thu air an "
-"dealbh seo ann an Shotwell a chur gu neoini."
-msgstr[1] ""
-"Ma thaghas tu leasaichear eile, thèid gach atharrachadh a rinn thu air na "
-"dealbhan seo ann an Shotwell a chur gu neoini."
-msgstr[2] ""
-"Ma thaghas tu leasaichear eile, thèid gach atharrachadh a rinn thu air na "
-"dealbhan seo ann an Shotwell a chur gu neoini."
-msgstr[3] ""
-"Ma thaghas tu leasaichear eile, thèid gach atharrachadh a rinn thu air na "
-"dealbhan seo ann an Shotwell a chur gu neoini."
+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] "Ma thaghas tu leasaichear eile, thèid gach atharrachadh a rinn thu air an dealbh seo ann an 
Shotwell a chur gu neoini"
+msgstr[1] "Ma thaghas tu leasaichear eile, thèid gach atharrachadh a rinn thu air na dealbhan seo ann an 
Shotwell a chur gu neoini"
+msgstr[2] "Ma thaghas tu leasaichear eile, thèid gach atharrachadh a rinn thu air na dealbhan seo ann an 
Shotwell a chur gu neoini"
+msgstr[3] "Ma thaghas tu leasaichear eile, thèid gach atharrachadh a rinn thu air na dealbhan seo ann an 
Shotwell a chur gu neoini"
 
 #: src/Dialogs.vala:40
 msgid "_Switch Developer"
 msgstr "_Cleachd an leasaichear eile"
 
-#: src/Dialogs.vala:59
+#: src/Dialogs.vala:54
+#, fuzzy, 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?"
+msgid "This will remove the face “%s” from one photo. Continue?"
+msgid_plural "This will remove the face “%s” from %d photos. Continue?"
+msgstr[0] "Bheir seo air falbh a’ bhratach “%s” o %d dealbh. A bheil thu airson leantainn air adhart?"
+msgstr[1] "Bheir seo air falbh a’ bhratach “%s” o %d dhealbh. A bheil thu airson leantainn air adhart?"
+msgstr[2] "Bheir seo air falbh a’ bhratach “%s” o %d dealbhan. A bheil thu airson leantainn air adhart?"
+msgstr[3] "Bheir seo air falbh a’ bhratach “%s” o %d dealbh. A bheil thu airson leantainn air adhart?"
+
+#: src/Dialogs.vala:74
 msgid "Export Video"
 msgstr "Às-phortaich a’ video"
 
+#: src/Dialogs.vala:99
+msgid "Export Photos"
+msgstr "Às-phortaich dealbhan"
+
 #. 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:112
+#: src/Dialogs.vala:127
 #, c-format
-#| msgid ""
-#| "Shotwell couldn't create a file for editing this photo because you do not "
-#| "have permission to write to %s."
-msgid ""
-"Shotwell couldn’t create a file for editing this photo because you do not "
-"have permission to write to %s."
-msgstr ""
-"Cha b’ urrainn dha Shotwell faidhle a chruthachadh gus an dealbh seo a "
-"dheasachadh air sgàth ’s nach eil cead-sgrìobhaidh agad ann an %s."
+msgid "Shotwell couldn’t create a file for editing this photo because you do not have permission to write to 
%s."
+msgstr "Cha b’ urrainn dha Shotwell faidhle a chruthachadh gus an dealbh seo a dheasachadh air sgàth ’s nach 
eil cead-sgrìobhaidh agad ann an %s."
 
-#: src/Dialogs.vala:121
+#: src/Dialogs.vala:136
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
 msgstr ""
-"Chan urrainn dhuinn an dealbh a leanas às-phortadh air sgàth mearachd "
-"faidhle.\n"
+"Chan urrainn dhuinn an dealbh a leanas às-phortadh air sgàth mearachd faidhle.\n"
 "\n"
 
-#: src/Dialogs.vala:127
+#: src/Dialogs.vala:142
 msgid ""
 "\n"
 "\n"
@@ -3261,59 +2692,28 @@ msgstr ""
 "\n"
 "A bheil thu airson leantainn air adhart leis an às-phortadh?"
 
-#. "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:144
-msgid "Unmodified"
-msgstr "Gun atharrachadh"
-
-#: src/Dialogs.vala:145
-msgid "Current"
-msgstr "Làithreach"
-
-#. layout controls
-#: src/Dialogs.vala:221
-msgid "_Format:"
-msgstr "_Fòrmat:"
-
-#: src/Dialogs.vala:224
-msgid "_Quality:"
-msgstr "_Càileachd:"
-
-#: src/Dialogs.vala:227
-msgid "_Scaling constraint:"
-msgstr "_Bacadh sgèilidh:"
-
-#: src/Dialogs.vala:230
-#| msgid " _pixels"
-msgid "_Pixels:"
-msgstr "_Piogsailean:"
-
-#: src/Dialogs.vala:234
-#| msgid "Export metadata"
-msgid "Export _metadata:"
-msgstr "Às-phortaich am _meata-dàta:"
+#: src/Dialogs.vala:143
+msgid "Con_tinue"
+msgstr "Lean air adhar_t"
 
-#: src/Dialogs.vala:478
-#| msgid "Save Details"
+#: src/Dialogs.vala:153
 msgid "Save Details…"
 msgstr "Sàbhail am mion-fhiosrachadh…"
 
-#: src/Dialogs.vala:479
+#: src/Dialogs.vala:154
 msgid "Save Details"
 msgstr "Sàbhail am mion-fhiosrachadh"
 
-#: src/Dialogs.vala:494
+#: src/Dialogs.vala:169
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(agus %d a bharrachd)\n"
 
-#: src/Dialogs.vala:547
+#: src/Dialogs.vala:222
 msgid "Import Results Report"
 msgstr "An aithris air coileanas an ion-phortaidh"
 
-#: src/Dialogs.vala:551
+#: src/Dialogs.vala:226
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
@@ -3322,7 +2722,7 @@ msgstr[1] "Dh’fheuch sinn ri %d fhaidhle ion-phortadh."
 msgstr[2] "Dh’fheuch sinn ri %d faidhlichean ion-phortadh."
 msgstr[3] "Dh’fheuch sinn ri %d faidhle ion-phortadh."
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:229
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -3334,73 +2734,48 @@ msgstr[3] "Chaidh %d dhiubh seo ion-phortadh gu soirbheachail."
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:566
+#: src/Dialogs.vala:241
 msgid "Duplicate Photos/Videos Not Imported:"
-msgstr ""
-"Dealbhan/videothan a bha ann iomadh turas is nach deach an ion-phortadh:"
+msgstr "Dealbhan/videothan a bha ann iomadh turas is nach deach an ion-phortadh:"
 
-#: src/Dialogs.vala:570
+#: src/Dialogs.vala:245
 msgid "duplicates existing media item"
 msgstr "a dhùblaicheadh ball a tha ann mu thràth"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: src/Dialogs.vala:581
+#: src/Dialogs.vala:256
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
-msgstr ""
-"Dealbhan/videothan a bha ann iomadh turas is nach deach an ion-phortadh ri "
-"linn mearachd a’ chamara:"
+msgstr "Dealbhan/videothan a bha ann iomadh turas is nach deach an ion-phortadh ri linn mearachd a’ chamara:"
 
-#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
-#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
+#: src/Dialogs.vala:259 src/Dialogs.vala:274 src/Dialogs.vala:289 src/Dialogs.vala:305 src/Dialogs.vala:320 
src/Dialogs.vala:334
 msgid "error message:"
 msgstr "teachdaireachd na mearachd:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:595
-#| msgid ""
-#| "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+#: src/Dialogs.vala:270
 msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
-msgstr ""
-"Cha deach na faidhlichean ion-phortadh air sgàth ’s nach deach an "
-"aithneachadh mar dhealbhan no videothan:"
+msgstr "Cha deach na faidhlichean ion-phortadh air sgàth ’s nach deach an aithneachadh mar dhealbhan no 
videothan:"
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:610
-#| msgid ""
-#| "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
-#| "Understands:"
-msgid ""
-"Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
-"Understands:"
-msgstr ""
-"Cha deach na dealbhan/videothan ion-phortadh air sgàth ’s nach eil iad ann "
-"am fòrmat a thuigeas Shotwell:"
+#: src/Dialogs.vala:285
+msgid "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell Understands:"
+msgstr "Cha deach na dealbhan/videothan ion-phortadh air sgàth ’s nach eil iad ann am fòrmat a thuigeas 
Shotwell:"
 
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:625
-#| msgid ""
-#| "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
-#| "Library:"
-msgid ""
-"Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
-"Library:"
-msgstr ""
-"Cha deach na dealbhan/videothan ion-phortadh air sgàth ’s nach b’ urrainn "
-"dha Shotwell lethbhreac dhiubh a chur dhan leabhar-lann aige."
+#: src/Dialogs.vala:300
+msgid "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its Library:"
+msgstr "Seo na dealbhan/videothan nach deach ion-phortadh air sgàth ’s nach b’ urrainn dha Shotwell 
lethbhreac dhiubh a chur dhan leabhar-lann aige:"
 
-#: src/Dialogs.vala:629
+#: src/Dialogs.vala:304
 #, c-format
-#| msgid ""
-#| "couldn't copy %s\n"
-#| "\tto %s"
 msgid ""
 "couldn’t copy %s\n"
 "\tto %s"
@@ -3411,21 +2786,18 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:641
+#: src/Dialogs.vala:316
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
-msgstr ""
-"Cha deach na dealbhan/videothan ion-phortadh a chionn ’s gu bheil na "
-"faidhlichean coirbte:"
+msgstr "Cha deach na dealbhan/videothan ion-phortadh a chionn ’s gu bheil na faidhlichean coirbte:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:656
+#: src/Dialogs.vala:331
 msgid "Photos/Videos Not Imported for Other Reasons:"
-msgstr ""
-"Dealbhan/videothan nach deach an ion-phortadh air sgàth adhbharan eile:"
+msgstr "Dealbhan/videothan nach deach an ion-phortadh air sgàth adhbharan eile:"
 
-#: src/Dialogs.vala:676
+#: src/Dialogs.vala:351
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
@@ -3434,7 +2806,7 @@ msgstr[1] "Bha %d dhealbh dùblaichte ann nach deach ion-phortadh:\n"
 msgstr[2] "Bha %d dealbhan dùblaichte ann nach deach ion-phortadh:\n"
 msgstr[3] "Bha %d dealbh dùblaichte ann nach deach ion-phortadh:\n"
 
-#: src/Dialogs.vala:679
+#: src/Dialogs.vala:354
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
@@ -3443,7 +2815,7 @@ msgstr[1] "Bha %d video dùblaichte ann nach deach ion-phortadh:\n"
 msgstr[2] "Bha %d videothan dùblaichte ann nach deach ion-phortadh:\n"
 msgstr[3] "Bha %d video dùblaichte ann nach deach ion-phortadh:\n"
 
-#: src/Dialogs.vala:682
+#: src/Dialogs.vala:357
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
@@ -3452,141 +2824,79 @@ msgstr[1] "Bha %d dhealbh/video dùblaichte ann nach deach ion-phortadh:\n"
 msgstr[2] "Bha %d dealbhan/videothan dùblaichte ann nach deach ion-phortadh:\n"
 msgstr[3] "Bha %d dealbh/video dùblaichte ann nach deach ion-phortadh:\n"
 
-#: src/Dialogs.vala:696
+#: src/Dialogs.vala:371
 #, 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] ""
-"Bha %d dealbh ann nach deach ion-phortadh ri linn mearachd faidhle no "
-"mearachd bathair-chruaidh:\n"
-msgstr[1] ""
-"Bha %d dhealbh ann nach deach ion-phortadh ri linn mearachd faidhle no "
-"mearachd bathair-chruaidh:\n"
-msgstr[2] ""
-"Bha %d dealbhan ann nach deach ion-phortadh ri linn mearachd faidhle no "
-"mearachd bathair-chruaidh:\n"
-msgstr[3] ""
-"Bha %d dealbh ann nach deach ion-phortadh ri linn mearachd faidhle no "
-"mearachd bathair-chruaidh:\n"
+msgstr[0] "Bha %d dealbh ann nach deach ion-phortadh ri linn mearachd faidhle no mearachd 
bathair-chruaidh:\n"
+msgstr[1] "Bha %d dhealbh ann nach deach ion-phortadh ri linn mearachd faidhle no mearachd 
bathair-chruaidh:\n"
+msgstr[2] "Bha %d dealbhan ann nach deach ion-phortadh ri linn mearachd faidhle no mearachd 
bathair-chruaidh:\n"
+msgstr[3] "Bha %d dealbh ann nach deach ion-phortadh ri linn mearachd faidhle no mearachd 
bathair-chruaidh:\n"
 
-#: src/Dialogs.vala:699
+#: src/Dialogs.vala:374
 #, 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] ""
-"Bha %d video ann nach deach ion-phortadh ri linn mearachd faidhle no "
-"mearachd bathair-chruaidh:\n"
-msgstr[1] ""
-"Bha %d video ann nach deach ion-phortadh ri linn mearachd faidhle no "
-"mearachd bathair-chruaidh:\n"
-msgstr[2] ""
-"Bha %d videothan ann nach deach ion-phortadh ri linn mearachd faidhle no "
-"mearachd bathair-chruaidh:\n"
-msgstr[3] ""
-"Bha %d video ann nach deach ion-phortadh ri linn mearachd faidhle no "
-"mearachd bathair-chruaidh:\n"
+msgstr[0] "Bha %d video ann nach deach ion-phortadh ri linn mearachd faidhle no mearachd bathair-chruaidh:\n"
+msgstr[1] "Bha %d video ann nach deach ion-phortadh ri linn mearachd faidhle no mearachd bathair-chruaidh:\n"
+msgstr[2] "Bha %d videothan ann nach deach ion-phortadh ri linn mearachd faidhle no mearachd 
bathair-chruaidh:\n"
+msgstr[3] "Bha %d video ann nach deach ion-phortadh ri linn mearachd faidhle no mearachd bathair-chruaidh:\n"
 
-#: src/Dialogs.vala:702
+#: src/Dialogs.vala:377
 #, 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] ""
-"Bha %d dealbh/video ann nach deach ion-phortadh ri linn mearachd faidhle no "
-"mearachd bathair-chruaidh:\n"
-msgstr[1] ""
-"Bha %d dhealbh/video ann nach deach ion-phortadh ri linn mearachd faidhle no "
-"mearachd bathair-chruaidh:\n"
-msgstr[2] ""
-"Bha %d dealbhan/videothan ann nach deach ion-phortadh ri linn mearachd "
-"faidhle no mearachd bathair-chruaidh:\n"
-msgstr[3] ""
-"Bha %d dealbh/video ann nach deach ion-phortadh ri linn mearachd faidhle no "
-"mearachd bathair-chruaidh:\n"
+msgid_plural "%d photos/videos failed to import due to a file or hardware error:\n"
+msgstr[0] "Bha %d dealbh/video ann nach deach ion-phortadh ri linn mearachd faidhle no mearachd 
bathair-chruaidh:\n"
+msgstr[1] "Bha %d dhealbh/video ann nach deach ion-phortadh ri linn mearachd faidhle no mearachd 
bathair-chruaidh:\n"
+msgstr[2] "Bha %d dealbhan/videothan ann nach deach ion-phortadh ri linn mearachd faidhle no mearachd 
bathair-chruaidh:\n"
+msgstr[3] "Bha %d dealbh/video ann nach deach ion-phortadh ri linn mearachd faidhle no mearachd 
bathair-chruaidh:\n"
 
-#: src/Dialogs.vala:705
+#: src/Dialogs.vala:380
 #, 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] ""
-"Bha %d fhaidhle ann nach deach ion-phortadh ri linn mearachd faidhle no "
-"mearachd bathair-chruaidh:\n"
-msgstr[1] ""
-"Bha %d fhaidhle ann nach deach ion-phortadh ri linn mearachd faidhle no "
-"mearachd bathair-chruaidh:\n"
-msgstr[2] ""
-"Bha %d faidhlichean ann nach deach ion-phortadh ri linn mearachd faidhle no "
-"mearachd bathair-chruaidh:\n"
-msgstr[3] ""
-"Bha %d faidhle ann nach deach ion-phortadh ri linn mearachd faidhle no "
-"mearachd bathair-chruaidh:\n"
+msgstr[0] "Bha %d fhaidhle ann nach deach ion-phortadh ri linn mearachd faidhle no mearachd 
bathair-chruaidh:\n"
+msgstr[1] "Bha %d fhaidhle ann nach deach ion-phortadh ri linn mearachd faidhle no mearachd 
bathair-chruaidh:\n"
+msgstr[2] "Bha %d faidhlichean ann nach deach ion-phortadh ri linn mearachd faidhle no mearachd 
bathair-chruaidh:\n"
+msgstr[3] "Bha %d faidhle ann nach deach ion-phortadh ri linn mearachd faidhle no mearachd 
bathair-chruaidh:\n"
 
-#: src/Dialogs.vala:719
+#: src/Dialogs.vala:394
 #, 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] "Bha %d dealbh ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn "
-"sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[1] "Bha %d dhealbh ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
-"dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[2] "Bha %d dealbhan ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
-"dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[3] "Bha %d dealbh ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn "
-"sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-
-#: src/Dialogs.vala:722
+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] "Bha %d dealbh ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn sgrìobhadh ann am 
pasgan leabhar-lann nan dealbhan:\n"
+msgstr[1] "Bha %d dhealbh ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn sgrìobhadh ann am 
pasgan leabhar-lann nan dealbhan:\n"
+msgstr[2] "Bha %d dealbhan ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn sgrìobhadh ann am 
pasgan leabhar-lann nan dealbhan:\n"
+msgstr[3] "Bha %d dealbh ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn sgrìobhadh ann am 
pasgan leabhar-lann nan dealbhan:\n"
+
+#: src/Dialogs.vala:397
 #, 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] "Bha %d video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn "
-"sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[1] "Bha %d video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn "
-"sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[2] "Bha %d videothan ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
-"dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[3] "Bha %d video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn "
-"sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-
-#: src/Dialogs.vala:725
+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] "Bha %d video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn sgrìobhadh ann am 
pasgan leabhar-lann nan dealbhan:\n"
+msgstr[1] "Bha %d video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn sgrìobhadh ann am 
pasgan leabhar-lann nan dealbhan:\n"
+msgstr[2] "Bha %d videothan ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn sgrìobhadh ann am 
pasgan leabhar-lann nan dealbhan:\n"
+msgstr[3] "Bha %d video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn sgrìobhadh ann am 
pasgan leabhar-lann nan dealbhan:\n"
+
+#: src/Dialogs.vala:400
 #, 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] "Bha %d dealbh/video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
-"dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[1] "Bha %d dhealbh/video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
-"dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[2] "Bha %d dealbhan/videothan ann nach deach ion-phortadh a chionn ’s nach b’ "
-"urrainn dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[3] "Bha %d dealbh/video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
-"dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-
-#: src/Dialogs.vala:728
+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] "Bha %d dealbh/video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn sgrìobhadh ann 
am pasgan leabhar-lann nan dealbhan:\n"
+msgstr[1] "Bha %d dhealbh/video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn sgrìobhadh 
ann am pasgan leabhar-lann nan dealbhan:\n"
+msgstr[2] "Bha %d dealbhan/videothan ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn 
sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
+msgstr[3] "Bha %d dealbh/video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn sgrìobhadh ann 
am pasgan leabhar-lann nan dealbhan:\n"
+
+#: src/Dialogs.vala:403
 #, 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] "Bha %d fhaidhle ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
-"dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[1] "Bha %d fhaidhle ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
-"dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[2] "Bha %d faidhlichean ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
-"dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[3] "Bha %d faidhle ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
-"dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-
-#: src/Dialogs.vala:742
+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] "Bha %d fhaidhle ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn sgrìobhadh ann am 
pasgan leabhar-lann nan dealbhan:\n"
+msgstr[1] "Bha %d fhaidhle ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn sgrìobhadh ann am 
pasgan leabhar-lann nan dealbhan:\n"
+msgstr[2] "Bha %d faidhlichean ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn sgrìobhadh ann 
am pasgan leabhar-lann nan dealbhan:\n"
+msgstr[3] "Bha %d faidhle ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn sgrìobhadh ann am 
pasgan leabhar-lann nan dealbhan:\n"
+
+#: src/Dialogs.vala:417
 #, 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"
@@ -3595,7 +2905,7 @@ msgstr[1] "Bha %d dhealbh ann nach deach ion-phortadh ri linn mearachd a’ cham
 msgstr[2] "Bha %d dealbhan ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
 msgstr[3] "Bha %d dealbh ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
 
-#: src/Dialogs.vala:745
+#: src/Dialogs.vala:420
 #, 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"
@@ -3604,18 +2914,16 @@ msgstr[1] "Bha %d video ann nach deach ion-phortadh ri linn mearachd a’ chamar
 msgstr[2] "Bha %d videothan ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
 msgstr[3] "Bha %d video ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
 
-#: src/Dialogs.vala:748
+#: src/Dialogs.vala:423
 #, 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] "Bha %d dealbh/video ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
-msgstr[1] "Bha %d dhealbh/video ann nach deach ion-phortadh ri linn mearachd a’ "
-"chamara:\n"
-msgstr[2] "Bha %d dealbhan/videothan ann nach deach ion-phortadh ri linn mearachd a’ "
-"chamara:\n"
+msgstr[1] "Bha %d dhealbh/video ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
+msgstr[2] "Bha %d dealbhan/videothan ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
 msgstr[3] "Bha %d dealbh/video ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
 
-#: src/Dialogs.vala:751
+#: src/Dialogs.vala:426
 #, 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"
@@ -3624,7 +2932,7 @@ msgstr[1] "Bha %d fhaidhle ann nach deach ion-phortadh ri linn mearachd a’ cha
 msgstr[2] "Bha %d faidhlichean ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
 msgstr[3] "Bha %d fhaidhle ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
 
-#: src/Dialogs.vala:765
+#: src/Dialogs.vala:440
 #, 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"
@@ -3633,7 +2941,7 @@ msgstr[1] "Cha deach %d dhealbh ion-phortadh a chionn ’s gu bheil iad coirbte:
 msgstr[2] "Cha deach %d dealbhan ion-phortadh a chionn ’s gu bheil iad coirbte:\n"
 msgstr[3] "Cha deach %d dealbh ion-phortadh a chionn ’s gu bheil iad coirbte:\n"
 
-#: src/Dialogs.vala:768
+#: src/Dialogs.vala:443
 #, 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"
@@ -3642,17 +2950,16 @@ msgstr[1] "Cha deach %d videothan ion-phortadh a chionn ’s gu bheil iad coirbt
 msgstr[2] "Cha deach %d video ion-phortadh a chionn ’s gu bheil iad coirbte:\n"
 msgstr[3] "Cha deach %d video ion-phortadh a chionn ’s gu bheil iad coirbte:\n"
 
-#: src/Dialogs.vala:771
+#: src/Dialogs.vala:446
 #, 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] "Cha deach %d dealbh/video ion-phortadh a chionn ’s gu bheil e coirbte:\n"
 msgstr[1] "Cha deach %d dhealbh/video ion-phortadh a chionn ’s gu bheil iad coirbte:\n"
-msgstr[2] "Cha deach %d dealbhan/videothan ion-phortadh a chionn ’s gu bheil iad "
-"coirbte:\n"
+msgstr[2] "Cha deach %d dealbhan/videothan ion-phortadh a chionn ’s gu bheil iad coirbte:\n"
 msgstr[3] "Cha deach %d dealbh/video ion-phortadh a chionn ’s gu bheil iad coirbte:\n"
 
-#: src/Dialogs.vala:774
+#: src/Dialogs.vala:449
 #, 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"
@@ -3665,19 +2972,18 @@ msgstr[3] "Cha deach %d faidhle ion-phortadh a chionn ’s gu bheil iad coirbte:
 #. 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:791
+#: src/Dialogs.vala:466
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
 msgstr[0] "Chaidh leum a ghearradh thairis air %d dealbh ris nach eil taic:\n"
 msgstr[1] "Chaidh leum a ghearradh thairis air %d dhealbh ris nach eil taic:\n"
-msgstr[2] ""
-"Chaidh leum a ghearradh thairis air %d dealbhan ris nach eil taic:\n"
+msgstr[2] "Chaidh leum a ghearradh thairis air %d dealbhan ris nach eil taic:\n"
 msgstr[3] "Chaidh leum a ghearradh thairis air %d dealbh ris nach eil taic:\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:806
+#: src/Dialogs.vala:481
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
@@ -3686,75 +2992,43 @@ msgstr[1] "Chaidh leum a ghearradh thairis air %d fhaidhle nach eil ’nan dealb
 msgstr[2] "Chaidh leum a ghearradh thairis air %d faidhlichean nach eil ’nan dealbhan:\n"
 msgstr[3] "Chaidh leum a ghearradh thairis air %d faidhle nach eil ’nan dealbhan:\n"
 
-#: src/Dialogs.vala:817
+#: src/Dialogs.vala:492
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
-msgstr[0] ""
-"Chaidh leum a ghearradh thairis air %d dealbh oir sguir an cleachdaiche "
-"dheth:\n"
-msgstr[1] ""
-"Chaidh leum a ghearradh thairis air %d dhealbh oir sguir an cleachdaiche "
-"dhiubh:\n"
-msgstr[2] ""
-"Chaidh leum a ghearradh thairis air %d dealbhan oir sguir an cleachdaiche "
-"dhiubh:\n"
-msgstr[3] ""
-"Chaidh leum a ghearradh thairis air %d dealbh oir sguir an cleachdaiche "
-"dhiubh:\n"
+msgstr[0] "Chaidh leum a ghearradh thairis air %d dealbh oir sguir an cleachdaiche dheth:\n"
+msgstr[1] "Chaidh leum a ghearradh thairis air %d dhealbh oir sguir an cleachdaiche dhiubh:\n"
+msgstr[2] "Chaidh leum a ghearradh thairis air %d dealbhan oir sguir an cleachdaiche dhiubh:\n"
+msgstr[3] "Chaidh leum a ghearradh thairis air %d dealbh oir sguir an cleachdaiche dhiubh:\n"
 
-#: src/Dialogs.vala:820
+#: src/Dialogs.vala:495
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
-msgstr[0] ""
-"Chaidh leum a ghearradh thairis air %d video oir sguir an cleachdaiche "
-"dhiubh:\n"
-msgstr[1] ""
-"Chaidh leum a ghearradh thairis air %d video oir sguir an cleachdaiche "
-"dhiubh:\n"
-msgstr[2] ""
-"Chaidh leum a ghearradh thairis air %d videothan oir sguir an cleachdaiche "
-"dhiubh:\n"
-msgstr[3] ""
-"Chaidh leum a ghearradh thairis air %d video oir sguir an cleachdaiche "
-"dhiubh:\n"
+msgstr[0] "Chaidh leum a ghearradh thairis air %d video oir sguir an cleachdaiche dhiubh:\n"
+msgstr[1] "Chaidh leum a ghearradh thairis air %d video oir sguir an cleachdaiche dhiubh:\n"
+msgstr[2] "Chaidh leum a ghearradh thairis air %d videothan oir sguir an cleachdaiche dhiubh:\n"
+msgstr[3] "Chaidh leum a ghearradh thairis air %d video oir sguir an cleachdaiche dhiubh:\n"
 
-#: src/Dialogs.vala:823
+#: src/Dialogs.vala:498
 #, 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] ""
-"Chaidh leum a ghearradh thairis air %d dealbh/video oir sguir an "
-"cleachdaiche dhiubh:\n"
-msgstr[1] ""
-"Chaidh leum a ghearradh thairis air %d dhealbh/video oir sguir an "
-"cleachdaiche dhiubh:\n"
-msgstr[2] ""
-"Chaidh leum a ghearradh thairis air %d dealbhan/videothan oir sguir an "
-"cleachdaiche dhiubh:\n"
-msgstr[3] ""
-"Chaidh leum a ghearradh thairis air %d dealbh/video oir sguir an "
-"cleachdaiche dhiubh:\n"
+msgstr[0] "Chaidh leum a ghearradh thairis air %d dealbh/video oir sguir an cleachdaiche dhiubh:\n"
+msgstr[1] "Chaidh leum a ghearradh thairis air %d dhealbh/video oir sguir an cleachdaiche dhiubh:\n"
+msgstr[2] "Chaidh leum a ghearradh thairis air %d dealbhan/videothan oir sguir an cleachdaiche dhiubh:\n"
+msgstr[3] "Chaidh leum a ghearradh thairis air %d dealbh/video oir sguir an cleachdaiche dhiubh:\n"
 
-#: src/Dialogs.vala:826
+#: src/Dialogs.vala:501
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
-msgstr[0] ""
-"Chaidh leum a ghearradh thairis air %d fhaidhle oir sguir an cleachdaiche "
-"dhiubh:\n"
-msgstr[1] ""
-"Chaidh leum a ghearradh thairis air %d fhaidhle oir sguir an cleachdaiche "
-"dhiubh:\n"
-msgstr[2] ""
-"Chaidh leum a ghearradh thairis air %d faidhlichean oir sguir an "
-"cleachdaiche dhiubh:\n"
-msgstr[3] ""
-"Chaidh leum a ghearradh thairis air %d faidhle oir sguir an cleachdaiche "
-"dhiubh:\n"
+msgstr[0] "Chaidh leum a ghearradh thairis air %d fhaidhle oir sguir an cleachdaiche dhiubh:\n"
+msgstr[1] "Chaidh leum a ghearradh thairis air %d fhaidhle oir sguir an cleachdaiche dhiubh:\n"
+msgstr[2] "Chaidh leum a ghearradh thairis air %d faidhlichean oir sguir an cleachdaiche dhiubh:\n"
+msgstr[3] "Chaidh leum a ghearradh thairis air %d faidhle oir sguir an cleachdaiche dhiubh:\n"
 
-#: src/Dialogs.vala:840
+#: src/Dialogs.vala:515
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
@@ -3763,7 +3037,7 @@ msgstr[1] "Chaidh %d dhealbh ion-phortadh.\n"
 msgstr[2] "Chaidh %d dealbhan ion-phortadh.\n"
 msgstr[3] "Chaidh %d dealbh ion-phortadh.\n"
 
-#: src/Dialogs.vala:843
+#: src/Dialogs.vala:518
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
@@ -3772,7 +3046,7 @@ msgstr[1] "Chaidh %d video ion-phortadh.\n"
 msgstr[2] "Chaidh %d videothan ion-phortadh.\n"
 msgstr[3] "Chaidh %d video ion-phortadh.\n"
 
-#: src/Dialogs.vala:846
+#: src/Dialogs.vala:521
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -3783,78 +3057,46 @@ msgstr[3] "Chaidh %d dealbh/video ion-phortadh.\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:862
+#: src/Dialogs.vala:537
 msgid "No photos or videos imported.\n"
 msgstr "Cha deach dealbh no video sam bith ion-phortadh.\n"
 
-#: src/Dialogs.vala:869 src/Dialogs.vala:888
+#: src/Dialogs.vala:544 src/Dialogs.vala:563
 msgid "Import Complete"
 msgstr "Deiseil leis an ion-phortadh"
 
-#: src/Dialogs.vala:1160
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d diog"
-msgstr[1] "%d dhiog"
-msgstr[2] "%d diogan"
-msgstr[3] "%d diog"
-
-#: src/Dialogs.vala:1163
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d mhionaid"
-msgstr[1] "%d mhionaid"
-msgstr[2] "%d mionaidean"
-msgstr[3] "%d mionaid"
-
-#: src/Dialogs.vala:1167
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d uair a thìde"
-msgstr[1] "%d uair a thìde"
-msgstr[2] "%d uairean a thìde"
-msgstr[3] "%d uair a thìde"
-
-#: src/Dialogs.vala:1170
-msgid "1 day"
-msgstr "1 latha"
-
-#: src/Dialogs.vala:1317 src/Resources.vala:232
+#: src/Dialogs.vala:663 src/Resources.vala:201
 msgid "Rename Event"
 msgstr "Thoir ainm ùr air an tachartas"
 
-#: src/Dialogs.vala:1317
+#: src/Dialogs.vala:663
 msgid "Name:"
 msgstr "Aimn:"
 
 #. Dialog title
-#: src/Dialogs.vala:1328
-#| msgid "Edit Title"
+#: src/Dialogs.vala:674
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Deasaich an tiotal"
 
-#: src/Dialogs.vala:1329 src/Properties.vala:343
+#: src/Dialogs.vala:675 src/Properties.vala:347
 msgid "Title:"
 msgstr "Tiotal:"
 
 #. Dialog title
-#: src/Dialogs.vala:1345 src/Resources.vala:308
+#: src/Dialogs.vala:691 src/Resources.vala:277
 msgid "Edit Event Comment"
 msgstr "Deasaich beachd an tachartais"
 
-#: src/Dialogs.vala:1346
+#: src/Dialogs.vala:692
 msgid "Edit Photo/Video Comment"
 msgstr "Deasaich beachd an deilbh/video"
 
-#: src/Dialogs.vala:1347 src/Properties.vala:631
+#: src/Dialogs.vala:693 src/Properties.vala:645
 msgid "Comment:"
 msgstr "Beachd:"
 
-#: src/Dialogs.vala:1363
+#: src/Dialogs.vala:709
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Thoir am _faidhle air falbh ’s cur san sgudal e"
@@ -3862,187 +3104,57 @@ msgstr[1] "Thoir na _faidhlichean air falbh ’s cur san sgudal iad"
 msgstr[2] "Thoir na _faidhlichean air falbh ’s cur san sgudal iad"
 msgstr[3] "Thoir na _faidhlichean air falbh ’s cur san sgudal iad"
 
-#: src/Dialogs.vala:1367
+#: src/Dialogs.vala:713
 msgid "_Remove From Library"
 msgstr "Thoi_r air falbh on leabhar-lann"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:756
 msgid "Revert External Edit?"
-msgstr ""
-"A bheil thu airson an deasachadh a rinneadh air taobh a-muigh a thilleadh?"
+msgstr "A bheil thu airson an deasachadh a rinneadh air taobh a-muigh a thilleadh?"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:756
 msgid "Revert External Edits?"
-msgstr ""
-"A bheil thu airson na deasachaidhean a rinneadh air an taobh a-muigh a "
-"thilleadh?"
+msgstr "A bheil thu airson na deasachaidhean a rinneadh air an taobh a-muigh a thilleadh?"
 
-#: src/Dialogs.vala:1412
+#: src/Dialogs.vala:758
 #, 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 "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] ""
-"Cuiridh seo gu neoini gach atharrachadh a rinneadh air an %d fhaidhle air an "
-"taobh a-muigh. A bheil thu airson leantainn air adhart?"
-msgstr[1] ""
-"Cuiridh seo gu neoini gach atharrachadh a rinneadh air an %d fhaidhle air an "
-"taobh a-muigh. A bheil thu airson leantainn air adhart?"
-msgstr[2] ""
-"Cuiridh seo gu neoini gach atharrachadh a rinneadh air na %d faidhlichean "
-"air an taobh a-muigh. A bheil thu airson leantainn air adhart?"
-msgstr[3] ""
-"Cuiridh seo gu neoini gach atharrachadh a rinneadh air na %d faidhle air an "
-"taobh a-muigh. A bheil thu airson leantainn air adhart?"
+msgid_plural "This will destroy all changes made to %d external files. Continue?"
+msgstr[0] "Cuiridh seo gu neoini gach atharrachadh a rinneadh air an %d fhaidhle air an taobh a-muigh. A 
bheil thu airson leantainn air adhart?"
+msgstr[1] "Cuiridh seo gu neoini gach atharrachadh a rinneadh air an %d fhaidhle air an taobh a-muigh. A 
bheil thu airson leantainn air adhart?"
+msgstr[2] "Cuiridh seo gu neoini gach atharrachadh a rinneadh air na %d faidhlichean air an taobh a-muigh. A 
bheil thu airson leantainn air adhart?"
+msgstr[3] "Cuiridh seo gu neoini gach atharrachadh a rinneadh air na %d faidhle air an taobh a-muigh. A 
bheil thu airson leantainn air adhart?"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:762
 msgid "Re_vert External Edit"
 msgstr "Till an deasachadh a rinneadh air an taobh a-_muigh"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:762
 msgid "Re_vert External Edits"
 msgstr "Till na deasachaidhean a rinneadh air an taobh a-_muigh"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:783
 #, c-format
-#| msgid "This will remove the photo from the library.  Continue?"
-#| msgid_plural "This will remove %d photos from the library.  Continue?"
 msgid "This will remove the photo from the library. Continue?"
 msgid_plural "This will remove %d photos from the library. Continue?"
-msgstr[0] ""
-"Bheir seo air falbh %d dealbh on leabhar-lann. A bheil thu airson leantainn "
-"air adhart?"
-msgstr[1] ""
-"Bheir seo air falbh %d dhealbh on leabhar-lann. A bheil thu airson leantainn "
-"air adhart?"
-msgstr[2] ""
-"Bheir seo air falbh %d dealbhan on leabhar-lann. A bheil thu airson "
-"leantainn air adhart?"
-msgstr[3] ""
-"Bheir seo air falbh %d dealbh on leabhar-lann. A bheil thu airson leantainn "
-"air adhart?"
+msgstr[0] "Bheir seo air falbh %d dealbh on leabhar-lann. A bheil thu airson leantainn air adhart?"
+msgstr[1] "Bheir seo air falbh %d dhealbh on leabhar-lann. A bheil thu airson leantainn air adhart?"
+msgstr[2] "Bheir seo air falbh %d dealbhan on leabhar-lann. A bheil thu airson leantainn air adhart?"
+msgstr[3] "Bheir seo air falbh %d dealbh on leabhar-lann. A bheil thu airson leantainn air adhart?"
 
-#: src/Dialogs.vala:1444 src/Resources.vala:174
+#: src/Dialogs.vala:790 src/Resources.vala:143
 msgid "_Remove"
 msgstr "_Thoir air falbh"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:791
 msgid "Remove Photo From Library"
 msgstr "Thoir air falbh an dealbh on leabhar-lann"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:791
 msgid "Remove Photos From Library"
 msgstr "Thoir air falbh na dealbhan on leabhar-lann"
 
-#: src/Dialogs.vala:1543
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/Dialogs.vala:1697
-msgid "AM"
-msgstr "m"
-
-#: src/Dialogs.vala:1698
-msgid "PM"
-msgstr "f"
-
-#: src/Dialogs.vala:1699
-msgid "24 Hr"
-msgstr "Cleoc nan 24 uairean"
-
-#: src/Dialogs.vala:1714
-msgid "_Shift photos/videos by the same amount"
-msgstr "_Gluais na dealbhan/videothan an aon astar"
-
-#: src/Dialogs.vala:1719
-msgid "Set _all photos/videos to this time"
-msgstr "Cleachd _an t-àm seo airson gach dealbh/video"
-
-#: src/Dialogs.vala:1725
-#| msgid "_Modify original photo file"
-msgid "_Modify original photo file"
-msgid_plural "_Modify original photo files"
-msgstr[0] "_Atharraich faidhle tùsail an deilbh"
-msgstr[1] "_Atharraich faidhlichean tùsail an deilbh"
-msgstr[2] "_Atharraich faidhlichean tùsail an deilbh"
-msgstr[3] "_Atharraich faidhlichean tùsail an deilbh"
-
-#: src/Dialogs.vala:1729
-#| msgid "_Modify original file"
-msgid "_Modify original file"
-msgid_plural "_Modify original files"
-msgstr[0] "_Atharraich am faidhle tùsail"
-msgstr[1] "_Atharraich na faidhlichean tùsail"
-msgstr[2] "_Atharraich na faidhlichean tùsail"
-msgstr[3] "_Atharraich na faidhlichean tùsail"
-
-#: src/Dialogs.vala:1817
-msgid "Original: "
-msgstr "Am feat tùsail: "
-
-#: src/Dialogs.vala:1818
-msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%d/%m/%Y, %H:%M:%S"
-
-#: src/Dialogs.vala:1819
-msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%d/%m/%Y, %I:%M:%S %p"
-
-#: src/Dialogs.vala:1908
-#, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Thèid àm an deisearais a ghluasad air adhart le\n"
-"%d %s, %d %s, %d %s agus %d %s."
-
-#: src/Dialogs.vala:1909
-#, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Thèid àm an deisearais a ghluasad air ais le\n"
-"%d %s, %d %s, %d %s agus %d %s."
-
-#: src/Dialogs.vala:1911
-msgid "day"
-msgid_plural "days"
-msgstr[0] "latha"
-msgstr[1] "latha"
-msgstr[2] "làithean"
-msgstr[3] "latha"
-
-#: src/Dialogs.vala:1912
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "uair"
-msgstr[1] "uairean"
-msgstr[2] "uairean a thìde"
-msgstr[3] "uair a thìde"
-
-#: src/Dialogs.vala:1913
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "mhionaid"
-msgstr[1] "mhionaid"
-msgstr[2] "mionaidean"
-msgstr[3] "mionaid"
-
-#: src/Dialogs.vala:1914
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "diog"
-msgstr[1] "dhiog"
-msgstr[2] "diogan"
-msgstr[3] "diog"
-
-#: src/Dialogs.vala:1958
+#: src/Dialogs.vala:811
 #, c-format
 msgid ""
 "\n"
@@ -4069,284 +3181,132 @@ msgstr[3] ""
 "\n"
 "Agus %d eile."
 
-#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
+#: src/Dialogs.vala:835 src/Dialogs.vala:862
 msgid "Tags (separated by commas):"
 msgstr "Tagaichean (air an sgaradh le cromagan):"
 
-#: src/Dialogs.vala:2089
-msgid "Welcome!"
-msgstr "Fàilte!"
-
-#: src/Dialogs.vala:2096
-msgid "Welcome to Shotwell!"
-msgstr "Fàilte gu Shotwell!"
-
-#: src/Dialogs.vala:2101
-msgid "To get started, import photos in any of these ways:"
-msgstr ""
-"Dèan toiseach tòiseachaidh is ion-phortaich dealbhan air gin dhe na dòighean "
-"a leanas:"
-
-#: src/Dialogs.vala:2121
-#, c-format
-msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
-msgstr "Tagh <span weight=\"bold\">Ion-phortadh faidhle %s o phasgan</span>"
-
-#: src/Dialogs.vala:2122
-msgid "Drag and drop photos onto the Shotwell window"
-msgstr "Slaod is leig às dealbhan air uinneag Shotwell"
-
-#: src/Dialogs.vala:2123
-msgid "Connect a camera to your computer and import"
-msgstr "Ceangail camara ris a’ choimpiutair agad agus dèan ion-phortadh"
-
-#: src/Dialogs.vala:2134
-#, c-format
-msgid "_Import photos from your %s folder"
-msgstr "_Ion-phortaich dealbhan on phasgan %s agad"
-
-#: src/Dialogs.vala:2141
-msgid "You can also import photos in any of these ways:"
-msgstr ""
-"’S urrainn dhut dealbhan ion-phortadh air gin dhe na dòighean seo leanas "
-"cuideachd:"
-
-#: src/Dialogs.vala:2152
-#| msgid "_Don't show this message again"
-msgid "_Don’t show this message again"
-msgstr "_Na seall an teachdaireachd seo a-rithist"
-
-#: src/Dialogs.vala:2189
-#, c-format
-msgid "Import photos from your %s library"
-msgstr "Ion-phortaich dealbhan on leabhar-lann %s agad"
-
-#. 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 of help: URIs.
-#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
-msgid "(Help)"
-msgstr "(Cobhair)"
-
-#: src/Dialogs.vala:2346
-#, c-format
-msgid "Year%sMonth%sDay"
-msgstr "Bliadhna%sMìos%sLatha"
-
-#: src/Dialogs.vala:2348
-#, c-format
-msgid "Year%sMonth"
-msgstr "Bliadhna%sMìos"
-
-#: src/Dialogs.vala:2350
-#, c-format
-msgid "Year%sMonth-Day"
-msgstr "Bliadhna%sMìos-Latha"
-
-#: src/Dialogs.vala:2352
-msgid "Year-Month-Day"
-msgstr "Bliadhna-Mìos-Latha"
-
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
-msgid "Custom"
-msgstr "Gnàthaichte"
-
-#. Invalid pattern.
-#: src/Dialogs.vala:2590
-msgid "Invalid pattern"
-msgstr "Pàtran mì-dhligheach"
-
 #. 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:2692
-msgid ""
-"Shotwell can copy the photos into your library folder or it can import them "
-"without copying."
-msgstr ""
-"’S urrainn dha Shotwell lethbhreacan dhe na dealbhan a chur do phasgan na "
-"leabhar-lainn agad no an ion-phortadh gun a bhith a’ dèanamh lethbhreacan "
-"dhiubh."
+#: src/Dialogs.vala:921
+msgid "Shotwell can copy the photos into your library folder or it can import them without copying."
+msgstr "’S urrainn dha Shotwell lethbhreacan dhe na dealbhan a chur do phasgan na leabhar-lainn agad no an 
ion-phortadh gun a bhith a’ dèanamh lethbhreacan dhiubh."
 
-#: src/Dialogs.vala:2697
+#: src/Dialogs.vala:926
 msgid "Co_py Photos"
 msgstr "Dèan le_thbhreacan dhe na dealbhan"
 
-#: src/Dialogs.vala:2698
+#: src/Dialogs.vala:927
 msgid "_Import in Place"
 msgstr "_Ion-phortaich ’na àite"
 
-#: src/Dialogs.vala:2699
+#: src/Dialogs.vala:928
 msgid "Import to Library"
 msgstr "Ion-phortaich dhan leabhar-lann"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:938 src/PhotoPage.vala:2897
 msgid "Remove From Library"
 msgstr "Thoir air falbh on leabhar-lann"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:939 src/PhotoPage.vala:2897
 msgid "Removing Photo From Library"
 msgstr "A’ toirt air falbh an deilbh on leabhar-lann"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:939
 msgid "Removing Photos From Library"
 msgstr "A’ toirt air falbh dealbhan on leabhar-lann"
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:953
 #, 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."
 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] ""
-"Bheir seo air falbh %d dealbh/video o leabhar-lann Shotwell agad. A bheil "
-"thu airson a ghluasad dhan sgudal air an deasg agad cuideachd?\n"
+"Bheir seo air falbh %d dealbh/video o leabhar-lann Shotwell agad. A bheil thu airson a ghluasad dhan sgudal 
air an deasg agad cuideachd?\n"
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 msgstr[1] ""
-"Bheir seo air falbh %d dhealbh/video o leabhar-lann Shotwell agad. A bheil "
-"thu airson an gluasad dhan sgudal air an deasg agad cuideachd?\n"
+"Bheir seo air falbh %d dhealbh/video o leabhar-lann Shotwell agad. A bheil thu airson an gluasad dhan 
sgudal air an deasg agad cuideachd?\n"
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 msgstr[2] ""
-"Bheir seo air falbh %d dealbhan/video o leabhar-lann Shotwell agad. A bheil "
-"thu airson an gluasad dhan sgudal air an deasg agad cuideachd?\n"
+"Bheir seo air falbh %d dealbhan/video o leabhar-lann Shotwell agad. A bheil thu airson an gluasad dhan 
sgudal air an deasg agad cuideachd?\n"
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 msgstr[3] ""
-"Bheir seo air falbh %d dealbh/video o leabhar-lann Shotwell agad. A bheil "
-"thu airson an gluasad dhan sgudal air an deasg agad cuideachd?\n"
+"Bheir seo air falbh %d dealbh/video o leabhar-lann Shotwell agad. A bheil thu airson an gluasad dhan sgudal 
air an deasg agad cuideachd?\n"
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:957
 #, 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."
 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] ""
-"Bheir seo air falbh %d video o leabhar-lann Shotwell agad. A bheil thu "
-"airson an gluasad dhan sgudal air an deasg agad cuideachd?\n"
+"Bheir seo air falbh %d video o leabhar-lann Shotwell agad. A bheil thu airson an gluasad dhan sgudal air an 
deasg agad cuideachd?\n"
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 msgstr[1] ""
-"Bheir seo air falbh %d video o leabhar-lann Shotwell agad. A bheil thu "
-"airson an gluasad dhan sgudal air an deasg agad cuideachd?\n"
+"Bheir seo air falbh %d video o leabhar-lann Shotwell agad. A bheil thu airson an gluasad dhan sgudal air an 
deasg agad cuideachd?\n"
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 msgstr[2] ""
-"Bheir seo air falbh %d videothan o leabhar-lann Shotwell agad. A bheil thu "
-"airson an gluasad dhan sgudal air an deasg agad cuideachd?\n"
+"Bheir seo air falbh %d videothan o leabhar-lann Shotwell agad. A bheil thu airson an gluasad dhan sgudal 
air an deasg agad cuideachd?\n"
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 msgstr[3] ""
-"Bheir seo air falbh %d video o leabhar-lann Shotwell agad. A bheil thu "
-"airson an gluasad dhan sgudal air an deasg agad cuideachd?\n"
+"Bheir seo air falbh %d video o leabhar-lann Shotwell agad. A bheil thu airson an gluasad dhan sgudal air an 
deasg agad cuideachd?\n"
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:961
 #, 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."
 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] ""
-"Bheir seo air falbh %d dealbh o leabhar-lann Shotwell agad. A bheil thu "
-"airson an gluasad dhan sgudal air an deasg agad cuideachd?\n"
+"Bheir seo air falbh %d dealbh o leabhar-lann Shotwell agad. A bheil thu airson an gluasad dhan sgudal air 
an deasg agad cuideachd?\n"
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 msgstr[1] ""
-"Bheir seo air falbh %d dhealbh o leabhar-lann Shotwell agad. A bheil thu "
-"airson an gluasad dhan sgudal air an deasg agad cuideachd?\n"
+"Bheir seo air falbh %d dhealbh o leabhar-lann Shotwell agad. A bheil thu airson an gluasad dhan sgudal air 
an deasg agad cuideachd?\n"
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 msgstr[2] ""
-"Bheir seo air falbh %d dealbhan o leabhar-lann Shotwell agad. A bheil thu "
-"airson an gluasad dhan sgudal air an deasg agad cuideachd?\n"
+"Bheir seo air falbh %d dealbhan o leabhar-lann Shotwell agad. A bheil thu airson an gluasad dhan sgudal air 
an deasg agad cuideachd?\n"
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 msgstr[3] ""
-"Bheir seo air falbh %d dealbh o leabhar-lann Shotwell agad. A bheil thu "
-"airson an gluasad dhan sgudal air an deasg agad cuideachd?\n"
+"Bheir seo air falbh %d dealbh o leabhar-lann Shotwell agad. A bheil thu airson an gluasad dhan sgudal air 
an deasg agad cuideachd?\n"
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:993
 #, 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?"
-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] ""
-"Cha ghabh an %d dealbh no video seo a ghluasad dhan sgudal air an deasg. A "
-"bheil thu airson a sguabadh às?"
-msgstr[1] ""
-"Cha ghabh an %d dhealbh no video seo a ghluasad dhan sgudal air an deasg. A "
-"bheil thu airson an sguabadh às?"
-msgstr[2] ""
-"Cha ghabh na %d dealbhan no videothan seo a ghluasad dhan sgudal air an "
-"deasg. A bheil thu airson an sguabadh às?"
-msgstr[3] ""
-"Cha ghabh na %d dealbh no video seo a ghluasad dhan sgudal air an deasg. A "
-"bheil thu airson an sguabadh às?"
+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] "Cha ghabh an %d dealbh no video seo a ghluasad dhan sgudal air an deasg. A bheil thu airson a 
sguabadh às?"
+msgstr[1] "Cha ghabh an %d dhealbh no video seo a ghluasad dhan sgudal air an deasg. A bheil thu airson an 
sguabadh às?"
+msgstr[2] "Cha ghabh na %d dealbhan no videothan seo a ghluasad dhan sgudal air an deasg. A bheil thu airson 
an sguabadh às?"
+msgstr[3] "Cha ghabh na %d dealbh no video seo a ghluasad dhan sgudal air an deasg. A bheil thu airson an 
sguabadh às?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2781
+#: src/Dialogs.vala:1010
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4393,255 +3353,474 @@ msgstr ""
 "Chan urrainn dhuinn an dealbh a chlò-bhualadh\n"
 "%s"
 
-#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
-msgid "_Save"
-msgstr "_Sàbhail"
+#: src/direct/DirectPhotoPage.vala:322 src/Resources.vala:145 ui/direct.ui:8 ui/textentrydialog.ui:33
+msgid "_Save"
+msgstr "_Sàbhail"
+
+#: src/direct/DirectPhotoPage.vala:322
+msgid "_Save a Copy"
+msgstr "_Sàbhail lethbhreac dheth"
+
+#: src/direct/DirectPhotoPage.vala:325
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "A bheil thu airson na dh’atharraich thu air %s a chall?"
+
+#: src/direct/DirectPhotoPage.vala:326
+msgid "Close _without Saving"
+msgstr "Dùin _gun a shàbhaladh"
+
+#: src/direct/DirectPhotoPage.vala:359
+#, c-format
+msgid "Error while saving to %s: %s"
+msgstr "Thachair mearachd fhad ’s a bha sinn a’ sàbhaladh ann an %s: %s"
+
+#: src/direct/DirectPhotoPage.vala:389 src/direct/DirectPhotoPage.vala:410
+msgid "Save As"
+msgstr "Sàbhail mar"
+
+#. verify this is a directory
+#: src/DirectoryMonitor.vala:891
+#, c-format
+msgid "Unable to monitor %s: Not a directory (%s)"
+msgstr "Chan urrainn dhuinn sùil a chumail air %s: Chan e pasgan a tha ann(%s)"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:78
+msgid "AM"
+msgstr "m"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:79
+msgid "PM"
+msgstr "f"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:80
+msgid "24 Hr"
+msgstr "Cleoc nan 24 uairean"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:95
+msgid "_Shift photos/videos by the same amount"
+msgstr "_Gluais na dealbhan/videothan an aon astar"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:100
+msgid "Set _all photos/videos to this time"
+msgstr "Cleachd _an t-àm seo airson gach dealbh/video"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:106
+msgid "_Modify original photo file"
+msgid_plural "_Modify original photo files"
+msgstr[0] "_Atharraich faidhle tùsail an deilbh"
+msgstr[1] "_Atharraich faidhlichean tùsail an deilbh"
+msgstr[2] "_Atharraich faidhlichean tùsail an deilbh"
+msgstr[3] "_Atharraich faidhlichean tùsail an deilbh"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:110
+msgid "_Modify original file"
+msgid_plural "_Modify original files"
+msgstr[0] "_Atharraich am faidhle tùsail"
+msgstr[1] "_Atharraich na faidhlichean tùsail"
+msgstr[2] "_Atharraich na faidhlichean tùsail"
+msgstr[3] "_Atharraich na faidhlichean tùsail"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:219
+msgid "Original: "
+msgstr "Am feat tùsail: "
+
+#: src/dialogs/AdjustDateTimeDialog.vala:220
+msgid "%m/%d/%Y, %H:%M:%S"
+msgstr "%d/%m/%Y, %H:%M:%S"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:221
+msgid "%m/%d/%Y, %I:%M:%S %p"
+msgstr "%d/%m/%Y, %I:%M:%S %p"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:312
+#, c-format
+msgid ""
+"Exposure time will be shifted forward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Thèid àm an deisearais a ghluasad air adhart le\n"
+"%d %s, %d %s, %d %s agus %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:313
+#, c-format
+msgid ""
+"Exposure time will be shifted backward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Thèid àm an deisearais a ghluasad air ais le\n"
+"%d %s, %d %s, %d %s agus %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:315
+msgid "day"
+msgid_plural "days"
+msgstr[0] "latha"
+msgstr[1] "latha"
+msgstr[2] "làithean"
+msgstr[3] "latha"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:316
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "uair"
+msgstr[1] "uairean"
+msgstr[2] "uairean a thìde"
+msgstr[3] "uair a thìde"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:317
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "mhionaid"
+msgstr[1] "mhionaid"
+msgstr[2] "mionaidean"
+msgstr[3] "mionaid"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:318
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "diog"
+msgstr[1] "dhiog"
+msgstr[2] "diogan"
+msgstr[3] "diog"
+
+#. "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/ExportDialog.vala:15
+msgid "Unmodified"
+msgstr "Gun atharrachadh"
+
+#: src/dialogs/ExportDialog.vala:16
+msgid "Current"
+msgstr "Làithreach"
+
+#. layout controls
+#: src/dialogs/ExportDialog.vala:90
+msgid "_Format:"
+msgstr "_Fòrmat:"
+
+#: src/dialogs/ExportDialog.vala:93
+msgid "_Quality:"
+msgstr "_Càileachd:"
+
+#: src/dialogs/ExportDialog.vala:96
+msgid "_Scaling constraint:"
+msgstr "_Bacadh sgèilidh:"
+
+#: src/dialogs/ExportDialog.vala:99
+msgid "_Pixels:"
+msgstr "_Piogsailean:"
+
+#: src/dialogs/ExportDialog.vala:103
+msgid "Export _metadata:"
+msgstr "Às-phortaich am _meata-dàta:"
+
+#. 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 of help: URIs.
+#: src/dialogs/Preferences.vala:108 src/dialogs/Preferences.vala:112
+msgid "(Help)"
+msgstr "(Cobhair)"
+
+#: src/dialogs/Preferences.vala:116
+#, c-format
+msgid "Year%sMonth%sDay"
+msgstr "Bliadhna%sMìos%sLatha"
+
+#: src/dialogs/Preferences.vala:118
+#, c-format
+msgid "Year%sMonth"
+msgstr "Bliadhna%sMìos"
+
+#: src/dialogs/Preferences.vala:120
+#, c-format
+msgid "Year%sMonth-Day"
+msgstr "Bliadhna%sMìos-Latha"
+
+#: src/dialogs/Preferences.vala:122
+msgid "Year-Month-Day"
+msgstr "Bliadhna-Mìos-Latha"
+
+#: src/dialogs/Preferences.vala:123 src/editing_tools/EditingTools.vala:760
+msgid "Custom"
+msgstr "Gnàthaichte"
+
+#. Invalid pattern.
+#: src/dialogs/Preferences.vala:351
+msgid "Invalid pattern"
+msgstr "Pàtran mì-dhligheach"
+
+#: src/dialogs/ProgressDialog.vala:97
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:49
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d diog"
+msgstr[1] "%d dhiog"
+msgstr[2] "%d diogan"
+msgstr[3] "%d diog"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:52
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d mhionaid"
+msgstr[1] "%d mhionaid"
+msgstr[2] "%d mionaidean"
+msgstr[3] "%d mionaid"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:56
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d uair a thìde"
+msgstr[1] "%d uair a thìde"
+msgstr[2] "%d uairean a thìde"
+msgstr[3] "%d uair a thìde"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:59
+msgid "1 day"
+msgstr "1 latha"
+
+#: src/dialogs/WelcomeDialog.vala:35
+msgid "Welcome!"
+msgstr "Fàilte!"
+
+#: src/dialogs/WelcomeDialog.vala:42
+msgid "Welcome to Shotwell!"
+msgstr "Fàilte gu Shotwell!"
 
-#: src/direct/DirectPhotoPage.vala:316
-msgid "_Save a Copy"
-msgstr "_Sàbhail lethbhreac dheth"
+#: src/dialogs/WelcomeDialog.vala:47
+msgid "To get started, import photos in any of these ways:"
+msgstr "Dèan toiseach tòiseachaidh is ion-phortaich dealbhan air gin dhe na dòighean a leanas:"
 
-#: src/direct/DirectPhotoPage.vala:319
+#: src/dialogs/WelcomeDialog.vala:67
 #, c-format
-msgid "Lose changes to %s?"
-msgstr "A bheil thu airson na dh’atharraich thu air %s a chall?"
+msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
+msgstr "Tagh <span weight=\"bold\">Ion-phortadh faidhle %s o phasgan</span>"
 
-#: src/direct/DirectPhotoPage.vala:320
-msgid "Close _without Saving"
-msgstr "Dùin _gun a shàbhaladh"
+#: src/dialogs/WelcomeDialog.vala:68
+msgid "Drag and drop photos onto the Shotwell window"
+msgstr "Slaod is leig às dealbhan air uinneag Shotwell"
+
+#: src/dialogs/WelcomeDialog.vala:69
+msgid "Connect a camera to your computer and import"
+msgstr "Ceangail camara ris a’ choimpiutair agad agus dèan ion-phortadh"
 
-#: src/direct/DirectPhotoPage.vala:353
+#: src/dialogs/WelcomeDialog.vala:80
 #, c-format
-msgid "Error while saving to %s: %s"
-msgstr "Thachair mearachd fhad ’s a bha sinn a’ sàbhaladh ann an %s: %s"
+msgid "_Import photos from your %s folder"
+msgstr "_Ion-phortaich dealbhan on phasgan %s agad"
 
-#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404
-msgid "Save As"
-msgstr "Sàbhail mar"
+#: src/dialogs/WelcomeDialog.vala:87
+msgid "You can also import photos in any of these ways:"
+msgstr "’S urrainn dhut dealbhan ion-phortadh air gin dhe na dòighean seo leanas cuideachd:"
 
-#. verify this is a directory
-#: src/DirectoryMonitor.vala:889
+#: src/dialogs/WelcomeDialog.vala:98
+msgid "_Don’t show this message again"
+msgstr "_Na seall an teachdaireachd seo a-rithist"
+
+#: src/dialogs/WelcomeDialog.vala:135
 #, c-format
-msgid "Unable to monitor %s: Not a directory (%s)"
-msgstr "Chan urrainn dhuinn sùil a chumail air %s: Chan e pasgan a tha ann(%s)"
+msgid "Import photos from your %s library"
+msgstr "Ion-phortaich dealbhan on leabhar-lann %s agad"
 
-#: src/editing_tools/EditingTools.vala:666
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Till do mheudachd an deilbh làithrich"
 
-#: src/editing_tools/EditingTools.vala:669
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Suidhich bearradh an deilbh seo"
 
-#: src/editing_tools/EditingTools.vala:681
+#: src/editing_tools/EditingTools.vala:659
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
-msgstr ""
-"Cuairtich an ceart-cheàrnach bearraidh eadar comhair portraid is dreach-tìre"
+msgstr "Cuairtich an ceart-cheàrnach bearraidh eadar comhair portraid is dreach-tìre"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "Gun chuingeachadh"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Ceàrnagach"
 
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Sgrìn"
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736 src/editing_tools/EditingTools.vala:739 
src/editing_tools/EditingTools.vala:749 src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:759
-#| msgid "SD Video (4 : 3)"
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD Video (4 ∶ 3)"
 
-#: src/editing_tools/EditingTools.vala:760
-#| msgid "HD Video (16 : 9)"
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD Video (16 ∶ 9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
-#| msgid "Wallet (2 x 3 in.)"
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Meud sporain (2 × 3 òirlich)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
-#| msgid "Notecard (3 x 5 in.)"
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Cairt-nòta (3 × 5 òirlich)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
-#| msgid "4 x 6 in."
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
-msgstr "4 × 6 òirlich"
+msgstr "4 × 6 òirl."
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
-#| msgid "5 x 7 in."
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
-msgstr "5 × 7 òirlich"
+msgstr "5 × 7 òirl."
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
-#| msgid "8 x 10 in."
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
-msgstr "8 × 10 òirlich"
+msgstr "8 × 10 òirl."
 
-#: src/editing_tools/EditingTools.vala:767
-#| msgid "Letter (8.5 x 11 in.)"
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Litir (8.5 × 11 òirlich)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
-#| msgid "11 x 14 in."
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
-msgstr "11 × 14 òirlich"
+msgstr "11 × 14 òirl."
 
-#: src/editing_tools/EditingTools.vala:769
-#| msgid "Tabloid (11 x 17 in.)"
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11 × 17 òirlich)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
-#| msgid "16 x 20 in."
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
-msgstr "16 × 20 òirlich"
+msgstr "16 × 20 òirl."
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
-#| msgid "Metric Wallet (9 x 13 cm)"
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Meud sporain (meatrach, 9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
-#| msgid "Postcard (10 x 15 cm)"
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Cairt-phuist (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
-#| msgid "13 x 18 cm"
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
-#| msgid "18 x 24 cm"
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:776
-#| msgid "A4 (210 x 297 mm)"
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
-#| msgid "20 x 30 cm"
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
-#| msgid "24 x 40 cm"
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
-#| msgid "30 x 40 cm"
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:780
-#| msgid "A3 (297 x 420 mm)"
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:402
 msgid "Size:"
 msgstr "Meud:"
 
-#: src/editing_tools/EditingTools.vala:1895
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Dùin inneal nan sùilean dearga"
 
-#: src/editing_tools/EditingTools.vala:1898
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Thoir air falbh sùil dhearg sam bith san raon a thagh thu"
 
-#: src/editing_tools/EditingTools.vala:2238
-#: src/editing_tools/StraightenTool.vala:102
+#: src/editing_tools/EditingTools.vala:2216 src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Ath-shuidhich"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
-#: src/Properties.vala:443 src/Properties.vala:450
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:443 src/Properties.vala:447 
src/Properties.vala:454
 msgid "Exposure:"
 msgstr "Deisearas:"
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "Iomsgaradh:"
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Sàthachd:"
 
-#: src/editing_tools/EditingTools.vala:2279
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Tuar:"
 
-#: src/editing_tools/EditingTools.vala:2289
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Teothachd:"
 
-#: src/editing_tools/EditingTools.vala:2298
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Sgàilean:"
 
-#: src/editing_tools/EditingTools.vala:2307
+#. FIXME: Hack to make the slider the same length as the other. Find out why it is aligned
+#. Differently (probably because it only has positive values)
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Highlights:"
 msgstr "Soillseachadh:"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset Colors"
 msgstr "Ath-shuidhich na dathan"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset all color adjustments to original"
 msgstr "Ath-shuidhich gach rèiteachadh datha gu roghainn thùsail aige"
 
-#: src/editing_tools/EditingTools.vala:2722
+#: src/editing_tools/EditingTools.vala:2703
 msgid "Temperature"
 msgstr "Teothachd"
 
-#: src/editing_tools/EditingTools.vala:2734
+#: src/editing_tools/EditingTools.vala:2715
 msgid "Tint"
 msgstr "Tuar"
 
-#: src/editing_tools/EditingTools.vala:2746
-#| msgid "Contrast Expansion"
+#: src/editing_tools/EditingTools.vala:2727
 msgid "Contrast"
 msgstr "Iomsgaradh"
 
-#: src/editing_tools/EditingTools.vala:2760
+#: src/editing_tools/EditingTools.vala:2741
 msgid "Saturation"
 msgstr "Sàthachd"
 
-#: src/editing_tools/EditingTools.vala:2773
+#: src/editing_tools/EditingTools.vala:2754
 msgid "Exposure"
 msgstr "Deisearas"
 
-#: src/editing_tools/EditingTools.vala:2786
+#: src/editing_tools/EditingTools.vala:2767
 msgid "Shadows"
 msgstr "Sgàilean"
 
-#: src/editing_tools/EditingTools.vala:2799
+#: src/editing_tools/EditingTools.vala:2780
 msgid "Highlights"
 msgstr "Soillseachadh"
 
-#: src/editing_tools/EditingTools.vala:2809
+#: src/editing_tools/EditingTools.vala:2790
 msgid "Contrast Expansion"
 msgstr "Leudachadh an iomsgaraidh"
 
@@ -4649,16 +3828,11 @@ msgstr "Leudachadh an iomsgaraidh"
 msgid "Angle:"
 msgstr "Ceàrn:"
 
-#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:203
-#: ui/direct.ui:144 ui/photo.ui:233
+#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:172 ui/direct.ui:144 ui/photo.ui:233
 msgid "_Straighten"
 msgstr "_Dèan dìreach"
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Tachartasan"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
@@ -4667,7 +3841,7 @@ msgstr[1] "%d dhealbh/video"
 msgstr[2] "%d dealbhan/videothan"
 msgstr[3] "%d dealbh/video"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#: src/events/EventDirectoryItem.vala:99 src/Properties.vala:362
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
@@ -4676,7 +3850,7 @@ msgstr[1] "%d video"
 msgstr[2] "%d videothan"
 msgstr[3] "%d video"
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:360
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
@@ -4689,28 +3863,35 @@ msgstr[3] "%d dealbh"
 msgid "No Event"
 msgstr "Chan eil tachartas ann"
 
-#: src/events/EventsDirectoryPage.vala:150
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Tachartasan"
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr ""
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "Chan eil tachartas sam bith ann"
 
-#: src/events/EventsDirectoryPage.vala:154
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "Cha deach tachartas sam bith a lorg"
 
-#: src/events/EventsDirectoryPage.vala:227
-#| msgid "Events"
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "A h-uile tachartas"
 
-#: src/events/EventsDirectoryPage.vala:241
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Gun cheann-là"
 
-#: src/events/EventsDirectoryPage.vala:242
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:243
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
@@ -4731,11 +3912,8 @@ msgstr "Ag às-phortadh"
 
 #: src/Exporter.vala:317
 #, c-format
-#| msgid "File %s already exists.  Replace?"
 msgid "File %s already exists. Replace?"
-msgstr ""
-"Tha am faidhle %s ann mu thràth. A bheil thu airson am fear ùr a chur ’na "
-"àite?"
+msgstr "Tha am faidhle %s ann mu thràth. A bheil thu airson am fear ùr a chur ’na àite?"
 
 #: src/Exporter.vala:319
 msgid "_Skip"
@@ -4753,30 +3931,100 @@ msgstr "Cuir an àite n_a h-uile"
 msgid "Export"
 msgstr "Às-phortaich"
 
-#: src/folders/Branch.vala:144
+#: src/faces/FacesBranch.vala:89 src/Resources.vala:304 src/Resources.vala:305 ui/faces.ui:403
+msgid "Faces"
+msgstr ""
+
+#: src/faces/FacesTool.vala:115
+msgid "Detect faces…"
+msgstr ""
+
+#: src/faces/FacesTool.vala:140
+#, fuzzy
+#| msgid "Set the crop for this photo"
+msgid "Detect faces on this photo"
+msgstr "Suidhich bearradh an deilbh seo"
+
+#: src/faces/FacesTool.vala:142
+msgid "Cancel face detection"
+msgstr ""
+
+#: src/faces/FacesTool.vala:146
+msgid "Close the Faces tool without saving changes"
+msgstr ""
+
+#: src/faces/FacesTool.vala:153 src/faces/FacesTool.vala:185
+msgid "Click and drag to tag a face"
+msgstr ""
+
+#: src/faces/FacesTool.vala:180
+#, c-format
+msgid "Click to edit face <i>%s</i>"
+msgstr ""
+
+#: src/faces/FacesTool.vala:189
+msgid "Stop dragging to add your face and name it."
+msgstr ""
+
+#: src/faces/FacesTool.vala:193
+msgid "Type a name for this face, then press Enter"
+msgstr ""
+
+#: src/faces/FacesTool.vala:197
+msgid "Move or modify the face shape or name and press Enter"
+msgstr ""
+
+#: src/faces/FacesTool.vala:201
+#, fuzzy
+#| msgid "Settings"
+msgid "Detecting faces"
+msgstr "Roghainnean"
+
+#: src/faces/FacesTool.vala:212
+msgid "If you don’t set the name of unknown faces they won’t be saved."
+msgstr ""
+
+#: src/faces/FacesTool.vala:233
+msgid "Save changes and close the Faces tool"
+msgstr ""
+
+#: src/faces/FacesTool.vala:235
+#, fuzzy
+#| msgid "Lose changes to %s?"
+msgid "No changes to save"
+msgstr "A bheil thu airson na dh’atharraich thu air %s a chall?"
+
+#: src/faces/FacesTool.vala:956
+msgid "Error trying to spawn face detection program:\n"
+msgstr ""
+
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Pasganan"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
-msgid "Library"
-msgstr "Leabhar-lann"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr ""
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
-msgid "Photos"
-msgstr "Dealbhan"
+#: src/import-roll/ImportRollBranch.vala:43
+#, fuzzy
+#| msgid "_Import"
+msgid "Imports"
+msgstr "_Ion-phortaich"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
-#: src/SearchFilter.vala:1103
+#: src/import-roll/ImportRollBranch.vala:43
+msgid "Browse the library’s import history"
+msgstr ""
+
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1124 src/SearchFilter.vala:1125
 msgid "Flagged"
 msgstr "Le bratach"
 
 #: src/library/ImportQueuePage.vala:8
-#| msgid "Importing"
 msgid "Importing…"
 msgstr "’Ga ion-phortadh…"
 
 #: src/library/ImportQueuePage.vala:129
-#| msgid "Preparing to import"
 msgid "Preparing to import…"
 msgstr "Ag ullachadh airson ion-phortadh…"
 
@@ -4789,64 +4037,74 @@ msgstr "Chaidh %s ion-phortadh"
 msgid "Last Import"
 msgstr "An t-ion-phortadh mu dheireadh"
 
-#: src/library/LibraryWindow.vala:507
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:127 ui/preferences_dialog.ui:465
+msgid "Library"
+msgstr "Leabhar-lann"
+
+#: src/library/LibraryBranch.vala:30
+#, fuzzy
+#| msgid "Organize your photos"
+msgid "Organize and browse your photos"
+msgstr "Cuir rian air na dealbhan agad"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1105
+msgid "Photos"
+msgstr "Dealbhan"
+
+#: src/library/LibraryWindow.vala:528
 msgid "Import From Folder"
 msgstr "Ion-phortaich o phasgan"
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:535
+msgid "Recurse Into Subfolders"
+msgstr ""
+
+#: src/library/LibraryWindow.vala:603 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Falamhaich an sgudal"
 
-#: src/library/LibraryWindow.vala:576
-#| msgid "Emptying Trash..."
+#: src/library/LibraryWindow.vala:603
 msgid "Emptying Trash…"
 msgstr "A’ falamhachadh an sgudail…"
 
-#: src/library/LibraryWindow.vala:772
+#: src/library/LibraryWindow.vala:782
 #, 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 ""
-"Chaidh Shotwell a rèiteachadh ach an dèan a ion-phortadh nan dealbhan dhan "
-"phasgan dhachaigh agad.\n"
-"Mholamaid gun atharraich thu seo ann an <span weight=\"bold\">Deasaich "
-"roghainnean %s</span>.\n"
+"Chaidh Shotwell a rèiteachadh ach an dèan a ion-phortadh nan dealbhan dhan phasgan dhachaigh agad.\n"
+"Mholamaid gun atharraich thu seo ann an <span weight=\"bold\">Deasaich roghainnean %s</span>.\n"
 "A bheil thu airson leantainn air adhart le ion-phortachadh nan dealbhan?"
 
-#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:785 ui/preferences_dialog.ui:86
 msgid "Library Location"
 msgstr "Ionad na leabhar-lainn"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
+#: src/library/LibraryWindow.vala:798
 msgid "Photos cannot be imported from this directory."
 msgstr "Cha ghabh dealbhan ion-phortadh on phasgan seo."
 
-#: src/library/LibraryWindow.vala:1068
+#: src/library/LibraryWindow.vala:1078
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
-#| msgid "Updating library..."
+#: src/library/LibraryWindow.vala:1122 src/library/LibraryWindow.vala:1133
 msgid "Updating library…"
 msgstr "Ag ùrachadh na leabhar-lainn…"
 
-#: src/library/LibraryWindow.vala:1129
-#| msgid "Preparing to auto-import photos..."
+#: src/library/LibraryWindow.vala:1139
 msgid "Preparing to auto-import photos…"
 msgstr "Ag ullachadh airson ion-phortadh gu fèin-obrach de dhealbhan…"
 
-#: src/library/LibraryWindow.vala:1134
-#| msgid "Auto-importing photos..."
+#: src/library/LibraryWindow.vala:1144
 msgid "Auto-importing photos…"
 msgstr "Ag ion-phortadh nan dealbhan gu fèin-obrachail…"
 
-#: src/library/LibraryWindow.vala:1142
-#| msgid "Writing metadata to files..."
+#: src/library/LibraryWindow.vala:1152
 msgid "Writing metadata to files…"
 msgstr "A’ sgrìobhadh am meata-dàta sna faidhlichean…"
 
@@ -4855,7 +4113,6 @@ msgid "Missing Files"
 msgstr "Faidhlichean a tha a dhìth"
 
 #: src/library/OfflinePage.vala:110
-#| msgid "Deleting..."
 msgid "Deleting…"
 msgstr "’Ga sguabadh às…"
 
@@ -4863,126 +4120,86 @@ msgstr "’Ga sguabadh às…"
 msgid "Trash"
 msgstr "An sgudal"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "Tha an sgudal falamh"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110 ui/faces.ui:469
 msgid "Delete"
 msgstr "Sguab às"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "A’ sguabadh às nan dealbhan"
 
 #: 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."
-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 ""
-"Chan eil leabhar-lann nan dealbhan agad co-chòrdail leis an tionndadh seo de "
-"Shotwell. Tha coltas gun deach a chruthachadh le Shotwell %s (sgeama %d). "
-"Seo tionndadh %s (sgeama %d). Nach cleachd thu an tionndadh às ùire de "
-"Shotwell?"
+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 "Chan eil leabhar-lann nan dealbhan agad co-chòrdail leis an tionndadh seo de Shotwell. Tha coltas 
gun deach a chruthachadh le Shotwell %s (sgeama %d). Seo tionndadh %s (sgeama %d). Nach cleachd thu an 
tionndadh às ùire de 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"
-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 ""
-"Cha b’ urrainn dha Shotwell leabhar-lann nan dealbhan agad àrdachadh o "
-"thionndadh %s (sgeama %d) gu %s (sgeama %d). Airson barrachd fiosrachaidh, "
-"thoir sùil air an uicipeid aig Shotwell aig %s"
+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 "Cha b’ urrainn dha Shotwell leabhar-lann nan dealbhan agad àrdachadh o thionndadh %s (sgeama %d) gu 
%s (sgeama %d). Airson barrachd fiosrachaidh, thoir sùil air an uicipeid aig Shotwell aig %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."
-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 ""
-"Chan eil leabhar-lann nan dealbh agad co-chòrdail leis an tionndadh seo de "
-"Shotwell. Tha coltas gun deach a chruthachadh le Shotwell %s (sgeama %d). "
-"Seo tionndadh %s (sgeama %d). Glan an leabhar-lann agad - sguab às %s agus "
-"ion-phortaich na dealbhan agad às ùr an uairsin."
+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 "Chan eil leabhar-lann nan dealbh agad co-chòrdail leis an tionndadh seo de Shotwell. Tha coltas gun 
deach a chruthachadh le Shotwell %s (sgeama %d). Seo tionndadh %s (sgeama %d). Glan an leabhar-lann agad - 
sguab às %s agus ion-phortaich na dealbhan agad às ùr an uairsin."
 
 #: src/main.vala:71
 #, c-format
-#| msgid "Unknown error attempting to verify Shotwell's database: %s"
 msgid "Unknown error attempting to verify Shotwell’s database: %s"
-msgstr ""
-"Thachair mearachd nach aithne dhuinn nuair a dh’fheuch sinn ri stòr-dàta "
-"Shotwell a dhearbhadh: %s"
+msgstr "Thachair mearachd nach aithne dhuinn nuair a dh’fheuch sinn ri stòr-dàta Shotwell a dhearbhadh: %s"
 
-#: src/main.vala:104
+#: src/main.vala:108
 msgid "Loading Shotwell"
 msgstr "A’ luchdadh Shotwell"
 
-#: src/main.vala:293
-#| msgid "Path to Shotwell's private data"
+#: src/main.vala:320
 msgid "Path to Shotwell’s private data"
 msgstr "An t-slighe dhan dàta phrìobhaideach aig Shotwell"
 
-#: src/main.vala:293
+#: src/main.vala:320
 msgid "DIRECTORY"
 msgstr "PASGAN"
 
-#: src/main.vala:297
+#: src/main.vala:324
 msgid "Do not monitor library directory at runtime for changes"
-msgstr ""
-"Na cum sùil air pasgan na leabhar-lainn airson atharraichean aig àm ruith"
+msgstr "Na cum sùil air pasgan na leabhar-lainn airson atharraichean aig àm ruith"
 
-#: src/main.vala:301
-#| msgid "Don't display startup progress meter"
+#: src/main.vala:328
 msgid "Don’t display startup progress meter"
 msgstr "Na seall an t-adhartas tòiseachaidh nuair a thòisicheas e"
 
-#: src/main.vala:305
-#| msgid "Show the application's version"
+#: src/main.vala:332
 msgid "Show the application’s version"
 msgstr "Seall tionndadh na h-aplacaid"
 
+#: src/main.vala:336
+msgid "Start the application in fullscreen mode"
+msgstr ""
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:342
+#: src/main.vala:373
 msgid "[FILE]"
 msgstr "[FAIDHLE]"
 
-#: src/main.vala:346
+#: src/main.vala:380
 #, c-format
-#| msgid ""
-#| "Run '%s --help' to see a full list of available command line options.\n"
 msgid "Run “%s --help” to see a full list of available command line options.\n"
-msgstr "Cleachd “%s --help” airson liosta shlàn de roghainnean na loidhne-àithne "
-"fhaicinn a tha ri làimh.\n"
+msgstr "Cleachd “%s --help” airson liosta shlàn de roghainnean na loidhne-àithne fhaicinn a tha ri làimh.\n"
 
 #: src/MediaMonitor.vala:400
 #, c-format
 msgid "Unable to process monitoring updates: %s"
 msgstr "Chan urrainn dhuinn na h-ùrachaidhean marasglaidh a làimhseachadh: %s"
 
-#: src/MediaPage.vala:158
+#: src/MediaPage.vala:76
 msgid "Adjust the size of the thumbnails"
 msgstr "Cuir air gleus meud nan dealbhagan"
 
-#: src/MediaPage.vala:503
+#: src/MediaPage.vala:419
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4991,34 +4208,34 @@ msgstr ""
 "Cha b’ urrainn dha Shotwell a’ video a thagh thu a chluich:\n"
 "%s"
 
-#: src/Page.vala:1318
+#: src/Page.vala:1324
 msgid "No photos/videos"
 msgstr "Chan eil dealbhan/videothan ann"
 
-#: src/Page.vala:1322
+#: src/Page.vala:1328
 msgid "No photos/videos found which match the current filter"
 msgstr ""
 
-#: src/Page.vala:2628
+#: src/Page.vala:2641
 msgid "Photos cannot be exported to this directory."
 msgstr "Cha ghabh dealbhan às-phortadh dhan phasgan seo."
 
 #. previous button
-#: src/PhotoPage.vala:538
+#: src/PhotoPage.vala:550
 msgid "Previous photo"
 msgstr "An dealbh roimhe"
 
 #. next button
-#: src/PhotoPage.vala:544
+#: src/PhotoPage.vala:556
 msgid "Next photo"
 msgstr "An ath-dhealbh"
 
-#: src/PhotoPage.vala:1850
+#: src/PhotoPage.vala:1862
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Tha faidhle bun-tùs an deilbh a dhìth: %s"
 
-#: src/PhotoPage.vala:3018
+#: src/PhotoPage.vala:3041
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Cha ghabh %s às-phortadh: %s"
@@ -5027,6 +4244,10 @@ msgstr "Cha ghabh %s às-phortadh: %s"
 msgid "BMP"
 msgstr "BMP"
 
+#: src/photos/GifSupport.vala:32
+msgid "GIF"
+msgstr ""
+
 #: src/photos/JfifSupport.vala:84
 msgid "JPEG"
 msgstr "JPEG"
@@ -5063,7 +4284,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3755
+#: src/Photo.vala:3767
 msgid "modified"
 msgstr "air atharrachadh"
 
@@ -5100,7 +4321,6 @@ msgid "Image Settings"
 msgstr "Roghainnean an deilbh"
 
 #: src/Printing.vala:864
-#| msgid "Printing..."
 msgid "Printing…"
 msgstr "’Ga chlò-bhualadh…"
 
@@ -5114,19 +4334,19 @@ msgstr ""
 "Chan urrainn dhuinn an dealbh a chlò-bhualadh\n"
 "%s"
 
-#: src/Properties.vala:87
+#: src/Properties.vala:98
 msgid "Today"
 msgstr "An-diugh"
 
-#: src/Properties.vala:89
+#: src/Properties.vala:100
 msgid "Yesterday"
 msgstr "An-dè"
 
-#: src/Properties.vala:346
+#: src/Properties.vala:350
 msgid "Items:"
-msgstr "Nithean"
+msgstr "Nithean:"
 
-#: src/Properties.vala:349
+#: src/Properties.vala:353
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
@@ -5136,107 +4356,103 @@ msgstr[2] "%d tachartasan"
 msgstr[3] "%d tachartas"
 
 #. display only one date if start and end are the same
-#: src/Properties.vala:380
+#: src/Properties.vala:384
 msgid "Date:"
 msgstr "Ceann-là:"
 
 #. display only one time if start and end are the same
-#: src/Properties.vala:384
+#: src/Properties.vala:388
 msgid "Time:"
 msgstr "Àm:"
 
 #. display time range
 #. display date range
-#: src/Properties.vala:387 src/Properties.vala:392
+#: src/Properties.vala:391 src/Properties.vala:396
 msgid "From:"
 msgstr "O:"
 
-#: src/Properties.vala:388 src/Properties.vala:393
+#: src/Properties.vala:392 src/Properties.vala:397
 msgid "To:"
 msgstr "Gu:"
 
-#: src/Properties.vala:407
+#: src/Properties.vala:411
 msgid "Duration:"
 msgstr "Faid:"
 
-#: src/Properties.vala:407
+#: src/Properties.vala:411
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f diogan"
 
-#: src/Properties.vala:411
+#: src/Properties.vala:415
 msgid "Developer:"
 msgstr "Leasaichear:"
 
 #. nothing special to be done for now for Events
-#: src/Properties.vala:586
+#: src/Properties.vala:593
 msgid "Location:"
 msgstr "Ionad:"
 
-#: src/Properties.vala:589
+#: src/Properties.vala:596
 msgid "File size:"
 msgstr "Meud an fhaidhle:"
 
-#: src/Properties.vala:593
+#: src/Properties.vala:600
 msgid "Current Development:"
 msgstr "Obair-leasachaidh làithreach:"
 
-#: src/Properties.vala:595
+#: src/Properties.vala:602
 msgid "Original dimensions:"
 msgstr "Am meud tùsail:"
 
-#: src/Properties.vala:598
+#: src/Properties.vala:605
 msgid "Camera make:"
 msgstr "Brannd a’ chamara:"
 
-#: src/Properties.vala:601
+#: src/Properties.vala:608
 msgid "Camera model:"
 msgstr "Modail a’ chamara:"
 
-#: src/Properties.vala:604
+#: src/Properties.vala:611
 msgid "Flash:"
 msgstr "Solas-boillsgidh:"
 
-#: src/Properties.vala:606
+#: src/Properties.vala:613
 msgid "Focal length:"
 msgstr "Faid an fhòcais:"
 
-#: src/Properties.vala:609
+#: src/Properties.vala:616
 msgid "Exposure date:"
 msgstr "Ceann-là deisearais:"
 
-#: src/Properties.vala:612
+#: src/Properties.vala:619
 msgid "Exposure time:"
-msgstr "Faid an deisearais"
+msgstr "Faid an deisearais:"
 
-#: src/Properties.vala:615
+#: src/Properties.vala:622
 msgid "Exposure bias:"
 msgstr "Bias an deisearais:"
 
-#: src/Properties.vala:617
+#: src/Properties.vala:631
 msgid "GPS latitude:"
 msgstr "Domhan-leud GPS:"
 
-#: src/Properties.vala:620
+#: src/Properties.vala:634
 msgid "GPS longitude:"
 msgstr "Domhan-fhad GPS:"
 
-#: src/Properties.vala:623
+#: src/Properties.vala:637
 msgid "Artist:"
 msgstr "Neach-ealain:"
 
-#: src/Properties.vala:625
+#: src/Properties.vala:639
 msgid "Copyright:"
 msgstr "Còir-lethbhreac:"
 
-#: src/Properties.vala:627
+#: src/Properties.vala:641
 msgid "Software:"
 msgstr "Bathar-bog:"
 
-#: src/Properties.vala:644
-msgid "Extended Information"
-msgstr "Fiosrachadh leudaichte"
-
 #: src/publishing/PublishingPluginHost.vala:11
 msgid "Preparing for upload"
 msgstr "Ag ullachadh airson luchdadh suas"
@@ -5248,22 +4464,16 @@ msgstr "A’ luchdadh suas %d à %d"
 
 #: src/publishing/PublishingPluginHost.vala:81
 #, c-format
-#| msgid "Publishing to %s can't continue because an error occurred:"
 msgid "Publishing to %s can’t continue because an error occurred:"
-msgstr ""
-"Chan urrainn leantainn air adhart leis an fhoillseachadh air %s oir thachair "
-"mearachd:"
+msgstr "Chan urrainn leantainn air adhart leis an fhoillseachadh air %s oir thachair mearachd:"
 
 #: src/publishing/PublishingPluginHost.vala:84
 msgid "To try publishing to another service, select one from the above menu."
-msgstr ""
-"A’ feuchainn ri fhoillseachadh air seirbhis eile, tagh aonan sa chlàr-taice "
-"gu h-àrd."
+msgstr "A’ feuchainn ri fhoillseachadh air seirbhis eile, tagh aonan sa chlàr-taice gu h-àrd."
 
 #. Here, we check whether more than one item is being uploaded, and if so, display
 #. an alternate message.
 #: src/publishing/PublishingUI.vala:104
-#| msgid "The selected video was successfully published."
 msgid "The selected video was successfully published."
 msgid_plural "The selected videos were successfully published."
 msgstr[0] "Chaidh a’ video a thagh thu fhoillseachadh."
@@ -5272,7 +4482,6 @@ msgstr[2] "Chaidh na videothan a thagh thu fhoillseachadh."
 msgstr[3] "Chaidh na videothan a thagh thu fhoillseachadh."
 
 #: src/publishing/PublishingUI.vala:109
-#| msgid "The selected photo was successfully published."
 msgid "The selected photo was successfully published."
 msgid_plural "The selected photos were successfully published."
 msgstr[0] "Chaidh an dealbh a thagh thu fhoillseachadh."
@@ -5285,681 +4494,606 @@ msgid "The selected photos/videos were successfully published."
 msgstr "Chaidh na dealbhan/videothan a thagh thu fhoillseachadh."
 
 #: src/publishing/PublishingUI.vala:127
-#| msgid "Fetching account information..."
 msgid "Fetching account information…"
 msgstr "A’ faighinn fiosrachadh a’ chunntais…"
 
 #: src/publishing/PublishingUI.vala:133
-#| msgid "Logging in..."
 msgid "Logging in…"
 msgstr "’Gad chlàradh a-steach…"
 
-#: src/publishing/PublishingUI.vala:193
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish Photos"
 msgstr "Foillsich na dealbhan"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish photos _to:"
 msgstr "Foillsich na d_ealbhan air:"
 
-#: src/publishing/PublishingUI.vala:196
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish Videos"
 msgstr "Foillsich na videothan"
 
-#: src/publishing/PublishingUI.vala:197
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish videos _to"
 msgstr "Foillsich na videothan _air"
 
-#: src/publishing/PublishingUI.vala:199
+#: src/publishing/PublishingUI.vala:203
 msgid "Publish Photos and Videos"
 msgstr "Foillsich na dealbhan agus videothan"
 
-#: src/publishing/PublishingUI.vala:200
+#: src/publishing/PublishingUI.vala:204
 msgid "Publish photos and videos _to"
 msgstr "Foillsich na dealbhan agus _videothan air"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:410
+#: src/publishing/PublishingUI.vala:414
 msgid "Unable to publish"
 msgstr "Chan urrainn dhuinn foillseachadh"
 
-#: src/publishing/PublishingUI.vala:411
+#: src/publishing/PublishingUI.vala:415
 #, 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 ""
-"Chan urrainn dha Shotwell na nithean a thagh thu fhoillseachadh air sgàth ’s "
-"nach eil plugan foillseachaidh freagarrach an comas agad. Airson seo a chur "
-"ceart, tagh <b>Deasaich roghainnean %s</b> agus cuir an comas co-dhiù aon "
-"phlugan foillseachaidh air an taba <b>Plugain</b>"
+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 "Chan urrainn dha Shotwell na nithean a thagh thu fhoillseachadh air sgàth ’s nach eil plugan 
foillseachaidh freagarrach an comas agad. Airson seo a chur ceart, tagh <b>Deasaich roghainnean %s</b> agus 
cuir an comas co-dhiù aon phlugan foillseachaidh air an taba <b>Plugain</b>."
 
 #: src/publishing/Publishing.vala:16
 msgid "Publishing"
 msgstr "’Ga fhoillseachadh"
 
-#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:151
+#: src/Resources.vala:110 src/Resources.vala:115 ui/collection.ui:151
 msgid "Rotate"
 msgstr "Cuairtich"
 
-#: src/Resources.vala:142
+#: src/Resources.vala:111
 msgid "Rotate Right"
 msgstr "Cuairtich gu deiseil"
 
-#: src/Resources.vala:143 ui/collection.ui:148
+#: src/Resources.vala:112 ui/collection.ui:148
 msgid "Rotate the photos right (press Ctrl to rotate left)"
-msgstr ""
-"Cuairtich na dealbhan gu deiseil (brùth Ctrl gus a chuairteachadh gu "
-"tuathail)"
+msgstr "Cuairtich na dealbhan gu deiseil (brùth Ctrl gus a chuairteachadh gu tuathail)"
 
-#: src/Resources.vala:147
+#: src/Resources.vala:116
 msgid "Rotate Left"
 msgstr "Cuairtich gu tuathail"
 
-#: src/Resources.vala:148
+#: src/Resources.vala:117
 msgid "Rotate the photos left"
 msgstr "Cuairtich na dealbhan gu tuathail"
 
-#: src/Resources.vala:151
+#: src/Resources.vala:120
 msgid "Flip Horizontally"
 msgstr "Thoir flip air a’ chòmhnard"
 
-#: src/Resources.vala:154
+#: src/Resources.vala:123
 msgid "Flip Vertically"
 msgstr "Thoir flip gu h-inghearach"
 
-#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168
-#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421
-#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207
+#: src/Resources.vala:125 ui/direct.ui:192 ui/events_directory.ui:168 ui/event.ui:438 ui/faces.ui:448 
ui/import_queue.ui:83 ui/import.ui:201 ui/manifest_widget.ui:35 ui/media.ui:421 ui/offline.ui:198 
ui/photo.ui:405 ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr "_Mu dhèidhinn"
 
-#: src/Resources.vala:157
+#: src/Resources.vala:126
 msgid "_Apply"
 msgstr "Cuir _an sàs"
 
-#: src/Resources.vala:160 ui/direct.ui:44 ui/events_directory.ui:32
-#: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32
-#: ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37
+#: src/Resources.vala:129 ui/direct.ui:44 ui/events_directory.ui:32 ui/event.ui:47 ui/faces.ui:47 
ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32 ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37
 msgid "_Edit"
 msgstr "D_easaich"
 
-#: src/Resources.vala:161
-#| msgid "_Format:"
+#: src/Resources.vala:130
 msgid "_Forward"
 msgstr "Air a_dhart"
 
-#: src/Resources.vala:162 ui/direct.ui:62 ui/events_directory.ui:125
-#: ui/photo.ui:173
+#: src/Resources.vala:131 ui/direct.ui:62 ui/events_directory.ui:125 ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr "_Làn-sgrìn"
 
-#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176
-#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
-#: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
-#: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
-#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422
-#: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
+#: src/Resources.vala:132 ui/direct.ui:174 ui/direct.ui:177 ui/events_directory.ui:150 
ui/events_directory.ui:153 ui/event.ui:420 ui/event.ui:423 ui/faces.ui:430 ui/faces.ui:433 
ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183 ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 
ui/offline.ui:180 ui/offline.ui:183
+#: ui/photo.ui:387 ui/photo.ui:390 ui/tags.ui:422 ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "_Cobhair"
 
-#: src/Resources.vala:164
+#: src/Resources.vala:133
 msgid "Leave _Fullscreen"
 msgstr "_Fàg an làn-sgrìn"
 
-#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:450
+#: src/Resources.vala:134 src/Resources.vala:342 ui/tags.ui:450
 msgid "_New"
 msgstr "Ù_r"
 
-#: src/Resources.vala:166
-#| msgid "Next"
+#: src/Resources.vala:135
 msgid "_Next"
 msgstr "Ai_r adhart"
 
-#: src/Resources.vala:169 src/Resources.vala:318 ui/events_directory.ui:65
-#: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72
-#: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81
+#: src/Resources.vala:138 src/Resources.vala:287 ui/events_directory.ui:65 ui/event.ui:93 ui/faces.ui:93 
ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72 ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81
 msgid "_Preferences"
 msgstr "_Roghainnean"
 
-#: src/Resources.vala:170
-#| msgid "_Previous Photo"
+#: src/Resources.vala:139
 msgid "_Previous"
 msgstr "_Air ais"
 
-#: src/Resources.vala:172 ui/direct.ui:37 ui/events_directory.ui:25
-#: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40
-#: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30
+#: src/Resources.vala:141 ui/direct.ui:37 ui/events_directory.ui:25 ui/event.ui:40 ui/faces.ui:40 
ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40 ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 
ui/trash.ui:30
 msgid "_Quit"
 msgstr "_Fàg an-seo"
 
-#: src/Resources.vala:173
+#: src/Resources.vala:142
 msgid "_Refresh"
 msgstr "_Ath-nuadhaich"
 
-#: src/Resources.vala:175
-#| msgid "Reverting"
+#: src/Resources.vala:144
 msgid "_Revert"
 msgstr "_Till"
 
-#: src/Resources.vala:177
-#| msgid "Save As"
+#: src/Resources.vala:146
 msgid "Save _As"
 msgstr "Sàbhail _mar"
 
-#: src/Resources.vala:178
-#| msgid "_Ascending"
+#: src/Resources.vala:147
 msgid "Sort _Ascending"
 msgstr "Seòrsaich a’ _dìreadh"
 
-#: src/Resources.vala:179
-#| msgid "D_escending"
+#: src/Resources.vala:148
 msgid "Sort _Descending"
 msgstr "Seòrsaich a’ _teàrnadh"
 
-#: src/Resources.vala:180
+#: src/Resources.vala:149
 msgid "_Stop"
 msgstr "Cuir _stad air"
 
-#: src/Resources.vala:181
-#| msgid "_Delete"
+#: src/Resources.vala:150
 msgid "_Undelete"
 msgstr "_Neo-dhèan an sguabadh às"
 
-#: src/Resources.vala:182
-#| msgid "Original Size"
+#: src/Resources.vala:151
 msgid "_Normal Size"
 msgstr "Meud _abhàisteach"
 
-#: src/Resources.vala:183
+#: src/Resources.vala:152
 msgid "Best _Fit"
 msgstr "_Meud as fhearr"
 
-#: src/Resources.vala:184 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
-#: ui/photo.ui:144 ui/tags.ui:260
+#: src/Resources.vala:153 ui/direct.ui:69 ui/event.ui:260 ui/faces.ui:260 ui/media.ui:260 ui/photo.ui:144 
ui/tags.ui:260
 msgid "Zoom _In"
 msgstr "Sù_m a-steach"
 
-#: src/Resources.vala:185 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
-#: ui/photo.ui:149 ui/tags.ui:265
+#: src/Resources.vala:154 ui/direct.ui:74 ui/event.ui:265 ui/faces.ui:265 ui/media.ui:265 ui/photo.ui:149 
ui/tags.ui:265
 msgid "Zoom _Out"
 msgstr "Sùm _a-mach"
 
-#: src/Resources.vala:188 ui/collection.ui:167
+#: src/Resources.vala:157 ui/collection.ui:167
 msgid "Enhance"
 msgstr "Leasaich"
 
-#: src/Resources.vala:189 ui/collection.ui:164
-#| msgid "Automatically improve the photo's appearance"
+#: src/Resources.vala:158 ui/collection.ui:164
 msgid "Automatically improve the photo’s appearance"
 msgstr "Leasaich dreach an deilbh gu fèin-obrachail"
 
-#: src/Resources.vala:192
+#: src/Resources.vala:161
 msgid "Copy Color Adjustments"
 msgstr "Dèan lethbhreac de dh’atharraichean nan dathan"
 
-#: src/Resources.vala:193
+#: src/Resources.vala:162
 msgid "Copy the color adjustments applied to the photo"
-msgstr ""
-"Dèan lethbhreac de dh’atharraichean nan dathan a chaidh a chur air an dealbh"
+msgstr "Dèan lethbhreac de dh’atharraichean nan dathan a chaidh a chur air an dealbh"
 
-#: src/Resources.vala:196
+#: src/Resources.vala:165
 msgid "Paste Color Adjustments"
 msgstr "Cuir ann atharraichean nan dathan"
 
-#: src/Resources.vala:197
+#: src/Resources.vala:166
 msgid "Apply copied color adjustments to the selected photos"
-msgstr ""
-"Cuir ann atharraichean nan dathan a chaidh a chur air na dealbhan a thagh thu"
+msgstr "Cuir ann atharraichean nan dathan a chaidh a chur air na dealbhan a thagh thu"
 
-#: src/Resources.vala:199 ui/direct.ui:139 ui/photo.ui:228
+#: src/Resources.vala:168 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "_Bearr"
 
-#: src/Resources.vala:200
+#: src/Resources.vala:169
 msgid "Crop"
 msgstr "Bearr"
 
-#: src/Resources.vala:201
-#| msgid "Crop the photo's size"
+#: src/Resources.vala:170
 msgid "Crop the photo’s size"
 msgstr "Bearr meud an deilbh"
 
-#: src/Resources.vala:204
+#: src/Resources.vala:173
 msgid "Straighten"
 msgstr "Dèan dìreach"
 
-#: src/Resources.vala:205
+#: src/Resources.vala:174
 msgid "Straighten the photo"
 msgstr "Dèan dìreach an dealbh"
 
-#: src/Resources.vala:207 ui/direct.ui:149 ui/photo.ui:238
+#: src/Resources.vala:176 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "_Sùil dhearg"
 
-#: src/Resources.vala:208
+#: src/Resources.vala:177
 msgid "Red-eye"
 msgstr "Sùil dhearg"
 
-#: src/Resources.vala:209
+#: src/Resources.vala:178
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Lughdaich no thoir air falbh sùil dhearg sam bith anns an dealbh"
 
-#: src/Resources.vala:211 ui/direct.ui:154 ui/photo.ui:243
+#: src/Resources.vala:180 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "C_uir air gleus"
 
-#: src/Resources.vala:212
+#: src/Resources.vala:181
 msgid "Adjust"
 msgstr "Cuir air gleus"
 
-#: src/Resources.vala:213
-#| msgid "Adjust the photo's color and tone"
+#: src/Resources.vala:182
 msgid "Adjust the photo’s color and tone"
 msgstr "Cuir air gleus dath agus tòna an deilbh"
 
-#: src/Resources.vala:216
+#: src/Resources.vala:185
 msgid "Revert to Original"
 msgstr "Till an tionndadh tùsail"
 
-#: src/Resources.vala:218
+#: src/Resources.vala:187
 msgid "Revert External E_dits"
 msgstr "Neo-dhèan d_easachadh a-muigh sam bith"
 
-#: src/Resources.vala:219
+#: src/Resources.vala:188
 msgid "Revert to the master photo"
 msgstr "Till maighstir an deilbh"
 
-#: src/Resources.vala:222
+#: src/Resources.vala:191
 msgid "Set selected image to be the new desktop background"
 msgstr "Suidhich an dealbh a thagh thu mar chùlaibh an deasga"
 
-#: src/Resources.vala:223
-#| msgid "Set as Desktop Slideshow"
+#: src/Resources.vala:192
 msgid "Set as _Desktop Slideshow…"
 msgstr "Suidhich mar thaisbeanadh-shleamhnagan an _deasga…"
 
-#: src/Resources.vala:225 ui/direct.ui:47 ui/events_directory.ui:35
-#: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35
-#: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40
+#: src/Resources.vala:194 ui/direct.ui:47 ui/events_directory.ui:35 ui/event.ui:50 ui/faces.ui:50 
ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35 ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40
 msgid "_Undo"
 msgstr "_Neo-dhèan"
 
-#: src/Resources.vala:226
+#: src/Resources.vala:195
 msgid "Undo"
 msgstr "Neo-dhèan"
 
-#: src/Resources.vala:228 ui/direct.ui:52 ui/events_directory.ui:40
-#: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40
-#: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45
+#: src/Resources.vala:197 ui/direct.ui:52 ui/events_directory.ui:40 ui/event.ui:55 ui/faces.ui:55 
ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40 ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45
 msgid "_Redo"
 msgstr "_Ath-dhèan"
 
-#: src/Resources.vala:229
+#: src/Resources.vala:198
 msgid "Redo"
 msgstr "Ath-dhèan"
 
-#: src/Resources.vala:231 ui/events_directory.ui:139 ui/events_directory.ui:181
-#: ui/event.ui:393 ui/event.ui:588
-#| msgid "Rename Event"
+#: src/Resources.vala:200 ui/events_directory.ui:139 ui/events_directory.ui:181 ui/event.ui:393 
ui/event.ui:588
 msgid "Re_name Event…"
 msgstr "Thoir ai_nm ùr air an tachartas…"
 
-#: src/Resources.vala:234 ui/event.ui:373 ui/event.ui:580
+#: src/Resources.vala:203 ui/event.ui:373 ui/event.ui:580
 msgid "Make _Key Photo for Event"
 msgstr "Cleachd _seo mar phrìomh-dhealbh an tachartais"
 
-#: src/Resources.vala:235
+#: src/Resources.vala:204
 msgid "Make Key Photo for Event"
 msgstr "Cleachd seo mar phrìomh-dhealbh an tachartais"
 
-#: src/Resources.vala:237 ui/event.ui:382 ui/media.ui:376 ui/tags.ui:376
+#: src/Resources.vala:206 ui/event.ui:382 ui/faces.ui:376 ui/media.ui:376 ui/tags.ui:376
 msgid "_New Event"
 msgstr "Tachartas ù_r"
 
-#: src/Resources.vala:238
+#: src/Resources.vala:207
 msgid "New Event"
 msgstr "Tachartas ùr"
 
-#: src/Resources.vala:240
+#: src/Resources.vala:209
 msgid "Move Photos"
 msgstr "Gluais na dealbhan"
 
-#: src/Resources.vala:241
+#: src/Resources.vala:210
 msgid "Move photos to an event"
 msgstr "Gluais na dealbhan gu tachartas"
 
-#: src/Resources.vala:243 ui/events_directory.ui:135 ui/events_directory.ui:177
+#: src/Resources.vala:212 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "_Co-aonaich na tachartasan"
 
-#: src/Resources.vala:244
+#: src/Resources.vala:213
 msgid "Merge"
 msgstr "Co-aonaich"
 
-#: src/Resources.vala:245
+#: src/Resources.vala:214
 msgid "Combine events into a single event"
 msgstr "Cuir còmhla na tachartasan san aon tachartas"
 
-#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478
-#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
+#: src/Resources.vala:216 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478 ui/faces.ui:286 
ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "_Suidhich rangachadh"
 
-#: src/Resources.vala:248
+#: src/Resources.vala:217
 msgid "Set Rating"
 msgstr "Suidhich rangachadh"
 
-#: src/Resources.vala:249
+#: src/Resources.vala:218
 msgid "Change the rating of your photo"
 msgstr "Atharraich rangachadh an deilbh agad"
 
-#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511
-#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
+#: src/Resources.vala:220 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511 ui/faces.ui:326 
ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "_Cuir am meud"
 
-#: src/Resources.vala:252
+#: src/Resources.vala:221
 msgid "Increase Rating"
 msgstr "Cuir am meud an rangachadh"
 
-#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515
-#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
+#: src/Resources.vala:223 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515 ui/faces.ui:331 
ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "_Lùghdaich"
 
-#: src/Resources.vala:255
+#: src/Resources.vala:224
 msgid "Decrease Rating"
 msgstr "Lùghdaich an rangachadh"
 
-#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501
-#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
+#: src/Resources.vala:226 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501 ui/faces.ui:314 
ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "_Gun rangachadh"
 
-#: src/Resources.vala:258
+#: src/Resources.vala:227
 msgid "Unrated"
 msgstr "Gun rangachadh"
 
-#: src/Resources.vala:259
+#: src/Resources.vala:228
 msgid "Rate Unrated"
 msgstr "Thoir air falbh rangachadh sam bith"
 
-#: src/Resources.vala:260
+#: src/Resources.vala:229
 msgid "Setting as unrated"
 msgstr "A’ toirt air falbh rangachadh sam bith"
 
-#: src/Resources.vala:261
+#: src/Resources.vala:230
 msgid "Remove any ratings"
 msgstr "Thoir air falbh rangachadh sam bith"
 
-#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505
-#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
+#: src/Resources.vala:232 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505 ui/faces.ui:319 
ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "Air a _dhiùltadh"
 
-#: src/Resources.vala:264
+#: src/Resources.vala:233
 msgid "Rejected"
 msgstr "Air a dhiùltadh"
 
-#: src/Resources.vala:265
+#: src/Resources.vala:234
 msgid "Rate Rejected"
 msgstr "Thoir rangachadh “Air a dhiùltadh” dha"
 
-#: src/Resources.vala:266
+#: src/Resources.vala:235
 msgid "Setting as rejected"
 msgstr "A’ toirt rangachadh “Air a dhiùltadh” dha"
 
-#: src/Resources.vala:267
+#: src/Resources.vala:236
 msgid "Set rating to rejected"
 msgstr "Thoir rangachadh “Air a dhiùltadh” dha"
 
-#: src/Resources.vala:269 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196
-#: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162
+#: src/Resources.vala:238 ui/event.ui:196 ui/faces.ui:196 ui/import.ui:156 ui/media.ui:196 ui/offline.ui:153 
ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162
 msgid "Rejected _Only"
 msgstr "Na chaidh a dhiùltadh a-_mhàin"
 
-#: src/Resources.vala:270
+#: src/Resources.vala:239
 msgid "Rejected Only"
 msgstr "Na chaidh a dhiùltadh a-mhàin"
 
-#: src/Resources.vala:271
+#: src/Resources.vala:240
 msgid "Show only rejected photos"
 msgstr "Na seall ach dealbhan a chaidh a dhiùltadh"
 
-#: src/Resources.vala:273 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190
-#: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156
+#: src/Resources.vala:242 ui/event.ui:190 ui/faces.ui:190 ui/import.ui:150 ui/media.ui:190 ui/offline.ui:147 
ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156
 msgid "All + _Rejected"
 msgstr "Na h-uile ⁊ feadhainn air _dhiùltadh"
 
-#: src/Resources.vala:274
-#| msgid "Show all photos, including rejected"
+#: src/Resources.vala:243
 msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Seall gach dealbh, a’ toirt a-steach feadhainn a chaidh a dhiùltadh"
 
-#: src/Resources.vala:276 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184
-#: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150
+#: src/Resources.vala:245 ui/event.ui:184 ui/faces.ui:184 ui/import.ui:144 ui/media.ui:184 ui/offline.ui:141 
ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150
 msgid "_All Photos"
 msgstr "_Na h-uile dealbh"
 
 #. Button tooltip
-#: src/Resources.vala:278
+#: src/Resources.vala:247
 msgid "Show all photos"
 msgstr "Seall a h-uile dealbh"
 
-#: src/Resources.vala:280 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
-#: ui/tags.ui:144
+#: src/Resources.vala:249 ui/event.ui:144 ui/faces.ui:144 ui/media.ui:144 ui/photo.ui:120 ui/tags.ui:144
 msgid "_Ratings"
 msgstr "_Rangachaidhean"
 
-#: src/Resources.vala:281
-#| msgid "Display each photo's rating"
+#: src/Resources.vala:250
 msgid "Display each photo’s rating"
 msgstr "Seall an rangachadh aig gach dealbh"
 
-#: src/Resources.vala:283 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
-#: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117
+#: src/Resources.vala:252 ui/event.ui:151 ui/faces.ui:151 ui/import.ui:111 ui/media.ui:151 ui/offline.ui:108 
ui/tags.ui:151 ui/trash.ui:117
 msgid "_Filter Photos"
 msgstr "_Criathraich na dealbhan"
 
-#: src/Resources.vala:284
+#: src/Resources.vala:253
 msgid "Filter Photos"
 msgstr "Criathraich na dealbhan"
 
-#: src/Resources.vala:285
+#: src/Resources.vala:254
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Cuingich àireamh nan dealbhan a chithear le criathrag"
 
-#: src/Resources.vala:288
+#: src/Resources.vala:257
 msgid "Duplicate"
 msgstr "Dùblaich"
 
-#: src/Resources.vala:289
+#: src/Resources.vala:258
 msgid "Make a duplicate of the photo"
 msgstr "Dùblaich an dealbh"
 
-#: src/Resources.vala:291 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
-#: ui/tags.ui:17
-#| msgid "Export"
+#: src/Resources.vala:260 ui/event.ui:17 ui/faces.ui:17 ui/media.ui:17 ui/photo.ui:17 ui/tags.ui:17
 msgid "_Export…"
 msgstr "Às-p_hortaich…"
 
-#: src/Resources.vala:293
-#| msgid "_Print..."
+#: src/Resources.vala:262
 msgid "_Print…"
 msgstr "_Clò-bhuail…"
 
-#: src/Resources.vala:295
-#| msgid "Publish"
+#: src/Resources.vala:264
 msgid "Pu_blish…"
 msgstr "_Foillsich…"
 
-#: src/Resources.vala:297 ui/collection.ui:189
+#: src/Resources.vala:266 ui/collection.ui:189
 msgid "Publish to various websites"
 msgstr "Foillsich air iomadh làrach-lìn"
 
-#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537
-#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
-#| msgid "Edit Title"
+#: src/Resources.vala:268 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537 ui/faces.ui:340 
ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
 msgid "Edit _Title…"
 msgstr "Deasaich an _tiotal…"
 
 #. Button label
-#: src/Resources.vala:301
-#| msgid "Edit Title"
+#: src/Resources.vala:270
 msgctxt "Button Label"
 msgid "Edit Title"
 msgstr "Deasaich an tiotal"
 
-#: src/Resources.vala:303 ui/collection.ui:103 ui/events_directory.ui:144
-#: ui/events_directory.ui:186 ui/event.ui:345 ui/event.ui:398 ui/event.ui:542
-#: ui/media.ui:345 ui/photo_context.ui:110 ui/photo.ui:332 ui/tags.ui:345
-#| msgid "Edit Comment"
+#: src/Resources.vala:272 ui/collection.ui:103 ui/events_directory.ui:144 ui/events_directory.ui:186 
ui/event.ui:345 ui/event.ui:398 ui/event.ui:542 ui/faces.ui:345 ui/media.ui:345 ui/photo_context.ui:110 
ui/photo.ui:332 ui/tags.ui:345
 msgid "Edit _Comment…"
 msgstr "Deasaich am _beachd…"
 
 #. Button label
-#: src/Resources.vala:305
+#: src/Resources.vala:274
 msgid "Edit Comment"
 msgstr "Deasaich am beachd"
 
-#: src/Resources.vala:307 ui/event.ui:592
-#| msgid "Edit Event Comment"
+#: src/Resources.vala:276 ui/event.ui:592
 msgid "Edit Event _Comment…"
 msgstr "Deasaich _beachd an tachartais…"
 
-#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:337
-#| msgid "Adjust Date and Time"
+#: src/Resources.vala:279 ui/direct.ui:167 ui/photo.ui:337
 msgid "_Adjust Date and Time…"
 msgstr "Cuir _air gleus an ceann-là agus an t-àm…"
 
-#: src/Resources.vala:311
+#: src/Resources.vala:280
 msgid "Adjust Date and Time"
 msgstr "Cuir air gleus an ceann-là agus an t-àm"
 
-#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
-#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390
-#| msgid "Add Tags"
+#: src/Resources.vala:282 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458 ui/faces.ui:390 
ui/media.ui:390 ui/photo.ui:375 ui/tags.ui:390
 msgid "Add _Tags…"
 msgstr "Cuir _tagaichean ris…"
 
-#: src/Resources.vala:314 ui/photo_context.ui:17
-#| msgid "Add Tags"
+#: src/Resources.vala:283 ui/photo_context.ui:17
 msgid "_Add Tags…"
 msgstr "Cuir t_agaichean ris…"
 
 #. Dialog title
-#: src/Resources.vala:316
-#| msgid "Add Tags"
+#: src/Resources.vala:285
 msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Cuir tagaichean ris"
 
-#: src/Resources.vala:325 ui/photo_context.ui:135
-#| msgid "Send To"
+#: src/Resources.vala:294 ui/photo_context.ui:135
 msgid "Send T_o…"
 msgstr "Cuir _gu…"
 
-#: src/Resources.vala:327
-#| msgid "_Find"
+#: src/Resources.vala:296
 msgid "_Find…"
 msgstr "_Lorg…"
 
-#: src/Resources.vala:328 ui/collection.ui:217 ui/offline.ui:239
-#: ui/trash.ui:312
+#: src/Resources.vala:297 ui/collection.ui:217 ui/offline.ui:239 ui/trash.ui:312
 msgid "Find"
 msgstr "Lorg"
 
-#: src/Resources.vala:329 ui/collection.ui:214 ui/offline.ui:236
-#: ui/trash.ui:309
+#: src/Resources.vala:298 ui/collection.ui:214 ui/offline.ui:236 ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
-msgstr ""
-"Lorg dealbh ’s tu a’ cur a-steach teacsa a tha a’ nochdadh ’na ainm no sna "
-"tagaichean aige."
+msgstr "Lorg dealbh ’s tu a’ cur a-steach teacsa a tha a’ nochdadh ’na ainm no sna tagaichean aige"
 
-#: src/Resources.vala:331
+#: src/Resources.vala:300
 msgid "_Flag"
 msgstr "Cuir _bratach ris"
 
-#: src/Resources.vala:333
+#: src/Resources.vala:302
 msgid "Un_flag"
 msgstr "Thoir a’ bhratach air _falbh"
 
-#: src/Resources.vala:336
+#: src/Resources.vala:306
+#, fuzzy
+#| msgid "Make a duplicate of the photo"
+msgid "Mark faces of people in the photo"
+msgstr "Dùblaich an dealbh"
+
+#: src/Resources.vala:307
+#, fuzzy
+#| msgid "Modify Tags"
+msgid "Modify Faces"
+msgstr "Atharraich na tagaichean"
+
+#: src/Resources.vala:308
+#, fuzzy
+#| msgid "Delete Tag"
+msgid "Delete Face"
+msgstr "Sguab às an taga"
+
+#: src/Resources.vala:310 src/Resources.vala:352 ui/tags.ui:456
+msgid "_Rename…"
+msgstr "_Thoir ainm ùr air…"
+
+#: src/Resources.vala:314
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Chan urrainn dhuinn an deasaiche a chur gu dol: %s"
 
-#: src/Resources.vala:341
+#: src/Resources.vala:319
 #, c-format
-#| msgid "Add Tag \"%s\""
 msgid "Add Tag “%s”"
 msgstr "Cuir an taga “%s” ris"
 
 #. Used when adding two tags to photo(s)
-#: src/Resources.vala:344
+#: src/Resources.vala:322
 #, c-format
-#| msgid "Add Tags \"%s\" and \"%s\""
 msgid "Add Tags “%s” and “%s”"
 msgstr "Cuir na tagaichean “%s” agus “%s” ris"
 
 #. Undo/Redo command name (in Edit menu)
-#: src/Resources.vala:349
-#| msgid "Add Tags"
+#: src/Resources.vala:327
 msgctxt "UndoRedo menu entry"
 msgid "Add Tags"
 msgstr "Cuir tagaichean ris"
 
-#: src/Resources.vala:354
+#: src/Resources.vala:332
 #, c-format
-#| msgid "_Delete Tag \"%s\""
 msgid "_Delete Tag “%s”"
 msgstr "_Sguab às an taga “%s”"
 
-#: src/Resources.vala:358
+#: src/Resources.vala:336
 #, c-format
-#| msgid "Delete Tag \"%s\""
 msgid "Delete Tag “%s”"
 msgstr "Sguab às an taga “%s”"
 
-#: src/Resources.vala:361
+#: src/Resources.vala:339
 msgid "Delete Tag"
 msgstr "Sguab às an taga"
 
-#: src/Resources.vala:367
+#: src/Resources.vala:345
 #, c-format
-#| msgid "Re_name Tag \"%s\"..."
 msgid "Re_name Tag “%s”…"
 msgstr "Thoir ai_nm eile air an taga “%s”…"
 
-#: src/Resources.vala:371
+#: src/Resources.vala:349
 #, c-format
-#| msgid "Rename Tag \"%s\" to \"%s\""
 msgid "Rename Tag “%s” to “%s”"
 msgstr "Thoir “%2$s” air an taga “%1$s”"
 
-#: src/Resources.vala:374 ui/tags.ui:456
-#| msgid "_Rename..."
-msgid "_Rename…"
-msgstr "_Thoir ainm ùr air…"
-
-#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
-#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395
-#| msgid "Modify Tags"
+#: src/Resources.vala:354 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463 ui/faces.ui:395 
ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:380 ui/tags.ui:395
 msgid "Modif_y Tags…"
 msgstr "Atharraich na ta_gaichean…"
 
-#: src/Resources.vala:377
+#: src/Resources.vala:355
 msgid "Modify Tags"
 msgstr "Atharraich na tagaichean"
 
-#: src/Resources.vala:380
+#: src/Resources.vala:358
 #, c-format
-#| msgid "Tag Photo as \"%s\""
 msgid "Tag Photo as “%s”"
 msgid_plural "Tag Photos as “%s”"
 msgstr[0] "Cuir an taga “%s” ris an dealbh"
@@ -5967,9 +5101,8 @@ msgstr[1] "Cuir an taga “%s” ris na dealbhan"
 msgstr[2] "Cuir an taga “%s” ris na dealbhan"
 msgstr[3] "Cuir an taga “%s” ris na dealbhan"
 
-#: src/Resources.vala:386
+#: src/Resources.vala:364
 #, c-format
-#| msgid "Tag the selected photo as \"%s\""
 msgid "Tag the selected photo as “%s”"
 msgid_plural "Tag the selected photos as “%s”"
 msgstr[0] "Cuir an taga “%s” ris an dealbh a thagh thu"
@@ -5977,9 +5110,8 @@ msgstr[1] "Cuir an taga “%s” ris na dealbhan a thagh thu"
 msgstr[2] "Cuir an taga “%s” ris na dealbhan a thagh thu"
 msgstr[3] "Cuir an taga “%s” ris na dealbhan a thagh thu"
 
-#: src/Resources.vala:392
+#: src/Resources.vala:370
 #, c-format
-#| msgid "Remove Tag \"%s\" From _Photo"
 msgid "Remove Tag “%s” From _Photo"
 msgid_plural "Remove Tag “%s” From _Photos"
 msgstr[0] "Thoir air falbh an taga “%s” on _dealbh"
@@ -5987,9 +5119,8 @@ msgstr[1] "Thoir air falbh an taga “%s” o na _dealbhan"
 msgstr[2] "Thoir air falbh an taga “%s” o na _dealbhan"
 msgstr[3] "Thoir air falbh an taga “%s” o na _dealbhan"
 
-#: src/Resources.vala:398
+#: src/Resources.vala:376
 #, c-format
-#| msgid "Remove Tag \"%s\" From Photo"
 msgid "Remove Tag “%s” From Photo"
 msgid_plural "Remove Tag “%s” From Photos"
 msgstr[0] "Thoir air falbh an taga “%s” on dealbh"
@@ -5997,142 +5128,177 @@ msgstr[1] "Thoir air falbh an taga “%s” o na dealbhan"
 msgstr[2] "Thoir air falbh an taga “%s” o na dealbhan"
 msgstr[3] "Thoir air falbh an taga “%s” o na dealbhan"
 
-#: src/Resources.vala:404
+#: src/Resources.vala:382
 #, c-format
-#| msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgid "Unable to rename tag to “%s” because the tag already exists."
-msgstr ""
-"Chan urrainn dhuinn “%s” a thoirt air an taga a chionn ’s gu bheil an taga "
-"sin ann mu thràth."
+msgstr "Chan urrainn dhuinn “%s” a thoirt air an taga a chionn ’s gu bheil an taga sin ann mu thràth."
 
-#: src/Resources.vala:408
+#: src/Resources.vala:386
 #, c-format
-#| msgid "Unable to rename search to \"%s\" because the search already exists."
 msgid "Unable to rename search to “%s” because the search already exists."
-msgstr ""
-"Chan urrainn dhuinn “%s” a thoirt air an lorg air sgàth ’s gu bheil a "
-"leithid ann mar-thà."
+msgstr "Chan urrainn dhuinn “%s” a thoirt air an lorg air sgàth ’s gu bheil a leithid ann mar-thà."
 
 #. Saved search button
-#: src/Resources.vala:411 src/SearchFilter.vala:1124
+#: src/Resources.vala:389 src/SearchFilter.vala:1146
 msgid "Saved Search"
 msgstr "Lorg a chaidh a shàbhaladh"
 
-#: src/Resources.vala:413
+#: src/Resources.vala:391
 msgid "Delete Search"
 msgstr "Sguab às an lorg"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:11
-#| msgid "_Edit"
+#: src/Resources.vala:394 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "D_easaich…"
 
-#: src/Resources.vala:417 ui/savedsearch.ui:7
-#| msgid "Re_name..."
+#: src/Resources.vala:395 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "Thoir ai_nm ùr air…"
 
-#: src/Resources.vala:420
+#: src/Resources.vala:398
 #, c-format
-#| msgid "Rename Search \"%s\" to \"%s\""
 msgid "Rename Search “%s” to “%s”"
 msgstr "Thoir “%2$s” air an lorg “%1$s”"
 
-#: src/Resources.vala:424
+#: src/Resources.vala:402
 #, c-format
-#| msgid "Delete Search \"%s\""
 msgid "Delete Search “%s”"
 msgstr "Sguab às an lorg “%s”"
 
-#: src/Resources.vala:561
+#: src/Resources.vala:407
+#, fuzzy, c-format
+#| msgid "Unable to rename tag to “%s” because the tag already exists."
+msgid "Unable to rename face to “%s” because the face already exists."
+msgstr "Chan urrainn dhuinn “%s” a thoirt air an taga a chionn ’s gu bheil an taga sin ann mu thràth."
+
+#: src/Resources.vala:411
+#, fuzzy, c-format
+#| msgid "Remove Tag “%s” From _Photo"
+#| msgid_plural "Remove Tag “%s” From _Photos"
+msgid "Remove Face “%s” From _Photo"
+msgid_plural "Remove Face “%s” From _Photos"
+msgstr[0] "Thoir air falbh an taga “%s” on _dealbh"
+msgstr[1] "Thoir air falbh an taga “%s” o na _dealbhan"
+msgstr[2] "Thoir air falbh an taga “%s” o na _dealbhan"
+msgstr[3] "Thoir air falbh an taga “%s” o na _dealbhan"
+
+#: src/Resources.vala:416
+#, fuzzy, c-format
+#| msgid "Remove Tag “%s” From Photo"
+#| msgid_plural "Remove Tag “%s” From Photos"
+msgid "Remove Face “%s” From Photo"
+msgid_plural "Remove Face “%s” From Photos"
+msgstr[0] "Thoir air falbh an taga “%s” on dealbh"
+msgstr[1] "Thoir air falbh an taga “%s” o na dealbhan"
+msgstr[2] "Thoir air falbh an taga “%s” o na dealbhan"
+msgstr[3] "Thoir air falbh an taga “%s” o na dealbhan"
+
+#: src/Resources.vala:421
+#, fuzzy, c-format
+#| msgid "Re_name Tag “%s”…"
+msgid "Re_name Face “%s”…"
+msgstr "Thoir ai_nm eile air an taga “%s”…"
+
+#: src/Resources.vala:425
+#, fuzzy, c-format
+#| msgid "Rename Tag “%s” to “%s”"
+msgid "Rename Face “%s” to “%s”"
+msgstr "Thoir “%2$s” air an taga “%1$s”"
+
+#: src/Resources.vala:429
+#, fuzzy, c-format
+#| msgid "_Delete Tag “%s”"
+msgid "_Delete Face “%s”"
+msgstr "_Sguab às an taga “%s”"
+
+#: src/Resources.vala:433
+#, fuzzy, c-format
+#| msgid "Delete Tag “%s”"
+msgid "Delete Face “%s”"
+msgstr "Sguab às an taga “%s”"
+
+#: src/Resources.vala:663
 #, c-format
 msgid "Rate %s"
 msgstr "Thoir an rangachadh %s dha"
 
-#: src/Resources.vala:562
+#: src/Resources.vala:664
 #, c-format
 msgid "Set rating to %s"
 msgstr "Thoir an rangachadh %s dha"
 
-#: src/Resources.vala:563
+#: src/Resources.vala:665
 #, c-format
 msgid "Setting rating to %s"
 msgstr "A’ toirt an rangachadh %s dha"
 
-#: src/Resources.vala:565
+#: src/Resources.vala:667
 #, c-format
 msgid "Display %s"
 msgstr "Seall %s"
 
-#: src/Resources.vala:566
+#: src/Resources.vala:668
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Na seall ach dealbhan aig a bheil an rangachadh %s"
 
-#: src/Resources.vala:567
+#: src/Resources.vala:669
 #, c-format
 msgid "%s or Better"
 msgstr "%s no nas fhearr"
 
-#: src/Resources.vala:568
+#: src/Resources.vala:670
 #, c-format
 msgid "Display %s or Better"
 msgstr "Seall %s no feadhainn nas fhearr"
 
-#: src/Resources.vala:569
+#: src/Resources.vala:671
 #, c-format
 msgid "Only show photos with a rating of %s or better"
-msgstr ""
-"Na seall dealbhan ach feadhainn aig a bheil rangachadh %s no fear nas fhearr"
+msgstr "Na seall dealbhan ach feadhainn aig a bheil rangachadh %s no fear nas fhearr"
 
-#: src/Resources.vala:660 ui/trash.ui:255
+#: src/Resources.vala:762 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Thoir na dealbhan a thagh thu air falbh on sgudal"
 
-#: src/Resources.vala:661 ui/offline.ui:221
+#: src/Resources.vala:763 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Thoir na dealbhan a thagh thu air falbh on leabhar-lann"
 
-#: src/Resources.vala:663 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
+#: src/Resources.vala:765 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "_Aisig"
 
-#: src/Resources.vala:664 ui/trash.ui:270
+#: src/Resources.vala:766 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Gluais na dealbhan a thagh thu air ais dhan leabhar-lann"
 
-#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:20
-#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
-#: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
-#: ui/trash.ui:227
+#: src/Resources.vala:768 ui/collection.ui:123 ui/direct_context.ui:18 ui/direct.ui:30 ui/event.ui:27 
ui/event.ui:562 ui/faces.ui:27 ui/media.ui:27 ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 
ui/trash.ui:19 ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Seall ann am manai_dsear nam faidhlichean"
 
-#: src/Resources.vala:667
-#| msgid "Open the selected photo's directory in the file manager"
+#: src/Resources.vala:769
 msgid "Open the selected photo’s directory in the file manager"
 msgstr "Fosgail pasgan an deilbh a thagh thu ann am manaidsear nam faidhlichean"
 
-#: src/Resources.vala:670
+#: src/Resources.vala:772
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Cha ghabh fhosgladh manaidsear nam faidhlichean: %s"
 
-#: src/Resources.vala:673 ui/offline.ui:224
+#: src/Resources.vala:775 ui/event.ui:74 ui/faces.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207 
ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "T_hoir air falbh on leabhar-lann"
 
-#: src/Resources.vala:675 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573
-#: ui/media.ui:79 ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79
+#: src/Resources.vala:777 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573 ui/faces.ui:79 ui/media.ui:79 
ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "_Gluais dhan sgudal"
 
-#: src/Resources.vala:677 ui/events_directory.ui:58 ui/event.ui:86
-#: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74
+#: src/Resources.vala:779 ui/events_directory.ui:58 ui/event.ui:86 ui/faces.ui:86 ui/import.ui:61 
ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74
 msgid "Select _All"
 msgstr "Tagh n_a h-uile"
 
-#: src/Resources.vala:678
+#: src/Resources.vala:780
 msgid "Select all items"
 msgstr "Tagh a h-uile nì"
 
@@ -6145,15 +5311,14 @@ msgstr "Tagh a h-uile nì"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #. / 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:739
+#: src/Resources.vala:841
 msgid "%a %b %d, %Y"
 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
-#: src/Resources.vala:744
-#| msgid "%a %b %d"
+#: src/Resources.vala:846
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a %d %b"
@@ -6161,8 +5326,7 @@ 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:749
-#| msgid "%d, %Y"
+#: src/Resources.vala:851
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d, %Y"
@@ -6170,8 +5334,7 @@ msgstr "%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:754
-#| msgid "%a %b %d"
+#: src/Resources.vala:856
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a %d %b"
@@ -6179,229 +5342,204 @@ msgstr "%a %d %b"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Mon Apr 06, 2006" 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:759
-#| msgid "%a %b %d, %Y"
+#: src/Resources.vala:861
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a %d %b %Y"
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:117
 msgid "Slideshow"
 msgstr "Taisbeanadh-shleamhnagan"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Luirg a shàbhail thu"
-
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:162
+#: src/searches/SavedSearchDialog.vala:170
 msgid "contains"
 msgstr "is na leanas ’na bhroinn"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:163
-#: src/searches/SavedSearchDialog.vala:494
+#: src/searches/SavedSearchDialog.vala:171 src/searches/SavedSearchDialog.vala:502
 msgid "is exactly"
 msgstr "a tha gu pongail"
 
-#: src/searches/SavedSearchDialog.vala:164
+#: src/searches/SavedSearchDialog.vala:172
 msgid "starts with"
 msgstr "a tha a’ tòiseachadh le"
 
-#: src/searches/SavedSearchDialog.vala:165
+#: src/searches/SavedSearchDialog.vala:173
 msgid "ends with"
 msgstr "a tha a’ crìochnachadh le"
 
-#: src/searches/SavedSearchDialog.vala:166
+#: src/searches/SavedSearchDialog.vala:174
 msgid "does not contain"
 msgstr "anns nach eil"
 
-#: src/searches/SavedSearchDialog.vala:167
-#: src/searches/SavedSearchDialog.vala:498
+#: src/searches/SavedSearchDialog.vala:175 src/searches/SavedSearchDialog.vala:506
 msgid "is not set"
 msgstr "nach deach a shuidheachadh"
 
-#: src/searches/SavedSearchDialog.vala:168
-#| msgid "is not set"
+#: src/searches/SavedSearchDialog.vala:176
 msgid "is set"
 msgstr "a chaidh a shuidheachadh"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:242
-#: src/searches/SavedSearchDialog.vala:373
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:250 src/searches/SavedSearchDialog.vala:381 
src/searches/SavedSearchDialog.vala:446
 msgid "is"
 msgstr "a tha ’na"
 
-#: src/searches/SavedSearchDialog.vala:243
+#: src/searches/SavedSearchDialog.vala:251
 msgid "is not"
 msgstr "nach eil ’na"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:257
 msgid "any photo"
 msgstr "dealbh sam bith"
 
-#: src/searches/SavedSearchDialog.vala:250
+#: src/searches/SavedSearchDialog.vala:258
 msgid "a raw photo"
 msgstr "dhealbh amh"
 
-#: src/searches/SavedSearchDialog.vala:251
+#: src/searches/SavedSearchDialog.vala:259
 msgid "a video"
 msgstr "video"
 
-#: src/searches/SavedSearchDialog.vala:305
+#: src/searches/SavedSearchDialog.vala:313
 msgid "has"
 msgstr "Chaidh"
 
-#: src/searches/SavedSearchDialog.vala:306
+#: src/searches/SavedSearchDialog.vala:314
 msgid "has no"
 msgstr "Cha deach"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:319
 msgid "modifications"
 msgstr "atharrachadh a dhèanamh air"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:320
 msgid "internal modifications"
 msgstr "atharrachadh inntearnail a dhèanamh air"
 
-#: src/searches/SavedSearchDialog.vala:313
+#: src/searches/SavedSearchDialog.vala:321
 msgid "external modifications"
 msgstr "atharrachadh on taobh a-muigh a dhèanamh air"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:367
+#: src/searches/SavedSearchDialog.vala:375
 msgid "flagged"
 msgstr "a tha bratach ris"
 
-#: src/searches/SavedSearchDialog.vala:368
+#: src/searches/SavedSearchDialog.vala:376
 msgid "not flagged"
 msgstr "nach eil bratach ris"
 
-#: src/searches/SavedSearchDialog.vala:431
+#: src/searches/SavedSearchDialog.vala:439
 msgid "and higher"
 msgstr "agus nas àirde"
 
-#: src/searches/SavedSearchDialog.vala:432
+#: src/searches/SavedSearchDialog.vala:440
 msgid "only"
 msgstr "a-mhàin"
 
-#: src/searches/SavedSearchDialog.vala:433
+#: src/searches/SavedSearchDialog.vala:441
 msgid "and lower"
 msgstr "agus nas lugha"
 
-#: src/searches/SavedSearchDialog.vala:495
+#: src/searches/SavedSearchDialog.vala:503
 msgid "is after"
 msgstr "a tha àn dèidh"
 
-#: src/searches/SavedSearchDialog.vala:496
+#: src/searches/SavedSearchDialog.vala:504
 msgid "is before"
 msgstr "a tha ro"
 
-#: src/searches/SavedSearchDialog.vala:497
+#: src/searches/SavedSearchDialog.vala:505
 msgid "is between"
 msgstr "a tha eadar"
 
-#: src/searches/SavedSearchDialog.vala:510
+#: src/searches/SavedSearchDialog.vala:518
 msgid "and"
 msgstr "agus"
 
-#: src/searches/SavedSearchDialog.vala:691
-msgid "Search"
-msgstr "Lorg"
-
-#: src/searches/SavedSearchDialog.vala:696
-#| msgid "_Cancel"
-msgid "Cancel"
-msgstr "Sguir dheth"
-
-#: src/searches/SavedSearchDialog.vala:697
-msgid "OK"
-msgstr "Ceart ma-thà"
-
-#: src/searches/SavedSearchDialog.vala:716
-msgid "any"
-msgstr "gin sam bith"
-
-#: src/searches/SavedSearchDialog.vala:717
-msgid "all"
-msgstr "na h-uile"
-
-#: src/searches/SavedSearchDialog.vala:718
-msgid "none"
-msgstr "chan eil gin"
-
-#: src/searches/SearchBoolean.vala:157
+#: src/searches/SearchBoolean.vala:169
 msgid "Any text"
 msgstr "Teacsa sam bith"
 
-#: src/searches/SearchBoolean.vala:160
+#: src/searches/SearchBoolean.vala:172
 msgid "Title"
 msgstr "Tiotal"
 
-#: src/searches/SearchBoolean.vala:163
+#: src/searches/SearchBoolean.vala:175
 msgid "Tag"
 msgstr "Taga"
 
-#: src/searches/SearchBoolean.vala:166
+#: src/searches/SearchBoolean.vala:178
 msgid "Comment"
 msgstr "Beachd"
 
-#: src/searches/SearchBoolean.vala:169
+#: src/searches/SearchBoolean.vala:181
 msgid "Event name"
 msgstr "Ainm an tachartais"
 
-#: src/searches/SearchBoolean.vala:172
+#: src/searches/SearchBoolean.vala:184
 msgid "File name"
 msgstr "Ainm an fhaidhle"
 
-#: src/searches/SearchBoolean.vala:175
+#: src/searches/SearchBoolean.vala:187
+msgid "Face"
+msgstr ""
+
+#: src/searches/SearchBoolean.vala:190
 msgid "Media type"
 msgstr "Seòrsa a’ mheadhain"
 
-#: src/searches/SearchBoolean.vala:178
+#: src/searches/SearchBoolean.vala:193
 msgid "Flag state"
 msgstr "Staid na brataich"
 
-#: src/searches/SearchBoolean.vala:181
+#: src/searches/SearchBoolean.vala:196
 msgid "Photo state"
-msgstr "Staid an deilbh:"
+msgstr "Staid an deilbh"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1114
+#: src/searches/SearchBoolean.vala:199 src/SearchFilter.vala:853 src/SearchFilter.vala:1136
 msgid "Rating"
 msgstr "Rangachadh"
 
-#: src/searches/SearchBoolean.vala:187
+#: src/searches/SearchBoolean.vala:202
 msgid "Date"
 msgstr "Ceann-là"
 
-#: src/SearchFilter.vala:815
-#| msgid "Rating"
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Luirg a shàbhail thu"
+
+#: src/searches/SearchesBranch.vala:68
+#, fuzzy
+#| msgid "Organize your photos"
+msgid "Organize your saved searches"
+msgstr "Cuir rian air na dealbhan agad"
+
+#: src/SearchFilter.vala:837
 msgid "★+ Rating"
 msgstr "Rangachadh ★+"
 
-#: src/SearchFilter.vala:818
-#| msgid "Rating"
+#: src/SearchFilter.vala:840
 msgid "★★+ Rating"
 msgstr "Rangachadh ★★+"
 
-#: src/SearchFilter.vala:821
+#: src/SearchFilter.vala:843
 msgid "★★★+ Rating"
 msgstr "Rangachadh ★★★+"
 
-#: src/SearchFilter.vala:824
+#: src/SearchFilter.vala:846
 msgid "★★★★+ Rating"
 msgstr "Rangachadh ★★★★+"
 
-#: src/SearchFilter.vala:828
+#: src/SearchFilter.vala:850
 msgid "★★★★★+ Rating"
 msgstr "Rangachadh ★★★★★+"
 
-#: src/SearchFilter.vala:1064
+#: src/SearchFilter.vala:1086
 #, c-format
-#| msgid "Error loading UI file %s: %s"
 msgid "Error loading search bar UI: %s"
 msgstr "Mearachd a’ luchdadh eadar-aghaidh a’ bhàir-luirg: %s"
 
@@ -6410,72 +5548,71 @@ msgstr "Mearachd a’ luchdadh eadar-aghaidh a’ bhàir-luirg: %s"
 #. Prepare the close menu for use, but don't
 #. display it yet; we'll connect it to secondary
 #. click later on.
-#: src/SearchFilter.vala:1073
-#| msgid "_Close"
+#: src/SearchFilter.vala:1095
 msgid "Close"
 msgstr "Dùin"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1079
+#: src/SearchFilter.vala:1101
 msgid "Type"
 msgstr "Seòrsa"
 
-#: src/SearchFilter.vala:1086
+#: src/SearchFilter.vala:1108
 msgid "Videos"
 msgstr "Videothan"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1111
 msgid "RAW Photos"
 msgstr "Dealbhan RAW"
 
-#: src/SearchFilter.vala:1125
+#: src/SearchFilter.vala:1147
 msgid "Use a saved search to filter items in the current view"
 msgstr ""
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Roghainnean"
-
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:136
 msgid "Back"
 msgstr "Air ais"
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:138
 msgid "Go to the previous photo"
 msgstr "Air ais dhan dealbh roimhe"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:250
 msgid "Pause"
 msgstr "Cuir ’na stad"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:145 src/SlideshowPage.vala:251
 msgid "Pause the slideshow"
 msgstr "Cuir an taisbeanadh-shleamhnagan ’na stad"
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:150
 msgid "Next"
 msgstr "Air adhart"
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:152
 msgid "Go to the next photo"
 msgstr "Air adhart dhan ath-dhealbh"
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:159 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Roghainnean"
+
+#: src/SlideshowPage.vala:160
 msgid "Change slideshow settings"
 msgstr "Atharraich roghainnean an taisbeanaidh-shleamhnagan"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:214
 msgid "All photo source files are missing."
 msgstr "Tha gach tùs-fhaidhl nan dealbhan a dhìth."
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:246
 msgid "Play"
 msgstr "Cluich"
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:247
 msgid "Continue the slideshow"
 msgstr "Lean air an taisbeanadh-shleamhnagan"
 
@@ -6487,7 +5624,7 @@ msgstr "Tar-mhùthaidhean an taisbeanaidh-shleamhnagan"
 msgid "(None)"
 msgstr "(Chan eil gin)"
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:414
 msgid "None"
 msgstr "Chan eil gin"
 
@@ -6495,53 +5632,46 @@ msgstr "Chan eil gin"
 msgid "Random"
 msgstr "Air thuaiream"
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Tagaichean"
 
+#: src/tags/TagsBranch.vala:131
+#, fuzzy
+#| msgid "Organize your photos"
+msgid "Organize and browse your photo’s tags"
+msgstr "Cuir rian air na dealbhan agad"
+
 #: src/Tag.vala:830
 msgid "untitled"
 msgstr "gun tiotal"
 
 #. multiple videos
-#: src/VideoSupport.vala:523
+#: src/VideoSupport.vala:525
 msgid "Export Videos"
 msgstr "Às-phortaich videothan"
 
-#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/media.ui:281
-#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/faces.ui:281 ui/media.ui:281 
ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
 msgid "Toggle _Flag"
 msgstr ""
 
-#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
-#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353
+#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/faces.ui:353 ui/media.ui:353 
ui/photo_context.ui:88 ui/photo.ui:344 ui/tags.ui:353
 msgid "_Developer"
 msgstr "_Leasaichear"
 
-#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
-#| msgid "Open With E_xternal Editor"
-msgid "Open with E_xternal Editor"
-msgstr "Fosgail le deasaiche air an ta_obh a-muigh"
-
-#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
-#: ui/photo_context.ui:126 ui/tags.ui:381
+#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/faces.ui:381 ui/media.ui:381 
ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
 msgstr "Seall an tac_hartas aig an dealbh"
 
-#: ui/direct.ui:5 ui/events_directory.ui:5 ui/event.ui:5 ui/import_queue.ui:5
-#: ui/import.ui:5 ui/media.ui:5 ui/offline.ui:5 ui/photo.ui:5 ui/tags.ui:5
-#: ui/trash.ui:5
+#: ui/direct.ui:5 ui/events_directory.ui:5 ui/event.ui:5 ui/faces.ui:5 ui/import_queue.ui:5 ui/import.ui:5 
ui/media.ui:5 ui/offline.ui:5 ui/photo.ui:5 ui/tags.ui:5 ui/trash.ui:5
 msgid "_File"
 msgstr "_Faidhle"
 
 #: ui/direct.ui:13
-#| msgid "Save As"
 msgid "Save _As…"
 msgstr "Sàbhail m_ar…"
 
-#: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99
-#: ui/import_queue.ui:38 ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78
-#: ui/photo.ui:95 ui/tags.ui:99 ui/trash.ui:87
+#: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99 ui/faces.ui:99 ui/import_queue.ui:38 
ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78 ui/photo.ui:95 ui/tags.ui:99 ui/trash.ui:87
 msgid "_View"
 msgstr "_Sealladh"
 
@@ -6573,212 +5703,307 @@ msgstr "_An ath-dhealbh"
 msgid "T_ools"
 msgstr "I_nnealan"
 
-#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428
-#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
-#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197
+#: ui/direct.ui:182 ui/events_directory.ui:158 ui/event.ui:428 ui/faces.ui:438 ui/import_queue.ui:73 
ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188 ui/photo.ui:395 ui/tags.ui:430 ui/trash.ui:197
 msgid "_Frequently Asked Questions"
 msgstr "_Ceistean àbhaisteach"
 
-#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432
-#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
-#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201
-#| msgid "_Report a Problem..."
+#: ui/direct.ui:186 ui/events_directory.ui:162 ui/event.ui:432 ui/faces.ui:442 ui/import_queue.ui:77 
ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192 ui/photo.ui:399 ui/tags.ui:434 ui/trash.ui:201
 msgid "_Report a Problem…"
 msgstr "Dèan aith_ris air duilgheadas…"
 
-#: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
-#: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
-#| msgid "Import From Folder"
-msgid "_Import from Folder…"
+#: ui/events_directory.ui:8 ui/event.ui:8 ui/faces.ui:8 ui/import_queue.ui:14 ui/import.ui:8 ui/media.ui:8 
ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
+#, fuzzy
+#| msgid "_Import from Folder…"
+msgid "_Import From Folder…"
 msgstr "_Ion-phortaich o phasgan…"
 
-#: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
-#: ui/import.ui:21 ui/media.ui:13 ui/offline.ui:13 ui/photo.ui:13 ui/tags.ui:13
-#: ui/trash.ui:13
-#| msgid "Import From Application"
+#: ui/events_directory.ui:13 ui/event.ui:13 ui/faces.ui:13 ui/import_queue.ui:19 ui/import.ui:21 
ui/media.ui:13 ui/offline.ui:13 ui/photo.ui:13 ui/tags.ui:13 ui/trash.ui:13
 msgid "Import From _Application…"
 msgstr "_Ion-phortaich o aplacaid…"
 
-#: ui/events_directory.ui:19 ui/event.ui:34 ui/import_queue.ui:25
-#: ui/import.ui:27 ui/media.ui:34 ui/offline.ui:19 ui/photo.ui:42 ui/tags.ui:34
-#: ui/trash.ui:24 ui/trash.ui:234 ui/trash.ui:242
+#: ui/events_directory.ui:19 ui/event.ui:34 ui/faces.ui:34 ui/import_queue.ui:25 ui/import.ui:27 
ui/media.ui:34 ui/offline.ui:19 ui/photo.ui:42 ui/tags.ui:34 ui/trash.ui:24 ui/trash.ui:234 ui/trash.ui:242
 msgid "Empty T_rash"
 msgstr "Falamhaich an s_gudal"
 
-#: ui/events_directory.ui:47 ui/event.ui:62 ui/import.ui:55 ui/media.ui:62
-#: ui/offline.ui:47 ui/tags.ui:62 ui/trash.ui:52
+#: ui/events_directory.ui:47 ui/event.ui:62 ui/faces.ui:62 ui/import.ui:55 ui/media.ui:62 ui/offline.ui:47 
ui/tags.ui:62 ui/trash.ui:52
 msgid "_Find"
 msgstr "_Lorg"
 
-#: ui/events_directory.ui:51 ui/event.ui:66 ui/media.ui:66 ui/offline.ui:51
-#: ui/photo.ui:70 ui/search_sidebar_context.ui:6
-#: ui/sidebar_default_context.ui:6 ui/tags.ui:66 ui/trash.ui:56
-#| msgid "Ne_w Saved Search..."
+#: ui/events_directory.ui:51 ui/event.ui:66 ui/faces.ui:66 ui/media.ui:66 ui/offline.ui:51 ui/photo.ui:70 
ui/search_sidebar_context.ui:6 ui/sidebar_default_context.ui:6 ui/tags.ui:66 ui/trash.ui:56
 msgid "Ne_w Saved Search…"
 msgstr "Lorg ù_r a chaidh a shàbhaladh…"
 
-#: ui/events_directory.ui:74 ui/event.ui:102 ui/import_queue.ui:41
-#: ui/import.ui:77 ui/media.ui:102 ui/offline.ui:81 ui/photo.ui:98
-#: ui/tags.ui:102 ui/trash.ui:90
+#: ui/events_directory.ui:74 ui/event.ui:102 ui/faces.ui:102 ui/import_queue.ui:41 ui/import.ui:77 
ui/media.ui:102 ui/offline.ui:81 ui/photo.ui:98 ui/tags.ui:102 ui/trash.ui:90
 msgid "_Basic Information"
 msgstr "_Fiosrachadh bunasach"
 
-#: ui/events_directory.ui:79 ui/event.ui:107 ui/import.ui:82 ui/media.ui:107
-#: ui/offline.ui:86 ui/photo.ui:103 ui/tags.ui:107 ui/trash.ui:95
+#: ui/events_directory.ui:79 ui/event.ui:107 ui/faces.ui:107 ui/import.ui:82 ui/media.ui:107 
ui/offline.ui:86 ui/photo.ui:103 ui/tags.ui:107 ui/trash.ui:95
 msgid "E_xtended Information"
 msgstr "F_iosrachdadh leudaichte"
 
-#: ui/events_directory.ui:84 ui/event.ui:112 ui/import.ui:87 ui/media.ui:112
-#: ui/offline.ui:91 ui/tags.ui:112 ui/trash.ui:100
+#: ui/events_directory.ui:84 ui/event.ui:112 ui/faces.ui:112 ui/import.ui:87 ui/media.ui:112 
ui/offline.ui:91 ui/tags.ui:112 ui/trash.ui:100
 msgid "_Search Bar"
 msgstr "_Bàr nan lorg"
 
-#: ui/events_directory.ui:89 ui/event.ui:117 ui/import.ui:92 ui/media.ui:117
-#: ui/offline.ui:96 ui/photo.ui:108 ui/tags.ui:117 ui/trash.ui:105
+#: ui/events_directory.ui:89 ui/event.ui:117 ui/faces.ui:117 ui/import.ui:92 ui/media.ui:117 
ui/offline.ui:96 ui/photo.ui:108 ui/tags.ui:117 ui/trash.ui:105
 msgid "S_idebar"
 msgstr "Bàr-_taoibh"
 
-#: ui/events_directory.ui:94 ui/event.ui:122 ui/import.ui:97 ui/media.ui:122
-#: ui/offline.ui:101 ui/photo.ui:113 ui/tags.ui:122 ui/trash.ui:110
-#| msgid "Pin Toolbar"
+#: ui/events_directory.ui:94 ui/event.ui:122 ui/faces.ui:122 ui/import.ui:97 ui/media.ui:122 
ui/offline.ui:101 ui/photo.ui:113 ui/tags.ui:122 ui/trash.ui:110
 msgid "T_oolbar"
 msgstr "_Bàr-inneal"
 
-#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/faces.ui:134 ui/media.ui:134 ui/tags.ui:134
 msgid "_Comments"
 msgstr "_Beachdan"
 
-#: ui/events_directory.ui:108 ui/event.ui:243 ui/import_queue.ui:48
-#: ui/import.ui:166 ui/media.ui:243 ui/offline.ui:163 ui/photo.ui:127
-#: ui/tags.ui:243 ui/trash.ui:172
+#: ui/events_directory.ui:108 ui/event.ui:243 ui/faces.ui:243 ui/import_queue.ui:48 ui/import.ui:166 
ui/media.ui:243 ui/offline.ui:163 ui/photo.ui:127 ui/tags.ui:243 ui/trash.ui:172
 msgid "Sort _Events"
 msgstr "Seòrsaich na _tachartasan"
 
-#: ui/events_directory.ui:111 ui/event.ui:231 ui/event.ui:246
-#: ui/import_queue.ui:51 ui/import.ui:169 ui/media.ui:231 ui/media.ui:246
-#: ui/offline.ui:166 ui/photo.ui:130 ui/tags.ui:231 ui/tags.ui:246
-#: ui/trash.ui:175
+#: ui/events_directory.ui:111 ui/event.ui:231 ui/event.ui:246 ui/faces.ui:231 ui/faces.ui:246 
ui/import_queue.ui:51 ui/import.ui:169 ui/media.ui:231 ui/media.ui:246 ui/offline.ui:166 ui/photo.ui:130 
ui/tags.ui:231 ui/tags.ui:246 ui/trash.ui:175
 msgid "_Ascending"
 msgstr "A’ _dìreadh"
 
-#: ui/events_directory.ui:116 ui/event.ui:236 ui/import_queue.ui:56
-#: ui/media.ui:236 ui/offline.ui:171 ui/tags.ui:236 ui/trash.ui:180
+#: ui/events_directory.ui:116 ui/event.ui:236 ui/faces.ui:236 ui/import_queue.ui:56 ui/media.ui:236 
ui/offline.ui:171 ui/tags.ui:236 ui/trash.ui:180
 msgid "D_escending"
 msgstr "A’ teàrna_dh"
 
-#: ui/events_directory.ui:132 ui/event.ui:379 ui/media.ui:373 ui/tags.ui:373
+#: ui/events_directory.ui:132 ui/event.ui:379 ui/faces.ui:373 ui/media.ui:373 ui/tags.ui:373
 msgid "Even_ts"
 msgstr "Tach_artasan"
 
-#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207
-#: ui/photo.ui:77 ui/tags.ui:74
-#| msgid "R_emove From Library"
-msgid "R_emove from Library"
-msgstr "T_hoir air falbh on leabhar-lann"
-
-#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
+#: ui/event.ui:129 ui/faces.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr "_Tiotalan"
 
-#: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
-#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387
+#: ui/event.ui:139 ui/event.ui:404 ui/faces.ui:139 ui/faces.ui:387 ui/media.ui:139 ui/media.ui:387 
ui/photo.ui:372 ui/tags.ui:139 ui/tags.ui:387
 msgid "Ta_gs"
 msgstr "Ta_gaichean"
 
-#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+#: ui/event.ui:206 ui/faces.ui:206 ui/media.ui:206 ui/tags.ui:206
 msgid "Sort _Photos"
 msgstr "Seòrsaich na _dealbhan"
 
-#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+#: ui/event.ui:209 ui/faces.ui:209 ui/media.ui:209 ui/tags.ui:209
 msgid "By _Title"
 msgstr "A-rèir _tiotail"
 
-#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
-#| msgid "File name"
+#: ui/event.ui:214 ui/faces.ui:214 ui/media.ui:214 ui/tags.ui:214
 msgid "By _Filename"
 msgstr "A-rèir ainm an _fhaidhle"
 
-#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+#: ui/event.ui:219 ui/faces.ui:219 ui/media.ui:219 ui/tags.ui:219
 msgid "By Exposure _Date"
 msgstr "A-rèir _ceann-là an deisearais"
 
-#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+#: ui/event.ui:224 ui/faces.ui:224 ui/media.ui:224 ui/tags.ui:224
 msgid "By _Rating"
 msgstr "A-rèir _rangachaidh"
 
-#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
-#: ui/tags.ui:251
-#| msgid "D_escending"
+#: ui/event.ui:251 ui/faces.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135 ui/tags.ui:251
 msgid "_Descending"
 msgstr "A’ teàrna_dh"
 
-#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275
+#: ui/event.ui:275 ui/faces.ui:275 ui/media.ui:275 ui/tags.ui:275
 msgid "_Photos"
 msgstr "_Dealbhan"
 
+#: ui/faces.ui:465
+#, fuzzy
+#| msgid "_Rename…"
+msgid "Rename…"
+msgstr "_Thoir ainm ùr air…"
+
 #: ui/import_queue.ui:8
 msgid "_Stop Import"
 msgstr "Thoir _stad air an ion-phortadh"
 
-#: ui/printing_widget.ui:19
+#: ui/preferences_dialog.ui:67
+msgid "Display"
+msgstr "Sealladh"
+
+#: ui/preferences_dialog.ui:103
+msgid "_Import photos to:"
+msgstr "_Ion-phortaich dealbhan dha:"
+
+#: ui/preferences_dialog.ui:114
+msgid "_Watch library directory for new files"
+msgstr "_Cum sùil air pasgan na leabhar-lainn airson faidhlichean ùra"
+
+#: ui/preferences_dialog.ui:137
+msgid "Importing"
+msgstr "Ag ion-phortadh"
+
+#: ui/preferences_dialog.ui:154
+msgid "_Directory structure:"
+msgstr "Structar a’ p_hasgain:"
+
+#: ui/preferences_dialog.ui:169
+msgid "Example:"
+msgstr "Ball-eisimpleir:"
+
+#: ui/preferences_dialog.ui:178
+msgid "R_ename imported files to lowercase"
+msgstr "_Sparr litrichean beaga air ainmean fhaidhlichean a thèid ion-phortadh"
+
+#: ui/preferences_dialog.ui:200
+msgid "Metadata"
+msgstr "Meata-dàta"
+
+#: ui/preferences_dialog.ui:213
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "Sgrìobh tagaichean, tiotalan agus _meata-dàta eile ann am faidhlichean deilbh"
+
+#: ui/preferences_dialog.ui:235
+msgid "RAW Developer"
+msgstr "Leasaichear RAW"
+
+#: ui/preferences_dialog.ui:252
+msgid "De_fault:"
+msgstr "B_un-roghainn:"
+
+#: ui/preferences_dialog.ui:306
+msgid "_Pattern:"
+msgstr "_Pàtran:"
+
+#: ui/preferences_dialog.ui:339
+msgid "When viewing images that are transparent, they will be drawn against this background."
+msgstr ""
+
+#: ui/preferences_dialog.ui:343
+#, fuzzy
+#| msgid "_Background:"
+msgid "Transparent Background:"
+msgstr "Cùlai_bh:"
+
+#: ui/preferences_dialog.ui:357
+msgid "Checkered"
+msgstr ""
+
+#: ui/preferences_dialog.ui:378
+msgid "Solid color"
+msgstr ""
+
+#: ui/preferences_dialog.ui:441
+msgid "Use dark theme:"
+msgstr ""
+
+#: ui/preferences_dialog.ui:492
+msgid "E_xternal photo editor:"
+msgstr "Deasaiche dhealbhan air an taobh a-m_uigh:"
+
+#: ui/preferences_dialog.ui:509
+msgid "External _RAW editor:"
+msgstr "Deasaiche _RAW air an taobh a-muigh:"
+
+#: ui/preferences_dialog.ui:570
+msgid "External Editors"
+msgstr "Deasaichean air an taobh a-muigh"
+
+#: ui/preferences_dialog.ui:595
+msgid "Plugins"
+msgstr "Plugain"
+
+#: ui/preferences_dialog.ui:621
+msgid "Shotwell Preferences"
+msgstr "Roghainnean Shotwell"
+
+#: ui/printing_widget.ui:18
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Meud an deilbh chlò-bhuailte</b>"
 
-#: ui/printing_widget.ui:36
+#: ui/printing_widget.ui:38
 msgid "Use a _standard size:"
 msgstr "Cleachd meud _stannardach:"
 
-#: ui/printing_widget.ui:80
+#: ui/printing_widget.ui:65
 msgid "Use a c_ustom size:"
 msgstr "Cleachd meud g_nàthaichte:"
 
 #. Abbrevation for "inch"
-#: ui/printing_widget.ui:146
+#: ui/printing_widget.ui:128
 msgid "in."
 msgstr "òir."
 
 #. Abbrevation for "centimeters"
-#: ui/printing_widget.ui:147
+#: ui/printing_widget.ui:129
 msgid "cm"
 msgstr "cm"
 
-#: ui/printing_widget.ui:173
+#: ui/printing_widget.ui:146
 msgid "_Match photo aspect ratio"
 msgstr "_Maidsich co-mheas an deilbh"
 
-#: ui/printing_widget.ui:197
+#: ui/printing_widget.ui:161
 msgid "_Autosize:"
 msgstr "Meud fèin-_obrachail:"
 
-#: ui/printing_widget.ui:237
+#: ui/printing_widget.ui:202
 msgid "<b>Titles</b>"
 msgstr "<b>Tiotalan</b>"
 
-#: ui/printing_widget.ui:254
+#: ui/printing_widget.ui:219
 msgid "Print image _title"
 msgstr "Clo-bhuail _tiotal an deilbh"
 
-#: ui/printing_widget.ui:297
+#: ui/printing_widget.ui:262
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Dùmhlachd-bhreacaidh nam piogsailean</b>"
 
-#: ui/printing_widget.ui:317
+#: ui/printing_widget.ui:282
 msgid "_Output photo at:"
 msgstr "Dèan de_albh aig:"
 
-#: ui/printing_widget.ui:351
+#: ui/printing_widget.ui:316
 msgid "pixels per inch"
 msgstr "piogsailean gach òirleach"
 
+#: ui/saved_search_dialog.ui:7
+msgid "Search"
+msgstr "Lorg"
+
+#: ui/saved_search_dialog.ui:23
+msgid "Cancel"
+msgstr "Sguir dheth"
+
+#: ui/saved_search_dialog.ui:36
+msgid "OK"
+msgstr "Ceart ma-thà"
+
+#: ui/saved_search_dialog.ui:74
+msgid "_Name of search:"
+msgstr "_Ainm an luirg:"
+
+#: ui/saved_search_dialog.ui:132
+msgid "_Match"
+msgstr "_Maidsich"
+
+#: ui/saved_search_dialog.ui:149
+msgid "any"
+msgstr "gin sam bith"
+
+#: ui/saved_search_dialog.ui:150
+msgid "all"
+msgstr "na h-uile"
+
+#: ui/saved_search_dialog.ui:151
+msgid "none"
+msgstr "chan eil gin"
+
+#: ui/saved_search_dialog.ui:165
+msgid "of the following:"
+msgstr "dhe na leanas:"
+
 #: ui/set_background_dialog.ui:9
 msgid "Set as Desktop Background"
 msgstr "Suidhich mar chùlaibh an deasga"
 
-#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
 msgid "Use for Desktop"
 msgstr "Cleachd airson an deasga"
 
-#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
 msgid "Use for Lock Screen"
 msgstr "Cleachd airson na sgrìn-glasaidh"
 
@@ -6786,143 +6011,175 @@ msgstr "Cleachd airson na sgrìn-glasaidh"
 msgid "Set as Desktop Slideshow"
 msgstr "Suidhich mar thaisbeanadh-shleamhnagan an deasga"
 
-#: ui/set_background_slideshow_dialog.ui:56
+#: ui/set_background_slideshow_dialog.ui:54
 msgid "Generate desktop background slideshow"
 msgstr "Cruthaich taisbeanadh-shleamhnagan a’ chùlaibh"
 
-#: ui/set_background_slideshow_dialog.ui:82
+#: ui/set_background_slideshow_dialog.ui:80
 msgid "Show each photo for"
 msgstr "Seall gach dealbh"
 
-#: ui/set_background_slideshow_dialog.ui:94
+#: ui/set_background_slideshow_dialog.ui:92
 msgid "period of time"
 msgstr "fad greiseig"
 
-#: ui/set_background_slideshow_dialog.ui:116
+#: ui/set_background_slideshow_dialog.ui:114
 msgid "How long each photo is shown on the desktop background"
 msgstr "Dè cho fad ’s a thèid gach dealbh a shealltainn air cùlaibh an deasga"
 
-#: ui/shotwell.ui:65
-msgid "white"
-msgstr "geal"
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "_Taga ùr…"
 
-#: ui/shotwell.ui:92
-msgid "black"
-msgstr "dubh"
+#: ui/slideshow_settings.ui:98
+msgid "_Delay:"
+msgstr "_Dàil:"
 
-#: ui/shotwell.ui:123
-msgid "Display"
-msgstr "Sealladh"
+#: ui/slideshow_settings.ui:112
+msgid "_Transition effect:"
+msgstr "Èifeachd an _tar-mhùthaidh:"
 
-#: ui/shotwell.ui:160
-msgid "_Background:"
-msgstr "Cùlai_bh:"
+#: ui/slideshow_settings.ui:126
+msgid "Transition d_elay:"
+msgstr "Dàil an tar-mhùthaidh:"
 
-#: ui/shotwell.ui:175
-msgid "_Import photos to:"
-msgstr "_Ion-phortaich dealbhan dha:"
+#: ui/slideshow_settings.ui:136
+msgid "Show t_itle"
+msgstr "Seall an t_iotal"
 
-#: ui/shotwell.ui:186
-msgid "_Watch library directory for new files"
-msgstr "_Cum sùil air pasgan na leabhar-lainn airson faidhlichean ùra"
+#: ui/slideshow_settings.ui:219 ui/slideshow_settings.ui:230
+msgid "seconds"
+msgstr "diogan"
 
-#: ui/shotwell.ui:209
-msgid "Importing"
-msgstr "Ag ion-phortadh"
+#: ui/textentrydialog.ui:66
+msgid "label"
+msgstr "leubail"
 
-#: ui/shotwell.ui:226
-msgid "_Directory structure:"
-msgstr "Structar a’ p_hasgain:"
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Sguab às na dealbhan uile a tha san sgudal"
 
-#: ui/shotwell.ui:240
-msgid "Example:"
-msgstr "Ball-eisimpleir:"
+#~ msgid "shotwell"
+#~ msgstr "shotwell"
 
-#: ui/shotwell.ui:249
-msgid "R_ename imported files to lowercase"
-msgstr "_Sparr litrichean beaga air ainmean fhaidhlichean a thèid ion-phortadh"
+#~ msgid "background color"
+#~ msgstr "dath a’ chùlaibh"
 
-#: ui/shotwell.ui:271
-msgid "Metadata"
-msgstr "Meata-dàta"
+#~ msgid "Enter the confirmation number which appears after you log into Flickr in your Web browser."
+#~ msgstr "Cuir a-steach an àireamh-dhearbhaidh a nochdas an dèidh dhut clàradh a-steach dhan Flickr sa 
bhrabhsair-lìn agad."
 
-#: ui/shotwell.ui:284
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr ""
-"Sgrìobh tagaichean, tiotalan agus _meata-dàta eile ann am faidhlichean deilbh"
+#~ msgid "Authorization _Number:"
+#~ msgstr "_Àireamh ùghdarrais:"
 
-#: ui/shotwell.ui:306
-msgid "RAW Developer"
-msgstr "Leasaichear RAW"
+#~| 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."
+#~ msgid ""
+#~ "You are not currently logged into Picasa Web Albums.\n"
+#~ "\n"
+#~ "Click Log in 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 ""
+#~ "Cha do rinn thu clàradh a-steach air Picasa Web Albums.\n"
+#~ "\n"
+#~ "Briog air “Clàraich a-steach” gus sin a dhèanamh sa bhrabhsair-lìn agad. Bidh agad ri cead a thoirt dha 
Ceangal Shotwell gus ceangal a dhèanamh ris a’ chunntas agad air Picasa Web Albums."
 
-#: ui/shotwell.ui:323
-msgid "De_fault:"
-msgstr "B_un-roghainn"
+#~ 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 ""
+#~ "Cha do rinn thu clàradh a-steach air YouTube.\n"
+#~ "\n"
+#~ "Feumaidh cunntas Google a bhith agad ro làimh ’s e air a shuidheachadh airson ’s gun gabh a chleachdadh 
airson YouTube mus urrainn dhut leantainn air adhart. ’S urrainn dhut, mar is trice, sin a chur air dòigh ma 
chlàraicheas tu a-steach air YouTube sa bhrabhsair-lìn agad co-dhiù aon turas."
 
-#: ui/shotwell.ui:377
-msgid "_Pattern:"
-msgstr "_Pàtran:"
+#~ 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àilte do sheirbheis ion-phortadh leabhar-lannan F-Spot.\n"
+#~ "\n"
+#~ "Tagh leabhar-lann a bu mhath leat ion-phortadh ’s tu a’ taghadh leabharlann a lorg Shotwell no a’ 
taghadh faidhle stòr-dàta F-Spot eile."
 
-#: ui/shotwell.ui:439
-msgid "E_xternal photo editor:"
-msgstr "Deasaiche dhealbhan air an taobh a-m_uigh:"
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select an F-Spot database file."
+#~ msgstr ""
+#~ "Fàilte do sheirbheis ion-phortadh leabhar-lannan F-Spot.\n"
+#~ "\n"
+#~ "Tagh faidhle stòr-dàta F-Spot."
 
-#: ui/shotwell.ui:456
-msgid "External _RAW editor:"
-msgstr "Deasaiche _RAW air an taobh a-muigh:"
+#~ msgid "Manually select an F-Spot database file to import:"
+#~ msgstr "Tagh faidhle stòr-dàta F-Spot de làimh gus ion-phortadh:"
 
-#: ui/shotwell.ui:517
-msgid "External Editors"
-msgstr "Deasaichean air an taobh a-muigh:"
+#~ msgid "Cannot open the selected F-Spot database file: the file does not exist or is not an F-Spot 
database"
+#~ msgstr "Cha ghabh am faidhle stòr-dàta F-Spot a thagh thu fhosgladh: chan eil am faidhle ann no chan e 
stòr-dàta F-Spot tha ann"
 
-#: ui/shotwell.ui:542
-msgid "Plugins"
-msgstr "Plugain"
+#~ msgid "Cannot open the selected F-Spot database file: this version of the F-Spot database is not 
supported by Shotwell"
+#~ msgstr "Cha ghabh am faidhle stòr-dàta F-Spot a thagh thu fhosgladh: chan eil Shotwell a’ cur taic dhan 
tionndadh seo de stòr-dàta F-Spot"
 
-#: ui/shotwell.ui:590
-msgid "_Name of search:"
-msgstr "_Ainm an luirg:"
+#~ msgid "Cannot read the selected F-Spot database file: error while reading tags table"
+#~ msgstr "Cha ghabh am faidhle stòr-dàta F-Spot a thagh thu a leughadh: thachair mearachd fhad ’s a bha 
sinn a’ leughadh clàr nan tagaichean"
 
-#: ui/shotwell.ui:644
-msgid "_Match"
-msgstr "_Maidsich"
+#~ msgid "Cannot read the selected F-Spot database file: error while reading photos table"
+#~ msgstr "Cha ghabh am faidhle stòr-dàta F-Spot a thagh thu a leughadh: thachair mearachd fhad ’s a bha 
sinn a’ leughadh clàr nan dealbhan"
 
-#: ui/shotwell.ui:671
-msgid "of the following:"
-msgstr "dhe na leanas:"
+#~ 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 ""
+#~ "Lorg Shotwell %d dealbh(an) san leabhar-lann F-Spot agus tha e ’gan ion-phortadh. Mothaichidh sinn do 
dhealbhan a tha ann iomadh turas gu fèin-obrachail is bheir sinn air falbh iad.\n"
+#~ "\n"
+#~ "’S urrainn dhut an còmhradh seo a dhùnadh agus tòiseachadh air Shotwell a chleachdadh fhad ’s a tha 
sinne ’ga ion-phortadh fhathast sa chùlaibh."
 
-#: ui/shotwell.ui:752
-msgid "label"
-msgstr "leubail"
+#~ msgid "F-Spot library: %s"
+#~ msgstr "Leabhar-lann F-Spot: %s"
 
-#: ui/shotwell.ui:903
-msgid "_Delay:"
-msgstr "_Dàil:"
+#~ msgid "Preparing to import"
+#~ msgstr "Ag ullachadh airson ion-phortadh"
 
-#: ui/shotwell.ui:917
-msgid "_Transition effect:"
-msgstr "Èifeachd an _tar-mhùthaidh:"
+#~ msgid "Core Data Import Services"
+#~ msgstr "Seirbheisean ion-phortadh prìomh-dhàta"
 
-#: ui/shotwell.ui:931
-msgid "Transition d_elay:"
-msgstr "Dàil an tar-mhùthaidh:"
+#~ msgid "Width or height"
+#~ msgstr "Leud no àirde"
 
-#: ui/shotwell.ui:941
-msgid "Show t_itle"
-msgstr "Seall an t_iotal"
+#~| msgid "“%s” isn't a valid response to an OAuth authentication request"
+#~ msgid "“%s” isn’t a valid response to an OAuth authentication request"
+#~ msgstr "Chan e freagairt cheart air iarratas dearbhaidh OAuth a tha ann “%s”"
 
-#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
-msgid "seconds"
-msgstr "diogan"
+#~| msgid "A file required for publishing is unavailable. Publishing to Picasa can't continue."
+#~ msgid "A file required for publishing is unavailable. Publishing to Picasa can’t continue."
+#~ msgstr "Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. Chan urrainn dhuinn 
foillseachadh air Picasa dhut."
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-#| msgid "New _Tag..."
-msgid "New _Tag…"
-msgstr "_Taga ùr…"
+#~ msgid "You are logged into Picasa Web Albums as %s."
+#~ msgstr "Chlàraich thu a-steach air Picasa Web Albums mar %s."
 
-#: ui/trash.ui:285
-msgid "Delete all photos in the trash"
-msgstr "Sguab às na dealbhan uile a tha san sgudal"
+#~ msgid "%s – “Aachen”"
+#~ msgstr "%s – “Aachen”"
+
+#~ msgid "Export Photos/Videos"
+#~ msgstr "Às-phortaich dealbhan/videothan"
+
+#~ msgid "Extended Information"
+#~ msgstr "Fiosrachadh leudaichte"
+
+#~| msgid "Open With E_xternal Editor"
+#~ msgid "Open with E_xternal Editor"
+#~ msgstr "Fosgail le deasaiche air an ta_obh a-muigh"
+
+#~| msgid "R_emove From Library"
+#~ msgid "R_emove from Library"
+#~ msgstr "T_hoir air falbh on leabhar-lann"
+
+#~ msgid "white"
+#~ msgstr "geal"
+
+#~ msgid "black"
+#~ msgstr "dubh"
 
 #~ msgid "Login"
 #~ msgstr "Clàraich a-steach"
@@ -6931,15 +6188,11 @@ msgstr "Sguab às na dealbhan uile a tha san sgudal"
 #~ msgstr "A' cur fo dheuchainn a' cheangail ri Facebook..."
 
 #~ 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."
+#~ "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 ""
-#~ "Rinn thu clàradh a-steach is a-mach air Flickr san t-seisean Shotwell seo "
-#~ "mu thràth.\n"
-#~ "Ma tha thu airson leantainn air foillseachadh air Flickr, fàg an-seo, ath-"
-#~ "thòisich Shotwell is feuch ri fhoillseachadh às ùr."
+#~ "Rinn thu clàradh a-steach is a-mach air Flickr san t-seisean Shotwell seo mu thràth.\n"
+#~ "Ma tha thu airson leantainn air foillseachadh air Flickr, fàg an-seo, ath-thòisich Shotwell is feuch ri 
fhoillseachadh às ùr."
 
 #~ msgid "Videos will appear in '%s'"
 #~ msgstr "Nochdaidh na videothan ann an \"%s\""
@@ -6978,9 +6231,7 @@ msgstr "Sguab às na dealbhan uile a tha san sgudal"
 #~ msgstr "Sàbhail an dealbh fo ainm eile"
 
 #~ msgid "Print the photo to a printer connected to your computer"
-#~ msgstr ""
-#~ "Clò-bhuail an dealbh air clò-bhualadair a tha ceangailte ris a' "
-#~ "choimpiutair agad"
+#~ msgstr "Clò-bhuail an dealbh air clò-bhualadair a tha ceangailte ris a' choimpiutair agad"
 
 #~ msgid "Previous Photo"
 #~ msgstr "An dealbh roimhe"
@@ -7060,8 +6311,7 @@ msgstr "Sguab às na dealbhan uile a tha san sgudal"
 #~ msgstr "_Cluich a' video"
 
 #~ msgid "Open the selected videos in the system video player"
-#~ msgstr ""
-#~ "Fosgail na videothan a thagh thu ann an cluicheadair video an t-siostaim"
+#~ msgstr "Fosgail na videothan a thagh thu ann an cluicheadair video an t-siostaim"
 
 #~ msgid "Display the comment of each photo"
 #~ msgstr "Seall na beachdan aig gach dealbh"
@@ -7152,25 +6402,17 @@ msgstr "Sguab às na dealbhan uile a tha san sgudal"
 #~ msgid "RAW photos"
 #~ msgstr "Dealbhan RAW"
 
-#~ msgid "Shotwell Preferences"
-#~ msgstr "Roghainnean Shotwell"
-
 #~ msgid "Copyright 2009-2014 Yorba Foundation"
 #~ msgstr "Còir-lethbhreac 2009-2014 Yorba Foundation"
 
 #~ msgid "A file required for publishing is unavailable. Publishing to "
-#~ msgstr ""
-#~ "Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. "
-#~ "A' foillseachadh gu "
+#~ msgstr "Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. A' foillseachadh gu "
 
 #~ msgid "Intro message replaced at runtime"
-#~ msgstr ""
-#~ "Teachdaireachd tòiseachaidh 'ga chur an àite nuair a bhios e a' ruith"
+#~ msgstr "Teachdaireachd tòiseachaidh 'ga chur an àite nuair a bhios e a' ruith"
 
 #~ msgid "'Publishing to $url as $username' (populated in application code)"
-#~ msgstr ""
-#~ "\"'Ga fhoillseachadh gu $url mar $username\" ('ga lìonadh ann an còd na h-"
-#~ "aplacaid)"
+#~ msgstr "\"'Ga fhoillseachadh gu $url mar $username\" ('ga lìonadh ann an còd na h-aplacaid)"
 
 #~ msgid "you are logged in rajce as $name"
 #~ msgstr "Chlàraich thu a-steach air rajce mar $name"
@@ -7209,21 +6451,16 @@ msgstr "Sguab às na dealbhan uile a tha san sgudal"
 #~ msgstr "Còir-lethbhreac 2009-2013 Fonndas Yorba"
 
 #~ msgid "Shotwell is configured to import photos to your home directory.\n"
-#~ msgstr ""
-#~ "Ion-phortaichidh Shotwell dealbhan dhan phasgan-dachaigh agad a-rèir mar "
-#~ "a chaidh a rèiteachadh.\n"
+#~ msgstr "Ion-phortaichidh Shotwell dealbhan dhan phasgan-dachaigh agad a-rèir mar a chaidh a 
rèiteachadh.\n"
 
 #~ msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
-#~ msgstr ""
-#~ "Còir-lethbhreac 2010 Maxim Kartashev, Còir-lethbhreac 2011-2013 Fonndas "
-#~ "Yorba"
+#~ msgstr "Còir-lethbhreac 2010 Maxim Kartashev, Còir-lethbhreac 2011-2013 Fonndas Yorba"
 
 #~ msgid ""
 #~ " (text depends on fb username and is modified in the app - \n"
 #~ "anything put into this field won't display)"
 #~ msgstr ""
-#~ " (tha an teacsa a' crochadh air ainm-cleachdaiche FB agus thèid "
-#~ "atharrachadh san aplacaid - \n"
+#~ " (tha an teacsa a' crochadh air ainm-cleachdaiche FB agus thèid atharrachadh san aplacaid - \n"
 #~ "cha dèid dad a chuireas tu san raon seo a thaisbeanadh)"
 
 #~ msgid "_visibility label (populated in the code)"