Merge branch 'feature/upstream' into develop

2 files changed, 32 insertions, 40 deletions

diff --git a/help/sv/sv.po b/help/sv/sv.po
index 3c24835..310bf59 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -1,13 +1,13 @@
 # Swedish translation for shotwell help
-# Copyright © 2015-2020 shotwell's COPYRIGHT HOLDER
+# Copyright © 2015-2021 shotwell's COPYRIGHT HOLDER
 # This file is distributed under the same license as the shotwell package.
 # Josef Andersson <josef.andersson@fripost.org>, 2015.
-# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2016, 2017, 2018, 2019, 2020.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2016, 2017, 2018, 2019, 2020, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell master\n"
-"POT-Creation-Date: 2020-09-12 22:50+0000\n"
-"PO-Revision-Date: 2020-11-08 15:17+0100\n"
+"POT-Creation-Date: 2021-06-21 18:17+0000\n"
+"PO-Revision-Date: 2021-06-22 01:26+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Poedit 2.4.2\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -2756,14 +2756,14 @@ msgid ""
 "Shotwell may also be executed automatically when a camera is plugged in to "
 "your computer. To check that your system is set up to run Shotwell when a "
 "camera is detected, go to <guiseq><gui>Edit</gui><gui>Preferences</gui></"
-"guiseq> in any Nautilus (file browser) window and choose the <gui>Media</"
-"gui> tab.  You'll see a dropdown box entitled <gui>Photos:</gui> which lets "
+"guiseq> in any Nautilus (file browser) window and choose the <gui>Media</"
+"gui> tab. You'll see a dropdown box entitled <gui>Photos:</gui> which lets "
 "you choose Shotwell as your photo handling application."
 msgstr ""
 "Shotwell kan också exekveras automatiskt när en kamera stoppas i din dator. "
 "För att kontrollera att ditt system är inställt på att köra Shotwell när en "
 "kamera upptäcks, gå till <guiseq><gui>Redigera</gui><gui>Inställningar</"
-"gui></guiseq> i ett Nautilus(filhanterare)-fönster och markera fliken "
+"gui></guiseq> i ett filhanterarfönster (Nautilus) och välj fliken "
 "<gui>Media</gui>. Du kommer att se en rullgardinsmeny som heter <gui>Bilder:"
 "</gui> vilken låter dig välja Shotwell som ditt program för bildhantering."
 
diff --git a/help/uk/uk.po b/help/uk/uk.po
index 31394bc..a906850 100644
--- a/help/uk/uk.po
+++ b/help/uk/uk.po
@@ -2,21 +2,20 @@
 # Copyright (C) 2020 shotwell's COPYRIGHT HOLDER
 # This file is distributed under the same license as the shotwell package.
 #
-# Yuri Chornoivan <yurchor@ukr.net>, 2020.
+# Yuri Chornoivan <yurchor@ukr.net>, 2020, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell master\n"
-"POT-Creation-Date: 2020-06-23 16:08+0000\n"
-"PO-Revision-Date: 2020-06-26 17:26+0300\n"
+"POT-Creation-Date: 2021-06-21 17:33+0000\n"
+"PO-Revision-Date: 2021-06-21 21:16+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\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 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Lokalize 20.07.70\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Lokalize 20.12.0\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -750,15 +749,12 @@ msgstr ""
 
 #. (itstool) path: info/desc
 #: C/formats.page:7
-#| msgid ""
-#| "Shotwell supports JPEG, PNG, TIFF, BMP, GIF, WebP and RAW photo files as "
-#| "well as video files."
 msgid ""
 "Shotwell supports JPEG, PNG, TIFF, BMP and RAW photo files as well as video "
 "files."
 msgstr ""
-"У Shotwell передбачено підтримку файлів фотографій JPEG, PNG, TIFF, BMP та"
-" цифрових негативів (RAW), а також відеофайлів."
+"У Shotwell передбачено підтримку файлів фотографій JPEG, PNG, TIFF, BMP та "
+"цифрових негативів (RAW), а також відеофайлів."
 
 #. (itstool) path: page/title
 #: C/formats.page:12
@@ -767,26 +763,17 @@ msgstr "Підтримувані формати фотографій та від
 
 #. (itstool) path: page/p
 #: C/formats.page:14
-#| msgid ""
-#| "Shotwell supports JPEG, PNG, TIFF, BMP, GIF, WebP and <link xref=\"other-"
-#| "raw\">RAW</link> photo files."
 msgid ""
 "Shotwell supports JPEG, PNG, TIFF, BMP and <link xref=\"other-raw\">RAW</"
 "link> photo files. Shotwell does not yet support other graphics format such "
 "as GIF."
 msgstr ""
