From 436f7ad899fe1b56b192ed6bc8ecbe074b10c0e5 Mon Sep 17 00:00:00 2001
From: Automated System <gitea@mirror.git.trinitydesktop.org>
Date: Wed, 10 Mar 2021 21:42:59 +0000
Subject: Merge translation files from master branch.

---
 po/is/amarok.po | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'po/is/amarok.po')

diff --git a/po/is/amarok.po b/po/is/amarok.po
index bb64e204..74b16a50 100644
--- a/po/is/amarok.po
+++ b/po/is/amarok.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: amarok\n"
-"POT-Creation-Date: 2021-02-07 17:01+0100\n"
+"POT-Creation-Date: 2021-03-10 20:20+0000\n"
 "PO-Revision-Date: 2008-07-24 13:12+0000\n"
 "Last-Translator: Sveinn í Felli\n"
 "Language-Team:  <is@li.org>\n"
@@ -731,11 +731,11 @@ msgstr "Stilla safn"
 
 #: collectionbrowser.cpp:1123 collectionbrowser.cpp:1135
 #: collectionbrowser.cpp:3967 collectionbrowser.cpp:3978
-#: collectionbrowser.cpp:4271 collectiondb.cpp:2395 collectiondb.cpp:2414
-#: collectiondb.cpp:2432 collectiondb.cpp:2453 collectiondb.cpp:2471
-#: collectiondb.cpp:7036 collectiondb.cpp:7092 collectiondb.cpp:7126
-#: collectiondb.cpp:7175 collectiondb.cpp:7229 collectiondb.cpp:7258
-#: collectiondb.cpp:7310 collectiondb.cpp:7348 collectiondb.cpp:7376
+#: collectionbrowser.cpp:4271 collectiondb.cpp:2394 collectiondb.cpp:2413
+#: collectiondb.cpp:2431 collectiondb.cpp:2452 collectiondb.cpp:2470
+#: collectiondb.cpp:7035 collectiondb.cpp:7091 collectiondb.cpp:7125
+#: collectiondb.cpp:7174 collectiondb.cpp:7228 collectiondb.cpp:7257
+#: collectiondb.cpp:7309 collectiondb.cpp:7347 collectiondb.cpp:7375
 #: contextbrowser.cpp:1409 contextbrowser.cpp:1444 contextbrowser.cpp:1647
 #: contextbrowser.cpp:1693 contextbrowser.cpp:2688 contextbrowser.cpp:2717
 #: contextbrowser.cpp:2723 contextbrowser.cpp:2851 contextbrowser.cpp:2879
@@ -1098,8 +1098,8 @@ msgstr ""
 msgid "Flat View Columns"
 msgstr "Dálkar flatar sýnar"
 
-#: collectionbrowser.cpp:4040 collectiondb.cpp:2165 collectiondb.cpp:2230
-#: collectiondb.cpp:7051 collectiondb.cpp:7141 collectiondb.cpp:7191
+#: collectionbrowser.cpp:4040 collectiondb.cpp:2164 collectiondb.cpp:2229
+#: collectiondb.cpp:7050 collectiondb.cpp:7140 collectiondb.cpp:7190
 #: covermanager.cpp:132 covermanager.cpp:439 covermanager.cpp:942
 #: database_refactor/collectiondb.cpp:1120
 #: mediadevice/generic/genericmediadevice.cpp:541
@@ -1113,7 +1113,7 @@ msgstr "Dálkar flatar sýnar"
 msgid "Various Artists"
 msgstr "Ýmsir flytjendur"
 
-#: collectiondb.cpp:1752
+#: collectiondb.cpp:1751
 #, c-format
 msgid ""
 "_n: One item\n"
@@ -1122,13 +1122,13 @@ msgstr ""
 "Einn hlutur\n"
 "%n hlutir"
 
-#: collectiondb.cpp:1757
+#: collectiondb.cpp:1756
 msgid ""
 "_: X songs from X albums\n"
 "%2 from %1"
 msgstr "%2 frá %1"
 
-#: collectiondb.cpp:1758
+#: collectiondb.cpp:1757
 #, c-format
 msgid ""
 "_n: one album\n"
@@ -1137,7 +1137,7 @@ msgstr ""
 "Ein plata\n"
 "%n plötur"
 
-#: collectiondb.cpp:1762
+#: collectiondb.cpp:1761
 #, c-format
 msgid ""
 "_n: One song\n"
@@ -1146,7 +1146,7 @@ msgstr ""
 "Eitt lag\n"
 "%n lög"
 
-#: collectiondb.cpp:1765
+#: collectiondb.cpp:1764
 #, c-format
 msgid ""
 "_n: One playlist\n"
@@ -1155,7 +1155,7 @@ msgstr ""
 "Einn lagalisti\n"
 "%n lagalistar"
 
-#: collectiondb.cpp:1767
+#: collectiondb.cpp:1766
 #, c-format
 msgid ""
 "_n: One remote file\n"
@@ -1164,34 +1164,34 @@ msgstr ""
 "Ein fjarlæg skrá\n"
 "%n fjarlægar skrár"
 
-#: collectiondb.cpp:1769
+#: collectiondb.cpp:1768
 msgid "Unknown item"
 msgstr "Óþekktur hlutur"
 
-#: collectiondb.cpp:3584
+#: collectiondb.cpp:3583
 msgid "from"
 msgstr "frá"
 
-#: collectiondb.cpp:5354 collectiondb.cpp:5363
+#: collectiondb.cpp:5353 collectiondb.cpp:5362
 msgid "Updating database"
 msgstr "Uppfæri gagnagrunn"
 
-#: collectiondb.cpp:6466
+#: collectiondb.cpp:6465
 msgid "MySQL reported the following error:<br>"
 msgstr "MySQL skilaði eftirfarandi villu:<br>"
 
-#: collectiondb.cpp:6467
+#: collectiondb.cpp:6466
 msgid ""
 "<p>You can configure MySQL in the Collection section under Settings-"
 ">Configure Amarok</p>"
 msgstr ""
 "<p>Þú getur stillt MySQL í safnhlutanum í Stillingar->Stilla Amarok</p>"
 
-#: collectiondb.cpp:6633
+#: collectiondb.cpp:6632
 msgid "Postgresql reported the following error:<br>"
 msgstr "Postgresql skilaði eftirfarandi villu:<br>"
 
-#: collectiondb.cpp:6634
+#: collectiondb.cpp:6633
 msgid ""
 "<p>You can configure Postgresql in the Collection section under Settings-"
 ">Configure Amarok</p>"
-- 
cgit v1.2.1