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 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.
Translation license MIT License
Source code repository git@github.com:wallabag/ios-app.git
Repository branch main
Last remote commit Prepare build 09d6a02
Maxime Marinel authored a month ago
Last commit in Weblate Translated using Weblate (Lithuanian) 66f908b
User avatar IdeallyGrey authored 11 months 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

String statistics

Strings percent Hosted strings Words percent Hosted words Characters percent Hosted characters
Total 924 2,541 14,454
Source 28 77 438
Translated 46% 434 46% 1,191 46% 6,758
Needs editing 1% 1 1% 5 1% 30
Read-only 0% 0 0% 0 0% 0
Failing checks 3% 31 1% 41 1% 279
Strings with suggestions 8% 80 9% 238 9% 1,367
Untranslated strings 52% 489 52% 1,345 53% 7,666

Quick numbers

2,541
Hosted words
924
Hosted strings
46%
Translated
0
Contributors
and previous 30 days

Trends of last 30 days

Hosted words
Hosted strings
Translated
Contributors
User avatar None

Failed rebase on repository

wallabag / App (iOS)

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

Failed rebase on repository

wallabag / App (iOS)

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

Failed rebase on repository

wallabag / App (iOS)

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

Received repository notification

wallabag / App (iOS)

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

Failed rebase on repository

wallabag / App (iOS)

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

Received repository notification

wallabag / App (iOS)

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

Failed rebase on repository

wallabag / App (iOS)

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

Received repository notification

wallabag / App (iOS)

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

Failed rebase on repository

wallabag / App (iOS)

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

Received repository notification

wallabag / App (iOS)

GitHub: https://github.com/wallabag/ios-app, main 2 months ago
Browse all component changes