Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Meta] 2025 Disclaimer #1381

Merged
merged 1 commit into from
Jan 2, 2025
Merged

[Meta] 2025 Disclaimer #1381

merged 1 commit into from
Jan 2, 2025

Conversation

JPKribs
Copy link
Member

@JPKribs JPKribs commented Jan 2, 2025

Summary

I just pulled in Main then built. This should update all of the Disclaimer '2024' to '2025. I'm making this a stand alone PR so we don't have a random PR with 736 file changes. Instead, this one has 736 file changes.

For example, #1377 has "doubled" in size to include the 2025 changes.

@JPKribs
Copy link
Member Author

JPKribs commented Jan 2, 2025

@LePips No changes made here. Just ran the build on Main to update all of the 2024 to 2025. Goal of the PR is to have the huge 736 file change here instead of cluttering another PR.

The only other change in here looks like Strings file was changed without a build before the last commit. So the discrepancy is just these strings being removed since there is no longer a localization:

Screenshot 2025-01-02 at 12 00 15

@LePips LePips merged commit adec8de into jellyfin:main Jan 2, 2025
4 checks passed
@JPKribs JPKribs deleted the 2025Disclaimer branch January 2, 2025 23:34
JPKribs added a commit to JPKribs/Swiftfin that referenced this pull request Jan 3, 2025
commit adec8de
Author: Joe Kribs <[email protected]>
Date:   Thu Jan 2 16:05:15 2025 -0700

    [Meta] 2025 Disclaimer (jellyfin#1381)
JPKribs added a commit to JPKribs/Swiftfin that referenced this pull request Jan 3, 2025
commit adec8de
Author: Joe Kribs <[email protected]>
Date:   Thu Jan 2 16:05:15 2025 -0700

    [Meta] 2025 Disclaimer (jellyfin#1381)
ddrccw added a commit to ddrccw/Swiftfin that referenced this pull request Jan 26, 2025
* upstream/main: (392 commits)
  [tvOS] Add pin prompt to sign-in screen (jellyfin#1383)
  [iOS] Admin Dashboard - User Access Tags (jellyfin#1377)
  [Meta] 2025 Disclaimer (jellyfin#1381)
  [tvOS] Delete User from User Selection Screen (jellyfin#1359)
  [iOS] Media Item Menu - Identify Media Item (jellyfin#1369)
  [iOS] Admin Dashboard - User Profiles (jellyfin#1328)
  [iOS] Select all Users When Editing (jellyfin#1373)
  [Meta] Automatic String Organization (jellyfin#1372)
  [iOS & tvOS] Unused Localization Cleanup (jellyfin#1362)
  [tvOS] SelectServerView Change to Menu (jellyfin#1363)
  [tvOS] Update ConnectToServerView & UserSignInView (jellyfin#1365)
  Trim Fastlane Options (jellyfin#1367)
  Update Fastlane Runner (jellyfin#1366)
  [iOS & tvOS] Localize Existing Strings (jellyfin#1361)
  [iOS] Admin Dashboard - User Access Schedules (jellyfin#1358)
  [iOS] Admin Dashboard - Parental Ratings (jellyfin#1353)
  [iOS & tvOS] Error Cleanup (jellyfin#1357)
  update (jellyfin#1356)
  Fix possible duplicate ids (jellyfin#1354)
  [tvOS] Media Item Menu - Refresh / Delete Items (jellyfin#1348)
  ...

Signed-off-by: ddrccw <[email protected]>
@JPKribs JPKribs added enhancement New feature or request developer Developer facing issues labels Jan 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
developer Developer facing issues enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants