Merge branch 'release/debian/0.28.4-1'debian/0.28.4-1

3 files changed, 18 insertions, 18 deletions

diff --git a/po/shotwell.pot b/po/shotwell.pot
index da0fa07..744afae 100644
--- a/po/shotwell.pot
+++ b/po/shotwell.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: shotwell 0.28.3\n"
+"Project-Id-Version: shotwell 0.28.4\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=Shotwell&component=Internationalization\n"
-"POT-Creation-Date: 2018-05-07 19:39+0200\n"
+"POT-Creation-Date: 2018-07-14 13:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1273,7 +1273,7 @@ msgstr ""
 msgid "Verifying authorization…"
 msgstr ""
 
-#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118
+#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:137
 msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
@@ -2251,7 +2251,7 @@ msgid "Camera"
 msgstr ""
 
 #. 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:351
+#: src/camera/CameraTable.vala:246
 #, c-format
 msgid "%s (%s)"
 msgstr ""
@@ -2716,7 +2716,7 @@ msgstr ""
 msgid "Database file:"
 msgstr ""
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:783
 msgid "_Import"
 msgstr ""
 
@@ -4003,23 +4003,23 @@ msgstr ""
 msgid "Photos"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:508
+#: src/library/LibraryWindow.vala:509
 msgid "Import From Folder"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:515
+#: src/library/LibraryWindow.vala:516
 msgid "Recurse Into Subfolders"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:584 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:583
+#: src/library/LibraryWindow.vala:584
 msgid "Emptying Trash…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:779
+#: src/library/LibraryWindow.vala:780
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4028,33 +4028,33 @@ msgid ""
 "Do you want to continue importing photos?"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
+#: src/library/LibraryWindow.vala:783 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr ""
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:795
+#: src/library/LibraryWindow.vala:796
 msgid "Photos cannot be imported from this directory."
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1075
+#: src/library/LibraryWindow.vala:1076
 #, c-format
 msgid "%s (%d%%)"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
+#: src/library/LibraryWindow.vala:1120 src/library/LibraryWindow.vala:1131
 msgid "Updating library…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1136
+#: src/library/LibraryWindow.vala:1137
 msgid "Preparing to auto-import photos…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1141
+#: src/library/LibraryWindow.vala:1142
 msgid "Auto-importing photos…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1149
+#: src/library/LibraryWindow.vala:1150
 msgid "Writing metadata to files…"
 msgstr ""
 
diff --git a/po/tr.gmo b/po/tr.gmo
index 92cdb67..776f469 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index f527032..4bbe2b7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -94,7 +94,7 @@ msgstr ""
 "albüm;kamera;kameralar;kırp;düzenle;güzelleştir;dışa aktar;galeri;görüntü;"
 "görüntüler;içe aktar;yerleştir;foto;fotoğraflar;fotolar;resim;resimler;"
 "fotoğrafçılık;yazdır;baskı;yayımlamak;döndür;paylaş;etiketler;video;facebook;"
-"flickr;picasa;youtube;piwigo"
+"flickr;picasa;youtube;piwigo;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8