Merge pull request #700 from anxdpanic/weblate-conflict

Resolve Weblate merge conflicts
anxdpanic · Apr 12, 2024 · 505152a · 505152a
2 parents a375505 + 40ef176
commit 505152a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/resources/language/resource.language.en_au/strings.po b/resources/language/resource.language.en_au/strings.po
@@ -271,12 +271,7 @@ msgctxt "#30120"
 msgid "Confirm clear"
 msgstr ""
 
-msgctxt "#30121"
-msgid "Clear %s?"
-msgstr ""
-
-# YouTube
-# empty strings from id 30122 to 30199
+# empty strings from id 30121 to 30199
 
 msgctxt "#30200"
 msgid "API"

diff --git a/resources/language/resource.language.en_nz/strings.po b/resources/language/resource.language.en_nz/strings.po
@@ -271,10 +271,6 @@ msgctxt "#30120"
 msgid "Confirm clear"
 msgstr ""
 
-msgctxt "#30121"
-msgid "Clear %s?"
-msgstr ""
-
 # YouTube
 # empty strings from id 30122 to 30199
 

diff --git a/resources/language/resource.language.en_us/strings.po b/resources/language/resource.language.en_us/strings.po
@@ -1479,15 +1479,15 @@ msgid "8K/60 fps, HDR, using AV1 | Modern device or PC with full capabilities"
 msgstr ""
 
 msgctxt "#30793"
-msgid "Views count display color"
+msgid "Views count display colour"
 msgstr ""
 
 msgctxt "#30794"
-msgid "Likes count display color"
+msgid "Likes count display colour"
 msgstr ""
 
 msgctxt "#30795"
-msgid "Comments count display color"
+msgid "Comments count display colour"
 msgstr ""
 
 msgctxt "#30796"