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.
Language Translated Unfinished Unfinished words Unfinished characters Untranslated Checks Suggestions Comments
English This language is used for source strings. Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 2
Arabic Fix this component to clear its alerts. This translation is locked. MIT 0% 13 23 143 13 0 0 0
Aragonese Fix this component to clear its alerts. This translation is locked. MIT 0% 13 23 143 13 0 0 0
Basque Fix this component to clear its alerts. This translation is locked. MIT 0% 13 23 143 13 0 0 0
Chinese (Simplified) Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 0
Chinese (Traditional) Fix this component to clear its alerts. This translation is locked. MIT 76% 3 8 51 3 0 0 0
Croatian Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 0
Czech Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 0
Danish Fix this component to clear its alerts. This translation is locked. MIT 0% 13 23 143 13 0 0 0
Dutch Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 0
French Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 0
Galician Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 0
German Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 0
Greek Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 0
Hindi Fix this component to clear its alerts. This translation is locked. MIT 0% 13 23 143 13 0 0 0
Hungarian Fix this component to clear its alerts. This translation is locked. MIT 0% 13 23 143 13 0 0 0
Indonesian Fix this component to clear its alerts. This translation is locked. MIT 0% 13 23 143 13 0 0 0
Italian Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 0
Japanese Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 0
Korean Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 0
Lithuanian Fix this component to clear its alerts. This translation is locked. MIT 0% 13 23 143 13 0 0 0
Norwegian Bokmål Fix this component to clear its alerts. This translation is locked. MIT 76% 3 6 42 3 0 0 0
Occitan Fix this component to clear its alerts. This translation is locked. MIT 0% 13 23 143 13 0 0 0
Persian Fix this component to clear its alerts. This translation is locked. MIT 0% 13 23 143 13 0 0 0
Polish Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 0
Portuguese Fix this component to clear its alerts. This translation is locked. MIT 0% 13 23 143 13 0 0 0
Romanian Fix this component to clear its alerts. This translation is locked. MIT 0% 13 23 143 13 0 0 0
Russian Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 0
Spanish Fix this component to clear its alerts. This translation is locked. MIT 92% 1 4 20 1 0 0 0
Swedish Fix this component to clear its alerts. This translation is locked. MIT 0% 13 23 143 13 0 0 0
Thai Fix this component to clear its alerts. This translation is locked. MIT 0% 13 23 143 13 0 0 0
Turkish Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 0
Ukrainian Fix this component to clear its alerts. This translation is locked. MIT 0% 13 23 143 13 0 0 0
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 Clean AppDelegate 31387d1
Maxime Marinel authored 11 days ago
Last commit in Weblate Added translation using Weblate (Lithuanian) 33a053c
Weblate authored 7 months ago
Weblate repository https://hosted.weblate.org/git/wallabag/ios-app-setting/
File mask wallabag/Settings.bundle/*.lproj/Root.strings
Monolingual base language file wallabag/Settings.bundle/en.lproj/Root.strings

String statistics

Strings percent Hosted strings Words percent Hosted words Characters percent Hosted characters
Total 429 759 4,719
Source 13 23 143
Translated 52% 227 52% 396 52% 2,461
Needs editing 0% 0 0% 0 0% 0
Read-only 0% 0 0% 0 0% 0
Failing checks 0% 0 0% 0 0% 0
Strings with suggestions 0% 0 0% 0 0% 0
Untranslated strings 47% 202 47% 363 47% 2,258

Quick numbers

759
Hosted words
429
Hosted strings
52%
Translated
1
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 setting (iOS)

Rebasing (1/213)
error: 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
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/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
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .gitignore
 (1)
11 days ago
User avatar None

Received repository notification

wallabag / App setting (iOS)

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

Failed rebase on repository

wallabag / App setting (iOS)

Rebasing (1/213)
error: 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
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/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
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .gitignore
 (1)
11 days ago
User avatar None

Received repository notification

wallabag / App setting (iOS)

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

Failed rebase on repository

wallabag / App setting (iOS)

Rebasing (1/213)
error: 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
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/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
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .gitignore
 (1)
2 weeks ago
User avatar None

Received repository notification

wallabag / App setting (iOS)

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

Failed rebase on repository

wallabag / App setting (iOS)

Rebasing (1/213)
error: 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
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/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
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .gitignore
 (1)
3 weeks ago
User avatar None

Failed rebase on repository

wallabag / App setting (iOS)

Rebasing (1/213)
error: 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
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/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
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .gitignore
 (1)
a month ago
User avatar None

Failed rebase on repository

wallabag / App setting (iOS)

Rebasing (1/213)
error: 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
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/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
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .gitignore
 (1)
a month ago
User avatar None

Failed rebase on repository

wallabag / App setting (iOS)

Rebasing (1/213)
error: 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
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/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
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .gitignore
 (1)
2 months ago
Browse all component changes