README.md

README.md

@@ -32,13 +32,7 @@ This is the recommended way to edit the TSV files. tC Create is a web-based appl
 
 Once you log in, simply follow the prompts to open the file you wish to edit.
 
-<<<<<<< HEAD
-When you are done editing, click Save and then select “Use Text CSV Format” on the pop up dialogue. Note that even though it says CSV, it will use tab characters as the field separators.
-
-**Note:** Other spreadsheet editors **should not** be used because they will add or remove quotation marks which will affect the notes negatively.
-=======
 When you are done editing, click Save button at the top right corner of the screen.
->>>>>>> master
 
 ### Editing in a Text Editor
 
@@ -71,12 +65,7 @@ The following lists each column with a brief description and example.
   * This will be helpful in identifing which notes are translations of the original English tNs and which notes have been added by GLs.
   * The Universal ID (UID) of a note is the combination of the `Book`, `Chapter`, `Verse`, and `ID` fields. For example, `tit/1/3/swi9`.
     * This is a useful way to unambiguously refer to notes.
-<<<<<<< HEAD
-    * An [RC link](http://resource-container.readthedocs.io/en/latest/linking.html) can resolve to a specific note like this: `rc://en/tn/help/tit/01/01/swi9`.
-* `Tags` – not used for Translation Notes
-=======
     * An [RC link](https://resource-container.readthedocs.io/en/latest/linking.html) can resolve to a specific note like this: `rc://en/tn/help/tit/01/01/swi9`.
->>>>>>> master
 * `SupportReference`
   * Normally a link to a supporting reference text or blank
   * This will usually be a link to translationAcademy, like `rc://*/ta/man/translate/figs-metaphor`
@@ -89,9 +78,6 @@ The following lists each column with a brief description and example.
   * `1`: entry applies to first occurrence of Quote only
   * `2`: entry applies to second occurrence of Quote only
   * etc.
-<<<<<<< HEAD
-* `Note` – The Markdown formatted note itself. For example, `Paul speaks of God’s message as if it were an object that could be visibly shown to people. Alternate translation: “He caused me to understand his message” (See: [[rc://*/ta/man/translate/figs-metaphor]])`
-=======
 * `GLQuote` (OPTIONAL) - Gateway language quote (e.g. `he revealed his word`)
   * Software (such as tC) should disregard this field.
   * This field is a reference text for GL translators
@@ -100,7 +86,6 @@ The following lists each column with a brief description and example.
     * “General Information:”
   * GL translations teams **should not translate** this column. They do need to provide a translation of the above 2 statements.
 * `OccurrenceNote` - The Markdown formatted note itself. For example, `Paul speaks of God’s message as if it were an object that could be visibly shown to people. Alternate translation: “He caused me to understand his message” (See: [[rc://en/ta/man/translate/figs-metaphor]])`
->>>>>>> master
   * The text should be Markdown formatted, which means the following are also acceptable:
     * Plaintext – if you have no need for extra markup, just use plain text in this column
     * HTML – if you prefer to use inline HTML for markup, that works because it is supported in Markdown
@@ -113,11 +98,7 @@ Below are a few formatting guidelines that govern the composition of transationN
 * All tNotes should reference one of the “Just-in-Time” articles from translationAcademy, i.e., those with file names beginning with “figs-” or “grammar-” “translate-” or “writing-.”
 * The ULT term/concept being discussed in each Note should be in **bold type**, NOT in “quotation marks.”
 * Only use quotation marks to indicate suggested translations. Do not precede the suggestion with the word “that” (which turns them into indirect quotes) i.e., You could say that “they were planning to assassinate him.” Corrected to: You could say, “they were planning to assassinate him.”
-<<<<<<< HEAD
-* It is not enough to enclose “for example” in commas mid sentence and follow it with an example, i.e., You can say this with an active form, for example, “Mordecai found out what they were planning.” Corrected to: You can say this with an active form such as “Mordecai found out what they were planning.” Another example might include: You can say this with an active form, and you can say who did the action. For example, you can say, “Then the king's servants investigated Mordecai's report and found out that it was true.”
-=======
 * It is not enough to enclose “for example” in commas mid sentence and follow it with an example, i.e., You can say this with an active form, for example, “Mordecai found out what they were planning.” Corrected to: You can say this with an active form such as “Mordecai found out what they were planning.” Another example might include: You can say this with an active form, and you can say who did the action. For example, you can say, “Then the king’s servants investigated Mordecai’s report and found out that it was true.”
->>>>>>> master
 * When beginning a tNotes with the word “Here,” the term should be followed by a comma. For instance: “Here, the **ULT term** means …”
 * Do NOT include a period at the end of the “Alternate translation:” fragment at the end of a tNote. The “Alternate translation” should be formatted as a floating sentence fragment immediately followed by the translationAcademy hyperlink (if applicable), i.e., Alternation translation: “in the presence of Yahweh” (See: Metaphor)
 * When composing tNotes using tC Create, all hyperlinks should be typed in “Markdown” mode instead of “Preview” mode. Hyperlinks entered in Preview mode will not be saved in their proper format.
@@ -137,12 +118,9 @@ Here are some important technical *notes* to keep in mind as you translate tN:
 * Only the `Note` column needs to be translated
 * Do *not* remove any column in the TSV files
 * You will also need to supply a translation of these 2 phrases which are repeated, “Connecting Statement:” and “General Information:”.
-<<<<<<< HEAD
-=======
   * These phrases occur many times in the `GLQuote` column.
   * You may want to use find and replace to update the English text with your GL text. If not, we can do this when preparing the text for publishing.
 * Remember: the `GLQuote` column *is not required* to be filled out. Only use this field if it is helpful during the translation process. The software that processes the tNs will use alignment data to identify which words in your GL translation the individual notes refer to.
->>>>>>> master
 
 The section above on [Editing the tNs](https://git.door43.org/unfoldingWord/en_tn#editing-the-utn) may give you ideas on what software to use. Of course, you can also convert the TSV files into another format, do the translation, and then convert them back to TSV files (just ensure the IDs are preserved if you do this). Follow [Translate Content Online](https://help.door43.org/en/knowledgebase/15-door43-content-service/docs/41-translate-content-online) to get a copy of this repository to begin your work.