KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

general: Fix brand name to КолибриОС #262

Closed
ace-dent wants to merge 1 commits from ace-dent/kolibrios-gitea:PR-BrandName into main
pull from: ace-dent/kolibrios-gitea:PR-BrandName
merge into: KolibriOS:main
Conversation 3 Commits 1 Files Changed 9 +3259 -3247
ace-dent commented 2025-06-02 11:36:05 +02:00
Member
Copy Link
  • Ensure consistent brand nameКолибриОС; update Docs and source code. Fixes #6.
  • Note: Line endings standardised from CRLF > LF, so best to view diffs with whitespace changes hidden. BUT, in some documents the change is just Колибри ОС to КолибриОС!...
- Ensure consistent brand name`КолибриОС`; update Docs and source code. Fixes #6. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden. BUT, in some documents the change is just `Колибри ОС` to `КолибриОС`!...
ace-dent added the
Category/General
Influence/Text/TYPO
Kind
Enhancement
Priority
Low
 labels 2025-06-02 11:36:05 +02:00
ace-dent added 1 commit 2025-06-02 11:36:08 +02:00
general: Fix brand name to КолибриОС
All checks were successful
Build system / Check kernel codestyle (pull_request) Successful in 1m40s
Details
Build system / Build (pull_request) Successful in 7m57s
Details
3eef712b01 
- Ensure consistent brand name`КолибриОС`; update Docs and source code. Fixes #6.
- Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden. However, in some documents the change is just `Колибри ОС` to `КолибриОС`!
ace-dent commented 2025-06-02 11:36:31 +02:00
Author
Member
Copy Link

Files were searched for using:

git grep 'Колибри ' # UTF-8 encoded
git grep --text -P $'\xca\xee\xeb\xe8\xe1\xf0\xe8\x20' # Windows 1251 encoded 
git grep --text -P $'\xaa\xba\xeb\xa0\xa8\xb0\xa8\x20' # CP 866 encoded

... so there may still be remaining cases.

I encourage a native Russian speaker to review the changes are reasonable.
I also think data/ru_RU/docs/guide/faq.htm could be further improved.

Files were searched for using: ```sh git grep 'Колибри ' # UTF-8 encoded git grep --text -P $'\xca\xee\xeb\xe8\xe1\xf0\xe8\x20' # Windows 1251 encoded git grep --text -P $'\xaa\xba\xeb\xa0\xa8\xb0\xa8\x20' # CP 866 encoded ``` ... so there may still be remaining cases. I encourage a native Russian speaker to review the changes are reasonable. I also think `data/ru_RU/docs/guide/faq.htm` could be further improved.
ace-dent requested review from Burer 2025-06-02 11:37:16 +02:00
ace-dent requested review from dunkaist 2025-06-02 11:37:19 +02:00
ace-dent added the
PR
Review required
 label 2025-06-02 11:58:48 +02:00
Burer approved these changes 2025-07-12 14:34:23 +02:00
data/ru_RU/docs/guide/faq.htm
@@ -107,0 +17,4 @@
<body bgcolor="#FDF6E3" link="#5551FF"><pre><h1>Решение проблем и часто задаваемые вопросы</h1>
<a href="guide.htm" param="d">&lt; Назад</a>
<b>Какие есть варианты загрузки КолибриОС?</b>
Burer commented 2025-06-02 15:17:11 +02:00
Owner
Copy Link

@Leency intentionally made this text informal, as a user-friendly guide, so maybe we can keep it just "Колибри" here. But that is just my thoughts.

@Leency intentionally made this text informal, as a user-friendly guide, so maybe we can keep it just "Колибри" here. But that is just my thoughts.
Burer marked this conversation as resolved
programs/games/whowtbam/wwtbam.cpp
@@ -1,1272 +1,1278 @@
// Исходник игры "Кто хочет быть миллионером?" для Колибри ОС
Burer commented 2025-06-02 15:19:25 +02:00
Owner
Copy Link

I don't see any entry of "КолибриОС" in this file.
What exactly have you edited here? And same for programs/other/HACONFIG.ASM

I don't see any entry of "КолибриОС" in this file. What exactly have you edited here? And same for `programs/other/HACONFIG.ASM`
Burer marked this conversation as resolved
ace-dent commented 2025-09-14 12:58:44 +02:00
Author
Member
Copy Link

CLOSED - This PR was replaced with #280; it removes the EOL CRLF > LF changes.

CLOSED - This PR was replaced with #280; it removes the EOL `CRLF` > `LF` changes.
ace-dent closed this pull request 2025-09-14 12:58:46 +02:00
All checks were successful
Build system / Check kernel codestyle (pull_request) Successful in 1m40s
Required
Details
Build system / Build (pull_request) Successful in 7m57s
Required
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
dunkaist
Burer
Labels
Clear labels
C
Category/Applications
Category/Drivers
Category/General
Category/Kernel
Category/Libraries
Eolite
FASM
FS
GSoC
This issue in GSoC program
HardwareTested
HLL
Influence/Settings
Influence/Text/TYPO
IRCC
Kernel
Kind
Breaking
Breaking change that won't be backward compatible
Kind
Bug
Something is not working
Kind
Build
Kind
Documentation
Documentation changes
Kind
Enhancement
Improve existing functionality
Kind
Feature
New functionality
Kind
Security
This is security issue
Kind
Testing
Issue or pull request related to testing
Pay for the code
Paid task
PR
Conflicts
PR conflicts with main
PR
Dependent
This PR is dependent on another PR
Priority
Critical
The priority is critical
Priority
High
The priority is high
Priority
Low
The priority is low
Priority
Medium
The priority is medium
PR
Ready to merge
Pull request is ready for merge
PR
Request changes
Changes requested in pull request
PR
Review required
Reviewed
Confirmed
Issue has been confirmed
Reviewed
Duplicate
This issue or pull request already exists
Reviewed
Invalid
Invalid issue
Reviewed
Won't Fix
This issue won't be fixed
Status
Abandoned
Somebody has started to work on this but abandoned work
Status
Blocked
Something is blocking this issue or pull request
Status
Need More Info
Feedback is required to reproduce issue or to continue work
No Label
Category/General
Influence/Text/TYPO
Kind
Enhancement
Priority
Low
PR
Review required
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
ace-dent Burer Doczom dunkaist IgorA Leency mxlgv ramenu rgimad sdongles Sweetbread
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: KolibriOS/kolibrios#262
No description provided.
Delete Branch "ace-dent/kolibrios-gitea:PR-BrandName"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?