wallabag/App setting (iOS) @ Hosted Weblate

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 MIT		0	0	0	0	0	0	2

Arabic MIT	0%	13	23	143	13	0	0	0

Aragonese MIT	0%	13	23	143	13	0	0	0

Basque MIT	0%	13	23	143	13	0	0	0

Catalan MIT	0%	13	23	143	13	0	0	0

Chinese (Simplified) MIT		0	0	0	0	0	0	0

Chinese (Traditional) MIT	76%	3	8	51	3	0	3	0

Croatian MIT		0	0	0	0	0	0	0

Czech MIT		0	0	0	0	0	0	0

Danish MIT	0%	13	23	143	13	0	0	0

Dutch MIT		0	0	0	0	0	0	0

French MIT		0	0	0	0	0	0	0

Galician MIT		0	0	0	0	0	0	0

German MIT		0	0	0	0	0	0	0

Greek MIT		0	0	0	0	0	0	0

Hindi MIT	0%	13	23	143	13	0	0	0

Hungarian MIT	0%	13	23	143	13	0	0	0

Indonesian MIT	0%	13	23	143	13	0	0	0

Italian MIT		0	0	0	0	0	0	0

Japanese MIT		0	0	0	0	0	0	0

Korean MIT		0	0	0	0	0	0	0

Lithuanian MIT	0%	13	23	143	13	0	0	0

Malayalam MIT	0%	13	23	143	13	0	0	0

Norwegian Bokmål MIT	76%	3	6	42	3	0	0	0

Occitan MIT	0%	13	23	143	13	0	0	0

Persian MIT	0%	13	23	143	13	0	0	0

Polish MIT		0	0	0	0	0	0	0

Portuguese MIT	0%	13	23	143	13	0	1	0

Romanian MIT	0%	13	23	143	13	0	0	0

Russian MIT		0	0	0	0	0	0	0

Spanish MIT	92%	1	4	20	1	0	1	0

Swedish MIT	0%	13	23	143	13	0	0	0

Thai MIT	0%	13	23	143	13	0	0	0

Turkish MIT		0	0	0	0	0	0	0

Ukrainian MIT	0%	13	23	143	13	0	0	0

Please sign in to see the alerts.

Overview

Project website	www.wallabag.org
Project maintainers	di72nn tcitworld strubbl Kdecherf nicosomb j0k3r 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	Bump version `cc35222` Maxime Marinel authored a month ago
Last commit in Weblate	Added translation using Weblate (Malayalam) `06aee6c` Weblate authored 11 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`

6 days ago

String statistics

	Strings percent	Hosted strings	Words percent	Hosted words	Characters percent	Hosted characters
Total		455		805		5,005
Source		13		23		143
Translated	49%	227	49%	396	49%	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	1%	5	1%	13	1%	76
Untranslated strings	50%	228	50%	409	50%	2,544

Last 12 months Previous

Activity in last 12 months


Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec	Jan	Feb	Mar

Quick numbers

805

Hosted words

455

Hosted strings

49%

Translated

Contributors

and previous 30 days

Trends of last 30 days

—

Hosted words

+100%

—

Hosted strings

+100%

—

Translated

+49%

—

Contributors

+100%

Search

Advanced query builder

Query examples

Review strings changed by other users	`changed:>=2024-03-25 AND NOT changed_by:anonymous`	Add
Translated strings	`state:>=translated`	Add
Strings with comments	`has:comment`	Add
Strings with any failing checks	`has:check`	Add
Strings with suggestions from others	`has:suggestion AND NOT suggestion_author:anonymous`	Add
Approved strings with suggestions	`state:approved AND has:suggestion`	Add
All untranslated strings added the past month	`added:>=2024-03-25 AND state:<=needs-editing`	Add
Translated strings in a certain language	`is:translated AND language:en`	Add

HangeFurude Suggestion added wallabag App setting (iOS) Chinese (Traditional)	English Unread articles Chinese (Traditional) 4 characters edited 未讀文章 a month ago
HangeFurude Suggestion added wallabag App setting (iOS) Chinese (Traditional)	English "Show image in list" Chinese (Traditional) 10 characters edited 「顯示列表內的圖像」 a month ago
HangeFurude Suggestion added wallabag App setting (iOS) Chinese (Traditional)	English Starred articles Chinese (Traditional) 5 characters edited 已收藏文章 a month ago
None Repository rebase failed wallabag App setting (iOS)	Rebasing (1/217) 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) a month ago
None Repository notification received wallabag App setting (iOS)	GitHub: https://github.com/wallabag/ios-app, main a month ago
None Repository rebase failed wallabag App setting (iOS)	Rebasing (1/217) 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) a month ago
None Repository notification received wallabag App setting (iOS)	GitHub: https://github.com/wallabag/ios-app, main a month ago
None Repository rebase failed wallabag App setting (iOS)	Rebasing (1/217) 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) 2 months ago
None Repository notification received wallabag App setting (iOS)	GitHub: https://github.com/wallabag/ios-app, main 2 months ago
None Repository rebase failed wallabag App setting (iOS)	Rebasing (1/217) 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) 2 months ago

Browse all component changes