Merge branch 'main' into david/github-arm-builder

elementary · Feb 24, 2025 · 9e5126e · 9e5126e
2 parents 3b94106 + b2447ad
commit 9e5126e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/io.elementary.videos.yml b/io.elementary.videos.yml
@@ -34,7 +34,8 @@ modules:
   - name: cargo-c
     buildsystem: simple
     build-commands:
-      - "cargo install cargo-c --root /app"
+      # This version is locked to a version that can build with Rust 1.81 which is what's in the SDK
+      - "cargo install --locked cargo-c@0.10.7+cargo-0.84.0 --root /app"
     build-options:
       build-args:
         - "--share=network"

diff --git a/po/extra/extra.pot b/po/extra/extra.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-02 12:46+0000\n"
+"POT-Creation-Date: 2025-02-24 00:44+0000\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"
@@ -48,10 +48,6 @@ msgstr ""
 msgid "Thumbnail previews on the seek bar"
 msgstr ""
 
-#: data/videos.metainfo.xml.in:51
-msgid "elementary, Inc."
-msgstr ""
-
 #: data/videos.metainfo.xml.in:59
 msgid ""
 "Small hotfix release that fixes an annoying issue causing videos to play in "

diff --git a/po/io.elementary.videos.pot b/po/io.elementary.videos.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.elementary.videos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-02 12:46+0000\n"
+"POT-Creation-Date: 2025-02-24 00:44+0000\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"