Merge branch 'master' into 'master'

kaiw · kaiw · commit 5cf774056367 · 2020-09-03T21:24:06.000Z
Update Simplified Chinese translation &amp;&amp; Fixed translations in other languages

See merge request GNOME/meld!62
diff --git a/po/bs.po b/po/bs.po
@@ -1790,7 +1790,7 @@ msgid "Save the current file"
 msgstr "Sačuvaj trenutnu datoteku"
 
 #: ../meld/meldwindow.py:55
-msgid "Save As..."
+msgid "Save As…"
 msgstr "Sačuvaj Kao..."
 
 #: ../meld/meldwindow.py:56
diff --git a/po/ca.po b/po/ca.po
@@ -2294,7 +2294,7 @@ msgid "Save the current file"
 msgstr "Desa el fitxer actual"
 
 #: ../meld/meldwindow.py:56
-msgid "Save As..."
+msgid "Save As…"
 msgstr "Anomena i desa..."
 
 #: ../meld/meldwindow.py:57
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
@@ -1771,7 +1771,7 @@ msgid "Save the current file"
 msgstr "Guarda el fitxer actual"
 
 #: ../meld/meldwindow.py:55
-msgid "Save As..."
+msgid "Save As…"
 msgstr "Anomena i guarda..."
 
 #: ../meld/meldwindow.py:56
diff --git a/po/el.po b/po/el.po
@@ -1769,7 +1769,7 @@ msgid "Save the current file"
 msgstr "Αποθήκευση του τρέχοντος αρχείου"
 
 #: ../meld/meldwindow.py:55
-msgid "Save As..."
+msgid "Save As…"
 msgstr "Αποθήκευση ως..."
 
 #: ../meld/meldwindow.py:56
diff --git a/po/he.po b/po/he.po
@@ -1561,7 +1561,7 @@ msgid "Save the current file"
 msgstr "שמירת הקובץ הנוכחי"
 
 #: ../meld/meldwindow.py:55
-msgid "Save As..."
+msgid "Save As…"
 msgstr "שמירה בשם..."
 
 #: ../meld/meldwindow.py:56
diff --git a/po/oc.po b/po/oc.po
@@ -2141,7 +2141,7 @@ msgstr "Enregistrar lo fichièr actual"
 
 #: ../meld/meldwindow.py:56
 #| msgid "Save Patch As..."
-msgid "Save As..."
+msgid "Save As…"
 msgstr "Enregistrar jos..."
 
 #: ../meld/meldwindow.py:57
diff --git a/po/pt.po b/po/pt.po
@@ -2125,7 +2125,7 @@ msgid "Save the current file"
 msgstr "Gravar o ficheiro atual"
 
 #: ../meld/meldwindow.py:56
-msgid "Save As..."
+msgid "Save As…"
 msgstr "Gravar como..."
 
 #: ../meld/meldwindow.py:57
diff --git a/po/ru.po b/po/ru.po
@@ -1707,7 +1707,7 @@ msgid "Save the current file"
 msgstr "Сохранить текущий файл"
 
 #: ../meld/meldwindow.py:55
-msgid "Save As..."
+msgid "Save As…"
 msgstr "Сохранить как…"
 
 #: ../meld/meldwindow.py:56
diff --git a/po/rw.po b/po/rw.po
@@ -370,7 +370,7 @@ msgstr "Kubika i KIGEZWEHO IDOSIYE"
 # sfx2/source\doc\doc.src:STR_SAVEASDOC.text
 #: filediff.py:111
 #, fuzzy
-msgid "_Save As..."
+msgid "_Save As…"
 msgstr "Gushyingura muri..."
 
 # sfx2/sdi\sfxslots.src:SID_SAVEDOCS.text
diff --git a/po/sk.po b/po/sk.po
@@ -1644,7 +1644,7 @@ msgid "Save the current file"
 msgstr "Uloží aktuálny súbor"
 
 #: ../meld/meldwindow.py:56
-msgid "Save As..."
+msgid "Save As…"
 msgstr "Uložiť ako..."
 
 # MČ: Sú to popisy položiek v ponuke zobrazené v statuse. Teda nie v neurčitku.
diff --git a/po/sr.po b/po/sr.po
@@ -2123,7 +2123,7 @@ msgid "Save the current file"
 msgstr "Сачувајте тренутну датотеку"
 
 #: ../meld/meldwindow.py:56
-msgid "Save As..."
+msgid "Save As…"
 msgstr "Сачувај као..."
 
 #: ../meld/meldwindow.py:57
diff --git a/po/sr@latin.po b/po/sr@latin.po
@@ -2123,7 +2123,7 @@ msgid "Save the current file"
 msgstr "Sačuvajte trenutnu datoteku"
 
 #: ../meld/meldwindow.py:56
-msgid "Save As..."
+msgid "Save As…"
 msgstr "Sačuvaj kao..."
 
 #: ../meld/meldwindow.py:57
diff --git a/po/zh_CN.po b/po/zh_CN.po
@@ -1165,6 +1165,75 @@ msgstr "保存当前比较中的所有文件"
 msgid "Revert files to their saved versions"
 msgstr "将文件恢复为其保存的版本"
 
+#: meld/resources/gtk/menus.ui:34
+msgid "Revert files…"
+msgstr "恢复文件"
+
+#: meld/resources/gtk/menus.ui:45
+msgid "_Find…"
+msgstr "查找(_F)…"
+
+#: meld/resources/gtk/menus.ui:49
+msgid "_Replace…"
+msgstr "替换(_R)…"
+
+#: meld/resources/ui/recent-selector.ui:16
+msgid "Search recent comparisons…"
+msgstr "搜索最近使用的对比…"
+
+#: meld/meldwindow.py:151
+msgid "Filename"
+msgstr "文件名"
+
+#: meld/resources/ui/appwindow.ui:45
+msgid "Open a recent comparison"
+msgstr "打开最近使用的对比"
+
+#: meld/resources/ui/appwindow.ui:191
+msgid "Version Filters"
+msgstr "版本过滤"
+
+#: meld/resources/gtk/menus.ui:171
+msgid "Normal"
+msgstr "正常"
+
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+msgid "Unversioned"
+msgstr "未版本控制"
+
+#: meld/resources/gtk/menus.ui:186
+msgid "Flatten folders"
+msgstr "展开/收缩 文件夹"
+
+#: meld/resources/gtk/menus.ui:55
+msgid "View"
+msgstr "查看"
+
+#: meld/resources/gtk/menus.ui:59
+msgid "Overview Map"
+msgstr "总览图"
+
+#: meld/resources/gtk/menus.ui:63
+msgid "Version control console"
+msgstr "版本控制终端"
+
+#: meld/resources/gtk/menus.ui:67
+msgid "Lock scrolling"
+msgstr "锁定滚动"
+
+#: meld/resources/gtk/menus.ui:73
+msgid "Comparison"
+msgstr "对比"
+
+#: meld/resources/gtk/menus.ui:103
+msgid "Format as Patch…"
+msgstr "格式化为补丁…"
+
+#: meld/resources/gtk/menus.ui:116
+msgid "Keyboard Shortcuts"
+msgstr "快捷键"
+
+
 #: ../meld/filediff.py:238
 msgid "Add Synchronization Point"
 msgstr "增加同步点"
@@ -1616,7 +1685,7 @@ msgid "Save the current file"
 msgstr "保存当前文件"
 
 #: ../meld/meldwindow.py:58
-msgid "Save As..."
+msgid "Save As…"
 msgstr "另存为..."
 
 #: ../meld/meldwindow.py:59
