Merge branch 'asonix/changes' into asonix/downstream

config/locales/dog.yml

@@ -811,8 +811,8 @@ dog:
   themes:
     contrast: High contrast
     contrast-wider: High contrast (wider)
-    dog: Dog
-    dog-wider: Dog (wider)
+    pop: Pop
+    pop-wider: Pop (wider)
     mastodon: Mastodon
     mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)

config/locales/en.yml

@@ -811,8 +811,8 @@ en:
   themes:
     contrast: High contrast
     contrast-wider: High contrast (wider)
-    dog: Dog
-    dog-wider: Dog (wider)
+    pop: Pop
+    pop-wider: Pop (wider)
     mastodon: Mastodon
     mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)

config/locales/lion.yml

@@ -810,8 +810,8 @@ lion:
   themes:
     contrast: High contrast
     contrast-wider: High contrast (wider)
-    dog: Dog
-    dog-wider: Dog (wider)
+    pop: Pop
+    pop-wider: Pop (wider)
     mastodon: Mastodon
     mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)

config/locales/squeak.yml

@@ -811,8 +811,8 @@ squeak:
   themes:
     contrast: High contrast
     contrast-wider: High contrast (wider)
-    dog: Dog
-    dog-wider: Dog (wider)
+    pop: Pop
+    pop-wider: Pop (wider)
     mastodon: Mastodon
     mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)

config/themes.yml

@@ -1,7 +1,7 @@
 contrast: styles/contrast.scss
 contrast-wider: styles/contrast-wider.scss
-dog-wider: styles/dog-wider.scss
-dog: styles/dog.scss
+pop-wider: styles/pop-wider.scss
+pop: styles/pop.scss
 mastodon: styles/application.scss
 mastodon-wider: styles/mastodon-wider.scss
 mastodon-light: styles/mastodon-light.scss