Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Total Resurrection #23

Merged
merged 626 commits into from
Mar 16, 2020
Merged

Total Resurrection #23

merged 626 commits into from
Mar 16, 2020

Conversation

Davoodeh
Copy link

@Davoodeh Davoodeh commented Mar 15, 2020

این مخزن رو آپدیت کرده:
کتاب به نسخه هشت روز پیش (2.1.207) بروزرسانی شده #22
شامل بازنویسی کامل ۳ فصل هست
شامل فایل‌های پایهٔ ترجمه شدهٔ مخزن هست #18
شامل استاندارد اولیهٔ کار برای مترجمینه

سعی شده با وفاداری به متن‌های قدیمی بازنویسی انجام شه.

همونطور که پیشتر ذکر شد متون قبل مشکلات زیادی داشت
از علائم و مارکآپ کتاب استفاده نشده بود (مانند بولد و ایتالیک)
یکپارچه نبود انتخاب کلمات یا بد نگاشته شده بود.
غلط‌های تایپی متعدد داشت و از این قبیل مشکلات توی متن‌های قبلی کم نبود.

فکر می‌کنم اگر چنین تغییراتی اعمال شه نقطه شروع و امید دوبارهٔ جدیدی برای پروژه می‌تونه باشه.

jnavila and others added 30 commits April 1, 2019 23:28
1. Avoid awkward idiom, as discussed in progit#1179 (comment)
2. Fix pronoun: As it was written, 'it' would've referred to the subject of the sentence, 'changes'. Besides the singular-plural disagreement, it should've said the _file_ was replaced, not the changes.
Reword sentence about losing local changes
* Update issue templates

* Add checklist.

* Add link to translation projects.

* Replace list with table.

* Add Javascript comments, add punctuation.

* Remove unnecessary capitalization.

* Remove unnecessary capitalization.

* Add guidance on steps to reproduce.

* Add note to refence other bugs.

* Add how-to mark checkbox with Github Markdown.

* Change text to be more descriptive.

* Fix Javascript comments for list.

* Add colon.

* Add Javascript comment.

* Remove backticks.

* Add checkbox, fix text.

* Create inline links.

* Add section on e-book readers.

* Fixes, see description below

Add note about not supporting epub or mobi formats.
Add bold markdown to emphasize what the bug should not be about.
Move translation project to own line and add checkbox.

* Add application.

* Add application.

* Fix comment.

* Add checkbox/selector for pdf/website.

* Remove text.

* Fix indentation.

* Fix indention for all list items.

* Change wording for checkbox.

* Change wording for pdf/website cross-check.

* Convert checkboxes to list items.

* Convert checkbox pdf/website to a question.

* Rewrite text to better fit list format.

* Rewrite pdf/website question.

* Fix grammar.

* Remove line about not accepting .epub/.mobi bugs.

* Expand list to include epub/mobi files.

* Clarify why we need the source/file comparison.

* Add comment for device detail forms.

* Add horizontal rulers. Move context section up.

* Comment out checklist. Remove ruler.

* Add colon to headers.

* Remove horizontal ruler.

* Remove e.g.

* Squash comments into one comment above each list.
common ancestor with main branch.

Issue detected and fixed by consulting git-revisions manual page
(used git version is 2.21.0):
 <rev1>...<rev2> - Include commits that are reachable from either <rev1> or <rev2>
 but exclude those that are reachable from both...
 <rev1>..<rev2> - Include commits that are reachable from <rev2>
 but exclude those that are reachable from <rev1>...
…ed' into udyzr-ch05-maintain-whatintroduced
Fix: Inspecting commits made on topic branch since...
From my point of view we should note here that a commit object
contains its parent commit(s)
Add extra notes about format for a commit object
I'd like to add some notes about the HEAD file content which I think
should be in this book section.

Unfortunately I'm not English native speaker so please correct me if I
did grammar or other mistakes.
Note about SHA-1 values in the HEAD file
Recently I found the extra way to get the manpage so I'd like add it
to the book.
…n-page

Extend the git commands list to get the manpage
Previous text (c568962) was correct.

The pull request being reverted applies the meaning of `..` and `...` as
used in revision ranges for `git log` to `git diff`. The later does not
receive revision ranges as a parameter - as can be seen in the manual:

       git diff [--options] <commit> <commit> [--] [<path>...]
           This is to view the changes between two arbitrary <commit>.

       git diff [--options] <commit>..<commit> [--] [<path>...]
           This is synonymous to the previous form. If <commit> on one
side is omitted, it will
           have the same effect as using HEAD instead.

       git diff [--options] <commit>...<commit> [--] [<path>...]
           This form is to view the changes on the branch containing and
up to the second <commit>,
           starting at a common ancestor of both <commit>. "git diff
A...B" is equivalent to "git
           diff $(git-merge-base A B) B". You can omit any one of
<commit>, which has the same
           effect as using HEAD instead.

This commit reverts commit ec181fa
and f3a4d37.
Emojis are not really "incredibly useful"...
Since all non-Vim & -Notepad++ commands are now in Appendix C, and
64-bit is becoming the default, the 32-bit edge cases don't seem to
warrant inclusion in the main section any more.
@Davoodeh
Copy link
Author

پس از این می‌تونیم به روند کاری پروژه برگردیم و به ازای هر فصل یک ایشو باز کنیم و تحت نظر شما کار رو تموم کنیم.

@Davoodeh Davoodeh mentioned this pull request Mar 15, 2020
@hjavadish hjavadish merged commit 0ee802f into progit2-fa:master Mar 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.