-"У Shotwell передбачено підтримку файлів фотографій JPEG, PNG, TIFF, BMP та <"
-"link xref=\"other-raw\">RAW</link>. У Shotwell ще не передбачено підтримки"
-" інших форматів графічних даних, зокрема GIF."
+"У Shotwell передбачено підтримку файлів фотографій JPEG, PNG, TIFF, BMP та "
+"<link xref=\"other-raw\">RAW</link>. У Shotwell ще не передбачено підтримки "
+"інших форматів графічних даних, зокрема GIF."
 
 #. (itstool) path: page/p
 #: C/formats.page:16
-#| msgid ""
-#| "Shotwell's RAW format support is currently limited. When you view a RAW "
-#| "photo, you are actually viewing a JPEG derived from the RAW photo, not "
-#| "the RAW image itself. Additionally, the RAW editing pipeline is not fully "
-#| "16-bit - you can only export edited photos as 8-bit files. Most supported "
-#| "formats can be used for export (JPEG, PNG, TIFF, BMP)."
 msgid ""
 "Shotwell's RAW format support is currently limited. When you view a RAW "
 "photo, you are actually viewing a JPEG derived from the RAW photo, not the "
@@ -2860,12 +2847,19 @@ msgstr ""
 
 #. (itstool) path: page/p
 #: C/running.page:18
+#| msgid ""
+#| "Shotwell may also be executed automatically when a camera is plugged in "
+#| "to your computer. To check that your system is set up to run Shotwell "
+#| "when a camera is detected, go to <guiseq><gui>Edit</gui><gui>Preferences</"
+#| "gui></guiseq> in any Nautilus (file browser) window and choose the "
+#| "<gui>Media</gui> tab.  You'll see a dropdown box entitled <gui>Photos:</"
+#| "gui> which lets you choose Shotwell as your photo handling application."
 msgid ""
 "Shotwell may also be executed automatically when a camera is plugged in to "
 "your computer. To check that your system is set up to run Shotwell when a "
 "camera is detected, go to <guiseq><gui>Edit</gui><gui>Preferences</gui></"
-"guiseq> in any Nautilus (file browser) window and choose the <gui>Media</"
-"gui> tab.  You'll see a dropdown box entitled <gui>Photos:</gui> which lets "
+"guiseq> in any Nautilus (file browser) window and choose the <gui>Media</"
+"gui> tab. You'll see a dropdown box entitled <gui>Photos:</gui> which lets "
 "you choose Shotwell as your photo handling application."
 msgstr ""
 "Крім того, можна налаштувати Shotwell на автоматичний запуск, коли з "
@@ -3257,7 +3251,6 @@ msgstr ""
 
 #. (itstool) path: item/p
 #: C/share-upload.page:18
-#| msgid "<link href=\"https://flickr.com\">Flickr</link>"
 msgid "<link href=\"https://facebook.com\">Facebook</link>"
 msgstr "<link href=\"https://facebook.com\">Facebook</link>"
 
@@ -3278,7 +3271,6 @@ msgstr "<link href=\"https://youtube.com\">YouTube</link> (лише відео)"
 
 #. (itstool) path: item/p
 #: C/share-upload.page:22
-#| msgid "<link href=\"https://tumblr.com\">Tumblr</link> (Photos only)"
 msgid "<link href=\"https://tumblr.com\">Tumblr</link> (videos only)"
 msgstr "<link href=\"https://tumblr.com\">Tumblr</link> (лише фотографії)"
 
@@ -3320,9 +3312,9 @@ msgid ""
 "Shotwell Facebook application. You only need to grant these permissions "
 "once, when you first associate Shotwell with your Facebook account."
 msgstr ""
-"Оприлюднення даних на Facebook потребує надання з вашого боку певних прав"
-" доступу для програми Shotwell Facebook. Надати ці права достатньо один раз,"
-" коли ви вперше пов'язуєте Shotwell із вашим обліковим записом Facebook."
+"Оприлюднення даних на Facebook потребує надання з вашого боку певних прав "
+"доступу для програми Shotwell Facebook. Надати ці права достатньо один раз, "
+"коли ви вперше пов'язуєте Shotwell із вашим обліковим записом Facebook."
 
 #. (itstool) path: note/p
 #: C/share-upload.page:34
@@ -3330,8 +3322,8 @@ msgid ""
 "You will be only able to publish images with at most the permission you "
 "granted to the Shotwell Facebook application"
 msgstr ""
-"Ви зможете оприлюднювати зображення лише з тими правами доступу, які ви"
-" надали програмі Shotwell Facebook."
+"Ви зможете оприлюднювати зображення лише з тими правами доступу, які ви "
+"надали програмі Shotwell Facebook."
 
 #. (itstool) path: page/p
 #: C/share-upload.page:36