Skip to content

Commit

Permalink
План оновлення перекладу
Browse files Browse the repository at this point in the history
  • Loading branch information
@hedrok
hedrok committed Oct 21, 2024
1 parent 1758412 commit 035a8a3
Show file tree
Hide file tree
Showing 2 changed files with 134 additions and 0 deletions.
111 changes: 111 additions & 0 deletions update-plan/files.adoc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
== Список змінених файлів

Конфлікти у файлах:

|===
| Назва файлу |Статус (+ означає зроблено)
| book/01-introduction/sections/about-version-control.asc |
| book/01-introduction/sections/command-line.asc |
| book/01-introduction/sections/first-time-setup.asc |
| book/01-introduction/sections/help.asc |
| book/01-introduction/sections/history.asc |
| book/01-introduction/sections/installing.asc |
| book/01-introduction/sections/what-is-git.asc |
| book/02-git-basics/sections/aliases.asc |
| book/02-git-basics/sections/getting-a-repository.asc |
| book/02-git-basics/sections/recording-changes.asc |
| book/02-git-basics/sections/remotes.asc |
| book/02-git-basics/sections/tagging.asc |
| book/02-git-basics/sections/undoing.asc |
| book/02-git-basics/sections/viewing-history.asc |
| book/03-git-branching/sections/basic-branching-and-merging.asc |
| book/03-git-branching/sections/branch-management.asc |
| book/03-git-branching/sections/nutshell.asc |
| book/03-git-branching/sections/rebasing.asc |
| book/03-git-branching/sections/remote-branches.asc |
| book/03-git-branching/sections/workflows.asc |
| book/04-git-server/sections/generating-ssh-key.asc |
| book/04-git-server/sections/git-daemon.asc |
| book/04-git-server/sections/gitlab.asc |
| book/04-git-server/sections/git-on-a-server.asc |
| book/04-git-server/sections/gitweb.asc |
| book/04-git-server/sections/hosted.asc |
| book/04-git-server/sections/protocols.asc |
| book/04-git-server/sections/setting-up-server.asc |
| book/04-git-server/sections/smart-http.asc |
| book/05-distributed-git/sections/contributing.asc |
| book/05-distributed-git/sections/distributed-workflows.asc |
| book/05-distributed-git/sections/maintaining.asc |
| book/06-github/sections/1-setting-up-account.asc |
| book/06-github/sections/2-contributing.asc |
| book/06-github/sections/3-maintaining.asc |
| book/06-github/sections/4-managing-organization.asc |
| book/06-github/sections/5-scripting.asc |
| book/07-git-tools/sections/advanced-merging.asc |
| book/07-git-tools/sections/bundling.asc |
| book/07-git-tools/sections/credentials.asc |
| book/07-git-tools/sections/debugging.asc |
| book/07-git-tools/sections/interactive-staging.asc |
| book/07-git-tools/sections/replace.asc |
| book/07-git-tools/sections/rerere.asc |
| book/07-git-tools/sections/reset.asc |
| book/07-git-tools/sections/revision-selection.asc |
| book/07-git-tools/sections/rewriting-history.asc |
| book/07-git-tools/sections/searching.asc |
| book/07-git-tools/sections/signing.asc |
| book/07-git-tools/sections/stashing-cleaning.asc |
| book/07-git-tools/sections/submodules.asc |
| book/07-git-tools/sections/subtree-merges.asc |
| book/08-customizing-git/sections/attributes.asc |
| book/08-customizing-git/sections/config.asc |
| book/08-customizing-git/sections/hooks.asc |
| book/08-customizing-git/sections/policy.asc |
| book/09-git-and-other-scms/sections/client-hg.asc |
| book/09-git-and-other-scms/sections/client-p4.asc |
| book/09-git-and-other-scms/sections/client-svn.asc |
| book/09-git-and-other-scms/sections/import-custom.asc |
| book/09-git-and-other-scms/sections/import-hg.asc |
| book/09-git-and-other-scms/sections/import-svn.asc |
| book/10-git-internals/sections/environment.asc |
| book/10-git-internals/sections/maintenance.asc |
| book/10-git-internals/sections/objects.asc |
| book/10-git-internals/sections/packfiles.asc |
| book/10-git-internals/sections/plumbing-porcelain.asc |
| book/10-git-internals/sections/refs.asc |
| book/10-git-internals/sections/refspec.asc |
| book/10-git-internals/sections/transfer-protocols.asc |
| book/A-git-in-other-environments/sections/bash.asc |
| book/A-git-in-other-environments/sections/guis.asc |
| book/A-git-in-other-environments/sections/powershell.asc |
| book/A-git-in-other-environments/sections/visualstudio.asc |
| book/A-git-in-other-environments/sections/zsh.asc |
| book/B-embedding-git/sections/jgit.asc |
| book/B-embedding-git/sections/libgit2.asc |
| book/contributors.asc |
| book/dedication.asc |
| book/introduction.asc |
| book/preface_ben.asc |
| book/preface_schacon.asc |
| C-git-commands.asc |
| ch02-git-basics-chapter.asc |
| ch03-git-branching.asc |
| ch04-git-on-the-server.asc |
| ch07-git-tools.asc |
| ch09-git-and-other-systems.asc |
| CONTRIBUTING.md |
| LICENSE.asc |
| progit.asc |
| README.asc |
| status.json |
|===

Вилучені файли:

* book/A-git-in-other-environments/sections/eclipse.asc
* book/09-git-and-other-scms/sections/client-tfs.asc
* .travis.yml
* book/09-git-and-other-scms/sections/import-tfs.asc
Додані і нами (для того, щоб генерація працювала), і ними:
* .github/workflows/pr-build.yml
* .github/workflows/release-on-merge.yml
23 changes: 23 additions & 0 deletions update-plan/plan.adoc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
== План оновлення перекладу

Поточний переклад базується на версії `e95aba0b236ab57b8ea9a1ef1b4fdae6339573ec`
(`english-version`) квітня 2016-го року.

Це план, як оновити переклад до версії `2.1.434`.

Спробував залити `2.1.434` до `master`, список файлів з конфліктами у `files.adoc`.

// Пропонований порядок роботи (продемонстрований на `book/01-introduction/sections/about-version-control.asc`):
//
// Спершу отримаємо всі версії цього файлу:
//
// ----
// f=book/01-introduction/sections/about-version-control.asc
// # Дивимося конфлікти
// git show origin/english-version:$f > $f-old-english
// git show 2.1.434:$f > $f-cur-english
// git show HEAD:$f > $f-ukrainian
// git merge-file -p $f-ukrainian $f-old-english $f-cur-english > $f
// ----
//
// Виправляємо файл і робимо PR.

0 comments on commit 035a8a3

Please sign in to comment.