Sync and translate files

Author: petk

.github/workflows/pr-build.yml

@@ -10,15 +10,11 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Download bootstrap file
-      run: wget https://raw.githubusercontent.com/progit/progit2-pub/master/bootstrap.sh
-    - name: Run bootstrap
-      run: sh bootstrap.sh
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.1
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
     - name: Build book
-      run: bundle exec rake book:build_action
+      run: bundle exec rake book:build

.github/workflows/release-on-merge.yml

@@ -11,32 +11,28 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - name: get bootstrap file
-      run: wget https://raw.githubusercontent.com/progit/progit2-pub/master/bootstrap.sh
-    - name: run bootstrap
-      run: sh bootstrap.sh
-    - name: Compute tag name
-      id: compute-tag
-      run: |
-        echo Computing next tag number
-        LASTPATCH=$(git describe --tags | cut -d- -f1 | cut -d. -f3)
-        PATCH=$(($LASTPATCH+1))
-        echo "::set-output name=tagname::2.1.${PATCH}"
-        echo "::set-output name=branch::${GITHUB_REF#refs/heads/}"
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.1
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
     - name: Build release assets
-      run: bundle exec rake book:build_action
+      run: bundle exec rake book:build
+
+    - name: Compute tag name
+      id: compute-tag
+      run: |
+        echo Computing next tag number
+        LASTPATCH=$(git describe --tags | cut -d- -f1 | cut -d. -f3)
+        PATCH=$(($LASTPATCH+1))
+        echo "{tagname}={2.1.${PATCH}}" >> $GITHUB_OUTPUT
 
     - name: Create release
       uses: ncipollo/release-action@v1
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         tag: ${{ steps.compute-tag.outputs.tagname }}
-        commit: ${{ steps.compute-tag.outputs.branch }}
-        artifacts: './progit.epub,./progit.mobi,./progit.pdf,./progit.html'
+        commit: main
+        artifacts: './progit.epub,./progit.fb2.zip,./progit.mobi,./progit.pdf,./progit.html'

A-git-in-other-environments.asc

@@ -2,7 +2,7 @@
 [appendix]
 == Git v drugih okoljih
 
-Če ste prebrali celotno knjibo, ste se naučili veliko o tem, kako uporabljati Git v ukazni vrstici.
+Če ste prebrali celotno knjigo, ste se naučili veliko o tem, kako uporabljati Git v ukazni vrstici.
 Lahko delate z lokalnimi datotekami, povežete vaš repozitorij z drugimi preko omrežja in učinkovito sodelujete z ostalimi.
 Vendar zgodba se tu ne konča; Git je običajno uporabljen kot del večjega ekosistema in terminal ni vedno najboljši način za delo z njim.
 Sedaj bomo pogledali nekaj drugih vrst okolj, kjer je Git lahko uporaben in kako druge aplikacije (vključno z vašo) delajo skupaj z Gitom.

B-embedding-git-in-your-applications.asc

@@ -6,6 +6,7 @@
 Tudi aplikacije, ki niso namenjene razvijalcem, kot so urejevalniki dokumentov, lahko potencialno koristijo lastnosti kontrole verzij in Gitov model deluje zelo dobro za mnoge različne scenarije.
 
 Če potrebujete integrirati Git z vašo aplikacijo, imate v osnovi dve opciji: ustvariti ukazno vrstico in klicati `git` ukaz, ali pa vdelati knjižnico Git v vašo aplikacijo.
+Tu bomo pogledali integracijo z ukazno vrstico in nekaj najbolj priljubljenih knjižnic Git za vdelavo.
 
 include::book/B-embedding-git/sections/command-line.asc[]
 

C-git-commands.asc

@@ -1,22 +1,22 @@
 [[C-git-commands]]
 [appendix]
-== Git Commands
+== Ukazi Git
 
-Throughout the book we have introduced dozens of Git commands and have tried hard to introduce them within something of a narrative, adding more commands to the story slowly.
-However, this leaves us with examples of usage of the commands somewhat scattered throughout the whole book.
+Skozi knjigo smo predstavili desetine ukazov Git in se trudili, da bi jih predstavili znotraj neke vrste pripovedi s postopnim dodajanjem več ukazov v zgodbo.
+Vendar pa to pusti primere uporabe ukazov nekoliko razpršene po celotni knjigi.
 
-In this appendix, we'll go through all the Git commands we addressed throughout the book, grouped roughly by what they're used for.
-We'll talk about what each command very generally does and then point out where in the book you can find us having used it.
+V tem dodatku bomo pregledali vse ukaze Git, ki smo jih obravnavali v knjigi, približno razvrščene glede na to, za kaj se uporabljajo.
+Govorili bomo o tem, kaj vsak ukaz na splošno naredi, in nato poudarili, kje v knjigi smo ga uporabili.
 
 [TIP]
 ====
-You can abbreviate long options.
-For example, you can type in `git commit --a`, which acts as if you typed `git commit --amend`.
-This only works when the letters after `--` are unique for one option.
-Do use the full option when writing scripts.
+Dolge možnosti lahko skrajšate.
+Na primer, vtipkate lahko `git commit --a`, kar deluje tako, kot da bi vtipkali `git commit --amend`.
+To deluje samo, če so črke po `--` edinstvene za eno možnost.
+Pri pisanju skript uporabljajte polno opcijo.
 ====
 
-=== Setup and Config
+=== Nastavitev in konfiguracija
 
 There are two commands that are used quite a lot, from the first invocations of Git to common every day tweaking and referencing, the `config` and `help` commands.
 

CONTRIBUTING.md

@@ -18,7 +18,7 @@ The issue may have already been corrected in the source files, but not yet deplo
 Errata and basic clarifications will be accepted if we agree that they improve the content.
 You can also open an issue so that we can discuss how or if the issue needs to be addressed.
 
-If you've never done this before, the [flow guide](https://guides.github.com/introduction/flow/) might be useful.
+If you've never done this before, the [flow guide](https://docs.github.com/en/get-started/quickstart/github-flow) might be useful.
 
 ## Large Rewrites
 
@@ -29,7 +29,7 @@ It's unlikely that your prose is going to be *so* much better that it's worth ch
 
 ## Figures
 
-The images in this book are generated using [Sketch 3](https://www.sketchapp.com/), with the [included sketchbook file](diagram-source/progit.sketch).
+The images in this book are generated using [Sketch 3](https://www.sketch.com/), with the [included sketchbook file](diagram-source/progit.sketch).
 
 To create a figure:
 

LICENSE.asc

@@ -1,2 +1,2 @@
-This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
-To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/3.0 or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+To delo je izdano pod "Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported" licenco.
+Za ogled kopije te licence obiščite https://creativecommons.org/licenses/by-nc-sa/3.0 ali pošljite sporočilo na Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.

README.asc

@@ -66,4 +66,4 @@ The issue may have already been corrected, but the changes have not been deploye
 
 == Contributing
 
-If you'd like to help out by making a change, take a look at the link:CONTRIBUTING.md[contributor's guide].
+If you'd like to help out by making a change, take a look at the link:CONTRIBUTING.md[contributor's guide].