pre-translate-po: update mergetools

Signed-off-by: Matthias Aßhauer <mha1993@live.de>

po/documentation.de.po

@@ -57062,10 +57062,9 @@ msgstr "p4merge"
 #. type: Plain text
 #: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
-#| msgid "--merged"
+#, ignore-same, priority:240
 msgid "smerge"
-msgstr "--merged"
+msgstr "smerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:21

po/documentation.es_MX.po

@@ -56024,9 +56024,9 @@ msgstr "p4merge"
 #. type: Plain text
 #: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, ignore-same, priority:240
 msgid "smerge"
-msgstr "emerge"
+msgstr "smerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:21

po/documentation.nb_NO.po

@@ -55970,10 +55970,9 @@ msgstr "p4merge"
 #. type: Plain text
 #: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
-#| msgid "emerge"
+#, ignore-same, priority:240
 msgid "smerge"
-msgstr "emerge"
+msgstr "smerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:21

po/documentation.pt_BR.po

@@ -56408,10 +56408,9 @@ msgstr "p4merge"
 #. type: Plain text
 #: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
-#| msgid "emerge"
+#, ignore-same, priority:240
 msgid "smerge"
-msgstr "emerge"
+msgstr "smerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:21

po/documentation.pt_PT.po

@@ -55960,9 +55960,9 @@ msgstr "p4merge"
 #. type: Plain text
 #: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, ignore-same, priority:240
 msgid "smerge"
-msgstr "emerge"
+msgstr "smerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:21

po/documentation.ru.po

@@ -55989,9 +55989,9 @@ msgstr "p4merge"
 #. type: Plain text
 #: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, ignore-same, priority:240
 msgid "smerge"
-msgstr "emerge"
+msgstr "smerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:21

po/documentation.zh_HANT.po

@@ -27707,9 +27707,7 @@ msgstr ""
 #: en/git-init.txt:24
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
-msgstr ""
-"這行指令會創建一個空的Git倉庫，基本上是一個名為`.git`的目錄，含有`objects`,`refs/heads`,`refs/"
-"tags`這幾個子目錄，其他模板檔案，跟一個指向`master`分支Head的初始`HEAD`檔案。"
+msgstr "這行指令會創建一個空的Git倉庫，基本上是一個名為`.git`的目錄，含有`objects`,`refs/heads`,`refs/tags`這幾個子目錄，其他模板檔案，跟一個指向`master`分支Head的初始`HEAD`檔案。"
 #. type: Plain text
 #: en/git-init.txt:27
@@ -27721,17 +27719,13 @@ msgstr "如果有設定環境變數`$GIT_DIR`，則會使用被指定的路徑
 #: en/git-init.txt:32
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
-msgstr ""
-"如果object儲存路徑有經由環境變數`$GIT_OBJECT_DIRECTORY`所指定，則SHA-1的目錄將會被設置在其底下，否則會使用預設的`$"
-"GIT_DIR/objects`目錄。"
+msgstr "如果object儲存路徑有經由環境變數`$GIT_OBJECT_DIRECTORY`所指定，則SHA-1的目錄將會被設置在其底下，否則會使用預設的`$GIT_DIR/objects`目錄。"
 #. type: Plain text
 #: en/git-init.txt:37
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
-msgstr ""
-"在現有的倉庫執行'git init'是很安全的。它並不會覆蓋掉已存在的檔案。重新執行'git init'最主要的原因，是去取得新增的模板檔案(或是加上 "
-"--separate-git-dir 將倉庫移到另一個位置)。"
+msgstr "在現有的倉庫執行'git init'是很安全的。它並不會覆蓋掉已存在的檔案。重新執行'git init'最主要的原因，是去取得新增的模板檔案(或是加上 --separate-git-dir 將倉庫移到另一個位置)。"
 #. type: Plain text
 #: en/git-init.txt:45
@@ -27755,9 +27749,7 @@ msgstr "指定用於取得模板檔案的目錄(請參考下面的\"模板檔案
 #: en/git-init.txt:62
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
-msgstr ""
-"不使用`$GIT_DIR`或是`./.git/"
-"`作為初始化倉庫的路徑，而是創建一個儲存實際倉庫路徑的檔案。這個檔案會作為資料系統獨立的Git捷徑，連結到倉庫。"
+msgstr "不使用`$GIT_DIR`或是`./.git/`作為初始化倉庫的路徑，而是創建一個儲存實際倉庫路徑的檔案。這個檔案會作為資料系統獨立的Git捷徑，連結到倉庫。"
 #. type: Plain text
 #: en/git-init.txt:64

scripts/pre-translate-po

@@ -8,7 +8,7 @@ def main (f, d=None):
     po = polib.pofile(f, wrapwidth=0)
     option_re = re.compile(r'-[-a-z0-9[\]]+')
     linkgit_re = re.compile(r'((linkgit:)?(git[-a-z0-9[\]]+|mail)(\[[157]\]|\([157]\))(,|;)?(\n| )?)+')
-    quoted_re = re.compile(r'`[a-zA-Z-_]+`|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|merge(tool)?|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|diff(tool)?|credential|commit|column|core|branch|apply|color|git-p4)\.[a-zA-Z_.]+|araxis|bc3?|codecompare|deltawalker|guiffy|meld|diff(use|merge)|ec?merge|(exam|g?vim|t?k|open|xx)?diff[23]?|(p4|tortoise|win)merge')
+    quoted_re = re.compile(r'`[a-zA-Z-_]+`|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|merge(tool)?|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|diff(tool)?|credential|commit|column|core|branch|apply|color|git-p4)\.[a-zA-Z_.]+|araxis|bc3?|codecompare|deltawalker|guiffy|meld|diff(use|merge)|(exam|g?vim|t?k|open|xx)?diff[23]?|(ec?|p4|s|tortoise|win)merge')
     env_var_re = re.compile(r'`?GIT_[A-Z_\d]+`?')
     if not d is None:
             po_file=polib.pofile(d)