Skip to content
Snippets Groups Projects
Commit 0c498f92 authored by Jean-Noël Avila's avatar Jean-Noël Avila
Browse files

Update translations with automatic unchanged translations

The translation of configuration and environment  variables, git
commands and cross-links was pushed automatically.
parent 2591933d
No related branches found
No related tags found
No related merge requests found
Source diff could not be displayed: it is too large. Options to address this: view the blob.
Source diff could not be displayed: it is too large. Options to address this: view the blob.
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2019-01-03 23:03+0100\n" "POT-Creation-Date: 2019-01-04 23:29+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -66576,71 +66576,76 @@ msgstr "" ...@@ -66576,71 +66576,76 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:12 #: en/mergetools-merge.txt:12
msgid "gvimdiff" msgid "guiffy"
msgstr "" msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:13 #: en/mergetools-merge.txt:13
msgid "gvimdiff2" msgid "gvimdiff"
msgstr "" msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:14 #: en/mergetools-merge.txt:14
msgid "gvimdiff3" msgid "gvimdiff2"
msgstr "" msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:15 #: en/mergetools-merge.txt:15
msgid "kdiff3" msgid "gvimdiff3"
msgstr "" msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:16 #: en/mergetools-merge.txt:16
msgid "meld" msgid "kdiff3"
msgstr "" msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:17 #: en/mergetools-merge.txt:17
msgid "opendiff" msgid "meld"
msgstr "" msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:18 #: en/mergetools-merge.txt:18
msgid "p4merge" msgid "opendiff"
msgstr "" msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:19 #: en/mergetools-merge.txt:19
msgid "tkdiff" msgid "p4merge"
msgstr "" msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:20 #: en/mergetools-merge.txt:20
msgid "tortoisemerge" msgid "tkdiff"
msgstr "" msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:21 #: en/mergetools-merge.txt:21
msgid "vimdiff" msgid "tortoisemerge"
msgstr "" msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:22 #: en/mergetools-merge.txt:22
msgid "vimdiff2" msgid "vimdiff"
msgstr "" msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:23 #: en/mergetools-merge.txt:23
msgid "vimdiff3" msgid "vimdiff2"
msgstr "" msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:24 #: en/mergetools-merge.txt:24
msgid "vimdiff3"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:25
msgid "winmerge" msgid "winmerge"
msgstr "" msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:24 #: en/mergetools-merge.txt:25
msgid "xxdiff" msgid "xxdiff"
msgstr "" msgstr ""
   
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment