The translation is temporarily closed for contributions due to maintenance, please come back later.
The translation was automatically locked due to following alerts: Could not merge the repository.
Please sign in to see the alerts.

Overview

Project website www.wallabag.org
Project maintainers User avatar di72nn User avatar tcitworld User avatar strubbl User avatar Kdecherf User avatar nicosomb User avatar j0k3r User avatar bourvill
Translation license MIT License
Translation process
  • Translations can be made directly.
  • Translation suggestions can be made.
  • Any authenticated user can contribute.
  • The translation uses monolingual files.
  • The translation base language is editable.
Source code repository git@github.com:wallabag/ios-app.git
Repository branch main
Last remote commit Add delete entry swipe action 66d2a84
Maxime Marinel authored 5 months ago
Last commit in Weblate Added translation using Weblate (Malayalam) 466fd4a
Weblate authored a year ago
Weblate repository https://hosted.weblate.org/git/wallabag/ios-app/
File mask wallabag/*.lproj/Localizable.strings
Monolingual base language file wallabag/en.lproj/Localizable.strings
6 days ago

String statistics

Strings percent Hosted strings Words percent Hosted words Characters percent Hosted characters
Total 980 2,695 15,330
Source 28 77 438
Translated 44% 434 44% 1,191 44% 6,758
Needs editing 1% 1 1% 5 1% 30
Read-only 0% 0 0% 0 0% 0
Failing checks 1% 16 1% 22 1% 138
Strings with suggestions 9% 89 9% 263 9% 1,517
Untranslated strings 55% 545 55% 1,499 55% 8,542

Quick numbers

2,695
Hosted words
980
Hosted strings
44%
Translated
and previous 30 days

Trends of last 30 days

Hosted words
+100%
Hosted strings
+100%
Translated
+44%
Contributors
User avatar j0k3r

Repository rebase failed

Rebasing (1/220)
Auto-merging .github/ISSUE_TEMPLATE.md
CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE.md
Auto-merging .github/workflows/swift.yml
CONFLICT (add/add): Merge conflict in .github/workflows/swift.yml
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .swift-version
CONFLICT (add/add): Merge conflict in .swift-version
Auto-merging .swiftlint.yml
CONFLICT (add/add): Merge conflict in .swiftlint.yml
Auto-merging Gemfile
CONFLICT (add/add): Merge conflict in Gemfile
Auto-merging Gemfile.lock
CONFLICT (add/add): Merge conflict in Gemfile.lock
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging WallabagKit/.gitignore
CONFLICT (add/add): Merge conflict in WallabagKit/.gitignore
Auto-merging WallabagKit/Package.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Package.swift
Auto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagKitEndpoint.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagKitEndpoint.swift
Auto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift
Auto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift
Auto-merging WallabagKit/Sources/WallabagKit/WallabagKitError.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKitError.swift
Auto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift
Auto-merging bagit/Info.plist
CONFLICT (add/add): Merge conflict in bagit/Info.plist
Auto-merging bagit/ShareExtensionError.swift
CONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift
Auto-merging bagit/ShareViewController.swift
CONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift
Auto-merging fastlane/Fastfile
CONFLICT (add/add): Merge conflict in fastlane/Fastfile
Auto-merging fastlane/README.md
CONFLICT (add/add): Merge conflict in fastlane/README.md
Auto-merging fastlane/Snapfile
CONFLICT (add/add): Merge conflict in fastlane/Snapfile
Auto-merging fastlane/SnapshotHelper.swift
CONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift
Auto-merging fastlane/metadata/copyright.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt
Auto-merging fastlane/metadata/en-US/privacy_url.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt
Auto-merging fastlane/metadata/en-US/promotional_text.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt
Auto-merging fastlane/metadata/en-US/release_notes.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt
Auto-merging fastlane/metadata/en-US/support_url.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt
Auto-merging fastlane/metadata/fr-FR/description.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt
Auto-merging fastlane/metadata/fr-FR/privacy_url.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt
Auto-merging fastlane/metadata/fr-FR/promotional_text.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt
Auto-merging fastlane/metadata/fr-FR/release_notes.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt
Auto-merging fastlane/metadata/fr-FR/support_url.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt
Auto-merging fastlane/metadata/primary_category.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt
Auto-merging fastlane/metadata/secondary_category.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt
Auto-merging wallabag.xcodeproj/project.pbxproj
CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj
Auto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
Auto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme
CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme
Auto-merging wallabag.xcodeproj/xcshareddata/xcschemes/wallabag.xcscheme
CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/wallabag.xcscheme
Auto-merging wallabagTests/Info.plist
CONFLICT (add/add): Merge conflict in wallabagTests/Info.plist
error: could not apply b601fb4... Release day
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b601fb4... Release day
 (1)
3 months ago
User avatar None

Repository rebase failed

Rebasing (1/220)
Auto-merging .github/ISSUE_TEMPLATE.md
CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE.md
Auto-merging .github/workflows/swift.yml
CONFLICT (add/add): Merge conflict in .github/workflows/swift.yml
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .swift-version
CONFLICT (add/add): Merge conflict in .swift-version
Auto-merging .swiftlint.yml
CONFLICT (add/add): Merge conflict in .swiftlint.yml
Auto-merging Gemfile
CONFLICT (add/add): Merge conflict in Gemfile
Auto-merging Gemfile.lock
CONFLICT (add/add): Merge conflict in Gemfile.lock
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging WallabagKit/.gitignore
CONFLICT (add/add): Merge conflict in WallabagKit/.gitignore
Auto-merging WallabagKit/Package.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Package.swift
Auto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagKitEndpoint.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagKitEndpoint.swift
Auto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift
Auto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift
Auto-merging WallabagKit/Sources/WallabagKit/WallabagKitError.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKitError.swift
Auto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift
Auto-merging bagit/Info.plist
CONFLICT (add/add): Merge conflict in bagit/Info.plist
Auto-merging bagit/ShareExtensionError.swift
CONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift
Auto-merging bagit/ShareViewController.swift
CONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift
Auto-merging fastlane/Fastfile
CONFLICT (add/add): Merge conflict in fastlane/Fastfile
Auto-merging fastlane/README.md
CONFLICT (add/add): Merge conflict in fastlane/README.md
Auto-merging fastlane/Snapfile
CONFLICT (add/add): Merge conflict in fastlane/Snapfile
Auto-merging fastlane/SnapshotHelper.swift
CONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift
Auto-merging fastlane/metadata/copyright.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt
Auto-merging fastlane/metadata/en-US/privacy_url.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt
Auto-merging fastlane/metadata/en-US/promotional_text.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt
Auto-merging fastlane/metadata/en-US/release_notes.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt
Auto-merging fastlane/metadata/en-US/support_url.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt
Auto-merging fastlane/metadata/fr-FR/description.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt
Auto-merging fastlane/metadata/fr-FR/privacy_url.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt
Auto-merging fastlane/metadata/fr-FR/promotional_text.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt
Auto-merging fastlane/metadata/fr-FR/release_notes.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt
Auto-merging fastlane/metadata/fr-FR/support_url.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt
Auto-merging fastlane/metadata/primary_category.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt
Auto-merging fastlane/metadata/secondary_category.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt
Auto-merging wallabag.xcodeproj/project.pbxproj
CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj
Auto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
Auto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme
CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme
Auto-merging wallabag.xcodeproj/xcshareddata/xcschemes/wallabag.xcscheme
CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/wallabag.xcscheme
Auto-merging wallabagTests/Info.plist
CONFLICT (add/add): Merge conflict in wallabagTests/Info.plist
error: could not apply b601fb4... Release day
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b601fb4... Release day
 (1)
5 months ago
User avatar None

Repository notification received

GitHub: https://github.com/wallabag/ios-app, main 5 months ago
User avatar HangeFurude

Suggestion added

7 months ago
User avatar HangeFurude

Suggestion added

8 months ago
User avatar HangeFurude

Suggestion removed

8 months ago
User avatar HangeFurude

Suggestion added

8 months ago
User avatar None

Repository rebase failed

Rebasing (1/220)
Auto-merging .github/ISSUE_TEMPLATE.md
CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE.md
Auto-merging .github/workflows/swift.yml
CONFLICT (add/add): Merge conflict in .github/workflows/swift.yml
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .swift-version
CONFLICT (add/add): Merge conflict in .swift-version
Auto-merging .swiftlint.yml
CONFLICT (add/add): Merge conflict in .swiftlint.yml
Auto-merging Gemfile
CONFLICT (add/add): Merge conflict in Gemfile
Auto-merging Gemfile.lock
CONFLICT (add/add): Merge conflict in Gemfile.lock
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging WallabagKit/.gitignore
CONFLICT (add/add): Merge conflict in WallabagKit/.gitignore
Auto-merging WallabagKit/Package.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Package.swift
Auto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagKitEndpoint.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagKitEndpoint.swift
Auto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift
Auto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift
Auto-merging WallabagKit/Sources/WallabagKit/WallabagKitError.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKitError.swift
Auto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift
Auto-merging bagit/Info.plist
CONFLICT (add/add): Merge conflict in bagit/Info.plist
Auto-merging bagit/ShareExtensionError.swift
CONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift
Auto-merging bagit/ShareViewController.swift
CONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift
Auto-merging fastlane/Fastfile
CONFLICT (add/add): Merge conflict in fastlane/Fastfile
Auto-merging fastlane/README.md
CONFLICT (add/add): Merge conflict in fastlane/README.md
Auto-merging fastlane/Snapfile
CONFLICT (add/add): Merge conflict in fastlane/Snapfile
Auto-merging fastlane/SnapshotHelper.swift
CONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift
Auto-merging fastlane/metadata/copyright.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt
Auto-merging fastlane/metadata/en-US/privacy_url.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt
Auto-merging fastlane/metadata/en-US/promotional_text.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt
Auto-merging fastlane/metadata/en-US/release_notes.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt
Auto-merging fastlane/metadata/en-US/support_url.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt
Auto-merging fastlane/metadata/fr-FR/description.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt
Auto-merging fastlane/metadata/fr-FR/privacy_url.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt
Auto-merging fastlane/metadata/fr-FR/promotional_text.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt
Auto-merging fastlane/metadata/fr-FR/release_notes.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt
Auto-merging fastlane/metadata/fr-FR/support_url.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt
Auto-merging fastlane/metadata/primary_category.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt
Auto-merging fastlane/metadata/secondary_category.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt
Auto-merging wallabag.xcodeproj/project.pbxproj
CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj
Auto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
Auto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme
CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme
Auto-merging wallabag.xcodeproj/xcshareddata/xcschemes/wallabag.xcscheme
CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/wallabag.xcscheme
Auto-merging wallabagTests/Info.plist
CONFLICT (add/add): Merge conflict in wallabagTests/Info.plist
error: could not apply b601fb4... Release day
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b601fb4... Release day
 (1)
8 months ago
User avatar None

Repository notification received

GitHub: https://github.com/wallabag/ios-app, main 8 months ago
User avatar None

Repository rebase failed

Rebasing (1/220)
Auto-merging .github/ISSUE_TEMPLATE.md
CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE.md
Auto-merging .github/workflows/swift.yml
CONFLICT (add/add): Merge conflict in .github/workflows/swift.yml
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .swift-version
CONFLICT (add/add): Merge conflict in .swift-version
Auto-merging .swiftlint.yml
CONFLICT (add/add): Merge conflict in .swiftlint.yml
Auto-merging Gemfile
CONFLICT (add/add): Merge conflict in Gemfile
Auto-merging Gemfile.lock
CONFLICT (add/add): Merge conflict in Gemfile.lock
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging WallabagKit/.gitignore
CONFLICT (add/add): Merge conflict in WallabagKit/.gitignore
Auto-merging WallabagKit/Package.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Package.swift
Auto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagKitEndpoint.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagKitEndpoint.swift
Auto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift
Auto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift
Auto-merging WallabagKit/Sources/WallabagKit/WallabagKitError.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKitError.swift
Auto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift
CONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift
Auto-merging bagit/Info.plist
CONFLICT (add/add): Merge conflict in bagit/Info.plist
Auto-merging bagit/ShareExtensionError.swift
CONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift
Auto-merging bagit/ShareViewController.swift
CONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift
Auto-merging fastlane/Fastfile
CONFLICT (add/add): Merge conflict in fastlane/Fastfile
Auto-merging fastlane/README.md
CONFLICT (add/add): Merge conflict in fastlane/README.md
Auto-merging fastlane/Snapfile
CONFLICT (add/add): Merge conflict in fastlane/Snapfile
Auto-merging fastlane/SnapshotHelper.swift
CONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift
Auto-merging fastlane/metadata/copyright.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt
Auto-merging fastlane/metadata/en-US/privacy_url.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt
Auto-merging fastlane/metadata/en-US/promotional_text.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt
Auto-merging fastlane/metadata/en-US/release_notes.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt
Auto-merging fastlane/metadata/en-US/support_url.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt
Auto-merging fastlane/metadata/fr-FR/description.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt
Auto-merging fastlane/metadata/fr-FR/privacy_url.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt
Auto-merging fastlane/metadata/fr-FR/promotional_text.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt
Auto-merging fastlane/metadata/fr-FR/release_notes.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt
Auto-merging fastlane/metadata/fr-FR/support_url.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt
Auto-merging fastlane/metadata/primary_category.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt
Auto-merging fastlane/metadata/secondary_category.txt
CONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt
Auto-merging wallabag.xcodeproj/project.pbxproj
CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj
Auto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
Auto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme
CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme
Auto-merging wallabag.xcodeproj/xcshareddata/xcschemes/wallabag.xcscheme
CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/wallabag.xcscheme
Auto-merging wallabagTests/Info.plist
CONFLICT (add/add): Merge conflict in wallabagTests/Info.plist
error: could not apply b601fb4... Release day
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b601fb4... Release day
 (1)
8 months ago
Browse all component changes