From 52a6d9017259c561f8eff5c84f673044d2219453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emin=20Tufan=20=C3=87etin?= <etcetin@gmail.com>
Date: Fri, 17 Dec 2021 15:09:47 +0000
Subject: [PATCH 001/116] Update Turkish translation

---
 po/tr.po | 459 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 251 insertions(+), 208 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index a3a143e3..76530bcc 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,27 +5,32 @@
 # Özgür Sarıer <ozgursarier1011601115@gmail.com>, 2013.
 # Simge Sezgin <simgesezgin88@gmail.com>, 2015.
 # Sabri Ünal <libreajans@gmail.com>, 2019.
-# Emin Tufan Çetin <etcetin@gmail.com>, 2017-2021.
 # Muhammet Kara <muhammetk@gmail.com>, 2013-2021.
+# Emin Tufan Çetin <etcetin@gmail.com>, 2017-2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-08-07 23:17+0000\n"
-"PO-Revision-Date: 2021-08-10 19:19+0300\n"
+"POT-Creation-Date: 2021-10-08 21:01+0000\n"
+"PO-Revision-Date: 2021-12-17 18:09+0300\n"
 "Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n"
-"Language-Team: Turkish <gnometurk@gnome.org>\n"
+"Language-Team: Turkish <gnome-turk@gnome.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.4.3\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: Gtranslator 41.0\n"
 "X-POOTLE-MTIME: 1428188634.000000\n"
+"X-DL-Team: tr\n"
+"X-DL-Module: meld\n"
+"X-DL-Branch: master\n"
+"X-DL-Domain: po\n"
+"X-DL-State: Translating\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
-#: meld/resources/ui/appwindow.ui:9
+#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
 msgid "Meld"
 msgstr "Meld"
 
@@ -820,11 +825,11 @@ msgstr "Sağdan Tümünü Birleştir"
 msgid "Merge All"
 msgstr "Tümünü Birleştir"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
 msgid "Add Synchronization Point"
 msgstr "Eşzamanlama Noktası Ekle"
 
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
 msgid "Clear Synchronization Points"
 msgstr "Eşzamanlama Noktalarını Temizle"
 
@@ -903,39 +908,39 @@ msgstr ""
 "Emin Tufan Çetin <etcetin@gmail.com>\n"
 "Sabri Ünal <libreajans@gmail.com>"
 
-#: meld/resources/ui/appwindow.ui:29
+#: meld/resources/ui/appwindow.ui:30
 msgid "Start a new comparison"
 msgstr "Yeni karşılaştırma başlat"
 
-#: meld/resources/ui/appwindow.ui:45
+#: meld/resources/ui/appwindow.ui:46
 msgid "Open a recent comparison"
 msgstr "Son karşılaştırmaları aç"
 
-#: meld/resources/ui/appwindow.ui:73
+#: meld/resources/ui/appwindow.ui:74
 msgid "Go to the previous change"
 msgstr "Önceki değişikliğe git"
 
-#: meld/resources/ui/appwindow.ui:93
+#: meld/resources/ui/appwindow.ui:94
 msgid "Go to the next change"
 msgstr "Sonraki değişikliğe git"
 
-#: meld/resources/ui/appwindow.ui:123
+#: meld/resources/ui/appwindow.ui:124
 msgid "Go to the previous conflict"
 msgstr "Önceki çakışmaya git"
 
-#: meld/resources/ui/appwindow.ui:143
+#: meld/resources/ui/appwindow.ui:144
 msgid "Go to the next conflict"
 msgstr "Sonraki çakışmaya git"
 
-#: meld/resources/ui/appwindow.ui:192
+#: meld/resources/ui/appwindow.ui:193
 msgid "Version Filters"
 msgstr "Sürüm Süzgeçleri"
 
-#: meld/resources/ui/appwindow.ui:207 meld/resources/ui/preferences.ui:1472
+#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472
 msgid "File Filters"
 msgstr "Dosya Süzgeçleri"
 
-#: meld/resources/ui/appwindow.ui:222 meld/resources/ui/preferences.ui:1657
+#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657
 msgid "Text Filters"
 msgstr "Metin Süzgeçleri"
 
@@ -948,7 +953,7 @@ msgid "Column Name"
 msgstr "Sütun Adı"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
 msgid "_Remove"
 msgstr "_Kaldır"
 
@@ -1032,6 +1037,27 @@ msgstr "_Dışarda Aç"
 msgid "_Copy File Paths"
 msgstr "Dosya Yollarını _Kopyala"
 
+#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
+#: meld/resources/ui/dirdiff.ui:117
+#| msgid "Save file in this pane"
+msgid "Select folder to open in this pane"
+msgstr "Bu bölmede açılacak klasörü seç"
+
+#: meld/resources/ui/dirdiff.ui:43
+#| msgid "Folder"
+msgid "Folder 1"
+msgstr "Klasör 1"
+
+#: meld/resources/ui/dirdiff.ui:84
+#| msgid "Folder"
+msgid "Folder 2"
+msgstr "Klasör 2"
+
+#: meld/resources/ui/dirdiff.ui:125
+#| msgid "Folder"
+msgid "Folder 3"
+msgstr "Klasör 3"
+
 #: meld/resources/ui/encoding-selector.ui:31
 msgid "Search text encoding…"
 msgstr "Metin kodlaması ara…"
@@ -1088,8 +1114,17 @@ msgstr "_Kopyala"
 msgid "_Paste"
 msgstr "_Yapıştır"
 
-#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
-#: meld/resources/ui/filediff.ui:171
+#: meld/resources/ui/filediff-menus.ui:54
+msgid "Open Containing Folder"
+msgstr "İçeren Klasörü Aç"
+
+#: meld/resources/ui/filediff-menus.ui:58
+#| msgid "_Copy File Paths"
+msgid "Copy Full Path"
+msgstr "Tam Yolu Kopyala"
+
+#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
+#: meld/resources/ui/filediff.ui:169
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -1098,31 +1133,31 @@ msgstr ""
 "rağmen değişiklikler yapabilirsiniz, fakat bu değişikler yeni dosyaya "
 "kaydedilmek zorundadır."
 
-#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
-#: meld/resources/ui/filediff.ui:185
-msgid "Open file in this pane"
-msgstr "Bu bölmede dosya aç"
-
-#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
-#: meld/resources/ui/filediff.ui:194
+#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
+#: meld/resources/ui/filediff.ui:183
 msgid "Save file in this pane"
 msgstr "Bu bölmede dosya kaydet"
 
-#: meld/resources/ui/filediff.ui:73
+#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
+#: meld/resources/ui/filediff.ui:209
+msgid "Open file in this pane"
+msgstr "Bu bölmede dosya aç"
+
+#: meld/resources/ui/filediff.ui:79
 msgid "File 3"
 msgstr "Dosya 3"
 
-#: meld/resources/ui/filediff.ui:142
+#: meld/resources/ui/filediff.ui:148
 msgid "File 2"
 msgstr "Dosya 2"
 
-#: meld/resources/ui/filediff.ui:207
+#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148
 msgid "File 1"
 msgstr "Dosya 1"
 
 #. Create icon and filename CellRenderer
-#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
-#: meld/dirdiff.py:517
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
+#: meld/dirdiff.py:530
 msgid "Name"
 msgstr "Ad"
 
@@ -1134,7 +1169,7 @@ msgstr "Örüntü"
 msgid "Add new filter"
 msgstr "Yeni süzgeç ekle"
 
-#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18
 msgid "_Add"
 msgstr "_Ekle"
 
@@ -1162,7 +1197,7 @@ msgstr "Kaydırılmış"
 msgid "Replace _All"
 msgstr "_Tümünü Değiştir"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1067 meld/iohelpers.py:113
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1092 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "_Değiştir"
 
@@ -1174,7 +1209,7 @@ msgstr "Bul ile Bul ve Değiştir arasında geçiş yap"
 msgid "Search highlight mode…"
 msgstr "Vurgu kipi ara…"
 
-#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:349
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342
 #: meld/newdifftab.py:49
 msgid "New comparison"
 msgstr "Yeni karşılaştırma"
@@ -1263,6 +1298,20 @@ msgstr "Orta ve sağ bölmeler"
 msgid "_Reverse patch direction"
 msgstr "Yama yönünü _terse çevir"
 
+#: meld/resources/ui/path-label.ui:23
+msgid "Path"
+msgstr "Yol"
+
+#: meld/resources/ui/path-label.ui:62
+#| msgid "_Copy File Paths"
+msgid "Copy Path"
+msgstr "Yolu Kopyala"
+
+#: meld/resources/ui/path-label.ui:78
+#| msgid "Open File"
+msgid "Open Folder"
+msgstr "Klasör Aç"
+
 #: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
 msgid "Preferences"
 msgstr "Tercihler"
@@ -1536,8 +1585,8 @@ msgstr "Eğer kaydetmezseniz, değişiklikler kalıcı olarak yitecektir."
 msgid "Close _without Saving"
 msgstr "Kaydet_meden Kapat"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1066
-#: meld/iohelpers.py:55 meld/iohelpers.py:112
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1091
+#: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_İptal"
 
@@ -1561,95 +1610,70 @@ msgstr "_Karşılaştır"
 msgid "Co_mmit…"
 msgstr "Gö_nder…"
 
-#: meld/resources/ui/vcview-menus.ui:15
-msgid "_Update"
-msgstr "_Güncelle"
-
-#: meld/resources/ui/vcview-menus.ui:30
+#: meld/resources/ui/vcview-menus.ui:26
 msgid "Re_vert"
 msgstr "Geri _Al"
 
-#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+#: meld/resources/ui/vcview-menus.ui:30
 msgid "Delete"
 msgstr "Sil"
 
-#: meld/resources/ui/vcview-menus.ui:41
-msgid "Mar_k as Resolved"
-msgstr "Çözüldü Olarak İm_le"
-
-#: meld/resources/ui/vcview.ui:73
-msgid "Commit…"
-msgstr "Gönder…"
+#: meld/resources/ui/vcview-menus.ui:37
+#| msgid "Next Conflict"
+msgid "Resolve Conflict"
+msgstr "Çakışma Çöz"
 
-#: meld/resources/ui/vcview.ui:74
+#: meld/resources/ui/vcview.ui:16
 msgid "Commit changes to version control"
 msgstr "Değişiklikleri sürüm denetimine gönder"
 
-#: meld/resources/ui/vcview.ui:86
-msgid "Update"
-msgstr "Güncelle"
-
-#: meld/resources/ui/vcview.ui:87
-msgid "Update working copy from version control"
-msgstr "Sürüm denetiminden çalışma kopyasını güncelle"
+#: meld/resources/ui/vcview.ui:21
+msgid "Commit…"
+msgstr "Gönder…"
 
-#: meld/resources/ui/vcview.ui:99
-msgid "Push"
-msgstr "Gönder"
+#: meld/resources/ui/vcview.ui:38
+#| msgid "Push current change to the left"
+msgid "Pull remote changes to the local repository"
+msgstr "Uzak değişiklikleri yerel depoya iste"
 
-#: meld/resources/ui/vcview.ui:100
+#: meld/resources/ui/vcview.ui:51
 msgid "Push local changes to remote"
 msgstr "Yerel değişiklikleri uzak sunucuya gönder"
 
-#: meld/resources/ui/vcview.ui:112
-msgid "Add"
-msgstr "Ekle"
-
-#: meld/resources/ui/vcview.ui:113
+#: meld/resources/ui/vcview.ui:74
 msgid "Add to version control"
 msgstr "Sürüm denetimine ekle"
 
-#: meld/resources/ui/vcview.ui:125
-msgid "Remove"
-msgstr "Kaldır"
-
-#: meld/resources/ui/vcview.ui:126
+#: meld/resources/ui/vcview.ui:87
 msgid "Remove from version control"
 msgstr "Sürüm denetiminden sil"
 
-#: meld/resources/ui/vcview.ui:138
-msgid "Mark as Resolved"
-msgstr "Çözüldü Olarak İmle"
+#: meld/resources/ui/vcview.ui:100
+msgid "Revert working copy to original state"
+msgstr "Çalışma kopyasını özgün durumuna geri döndür"
 
-#: meld/resources/ui/vcview.ui:139
+#: meld/resources/ui/vcview.ui:113
 msgid "Mark as resolved in version control"
 msgstr "Sürüm denetiminde çözüldü olarak işaretle"
 
-#: meld/resources/ui/vcview.ui:151
-msgid "Revert"
-msgstr "Geri Al"
-
-#: meld/resources/ui/vcview.ui:152
-msgid "Revert working copy to original state"
-msgstr "Çalışma kopyasını özgün durumuna geri döndür"
-
-#: meld/resources/ui/vcview.ui:165
-msgid "Delete from working copy"
-msgstr "Çalışma kopyasından sil"
+#: meld/resources/ui/vcview.ui:140
+#| msgid "Only one version control system found in this folder"
+msgid "Open version controlled folder in this pane"
+msgstr "Bu klasörde sürüm denetimli klasör aç"
 
-#: meld/resources/ui/vcview.ui:220
+#: meld/resources/ui/vcview.ui:229
 msgid "Location"
 msgstr "Konum"
 
-#: meld/resources/ui/vcview.ui:229
+#: meld/resources/ui/vcview.ui:238
 msgid "Status"
 msgstr "Durum"
 
-#: meld/resources/ui/vcview.ui:238
+#: meld/resources/ui/vcview.ui:247
 msgid "Extra"
 msgstr "Ek"
 
-#: meld/resources/ui/vcview.ui:270
+#: meld/resources/ui/vcview.ui:279
 msgid "Console output"
 msgstr "Konsol çıktısı"
 
@@ -1674,85 +1698,85 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:538 meld/preferences.py:132
+#: meld/dirdiff.py:551 meld/preferences.py:132
 msgid "Size"
 msgstr "Boyut"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:546 meld/preferences.py:133
+#: meld/dirdiff.py:559 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Değiştirilme zamanı"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:554 meld/preferences.py:134
+#: meld/dirdiff.py:567 meld/preferences.py:134
 msgid "Permissions"
 msgstr "İzinler"
 
-#: meld/dirdiff.py:778 meld/dirdiff.py:802
+#: meld/dirdiff.py:803 meld/dirdiff.py:827
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] {folder} taranıyor"
 
-#: meld/dirdiff.py:942
+#: meld/dirdiff.py:967
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Tamamlandı"
 
-#: meld/dirdiff.py:951
+#: meld/dirdiff.py:976
 msgid "Folder {} is being compared to itself"
 msgstr "{} klasörü kendiyle karşılaştırılıyor"
 
-#: meld/dirdiff.py:957
+#: meld/dirdiff.py:982
 msgid "Folders have no differences"
 msgstr "Klasörlerde fark yok"
 
-#: meld/dirdiff.py:959
+#: meld/dirdiff.py:984
 msgid "Contents of scanned files in folders are identical."
 msgstr "Klasörlerdeki taranan dosyaların içerikleri özdeş."
 
-#: meld/dirdiff.py:961
+#: meld/dirdiff.py:986
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 "Klasördeki taranan dosyalar özdeş gözüküyor fakat içerikleri taranmadı."
 
-#: meld/dirdiff.py:964
+#: meld/dirdiff.py:989
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Dosya süzgeçleri kullanımda, bu yüzden tüm dosyalar taranamamış."
 
-#: meld/dirdiff.py:966
+#: meld/dirdiff.py:991
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Metin süzgeçleri kullanımda ve içerik farklılıklarını maskeleyebilir."
 
-#: meld/dirdiff.py:982 meld/filediff.py:1874
+#: meld/dirdiff.py:1007 meld/filediff.py:1907
 msgid "Hide"
 msgstr "Gizle"
 
-#: meld/dirdiff.py:984 meld/filediff.py:1876 meld/filediff.py:1906
-#: meld/filediff.py:1908 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1009 meld/filediff.py:1909 meld/filediff.py:1939
+#: meld/filediff.py:1941 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "Gi_zle"
 
-#: meld/dirdiff.py:993
+#: meld/dirdiff.py:1018
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Bu klasör taranırken birçok hata oluştu"
 
-#: meld/dirdiff.py:994
+#: meld/dirdiff.py:1019
 msgid "Files with invalid encodings found"
 msgstr "Geçersiz kodlamalı dosyalar bulundu"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:996
+#: meld/dirdiff.py:1021
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Bazı dosyalar yanlış kodlamadaydı. Adları şu biçimdedir:"
 
-#: meld/dirdiff.py:998
+#: meld/dirdiff.py:1023
 msgid "Files hidden by case insensitive comparison"
 msgstr "Büyük küçük harf duyarsız karşılaştırmaya göre gizli dosyalar"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1000
+#: meld/dirdiff.py:1025
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1760,17 +1784,17 @@ msgstr ""
 "Büyük/küçük harf duyarlı dosya sisteminde büyük/küçük harf duyarsız "
 "karşılaştırma yapmaktasınız. Bu klasördeki bazı dosyalar gizlidir:"
 
-#: meld/dirdiff.py:1011
+#: meld/dirdiff.py:1036
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}”, “{second_file}” tarafından gizlendi"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1095
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "“%s” klasörü değiştirilsin mi?"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1097
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1779,11 +1803,11 @@ msgstr ""
 "“%s” içinde aynı ad ile başka klasör zaten var.\n"
 "Eğer var olan klasörü değiştirirseniz, içindeki tüm dosyalar yitecektir."
 
-#: meld/dirdiff.py:1085
+#: meld/dirdiff.py:1110
 msgid "Error copying file"
 msgstr "Dosya kopyalamada hata"
 
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1111
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1796,19 +1820,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1111 meld/vcview.py:759
+#: meld/dirdiff.py:1136 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "{} silinirken hata"
 
-#: meld/dirdiff.py:1604
+#: meld/dirdiff.py:1626
 msgid "No folder"
 msgstr "Klasör yok"
 
-#: meld/filediff.py:1144
+#: meld/filediff.py:1149
 msgid "Comparison results will be inaccurate"
 msgstr "Karşılaştırma sonuçları hatalı olacak"
 
-#: meld/filediff.py:1146
+#: meld/filediff.py:1151
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1816,75 +1840,75 @@ msgstr ""
 "Bir süzgeç dosyadaki satır numaralarını desteklenmeyen biçimde değiştirdi. "
 "Karşılaştırma doğru olmayacaktır."
 
-#: meld/filediff.py:1218
+#: meld/filediff.py:1223
 msgid "Mark conflict as resolved?"
 msgstr "Çakışma çözüldü olarak işaretlensin mi?"
 
-#: meld/filediff.py:1220
+#: meld/filediff.py:1225
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Eğer çakışma başarıyla çözüldüyse, o zaman çözüldü olarak "
 "işaretleyebilirsiniz."
 
-#: meld/filediff.py:1222
+#: meld/filediff.py:1227
 msgid "Cancel"
 msgstr "İptal Et"
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1228
 msgid "Mark _Resolved"
 msgstr "_Çözümlendi olarak işaretle"
 
-#: meld/filediff.py:1556
+#: meld/filediff.py:1589
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "“%s” dosyası açılırken sorun var."
 
-#: meld/filediff.py:1564
+#: meld/filediff.py:1598
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "%s dosyası ikili dosya olarak görünüyor."
 
-#: meld/filediff.py:1566
+#: meld/filediff.py:1600
 msgid "Do you want to open the file using the default application?"
 msgstr "Dosyayı öntanımlı uygulamayı kullanarak açmak istiyor musunuz?"
 
-#: meld/filediff.py:1568
+#: meld/filediff.py:1602
 msgid "Open"
 msgstr "Aç"
 
-#: meld/filediff.py:1582
+#: meld/filediff.py:1616
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Dosyalar birleştiriliyor"
 
-#: meld/filediff.py:1596
+#: meld/filediff.py:1630
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Farklılıklar hesaplanıyor"
 
-#: meld/filediff.py:1657
+#: meld/filediff.py:1690
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Disk üzerindeki %s dosyası değiştirildi"
 
-#: meld/filediff.py:1658
+#: meld/filediff.py:1691
 msgid "Do you want to reload the file?"
 msgstr "Dosyayı yeniden yüklemek istiyor musunuz?"
 
-#: meld/filediff.py:1660
+#: meld/filediff.py:1693
 msgid "_Reload"
 msgstr "_Yeniden yükle"
 
-#: meld/filediff.py:1830
+#: meld/filediff.py:1863
 msgid "File {} is being compared to itself"
 msgstr "{} dosyası kendiyle karşılaştırılıyor"
 
-#: meld/filediff.py:1839
+#: meld/filediff.py:1872
 msgid "Files are identical"
 msgstr "Dosyalar özdeş"
 
-#: meld/filediff.py:1852
+#: meld/filediff.py:1885
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1892,11 +1916,11 @@ msgstr ""
 "Metin süzgeçleri kullanılmakta ve dosyalar arasındaki farklılıkları "
 "maskeliyor olabilir. Süzülmemiş dosyaları karşılaştırmak ister misiniz?"
 
-#: meld/filediff.py:1857
+#: meld/filediff.py:1890
 msgid "Files differ in line endings only"
 msgstr "Dosyalar yalnızca satır sonlarında farklılaşıyor"
 
-#: meld/filediff.py:1859
+#: meld/filediff.py:1892
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1905,15 +1929,15 @@ msgstr ""
 "Dosyalar satır sonları dışında özdeş:\n"
 "%s"
 
-#: meld/filediff.py:1879
+#: meld/filediff.py:1912
 msgid "Show without filters"
 msgstr "Süzgeçsiz göster"
 
-#: meld/filediff.py:1901
+#: meld/filediff.py:1934
 msgid "Change highlighting incomplete"
 msgstr "Vurgulama değişikliği tamamlanamadı"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1935
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1922,19 +1946,19 @@ msgstr ""
 "daha büyük değişiklikleri daha uzun sürede ve daha yavaş olmasına rağmen "
 "vurgulaması için zorlayabilirsiniz."
 
-#: meld/filediff.py:1910
+#: meld/filediff.py:1943
 msgid "Keep highlighting"
 msgstr "Vurgulamayı koru"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1945
 msgid "_Keep highlighting"
 msgstr "Vurgulamayı _koru"
 
-#: meld/filediff.py:1925
+#: meld/filediff.py:1958
 msgid "Saving failed"
 msgstr "Kaydetme başarısız"
 
-#: meld/filediff.py:1926
+#: meld/filediff.py:1959
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1942,36 +1966,36 @@ msgstr ""
 "Veri yitimini önlemek için lütfen önemli değişiklikleri başka programa veya "
 "dosyaya kopyalayın."
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1968
 msgid "Save Left Pane As"
 msgstr "Sol Bölme Olarak Kaydet"
 
-#: meld/filediff.py:1937
+#: meld/filediff.py:1970
 msgid "Save Middle Pane As"
 msgstr "Orta Bölme Olarak Kaydet"
 
-#: meld/filediff.py:1939
+#: meld/filediff.py:1972
 msgid "Save Right Pane As"
 msgstr "Sağ Bölme Olarak Kaydet"
 
-#: meld/filediff.py:1950
+#: meld/filediff.py:1983
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "%s dosyası açıldığından beri diskte değişti"
 
-#: meld/filediff.py:1952
+#: meld/filediff.py:1985
 msgid "If you save it, any external changes will be lost."
 msgstr "Eğer kaydederseniz, dış değişiklikler yitecektir."
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:1988
 msgid "Save Anyway"
 msgstr "Yine De Kaydet"
 
-#: meld/filediff.py:1956
+#: meld/filediff.py:1989
 msgid "Don’t Save"
 msgstr "Kaydetme"
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2031
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1979,7 +2003,7 @@ msgstr ""
 "“{}” dosyası, kendisinin şu anki “{}” kodlaması kullanılarak kodlanamayacak "
 "karakterler içeriyor."
 
-#: meld/filediff.py:2002 meld/patchdialog.py:138
+#: meld/filediff.py:2035 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1988,20 +2012,16 @@ msgstr ""
 "Şu nedenle dosya kaydedilemedi:\n"
 "%s"
 
-#: meld/filediff.py:2006 meld/patchdialog.py:137
+#: meld/filediff.py:2039 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "%s dosyası kaydedilemedi."
 
-#: meld/filediff.py:2067
-msgid "Open File"
-msgstr "Dosya Aç"
-
-#: meld/filediff.py:2421
+#: meld/filediff.py:2440
 msgid "Live comparison updating disabled"
 msgstr "Canlı karşılaştırma güncellemesi devre dışı bırakıldı"
 
-#: meld/filediff.py:2422
+#: meld/filediff.py:2441
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2012,32 +2032,32 @@ msgstr ""
 "yenileyebilirsiniz ve eşzamanlama noktaları temizlenirse canlı güncellemeler "
 "devam edecektir."
 
-#: meld/iohelpers.py:40
+#: meld/iohelpers.py:41
 msgid "Deleting remote folders is not supported"
 msgstr "Uzak klasörlerin silinmesi desteklenmiyor"
 
-#: meld/iohelpers.py:42
+#: meld/iohelpers.py:43
 msgid "Not a file or directory"
 msgstr "Dosya veya dizin değil"
 
-#: meld/iohelpers.py:46
+#: meld/iohelpers.py:47
 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
 msgstr "“{}” çöpe konulamaz. Hemen silmek ister misiniz?"
 
-#: meld/iohelpers.py:51
+#: meld/iohelpers.py:52
 msgid "This remote location does not support sending items to the trash."
 msgstr "Bu uzak konum ögelerin çöpe gönderilmesini desteklemiyor."
 
-#: meld/iohelpers.py:56
+#: meld/iohelpers.py:57
 msgid "_Delete Permanently"
 msgstr "Kalıcı Olarak _Sil"
 
-#: meld/iohelpers.py:106
+#: meld/iohelpers.py:107
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "“%s” dosyası değiştirilsin mi?"
 
-#: meld/iohelpers.py:108
+#: meld/iohelpers.py:109
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2146,20 +2166,20 @@ msgstr "uzak klasör “{}” desteklenmiyor"
 msgid "<unnamed>"
 msgstr "<adsiz>"
 
-#: meld/melddoc.py:61
+#: meld/melddoc.py:124
 msgid "untitled"
 msgstr "başlıksız"
 
-#: meld/meldwindow.py:155
+#: meld/meldwindow.py:158
 msgid "Filename"
 msgstr "Dosya adı"
 
-#: meld/meldwindow.py:384
+#: meld/meldwindow.py:381
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Kendiliğinden birleştirme için üç dosya gerekiyor, var olan: %r"
 
-#: meld/meldwindow.py:406
+#: meld/meldwindow.py:403
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Dosya ve dizinlerin karışımı karşılaştırılamıyor"
 
@@ -2187,7 +2207,7 @@ msgstr "etiket"
 msgid "pattern"
 msgstr "örüntü"
 
-#: meld/recent.py:104
+#: meld/recent.py:111
 msgid "Version control:"
 msgstr "Sürüm denetimi:"
 
@@ -2204,6 +2224,11 @@ msgstr "{name} ({charset})"
 msgid "Plain Text"
 msgstr "Düz Metin"
 
+#: meld/ui/pathlabel.py:36
+#| msgid "Filename filters"
+msgid "Unnamed file"
+msgstr "Adsız dosya"
+
 #. Abbreviation for line, column so that it will fit in the status bar
 #: meld/ui/statusbar.py:125
 #, python-brace-format
@@ -2226,9 +2251,7 @@ msgstr "Hiçbir dosya gönderilemeyecektir"
 msgid "{unpushed_commits} in {unpushed_branches}"
 msgstr "{unpushed_branches} içinde {unpushed_commits}"
 
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: meld/vc/git.py:94 meld/vc/git.py:103
+#: meld/vc/git.py:94 meld/vc/git.py:104
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -2240,16 +2263,16 @@ msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "%d dal"
 
-#: meld/vc/git.py:344
+#: meld/vc/git.py:345
 #, python-brace-format
 msgid "Mode changed from {old_mode} to {new_mode}"
 msgstr "Kip {old_mode}’den {new_mode}’e değiştirildi"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Partially staged"
 msgstr "Kısmen sahnelendi"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Staged"
 msgstr "Sahnelendi"
 
@@ -2310,94 +2333,94 @@ msgstr "Mevcut değil"
 
 #. Translators: This error message is shown when no
 #. repository of this type is found.
-#: meld/vcview.py:333
+#: meld/vcview.py:334
 #, python-format
 msgid "%(name)s (not found)"
 msgstr "%(name)s (bulunamadı)"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: meld/vcview.py:337
+#: meld/vcview.py:338
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s yüklü değil)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: meld/vcview.py:341
+#: meld/vcview.py:342
 #, python-format
 msgid "%(name)s (invalid repository)"
 msgstr "%(name)s (geçersiz depo)"
 
-#: meld/vcview.py:355
+#: meld/vcview.py:356
 msgid "No valid version control system found in this folder"
 msgstr "Bu klasörde geçerli sürüm denetimi sistemi bulunamadı"
 
-#: meld/vcview.py:357
+#: meld/vcview.py:358
 msgid "Choose which version control system to use"
 msgstr "Hangi sürüm denetimi sistemini kullanacağınızı seçin"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:411
+#: meld/vcview.py:412
 #, python-brace-format
 msgid "Location: {path}"
 msgstr "Konum: {path}"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:418
+#: meld/vcview.py:419
 msgid "Scanning repository"
 msgstr "Depo taranıyor"
 
-#: meld/vcview.py:447
+#: meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "%s taranıyor"
 
-#: meld/vcview.py:486
+#: meld/vcview.py:487
 msgid "(Empty)"
 msgstr "(Boş)"
 
-#: meld/vcview.py:533
+#: meld/vcview.py:535
 #, python-format
 msgid "%s — local"
 msgstr "%s — yerel"
 
-#: meld/vcview.py:534
+#: meld/vcview.py:536
 #, python-format
 msgid "%s — remote"
 msgstr "%s — uzak"
 
-#: meld/vcview.py:542
+#: meld/vcview.py:544
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (yerel, birleştir, uzak)"
 
-#: meld/vcview.py:547
+#: meld/vcview.py:549
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (uzak, birleştir, yerel)"
 
-#: meld/vcview.py:558
+#: meld/vcview.py:560
 #, python-format
 msgid "%s — repository"
 msgstr "%s — depo"
 
-#: meld/vcview.py:564
+#: meld/vcview.py:566
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (çalışma dizini, depo)"
 
-#: meld/vcview.py:568
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (depo, çalışma dizini)"
 
-#: meld/vcview.py:730
+#: meld/vcview.py:735
 msgid "Remove folder and all its files?"
 msgstr "Klasör ve dosyaları silinsin mi?"
 
-#: meld/vcview.py:732
+#: meld/vcview.py:737
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2405,10 +2428,40 @@ msgstr ""
 "Bu işlem, sürüm denetimi sisteminden tüm seçili dosya ve klasörleri, ve "
 "seçili herhangi bir klasör içindeki tüm dosyaları kaldıracak."
 
-#: meld/vcview.py:845
+#: meld/vcview.py:850
 msgid "Clear"
 msgstr "Temizle"
 
+#~ msgid "_Update"
+#~ msgstr "_Güncelle"
+
+#~ msgid "Mar_k as Resolved"
+#~ msgstr "Çözüldü Olarak İm_le"
+
+#~ msgid "Update"
+#~ msgstr "Güncelle"
+
+#~ msgid "Update working copy from version control"
+#~ msgstr "Sürüm denetiminden çalışma kopyasını güncelle"
+
+#~ msgid "Push"
+#~ msgstr "Gönder"
+
+#~ msgid "Add"
+#~ msgstr "Ekle"
+
+#~ msgid "Remove"
+#~ msgstr "Kaldır"
+
+#~ msgid "Mark as Resolved"
+#~ msgstr "Çözüldü Olarak İmle"
+
+#~ msgid "Revert"
+#~ msgstr "Geri Al"
+
+#~ msgid "Delete from working copy"
+#~ msgstr "Çalışma kopyasından sil"
+
 #~ msgid "[%s] Scanning %s"
 #~ msgstr "[%s] Taranıyor %s"
 
@@ -2525,9 +2578,6 @@ msgstr "Temizle"
 #~ msgid "Previous Conflict"
 #~ msgstr "Önceki Çakışma"
 
-#~ msgid "Next Conflict"
-#~ msgstr "Sonraki Çakışma"
-
 #~ msgid "Push to Left"
 #~ msgstr "Sola Gönder"
 
@@ -2708,9 +2758,6 @@ msgstr "Temizle"
 #~ msgid "Open Recent"
 #~ msgstr "En Son Açılanlar"
 
-#~ msgid "Only one version control system found in this folder"
-#~ msgstr "Bu klasörde yalnızca bir sürüm denetimi sistemi bulundu"
-
 #~ msgid "Show toolbar"
 #~ msgstr "Araç çubuğunu göster"
 
@@ -2916,10 +2963,6 @@ msgstr "Temizle"
 #~ msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 #~ msgstr "Yedekler\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 
-#, fuzzy
-#~ msgid "Path"
-#~ msgstr "Yama"
-
 #~ msgid "Select directory"
 #~ msgstr "Dizin seç"
 

From 82427a955caedd8b490d9e65d3a9efe47d4b19bd Mon Sep 17 00:00:00 2001
From: Luna Jernberg <droidbittin@gmail.com>
Date: Sun, 26 Dec 2021 11:43:49 +0000
Subject: [PATCH 002/116] Update Swedish translation

---
 po/sv.po | 435 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 233 insertions(+), 202 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index 9ca13a33..1b1b0a9e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-07-25 10:37+0000\n"
-"PO-Revision-Date: 2021-07-25 22:05+0200\n"
+"POT-Creation-Date: 2021-10-08 22:28+0000\n"
+"PO-Revision-Date: 2021-12-26 12:41+0100\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.2\n"
+"X-Generator: Poedit 3.0.1\n"
 "X-Project-Style: gnome\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
-#: meld/resources/ui/appwindow.ui:9
+#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
 msgid "Meld"
 msgstr "Meld"
 
@@ -810,11 +810,11 @@ msgstr "Sammanfoga allt från höger"
 msgid "Merge All"
 msgstr "Sammanfoga alla"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
 msgid "Add Synchronization Point"
 msgstr "Lägg till synkroniseringspunkt"
 
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
 msgid "Clear Synchronization Points"
 msgstr "Rensa synkroniseringspunkter"
 
@@ -895,39 +895,39 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: meld/resources/ui/appwindow.ui:29
+#: meld/resources/ui/appwindow.ui:30
 msgid "Start a new comparison"
 msgstr "Starta en ny jämförelse"
 
-#: meld/resources/ui/appwindow.ui:45
+#: meld/resources/ui/appwindow.ui:46
 msgid "Open a recent comparison"
 msgstr "Öppna en tidigare jämförelse"
 
-#: meld/resources/ui/appwindow.ui:73
+#: meld/resources/ui/appwindow.ui:74
 msgid "Go to the previous change"
 msgstr "Gå till föregående ändring"
 
-#: meld/resources/ui/appwindow.ui:93
+#: meld/resources/ui/appwindow.ui:94
 msgid "Go to the next change"
 msgstr "Gå till nästa ändring"
 
-#: meld/resources/ui/appwindow.ui:123
+#: meld/resources/ui/appwindow.ui:124
 msgid "Go to the previous conflict"
 msgstr "Gå till föregående konflikt"
 
-#: meld/resources/ui/appwindow.ui:143
+#: meld/resources/ui/appwindow.ui:144
 msgid "Go to the next conflict"
 msgstr "Gå till nästa konflikt"
 
-#: meld/resources/ui/appwindow.ui:192
+#: meld/resources/ui/appwindow.ui:193
 msgid "Version Filters"
 msgstr "Versionsfilter"
 
-#: meld/resources/ui/appwindow.ui:207 meld/resources/ui/preferences.ui:1472
+#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472
 msgid "File Filters"
 msgstr "Filfilter"
 
-#: meld/resources/ui/appwindow.ui:222 meld/resources/ui/preferences.ui:1657
+#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657
 msgid "Text Filters"
 msgstr "Textfilter"
 
@@ -940,7 +940,7 @@ msgid "Column Name"
 msgstr "Kolumnnamn"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
 msgid "_Remove"
 msgstr "_Ta bort"
 
@@ -1024,6 +1024,23 @@ msgstr "Ö_ppna externt"
 msgid "_Copy File Paths"
 msgstr "_Kopiera filsökvägar"
 
+#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
+#: meld/resources/ui/dirdiff.ui:117
+msgid "Select folder to open in this pane"
+msgstr "Välj mapp att öppna i denna panel"
+
+#: meld/resources/ui/dirdiff.ui:43
+msgid "Folder 1"
+msgstr "Mapp 1"
+
+#: meld/resources/ui/dirdiff.ui:84
+msgid "Folder 2"
+msgstr "Mapp 2"
+
+#: meld/resources/ui/dirdiff.ui:125
+msgid "Folder 3"
+msgstr "Mapp 3"
+
 #: meld/resources/ui/encoding-selector.ui:31
 msgid "Search text encoding…"
 msgstr "Sök textkodning…"
@@ -1080,8 +1097,16 @@ msgstr "_Kopiera"
 msgid "_Paste"
 msgstr "K_listra in"
 
-#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
-#: meld/resources/ui/filediff.ui:171
+#: meld/resources/ui/filediff-menus.ui:54
+msgid "Open Containing Folder"
+msgstr "Öppna innehållande mapp"
+
+#: meld/resources/ui/filediff-menus.ui:58
+msgid "Copy Full Path"
+msgstr "Kopiera fullständig sökväg"
+
+#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
+#: meld/resources/ui/filediff.ui:169
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -1089,31 +1114,31 @@ msgstr ""
 "Kan inte skriva till denna fil. Du kan klicka här för att låsa upp denna fil "
 "och göra ändringar ändå, men dessa ändringar måste sparas till en ny fil."
 
-#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
-#: meld/resources/ui/filediff.ui:185
-msgid "Open file in this pane"
-msgstr "Öppna fil i denna panel"
-
-#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
-#: meld/resources/ui/filediff.ui:194
+#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
+#: meld/resources/ui/filediff.ui:183
 msgid "Save file in this pane"
 msgstr "Spara fil i denna panel"
 
-#: meld/resources/ui/filediff.ui:73
+#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
+#: meld/resources/ui/filediff.ui:209
+msgid "Open file in this pane"
+msgstr "Öppna fil i denna panel"
+
+#: meld/resources/ui/filediff.ui:79
 msgid "File 3"
 msgstr "Fil tre"
 
-#: meld/resources/ui/filediff.ui:142
+#: meld/resources/ui/filediff.ui:148
 msgid "File 2"
 msgstr "Fil två"
 
-#: meld/resources/ui/filediff.ui:207
+#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148
 msgid "File 1"
 msgstr "Fil ett"
 
 #. Create icon and filename CellRenderer
-#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
-#: meld/dirdiff.py:517
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
+#: meld/dirdiff.py:530
 msgid "Name"
 msgstr "Namn"
 
@@ -1125,7 +1150,7 @@ msgstr "Mönster"
 msgid "Add new filter"
 msgstr "Lägg till nytt filter"
 
-#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18
 msgid "_Add"
 msgstr "_Lägg till"
 
@@ -1153,7 +1178,7 @@ msgstr "Radbruten"
 msgid "Replace _All"
 msgstr "Ersätt _alla"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1067 meld/iohelpers.py:113
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1092 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "_Ersätt"
 
@@ -1165,7 +1190,7 @@ msgstr "Växla mellan Sök och Sök-och-ersätt"
 msgid "Search highlight mode…"
 msgstr "Sök färgmarkeringsläge…"
 
-#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:349
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342
 #: meld/newdifftab.py:49
 msgid "New comparison"
 msgstr "Ny jämförelse"
@@ -1254,6 +1279,18 @@ msgstr "Mitten- och högerpaneler"
 msgid "_Reverse patch direction"
 msgstr "_Omvänd programfixriktning"
 
+#: meld/resources/ui/path-label.ui:23
+msgid "Path"
+msgstr "Sökväg"
+
+#: meld/resources/ui/path-label.ui:62
+msgid "Copy Path"
+msgstr "Kopiera sökväg"
+
+#: meld/resources/ui/path-label.ui:78
+msgid "Open Folder"
+msgstr "Öppna mapp"
+
 #: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
 msgid "Preferences"
 msgstr "Inställningar"
@@ -1527,8 +1564,8 @@ msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid."
 msgid "Close _without Saving"
 msgstr "Stäng _utan att spara"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1066
-#: meld/iohelpers.py:55 meld/iohelpers.py:112
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1091
+#: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Avbryt"
 
@@ -1552,95 +1589,67 @@ msgstr "_Jämför"
 msgid "Co_mmit…"
 msgstr "Che_cka in…"
 
-#: meld/resources/ui/vcview-menus.ui:15
-msgid "_Update"
-msgstr "_Uppdatera"
-
-#: meld/resources/ui/vcview-menus.ui:30
+#: meld/resources/ui/vcview-menus.ui:26
 msgid "Re_vert"
 msgstr "Åter_ställ"
 
-#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+#: meld/resources/ui/vcview-menus.ui:30
 msgid "Delete"
 msgstr "Ta bort"
 
-#: meld/resources/ui/vcview-menus.ui:41
-msgid "Mar_k as Resolved"
-msgstr "Markera som _löst"
-
-#: meld/resources/ui/vcview.ui:73
-msgid "Commit…"
-msgstr "Checka in…"
+#: meld/resources/ui/vcview-menus.ui:37
+msgid "Resolve Conflict"
+msgstr "Lös konflikt"
 
-#: meld/resources/ui/vcview.ui:74
+#: meld/resources/ui/vcview.ui:16
 msgid "Commit changes to version control"
 msgstr "Checka in ändringar till versionshanteraren"
 
-#: meld/resources/ui/vcview.ui:86
-msgid "Update"
-msgstr "Uppdatera"
-
-#: meld/resources/ui/vcview.ui:87
-msgid "Update working copy from version control"
-msgstr "Uppdatera arbetskopian från versionshanteraren"
+#: meld/resources/ui/vcview.ui:21
+msgid "Commit…"
+msgstr "Checka in…"
 
-#: meld/resources/ui/vcview.ui:99
-msgid "Push"
-msgstr "_Sänd"
+#: meld/resources/ui/vcview.ui:38
+msgid "Pull remote changes to the local repository"
+msgstr "Hämta fjärrändringar till det lokala förrådet"
 
-#: meld/resources/ui/vcview.ui:100
+#: meld/resources/ui/vcview.ui:51
 msgid "Push local changes to remote"
 msgstr "Sänd lokala ändringar till fjärr"
 
-#: meld/resources/ui/vcview.ui:112
-msgid "Add"
-msgstr "Lägg till"
-
-#: meld/resources/ui/vcview.ui:113
+#: meld/resources/ui/vcview.ui:74
 msgid "Add to version control"
 msgstr "Lägg till för versionshantering"
 
-#: meld/resources/ui/vcview.ui:125
-msgid "Remove"
-msgstr "Ta bort"
-
-#: meld/resources/ui/vcview.ui:126
+#: meld/resources/ui/vcview.ui:87
 msgid "Remove from version control"
 msgstr "Ta bort från versionshantering"
 
-#: meld/resources/ui/vcview.ui:138
-msgid "Mark as Resolved"
-msgstr "Markera som löst"
+#: meld/resources/ui/vcview.ui:100
+msgid "Revert working copy to original state"
+msgstr "Återställ arbetskopian till ursprungligt tillstånd"
 
-#: meld/resources/ui/vcview.ui:139
+#: meld/resources/ui/vcview.ui:113
 msgid "Mark as resolved in version control"
 msgstr "Markera som löst i versionshanteraren"
 
-#: meld/resources/ui/vcview.ui:151
-msgid "Revert"
-msgstr "Återställ"
-
-#: meld/resources/ui/vcview.ui:152
-msgid "Revert working copy to original state"
-msgstr "Återställ arbetskopian till ursprungligt tillstånd"
-
-#: meld/resources/ui/vcview.ui:165
-msgid "Delete from working copy"
-msgstr "Ta bort från arbetskopia"
+#: meld/resources/ui/vcview.ui:140
+msgid "Open version controlled folder in this pane"
+msgstr "Öppna versionskontrollerad mapp i denna panel"
 
-#: meld/resources/ui/vcview.ui:220
+#: meld/resources/ui/vcview.ui:229
 msgid "Location"
 msgstr "Plats"
 
-#: meld/resources/ui/vcview.ui:229
+#: meld/resources/ui/vcview.ui:238
 msgid "Status"
 msgstr "Status"
 
-#: meld/resources/ui/vcview.ui:238
+#: meld/resources/ui/vcview.ui:247
 msgid "Extra"
 msgstr "Extra"
 
-#: meld/resources/ui/vcview.ui:270
+#: meld/resources/ui/vcview.ui:279
 msgid "Console output"
 msgstr "Konsolutskrift"
 
@@ -1665,85 +1674,85 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:538 meld/preferences.py:132
+#: meld/dirdiff.py:551 meld/preferences.py:132
 msgid "Size"
 msgstr "Storlek"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:546 meld/preferences.py:133
+#: meld/dirdiff.py:559 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Ändringstid"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:554 meld/preferences.py:134
+#: meld/dirdiff.py:567 meld/preferences.py:134
 msgid "Permissions"
 msgstr "Rättigheter"
 
-#: meld/dirdiff.py:778 meld/dirdiff.py:802
+#: meld/dirdiff.py:803 meld/dirdiff.py:827
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Söker igenom {folder}"
 
-#: meld/dirdiff.py:942
+#: meld/dirdiff.py:967
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Klar"
 
-#: meld/dirdiff.py:951
+#: meld/dirdiff.py:976
 msgid "Folder {} is being compared to itself"
 msgstr "Mappen {} jämförs med sig själv"
 
-#: meld/dirdiff.py:957
+#: meld/dirdiff.py:982
 msgid "Folders have no differences"
 msgstr "Mapparna skiljer sig inte åt"
 
-#: meld/dirdiff.py:959
+#: meld/dirdiff.py:984
 msgid "Contents of scanned files in folders are identical."
 msgstr "Innehållet i mapparnas avsökta filer är identiskt."
 
-#: meld/dirdiff.py:961
+#: meld/dirdiff.py:986
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 "Mapparnas avsökta filer verkar identiska, men innehållet har inte genomsökts."
 
-#: meld/dirdiff.py:964
+#: meld/dirdiff.py:989
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Filfilter används, och därför har inte alla filer genomsökts."
 
-#: meld/dirdiff.py:966
+#: meld/dirdiff.py:991
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Textfilter används och kan dölja skillnader i innehåll."
 
-#: meld/dirdiff.py:982 meld/filediff.py:1874
+#: meld/dirdiff.py:1007 meld/filediff.py:1907
 msgid "Hide"
 msgstr "Dölj"
 
-#: meld/dirdiff.py:984 meld/filediff.py:1876 meld/filediff.py:1906
-#: meld/filediff.py:1908 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1009 meld/filediff.py:1909 meld/filediff.py:1939
+#: meld/filediff.py:1941 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Dölj"
 
-#: meld/dirdiff.py:993
+#: meld/dirdiff.py:1018
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Flera fel inträffade vid avsökning av denna mapp"
 
-#: meld/dirdiff.py:994
+#: meld/dirdiff.py:1019
 msgid "Files with invalid encodings found"
 msgstr "Filer med ogiltiga teckenkodningar hittades"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:996
+#: meld/dirdiff.py:1021
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "En del filer hade en felaktig kodning. Namnen är ungefär:"
 
-#: meld/dirdiff.py:998
+#: meld/dirdiff.py:1023
 msgid "Files hidden by case insensitive comparison"
 msgstr "Filer dolda av skiftlägeskänslig jämförelse"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1000
+#: meld/dirdiff.py:1025
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1751,17 +1760,17 @@ msgstr ""
 "Du gör en skiftlägesokänslig jämförelse på ett skiftlägeskänsligt filsystem. "
 "En del filer syns inte:"
 
-#: meld/dirdiff.py:1011
+#: meld/dirdiff.py:1036
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "”{first_file}” dold av ”{second_file}”"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1095
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ersätt mappen ”%s”?"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1097
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1770,11 +1779,11 @@ msgstr ""
 "En annan mapp med samma namn existerar redan i ”%s”.\n"
 "Om du ersätter befintlig mapp kommer alla filer att förloras."
 
-#: meld/dirdiff.py:1085
+#: meld/dirdiff.py:1110
 msgid "Error copying file"
 msgstr "Fel vid filkopiering"
 
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1111
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1787,19 +1796,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1111 meld/vcview.py:759
+#: meld/dirdiff.py:1136 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Fel vid borttagning av {}"
 
-#: meld/dirdiff.py:1604
+#: meld/dirdiff.py:1626
 msgid "No folder"
 msgstr "Ingen mapp"
 
-#: meld/filediff.py:1144
+#: meld/filediff.py:1149
 msgid "Comparison results will be inaccurate"
 msgstr "Jämförelseresultat kommer att bli osäkra"
 
-#: meld/filediff.py:1146
+#: meld/filediff.py:1151
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1807,73 +1816,73 @@ msgstr ""
 "Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen "
 "kommer att vara osäker."
 
-#: meld/filediff.py:1218
+#: meld/filediff.py:1223
 msgid "Mark conflict as resolved?"
 msgstr "Markera konflikten som löst?"
 
-#: meld/filediff.py:1220
+#: meld/filediff.py:1225
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "Om konflikten gick att lösa kan du markera den som löst nu."
 
-#: meld/filediff.py:1222
+#: meld/filediff.py:1227
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1228
 msgid "Mark _Resolved"
 msgstr "Markera som _löst"
 
-#: meld/filediff.py:1556
+#: meld/filediff.py:1589
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”."
 
-#: meld/filediff.py:1564
+#: meld/filediff.py:1598
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Filen %s verkar vara en binärfil."
 
-#: meld/filediff.py:1566
+#: meld/filediff.py:1600
 msgid "Do you want to open the file using the default application?"
 msgstr "Vill du öppna filen med standardprogrammet?"
 
-#: meld/filediff.py:1568
+#: meld/filediff.py:1602
 msgid "Open"
 msgstr "Öppna"
 
-#: meld/filediff.py:1582
+#: meld/filediff.py:1616
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Sammanfogar filer"
 
-#: meld/filediff.py:1596
+#: meld/filediff.py:1630
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Beräknar skillnader"
 
-#: meld/filediff.py:1657
+#: meld/filediff.py:1690
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Filen %s har ändrats på disk"
 
-#: meld/filediff.py:1658
+#: meld/filediff.py:1691
 msgid "Do you want to reload the file?"
 msgstr "Vill du läsa om filen?"
 
-#: meld/filediff.py:1660
+#: meld/filediff.py:1693
 msgid "_Reload"
 msgstr "_Läs om"
 
-#: meld/filediff.py:1830
+#: meld/filediff.py:1863
 msgid "File {} is being compared to itself"
 msgstr "Filen {} jämförs med sig själv"
 
-#: meld/filediff.py:1839
+#: meld/filediff.py:1872
 msgid "Files are identical"
 msgstr "Filerna är identiska"
 
-#: meld/filediff.py:1852
+#: meld/filediff.py:1885
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1881,11 +1890,11 @@ msgstr ""
 "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
 "ofiltrerade filerna?"
 
-#: meld/filediff.py:1857
+#: meld/filediff.py:1890
 msgid "Files differ in line endings only"
 msgstr "Filer skiljer sig endast vad gäller radslut"
 
-#: meld/filediff.py:1859
+#: meld/filediff.py:1892
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1894,15 +1903,15 @@ msgstr ""
 "Filerna är identiska förutom radavsluten:\n"
 "%s"
 
-#: meld/filediff.py:1879
+#: meld/filediff.py:1912
 msgid "Show without filters"
 msgstr "Visa utan filer"
 
-#: meld/filediff.py:1901
+#: meld/filediff.py:1934
 msgid "Change highlighting incomplete"
 msgstr "Ändra markering av ofärdiga"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1935
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1911,19 +1920,19 @@ msgstr ""
 "Meld till att längre tid på sig att markera större ändringar, men det kan "
 "bli långsamt."
 
-#: meld/filediff.py:1910
+#: meld/filediff.py:1943
 msgid "Keep highlighting"
 msgstr "Använd markering"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1945
 msgid "_Keep highlighting"
 msgstr "_Använd markering"
 
-#: meld/filediff.py:1925
+#: meld/filediff.py:1958
 msgid "Saving failed"
 msgstr "Misslyckades med att spara"
 
-#: meld/filediff.py:1926
+#: meld/filediff.py:1959
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1931,36 +1940,36 @@ msgstr ""
 "Överväg att kopiera kritiska ändringar till ett annat program eller en annan "
 "fil för att undvika förlust av data."
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1968
 msgid "Save Left Pane As"
 msgstr "Spara vänsterpanel som"
 
-#: meld/filediff.py:1937
+#: meld/filediff.py:1970
 msgid "Save Middle Pane As"
 msgstr "Spara mittenpanel som"
 
-#: meld/filediff.py:1939
+#: meld/filediff.py:1972
 msgid "Save Right Pane As"
 msgstr "Spara högerpanel som"
 
-#: meld/filediff.py:1950
+#: meld/filediff.py:1983
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Filen %s har ändrats på disk sedan den öppnades"
 
-#: meld/filediff.py:1952
+#: meld/filediff.py:1985
 msgid "If you save it, any external changes will be lost."
 msgstr "Om du sparar den kommer alla externa ändringar att gå förlorade."
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:1988
 msgid "Save Anyway"
 msgstr "Spara ändå"
 
-#: meld/filediff.py:1956
+#: meld/filediff.py:1989
 msgid "Don’t Save"
 msgstr "Spara inte"
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2031
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1968,7 +1977,7 @@ msgstr ""
 "Filen ”{}” innehåller tecken som inte kan kodas med dess aktuella kodning "
 "”{}”."
 
-#: meld/filediff.py:2002 meld/patchdialog.py:138
+#: meld/filediff.py:2035 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1977,20 +1986,16 @@ msgstr ""
 "Kunde in spara fil beroende på:\n"
 "%s"
 
-#: meld/filediff.py:2006 meld/patchdialog.py:137
+#: meld/filediff.py:2039 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Kunde inte spara filen %s."
 
-#: meld/filediff.py:2067
-msgid "Open File"
-msgstr "Öppna fil"
-
-#: meld/filediff.py:2421
+#: meld/filediff.py:2440
 msgid "Live comparison updating disabled"
 msgstr "Inaktivera realtidsuppdateringar av jämförelser"
 
-#: meld/filediff.py:2422
+#: meld/filediff.py:2441
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2001,33 +2006,33 @@ msgstr ""
 "manuellt, och uppdateringar i realtid kommer att fortsätta när "
 "synkroniseringspunkterna är rensade."
 
-#: meld/iohelpers.py:40
+#: meld/iohelpers.py:41
 msgid "Deleting remote folders is not supported"
 msgstr "Att ta bort fjärrmappar stöds ej"
 
-#: meld/iohelpers.py:42
+#: meld/iohelpers.py:43
 msgid "Not a file or directory"
 msgstr "Inte en fil eller katalog"
 
-#: meld/iohelpers.py:46
+#: meld/iohelpers.py:47
 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
 msgstr ""
 "Kan inte flytta ”{}” till papperskorgen. Vill du ta bort den omedelbart?"
 
-#: meld/iohelpers.py:51
+#: meld/iohelpers.py:52
 msgid "This remote location does not support sending items to the trash."
 msgstr "Denna fjärrplats stöder inte att lägga objekt i papperskorgen."
 
-#: meld/iohelpers.py:56
+#: meld/iohelpers.py:57
 msgid "_Delete Permanently"
 msgstr "_Ta bort permanent"
 
-#: meld/iohelpers.py:106
+#: meld/iohelpers.py:107
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Ersätt filen ”%s”?"
 
-#: meld/iohelpers.py:108
+#: meld/iohelpers.py:109
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2132,24 +2137,24 @@ msgid "remote folder “{}” not supported"
 msgstr "fjärrmapp ”{}” stöds ej"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: meld/meldbuffer.py:114
+#: meld/meldbuffer.py:115
 msgid "<unnamed>"
 msgstr "<namnlös>"
 
-#: meld/melddoc.py:61
+#: meld/melddoc.py:124
 msgid "untitled"
 msgstr "namnlös"
 
-#: meld/meldwindow.py:155
+#: meld/meldwindow.py:158
 msgid "Filename"
 msgstr "Filnamn"
 
-#: meld/meldwindow.py:384
+#: meld/meldwindow.py:381
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Behöver tre filer för att sammanfoga automatiskt, fick: %r"
 
-#: meld/meldwindow.py:406
+#: meld/meldwindow.py:403
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Kan inte jämföra en blandning av filer och kataloger"
 
@@ -2177,7 +2182,7 @@ msgstr "etikett"
 msgid "pattern"
 msgstr "mönster"
 
-#: meld/recent.py:104
+#: meld/recent.py:111
 msgid "Version control:"
 msgstr "Versionshantering:"
 
@@ -2195,6 +2200,10 @@ msgstr "{name} ({charset})"
 msgid "Plain Text"
 msgstr "Vanlig text"
 
+#: meld/ui/pathlabel.py:36
+msgid "Unnamed file"
+msgstr "Namnlös fil"
+
 #. Abbreviation for line, column so that it will fit in the status bar
 #: meld/ui/statusbar.py:125
 #, python-brace-format
@@ -2217,9 +2226,7 @@ msgstr "Inga filer kommer att checkas in"
 msgid "{unpushed_commits} in {unpushed_branches}"
 msgstr "{unpushed_commits} i {unpushed_branches}"
 
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: meld/vc/git.py:94 meld/vc/git.py:103
+#: meld/vc/git.py:94 meld/vc/git.py:104
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -2233,16 +2240,16 @@ msgid_plural "%d branches"
 msgstr[0] "%d gren"
 msgstr[1] "%d grenar"
 
-#: meld/vc/git.py:344
+#: meld/vc/git.py:345
 #, python-brace-format
 msgid "Mode changed from {old_mode} to {new_mode}"
 msgstr "Läge ändrat från {old_mode} till {new_mode}"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Partially staged"
 msgstr "Delvis köad"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Staged"
 msgstr "Köad"
 
@@ -2303,94 +2310,94 @@ msgstr "Inte närvarande"
 
 #. Translators: This error message is shown when no
 #. repository of this type is found.
-#: meld/vcview.py:333
+#: meld/vcview.py:334
 #, python-format
 msgid "%(name)s (not found)"
 msgstr "%(name)s (hittades inte)"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: meld/vcview.py:337
+#: meld/vcview.py:338
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s inte installerad)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: meld/vcview.py:341
+#: meld/vcview.py:342
 #, python-format
 msgid "%(name)s (invalid repository)"
 msgstr "%(name)s (ogiltigt förråd)"
 
-#: meld/vcview.py:355
+#: meld/vcview.py:356
 msgid "No valid version control system found in this folder"
 msgstr "Inget giltigt versionshanteringssystem hittades i denna mapp"
 
-#: meld/vcview.py:357
+#: meld/vcview.py:358
 msgid "Choose which version control system to use"
 msgstr "Välj vilket versionshanteringssystem som ska användas"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:411
+#: meld/vcview.py:412
 #, python-brace-format
 msgid "Location: {path}"
 msgstr "Plats: {path}"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:418
+#: meld/vcview.py:419
 msgid "Scanning repository"
 msgstr "Söker igenom förråd"
 
-#: meld/vcview.py:447
+#: meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "Söker igenom %s"
 
-#: meld/vcview.py:486
+#: meld/vcview.py:487
 msgid "(Empty)"
 msgstr "(Tom)"
 
-#: meld/vcview.py:533
+#: meld/vcview.py:535
 #, python-format
 msgid "%s — local"
 msgstr "%s — lokal"
 
-#: meld/vcview.py:534
+#: meld/vcview.py:536
 #, python-format
 msgid "%s — remote"
 msgstr "%s — fjärr"
 
-#: meld/vcview.py:542
+#: meld/vcview.py:544
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (lokal, sammanfoga, fjärr)"
 
-#: meld/vcview.py:547
+#: meld/vcview.py:549
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (fjärr, sammanfoga, lokal)"
 
-#: meld/vcview.py:558
+#: meld/vcview.py:560
 #, python-format
 msgid "%s — repository"
 msgstr "%s — förråd"
 
-#: meld/vcview.py:564
+#: meld/vcview.py:566
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (arbetskopia, förråd)"
 
-#: meld/vcview.py:568
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (förråd, arbetskopia)"
 
-#: meld/vcview.py:730
+#: meld/vcview.py:735
 msgid "Remove folder and all its files?"
 msgstr "Ta bort mapp och dess filer?"
 
-#: meld/vcview.py:732
+#: meld/vcview.py:737
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2398,10 +2405,40 @@ msgstr ""
 "Det här kommer att ta bort alla markerade filer och mappar samt alla filer i "
 "markerade mappar från versionshantering."
 
-#: meld/vcview.py:845
+#: meld/vcview.py:850
 msgid "Clear"
 msgstr "Töm"
 
+#~ msgid "_Update"
+#~ msgstr "_Uppdatera"
+
+#~ msgid "Mar_k as Resolved"
+#~ msgstr "Markera som _löst"
+
+#~ msgid "Update"
+#~ msgstr "Uppdatera"
+
+#~ msgid "Update working copy from version control"
+#~ msgstr "Uppdatera arbetskopian från versionshanteraren"
+
+#~ msgid "Push"
+#~ msgstr "_Sänd"
+
+#~ msgid "Add"
+#~ msgstr "Lägg till"
+
+#~ msgid "Remove"
+#~ msgstr "Ta bort"
+
+#~ msgid "Mark as Resolved"
+#~ msgstr "Markera som löst"
+
+#~ msgid "Revert"
+#~ msgstr "Återställ"
+
+#~ msgid "Delete from working copy"
+#~ msgstr "Ta bort från arbetskopia"
+
 #~ msgid "[%s] Scanning %s"
 #~ msgstr "[%s] Söker igenom %s"
 
@@ -2519,9 +2556,6 @@ msgstr "Töm"
 #~ msgid "Previous Conflict"
 #~ msgstr "Föregående konflikt"
 
-#~ msgid "Next Conflict"
-#~ msgstr "Nästa konflikt"
-
 #~ msgid "Push to Left"
 #~ msgstr "Tryck över åt vänster"
 
@@ -2704,9 +2738,6 @@ msgstr "Töm"
 #~ msgid "Open Recent"
 #~ msgstr "Öppna senaste"
 
-#~ msgid "Only one version control system found in this folder"
-#~ msgstr "Endast ett versionshanteringssystem hittades i denna mapp"
-
 #~ msgid "Show toolbar"
 #~ msgstr "Visa verktygsfältet"
 

From e23ffa3c06caabf962fe77352191166beb6a7ca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=80=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=9D?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B8=D1=9B?=
 <miroslavnikolic@rocketmail.com>
Date: Thu, 30 Dec 2021 13:58:10 +0000
Subject: [PATCH 003/116] Update Serbian translation

---
 po/sr.po | 463 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 245 insertions(+), 218 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index d3bc8ee2..82f216c4 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-09-05 06:01+0000\n"
-"PO-Revision-Date: 2021-09-18 07:47+0200\n"
+"POT-Creation-Date: 2021-10-08 21:01+0000\n"
+"PO-Revision-Date: 2021-12-30 14:56+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: српски <gnome-sr@googlegroups.org>\n"
+"Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
-#: meld/resources/ui/appwindow.ui:9
+#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
 msgid "Meld"
 msgstr "Мелд"
 
@@ -809,11 +809,11 @@ msgstr "Обједини све с десна"
 msgid "Merge All"
 msgstr "Стопи све"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
 msgid "Add Synchronization Point"
 msgstr "Додај тачку усклађивања"
 
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
 msgid "Clear Synchronization Points"
 msgstr "Очисти тачке усклађивања"
 
@@ -875,9 +875,6 @@ msgid "Flatten folders"
 msgstr "Поравнате фасцикле"
 
 #: meld/resources/ui/about-dialog.ui:8
-#| msgid ""
-#| "Copyright © 2002-2009 Stephen Kennedy\n"
-#| "Copyright © 2009-2019 Kai Willadsen"
 msgid ""
 "Copyright © 2002-2009 Stephen Kennedy\n"
 "Copyright © 2009-2021 Kai Willadsen"
@@ -893,39 +890,39 @@ msgstr ""
 "\n"
 "http://prevod.org — превод на српски језик"
 
-#: meld/resources/ui/appwindow.ui:29
+#: meld/resources/ui/appwindow.ui:30
 msgid "Start a new comparison"
 msgstr "Започните ново поређење"
 
-#: meld/resources/ui/appwindow.ui:45
+#: meld/resources/ui/appwindow.ui:46
 msgid "Open a recent comparison"
 msgstr "Отворите скорашње поређење"
 
-#: meld/resources/ui/appwindow.ui:73
+#: meld/resources/ui/appwindow.ui:74
 msgid "Go to the previous change"
 msgstr "Идите на претходну измену"
 
-#: meld/resources/ui/appwindow.ui:93
+#: meld/resources/ui/appwindow.ui:94
 msgid "Go to the next change"
 msgstr "Идите на следећу измену"
 
-#: meld/resources/ui/appwindow.ui:123
+#: meld/resources/ui/appwindow.ui:124
 msgid "Go to the previous conflict"
 msgstr "Идите на претходни сукоб"
 
-#: meld/resources/ui/appwindow.ui:143
+#: meld/resources/ui/appwindow.ui:144
 msgid "Go to the next conflict"
 msgstr "Идите на следећи сукоб"
 
-#: meld/resources/ui/appwindow.ui:192
+#: meld/resources/ui/appwindow.ui:193
 msgid "Version Filters"
 msgstr "Филтери издања"
 
-#: meld/resources/ui/appwindow.ui:207 meld/resources/ui/preferences.ui:1472
+#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472
 msgid "File Filters"
 msgstr "Пропусници датотека"
 
-#: meld/resources/ui/appwindow.ui:222 meld/resources/ui/preferences.ui:1657
+#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657
 msgid "Text Filters"
 msgstr "Пропусници текста"
 
@@ -938,7 +935,7 @@ msgid "Column Name"
 msgstr "Назив колоне"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
 msgid "_Remove"
 msgstr "_Уклони"
 
@@ -1022,6 +1019,27 @@ msgstr "_Отвори спољним"
 msgid "_Copy File Paths"
 msgstr "_Умножи путање датотека"
 
+#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
+#: meld/resources/ui/dirdiff.ui:117
+#| msgid "Save file in this pane"
+msgid "Select folder to open in this pane"
+msgstr "Изаберите фасциклу за отварање у овом окну"
+
+#: meld/resources/ui/dirdiff.ui:43
+#| msgid "Folder"
+msgid "Folder 1"
+msgstr "Фасцикла 1"
+
+#: meld/resources/ui/dirdiff.ui:84
+#| msgid "Folder"
+msgid "Folder 2"
+msgstr "Фасцикла 2"
+
+#: meld/resources/ui/dirdiff.ui:125
+#| msgid "Folder"
+msgid "Folder 3"
+msgstr "Фасцикла 3"
+
 #: meld/resources/ui/encoding-selector.ui:31
 msgid "Search text encoding…"
 msgstr "Тражи кодирање текста…"
@@ -1078,8 +1096,17 @@ msgstr "У_множи"
 msgid "_Paste"
 msgstr "У_баци"
 
-#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
-#: meld/resources/ui/filediff.ui:171
+#: meld/resources/ui/filediff-menus.ui:54
+msgid "Open Containing Folder"
+msgstr "Отвори фасциклу садржаја"
+
+#: meld/resources/ui/filediff-menus.ui:58
+#| msgid "_Copy File Paths"
+msgid "Copy Full Path"
+msgstr "Умножи пуну путању"
+
+#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
+#: meld/resources/ui/filediff.ui:169
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -1088,31 +1115,31 @@ msgstr ""
 "ову датотеку и да ипак начините измене, али те измене морају бити сачуване у "
 "нову датотеку."
 
-#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
-#: meld/resources/ui/filediff.ui:185
-msgid "Open file in this pane"
-msgstr "Отвори датотеку у овом окну"
-
-#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
-#: meld/resources/ui/filediff.ui:194
+#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
+#: meld/resources/ui/filediff.ui:183
 msgid "Save file in this pane"
 msgstr "Сачувај датотеку у овом окну"
 
-#: meld/resources/ui/filediff.ui:73
+#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
+#: meld/resources/ui/filediff.ui:209
+msgid "Open file in this pane"
+msgstr "Отвори датотеку у овом окну"
+
+#: meld/resources/ui/filediff.ui:79
 msgid "File 3"
 msgstr "3. датотека"
 
-#: meld/resources/ui/filediff.ui:142
+#: meld/resources/ui/filediff.ui:148
 msgid "File 2"
 msgstr "2. датотека"
 
-#: meld/resources/ui/filediff.ui:207
+#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148
 msgid "File 1"
 msgstr "1. датотека"
 
 #. Create icon and filename CellRenderer
-#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
-#: meld/dirdiff.py:517
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
+#: meld/dirdiff.py:530
 msgid "Name"
 msgstr "Назив"
 
@@ -1124,7 +1151,7 @@ msgstr "Образац"
 msgid "Add new filter"
 msgstr "Додајте нови филтер"
 
-#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18
 msgid "_Add"
 msgstr "_Додај"
 
@@ -1152,7 +1179,7 @@ msgstr "Преломљено"
 msgid "Replace _All"
 msgstr "Замени с_ве"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1067 meld/iohelpers.py:113
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1092 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "_Замени"
 
@@ -1164,7 +1191,7 @@ msgstr "Пребаци између Нађи и Нађи_и_замени"
 msgid "Search highlight mode…"
 msgstr "Režim isticanja pretrage…"
 
-#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:349
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342
 #: meld/newdifftab.py:49
 msgid "New comparison"
 msgstr "Ново поређење"
@@ -1253,6 +1280,20 @@ msgstr "Средња и десна површ"
 msgid "_Reverse patch direction"
 msgstr "Преокрени смер _исправке"
 
+#: meld/resources/ui/path-label.ui:23
+msgid "Path"
+msgstr "Путања"
+
+#: meld/resources/ui/path-label.ui:62
+#| msgid "_Copy File Paths"
+msgid "Copy Path"
+msgstr "Умножи путању"
+
+#: meld/resources/ui/path-label.ui:78
+#| msgid "Open File"
+msgid "Open Folder"
+msgstr "Отвори фасциклу"
+
 #: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
 msgid "Preferences"
 msgstr "Поставке"
@@ -1304,7 +1345,6 @@ msgid "Show w_hitespace"
 msgstr "Прикажи _размаке"
 
 #: meld/resources/ui/preferences.ui:381
-#| msgid "Meld dark scheme"
 msgid "Prefer dark theme"
 msgstr "Предност тамној теми"
 
@@ -1526,8 +1566,8 @@ msgstr "Ако не сачувате, измене ће бити трајно и
 msgid "Close _without Saving"
 msgstr "Затвори _без чувања"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1066
-#: meld/iohelpers.py:55 meld/iohelpers.py:112
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1091
+#: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Откажи"
 
@@ -1551,95 +1591,70 @@ msgstr "_Упореди"
 msgid "Co_mmit…"
 msgstr "У_гради…"
 
-#: meld/resources/ui/vcview-menus.ui:15
-msgid "_Update"
-msgstr "_Ажурирај"
-
-#: meld/resources/ui/vcview-menus.ui:30
+#: meld/resources/ui/vcview-menus.ui:26
 msgid "Re_vert"
 msgstr "_Поврати"
 
-#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+#: meld/resources/ui/vcview-menus.ui:30
 msgid "Delete"
 msgstr "Обриши"
 
-#: meld/resources/ui/vcview-menus.ui:41
-msgid "Mar_k as Resolved"
-msgstr "Означи _као решено"
-
-#: meld/resources/ui/vcview.ui:73
-msgid "Commit…"
-msgstr "Угради…"
+#: meld/resources/ui/vcview-menus.ui:37
+#| msgid "Next Conflict"
+msgid "Resolve Conflict"
+msgstr "Реши сукоб"
 
-#: meld/resources/ui/vcview.ui:74
+#: meld/resources/ui/vcview.ui:16
 msgid "Commit changes to version control"
 msgstr "Уградите измене у управљање издањем"
 
-#: meld/resources/ui/vcview.ui:86
-msgid "Update"
-msgstr "Освежи"
-
-#: meld/resources/ui/vcview.ui:87
-msgid "Update working copy from version control"
-msgstr "Освежите радни примерак из управљања издањем"
+#: meld/resources/ui/vcview.ui:21
+msgid "Commit…"
+msgstr "Угради…"
 
-#: meld/resources/ui/vcview.ui:99
-msgid "Push"
-msgstr "Погурај"
+#: meld/resources/ui/vcview.ui:38
+#| msgid "Push current change to the left"
+msgid "Pull remote changes to the local repository"
+msgstr "Повуците удаљене измене у локалну ризницу"
 
-#: meld/resources/ui/vcview.ui:100
+#: meld/resources/ui/vcview.ui:51
 msgid "Push local changes to remote"
 msgstr "Погурајте месне измене у удаљене"
 
-#: meld/resources/ui/vcview.ui:112
-msgid "Add"
-msgstr "Додај"
-
-#: meld/resources/ui/vcview.ui:113
+#: meld/resources/ui/vcview.ui:74
 msgid "Add to version control"
 msgstr "Додајте у управљање издањем"
 
-#: meld/resources/ui/vcview.ui:125
-msgid "Remove"
-msgstr "Уклони"
-
-#: meld/resources/ui/vcview.ui:126
+#: meld/resources/ui/vcview.ui:87
 msgid "Remove from version control"
 msgstr "Уклоните из управљања издањем"
 
-#: meld/resources/ui/vcview.ui:138
-msgid "Mark as Resolved"
-msgstr "Означи као решено"
+#: meld/resources/ui/vcview.ui:100
+msgid "Revert working copy to original state"
+msgstr "Вратите радни примерак на првобитно стање"
 
-#: meld/resources/ui/vcview.ui:139
+#: meld/resources/ui/vcview.ui:113
 msgid "Mark as resolved in version control"
 msgstr "Означите као решено у управљању издањем"
 
-#: meld/resources/ui/vcview.ui:151
-msgid "Revert"
-msgstr "Врати"
+#: meld/resources/ui/vcview.ui:140
+#| msgid "Only one version control system found in this folder"
+msgid "Open version controlled folder in this pane"
+msgstr "Отворите фасциклу управљану издањем у овом окну"
 
-#: meld/resources/ui/vcview.ui:152
-msgid "Revert working copy to original state"
-msgstr "Вратите радни примерак на првобитно стање"
-
-#: meld/resources/ui/vcview.ui:165
-msgid "Delete from working copy"
-msgstr "Обришите из радног примерка"
-
-#: meld/resources/ui/vcview.ui:220
+#: meld/resources/ui/vcview.ui:229
 msgid "Location"
 msgstr "Путања"
 
-#: meld/resources/ui/vcview.ui:229
+#: meld/resources/ui/vcview.ui:238
 msgid "Status"
 msgstr "Стање"
 
-#: meld/resources/ui/vcview.ui:238
+#: meld/resources/ui/vcview.ui:247
 msgid "Extra"
 msgstr "Посебно"
 
-#: meld/resources/ui/vcview.ui:270
+#: meld/resources/ui/vcview.ui:279
 msgid "Console output"
 msgstr "Излаз конзоле"
 
@@ -1664,45 +1679,43 @@ msgid "Mac OS (CR)"
 msgstr "Мек ОС (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:538 meld/preferences.py:132
+#: meld/dirdiff.py:551 meld/preferences.py:132
 msgid "Size"
 msgstr "Величина"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:546 meld/preferences.py:133
+#: meld/dirdiff.py:559 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Време измене"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:554 meld/preferences.py:134
+#: meld/dirdiff.py:567 meld/preferences.py:134
 msgid "Permissions"
 msgstr "Овлашћења"
 
-#: meld/dirdiff.py:778 meld/dirdiff.py:802
+#: meld/dirdiff.py:803 meld/dirdiff.py:827
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Скенирам „{folder}“"
 
-#: meld/dirdiff.py:942
+#: meld/dirdiff.py:967
 #, python-brace-format
-#| msgid "[%s] Done"
 msgid "[{label}] Done"
 msgstr "[{label}] Готово"
 
-#: meld/dirdiff.py:951
-#| msgid "Folder {duplicate_directory} is being compared to itself"
+#: meld/dirdiff.py:976
 msgid "Folder {} is being compared to itself"
 msgstr "Фасцикла „{}“ је упоређена са самом собом"
 
-#: meld/dirdiff.py:957
+#: meld/dirdiff.py:982
 msgid "Folders have no differences"
 msgstr "Фасцикле се не разликују"
 
-#: meld/dirdiff.py:959
+#: meld/dirdiff.py:984
 msgid "Contents of scanned files in folders are identical."
 msgstr "Садржаји прегледаних датотека у фасциклама су исти."
 
-#: meld/dirdiff.py:961
+#: meld/dirdiff.py:986
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1710,42 +1723,42 @@ msgstr ""
 "Прегледане датотеке у фасциклама изгледа да су исте, али садржај није "
 "прегледан."
 
-#: meld/dirdiff.py:964
+#: meld/dirdiff.py:989
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Филтери датотека су у употреби, тако да нису све датотеке прегледане."
 
-#: meld/dirdiff.py:966
+#: meld/dirdiff.py:991
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Филтери текста су у употреби и можда су замаскирали разлике садржаја."
 
-#: meld/dirdiff.py:982 meld/filediff.py:1874
+#: meld/dirdiff.py:1007 meld/filediff.py:1907
 msgid "Hide"
 msgstr "Сакриј"
 
-#: meld/dirdiff.py:984 meld/filediff.py:1876 meld/filediff.py:1906
-#: meld/filediff.py:1908 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1009 meld/filediff.py:1909 meld/filediff.py:1939
+#: meld/filediff.py:1941 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Сакриј"
 
-#: meld/dirdiff.py:993
+#: meld/dirdiff.py:1018
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Дошло је до више грешака за време претраживања ове фасцикле"
 
-#: meld/dirdiff.py:994
+#: meld/dirdiff.py:1019
 msgid "Files with invalid encodings found"
 msgstr "Пронађене су датотеке са неисправним кодирањем"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:996
+#: meld/dirdiff.py:1021
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Неке датотеке бејаху у неисправном кодирању. Називи су нешто као:"
 
-#: meld/dirdiff.py:998
+#: meld/dirdiff.py:1023
 msgid "Files hidden by case insensitive comparison"
 msgstr "Датотеке скривене поређењем неосетљивим на величину слова"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1000
+#: meld/dirdiff.py:1025
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1753,18 +1766,17 @@ msgstr ""
 "Покренули сте поређење независно од величине слова на систему датотека где "
 "је она битна. Неке датотеке нису видљиве:"
 
-#: meld/dirdiff.py:1011
+#: meld/dirdiff.py:1036
 #, python-brace-format
-#| msgid "“%s” hidden by “%s”"
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "„{first_file}“ је скривена од стране „{second_file}“"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1095
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Да заменим фасциклу „%s“?"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1097
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1773,17 +1785,12 @@ msgstr ""
 "Фасцикла са истим називом већ постоји у „%s“.\n"
 "Ако замените постојећу фасциклу, све датотеке у њој биће изгубљене."
 
-#: meld/dirdiff.py:1085
+#: meld/dirdiff.py:1110
 msgid "Error copying file"
 msgstr "Грешка умножавања датотеке"
 
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1111
 #, python-brace-format
-#| msgid ""
-#| "Couldn’t copy %s\n"
-#| "to %s.\n"
-#| "\n"
-#| "%s"
 msgid ""
 "Couldn’t copy {source}\n"
 "to {dest}.\n"
@@ -1795,19 +1802,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1111 meld/vcview.py:759
+#: meld/dirdiff.py:1136 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Грешка брисања {}"
 
-#: meld/dirdiff.py:1604
+#: meld/dirdiff.py:1626
 msgid "No folder"
 msgstr "Нема фасцикле"
 
-#: meld/filediff.py:1144
+#: meld/filediff.py:1149
 msgid "Comparison results will be inaccurate"
 msgstr "Резултати поређења биће нетачни"
 
-#: meld/filediff.py:1146
+#: meld/filediff.py:1151
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1815,74 +1822,73 @@ msgstr ""
 "Филтер је изменио број редова у датотеци, а то није подржано. Поређење неће "
 "бити тачно."
 
-#: meld/filediff.py:1218
+#: meld/filediff.py:1223
 msgid "Mark conflict as resolved?"
 msgstr "Да означим сукоб решеним?"
 
-#: meld/filediff.py:1220
+#: meld/filediff.py:1225
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "Ако је сукоб успешно решен, сада га можете означити решеним."
 
-#: meld/filediff.py:1222
+#: meld/filediff.py:1227
 msgid "Cancel"
 msgstr "Откажи"
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1228
 msgid "Mark _Resolved"
 msgstr "Означи _решеним"
 
-#: meld/filediff.py:1556
+#: meld/filediff.py:1589
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Дошло је до проблема отварања датотеке „%s“."
 
-#: meld/filediff.py:1564
+#: meld/filediff.py:1598
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Изгледа да је „%s“ извршна датотека."
 
-#: meld/filediff.py:1566
+#: meld/filediff.py:1600
 msgid "Do you want to open the file using the default application?"
 msgstr "Да ли желите да отворите датотеку користећи основни програм?"
 
-#: meld/filediff.py:1568
+#: meld/filediff.py:1602
 msgid "Open"
 msgstr "Отвори"
 
-#: meld/filediff.py:1582
+#: meld/filediff.py:1616
 #, python-format
 msgid "[%s] Merging files"
 msgstr "Обједињујем датотеке [%s]"
 
-#: meld/filediff.py:1596
+#: meld/filediff.py:1630
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "Срачунавам разлике [%s]"
 
-#: meld/filediff.py:1657
+#: meld/filediff.py:1690
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Датотека „%s“ је измењена на диску"
 
-#: meld/filediff.py:1658
+#: meld/filediff.py:1691
 msgid "Do you want to reload the file?"
 msgstr "Да ли желите поново да учитате датотеку?"
 
-#: meld/filediff.py:1660
+#: meld/filediff.py:1693
 msgid "_Reload"
 msgstr "_Учитај поново"
 
-#: meld/filediff.py:1830
-#| msgid "File {duplicate_files[0]} is being compared to itself"
+#: meld/filediff.py:1863
 msgid "File {} is being compared to itself"
 msgstr "Датотека „{}“ је упоређена са самом собом"
 
-#: meld/filediff.py:1839
+#: meld/filediff.py:1872
 msgid "Files are identical"
 msgstr "Датотеке су истоветне"
 
-#: meld/filediff.py:1852
+#: meld/filediff.py:1885
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1890,11 +1896,11 @@ msgstr ""
 "Коришћени су филтери текста, а могу постојати и замаскиране разлике између "
 "датотека. Да ли желите да поредите неиздвојене датотеке?"
 
-#: meld/filediff.py:1857
+#: meld/filediff.py:1890
 msgid "Files differ in line endings only"
 msgstr "Датотеке се разликују само по завршецима редова"
 
-#: meld/filediff.py:1859
+#: meld/filediff.py:1892
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1903,15 +1909,15 @@ msgstr ""
 "Датотеке су истоветне али се разликују само по завршецима редова:\n"
 "%s"
 
-#: meld/filediff.py:1879
+#: meld/filediff.py:1912
 msgid "Show without filters"
 msgstr "Приказује без филтера"
 
-#: meld/filediff.py:1901
+#: meld/filediff.py:1934
 msgid "Change highlighting incomplete"
 msgstr "Истицање измена није довршено"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1935
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1919,19 +1925,19 @@ msgstr ""
 "Неке измене нису истакнуте зато што су превелике. Можете да приморате Мелд "
 "да продужи са истицањем већих измена, иако то може бити споро."
 
-#: meld/filediff.py:1910
+#: meld/filediff.py:1943
 msgid "Keep highlighting"
 msgstr "Задржите истицање"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1945
 msgid "_Keep highlighting"
 msgstr "_Задржи истицање"
 
-#: meld/filediff.py:1925
+#: meld/filediff.py:1958
 msgid "Saving failed"
 msgstr "Чување није успело"
 
-#: meld/filediff.py:1926
+#: meld/filediff.py:1959
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1939,36 +1945,36 @@ msgstr ""
 "Размотрите умножавање свих ризичних измена у други програм или датотеку да "
 "избегнете губитак података."
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1968
 msgid "Save Left Pane As"
 msgstr "Сачувај леву површ као"
 
-#: meld/filediff.py:1937
+#: meld/filediff.py:1970
 msgid "Save Middle Pane As"
 msgstr "Сачувај средњу површ као"
 
-#: meld/filediff.py:1939
+#: meld/filediff.py:1972
 msgid "Save Right Pane As"
 msgstr "Сачувај десну површ као"
 
-#: meld/filediff.py:1950
+#: meld/filediff.py:1983
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Датотека „%s“ је измењена на диску након отварања"
 
-#: meld/filediff.py:1952
+#: meld/filediff.py:1985
 msgid "If you save it, any external changes will be lost."
 msgstr "Ако је сачувате, све спољне измене ће бити изгубљене."
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:1988
 msgid "Save Anyway"
 msgstr "Ипак сачувај"
 
-#: meld/filediff.py:1956
+#: meld/filediff.py:1989
 msgid "Don’t Save"
 msgstr "Немој чувати"
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2031
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1976,7 +1982,7 @@ msgstr ""
 "Датотека „{}“ садржи знакове који се не могу кодирати употребом њеног "
 "тренутног кодирања „{}“."
 
-#: meld/filediff.py:2002 meld/patchdialog.py:138
+#: meld/filediff.py:2035 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1985,20 +1991,16 @@ msgstr ""
 "Не могу да сачувам датотеку због следећег:\n"
 "%s"
 
-#: meld/filediff.py:2006 meld/patchdialog.py:137
+#: meld/filediff.py:2039 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Не могу да сачувам датотеку „%s“."
 
-#: meld/filediff.py:2067
-msgid "Open File"
-msgstr "Отвори датотеку"
-
-#: meld/filediff.py:2421
+#: meld/filediff.py:2440
 msgid "Live comparison updating disabled"
 msgstr "Искључено је живо ажурирање поређења"
 
-#: meld/filediff.py:2422
+#: meld/filediff.py:2441
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2008,32 +2010,32 @@ msgstr ""
 "увек можете ручно да освежите поређење, а жива ажурирања ће наставити са "
 "радом након чишћења тачака усклађивања."
 
-#: meld/iohelpers.py:40
+#: meld/iohelpers.py:41
 msgid "Deleting remote folders is not supported"
 msgstr "Брисање удаљених фасцикли није подржано"
 
-#: meld/iohelpers.py:42
+#: meld/iohelpers.py:43
 msgid "Not a file or directory"
 msgstr "Није датотека или директоријум"
 
-#: meld/iohelpers.py:46
+#: meld/iohelpers.py:47
 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
 msgstr "Не могу да пребацим „{}“ у смеће. Да ли желите да је одмах обришете?"
 
-#: meld/iohelpers.py:51
+#: meld/iohelpers.py:52
 msgid "This remote location does not support sending items to the trash."
 msgstr "Ово удаљено место не подржава слање ставки у смеће."
 
-#: meld/iohelpers.py:56
+#: meld/iohelpers.py:57
 msgid "_Delete Permanently"
 msgstr "_Трајно обриши"
 
-#: meld/iohelpers.py:106
+#: meld/iohelpers.py:107
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Да заменим датотеку „%s“?"
 
-#: meld/iohelpers.py:108
+#: meld/iohelpers.py:109
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2143,20 +2145,20 @@ msgstr "удаљена фасцикла „{}“ није подржана"
 msgid "<unnamed>"
 msgstr "<неименовано>"
 
-#: meld/melddoc.py:61
+#: meld/melddoc.py:124
 msgid "untitled"
 msgstr "безимено"
 
-#: meld/meldwindow.py:155
+#: meld/meldwindow.py:158
 msgid "Filename"
 msgstr "Назив датотеке"
 
-#: meld/meldwindow.py:384
+#: meld/meldwindow.py:381
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Потребне су три датотеке за само-спајање, добих: %r"
 
-#: meld/meldwindow.py:406
+#: meld/meldwindow.py:403
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Не могу да поредим мешавину датотека и фасцикли"
 
@@ -2184,14 +2186,14 @@ msgstr "натпис"
 msgid "pattern"
 msgstr "образац"
 
-#: meld/recent.py:104
+#: meld/recent.py:111
 msgid "Version control:"
 msgstr "Управљање издањем:"
 
 #: meld/style.py:91
-#| msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
 msgid "Couldn’t find colour scheme details for {}; this is a bad install"
-msgstr "Не могу да нађем појединости шеме боје за „{}“; јер је лоше инсталирана"
+msgstr ""
+"Не могу да нађем појединости шеме боје за „{}“; јер је лоше инсталирана"
 
 #: meld/ui/bufferselectors.py:110
 #, python-brace-format
@@ -2202,6 +2204,11 @@ msgstr "{name} ({charset})"
 msgid "Plain Text"
 msgstr "Обичан текст"
 
+#: meld/ui/pathlabel.py:36
+#| msgid "Filename filters"
+msgid "Unnamed file"
+msgstr "Неименована датотека"
+
 #. Abbreviation for line, column so that it will fit in the status bar
 #: meld/ui/statusbar.py:125
 #, python-brace-format
@@ -2224,9 +2231,7 @@ msgstr "Ниједна датотека неће бити уграђена"
 msgid "{unpushed_commits} in {unpushed_branches}"
 msgstr "„{unpushed_commits}“ у „{unpushed_branches}“"
 
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: meld/vc/git.py:94 meld/vc/git.py:103
+#: meld/vc/git.py:94 meld/vc/git.py:104
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -2244,17 +2249,16 @@ msgstr[1] "%d гране"
 msgstr[2] "%d грана"
 msgstr[3] "%d грани"
 
-#: meld/vc/git.py:344
+#: meld/vc/git.py:345
 #, python-brace-format
-#| msgid "Mode changed from %s to %s"
 msgid "Mode changed from {old_mode} to {new_mode}"
 msgstr "Режим је измењен из „{old_mode}“ у „{new_mode}“"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Partially staged"
 msgstr "Делимично уштекано"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Staged"
 msgstr "Уштекано"
 
@@ -2315,95 +2319,94 @@ msgstr "Није присутно"
 
 #. Translators: This error message is shown when no
 #. repository of this type is found.
-#: meld/vcview.py:333
+#: meld/vcview.py:334
 #, python-format
 msgid "%(name)s (not found)"
 msgstr "%(name)s (нисам нашао)"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: meld/vcview.py:337
+#: meld/vcview.py:338
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s („%(cmd)s“ није инсталирана)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: meld/vcview.py:341
+#: meld/vcview.py:342
 #, python-format
 msgid "%(name)s (invalid repository)"
 msgstr "%(name)s (неисправна ризница)"
 
-#: meld/vcview.py:355
+#: meld/vcview.py:356
 msgid "No valid version control system found in this folder"
 msgstr "У овој фасцикли није пронађен исправан систем управљања издањем"
 
-#: meld/vcview.py:357
+#: meld/vcview.py:358
 msgid "Choose which version control system to use"
 msgstr "Изаберите који систем управљања издањем ће бити коришћен"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:411
+#: meld/vcview.py:412
 #, python-brace-format
-#| msgid "Location"
 msgid "Location: {path}"
 msgstr "Путања: {path}"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:418
+#: meld/vcview.py:419
 msgid "Scanning repository"
 msgstr "Прегледам ризницу"
 
-#: meld/vcview.py:447
+#: meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "Прегледам „%s“"
 
-#: meld/vcview.py:486
+#: meld/vcview.py:487
 msgid "(Empty)"
 msgstr "(Празно)"
 
-#: meld/vcview.py:533
+#: meld/vcview.py:535
 #, python-format
 msgid "%s — local"
 msgstr "%s — месна"
 
-#: meld/vcview.py:534
+#: meld/vcview.py:536
 #, python-format
 msgid "%s — remote"
 msgstr "%s — удаљена"
 
-#: meld/vcview.py:542
+#: meld/vcview.py:544
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (месна, спојена, удаљена)"
 
-#: meld/vcview.py:547
+#: meld/vcview.py:549
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (удаљена, спојена, месна)"
 
-#: meld/vcview.py:558
+#: meld/vcview.py:560
 #, python-format
 msgid "%s — repository"
 msgstr "%s — ризница"
 
-#: meld/vcview.py:564
+#: meld/vcview.py:566
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (радна, ризница)"
 
-#: meld/vcview.py:568
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (ризница, радна)"
 
-#: meld/vcview.py:730
+#: meld/vcview.py:735
 msgid "Remove folder and all its files?"
 msgstr "Да уклоним фасциклу и све њене датотеке?"
 
-#: meld/vcview.py:732
+#: meld/vcview.py:737
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2411,10 +2414,40 @@ msgstr ""
 "Ово ће уклонити све изабране датотеке и фасцикле, и све датотеке унутар свих "
 "изабраних фасцикли, из управљања издањем."
 
-#: meld/vcview.py:845
+#: meld/vcview.py:850
 msgid "Clear"
 msgstr "Очисти"
 
+#~ msgid "_Update"
+#~ msgstr "_Ажурирај"
+
+#~ msgid "Mar_k as Resolved"
+#~ msgstr "Означи _као решено"
+
+#~ msgid "Update"
+#~ msgstr "Освежи"
+
+#~ msgid "Update working copy from version control"
+#~ msgstr "Освежите радни примерак из управљања издањем"
+
+#~ msgid "Push"
+#~ msgstr "Погурај"
+
+#~ msgid "Add"
+#~ msgstr "Додај"
+
+#~ msgid "Remove"
+#~ msgstr "Уклони"
+
+#~ msgid "Mark as Resolved"
+#~ msgstr "Означи као решено"
+
+#~ msgid "Revert"
+#~ msgstr "Врати"
+
+#~ msgid "Delete from working copy"
+#~ msgstr "Обришите из радног примерка"
+
 #~ msgid "[%s] Scanning %s"
 #~ msgstr "[%s] прегледам „%s“"
 
@@ -2539,9 +2572,6 @@ msgstr "Очисти"
 #~ msgid "Previous Conflict"
 #~ msgstr "Претходни сукоб"
 
-#~ msgid "Next Conflict"
-#~ msgstr "Следећи сукоб"
-
 #~ msgid "Push to Left"
 #~ msgstr "Гурни улево"
 
@@ -2767,9 +2797,6 @@ msgstr "Очисти"
 #~ msgid "About this application"
 #~ msgstr "О овом програму"
 
-#~ msgid "Only one version control system found in this folder"
-#~ msgstr "У овој фасцикли је пронађен само један систем управљања издањем"
-
 #~ msgid "Error removing %s"
 #~ msgstr "Грешка при уклањању „%s“"
 

From c1c58ff3d2d529351f28572f948be31818e7fbbf Mon Sep 17 00:00:00 2001
From: DAB <dab@dab.la>
Date: Sun, 2 Jan 2022 10:49:24 -0500
Subject: [PATCH 004/116] Ignore UTF8 encoding differences on comparison

---
 meld/dirdiff.py             | 47 +++++++++++++++++++++++--------------
 meld/resources/gtk/menus.ui |  4 ++++
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 9837658d..f144031a 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -23,6 +23,7 @@
 import stat
 import sys
 import typing
+import unicodedata
 from collections import namedtuple
 from decimal import Decimal
 from mmap import ACCESS_COPY, mmap
@@ -266,17 +267,20 @@ def add_error(self, parent, msg, pane):
 class CanonicalListing:
     """Multi-pane lists with canonicalised matching and error detection"""
 
-    def __init__(self, n, canonicalize=None):
+    def __init__(self, n, compare):
         self.items = collections.defaultdict(lambda: [None] * n)
         self.errors = []
-        self.canonicalize = canonicalize
-        self.add = self.add_simple if canonicalize is None else self.add_canon
+        self.compare = compare
 
-    def add_simple(self, pane, item):
-        self.items[item][pane] = item
+    def add(self, pane, item):
+        # nomralize the name depending on settings
+        ci = item
+        if self.compare.ignore_case:
+            ci = ci.lower()
+        if self.compare.normalize_encoding:
+            ci = unicodedata.normalize('NFC', ci)
 
-    def add_canon(self, pane, item):
-        ci = self.canonicalize(item)
+        # add the item to the comparison tree
         if self.items[ci][pane] is None:
             self.items[ci][pane] = item
         else:
@@ -289,11 +293,6 @@ def filled(seq):
 
         return sorted(filled(v) for v in self.items.values())
 
-    @staticmethod
-    def canonicalize_lower(element):
-        return element.lower()
-
-
 @Gtk.Template(resource_path='/org/gnome/meld/ui/dirdiff.ui')
 class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
 
@@ -451,6 +450,8 @@ def __init__(self, num_panes):
                 GLib.Variant.new_boolean(False)),
             ("folder-ignore-case", self.action_ignore_case_change,
                 GLib.Variant.new_boolean(False)),
+            ("folder-normalize-encoding", self.action_ignore_case_change,
+                GLib.Variant.new_boolean(False)),
         )
         for (name, callback, state) in actions:
             action = Gio.SimpleAction.new_stateful(name, None, state)
@@ -481,6 +482,13 @@ def __init__(self, num_panes):
                 "text-filters-changed", self.on_text_filters_changed)
         ]
 
+        class Comparison:
+            def __init__(self):
+                self.ignore_case = False
+                self.normalize_encoding = False
+            pass
+        self.compare = Comparison()
+
         # Handle overview map visibility binding. Because of how we use
         # grid packing, we need two revealers here instead of the more
         # obvious one.
@@ -813,6 +821,13 @@ def _search_recursively_iter(self, rootpath):
 
         shadowed_entries = []
         invalid_filenames = []
+
+        # TODO: Map this to a GObject prop instead?
+        if self.get_action_state('folder-ignore-case'):
+            self.compare.ignore_case = True
+        if self.get_action_state('folder-normalize-encoding'):
+            self.compare.normalize_encoding = True
+
         while len(todo):
             todo.sort()  # depth first
             path = todo.pop(0)
@@ -829,12 +844,8 @@ def _search_recursively_iter(self, rootpath):
             differences = False
             encoding_errors = []
 
-            canonicalize = None
-            # TODO: Map this to a GObject prop instead?
-            if self.get_action_state('folder-ignore-case'):
-                canonicalize = CanonicalListing.canonicalize_lower
-            dirs = CanonicalListing(self.num_panes, canonicalize)
-            files = CanonicalListing(self.num_panes, canonicalize)
+            dirs = CanonicalListing(self.num_panes, self.compare)
+            files = CanonicalListing(self.num_panes, self.compare)
 
             for pane, root in enumerate(roots):
                 if not os.path.isdir(root):
diff --git a/meld/resources/gtk/menus.ui b/meld/resources/gtk/menus.ui
index 4486098d..d038d8be 100644
--- a/meld/resources/gtk/menus.ui
+++ b/meld/resources/gtk/menus.ui
@@ -158,6 +158,10 @@
         <attribute name="label" translatable="yes">Ignore filename case</attribute>
         <attribute name="action">view.folder-ignore-case</attribute>
       </item>
+      <item>
+        <attribute name="label" translatable="yes">Normalize UTF-8 encodings</attribute>
+        <attribute name="action">view.folder-normalize-encoding</attribute>
+      </item>
     </section>
   </menu>
   <menu id="vc-status-filter-menu">

From 0fb2f355899b13c48bab3c55e475b30b8bd9cd76 Mon Sep 17 00:00:00 2001
From: DAB <dab@dab.la>
Date: Sun, 2 Jan 2022 10:55:38 -0500
Subject: [PATCH 005/116] added extra line

---
 meld/dirdiff.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index f144031a..9866f9b5 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -293,6 +293,7 @@ def filled(seq):
 
         return sorted(filled(v) for v in self.items.values())
 
+
 @Gtk.Template(resource_path='/org/gnome/meld/ui/dirdiff.ui')
 class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
 

From de1789d85a724a9da8b7bb43da51667e087be4ac Mon Sep 17 00:00:00 2001
From: DAB <dab@dab.la>
Date: Sun, 2 Jan 2022 15:31:41 -0500
Subject: [PATCH 006/116] fixed typo

---
 meld/dirdiff.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 9866f9b5..c3967151 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -273,7 +273,7 @@ def __init__(self, n, compare):
         self.compare = compare
 
     def add(self, pane, item):
-        # nomralize the name depending on settings
+        # normalize the name depending on settings
         ci = item
         if self.compare.ignore_case:
             ci = ci.lower()

From 965efc005fe7e9bcf3f52d21e68faf85735239f3 Mon Sep 17 00:00:00 2001
From: Hugo Carvalho <hugokarvalho@hotmail.com>
Date: Tue, 4 Jan 2022 14:21:19 +0000
Subject: [PATCH 007/116] Update Portuguese translation

---
 po/pt.po | 434 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 233 insertions(+), 201 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index 0886ef66..900ec938 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,24 +4,25 @@
 # Duarte Loreto <happyguy_pt@hotmail.com>, 2003.
 # Pedro Albuquerque <palbuquerque73@gmail.com>, 2015.
 # Tiago Santos <tiagofsantos81@sapo.pt>, 2014 - 2016.
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2020, 2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.6\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-08-27 19:48+0000\n"
-"PO-Revision-Date: 2021-08-28 14:47+0100\n"
+"POT-Creation-Date: 2021-10-08 21:01+0000\n"
+"PO-Revision-Date: 2022-01-04 14:19+0000\n"
 "Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
 "Language-Team: Português <https://l10n.gnome.org/teams/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
-#: meld/resources/ui/appwindow.ui:9
+#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
 msgid "Meld"
 msgstr "Meld"
 
@@ -814,11 +815,11 @@ msgstr "Unir todas a partir da direita"
 msgid "Merge All"
 msgstr "Unir todas"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
 msgid "Add Synchronization Point"
 msgstr "Adicionar ponto de sincronização"
 
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
 msgid "Clear Synchronization Points"
 msgstr "Limpar pontos de sincronização"
 
@@ -894,39 +895,39 @@ msgstr ""
 "Tiago Santos <tiagofsantos81@sapo.pt>\n"
 "Hugo Carvalho <hugokarvalho@hotmail.com>"
 
-#: meld/resources/ui/appwindow.ui:29
+#: meld/resources/ui/appwindow.ui:30
 msgid "Start a new comparison"
 msgstr "Iniciar uma nova comparação"
 
-#: meld/resources/ui/appwindow.ui:45
+#: meld/resources/ui/appwindow.ui:46
 msgid "Open a recent comparison"
 msgstr "Abre uma comparação recente"
 
-#: meld/resources/ui/appwindow.ui:73
+#: meld/resources/ui/appwindow.ui:74
 msgid "Go to the previous change"
 msgstr "Ir para a alteração anterior"
 
-#: meld/resources/ui/appwindow.ui:93
+#: meld/resources/ui/appwindow.ui:94
 msgid "Go to the next change"
 msgstr "Ir para a alteração seguinte"
 
-#: meld/resources/ui/appwindow.ui:123
+#: meld/resources/ui/appwindow.ui:124
 msgid "Go to the previous conflict"
 msgstr "Ir para o conflito anterior"
 
-#: meld/resources/ui/appwindow.ui:143
+#: meld/resources/ui/appwindow.ui:144
 msgid "Go to the next conflict"
 msgstr "Ir para o conflito seguinte"
 
-#: meld/resources/ui/appwindow.ui:192
+#: meld/resources/ui/appwindow.ui:193
 msgid "Version Filters"
 msgstr "Filtros de versão"
 
-#: meld/resources/ui/appwindow.ui:207 meld/resources/ui/preferences.ui:1472
+#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472
 msgid "File Filters"
 msgstr "Filtros de ficheiros"
 
-#: meld/resources/ui/appwindow.ui:222 meld/resources/ui/preferences.ui:1657
+#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657
 msgid "Text Filters"
 msgstr "Filtros de texto"
 
@@ -939,7 +940,7 @@ msgid "Column Name"
 msgstr "Nome de coluna"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -1023,6 +1024,23 @@ msgstr "_Abrir externamente"
 msgid "_Copy File Paths"
 msgstr "_Copiar caminhos de ficheiros"
 
+#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
+#: meld/resources/ui/dirdiff.ui:117
+msgid "Select folder to open in this pane"
+msgstr "Selecionar a pasta para abrir neste painel"
+
+#: meld/resources/ui/dirdiff.ui:43
+msgid "Folder 1"
+msgstr "Pasta 1"
+
+#: meld/resources/ui/dirdiff.ui:84
+msgid "Folder 2"
+msgstr "Pasta 2"
+
+#: meld/resources/ui/dirdiff.ui:125
+msgid "Folder 3"
+msgstr "Pasta 3"
+
 #: meld/resources/ui/encoding-selector.ui:31
 msgid "Search text encoding…"
 msgstr "Pesquisar codificação de texto…"
@@ -1079,8 +1097,16 @@ msgstr "_Copiar"
 msgid "_Paste"
 msgstr "Co_lar"
 
-#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
-#: meld/resources/ui/filediff.ui:171
+#: meld/resources/ui/filediff-menus.ui:54
+msgid "Open Containing Folder"
+msgstr "Abrir a pasta respetiva"
+
+#: meld/resources/ui/filediff-menus.ui:58
+msgid "Copy Full Path"
+msgstr "Copiar localização completa"
+
+#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
+#: meld/resources/ui/filediff.ui:169
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -1088,31 +1114,31 @@ msgstr ""
 "Este ficheiro não pode ser escrito. Pode clicar aqui para desbloquear o "
 "ficheiro e fazer alterações, mas terá de as guardar num ficheiro diferente."
 
-#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
-#: meld/resources/ui/filediff.ui:185
-msgid "Open file in this pane"
-msgstr "Abrir ficheiro neste painel"
-
-#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
-#: meld/resources/ui/filediff.ui:194
+#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
+#: meld/resources/ui/filediff.ui:183
 msgid "Save file in this pane"
 msgstr "Guarda ficheiro neste painel"
 
-#: meld/resources/ui/filediff.ui:73
+#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
+#: meld/resources/ui/filediff.ui:209
+msgid "Open file in this pane"
+msgstr "Abrir ficheiro neste painel"
+
+#: meld/resources/ui/filediff.ui:79
 msgid "File 3"
 msgstr "Ficheiro 3"
 
-#: meld/resources/ui/filediff.ui:142
+#: meld/resources/ui/filediff.ui:148
 msgid "File 2"
 msgstr "Ficheiro 2"
 
-#: meld/resources/ui/filediff.ui:207
+#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148
 msgid "File 1"
 msgstr "Ficheiro 1"
 
 #. Create icon and filename CellRenderer
-#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
-#: meld/dirdiff.py:517
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
+#: meld/dirdiff.py:530
 msgid "Name"
 msgstr "Nome"
 
@@ -1124,7 +1150,7 @@ msgstr "Padrão"
 msgid "Add new filter"
 msgstr "Adicionar novo filtro"
 
-#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18
 msgid "_Add"
 msgstr "_Adicionar"
 
@@ -1152,7 +1178,7 @@ msgstr "Ajustado"
 msgid "Replace _All"
 msgstr "Su_bstituir tudo"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1067 meld/iohelpers.py:113
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1092 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "Substitui_r"
 
@@ -1164,7 +1190,7 @@ msgstr "Alterna entre “Localizar” e “Localizar e substituir”"
 msgid "Search highlight mode…"
 msgstr "Pesquisar modo de realce…"
 
-#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:349
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342
 #: meld/newdifftab.py:49
 msgid "New comparison"
 msgstr "Nova comparação"
@@ -1253,6 +1279,18 @@ msgstr "Painéis direito e central"
 msgid "_Reverse patch direction"
 msgstr "_Reverter direção do patch"
 
+#: meld/resources/ui/path-label.ui:23
+msgid "Path"
+msgstr "Localização"
+
+#: meld/resources/ui/path-label.ui:62
+msgid "Copy Path"
+msgstr "Copiar localização"
+
+#: meld/resources/ui/path-label.ui:78
+msgid "Open Folder"
+msgstr "Abrir pasta"
+
 #: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
 msgid "Preferences"
 msgstr "Preferências"
@@ -1528,8 +1566,8 @@ msgstr "Se não guardar, as alterações serão perdidas permanentemente."
 msgid "Close _without Saving"
 msgstr "Fechar sem guardar"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1066
-#: meld/iohelpers.py:55 meld/iohelpers.py:112
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1091
+#: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -1553,95 +1591,67 @@ msgstr "_Comparar"
 msgid "Co_mmit…"
 msgstr "Sub_meter…"
 
-#: meld/resources/ui/vcview-menus.ui:15
-msgid "_Update"
-msgstr "At_ualizar"
-
-#: meld/resources/ui/vcview-menus.ui:30
+#: meld/resources/ui/vcview-menus.ui:26
 msgid "Re_vert"
 msgstr "Re_verter"
 
-#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+#: meld/resources/ui/vcview-menus.ui:30
 msgid "Delete"
 msgstr "Eliminar"
 
-#: meld/resources/ui/vcview-menus.ui:41
-msgid "Mar_k as Resolved"
-msgstr "Mar_car como resolvido"
-
-#: meld/resources/ui/vcview.ui:73
-msgid "Commit…"
-msgstr "Fazer commit…"
+#: meld/resources/ui/vcview-menus.ui:37
+msgid "Resolve Conflict"
+msgstr "Resolver conflito"
 
-#: meld/resources/ui/vcview.ui:74
+#: meld/resources/ui/vcview.ui:16
 msgid "Commit changes to version control"
 msgstr "Submeter alterações ao controlo de versão"
 
-#: meld/resources/ui/vcview.ui:86
-msgid "Update"
-msgstr "Actualizar"
-
-#: meld/resources/ui/vcview.ui:87
-msgid "Update working copy from version control"
-msgstr "Atualizar cópia de trabalho a partir do controlo de versão"
+#: meld/resources/ui/vcview.ui:21
+msgid "Commit…"
+msgstr "Fazer commit…"
 
-#: meld/resources/ui/vcview.ui:99
-msgid "Push"
-msgstr "Push"
+#: meld/resources/ui/vcview.ui:38
+msgid "Pull remote changes to the local repository"
+msgstr "Submeter alterações remotas no repositório local"
 
-#: meld/resources/ui/vcview.ui:100
+#: meld/resources/ui/vcview.ui:51
 msgid "Push local changes to remote"
 msgstr "Empurrar as alterações locais para o remoto"
 
-#: meld/resources/ui/vcview.ui:112
-msgid "Add"
-msgstr "Adicionar"
-
-#: meld/resources/ui/vcview.ui:113
+#: meld/resources/ui/vcview.ui:74
 msgid "Add to version control"
 msgstr "Adicionar ao controlo de versão"
 
-#: meld/resources/ui/vcview.ui:125
-msgid "Remove"
-msgstr "Remover"
-
-#: meld/resources/ui/vcview.ui:126
+#: meld/resources/ui/vcview.ui:87
 msgid "Remove from version control"
 msgstr "Remover ao controlo de versão"
 
-#: meld/resources/ui/vcview.ui:138
-msgid "Mark as Resolved"
-msgstr "Marcar como resolvido"
+#: meld/resources/ui/vcview.ui:100
+msgid "Revert working copy to original state"
+msgstr "Reverter cópia de trabalho ao estado original"
 
-#: meld/resources/ui/vcview.ui:139
+#: meld/resources/ui/vcview.ui:113
 msgid "Mark as resolved in version control"
 msgstr "Marcar como resolvido no controlo de versão"
 
-#: meld/resources/ui/vcview.ui:151
-msgid "Revert"
-msgstr "Reverter"
-
-#: meld/resources/ui/vcview.ui:152
-msgid "Revert working copy to original state"
-msgstr "Reverter cópia de trabalho ao estado original"
-
-#: meld/resources/ui/vcview.ui:165
-msgid "Delete from working copy"
-msgstr "Eliminar da cópia de trabalho"
+#: meld/resources/ui/vcview.ui:140
+msgid "Open version controlled folder in this pane"
+msgstr "Abrir pasta controlada da versão neste painel"
 
-#: meld/resources/ui/vcview.ui:220
+#: meld/resources/ui/vcview.ui:229
 msgid "Location"
 msgstr "Localização"
 
-#: meld/resources/ui/vcview.ui:229
+#: meld/resources/ui/vcview.ui:238
 msgid "Status"
 msgstr "Estado"
 
-#: meld/resources/ui/vcview.ui:238
+#: meld/resources/ui/vcview.ui:247
 msgid "Extra"
 msgstr "Extra"
 
-#: meld/resources/ui/vcview.ui:270
+#: meld/resources/ui/vcview.ui:279
 msgid "Console output"
 msgstr "Saída da consola"
 
@@ -1666,43 +1676,43 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:538 meld/preferences.py:132
+#: meld/dirdiff.py:551 meld/preferences.py:132
 msgid "Size"
 msgstr "Tamanho"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:546 meld/preferences.py:133
+#: meld/dirdiff.py:559 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Hora de modificação"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:554 meld/preferences.py:134
+#: meld/dirdiff.py:567 meld/preferences.py:134
 msgid "Permissions"
 msgstr "Permissões"
 
-#: meld/dirdiff.py:778 meld/dirdiff.py:802
+#: meld/dirdiff.py:803 meld/dirdiff.py:827
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Varrendo {folder}"
 
-#: meld/dirdiff.py:942
+#: meld/dirdiff.py:967
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Concluído"
 
-#: meld/dirdiff.py:951
+#: meld/dirdiff.py:976
 msgid "Folder {} is being compared to itself"
 msgstr "Pasta {} sendo comparada consigo própria"
 
-#: meld/dirdiff.py:957
+#: meld/dirdiff.py:982
 msgid "Folders have no differences"
 msgstr "As pastas não têm diferenças"
 
-#: meld/dirdiff.py:959
+#: meld/dirdiff.py:984
 msgid "Contents of scanned files in folders are identical."
 msgstr "Os conteúdos de ficheiros pesquisados nas pastas são idênticos."
 
-#: meld/dirdiff.py:961
+#: meld/dirdiff.py:986
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1710,47 +1720,47 @@ msgstr ""
 "Os ficheiros pesquisados nas pastas parecem idênticos, mas os conteúdos não "
 "foram pesquisados."
 
-#: meld/dirdiff.py:964
+#: meld/dirdiff.py:989
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Os filtros de ficheiros estão em uso, pelo que nem todos os ficheiros foram "
 "pesquisados."
 
-#: meld/dirdiff.py:966
+#: meld/dirdiff.py:991
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Os filtros de texto estão em uso e podem estar a mascarar diferenças de "
 "conteúdo."
 
-#: meld/dirdiff.py:982 meld/filediff.py:1874
+#: meld/dirdiff.py:1007 meld/filediff.py:1907
 msgid "Hide"
 msgstr "Ocultar %s"
 
-#: meld/dirdiff.py:984 meld/filediff.py:1876 meld/filediff.py:1906
-#: meld/filediff.py:1908 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1009 meld/filediff.py:1909 meld/filediff.py:1939
+#: meld/filediff.py:1941 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Ocultar"
 
-#: meld/dirdiff.py:993
+#: meld/dirdiff.py:1018
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Ocorreram múltiplos erros ao pesquisar esta pasta"
 
-#: meld/dirdiff.py:994
+#: meld/dirdiff.py:1019
 msgid "Files with invalid encodings found"
 msgstr "Encontrados ficheiros com codificação inválida"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:996
+#: meld/dirdiff.py:1021
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Alguns ficheiros tinham uma codificação incorreta. Os nomes são algo como:"
 
-#: meld/dirdiff.py:998
+#: meld/dirdiff.py:1023
 msgid "Files hidden by case insensitive comparison"
 msgstr "Ficheiros ocultos por comparação insensível a maiúsculas"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1000
+#: meld/dirdiff.py:1025
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1759,17 +1769,17 @@ msgstr ""
 "ficheiros sensível a maiúsculas. Os seguintes ficheiros nesta pasta estão "
 "ocultos:"
 
-#: meld/dirdiff.py:1011
+#: meld/dirdiff.py:1036
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}” ocultado por “{second_file}”"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1095
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Substituir pasta “%s”?"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1097
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1779,11 +1789,11 @@ msgstr ""
 "Se substituir a pasta existente, todos os ficheiros nela contidos serão "
 "perdidos."
 
-#: meld/dirdiff.py:1085
+#: meld/dirdiff.py:1110
 msgid "Error copying file"
 msgstr "Erro ao copiar o ficheiro"
 
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1111
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1796,19 +1806,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1111 meld/vcview.py:759
+#: meld/dirdiff.py:1136 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Erro ao eliminar {}"
 
-#: meld/dirdiff.py:1604
+#: meld/dirdiff.py:1626
 msgid "No folder"
 msgstr "Sem pasta"
 
-#: meld/filediff.py:1144
+#: meld/filediff.py:1149
 msgid "Comparison results will be inaccurate"
 msgstr "Os resultados da comparação serão imprecisos"
 
-#: meld/filediff.py:1146
+#: meld/filediff.py:1151
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1816,74 +1826,74 @@ msgstr ""
 "O filtro alterou o número de linhas no ficheiro, o que não é suportado. A "
 "comparação será imprecisa."
 
-#: meld/filediff.py:1218
+#: meld/filediff.py:1223
 msgid "Mark conflict as resolved?"
 msgstr "Marcar conflito como resolvido?"
 
-#: meld/filediff.py:1220
+#: meld/filediff.py:1225
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Se o conflito foi resolvido com sucesso, pode agora marcá-lo como resolvido."
 
-#: meld/filediff.py:1222
+#: meld/filediff.py:1227
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1228
 msgid "Mark _Resolved"
 msgstr "Marcar _resolvido"
 
-#: meld/filediff.py:1556
+#: meld/filediff.py:1589
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Houve um problema ao abrir o ficheiro \"%s\"."
 
-#: meld/filediff.py:1564
+#: meld/filediff.py:1598
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "%s parece ser um ficheiro binário."
 
-#: meld/filediff.py:1566
+#: meld/filediff.py:1600
 msgid "Do you want to open the file using the default application?"
 msgstr "Quer abrir o ficheiro usando a aplicação predefinida?"
 
-#: meld/filediff.py:1568
+#: meld/filediff.py:1602
 msgid "Open"
 msgstr "Abrir"
 
-#: meld/filediff.py:1582
+#: meld/filediff.py:1616
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] A unir ficheiros"
 
-#: meld/filediff.py:1596
+#: meld/filediff.py:1630
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] A calcular diferenças"
 
-#: meld/filediff.py:1657
+#: meld/filediff.py:1690
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "O ficheiro %s foi alterado no disco"
 
-#: meld/filediff.py:1658
+#: meld/filediff.py:1691
 msgid "Do you want to reload the file?"
 msgstr "Quer recarregar o ficheiro?"
 
-#: meld/filediff.py:1660
+#: meld/filediff.py:1693
 msgid "_Reload"
 msgstr "_Recarregar"
 
-#: meld/filediff.py:1830
+#: meld/filediff.py:1863
 msgid "File {} is being compared to itself"
 msgstr "Arquivo {} sendo comparado consigo próprio"
 
-#: meld/filediff.py:1839
+#: meld/filediff.py:1872
 msgid "Files are identical"
 msgstr "Os ficheiros são idênticos"
 
-#: meld/filediff.py:1852
+#: meld/filediff.py:1885
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1891,11 +1901,11 @@ msgstr ""
 "Os filtros de texto estão em uso e podem estar a mascarar diferenças entre "
 "os ficheiros. Quer comparar os ficheiros sem filtragem?"
 
-#: meld/filediff.py:1857
+#: meld/filediff.py:1890
 msgid "Files differ in line endings only"
 msgstr "Os ficheiros só diferem nos fins de linha"
 
-#: meld/filediff.py:1859
+#: meld/filediff.py:1892
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1904,15 +1914,15 @@ msgstr ""
 "Os ficheiros são idênticos, exceto por diferentes fins de linha:\n"
 "%s"
 
-#: meld/filediff.py:1879
+#: meld/filediff.py:1912
 msgid "Show without filters"
 msgstr "Mostrar sem filtros"
 
-#: meld/filediff.py:1901
+#: meld/filediff.py:1934
 msgid "Change highlighting incomplete"
 msgstr "Alterar realce incompleto"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1935
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1921,19 +1931,19 @@ msgstr ""
 "forçar o Meld para demorar mais a realçar alterações grandes, mas pode ser "
 "lento."
 
-#: meld/filediff.py:1910
+#: meld/filediff.py:1943
 msgid "Keep highlighting"
 msgstr "Manter realce"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1945
 msgid "_Keep highlighting"
 msgstr "_Manter realce"
 
-#: meld/filediff.py:1925
+#: meld/filediff.py:1958
 msgid "Saving failed"
 msgstr "Falha ao guardar"
 
-#: meld/filediff.py:1926
+#: meld/filediff.py:1959
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1941,36 +1951,36 @@ msgstr ""
 "Por favor, considere copiar quaisquer alterações críticas para outro "
 "programa ou ficheiro para evitar a perda de dados."
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1968
 msgid "Save Left Pane As"
 msgstr "Guardar painel esquerdo como"
 
-#: meld/filediff.py:1937
+#: meld/filediff.py:1970
 msgid "Save Middle Pane As"
 msgstr "Guardar painel central como"
 
-#: meld/filediff.py:1939
+#: meld/filediff.py:1972
 msgid "Save Right Pane As"
 msgstr "Guardar painel direito como"
 
-#: meld/filediff.py:1950
+#: meld/filediff.py:1983
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "O ficheiro %s foi alterado no disco desde que foi aberto"
 
-#: meld/filediff.py:1952
+#: meld/filediff.py:1985
 msgid "If you save it, any external changes will be lost."
 msgstr "Se o guardar, todas as alterações externas serão perdidas."
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:1988
 msgid "Save Anyway"
 msgstr "Guardar mesmo assim"
 
-#: meld/filediff.py:1956
+#: meld/filediff.py:1989
 msgid "Don’t Save"
 msgstr "Não guardar"
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2031
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1978,7 +1988,7 @@ msgstr ""
 "O ficheiro “{}” contém caracteres que não podem ser codificados ao usar a "
 "sua codificação atual “{}”."
 
-#: meld/filediff.py:2002 meld/patchdialog.py:138
+#: meld/filediff.py:2035 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1987,20 +1997,16 @@ msgstr ""
 "Não foi possível guardar o ficheiro devido a:\n"
 "%s"
 
-#: meld/filediff.py:2006 meld/patchdialog.py:137
+#: meld/filediff.py:2039 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Impossível guardar o ficheiro %s."
 
-#: meld/filediff.py:2067
-msgid "Open File"
-msgstr "Abrir um ficheiro"
-
-#: meld/filediff.py:2421
+#: meld/filediff.py:2440
 msgid "Live comparison updating disabled"
 msgstr "Atualização ao vivo da comparação desativada"
 
-#: meld/filediff.py:2422
+#: meld/filediff.py:2441
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2010,32 +2016,32 @@ msgstr ""
 "sincronização estão ativos. Ainda pode atualizar manualmente a comparação e "
 "as atualizações ao vivo retomarão quando limpar os pontos de sincronização."
 
-#: meld/iohelpers.py:40
+#: meld/iohelpers.py:41
 msgid "Deleting remote folders is not supported"
 msgstr "A eliminação de pastas remotas não é suportada"
 
-#: meld/iohelpers.py:42
+#: meld/iohelpers.py:43
 msgid "Not a file or directory"
 msgstr "Não é um ficheiro ou diretório"
 
-#: meld/iohelpers.py:46
+#: meld/iohelpers.py:47
 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
 msgstr "“{}” não pode ser colocado no lixo. Deseja elimina-lo imediatamente?"
 
-#: meld/iohelpers.py:51
+#: meld/iohelpers.py:52
 msgid "This remote location does not support sending items to the trash."
 msgstr "Esta localização remota não suporta enviar itens para o lixo."
 
-#: meld/iohelpers.py:56
+#: meld/iohelpers.py:57
 msgid "_Delete Permanently"
 msgstr "Eliminar _definitivamente"
 
-#: meld/iohelpers.py:106
+#: meld/iohelpers.py:107
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Substituir ficheiro “%s”?"
 
-#: meld/iohelpers.py:108
+#: meld/iohelpers.py:109
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2144,20 +2150,20 @@ msgstr "sem suporte à pasta remota “{}”"
 msgid "<unnamed>"
 msgstr "<sem título>"
 
-#: meld/melddoc.py:61
+#: meld/melddoc.py:124
 msgid "untitled"
 msgstr "sem título"
 
-#: meld/meldwindow.py:155
+#: meld/meldwindow.py:158
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: meld/meldwindow.py:384
+#: meld/meldwindow.py:381
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Necessários três ficheiros para união automática, obtidos %r"
 
-#: meld/meldwindow.py:406
+#: meld/meldwindow.py:403
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Impossível comparar uma mistura de ficheiros e pastas"
 
@@ -2185,7 +2191,7 @@ msgstr "rótulo"
 msgid "pattern"
 msgstr "padrão"
 
-#: meld/recent.py:104
+#: meld/recent.py:111
 msgid "Version control:"
 msgstr "Controlo de versão:"
 
@@ -2204,6 +2210,10 @@ msgstr "{name} ({charset})"
 msgid "Plain Text"
 msgstr "Texto simples"
 
+#: meld/ui/pathlabel.py:36
+msgid "Unnamed file"
+msgstr "Ficheiro sem nome"
+
 #. Abbreviation for line, column so that it will fit in the status bar
 #: meld/ui/statusbar.py:125
 #, python-brace-format
@@ -2226,9 +2236,7 @@ msgstr "Não serão submetidos nenhuns ficheiros"
 msgid "{unpushed_commits} in {unpushed_branches}"
 msgstr "{unpushed_commits} em {unpushed_branches}"
 
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: meld/vc/git.py:94 meld/vc/git.py:103
+#: meld/vc/git.py:94 meld/vc/git.py:104
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -2242,16 +2250,16 @@ msgid_plural "%d branches"
 msgstr[0] "%d ramo"
 msgstr[1] "%d ramos"
 
-#: meld/vc/git.py:344
+#: meld/vc/git.py:345
 #, python-brace-format
 msgid "Mode changed from {old_mode} to {new_mode}"
 msgstr "Modo modificado de {old_mode} para {new_mode}"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Partially staged"
 msgstr "Parcialmente em estágio"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Staged"
 msgstr "Em estágio"
 
@@ -2312,94 +2320,94 @@ msgstr "Não presentes"
 
 #. Translators: This error message is shown when no
 #. repository of this type is found.
-#: meld/vcview.py:333
+#: meld/vcview.py:334
 #, python-format
 msgid "%(name)s (not found)"
 msgstr "%(name)s (não encontrado)"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: meld/vcview.py:337
+#: meld/vcview.py:338
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s não instalado)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: meld/vcview.py:341
+#: meld/vcview.py:342
 #, python-format
 msgid "%(name)s (invalid repository)"
 msgstr "%(name)s (repositório inválido)"
 
-#: meld/vcview.py:355
+#: meld/vcview.py:356
 msgid "No valid version control system found in this folder"
 msgstr "Não se encontrou um sistema de controlo de versão válido nesta pasta"
 
-#: meld/vcview.py:357
+#: meld/vcview.py:358
 msgid "Choose which version control system to use"
 msgstr "Escolha qual o sistema de controlo de versão a usar"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:411
+#: meld/vcview.py:412
 #, python-brace-format
 msgid "Location: {path}"
 msgstr "Localização: {path}"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:418
+#: meld/vcview.py:419
 msgid "Scanning repository"
 msgstr "A analisar repositório"
 
-#: meld/vcview.py:447
+#: meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "A analisar %s"
 
-#: meld/vcview.py:486
+#: meld/vcview.py:487
 msgid "(Empty)"
 msgstr "(Vazio)"
 
-#: meld/vcview.py:533
+#: meld/vcview.py:535
 #, python-format
 msgid "%s — local"
 msgstr "%s — local"
 
-#: meld/vcview.py:534
+#: meld/vcview.py:536
 #, python-format
 msgid "%s — remote"
 msgstr "%s — remoto"
 
-#: meld/vcview.py:542
+#: meld/vcview.py:544
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (local, unir, remoto)"
 
-#: meld/vcview.py:547
+#: meld/vcview.py:549
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (remoto, unir, local)"
 
-#: meld/vcview.py:558
+#: meld/vcview.py:560
 #, python-format
 msgid "%s — repository"
 msgstr "%s — repositório"
 
-#: meld/vcview.py:564
+#: meld/vcview.py:566
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (trabalho, repositório)"
 
-#: meld/vcview.py:568
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (repositório, trabalho)"
 
-#: meld/vcview.py:730
+#: meld/vcview.py:735
 msgid "Remove folder and all its files?"
 msgstr "Remover pasta e todos os ficheiros?"
 
-#: meld/vcview.py:732
+#: meld/vcview.py:737
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2407,10 +2415,40 @@ msgstr ""
 "Isto vai remover todos os ficheiros e pastas selecionados e todos os "
 "ficheiros dentro das pastas selecionadas do controlo de versão."
 
-#: meld/vcview.py:845
+#: meld/vcview.py:850
 msgid "Clear"
 msgstr "Limpar"
 
+#~ msgid "_Update"
+#~ msgstr "At_ualizar"
+
+#~ msgid "Mar_k as Resolved"
+#~ msgstr "Mar_car como resolvido"
+
+#~ msgid "Update"
+#~ msgstr "Actualizar"
+
+#~ msgid "Update working copy from version control"
+#~ msgstr "Atualizar cópia de trabalho a partir do controlo de versão"
+
+#~ msgid "Push"
+#~ msgstr "Push"
+
+#~ msgid "Add"
+#~ msgstr "Adicionar"
+
+#~ msgid "Remove"
+#~ msgstr "Remover"
+
+#~ msgid "Mark as Resolved"
+#~ msgstr "Marcar como resolvido"
+
+#~ msgid "Revert"
+#~ msgstr "Reverter"
+
+#~ msgid "Delete from working copy"
+#~ msgstr "Eliminar da cópia de trabalho"
+
 #~ msgid "Cannot import: "
 #~ msgstr "Impossível importar:"
 
@@ -2521,9 +2559,6 @@ msgstr "Limpar"
 #~ msgid "Previous Conflict"
 #~ msgstr "Conflito anterior"
 
-#~ msgid "Next Conflict"
-#~ msgstr "Conflito seguinte"
-
 #~ msgid "Push to Left"
 #~ msgstr "Empurrar para a esquerda"
 
@@ -2795,9 +2830,6 @@ msgstr "Limpar"
 #~ msgid "%s in %s"
 #~ msgstr "%s commits não submetidos em  %s ramos"
 
-#~ msgid "Only one version control system found in this folder"
-#~ msgstr "Só se encontrou um sistema de controlo de versão válido nesta pasta"
-
 #~ msgid "%s: %s"
 #~ msgstr "%s: %s"
 

From d3b9987e489f754590d437f439eecf6a3d8d3ffb Mon Sep 17 00:00:00 2001
From: DAB <dab@dab.la>
Date: Thu, 6 Jan 2022 19:57:36 -0500
Subject: [PATCH 008/116] small refactoring

---
 meld/dirdiff.py             | 18 ++++++++----------
 meld/resources/gtk/menus.ui |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index c3967151..325628ea 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -263,6 +263,11 @@ def add_error(self, parent, msg, pane):
         }
         super().add_error(parent, msg, pane, defaults)
 
+class ComparisonOptions:
+    def __init__(self):
+        self.ignore_case = False
+        self.normalize_encoding = False
+
 
 class CanonicalListing:
     """Multi-pane lists with canonicalised matching and error detection"""
@@ -483,12 +488,7 @@ def __init__(self, num_panes):
                 "text-filters-changed", self.on_text_filters_changed)
         ]
 
-        class Comparison:
-            def __init__(self):
-                self.ignore_case = False
-                self.normalize_encoding = False
-            pass
-        self.compare = Comparison()
+        self.compare = ComparisonOptions()
 
         # Handle overview map visibility binding. Because of how we use
         # grid packing, we need two revealers here instead of the more
@@ -824,10 +824,8 @@ def _search_recursively_iter(self, rootpath):
         invalid_filenames = []
 
         # TODO: Map this to a GObject prop instead?
-        if self.get_action_state('folder-ignore-case'):
-            self.compare.ignore_case = True
-        if self.get_action_state('folder-normalize-encoding'):
-            self.compare.normalize_encoding = True
+        self.compare.ignore_case = self.get_action_state('folder-ignore-case')
+        self.compare.normalize_encoding = self.get_action_state('folder-normalize-encoding')
 
         while len(todo):
             todo.sort()  # depth first
diff --git a/meld/resources/gtk/menus.ui b/meld/resources/gtk/menus.ui
index d038d8be..992f67c1 100644
--- a/meld/resources/gtk/menus.ui
+++ b/meld/resources/gtk/menus.ui
@@ -159,7 +159,7 @@
         <attribute name="action">view.folder-ignore-case</attribute>
       </item>
       <item>
-        <attribute name="label" translatable="yes">Normalize UTF-8 encodings</attribute>
+        <attribute name="label" translatable="yes">Normalize Unicode paths</attribute>
         <attribute name="action">view.folder-normalize-encoding</attribute>
       </item>
     </section>

From 3ac9613eb58668ee506f7f68dda29dac52109d3b Mon Sep 17 00:00:00 2001
From: DAB <dab@dab.la>
Date: Thu, 6 Jan 2022 19:59:57 -0500
Subject: [PATCH 009/116] added comment

---
 meld/dirdiff.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 325628ea..d168423e 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -283,6 +283,8 @@ def add(self, pane, item):
         if self.compare.ignore_case:
             ci = ci.lower()
         if self.compare.normalize_encoding:
+            # NFC or NFD will work here, changing all composed or decomposed
+            # characters to the same set for matching only.
             ci = unicodedata.normalize('NFC', ci)
 
         # add the item to the comparison tree

From 79a34210b7fa228b17b763adf6b7f2eb01f9e787 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Fri, 7 Jan 2022 13:44:02 +1000
Subject: [PATCH 010/116] Update NEWS + appdata

---
 NEWS                                  | 119 ++++++++++++++++++++++++++
 data/org.gnome.meld.appdata.xml.in.in |  14 +++
 2 files changed, 133 insertions(+)

diff --git a/NEWS b/NEWS
index 8dbc5eb3..331d0aab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,123 @@
 
+2022-01-07 meld 3.21.1
+======================
+
+  UI changes:
+
+   * A new custom per-pane location display widget replaces the standard GTK+
+     file chooser button and our existing placeholder path display, including
+     actions for opening containing folder and copying file paths (Kai
+     Willadsen)
+   * Version control comparison has had its action bar modernised in line with
+     file and folder comparison (Kai Willadsen)
+
+
+  Features:
+
+   * The find bar now remembers the previous search across panes (Jack)
+   * We show a warning to the user if they're trying to compare a file or
+     folder to itself (Jack)
+   * Meld no longer uses custom file chooser dialogs, improving portability
+     and flatpak behaviour (Mario Aichinger)
+   * Two pane comparisons now allow Alt+Right/Left to work in either pane
+     (Anatoli Babenia)
+   * Certain header bar actions (e.g., conflict navigation, filters) are now
+     only shown in their appropriate comparison types (Kai Willadsen)
+   * The application title no longer includes the per-comparison label (Kai
+     Willadsen)
+   * Add a preference for GTK's dark theme support (Kai Willadsen)
+   * Retain clipboard contents after exiting Meld (Kai Willadsen)
+
+
+  Fixes:
+
+   * Fix incorrect detection of FUSE directory comparisons as remote (mscdex)
+   * Fix "Open Externally" on Windows for paths with spaces (adam0antium)
+   * Fix syntax highlighting in version control by using the correct file
+     extension (Alan Suran)
+   * Move application icons into the resource bundle (Vasily Galkin)
+   * Improved error reporting for invalid change actions (Anatoli Babenia)
+   * Fix too-large minimum window size from status bar buttons (Kai Willadsen)
+   * Fix Subversion comparsion on Python 3.9 (Kai Willadsen)
+   * Fix bad translation source strings with multiple arguments (Kai Willadsen)
+   * Fix performance regression in file comparison line splitting logic (Kai
+     Willadsen)
+   * Fix folder comparison sensitivity breaking when cancelling a scan (Kai
+     Willadsen)
+   * Fix occasional traceback when closing comparisons (Kai Willadsen)
+   * Fix orphaned comparison helper process when quitting (Kai Willadsen)
+   * Minor UI fixes:
+     * Fix About dialog URL (TotalCaesar659)
+     * Update About dialog copyright (Kai Willadsen)
+     * The new comparison page now better distinguishes the "Compare" and
+       "Blank Comparison" actions (Kai Willadsen)
+     * The comparison overview map is now more responsive when dragging (Kai
+       Willadsen)
+     * The find bar now waits briefly before searching to improve
+       responsiveness (Kai Willadsen)
+     * The find bar no longer hides when it loses focus (Kai Willadsen)
+     * Allow preferences dialog to be resized (Kai Willadsen)
+     * Main menu can now be activated with F10
+     * Find next/previous can now be activated with F3/Shift+F3 (Kai Willadsen)
+   * Windows fixes:
+     * Add a MeldConsole.exe executable for running Meld from the console (Kai
+       Willadsen)
+     * Update Windows build to force all-users installation (Kai Willadsen)
+     * Improve default monospace font on Windows (Kai Willadsen)
+     * Fix empty line height and fallback fonts by changing the Pango font
+       backend to fontconfig on Windows (Kai Willadsen)
+     * Add Meld's install directory to the Windows PATH (Kai Willadsen)
+     * Add a basic GTK settings.ini for Windows builds (Kai Willadsen)
+     * Add the Meld icon to the Windows add/remove programs UI (Kai Willadsen)
+     * Fix file comparison holding a directory handle after close (Kai
+       Willadsen)
+   * Issues fixed: 25, 91, 143, 354, 433, 445, 453, 459, 477, 482, 488, 491,
+     499, 502, 526, 530, 539, 541, 557, 561, 564, 565, 571, 579, 590, 603
+
+
+  Internal changes:
+
+   * Modernise and improve the new Meson build rules (Iñigo Martínez)
+   * CI + build improvements (Jason Edson, Jordan Petridis, Vasily Galkin, Kai
+     Willadsen)
+   * Nightly Meld builds now use the standard nightly icon styling (Kai
+     Willadsen)
+   * Clarify licensing in appdata (Kai Willadsen)
+   * Windows build fixes (Kai Willadsen)
+   * Add documentation on hosting infrastructure (Kai Willadsen)
+
+
+  Translations:
+
+   * Anders Jonsson (sv)
+   * Andika Triwidada (id)
+   * Asier Sarasua Garmendia (eu)
+   * Ask Hjorth Larsen (da)
+   * Balázs Úr (hu)
+   * Christian Kirbach (de)
+   * Clay Stan (zh_CN)
+   * Daniel Mustieles (es)
+   * Daniel Șerbănescu (ro)
+   * Dz Chen (zh_CN)
+   * Emin Tufan Çetin (tr)
+   * Enrico Nicoletto (pt_BR)
+   * Hugo Carvalho (pt)
+   * Jiri Grönroos (fi)
+   * Jordi Mas (ca)
+   * Julien Hardelin (fr)
+   * Luna Jernberg (sv)
+   * Marek Černocký (cs)
+   * Matej Urbančič (sl)
+   * Muhammet Kara (tr)
+   * Philipp Kiemle (de)
+   * Piotr Drąg (pl)
+   * Rafael Fontenelle (pt_BR)
+   * Rodrigo Lledó (es)
+   * Yi-Jyun Pan (zh_TW)
+   * Yuri Chornoivan (uk)
+   * Мирослав Николић (sr)
+
+
 2020-04-19 meld 3.21.0
 ======================
 
diff --git a/data/org.gnome.meld.appdata.xml.in.in b/data/org.gnome.meld.appdata.xml.in.in
index 2590df59..3bbba995 100644
--- a/data/org.gnome.meld.appdata.xml.in.in
+++ b/data/org.gnome.meld.appdata.xml.in.in
@@ -52,6 +52,20 @@
   <translation type="gettext">meld</translation>
   <content_rating type="oars-1.1" />
   <releases>
+    <release date="2022-01-07" version="3.21.1">
+      <description>
+        <p>
+          This is an unstable release in the 3.21 development series.
+        </p>
+        <ul>
+	  <li>New location display for comparison panes</li>
+          <li>New action bar layout for version control comparisons</li>
+          <li>Dark theme can be toggled in preferences</li>
+          <li>Various improvements to find bar, comparison notifications, and keyboard ergonomics</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
     <release date="2020-04-19" version="3.21.0">
       <description>
         <p>

From 6b53493505406d13cde6512a6c9d979126961361 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Fri, 7 Jan 2022 13:47:47 +1000
Subject: [PATCH 011/116] Bump Meld version in meson build

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 526a0575..d5b59c10 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project(
   'meld',
-  version: '3.21.0',
+  version: '3.21.1',
   meson_version: '>= 0.49.0',
 )
 

From 933115f1315ddd0579e83d4c749e0b9b1ba86bae Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Fri, 7 Jan 2022 14:05:51 +1000
Subject: [PATCH 012/116] Post-release version bump

---
 meld/conf.py.in | 2 +-
 meson.build     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meld/conf.py.in b/meld/conf.py.in
index 0d3c6618..19c13634 100644
--- a/meld/conf.py.in
+++ b/meld/conf.py.in
@@ -4,7 +4,7 @@ import sys
 from pathlib import Path
 
 __package__ = "meld"
-__version__ = "3.21.1"
+__version__ = "3.21.2"
 
 APPLICATION_NAME = 'Meld'
 APPLICATION_ID = 'org.gnome.Meld'
diff --git a/meson.build b/meson.build
index d5b59c10..494fd9d1 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project(
   'meld',
-  version: '3.21.1',
+  version: '3.21.2',
   meson_version: '>= 0.49.0',
 )
 

From d56e0c8bf93bbde4f80b5abca643e4985ebaedbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= <daniel@serbanescu.dk>
Date: Fri, 7 Jan 2022 12:15:40 +0000
Subject: [PATCH 013/116] Update Romanian translation

---
 po/ro.po | 731 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 388 insertions(+), 343 deletions(-)

diff --git a/po/ro.po b/po/ro.po
index 43d3b862..91d74083 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-04-21 21:00+0000\n"
-"PO-Revision-Date: 2021-05-04 12:34+0200\n"
+"POT-Creation-Date: 2021-10-08 21:01+0000\n"
+"PO-Revision-Date: 2022-01-07 13:14+0100\n"
 "Last-Translator: Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
 "Language-Team: Gnome Romanian Translation Team\n"
 "Language: ro\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n==0 || (n!=1 && n%100>=1 && n"
 "%100<=19) ? 1 : 2);\n"
-"X-Generator: Poedit 2.4.2\n"
+"X-Generator: Poedit 3.0.1\n"
 "X-Project-Style: gnome\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
-#: meld/resources/ui/appwindow.ui:9
+#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
 msgid "Meld"
 msgstr "Meld"
 
@@ -85,10 +85,23 @@ msgid "Default window fullscreen state"
 msgstr "Starea pe întreg ecranul implicită a ferestrei"
 
 #: data/org.gnome.meld.gschema.xml:58
+msgid "Prefer application-wide dark theme"
+msgstr "Preferă tema închisă în toată aplicația"
+
+#: data/org.gnome.meld.gschema.xml:59
+msgid ""
+"If true, the GTK dark theme variant will be used, if available. Note that "
+"this is separate from the syntax highlighting scheme."
+msgstr ""
+"Dacă este adevărat, varianta închisă a temei GTK va fi folosită în caz că "
+"este disponibilă. Luați aminte că aceasta este separată de schema de "
+"evidențiere a sintaxei."
+
+#: data/org.gnome.meld.gschema.xml:65
 msgid "Additional automatically detected text encodings"
 msgstr "Codări text detectate automat adiționale"
 
-#: data/org.gnome.meld.gschema.xml:59
+#: data/org.gnome.meld.gschema.xml:66
 msgid ""
 "Meld will use these text encodings to try to decode loaded text files before "
 "trying any other encodings. In addition to the encodings in this list, UTF-8 "
@@ -101,39 +114,39 @@ msgstr ""
 "întotdeauna; alte codări pot fi încercate de asemenea, în funcție de "
 "localizarea utilizatorului."
 
-#: data/org.gnome.meld.gschema.xml:66
+#: data/org.gnome.meld.gschema.xml:73
 msgid "Width of an indentation step"
 msgstr "Lățimea unui pas de indentare"
 
-#: data/org.gnome.meld.gschema.xml:67
+#: data/org.gnome.meld.gschema.xml:74
 msgid "The number of spaces to use for a single indent step"
 msgstr "Numărul de spații de folosit pentru un singur pas de indentare"
 
-#: data/org.gnome.meld.gschema.xml:71
+#: data/org.gnome.meld.gschema.xml:78
 msgid "Whether to indent using spaces or tabs"
 msgstr "Dacă să se indenteze folosind spații sau taburi"
 
-#: data/org.gnome.meld.gschema.xml:72
+#: data/org.gnome.meld.gschema.xml:79
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr ""
 "Dacă are valoarea adevărat, orice identație nouă va folosi spații în loc de "
 "taburi."
 
-#: data/org.gnome.meld.gschema.xml:76 meld/resources/ui/statusbar-menu.ui:5
+#: data/org.gnome.meld.gschema.xml:83 meld/resources/ui/statusbar-menu.ui:5
 msgid "Show line numbers"
 msgstr "Afișează numerele liniilor"
 
-#: data/org.gnome.meld.gschema.xml:77
+#: data/org.gnome.meld.gschema.xml:84
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr ""
 "Dacă are valoarea adevărat, numărul liniilor va fi afișat în rigola "
 "comparării de fișiere."
 
-#: data/org.gnome.meld.gschema.xml:81
+#: data/org.gnome.meld.gschema.xml:88
 msgid "Highlight syntax"
 msgstr "Evidențiază sintaxa"
 
-#: data/org.gnome.meld.gschema.xml:82
+#: data/org.gnome.meld.gschema.xml:89
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld’s own color "
 "highlighting, this is off by default."
@@ -141,21 +154,21 @@ msgstr ""
 "Dacă să se evidențieze sintaxa în comparații. Din cauza propriei evidențieri "
 "a sintaxei în Meld, aceasta este oprită implicit."
 
-#: data/org.gnome.meld.gschema.xml:86
+#: data/org.gnome.meld.gschema.xml:93
 msgid "Color scheme to use for syntax highlighting"
 msgstr "Schema de culori de folosit pentru evidențierea sintaxei"
 
-#: data/org.gnome.meld.gschema.xml:87
+#: data/org.gnome.meld.gschema.xml:94
 msgid "Used by GtkSourceView to determine colors for syntax highlighting"
 msgstr ""
 "Utilizat de GtkSourceView pentru a determina culorile pentru evidențierea "
 "sintaxei"
 
-#: data/org.gnome.meld.gschema.xml:91
+#: data/org.gnome.meld.gschema.xml:98
 msgid "Draw whitespace"
 msgstr "Afișează spațiile goale"
 
-#: data/org.gnome.meld.gschema.xml:92
+#: data/org.gnome.meld.gschema.xml:99
 msgid ""
 "If true, whitespace characters will be drawn in comparisons even if they are "
 "not in a changed area."
@@ -163,11 +176,11 @@ msgstr ""
 "Dacă este adevărat, caracterele de spațiu vor fi desenate în comparații "
 "chiar dacă nu sunt în zonele cu modificări."
 
-#: data/org.gnome.meld.gschema.xml:101
+#: data/org.gnome.meld.gschema.xml:108
 msgid "Wrap mode"
 msgstr "Mod de încadrare"
 
-#: data/org.gnome.meld.gschema.xml:102
+#: data/org.gnome.meld.gschema.xml:109
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
@@ -177,11 +190,11 @@ msgstr ""
 "configurări, fie deloc („none”), la orice caracter („char”) sau numai la "
 "cuvinte de sfârșit („word”)."
 
-#: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
+#: data/org.gnome.meld.gschema.xml:116 meld/resources/ui/statusbar-menu.ui:13
 msgid "Highlight current line"
 msgstr "Evidențiază linia curentă"
 
-#: data/org.gnome.meld.gschema.xml:110
+#: data/org.gnome.meld.gschema.xml:117
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
@@ -189,22 +202,22 @@ msgstr ""
 "Dacă are valoarea adevărat, linia ce conține cursorul va fi evidențiată în "
 "comparările de fișiere."
 
-#: data/org.gnome.meld.gschema.xml:114
+#: data/org.gnome.meld.gschema.xml:121
 msgid "Use the system default monospace font"
 msgstr "Folosește fontul monospațiat implicit al sistemului"
 
-#: data/org.gnome.meld.gschema.xml:115
+#: data/org.gnome.meld.gschema.xml:122
 msgid ""
 "If false, custom-font will be used instead of the system monospace font."
 msgstr ""
 "Dacă are valoarea fals, cusom-font va fi folosit în locul fontului "
 "monospațiat al sistemului."
 
-#: data/org.gnome.meld.gschema.xml:119
+#: data/org.gnome.meld.gschema.xml:126
 msgid "Custom font"
 msgstr "Font personalizat"
 
-#: data/org.gnome.meld.gschema.xml:120
+#: data/org.gnome.meld.gschema.xml:127
 msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
@@ -212,41 +225,41 @@ msgstr ""
 "Font personalizat de folosit, stocat ca șir de caractere și parsat ca "
 "descriere de font Pango."
 
-#: data/org.gnome.meld.gschema.xml:126
+#: data/org.gnome.meld.gschema.xml:133
 msgid "Show overview source map"
 msgstr "Arată harta prezentării generale a sursei"
 
-#: data/org.gnome.meld.gschema.xml:127
+#: data/org.gnome.meld.gschema.xml:134
 msgid ""
 "If true, file comparisons will have paired source maps for compared files."
 msgstr ""
 "Dacă este adevărat, comparațiile de fișiere vor avea hărți de sursă pereche "
 "pentru fișierele comparate."
 
-#: data/org.gnome.meld.gschema.xml:132
+#: data/org.gnome.meld.gschema.xml:139
 msgid "Style of overview map"
 msgstr "Stilul hărții prezentării generlale"
 
-#: data/org.gnome.meld.gschema.xml:133
+#: data/org.gnome.meld.gschema.xml:140
 msgid "Style options for how the overview map is displayed."
 msgstr "Opțiuni de stil pentru cum este afișată harta prezentării generale."
 
-#: data/org.gnome.meld.gschema.xml:139
+#: data/org.gnome.meld.gschema.xml:146
 msgid "Ignore blank lines when comparing files"
 msgstr "Ignoră liniile goale la compararea fișierelor"
 
-#: data/org.gnome.meld.gschema.xml:140
+#: data/org.gnome.meld.gschema.xml:147
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
 "Dacă are valoarea adevărat, liniile goale vor fi omise la evidențierea "
 "modificărilor între fișiere."
 
-#: data/org.gnome.meld.gschema.xml:147
+#: data/org.gnome.meld.gschema.xml:154
 msgid "Use the system default editor"
 msgstr "Folosește editorul implicit al sistemului"
 
-#: data/org.gnome.meld.gschema.xml:148
+#: data/org.gnome.meld.gschema.xml:155
 msgid ""
 "If false, custom-editor-command will be used instead of the system editor "
 "when opening files externally."
@@ -254,11 +267,11 @@ msgstr ""
 "Dacă are valoarea fals, custom-editor-command va fi folosită în locul "
 "editorului sistemului când se deschid extern fișiere."
 
-#: data/org.gnome.meld.gschema.xml:152
+#: data/org.gnome.meld.gschema.xml:159
 msgid "The custom editor launch command"
 msgstr "Comanda de lansare pentru editorul personalizat"
 
-#: data/org.gnome.meld.gschema.xml:153
+#: data/org.gnome.meld.gschema.xml:160
 msgid ""
 "The command used to launch a custom editor. Some limited templating is "
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
@@ -266,22 +279,22 @@ msgstr ""
 "Comanda folosită la lansarea editorului personalizat. Șabloane limitate sunt "
 "suportate aici; momentan „{file}” și „{line}” sunt jetoane recunoscute."
 
-#: data/org.gnome.meld.gschema.xml:159
+#: data/org.gnome.meld.gschema.xml:166
 msgid "Columns to display"
 msgstr "Coloane de afișat"
 
-#: data/org.gnome.meld.gschema.xml:160
+#: data/org.gnome.meld.gschema.xml:167
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
 msgstr ""
 "Lista de nume de coloane în comparația de dosare și dacă ar trebui afișate."
 
-#: data/org.gnome.meld.gschema.xml:164 meld/resources/ui/preferences.ui:935
+#: data/org.gnome.meld.gschema.xml:171 meld/resources/ui/preferences.ui:951
 msgid "Ignore symbolic links"
 msgstr "Ignoră legaturile simbolice"
 
-#: data/org.gnome.meld.gschema.xml:165
+#: data/org.gnome.meld.gschema.xml:172
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
@@ -289,11 +302,11 @@ msgstr ""
 "Dacă are valoarea adevărat, comparațiile de dosare nu vor urma legăturile "
 "simbolice când se navighează prin arborele de dosare."
 
-#: data/org.gnome.meld.gschema.xml:169
+#: data/org.gnome.meld.gschema.xml:176
 msgid "Use shallow comparison"
 msgstr "Folosește comparație îngustă"
 
-#: data/org.gnome.meld.gschema.xml:170
+#: data/org.gnome.meld.gschema.xml:177
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
@@ -303,11 +316,11 @@ msgstr ""
 "numai pe dimensiune și timpul modificării, considerând fișierele identice "
 "dacă au dimensiuni și marcaje de timp identice."
 
-#: data/org.gnome.meld.gschema.xml:174
+#: data/org.gnome.meld.gschema.xml:181
 msgid "File timestamp resolution"
 msgstr "Rezoluția marcajului de timp al fișierului"
 
-#: data/org.gnome.meld.gschema.xml:175
+#: data/org.gnome.meld.gschema.xml:182
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
 "between two files before they’re considered to have different mtimes. This "
@@ -319,11 +332,11 @@ msgstr ""
 "timp diferite. Aceasta este folositor la compararea fișierelor între sisteme "
 "de fișiere cu rezoluție diferită pentru marcajele de timp."
 
-#: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
+#: data/org.gnome.meld.gschema.xml:186 meld/resources/ui/preferences.ui:852
 msgid "Apply text filters during folder comparisons"
 msgstr "Aplică filtrele text în timpul comparării dosarelor"
 
-#: data/org.gnome.meld.gschema.xml:180
+#: data/org.gnome.meld.gschema.xml:187
 msgid ""
 "If true, folder comparisons that compare file contents also apply active "
 "text filters and the blank line trimming option, and ignore newline "
@@ -333,21 +346,21 @@ msgstr ""
 "conținutul fișierelor aplică de asemenea și filtre de text și opțiunea de "
 "omitere a liniilor goale, și ignoră diferențele de linii noi."
 
-#: data/org.gnome.meld.gschema.xml:184
+#: data/org.gnome.meld.gschema.xml:191
 msgid "File status filters"
 msgstr "Filtre pentru starea fișierelor"
 
-#: data/org.gnome.meld.gschema.xml:185
+#: data/org.gnome.meld.gschema.xml:192
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 "Listă de stări folosite în filtrarea fișierelor vizibile în comparația de "
 "dosare."
 
-#: data/org.gnome.meld.gschema.xml:191
+#: data/org.gnome.meld.gschema.xml:198
 msgid "Show the version control console output"
 msgstr "Afișează ieșirea mediului de control al versiunilor"
 
-#: data/org.gnome.meld.gschema.xml:192
+#: data/org.gnome.meld.gschema.xml:199
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
@@ -356,11 +369,11 @@ msgstr ""
 "în vizualizările mediului de control al versiunilor, afișând comenzile "
 "rulate pentru operațiile de control ale versiunilor."
 
-#: data/org.gnome.meld.gschema.xml:196
+#: data/org.gnome.meld.gschema.xml:203
 msgid "Version control pane position"
 msgstr "Poziția în panou al mediului de control al versiunuilor"
 
-#: data/org.gnome.meld.gschema.xml:197
+#: data/org.gnome.meld.gschema.xml:204
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
@@ -368,11 +381,11 @@ msgstr ""
 "Aceasta este înălțimea arborelui principal al mediului de control al "
 "versiunilor când panoul consolei este afișat."
 
-#: data/org.gnome.meld.gschema.xml:201
+#: data/org.gnome.meld.gschema.xml:208
 msgid "Present version comparisons as left-local/right-remote"
 msgstr "Prezintă comparări de versiuni ca stânga-local/dreapta-la-distanță"
 
-#: data/org.gnome.meld.gschema.xml:202
+#: data/org.gnome.meld.gschema.xml:209
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
@@ -383,11 +396,11 @@ msgstr ""
 "determina ordinea prezentării fișierelor în panouri. Altfel, schema stânga-"
 "este-a-lor, dreapta-este-a-mea va fi folosită."
 
-#: data/org.gnome.meld.gschema.xml:206
+#: data/org.gnome.meld.gschema.xml:213
 msgid "Order for files in three-way version control merge comparisons"
 msgstr "Ordinea pentru fișiere într-o comparație de îmbinare a 3 fișiere"
 
-#: data/org.gnome.meld.gschema.xml:207
+#: data/org.gnome.meld.gschema.xml:214
 msgid ""
 "Choices for file order are remote/merged/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
@@ -398,11 +411,11 @@ msgstr ""
 "fișiere lansate din mediul de control al versiunilor, așadar este folosită "
 "numai la corectarea conflictelor de îmbinare, în cadrul Meld."
 
-#: data/org.gnome.meld.gschema.xml:211
+#: data/org.gnome.meld.gschema.xml:218
 msgid "Show margin in commit message editor"
 msgstr "Arată marginea în editorul mesajului de comitere"
 
-#: data/org.gnome.meld.gschema.xml:212
+#: data/org.gnome.meld.gschema.xml:219
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
@@ -410,22 +423,22 @@ msgstr ""
 "Dacă are valoarea adevărat, un ghid va fi afișat pentru a arăta unde este "
 "marginea coloanei în editorul folosit pentru mesajul de comitere."
 
-#: data/org.gnome.meld.gschema.xml:216
+#: data/org.gnome.meld.gschema.xml:223
 msgid "Margin column in commit message editor"
 msgstr "Coloana margine în editorul mesajului de comitere"
 
-#: data/org.gnome.meld.gschema.xml:217
+#: data/org.gnome.meld.gschema.xml:224
 msgid ""
 "The column at which to show the margin in the version control commit message "
 "editor."
 msgstr ""
 "Coloana la care să se arate marginea în editorul de mesaje de comitere."
 
-#: data/org.gnome.meld.gschema.xml:221
+#: data/org.gnome.meld.gschema.xml:228
 msgid "Automatically hard-wrap commit messages"
 msgstr "Încadrează automat mesajele de comitere"
 
-#: data/org.gnome.meld.gschema.xml:222
+#: data/org.gnome.meld.gschema.xml:229
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the commit margin before commit."
@@ -434,22 +447,22 @@ msgstr ""
 "versiunilor va fi împărțit pe mai multe linii la marginea comiterii înainte "
 "de a efectua comiterea."
 
-#: data/org.gnome.meld.gschema.xml:226
+#: data/org.gnome.meld.gschema.xml:233
 msgid "Version control status filters"
 msgstr "Filtrele de stare ale mediului de control al versiunilor"
 
-#: data/org.gnome.meld.gschema.xml:227
+#: data/org.gnome.meld.gschema.xml:234
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 "Listă de stări folosită la filtrarea fișierelor vizibile în comparația "
 "mediului de control al versiunilor."
 
-#: data/org.gnome.meld.gschema.xml:241
+#: data/org.gnome.meld.gschema.xml:248
 msgid "Filename-based filters"
 msgstr "Filtre bazate pe numele de fișier"
 
-#: data/org.gnome.meld.gschema.xml:242
+#: data/org.gnome.meld.gschema.xml:249
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
@@ -457,11 +470,11 @@ msgstr ""
 "Lista de filtre predefinite bazate pe numele de fișiere care, dacă active, "
 "vor elimina fișierele potrivite dintr-o comparație de dosare."
 
-#: data/org.gnome.meld.gschema.xml:256
+#: data/org.gnome.meld.gschema.xml:263
 msgid "Text-based filters"
 msgstr "Filtre bazate pe text"
 
-#: data/org.gnome.meld.gschema.xml:257
+#: data/org.gnome.meld.gschema.xml:264
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
@@ -806,11 +819,11 @@ msgstr "Îmbină toate modificările din dreapta"
 msgid "Merge All"
 msgstr "Îmbină toate"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
 msgid "Add Synchronization Point"
 msgstr "Adaugă un punct de sincronizare"
 
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
 msgid "Clear Synchronization Points"
 msgstr "Curăță punctele de sincronizare"
 
@@ -874,50 +887,50 @@ msgstr "Nivelează dosarele"
 #: meld/resources/ui/about-dialog.ui:8
 msgid ""
 "Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2019 Kai Willadsen"
+"Copyright © 2009-2021 Kai Willadsen"
 msgstr ""
 "Drepturi de autor © 2002-2009 Stephen Kennedy\n"
-"Drepturi de autor © 2009-2019 Kai Willadsen"
+"Drepturi de autor © 2009-2021 Kai Willadsen"
 
 #: meld/resources/ui/about-dialog.ui:14
 msgid "translator-credits"
 msgstr ""
 "Cosmin Clapon <cosminx2003@yahoo.com>, 2010\n"
-"Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2021"
+"Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2021-2022"
 
-#: meld/resources/ui/appwindow.ui:29
+#: meld/resources/ui/appwindow.ui:30
 msgid "Start a new comparison"
 msgstr "Începe o nouă comparație"
 
-#: meld/resources/ui/appwindow.ui:45
+#: meld/resources/ui/appwindow.ui:46
 msgid "Open a recent comparison"
 msgstr "Deschide o comparație recentă"
 
-#: meld/resources/ui/appwindow.ui:73
+#: meld/resources/ui/appwindow.ui:74
 msgid "Go to the previous change"
 msgstr "Revino la modificarea precedentă"
 
-#: meld/resources/ui/appwindow.ui:93
+#: meld/resources/ui/appwindow.ui:94
 msgid "Go to the next change"
 msgstr "Mergi la următoarea modificare"
 
-#: meld/resources/ui/appwindow.ui:123
+#: meld/resources/ui/appwindow.ui:124
 msgid "Go to the previous conflict"
 msgstr "Mergi la conflictul precedent"
 
-#: meld/resources/ui/appwindow.ui:143
+#: meld/resources/ui/appwindow.ui:144
 msgid "Go to the next conflict"
 msgstr "Mergi la următorul conflict"
 
-#: meld/resources/ui/appwindow.ui:192
+#: meld/resources/ui/appwindow.ui:193
 msgid "Version Filters"
 msgstr "Filtrele versiunii"
 
-#: meld/resources/ui/appwindow.ui:207 meld/resources/ui/preferences.ui:1456
+#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472
 msgid "File Filters"
 msgstr "Filtre de fișiere"
 
-#: meld/resources/ui/appwindow.ui:222 meld/resources/ui/preferences.ui:1641
+#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657
 msgid "Text Filters"
 msgstr "Filtre de text"
 
@@ -930,7 +943,7 @@ msgid "Column Name"
 msgstr "Nume coloană"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
 msgid "_Remove"
 msgstr "_Elimină"
 
@@ -1014,6 +1027,23 @@ msgstr "_Deschide extern"
 msgid "_Copy File Paths"
 msgstr "_Copiază căile fișierelor"
 
+#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
+#: meld/resources/ui/dirdiff.ui:117
+msgid "Select folder to open in this pane"
+msgstr "Salvează dosarul de deschis în acest panou"
+
+#: meld/resources/ui/dirdiff.ui:43
+msgid "Folder 1"
+msgstr "Dosar 1"
+
+#: meld/resources/ui/dirdiff.ui:84
+msgid "Folder 2"
+msgstr "Dosar 2"
+
+#: meld/resources/ui/dirdiff.ui:125
+msgid "Folder 3"
+msgstr "Dosar 3"
+
 #: meld/resources/ui/encoding-selector.ui:31
 msgid "Search text encoding…"
 msgstr "Caută codarea textului…"
@@ -1070,8 +1100,16 @@ msgstr "_Copiază"
 msgid "_Paste"
 msgstr "Li_pește"
 
-#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
-#: meld/resources/ui/filediff.ui:171
+#: meld/resources/ui/filediff-menus.ui:54
+msgid "Open Containing Folder"
+msgstr "Deschide dosarul conținător"
+
+#: meld/resources/ui/filediff-menus.ui:58
+msgid "Copy Full Path"
+msgstr "Copiază calea completă"
+
+#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
+#: meld/resources/ui/filediff.ui:169
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -1080,31 +1118,31 @@ msgstr ""
 "fișier și a face modificări oricum, dar aceste modificări trebuiesc salvate "
 "într-un nou fișier."
 
-#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
-#: meld/resources/ui/filediff.ui:185
-msgid "Open file in this pane"
-msgstr "Deschide fișierul în acest panou"
-
-#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
-#: meld/resources/ui/filediff.ui:194
+#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
+#: meld/resources/ui/filediff.ui:183
 msgid "Save file in this pane"
 msgstr "Salvează fișierul din acest panou"
 
-#: meld/resources/ui/filediff.ui:73
+#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
+#: meld/resources/ui/filediff.ui:209
+msgid "Open file in this pane"
+msgstr "Deschide fișierul în acest panou"
+
+#: meld/resources/ui/filediff.ui:79
 msgid "File 3"
 msgstr "Fișier 3"
 
-#: meld/resources/ui/filediff.ui:142
+#: meld/resources/ui/filediff.ui:148
 msgid "File 2"
 msgstr "Fișier 2"
 
-#: meld/resources/ui/filediff.ui:207
+#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148
 msgid "File 1"
 msgstr "Fișier 1"
 
 #. Create icon and filename CellRenderer
-#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
-#: meld/dirdiff.py:517
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
+#: meld/dirdiff.py:530
 msgid "Name"
 msgstr "Nume"
 
@@ -1116,7 +1154,7 @@ msgstr "Tipar"
 msgid "Add new filter"
 msgstr "Adaugă un nou filtru"
 
-#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18
 msgid "_Add"
 msgstr "_Adaugă"
 
@@ -1144,7 +1182,7 @@ msgstr "Încadrat"
 msgid "Replace _All"
 msgstr "Înlocuiește _totul"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1067 meld/iohelpers.py:113
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1092 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "În_locuiește"
 
@@ -1156,7 +1194,7 @@ msgstr "Comută între Caută și Caută-și-înlocuiește"
 msgid "Search highlight mode…"
 msgstr "Caută mod de evidențiere…"
 
-#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:349
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342
 #: meld/newdifftab.py:49
 msgid "New comparison"
 msgstr "Comparație nouă"
@@ -1173,43 +1211,43 @@ msgstr "Dosar"
 msgid "Version control"
 msgstr "Control al versiunilor"
 
-#: meld/resources/ui/new-diff-tab.ui:235 meld/resources/ui/new-diff-tab.ui:355
+#: meld/resources/ui/new-diff-tab.ui:236 meld/resources/ui/new-diff-tab.ui:357
 msgid "_3-way comparison"
 msgstr "Comparație în _3"
 
-#: meld/resources/ui/new-diff-tab.ui:255
+#: meld/resources/ui/new-diff-tab.ui:256
 msgid "Select First File"
 msgstr "Selectați primul fișier"
 
-#: meld/resources/ui/new-diff-tab.ui:269
+#: meld/resources/ui/new-diff-tab.ui:270
 msgid "Select Second File"
 msgstr "Selectați al doilea fișier"
 
-#: meld/resources/ui/new-diff-tab.ui:284
+#: meld/resources/ui/new-diff-tab.ui:285
 msgid "Select Third File"
 msgstr "Selectați al treilea fișier"
 
-#: meld/resources/ui/new-diff-tab.ui:319
+#: meld/resources/ui/new-diff-tab.ui:321
 msgid "Select First Folder"
 msgstr "Selectați primul dosar"
 
-#: meld/resources/ui/new-diff-tab.ui:332
+#: meld/resources/ui/new-diff-tab.ui:334
 msgid "Select Second Folder"
 msgstr "Selectați al doilea dosar"
 
-#: meld/resources/ui/new-diff-tab.ui:346
+#: meld/resources/ui/new-diff-tab.ui:348
 msgid "Select Third Folder"
 msgstr "Selectați al treilea dosar"
 
-#: meld/resources/ui/new-diff-tab.ui:396
+#: meld/resources/ui/new-diff-tab.ui:399
 msgid "Select A Version-Controlled Folder"
 msgstr "Selectați un dosar în mediul de control al versiunilor"
 
-#: meld/resources/ui/new-diff-tab.ui:445
+#: meld/resources/ui/new-diff-tab.ui:448
 msgid "_Blank comparison"
 msgstr "Comparație _goală"
 
-#: meld/resources/ui/new-diff-tab.ui:462
+#: meld/resources/ui/new-diff-tab.ui:466
 msgid "C_ompare"
 msgstr "C_ompară"
 
@@ -1245,6 +1283,18 @@ msgstr "Panouri la mijloc și la dreapta"
 msgid "_Reverse patch direction"
 msgstr "Inve_rsează direcția peticului"
 
+#: meld/resources/ui/path-label.ui:23
+msgid "Path"
+msgstr "Cale"
+
+#: meld/resources/ui/path-label.ui:62
+msgid "Copy Path"
+msgstr "Copiază calea"
+
+#: meld/resources/ui/path-label.ui:78
+msgid "Open Folder"
+msgstr "Deschide dosar"
+
 #: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
 msgid "Preferences"
 msgstr "Preferințe"
@@ -1296,103 +1346,107 @@ msgid "Show w_hitespace"
 msgstr "Afișează _spațiile goale"
 
 #: meld/resources/ui/preferences.ui:381
+msgid "Prefer dark theme"
+msgstr "Preferă tema închisă"
+
+#: meld/resources/ui/preferences.ui:397
 msgid "Use s_yntax highlighting"
 msgstr "Folosește _evidențierea sintaxei"
 
-#: meld/resources/ui/preferences.ui:404
+#: meld/resources/ui/preferences.ui:420
 msgid "Syntax highlighting color scheme:"
 msgstr "Schema de culori pentru evidențierea sintaxei:"
 
-#: meld/resources/ui/preferences.ui:469
+#: meld/resources/ui/preferences.ui:485
 msgid "Code Overview"
 msgstr "Prezentare generală a codului"
 
-#: meld/resources/ui/preferences.ui:506
+#: meld/resources/ui/preferences.ui:522
 msgid "Show overview map"
 msgstr "Arată harta prezentării generale"
 
-#: meld/resources/ui/preferences.ui:529
+#: meld/resources/ui/preferences.ui:545
 msgid "Overview map style:"
 msgstr "Stilul hărții prezentării generale:"
 
-#: meld/resources/ui/preferences.ui:596
+#: meld/resources/ui/preferences.ui:612
 msgid "External Editor"
 msgstr "Editor extern"
 
-#: meld/resources/ui/preferences.ui:632
+#: meld/resources/ui/preferences.ui:648
 msgid "Use _default system editor"
 msgstr "Folosește editorul implicit _de sistem"
 
-#: meld/resources/ui/preferences.ui:655
+#: meld/resources/ui/preferences.ui:671
 msgid "Edito_r command:"
 msgstr "Comandă de editor:"
 
-#: meld/resources/ui/preferences.ui:711
+#: meld/resources/ui/preferences.ui:727
 msgid "Editor"
 msgstr "Editor"
 
-#: meld/resources/ui/preferences.ui:732
+#: meld/resources/ui/preferences.ui:748
 msgid "Shallow Comparison"
 msgstr "Comparație îngustă"
 
-#: meld/resources/ui/preferences.ui:768
+#: meld/resources/ui/preferences.ui:784
 msgid "C_ompare files based only on size and timestamp"
 msgstr "C_ompară fișiere numai pe baza dimensiunii și a marcajului de timp"
 
-#: meld/resources/ui/preferences.ui:791
+#: meld/resources/ui/preferences.ui:807
 msgid "_Timestamp resolution:"
 msgstr "Rezoluția marcajelor de _timp:"
 
-#: meld/resources/ui/preferences.ui:855
+#: meld/resources/ui/preferences.ui:871
 msgid "Note: enabling text filters may make comparing large files much slower"
 msgstr ""
 "Notă: activarea filtrelor de text poate îngreuna compararea fișierelor mari"
 
-#: meld/resources/ui/preferences.ui:904
+#: meld/resources/ui/preferences.ui:920
 msgid "Symbolic Links"
 msgstr "Legături simbolice"
 
-#: meld/resources/ui/preferences.ui:972
+#: meld/resources/ui/preferences.ui:988
 msgid "Visible Columns"
 msgstr "Coloane vizibile"
 
-#: meld/resources/ui/preferences.ui:1039
+#: meld/resources/ui/preferences.ui:1055
 msgid "Folder Comparisons"
 msgstr "Comparație de dosare"
 
-#: meld/resources/ui/preferences.ui:1061
+#: meld/resources/ui/preferences.ui:1077
 msgid "Version Comparisons"
 msgstr "Comparații de versiuni"
 
-#: meld/resources/ui/preferences.ui:1104
+#: meld/resources/ui/preferences.ui:1120
 msgid "_Order when comparing file revisions:"
 msgstr "_Ordinea comparării reviziilor de fișiere:"
 
-#: meld/resources/ui/preferences.ui:1151
+#: meld/resources/ui/preferences.ui:1167
 msgid "Order when _merging files:"
 msgstr "Ordonează la î_mbinarea fișierelor:"
 
-#: meld/resources/ui/preferences.ui:1219
+#: meld/resources/ui/preferences.ui:1235
 msgid "Commit Messages"
 msgstr "Mesaje de comitere"
 
-#: meld/resources/ui/preferences.ui:1260
+#: meld/resources/ui/preferences.ui:1276
 msgid "Show _right margin at:"
 msgstr "Arată marginea d_reaptă la:"
 
-#: meld/resources/ui/preferences.ui:1301
+#: meld/resources/ui/preferences.ui:1317
 msgid "Automatically _break lines at right margin on commit"
 msgstr "_Rupe liniile automat la marginea din dreapta în timpul comiterii"
 
-#: meld/resources/ui/preferences.ui:1351
+#: meld/resources/ui/preferences.ui:1367
 msgid "Version Control"
 msgstr "Control al versiunilor"
 
-#: meld/resources/ui/preferences.ui:1373
+#: meld/resources/ui/preferences.ui:1389
 msgid "Filename filters"
 msgstr "Filtre pentru numele fișierelor"
 
-#: meld/resources/ui/preferences.ui:1411
+#: meld/resources/ui/preferences.ui:1427
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -1402,21 +1456,21 @@ msgstr ""
 "după nume. Fiecare tipar este o listă de metacaractere de tip shell separate "
 "prin spații."
 
-#: meld/resources/ui/preferences.ui:1478
+#: meld/resources/ui/preferences.ui:1494
 msgid "Change trimming"
 msgstr "Aranjează modificările"
 
-#: meld/resources/ui/preferences.ui:1514
+#: meld/resources/ui/preferences.ui:1530
 msgid "Trim blank line differences from the start and end of changes"
 msgstr ""
 "Omite diferențele de linii goale de la începutul până la sfârșitul "
 "modificărilor"
 
-#: meld/resources/ui/preferences.ui:1558
+#: meld/resources/ui/preferences.ui:1574
 msgid "Text filters"
 msgstr "Filtre de text"
 
-#: meld/resources/ui/preferences.ui:1596
+#: meld/resources/ui/preferences.ui:1612
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -1430,47 +1484,47 @@ msgstr ""
 "grupuri, atunci doar grupurile vor fi înlocuite. Pentru mai multe detalii "
 "consultați manualul."
 
-#: meld/resources/ui/preferences.ui:1687
+#: meld/resources/ui/preferences.ui:1703
 msgid "Left is remote, right is local"
 msgstr "Stânga este la distanță, dreapta este locală"
 
-#: meld/resources/ui/preferences.ui:1691
+#: meld/resources/ui/preferences.ui:1707
 msgid "Left is local, right is remote"
 msgstr "Stânga este locală, dreapta este la distanță"
 
-#: meld/resources/ui/preferences.ui:1705
+#: meld/resources/ui/preferences.ui:1721
 msgid "Simple change map"
 msgstr "Hartă de modificări simplă"
 
-#: meld/resources/ui/preferences.ui:1709
+#: meld/resources/ui/preferences.ui:1725
 msgid "Compact source map"
 msgstr "Hartă de sursă compactă"
 
-#: meld/resources/ui/preferences.ui:1713
+#: meld/resources/ui/preferences.ui:1729
 msgid "Full source map"
 msgstr "Harta completă a sursei"
 
-#: meld/resources/ui/preferences.ui:1727
+#: meld/resources/ui/preferences.ui:1743
 msgid "Remote, merge, local"
 msgstr "La distanță, îmbinare, local"
 
-#: meld/resources/ui/preferences.ui:1731
+#: meld/resources/ui/preferences.ui:1747
 msgid "Local, merge, remote"
 msgstr "Local, îmbinare, la distanță"
 
-#: meld/resources/ui/preferences.ui:1753
+#: meld/resources/ui/preferences.ui:1769
 msgid "1ns (ext4)"
 msgstr "1ns (ext4)"
 
-#: meld/resources/ui/preferences.ui:1757
+#: meld/resources/ui/preferences.ui:1773
 msgid "100ns (NTFS)"
 msgstr "100ns (NTFS)"
 
-#: meld/resources/ui/preferences.ui:1761
+#: meld/resources/ui/preferences.ui:1777
 msgid "1s (ext2/ext3)"
 msgstr "1s (ext2/ext3)"
 
-#: meld/resources/ui/preferences.ui:1765
+#: meld/resources/ui/preferences.ui:1781
 msgid "2s (VFAT)"
 msgstr "2s (VFAT)"
 
@@ -1515,8 +1569,8 @@ msgstr "Dacă nu salvați, modificările vor fi pierdute permanent."
 msgid "Close _without Saving"
 msgstr "Închide _fără a salva"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1066
-#: meld/iohelpers.py:55 meld/iohelpers.py:112
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1091
+#: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Anulează"
 
@@ -1540,95 +1594,67 @@ msgstr "_Compară"
 msgid "Co_mmit…"
 msgstr "Co_mite…"
 
-#: meld/resources/ui/vcview-menus.ui:15
-msgid "_Update"
-msgstr "_Actualizează"
-
-#: meld/resources/ui/vcview-menus.ui:30
+#: meld/resources/ui/vcview-menus.ui:26
 msgid "Re_vert"
 msgstr "Re_vino"
 
-#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+#: meld/resources/ui/vcview-menus.ui:30
 msgid "Delete"
 msgstr "Șterge"
 
-#: meld/resources/ui/vcview-menus.ui:41
-msgid "Mar_k as Resolved"
-msgstr "Marchea_ză ca rezolvat"
-
-#: meld/resources/ui/vcview.ui:73
-msgid "Commit…"
-msgstr "Comite…"
+#: meld/resources/ui/vcview-menus.ui:37
+msgid "Resolve Conflict"
+msgstr "Rezolvă conflictul"
 
-#: meld/resources/ui/vcview.ui:74
+#: meld/resources/ui/vcview.ui:16
 msgid "Commit changes to version control"
 msgstr "Comite modificările la mediul de control al versiunilor"
 
-#: meld/resources/ui/vcview.ui:86
-msgid "Update"
-msgstr "Actualizează"
-
-#: meld/resources/ui/vcview.ui:87
-msgid "Update working copy from version control"
-msgstr "Actualizează copia în lucru din mediul de control al versiunilor"
+#: meld/resources/ui/vcview.ui:21
+msgid "Commit…"
+msgstr "Comite…"
 
-#: meld/resources/ui/vcview.ui:99
-msgid "Push"
-msgstr "Îm_pinge"
+#: meld/resources/ui/vcview.ui:38
+msgid "Pull remote changes to the local repository"
+msgstr "Trage modificările de la distanță în depozitul local"
 
-#: meld/resources/ui/vcview.ui:100
+#: meld/resources/ui/vcview.ui:51
 msgid "Push local changes to remote"
 msgstr "Împinge modificările locale spre server"
 
-#: meld/resources/ui/vcview.ui:112
-msgid "Add"
-msgstr "Adaugă"
-
-#: meld/resources/ui/vcview.ui:113
+#: meld/resources/ui/vcview.ui:74
 msgid "Add to version control"
 msgstr "Adaugă la mediul de control al versiunilor"
 
-#: meld/resources/ui/vcview.ui:125
-msgid "Remove"
-msgstr "Elimină"
-
-#: meld/resources/ui/vcview.ui:126
+#: meld/resources/ui/vcview.ui:87
 msgid "Remove from version control"
 msgstr "Elimină din mediul de control al versiunilor"
 
-#: meld/resources/ui/vcview.ui:138
-msgid "Mark as Resolved"
-msgstr "Marchează ca rezolvat"
+#: meld/resources/ui/vcview.ui:100
+msgid "Revert working copy to original state"
+msgstr "Readu copia funcțională la starea originală"
 
-#: meld/resources/ui/vcview.ui:139
+#: meld/resources/ui/vcview.ui:113
 msgid "Mark as resolved in version control"
 msgstr "Marcat ca rezolvat în mediul de control al versiunilor"
 
-#: meld/resources/ui/vcview.ui:151
-msgid "Revert"
-msgstr "Revino"
-
-#: meld/resources/ui/vcview.ui:152
-msgid "Revert working copy to original state"
-msgstr "Readu copia funcțională la starea originală"
-
-#: meld/resources/ui/vcview.ui:165
-msgid "Delete from working copy"
-msgstr "Șterge din copia funcțională"
+#: meld/resources/ui/vcview.ui:140
+msgid "Open version controlled folder in this pane"
+msgstr "Deschide dosarul de control al versiunilor în acest panou"
 
-#: meld/resources/ui/vcview.ui:220
+#: meld/resources/ui/vcview.ui:229
 msgid "Location"
 msgstr "Locație"
 
-#: meld/resources/ui/vcview.ui:229
+#: meld/resources/ui/vcview.ui:238
 msgid "Status"
 msgstr "Stare"
 
-#: meld/resources/ui/vcview.ui:238
+#: meld/resources/ui/vcview.ui:247
 msgid "Extra"
 msgstr "Extra"
 
-#: meld/resources/ui/vcview.ui:270
+#: meld/resources/ui/vcview.ui:279
 msgid "Console output"
 msgstr "Ieșirea consolei"
 
@@ -1653,43 +1679,43 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:538 meld/preferences.py:132
+#: meld/dirdiff.py:551 meld/preferences.py:132
 msgid "Size"
 msgstr "Dimensiune"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:546 meld/preferences.py:133
+#: meld/dirdiff.py:559 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Timpul modificării"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:554 meld/preferences.py:134
+#: meld/dirdiff.py:567 meld/preferences.py:134
 msgid "Permissions"
 msgstr "Permisiuni"
 
-#: meld/dirdiff.py:778 meld/dirdiff.py:802
+#: meld/dirdiff.py:803 meld/dirdiff.py:827
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Se scanează {folder}"
 
-#: meld/dirdiff.py:942
+#: meld/dirdiff.py:967
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Terminat"
 
-#: meld/dirdiff.py:951
+#: meld/dirdiff.py:976
 msgid "Folder {} is being compared to itself"
 msgstr "Dosarul {} este comparat cu el însuși"
 
-#: meld/dirdiff.py:957
+#: meld/dirdiff.py:982
 msgid "Folders have no differences"
 msgstr "Dosarele nu au nicio diferență"
 
-#: meld/dirdiff.py:959
+#: meld/dirdiff.py:984
 msgid "Contents of scanned files in folders are identical."
 msgstr "Conținuturile fișierelor scanate în dosare sunt identice."
 
-#: meld/dirdiff.py:961
+#: meld/dirdiff.py:986
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1697,43 +1723,43 @@ msgstr ""
 "Fișierele scanate în dosare par a fi identice, dar conținutul nu a fost "
 "scanat."
 
-#: meld/dirdiff.py:964
+#: meld/dirdiff.py:989
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Filtre pentru fișiere sunt în uz, așadar nu toate fișierele au fost scanate."
 
-#: meld/dirdiff.py:966
+#: meld/dirdiff.py:991
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Filtre de text sunt folosite și pot masca diferențele de conținut."
 
-#: meld/dirdiff.py:982 meld/filediff.py:1874
+#: meld/dirdiff.py:1007 meld/filediff.py:1907
 msgid "Hide"
 msgstr "Ascunde"
 
-#: meld/dirdiff.py:984 meld/filediff.py:1876 meld/filediff.py:1906
-#: meld/filediff.py:1908 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1009 meld/filediff.py:1909 meld/filediff.py:1939
+#: meld/filediff.py:1941 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "Ascun_de"
 
-#: meld/dirdiff.py:993
+#: meld/dirdiff.py:1018
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Au avut loc erori multiple în timpul scanării acestui dosar"
 
-#: meld/dirdiff.py:994
+#: meld/dirdiff.py:1019
 msgid "Files with invalid encodings found"
 msgstr "Fișiere cu codări nevalide au fost găsite"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:996
+#: meld/dirdiff.py:1021
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Unele fișiere au avut o codare incorectă. Numele lor sunt:"
 
-#: meld/dirdiff.py:998
+#: meld/dirdiff.py:1023
 msgid "Files hidden by case insensitive comparison"
 msgstr "Fișiere ascunse de comparația insenzitivă la majuscule"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1000
+#: meld/dirdiff.py:1025
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1741,17 +1767,17 @@ msgstr ""
 "Efectuați o comparație insensibilă la majuscule pe un sistem de fișiere "
 "sensibil la majuscule. Următoarele fișiere din acest dosar sunt ascunse:"
 
-#: meld/dirdiff.py:1011
+#: meld/dirdiff.py:1036
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "„{first_file}” ascuns de „{second_file}”"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1095
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Înlocuiți dosarul „%s”?"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1097
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1760,11 +1786,11 @@ msgstr ""
 "Un alt dosar cu același nume există deja în „%s”.\n"
 "Dacă înlocuiți dosarul existent, toate fișierele din el vor fi pierdute."
 
-#: meld/dirdiff.py:1085
+#: meld/dirdiff.py:1110
 msgid "Error copying file"
 msgstr "Eroare la copierea fișierului"
 
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1111
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1777,19 +1803,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1111 meld/vcview.py:759
+#: meld/dirdiff.py:1136 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Eroare la ștergerea {}"
 
-#: meld/dirdiff.py:1604
+#: meld/dirdiff.py:1626
 msgid "No folder"
 msgstr "Niciun dosar"
 
-#: meld/filediff.py:1144
+#: meld/filediff.py:1149
 msgid "Comparison results will be inaccurate"
 msgstr "Rezultatele comparării vor fi inexacte"
 
-#: meld/filediff.py:1146
+#: meld/filediff.py:1151
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1797,74 +1823,74 @@ msgstr ""
 "Un filtru a modificat numărul de linii din fișier, ceea ce nu este suportat. "
 "Comparația va fi incorectă."
 
-#: meld/filediff.py:1218
+#: meld/filediff.py:1223
 msgid "Mark conflict as resolved?"
 msgstr "Marcați conflictul ca rezolvat?"
 
-#: meld/filediff.py:1220
+#: meld/filediff.py:1225
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Dacă conflictul a fost rezolvat cu succes, îl puteți marca ca rezolvat."
 
-#: meld/filediff.py:1222
+#: meld/filediff.py:1227
 msgid "Cancel"
 msgstr "Anulează"
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1228
 msgid "Mark _Resolved"
 msgstr "Marchează ca _rezolvat"
 
-#: meld/filediff.py:1556
+#: meld/filediff.py:1589
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "A intervenit o problemă la deschiderea fișierului „%s”."
 
-#: meld/filediff.py:1564
+#: meld/filediff.py:1598
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Fișierul %s pare să fie un fișier binar."
 
-#: meld/filediff.py:1566
+#: meld/filediff.py:1600
 msgid "Do you want to open the file using the default application?"
 msgstr "Doriți să deschideți fișierul utilizând aplicația implicită?"
 
-#: meld/filediff.py:1568
+#: meld/filediff.py:1602
 msgid "Open"
 msgstr "Deschide"
 
-#: meld/filediff.py:1582
+#: meld/filediff.py:1616
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Se combină fișierele"
 
-#: meld/filediff.py:1596
+#: meld/filediff.py:1630
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Se calculează diferențele"
 
-#: meld/filediff.py:1657
+#: meld/filediff.py:1690
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Fișierul %s s-a schimbat pe disc"
 
-#: meld/filediff.py:1658
+#: meld/filediff.py:1691
 msgid "Do you want to reload the file?"
 msgstr "Doriți să reîncărcați fișierul?"
 
-#: meld/filediff.py:1660
+#: meld/filediff.py:1693
 msgid "_Reload"
 msgstr "_Reîncarcă"
 
-#: meld/filediff.py:1830
+#: meld/filediff.py:1863
 msgid "File {} is being compared to itself"
 msgstr "Fișierul {} este comparat cu el însuși"
 
-#: meld/filediff.py:1839
+#: meld/filediff.py:1872
 msgid "Files are identical"
 msgstr "Fișierele sunt identice"
 
-#: meld/filediff.py:1852
+#: meld/filediff.py:1885
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1872,11 +1898,11 @@ msgstr ""
 "Filtre de text sunt folosite, și pot face diferențe între fișiere. Doriți să "
 "comparați fișierele nefiltrate?"
 
-#: meld/filediff.py:1857
+#: meld/filediff.py:1890
 msgid "Files differ in line endings only"
 msgstr "Fișierele diferă numai în modul în care se sfârșesc liniile"
 
-#: meld/filediff.py:1859
+#: meld/filediff.py:1892
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1885,15 +1911,15 @@ msgstr ""
 "Fișierele sunt identice cu excepția încheierii liniilor:\n"
 "%s"
 
-#: meld/filediff.py:1879
+#: meld/filediff.py:1912
 msgid "Show without filters"
 msgstr "Afișează fără filtre"
 
-#: meld/filediff.py:1901
+#: meld/filediff.py:1934
 msgid "Change highlighting incomplete"
 msgstr "Evidențierea modificărilor este incompletă"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1935
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1902,19 +1928,19 @@ msgstr ""
 "forța Meld să utilizeze mai mult timp la evidențierea modificărilor mai "
 "mari, dar asta poate fi lent."
 
-#: meld/filediff.py:1910
+#: meld/filediff.py:1943
 msgid "Keep highlighting"
 msgstr "Păstrează evidențierea"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1945
 msgid "_Keep highlighting"
 msgstr "_Păstrează evidențierea"
 
-#: meld/filediff.py:1925
+#: meld/filediff.py:1958
 msgid "Saving failed"
 msgstr "Salvarea a eșuat"
 
-#: meld/filediff.py:1926
+#: meld/filediff.py:1959
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1922,36 +1948,36 @@ msgstr ""
 "Considerați copierea oricăror modificări critice într-un alt program pentru "
 "a evida pierderi de date."
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1968
 msgid "Save Left Pane As"
 msgstr "Salvează panoul din stânga ca"
 
-#: meld/filediff.py:1937
+#: meld/filediff.py:1970
 msgid "Save Middle Pane As"
 msgstr "Salvează panoul din mijloc ca"
 
-#: meld/filediff.py:1939
+#: meld/filediff.py:1972
 msgid "Save Right Pane As"
 msgstr "Salvează panoul din dreapta ca"
 
-#: meld/filediff.py:1950
+#: meld/filediff.py:1983
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Fișierul %s s-a schimbat pe disc de când a fost deschis"
 
-#: meld/filediff.py:1952
+#: meld/filediff.py:1985
 msgid "If you save it, any external changes will be lost."
 msgstr "Dacă salvați, orice modificări externe vor fi pierdute."
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:1988
 msgid "Save Anyway"
 msgstr "Salvează oricum"
 
-#: meld/filediff.py:1956
+#: meld/filediff.py:1989
 msgid "Don’t Save"
 msgstr "Nu salva"
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2031
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1959,7 +1985,7 @@ msgstr ""
 "Fișierul „{}” conține caractere care nu pot fi codificare cu codarea curentă "
 "„{}”."
 
-#: meld/filediff.py:2002 meld/patchdialog.py:138
+#: meld/filediff.py:2035 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1968,20 +1994,16 @@ msgstr ""
 "Nu s-a putut salva fișierul din cauza:\n"
 "%s"
 
-#: meld/filediff.py:2006 meld/patchdialog.py:137
+#: meld/filediff.py:2039 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Nu s-a putut salva fișierul %s."
 
-#: meld/filediff.py:2067
-msgid "Open File"
-msgstr "Deschide un fișier"
-
-#: meld/filediff.py:2421
+#: meld/filediff.py:2440
 msgid "Live comparison updating disabled"
 msgstr "Actualizarea comparației în direct este dezactivată"
 
-#: meld/filediff.py:2422
+#: meld/filediff.py:2441
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1992,32 +2014,32 @@ msgstr ""
 "actualizările în direct vor reveni când punctele de sincronizare sunt "
 "curățate."
 
-#: meld/iohelpers.py:40
+#: meld/iohelpers.py:41
 msgid "Deleting remote folders is not supported"
 msgstr "Ștergerea dosarelor la distanță nu este suportată"
 
-#: meld/iohelpers.py:42
+#: meld/iohelpers.py:43
 msgid "Not a file or directory"
 msgstr "Nu este un fișier sau dosar"
 
-#: meld/iohelpers.py:46
+#: meld/iohelpers.py:47
 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
 msgstr "„{}” nu poate fi pus la gunoi. Doriți să îl ștergeți permanent?"
 
-#: meld/iohelpers.py:51
+#: meld/iohelpers.py:52
 msgid "This remote location does not support sending items to the trash."
 msgstr "Locația la distanță nu suportă trimiterea de elemente la gunoi."
 
-#: meld/iohelpers.py:56
+#: meld/iohelpers.py:57
 msgid "_Delete Permanently"
 msgstr "Ș_terge permanent"
 
-#: meld/iohelpers.py:106
+#: meld/iohelpers.py:107
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Înlocuiți fișierul „%s”?"
 
-#: meld/iohelpers.py:108
+#: meld/iohelpers.py:109
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2026,120 +2048,120 @@ msgstr ""
 "Un fișier cu acest nume există deja în „%s”.\n"
 "Dacă înlocuiți fișierul existent, conținutul lui va fi pierdut."
 
-#: meld/meldapp.py:183
+#: meld/meldapp.py:188
 msgid "wrong number of arguments supplied to --diff"
 msgstr "număr de parametri incorect pentru --diff"
 
-#: meld/meldapp.py:188
+#: meld/meldapp.py:193
 msgid "Start with an empty window"
 msgstr "Începe cu o fereastră goală"
 
-#: meld/meldapp.py:189 meld/meldapp.py:191
+#: meld/meldapp.py:194 meld/meldapp.py:196
 msgid "file"
 msgstr "fișier"
 
-#: meld/meldapp.py:189 meld/meldapp.py:193
+#: meld/meldapp.py:194 meld/meldapp.py:198
 msgid "folder"
 msgstr "dosar"
 
-#: meld/meldapp.py:190
+#: meld/meldapp.py:195
 msgid "Start a version control comparison"
 msgstr "Începe o comparație în mediul de control al versiunilor"
 
-#: meld/meldapp.py:192
+#: meld/meldapp.py:197
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Începe o comparație de 2 sau 3 fișiere"
 
-#: meld/meldapp.py:194
+#: meld/meldapp.py:199
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Începe o comparație de 2 sau 3 dosare"
 
-#: meld/meldapp.py:237
+#: meld/meldapp.py:242
 #, python-format
 msgid "Error: %s\n"
 msgstr "Eroare: %s\n"
 
-#: meld/meldapp.py:244
+#: meld/meldapp.py:249
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld este o unealtă de comparare a fișierelor și directoarelor."
 
-#: meld/meldapp.py:248
+#: meld/meldapp.py:253
 msgid "Set label to use instead of file name"
 msgstr "Definiți eticheta care să file folosită în locul numelui de fișier"
 
-#: meld/meldapp.py:251
+#: meld/meldapp.py:256
 msgid "Open a new tab in an already running instance"
 msgstr "Deschide un nou tab într-o instanță ce rulează deja"
 
-#: meld/meldapp.py:254
+#: meld/meldapp.py:259
 msgid "Automatically compare all differing files on startup"
 msgstr "Compară automat la pornire toate fișierele care diferă"
 
-#: meld/meldapp.py:257
+#: meld/meldapp.py:262
 msgid "Ignored for compatibility"
 msgstr "Ignorat pentru compatibilitate"
 
-#: meld/meldapp.py:261
+#: meld/meldapp.py:266
 msgid "Set the target file for saving a merge result"
 msgstr "Definiți fișierul țintă pentru a salva un rezultat combinat"
 
-#: meld/meldapp.py:264
+#: meld/meldapp.py:269
 msgid "Automatically merge files"
 msgstr "Îmbină fișiere automat"
 
-#: meld/meldapp.py:268
+#: meld/meldapp.py:273
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Încarcă o comparație salvată dintr-un fișier de comparație Meld"
 
-#: meld/meldapp.py:272
+#: meld/meldapp.py:277
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Creează un tab diferențiat pentru fișierele sau directoarele date"
 
-#: meld/meldapp.py:292
+#: meld/meldapp.py:297
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "prea multe argumente (este nevoie de 0-3, s-au folosit %d)"
 
-#: meld/meldapp.py:295
+#: meld/meldapp.py:300
 msgid "can’t auto-merge less than 3 files"
 msgstr "nu se pot îmbina mai puțin de 3 fișiere"
 
-#: meld/meldapp.py:297
+#: meld/meldapp.py:302
 msgid "can’t auto-merge directories"
 msgstr "nu se pot îmbina automat directoarele"
 
-#: meld/meldapp.py:312
+#: meld/meldapp.py:317
 msgid "Error reading saved comparison file"
 msgstr "Eroare la citirea fișierului de comparație salvat"
 
-#: meld/meldapp.py:329
+#: meld/meldapp.py:334
 #, python-format
 msgid "invalid path or URI “%s”"
 msgstr "cale sau URI nevalid „%s”"
 
-#: meld/meldapp.py:336
+#: meld/meldapp.py:341
 msgid "remote folder “{}” not supported"
 msgstr "dosarul de la distanță „{}” nu este suportat"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: meld/meldbuffer.py:114
+#: meld/meldbuffer.py:115
 msgid "<unnamed>"
 msgstr "<nedenumit>"
 
-#: meld/melddoc.py:61
+#: meld/melddoc.py:124
 msgid "untitled"
 msgstr "fără titlu"
 
-#: meld/meldwindow.py:155
+#: meld/meldwindow.py:158
 msgid "Filename"
 msgstr "Nume fișiere"
 
-#: meld/meldwindow.py:384
+#: meld/meldwindow.py:381
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Este nevoie de trei fișiere pentru îmbinarea automată, s-au primit: %r"
 
-#: meld/meldwindow.py:406
+#: meld/meldwindow.py:403
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Nu se poate compara un amestec de fișiere și directoare"
 
@@ -2167,7 +2189,7 @@ msgstr "etichetă"
 msgid "pattern"
 msgstr "tipar"
 
-#: meld/recent.py:104
+#: meld/recent.py:111
 msgid "Version control:"
 msgstr "Control al versiunilor:"
 
@@ -2186,6 +2208,10 @@ msgstr "{name} ({charset})"
 msgid "Plain Text"
 msgstr "Text simplu"
 
+#: meld/ui/pathlabel.py:36
+msgid "Unnamed file"
+msgstr "Fișier fără nume"
+
 #. Abbreviation for line, column so that it will fit in the status bar
 #: meld/ui/statusbar.py:125
 #, python-brace-format
@@ -2208,9 +2234,7 @@ msgstr "Niciun fișier nu va fi comis"
 msgid "{unpushed_commits} in {unpushed_branches}"
 msgstr "{unpushed_commits} în {unpushed_branches}"
 
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: meld/vc/git.py:94 meld/vc/git.py:103
+#: meld/vc/git.py:94 meld/vc/git.py:104
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -2226,16 +2250,16 @@ msgstr[0] "%d ramură"
 msgstr[1] "%d ramuri"
 msgstr[2] "%d de ramuri"
 
-#: meld/vc/git.py:344
+#: meld/vc/git.py:345
 #, python-brace-format
 msgid "Mode changed from {old_mode} to {new_mode}"
 msgstr "Modul s-a modificat de la {old_mode} la {new_mode}"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Partially staged"
 msgstr "Parțial introdus în index"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Staged"
 msgstr "Introdus în index"
 
@@ -2296,95 +2320,95 @@ msgstr "Nu este prezent"
 
 #. Translators: This error message is shown when no
 #. repository of this type is found.
-#: meld/vcview.py:333
+#: meld/vcview.py:334
 #, python-format
 msgid "%(name)s (not found)"
 msgstr "%(name)s (negăsit)"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: meld/vcview.py:337
+#: meld/vcview.py:338
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s neinstalat)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: meld/vcview.py:341
+#: meld/vcview.py:342
 #, python-format
 msgid "%(name)s (invalid repository)"
 msgstr "%(name)s (depozit nevalid)"
 
-#: meld/vcview.py:355
+#: meld/vcview.py:356
 msgid "No valid version control system found in this folder"
 msgstr ""
 "Niciun sistem de control al versiunilor valid nu a fost găsit în acest dosar"
 
-#: meld/vcview.py:357
+#: meld/vcview.py:358
 msgid "Choose which version control system to use"
 msgstr "Alegeți care mediu de control al versiunilor să fie folosit"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:411
+#: meld/vcview.py:412
 #, python-brace-format
 msgid "Location: {path}"
 msgstr "Locație: {path}"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:418
+#: meld/vcview.py:419
 msgid "Scanning repository"
 msgstr "Se scanează depozitul"
 
-#: meld/vcview.py:447
+#: meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "Se scanează %s"
 
-#: meld/vcview.py:486
+#: meld/vcview.py:487
 msgid "(Empty)"
 msgstr "(gol)"
 
-#: meld/vcview.py:533
+#: meld/vcview.py:535
 #, python-format
 msgid "%s — local"
 msgstr "%s — local"
 
-#: meld/vcview.py:534
+#: meld/vcview.py:536
 #, python-format
 msgid "%s — remote"
 msgstr "%s — la distanță"
 
-#: meld/vcview.py:542
+#: meld/vcview.py:544
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (local, îmbinare, la distanță)"
 
-#: meld/vcview.py:547
+#: meld/vcview.py:549
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (la distanță, îmbinare, local)"
 
-#: meld/vcview.py:558
+#: meld/vcview.py:560
 #, python-format
 msgid "%s — repository"
 msgstr "%s — depozit"
 
-#: meld/vcview.py:564
+#: meld/vcview.py:566
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (în lucru, depozit)"
 
-#: meld/vcview.py:568
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (depozit, în lucru)"
 
-#: meld/vcview.py:730
+#: meld/vcview.py:735
 msgid "Remove folder and all its files?"
 msgstr "Eliminați dosarul și toate fișierele lui?"
 
-#: meld/vcview.py:732
+#: meld/vcview.py:737
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2392,10 +2416,40 @@ msgstr ""
 "Aceasta va elimina toate fișierele și dosarele selectate, și toate fișierele "
 "din dosarele selectate, din mediul de control al versiunilor."
 
-#: meld/vcview.py:845
+#: meld/vcview.py:850
 msgid "Clear"
 msgstr "Curăță"
 
+#~ msgid "_Update"
+#~ msgstr "_Actualizează"
+
+#~ msgid "Mar_k as Resolved"
+#~ msgstr "Marchea_ză ca rezolvat"
+
+#~ msgid "Update"
+#~ msgstr "Actualizează"
+
+#~ msgid "Update working copy from version control"
+#~ msgstr "Actualizează copia în lucru din mediul de control al versiunilor"
+
+#~ msgid "Push"
+#~ msgstr "Îm_pinge"
+
+#~ msgid "Add"
+#~ msgstr "Adaugă"
+
+#~ msgid "Remove"
+#~ msgstr "Elimină"
+
+#~ msgid "Mark as Resolved"
+#~ msgstr "Marchează ca rezolvat"
+
+#~ msgid "Revert"
+#~ msgstr "Revino"
+
+#~ msgid "Delete from working copy"
+#~ msgstr "Șterge din copia funcțională"
+
 #~ msgid "[%s] Scanning %s"
 #~ msgstr "[%s] Se analizează %s"
 
@@ -2516,9 +2570,6 @@ msgstr "Curăță"
 #~ msgid "Previous Conflict"
 #~ msgstr "Conflictul precedent"
 
-#~ msgid "Next Conflict"
-#~ msgstr "Următorul conflict"
-
 #~ msgid "Push to Left"
 #~ msgstr "Împinge la stânga"
 
@@ -2740,9 +2791,6 @@ msgstr "Curăță"
 #~ msgid "Current Locale ({})"
 #~ msgstr "Localizarea curentă ({})"
 
-#~ msgid "Only one version control system found in this folder"
-#~ msgstr "Doar un mediu de control al versiunilor găsit în acest dosar"
-
 #, fuzzy
 #~| msgid "Format as patch..."
 #~ msgid "Format as Patch..."
@@ -3122,9 +3170,6 @@ msgstr "Curăță"
 #~ msgid "_Browse..."
 #~ msgstr "_Navighează..."
 
-#~ msgid "Path"
-#~ msgstr "Cale"
-
 #~ msgid "Path to file"
 #~ msgstr "Calea către fișier"
 

From c07d835ed77a8cbc6149dc467da7c8233291ddc1 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 8 Jan 2022 11:51:38 +1000
Subject: [PATCH 014/116] Add git to flatpak build (#319)

This is taken from the existing Flathub packaging, and just copies
across the git binary that exists in the SDK runtime. Given that this
only affects the GNOME nightly flatpak builds, we're not looking to try
to support any of the less popular version control systems here.
---
 data/org.gnome.MeldDevel.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/data/org.gnome.MeldDevel.json b/data/org.gnome.MeldDevel.json
index 0f8a88d8..acfdd271 100644
--- a/data/org.gnome.MeldDevel.json
+++ b/data/org.gnome.MeldDevel.json
@@ -60,6 +60,13 @@
       "config-opts": [
         "-Dprofile=Devel"
       ]
+    },
+    {
+      "name": "git",
+      "buildsystem": "simple",
+      "build-commands": [
+        "cp /usr/bin/git ${FLATPAK_DEST}/bin"
+      ]
     }
   ]
 }

From a0cd955f3c0b2ba8e76f1cb58dfc26efe3ff297a Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 8 Jan 2022 11:54:13 +1000
Subject: [PATCH 015/116] dirdiff: Set the current folder for all file choosers
 (#475)

This change sets the current folder for each chooser to the currently
displayed folder for the corresponding pane. This should mean that if
the user wants to change folders in the comparison, the chooser should
start at where ever is currently being compared.
---
 meld/dirdiff.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 9837658d..971501d1 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -369,6 +369,9 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
     folder_label0 = Gtk.Template.Child()
     folder_label1 = Gtk.Template.Child()
     folder_label2 = Gtk.Template.Child()
+    folder_open_button0 = Gtk.Template.Child()
+    folder_open_button1 = Gtk.Template.Child()
+    folder_open_button2 = Gtk.Template.Child()
     treeview0 = Gtk.Template.Child()
     treeview1 = Gtk.Template.Child()
     treeview2 = Gtk.Template.Child()
@@ -502,7 +505,7 @@ def __init__(self, num_panes):
             [
                 "treeview", "folder_label", "scrolledwindow", "chunkmap",
                 "linkmap", "msgarea_mgr", "vbox", "dummy_toolbar_linkmap",
-                "pane_actionbar",
+                "pane_actionbar", "folder_open_button",
             ],
         )
 
@@ -752,6 +755,7 @@ def set_locations(self) -> None:
         for pane, folder in enumerate(self.folders):
             self.folder_label[pane].set_file(folder)
             self.folder_label[pane].set_parent_file(parent_path)
+            self.folder_open_button[pane].props.file = folder
 
         # This is difficult to trigger, and to test. Most of the time here we
         # will actually have had UTF-8 from GTK, which has been unicode-ed by

From 7c6cdc1c727ed225c8a9242b9f89ed4c7fe3958e Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 8 Jan 2022 13:04:15 +1000
Subject: [PATCH 016/116] meldbuffer: Remove incorrect trailing commas

---
 meld/meldbuffer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meld/meldbuffer.py b/meld/meldbuffer.py
index 55342f17..106a1dbd 100644
--- a/meld/meldbuffer.py
+++ b/meld/meldbuffer.py
@@ -238,8 +238,8 @@ def __init__(self, buf, textfilter=None, *, cache_debug: bool = False):
         buf.connect("delete-range", self.on_delete_range),
         buf.connect_after("insert-text", self.after_insert_text),
         if cache_debug:
-            buf.connect_after("insert-text", self._check_cache_invariant),
-            buf.connect_after("delete-range", self._check_cache_invariant),
+            buf.connect_after("insert-text", self._check_cache_invariant)
+            buf.connect_after("delete-range", self._check_cache_invariant)
 
     def _check_cache_invariant(self, *args: Any) -> None:
         if len(self.lines) != len(self):

From d8318de3124ba94477d2d7321cb8e1e074c31aa8 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 8 Jan 2022 13:05:04 +1000
Subject: [PATCH 017/116] filediff: Check output file override when calculating
 parent path

If we don't use the output file override, we'll try to change the parent
path from `/` (because the file that's loaded will be in `/tmp`) and
we'll hit a very reasonable error case in the path label display. This
change means that we'll instead use the path that we're going to save
our file to when doing parent calculations.
---
 meld/filediff.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meld/filediff.py b/meld/filediff.py
index 7850300a..38420618 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1443,7 +1443,9 @@ def recompute_label(self):
                 'document-save-symbolic' if buf.data.writable else
                 'document-save-as-symbolic')
 
-        parent_path = find_shared_parent_path([b.data.gfile for b in buffers])
+        parent_path = find_shared_parent_path(
+            [b.data.gfiletarget for b in buffers]
+        )
         for pathlabel in self.filelabel:
             pathlabel.props.parent_gfile = parent_path
 

From 603b13aba66f9b1e014b687bc73d5c14095f982d Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 8 Jan 2022 13:57:40 +1000
Subject: [PATCH 018/116] filediff: Set buffers as modified when using custom
 save path (#581)

This change is about improving conflict resolution, which is envisaged
as the primary use case for the `--output` flag. The point here is that
if when you use the "save this buffer to a different place than where
you loaded it from" functionality, it's reasonable to expect that the
buffer is going to need to be saved in order for the buffer contents to
end up on disk.

This will change some workflows slightly, in that if you open up a
conflict from Meld's version control view but make no changes, you'll
now be prompted to save the file... but this seems like an acceptable
trade-off.
---
 meld/filediff.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/meld/filediff.py b/meld/filediff.py
index 38420618..436fabf8 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1604,9 +1604,17 @@ def file_loaded(self, loader, result, user_data):
                 'dialog-warning-symbolic', primary, secondary, _("Open"),
                 functools.partial(open_files_external, gfiles=[gfile]))
 
+        # We checkpoint first, which will set modified state via the
+        # checkpointed callback. We then check whether we're saving the
+        # file to a different location than it was loaded from, in
+        # which case we assume that this needs to be saved to persist
+        # what the user is seeing. Finally, we update the writability,
+        # which does label calculation.
+        self.undosequence.checkpoint(buf)
+        if buf.data.savefile:
+            buf.set_modified(True)
         self.update_buffer_writable(buf)
 
-        self.undosequence.checkpoint(buf)
         buf.data.update_mtime()
         buf.data.loaded = True
 

From 0021f178c3e13faa3452a195c6aa67b075fb864c Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 9 Jan 2022 07:40:09 +1000
Subject: [PATCH 019/116] dirdiff: Minor refactor of treeview header visibility
 logic

---
 meld/dirdiff.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 971501d1..7cdefc89 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -627,16 +627,17 @@ def update_comparator(self, *args):
     def update_treeview_columns(self, settings, key):
         """Update the visibility and order of columns"""
         columns = settings.get_value(key)
+        have_extra_columns = any(visible for name, visible in columns)
+
         for i, treeview in enumerate(self.treeview):
-            extra_cols = False
             last_column = treeview.get_column(0)
             for column_name, visible in columns:
-                extra_cols = extra_cols or visible
                 current_column = self.columns_dict[i][column_name]
                 current_column.set_visible(visible)
                 treeview.move_column_after(current_column, last_column)
                 last_column = current_column
-            treeview.set_headers_visible(extra_cols)
+
+            treeview.set_headers_visible(have_extra_columns)
 
     def get_filter_visibility(self) -> Tuple[bool, bool, bool]:
         # TODO: Make text filters available in folder comparison

From 35a653d5ee567198047bf7a24cc3f07077a6e386 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 9 Jan 2022 07:40:58 +1000
Subject: [PATCH 020/116] dirdiff: Handle bad column settings

---
 meld/dirdiff.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 7cdefc89..30e01822 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -18,6 +18,7 @@
 import copy
 import errno
 import functools
+import logging
 import os
 import shutil
 import stat
@@ -51,6 +52,8 @@
 if typing.TYPE_CHECKING:
     from meld.ui.pathlabel import PathLabel
 
+log = logging.getLogger(__name__)
+
 
 class StatItem(namedtuple('StatItem', 'mode size time')):
     __slots__ = ()
@@ -632,7 +635,11 @@ def update_treeview_columns(self, settings, key):
         for i, treeview in enumerate(self.treeview):
             last_column = treeview.get_column(0)
             for column_name, visible in columns:
-                current_column = self.columns_dict[i][column_name]
+                try:
+                    current_column = self.columns_dict[i][column_name]
+                except KeyError:
+                    log.warning(f"Invalid column {column_name} in settings")
+                    continue
                 current_column.set_visible(visible)
                 treeview.move_column_after(current_column, last_column)
                 last_column = current_column

From 85d62c46e7b2b1dba82895afd214af95c78ae010 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 9 Jan 2022 07:49:49 +1000
Subject: [PATCH 021/116] dirdiff: Add an ISO-format version of our mtime
 column (#188)

---
 meld/dirdiff.py          | 25 ++++++++++++++++++++++++-
 meld/preferences.py      |  8 ++++++--
 meld/ui/cellrenderers.py | 15 ++++++++++++++-
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 30e01822..4bc7da25 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -45,6 +45,7 @@
     CellRendererByteSize,
     CellRendererDate,
     CellRendererFileMode,
+    CellRendererISODate,
 )
 from meld.ui.emblemcellrenderer import EmblemCellRenderer
 from meld.ui.util import map_widgets_into_lists
@@ -569,6 +570,14 @@ def __init__(self, num_panes):
             column.set_attributes(rentext, timestamp=col_index(COL_TIME, i))
             self.treeview[i].append_column(column)
             self.columns_dict[i]["modification time"] = column
+            # Create ISO-format date-time CellRenderer
+            column = Gtk.TreeViewColumn(_("Modification time (ISO)"))
+            column.set_resizable(True)
+            rentext = CellRendererISODate()
+            column.pack_start(rentext, True)
+            column.set_attributes(rentext, timestamp=col_index(COL_TIME, i))
+            self.treeview[i].append_column(column)
+            self.columns_dict[i]["iso-time"] = column
             # Create permissions CellRenderer
             column = Gtk.TreeViewColumn(_("Permissions"))
             column.set_resizable(True)
@@ -627,11 +636,22 @@ def update_comparator(self, *args):
             _files_same, comparison_args=comparison_args)
         self.refresh()
 
-    def update_treeview_columns(self, settings, key):
+    def update_treeview_columns(
+        self, settings: Gio.Settings, key: str,
+    ) -> None:
         """Update the visibility and order of columns"""
+
         columns = settings.get_value(key)
         have_extra_columns = any(visible for name, visible in columns)
 
+        # Check for columns missing from the settings, special-casing
+        # the always-present name column
+        configured_columns = [name for name, visible in columns] + ["name"]
+        missing_columns = [
+            c for c in self.columns_dict[0].keys()
+            if c not in configured_columns
+        ]
+
         for i, treeview in enumerate(self.treeview):
             last_column = treeview.get_column(0)
             for column_name, visible in columns:
@@ -644,6 +664,9 @@ def update_treeview_columns(self, settings, key):
                 treeview.move_column_after(current_column, last_column)
                 last_column = current_column
 
+            for column_name in missing_columns:
+                self.columns_dict[i][column_name].set_visible(False)
+
             treeview.set_headers_visible(have_extra_columns)
 
     def get_filter_visibility(self) -> Tuple[bool, bool, bool]:
diff --git a/meld/preferences.py b/meld/preferences.py
index 8139a65f..67e99ad2 100644
--- a/meld/preferences.py
+++ b/meld/preferences.py
@@ -131,6 +131,7 @@ class ColumnList(Gtk.VBox, EditableListWidget):
     available_columns = {
         "size": _("Size"),
         "modification time": _("Modification time"),
+        "iso-time": _("Modification time (ISO)"),
         "permissions": _("Permissions"),
     }
 
@@ -158,10 +159,13 @@ def __init__(self, **kwargs):
             column_order[column_name] = sort_key
 
         columns = [
-            (column_vis.get(name, True), name, label)
+            (column_vis.get(name, False), name, label)
             for name, label in self.available_columns.items()
         ]
-        columns = sorted(columns, key=lambda c: column_order.get(c[1], 0))
+        columns = sorted(
+            columns,
+            key=lambda c: column_order.get(c[1], len(self.available_columns)),
+        )
 
         for visibility, name, label in columns:
             self.model.append([visibility, name, label])
diff --git a/meld/ui/cellrenderers.py b/meld/ui/cellrenderers.py
index 24824894..488dd1ce 100644
--- a/meld/ui/cellrenderers.py
+++ b/meld/ui/cellrenderers.py
@@ -26,6 +26,9 @@ class CellRendererDate(Gtk.CellRendererText):
     MIN_TIMESTAMP = -2147483648
     DATETIME_FORMAT = "%a %d %b %Y %H:%M:%S"
 
+    def _format_datetime(self, dt: datetime.datetime) -> str:
+        return dt.strftime(self.DATETIME_FORMAT)
+
     def get_timestamp(self):
         return getattr(self, '_datetime', self.MIN_TIMESTAMP)
 
@@ -37,7 +40,7 @@ def set_timestamp(self, value):
         else:
             try:
                 mod_datetime = datetime.datetime.fromtimestamp(value)
-                time_str = mod_datetime.strftime(self.DATETIME_FORMAT)
+                time_str = self._format_datetime(mod_datetime)
             except Exception:
                 time_str = ''
         self.props.markup = time_str
@@ -51,6 +54,16 @@ def set_timestamp(self, value):
     )
 
 
+class CellRendererISODate(CellRendererDate):
+
+    __gtype_name__ = "CellRendererISODate"
+
+    def _format_datetime(self, dt: datetime.datetime) -> str:
+        # Limit our ISO display to seconds (i.e., no milli or
+        # microseconds) for usability
+        return dt.isoformat(timespec="seconds")
+
+
 class CellRendererByteSize(Gtk.CellRendererText):
 
     __gtype_name__ = "CellRendererByteSize"

From 4e617f5d8cbf6ddcee8447650641960e874d121e Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 9 Jan 2022 09:35:43 +1000
Subject: [PATCH 022/116] dirdiff: Identify in-progress scans on tree parent
 row (#620)

This is a supplement to our toolbar spinner, since the latter is not
that obvious and also indicates ongoing tasks anywhere in the
application, rather than just the current pane.

It would possibly be nicer to have this presented as a spinner cell
renderer, but since we're only using this for one row (currently) that
seems like huge overkill in terms of additional cell data and renderers
for large trees. In the future if we move to more granular progress on
a per-file basis, per-cell spinners might make more sense.
---
 meld/dirdiff.py | 32 +++++++++++++++++++++++++++++++-
 meld/tree.py    |  3 +++
 meld/vc/_vc.py  |  3 ++-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 4bc7da25..9bf7a11e 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -818,6 +818,28 @@ def get_comparison(self):
             uris = []
         return RecentType.Folder, uris
 
+    def mark_in_progress_row(self, it: Gtk.TreeIter) -> None:
+        """Mark a tree row as having a scan in progress
+
+        After the scan is finished, `_update_item_state()` must be
+        called on the row to restore its actual state.
+        """
+
+        for pane in range(self.model.ntree):
+            path = self.model.get_value(
+                it, self.model.column_index(tree.COL_PATH, pane))
+            filename = GLib.markup_escape_text(os.path.basename(path))
+            label = _(f"{filename} (scanning…)")
+
+            self.model.set_state(it, pane, tree.STATE_SPINNER, label, True)
+            self.model.unsafe_set(it, pane, {
+                COL_EMBLEM: None,
+                COL_EMBLEM_SECONDARY: None,
+                COL_TIME: MISSING_TIMESTAMP,
+                COL_SIZE: -1,
+                COL_PERMS: -1
+            })
+
     def recursively_update(self, path):
         """Recursively update from tree path 'path'.
         """
@@ -826,7 +848,11 @@ def recursively_update(self, path):
         while child:
             self.model.remove(child)
             child = self.model.iter_children(it)
-        self._update_item_state(it)
+        if self._scan_in_progress == 0:
+            # Starting a scan, so set up progress indicator
+            self.mark_in_progress_row(it)
+        else:
+            self._update_item_state(it)
         self._scan_in_progress += 1
         self.scheduler.add_task(self._search_recursively_iter(path))
 
@@ -1002,6 +1028,10 @@ def _search_recursively_iter(self, rootpath):
         yield _('[{label}] Done').format(label=self.label_text)
 
         self._scan_in_progress -= 1
+        if self._scan_in_progress == 0:
+            # Finishing a scan, so remove progress indicator
+            self._update_item_state(self.model.get_iter(rootpath))
+
         self.force_cursor_recalculate = True
         self.treeview[0].set_cursor(Gtk.TreePath.new_first())
 
diff --git a/meld/tree.py b/meld/tree.py
index b78a4eb7..af9eee75 100644
--- a/meld/tree.py
+++ b/meld/tree.py
@@ -41,6 +41,7 @@
     STATE_NONEXIST,
     STATE_NORMAL,
     STATE_REMOVED,
+    STATE_SPINNER,
 )
 
 _GIGtk = None
@@ -102,6 +103,7 @@ def _setup_default_styles(self, style=None):
             (del_fg, roman,  bold,   True),  # STATE_REMOVED
             (del_fg, roman,  bold,   True),  # STATE_MISSING
             (unk_fg, roman,  normal, True),  # STATE_NONEXIST
+            (None,   italic, normal, None),  # STATE_SPINNER
         ]
 
         self.icon_details = [
@@ -119,6 +121,7 @@ def _setup_default_styles(self, style=None):
             ("text-x-generic", "folder", del_fg, None),    # REMOVED
             ("text-x-generic", "folder", unk_fg, unk_fg),  # MISSING
             ("text-x-generic", "folder", unk_fg, unk_fg),  # NONEXIST
+            ("text-x-generic", "folder", None,   None),    # SPINNER
         ]
 
         assert len(self.icon_details) == len(self.text_attributes) == STATE_MAX
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 18b13777..08c904cf 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -42,7 +42,7 @@
 (STATE_IGNORED, STATE_NONE, STATE_NORMAL, STATE_NOCHANGE,
     STATE_ERROR, STATE_EMPTY, STATE_NEW,
     STATE_MODIFIED, STATE_RENAMED, STATE_CONFLICT, STATE_REMOVED,
-    STATE_MISSING, STATE_NONEXIST, STATE_MAX) = list(range(14))
+    STATE_MISSING, STATE_NONEXIST, STATE_SPINNER, STATE_MAX) = list(range(15))
 
 # VC conflict types
 (CONFLICT_MERGED, CONFLICT_BASE, CONFLICT_LOCAL,
@@ -79,6 +79,7 @@ class Entry:
         STATE_REMOVED: _("Removed"),
         STATE_MISSING: _("Missing"),
         STATE_NONEXIST: _("Not present"),
+        STATE_SPINNER: _("Scanning…"),
     }
 
     def __init__(self, path, name, state, isdir, options=None):

From 96c2f13e65c61ded21fba687ab3e417a213d92b4 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 9 Jan 2022 10:54:17 +1000
Subject: [PATCH 023/116] meldwindow: Handle missing files when adding new
 comparisons

Our individual comparison types generally have handling for `None`s in
their locations, and this can be useful in certain situations.
---
 meld/meldwindow.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index 6f77fded..49c04ee3 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -16,7 +16,7 @@
 
 import logging
 import os
-from typing import Optional, Sequence
+from typing import Any, Dict, Optional, Sequence
 
 from gi.repository import Gdk, Gio, GLib, Gtk
 
@@ -388,13 +388,21 @@ def append_filemerge(self, gfiles, merge_output=None):
             doc.set_merge_output_file(merge_output)
         return doc
 
-    def append_diff(self, gfiles, auto_compare=False, auto_merge=False,
-                    merge_output=None, meta=None):
+    def append_diff(
+        self,
+        gfiles: Sequence[Optional[Gio.File]],
+        auto_compare: bool = False,
+        auto_merge: bool = False,
+        merge_output: Optional[Gio.File] = None,
+        meta: Optional[Dict[str, Any]] = None,
+    ):
         have_directories = False
         have_files = False
         for f in gfiles:
-            if f.query_file_type(
-               Gio.FileQueryInfoFlags.NONE, None) == Gio.FileType.DIRECTORY:
+            if not f:
+                continue
+            file_type = f.query_file_type(Gio.FileQueryInfoFlags.NONE, None)
+            if file_type == Gio.FileType.DIRECTORY:
                 have_directories = True
             else:
                 have_files = True

From ab0de11dc5d754edb97d925d99c2a1d23ce352c4 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 9 Jan 2022 11:18:05 +1000
Subject: [PATCH 024/116] dirdiff: Make new/deleted file comparison open in
 two-pane mode (#492)

The issue being addressed here is that once the comparison has been
opened, there's no clear indication of whether it was the left or the
right pane that was missing from the folder comparison.

The down-side to making us always open in two-pane mode is that we lose
the screen real estate of the single-pane view, but the benefits in
consistency feel like they outweigh that consideration. If a user really
wants a full-size view of an added/removed file without the screen
split, the Open Externally action is already available.
---
 meld/dirdiff.py        |  9 +++++----
 meld/iohelpers.py      |  4 ++--
 test/test_iohelpers.py | 13 ++++++++++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 9bf7a11e..1a6b7f09 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -1376,10 +1376,11 @@ def on_treeview_row_activated(self, view, path, column):
         if not rows[pane]:
             return
         if os.path.isfile(rows[pane]):
-            self.create_diff_signal.emit(
-                [Gio.File.new_for_path(r) for r in rows if os.path.isfile(r)],
-                {}
-            )
+            diff_gfiles = [
+                Gio.File.new_for_path(r) if os.path.isfile(r) else None
+                for r in rows
+            ]
+            self.create_diff_signal.emit(diff_gfiles, {})
         elif os.path.isdir(rows[pane]):
             if view.row_expanded(path):
                 view.collapse_row(path)
diff --git a/meld/iohelpers.py b/meld/iohelpers.py
index 1a824128..a7882386 100644
--- a/meld/iohelpers.py
+++ b/meld/iohelpers.py
@@ -122,10 +122,10 @@ def prompt_save_filename(
 
 
 def find_shared_parent_path(
-    paths: Sequence[Gio.File],
+    paths: Sequence[Optional[Gio.File]],
 ) -> Optional[Gio.File]:
 
-    if not paths or not paths[0]:
+    if not paths or not paths[0] or any(path is None for path in paths):
         return None
 
     current_parent = paths[0].get_parent()
diff --git a/test/test_iohelpers.py b/test/test_iohelpers.py
index 2ab3981f..b4fe0f86 100644
--- a/test/test_iohelpers.py
+++ b/test/test_iohelpers.py
@@ -22,18 +22,25 @@
         (['/foo/a/', '/foo/b/asd/asd'], '/foo'),
         # Common parent is the root
         (['/foo/a/', '/bar/b/'], '/'),
+        # One path, one missing path
+        (['/foo/a', None], None),
+        # Two paths, one missing path
+        (['/foo/a', None, '/foo/c'], None),
     ],
 )
 def test_find_shared_parent_path(paths, expected_parent):
-    files = [Gio.File.new_for_path(p) for p in paths]
-    print([f.get_path() for f in files])
+    files = [Gio.File.new_for_path(p) if p else None for p in paths]
+    print([f.get_path() if f else repr(f) for f in files])
     parent = find_shared_parent_path(files)
 
     if parent is None:
         assert expected_parent is None
     else:
         print(f'Parent: {parent.get_path()}; expected {expected_parent}')
-        assert parent.equal(Gio.File.new_for_path(expected_parent))
+        if expected_parent is None:
+            assert parent is None
+        else:
+            assert parent.equal(Gio.File.new_for_path(expected_parent))
 
 
 @pytest.mark.parametrize(

From 2828235abde184a7ead826b0be0dadcf4e4cb456 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Sun, 9 Jan 2022 12:37:05 +0000
Subject: [PATCH 025/116] Update Ukrainian translation

---
 po/uk.po | 167 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 85 insertions(+), 82 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index 496837a7..91966aaa 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,13 +3,13 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Yuri Chornoivan <yurchor@ukr.net>, 2020, 2021.
+# Yuri Chornoivan <yurchor@ukr.net>, 2020, 2021, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-10-08 21:01+0000\n"
-"PO-Revision-Date: 2021-10-09 11:58+0300\n"
+"POT-Creation-Date: 2022-01-08 23:40+0000\n"
+"PO-Revision-Date: 2022-01-09 14:36+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\n"
@@ -1037,22 +1037,18 @@ msgstr "_Копіювати шляхи до файлів"
 
 #: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
 #: meld/resources/ui/dirdiff.ui:117
-#| msgid "Save file in this pane"
 msgid "Select folder to open in this pane"
 msgstr "Виберіть теку, яку слід відкрити на цій панелі"
 
 #: meld/resources/ui/dirdiff.ui:43
-#| msgid "Folder"
 msgid "Folder 1"
 msgstr "Тека 1"
 
 #: meld/resources/ui/dirdiff.ui:84
-#| msgid "Folder"
 msgid "Folder 2"
 msgstr "Тека 2"
 
 #: meld/resources/ui/dirdiff.ui:125
-#| msgid "Folder"
 msgid "Folder 3"
 msgstr "Тека 3"
 
@@ -1114,11 +1110,9 @@ msgstr "Вст_авити"
 
 #: meld/resources/ui/filediff-menus.ui:54
 msgid "Open Containing Folder"
-msgstr ""
-"Відкрити теку з даними"
+msgstr "Відкрити теку з даними"
 
 #: meld/resources/ui/filediff-menus.ui:58
-#| msgid "_Copy File Paths"
 msgid "Copy Full Path"
 msgstr "Копіювати шлях повністю"
 
@@ -1156,7 +1150,7 @@ msgstr "Файл 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:530
+#: meld/dirdiff.py:537
 msgid "Name"
 msgstr "Назва"
 
@@ -1196,7 +1190,7 @@ msgstr "Циклічний пошук"
 msgid "Replace _All"
 msgstr "Замінити _все"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1092 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1157 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "За_мінити"
 
@@ -1299,16 +1293,13 @@ msgstr "_Обернений напрямок латки"
 
 #: meld/resources/ui/path-label.ui:23
 msgid "Path"
-msgstr ""
-"Шлях"
+msgstr "Шлях"
 
 #: meld/resources/ui/path-label.ui:62
-#| msgid "_Copy File Paths"
 msgid "Copy Path"
 msgstr "Копіювати шлях"
 
 #: meld/resources/ui/path-label.ui:78
-#| msgid "Open File"
 msgid "Open Folder"
 msgstr "Відкрити теку"
 
@@ -1586,7 +1577,7 @@ msgstr "Якщо ви не збережете внесені зміни, їх б
 msgid "Close _without Saving"
 msgstr "Закрити _без збереження"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1091
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1156
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Скасувати"
@@ -1620,7 +1611,6 @@ msgid "Delete"
 msgstr "Вилучити"
 
 #: meld/resources/ui/vcview-menus.ui:37
-#| msgid "Conflict"
 msgid "Resolve Conflict"
 msgstr "Усунути конфлікт"
 
@@ -1633,7 +1623,6 @@ msgid "Commit…"
 msgstr "Внести…"
 
 #: meld/resources/ui/vcview.ui:38
-#| msgid "Push current change to the left"
 msgid "Pull remote changes to the local repository"
 msgstr "Отримати зміни з віддаленого до локального сховища"
 
@@ -1658,10 +1647,8 @@ msgid "Mark as resolved in version control"
 msgstr "Позначити як розв'язаний у системі керування версіями"
 
 #: meld/resources/ui/vcview.ui:140
-#| msgid "No valid version control system found in this folder"
 msgid "Open version controlled folder in this pane"
-msgstr ""
-"Відкрити на цій панелі теку у системі із керуванням версіями"
+msgstr "Відкрити на цій панелі теку у системі із керуванням версіями"
 
 #: meld/resources/ui/vcview.ui:229
 msgid "Location"
@@ -1700,43 +1687,55 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:551 meld/preferences.py:132
+#: meld/dirdiff.py:558 meld/preferences.py:132
 msgid "Size"
 msgstr "Розмір"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:559 meld/preferences.py:133
+#: meld/dirdiff.py:566 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Час внесення змін"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:574 meld/preferences.py:134
+#| msgid "Modification time"
+msgid "Modification time (ISO)"
+msgstr "Час внесення змін (ISO)"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:567 meld/preferences.py:134
+#: meld/dirdiff.py:582 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Права доступу"
 
-#: meld/dirdiff.py:803 meld/dirdiff.py:827
+#: meld/dirdiff.py:832
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr ""
+"{filename} (сканування…)"
+
+#: meld/dirdiff.py:864 meld/dirdiff.py:888
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Скануємо {folder}"
 
-#: meld/dirdiff.py:967
+#: meld/dirdiff.py:1028
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Виконано"
 
-#: meld/dirdiff.py:976
+#: meld/dirdiff.py:1041
 msgid "Folder {} is being compared to itself"
 msgstr "Виконуємо порівняння теки {} із самою собою"
 
-#: meld/dirdiff.py:982
+#: meld/dirdiff.py:1047
 msgid "Folders have no differences"
 msgstr "Між теками немає відмінностей"
 
-#: meld/dirdiff.py:984
+#: meld/dirdiff.py:1049
 msgid "Contents of scanned files in folders are identical."
 msgstr "Вміст сканованих файлів у теках є тотожним."
 
-#: meld/dirdiff.py:986
+#: meld/dirdiff.py:1051
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1744,45 +1743,45 @@ msgstr ""
 "Здається, скановані файли у теках є тотожними, але програма не перевіряла "
 "їхній вміст."
 
-#: meld/dirdiff.py:989
+#: meld/dirdiff.py:1054
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Використано фільтри файлів, тому сканування виконувалося не для усіх файлів."
 
-#: meld/dirdiff.py:991
+#: meld/dirdiff.py:1056
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Використано текстові фільтри, що могли замаскувати відмінності у вмісті "
 "файлів."
 
-#: meld/dirdiff.py:1007 meld/filediff.py:1907
+#: meld/dirdiff.py:1072 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Приховати"
 
-#: meld/dirdiff.py:1009 meld/filediff.py:1909 meld/filediff.py:1939
-#: meld/filediff.py:1941 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1074 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Сховати"
 
-#: meld/dirdiff.py:1018
+#: meld/dirdiff.py:1083
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Під час сканування цієї теки було виявлено декілька помилок"
 
-#: meld/dirdiff.py:1019
+#: meld/dirdiff.py:1084
 msgid "Files with invalid encodings found"
 msgstr "Знайдено файли із некоректним кодуванням"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1021
+#: meld/dirdiff.py:1086
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Кодування деяких файлів є помилковим. Назви десь такі:"
 
-#: meld/dirdiff.py:1023
+#: meld/dirdiff.py:1088
 msgid "Files hidden by case insensitive comparison"
 msgstr "Файли приховано нечутливим до регістру порівнянням"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1025
+#: meld/dirdiff.py:1090
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1790,17 +1789,17 @@ msgstr ""
 "Ви виконуєте нечутливе до регістру порівняння в чутливій до регістру "
 "файловій системі. Вказані нижче рядки у цій теці приховано:"
 
-#: meld/dirdiff.py:1036
+#: meld/dirdiff.py:1101
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "«{first_file}» приховано «{second_file}»"
 
-#: meld/dirdiff.py:1095
+#: meld/dirdiff.py:1160
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Замінити теку «%s»?"
 
-#: meld/dirdiff.py:1097
+#: meld/dirdiff.py:1162
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1809,11 +1808,11 @@ msgstr ""
 "У «%s» вже існує інша тека з такою ж назвою.\n"
 "Якщо ви замістите наявну теку, усі файли у ній буде втрачено."
 
-#: meld/dirdiff.py:1110
+#: meld/dirdiff.py:1175
 msgid "Error copying file"
 msgstr "Помилка під час копіювання файла"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1176
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1826,11 +1825,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1136 meld/vcview.py:764
+#: meld/dirdiff.py:1201 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Помилка під час спроби вилучити {}"
 
-#: meld/dirdiff.py:1626
+#: meld/dirdiff.py:1691
 msgid "No folder"
 msgstr "Немає теки"
 
@@ -1864,56 +1863,56 @@ msgstr "Скасувати"
 msgid "Mark _Resolved"
 msgstr "Позначити як _розв'язаний"
 
-#: meld/filediff.py:1589
+#: meld/filediff.py:1591
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Помилка відкриття файла «%s»."
 
-#: meld/filediff.py:1598
+#: meld/filediff.py:1600
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Здається, файл %s є файлом двійкових даних."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1602
 msgid "Do you want to open the file using the default application?"
 msgstr "Хочете відкрити файл за допомогою типової програми?"
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1604
 msgid "Open"
 msgstr "Відкрити"
 
-#: meld/filediff.py:1616
+#: meld/filediff.py:1626
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Об'єднання файлів"
 
-#: meld/filediff.py:1630
+#: meld/filediff.py:1640
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Обчислення відмінностей"
 
-#: meld/filediff.py:1690
+#: meld/filediff.py:1700
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "До файла %s було внесено зміни на диску"
 
-#: meld/filediff.py:1691
+#: meld/filediff.py:1701
 msgid "Do you want to reload the file?"
 msgstr "Хочете перезавантажити файл?"
 
-#: meld/filediff.py:1693
+#: meld/filediff.py:1703
 msgid "_Reload"
 msgstr "Перезаванта_жити"
 
-#: meld/filediff.py:1863
+#: meld/filediff.py:1873
 msgid "File {} is being compared to itself"
 msgstr "Виконуємо порівняння файла {} із самим собою"
 
-#: meld/filediff.py:1872
+#: meld/filediff.py:1882
 msgid "Files are identical"
 msgstr "Файли є однаковими"
 
-#: meld/filediff.py:1885
+#: meld/filediff.py:1895
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1921,11 +1920,11 @@ msgstr ""
 "Використано текстові фільтри, які могли замаскувати відмінності між файлами. "
 "Хочете виконати порівняння файлів без фільтрування?"
 
-#: meld/filediff.py:1890
+#: meld/filediff.py:1900
 msgid "Files differ in line endings only"
 msgstr "Файли відрізняються лише символами завершення рядків"
 
-#: meld/filediff.py:1892
+#: meld/filediff.py:1902
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1934,15 +1933,15 @@ msgstr ""
 "Файли є однаковими, окрім різних символів завершення рядків:\n"
 "%s"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1922
 msgid "Show without filters"
 msgstr "Показати без фільтрів"
 
-#: meld/filediff.py:1934
+#: meld/filediff.py:1944
 msgid "Change highlighting incomplete"
 msgstr "Неповна зміна підсвічування"
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1945
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1951,19 +1950,19 @@ msgstr ""
 "наказати Meld підсвітити більші зміни, але вам доведеться почекати, доки "
 "програма виконає ваш наказ."
 
-#: meld/filediff.py:1943
+#: meld/filediff.py:1953
 msgid "Keep highlighting"
 msgstr "Зберігати підсвічування"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1955
 msgid "_Keep highlighting"
 msgstr "З_берігати підсвічування"
 
-#: meld/filediff.py:1958
+#: meld/filediff.py:1968
 msgid "Saving failed"
 msgstr "Не вдалося зберегти"
 
-#: meld/filediff.py:1959
+#: meld/filediff.py:1969
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1971,37 +1970,37 @@ msgstr ""
 "Вам варто скопіювати критичні зміни до вікна іншої програми або файла, щоб "
 "уникнути втрати даних."
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:1978
 msgid "Save Left Pane As"
 msgstr "Зберегти ліву панель як"
 
-#: meld/filediff.py:1970
+#: meld/filediff.py:1980
 msgid "Save Middle Pane As"
 msgstr "Зберегти середню панель як"
 
-#: meld/filediff.py:1972
+#: meld/filediff.py:1982
 msgid "Save Right Pane As"
 msgstr "Зберегти праву панель як"
 
-#: meld/filediff.py:1983
+#: meld/filediff.py:1993
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "З часу відкриття до файла %s було внесено зміни на диску"
 
-#: meld/filediff.py:1985
+#: meld/filediff.py:1995
 msgid "If you save it, any external changes will be lost."
 msgstr ""
 "Якщо ви збережете файл, внесені сторонніми програмами зміни буде втрачено."
 
-#: meld/filediff.py:1988
+#: meld/filediff.py:1998
 msgid "Save Anyway"
 msgstr "Зберегти попри це"
 
-#: meld/filediff.py:1989
+#: meld/filediff.py:1999
 msgid "Don’t Save"
 msgstr "Не зберігати"
 
-#: meld/filediff.py:2031
+#: meld/filediff.py:2041
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2009,7 +2008,7 @@ msgstr ""
 "У файлі «{}» містяться символи, які не входять до його поточного кодування "
 "«{}»."
 
-#: meld/filediff.py:2035 meld/patchdialog.py:138
+#: meld/filediff.py:2045 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2018,16 +2017,16 @@ msgstr ""
 "Не вдалося зберегти файл. Причина:\n"
 "%s"
 
-#: meld/filediff.py:2039 meld/patchdialog.py:137
+#: meld/filediff.py:2049 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Не вдалося зберегти файл %s."
 
-#: meld/filediff.py:2440
+#: meld/filediff.py:2450
 msgid "Live comparison updating disabled"
 msgstr "Інтерактивне оновлення порівняння вимкнено"
 
-#: meld/filediff.py:2441
+#: meld/filediff.py:2451
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2232,7 +2231,6 @@ msgid "Plain Text"
 msgstr "Звичайний текст"
 
 #: meld/ui/pathlabel.py:36
-#| msgid "Filename filters"
 msgid "Unnamed file"
 msgstr "Файл без назви"
 
@@ -2344,6 +2342,11 @@ msgstr "Не вистачає"
 msgid "Not present"
 msgstr "Немає"
 
+#: meld/vc/_vc.py:82
+#| msgid "Scanning %s"
+msgid "Scanning…"
+msgstr "Сканування…"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
 #: meld/vcview.py:334

From 519beb3aa3289aaf29c5975beea60e741c03f457 Mon Sep 17 00:00:00 2001
From: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date: Sun, 9 Jan 2022 12:53:41 +0000
Subject: [PATCH 026/116] Update Swedish translation

---
 po/sv.po | 146 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 80 insertions(+), 66 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index 1b1b0a9e..4940dd52 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,9 +1,9 @@
 # Swedish messages for meld.
-# Copyright © 2005-2021 Free Software Foundation, Inc.
+# Copyright © 2005-2022 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2005.
 # Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2011.
 # Sebastian Rasmussen <sebras@gmail.com>, 2015.
-# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2016, 2018, 2019, 2020, 2021.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2016, 2018, 2019, 2020, 2021, 2022.
 # Josef Andersson <l10nl18nsweja@gmail.com>, 2014, 2015, 2016, 2017.
 # Luna Jernberg <droidbittin@gmail.com>, 2021.
 #
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-10-08 22:28+0000\n"
-"PO-Revision-Date: 2021-12-26 12:41+0100\n"
+"POT-Creation-Date: 2022-01-08 23:40+0000\n"
+"PO-Revision-Date: 2022-01-09 02:03+0100\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -1138,7 +1138,7 @@ msgstr "Fil ett"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:530
+#: meld/dirdiff.py:537
 msgid "Name"
 msgstr "Namn"
 
@@ -1178,7 +1178,7 @@ msgstr "Radbruten"
 msgid "Replace _All"
 msgstr "Ersätt _alla"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1092 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1157 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "_Ersätt"
 
@@ -1564,7 +1564,7 @@ msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid."
 msgid "Close _without Saving"
 msgstr "Stäng _utan att spara"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1091
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1156
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Avbryt"
@@ -1674,85 +1674,95 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:551 meld/preferences.py:132
+#: meld/dirdiff.py:558 meld/preferences.py:132
 msgid "Size"
 msgstr "Storlek"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:559 meld/preferences.py:133
+#: meld/dirdiff.py:566 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Ändringstid"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:574 meld/preferences.py:134
+msgid "Modification time (ISO)"
+msgstr "Ändringstid (ISO)"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:567 meld/preferences.py:134
+#: meld/dirdiff.py:582 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Rättigheter"
 
-#: meld/dirdiff.py:803 meld/dirdiff.py:827
+#: meld/dirdiff.py:832
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (söker igenom…)"
+
+#: meld/dirdiff.py:864 meld/dirdiff.py:888
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Söker igenom {folder}"
 
-#: meld/dirdiff.py:967
+#: meld/dirdiff.py:1028
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Klar"
 
-#: meld/dirdiff.py:976
+#: meld/dirdiff.py:1041
 msgid "Folder {} is being compared to itself"
 msgstr "Mappen {} jämförs med sig själv"
 
-#: meld/dirdiff.py:982
+#: meld/dirdiff.py:1047
 msgid "Folders have no differences"
 msgstr "Mapparna skiljer sig inte åt"
 
-#: meld/dirdiff.py:984
+#: meld/dirdiff.py:1049
 msgid "Contents of scanned files in folders are identical."
 msgstr "Innehållet i mapparnas avsökta filer är identiskt."
 
-#: meld/dirdiff.py:986
+#: meld/dirdiff.py:1051
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 "Mapparnas avsökta filer verkar identiska, men innehållet har inte genomsökts."
 
-#: meld/dirdiff.py:989
+#: meld/dirdiff.py:1054
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Filfilter används, och därför har inte alla filer genomsökts."
 
-#: meld/dirdiff.py:991
+#: meld/dirdiff.py:1056
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Textfilter används och kan dölja skillnader i innehåll."
 
-#: meld/dirdiff.py:1007 meld/filediff.py:1907
+#: meld/dirdiff.py:1072 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Dölj"
 
-#: meld/dirdiff.py:1009 meld/filediff.py:1909 meld/filediff.py:1939
-#: meld/filediff.py:1941 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1074 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Dölj"
 
-#: meld/dirdiff.py:1018
+#: meld/dirdiff.py:1083
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Flera fel inträffade vid avsökning av denna mapp"
 
-#: meld/dirdiff.py:1019
+#: meld/dirdiff.py:1084
 msgid "Files with invalid encodings found"
 msgstr "Filer med ogiltiga teckenkodningar hittades"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1021
+#: meld/dirdiff.py:1086
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "En del filer hade en felaktig kodning. Namnen är ungefär:"
 
-#: meld/dirdiff.py:1023
+#: meld/dirdiff.py:1088
 msgid "Files hidden by case insensitive comparison"
 msgstr "Filer dolda av skiftlägeskänslig jämförelse"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1025
+#: meld/dirdiff.py:1090
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1760,17 +1770,17 @@ msgstr ""
 "Du gör en skiftlägesokänslig jämförelse på ett skiftlägeskänsligt filsystem. "
 "En del filer syns inte:"
 
-#: meld/dirdiff.py:1036
+#: meld/dirdiff.py:1101
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "”{first_file}” dold av ”{second_file}”"
 
-#: meld/dirdiff.py:1095
+#: meld/dirdiff.py:1160
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ersätt mappen ”%s”?"
 
-#: meld/dirdiff.py:1097
+#: meld/dirdiff.py:1162
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1779,11 +1789,11 @@ msgstr ""
 "En annan mapp med samma namn existerar redan i ”%s”.\n"
 "Om du ersätter befintlig mapp kommer alla filer att förloras."
 
-#: meld/dirdiff.py:1110
+#: meld/dirdiff.py:1175
 msgid "Error copying file"
 msgstr "Fel vid filkopiering"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1176
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1796,11 +1806,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1136 meld/vcview.py:764
+#: meld/dirdiff.py:1201 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Fel vid borttagning av {}"
 
-#: meld/dirdiff.py:1626
+#: meld/dirdiff.py:1691
 msgid "No folder"
 msgstr "Ingen mapp"
 
@@ -1833,56 +1843,56 @@ msgstr "Avbryt"
 msgid "Mark _Resolved"
 msgstr "Markera som _löst"
 
-#: meld/filediff.py:1589
+#: meld/filediff.py:1591
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”."
 
-#: meld/filediff.py:1598
+#: meld/filediff.py:1600
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Filen %s verkar vara en binärfil."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1602
 msgid "Do you want to open the file using the default application?"
 msgstr "Vill du öppna filen med standardprogrammet?"
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1604
 msgid "Open"
 msgstr "Öppna"
 
-#: meld/filediff.py:1616
+#: meld/filediff.py:1626
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Sammanfogar filer"
 
-#: meld/filediff.py:1630
+#: meld/filediff.py:1640
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Beräknar skillnader"
 
-#: meld/filediff.py:1690
+#: meld/filediff.py:1700
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Filen %s har ändrats på disk"
 
-#: meld/filediff.py:1691
+#: meld/filediff.py:1701
 msgid "Do you want to reload the file?"
 msgstr "Vill du läsa om filen?"
 
-#: meld/filediff.py:1693
+#: meld/filediff.py:1703
 msgid "_Reload"
 msgstr "_Läs om"
 
-#: meld/filediff.py:1863
+#: meld/filediff.py:1873
 msgid "File {} is being compared to itself"
 msgstr "Filen {} jämförs med sig själv"
 
-#: meld/filediff.py:1872
+#: meld/filediff.py:1882
 msgid "Files are identical"
 msgstr "Filerna är identiska"
 
-#: meld/filediff.py:1885
+#: meld/filediff.py:1895
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1890,11 +1900,11 @@ msgstr ""
 "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
 "ofiltrerade filerna?"
 
-#: meld/filediff.py:1890
+#: meld/filediff.py:1900
 msgid "Files differ in line endings only"
 msgstr "Filer skiljer sig endast vad gäller radslut"
 
-#: meld/filediff.py:1892
+#: meld/filediff.py:1902
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1903,15 +1913,15 @@ msgstr ""
 "Filerna är identiska förutom radavsluten:\n"
 "%s"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1922
 msgid "Show without filters"
 msgstr "Visa utan filer"
 
-#: meld/filediff.py:1934
+#: meld/filediff.py:1944
 msgid "Change highlighting incomplete"
 msgstr "Ändra markering av ofärdiga"
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1945
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1920,19 +1930,19 @@ msgstr ""
 "Meld till att längre tid på sig att markera större ändringar, men det kan "
 "bli långsamt."
 
-#: meld/filediff.py:1943
+#: meld/filediff.py:1953
 msgid "Keep highlighting"
 msgstr "Använd markering"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1955
 msgid "_Keep highlighting"
 msgstr "_Använd markering"
 
-#: meld/filediff.py:1958
+#: meld/filediff.py:1968
 msgid "Saving failed"
 msgstr "Misslyckades med att spara"
 
-#: meld/filediff.py:1959
+#: meld/filediff.py:1969
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1940,36 +1950,36 @@ msgstr ""
 "Överväg att kopiera kritiska ändringar till ett annat program eller en annan "
 "fil för att undvika förlust av data."
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:1978
 msgid "Save Left Pane As"
 msgstr "Spara vänsterpanel som"
 
-#: meld/filediff.py:1970
+#: meld/filediff.py:1980
 msgid "Save Middle Pane As"
 msgstr "Spara mittenpanel som"
 
-#: meld/filediff.py:1972
+#: meld/filediff.py:1982
 msgid "Save Right Pane As"
 msgstr "Spara högerpanel som"
 
-#: meld/filediff.py:1983
+#: meld/filediff.py:1993
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Filen %s har ändrats på disk sedan den öppnades"
 
-#: meld/filediff.py:1985
+#: meld/filediff.py:1995
 msgid "If you save it, any external changes will be lost."
 msgstr "Om du sparar den kommer alla externa ändringar att gå förlorade."
 
-#: meld/filediff.py:1988
+#: meld/filediff.py:1998
 msgid "Save Anyway"
 msgstr "Spara ändå"
 
-#: meld/filediff.py:1989
+#: meld/filediff.py:1999
 msgid "Don’t Save"
 msgstr "Spara inte"
 
-#: meld/filediff.py:2031
+#: meld/filediff.py:2041
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1977,7 +1987,7 @@ msgstr ""
 "Filen ”{}” innehåller tecken som inte kan kodas med dess aktuella kodning "
 "”{}”."
 
-#: meld/filediff.py:2035 meld/patchdialog.py:138
+#: meld/filediff.py:2045 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1986,16 +1996,16 @@ msgstr ""
 "Kunde in spara fil beroende på:\n"
 "%s"
 
-#: meld/filediff.py:2039 meld/patchdialog.py:137
+#: meld/filediff.py:2049 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Kunde inte spara filen %s."
 
-#: meld/filediff.py:2440
+#: meld/filediff.py:2450
 msgid "Live comparison updating disabled"
 msgstr "Inaktivera realtidsuppdateringar av jämförelser"
 
-#: meld/filediff.py:2441
+#: meld/filediff.py:2451
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2308,6 +2318,10 @@ msgstr "Saknas"
 msgid "Not present"
 msgstr "Inte närvarande"
 
+#: meld/vc/_vc.py:82
+msgid "Scanning…"
+msgstr "Söker igenom…"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
 #: meld/vcview.py:334

From 7d285ecc7861ace8a3d75c3efc1c17e7a203c111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Sun, 9 Jan 2022 14:59:11 +0100
Subject: [PATCH 027/116] Update Polish translation

---
 po/pl.po | 152 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 83 insertions(+), 69 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 904ea897..59d256d9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,16 +1,16 @@
 # Polish translation for meld.
-# Copyright © 2011-2021 the meld authors.
+# Copyright © 2011-2022 the meld authors.
 # This file is distributed under the same license as the meld package.
 # Marcin Floryan <mfloryan@mm.waw.pl>, 2011.
-# Piotr Drąg <piotrdrag@gmail.com>, 2011-2021.
-# Aviary.pl <community-poland@mozilla.org>, 2011-2021.
+# Piotr Drąg <piotrdrag@gmail.com>, 2011-2022.
+# Aviary.pl <community-poland@mozilla.org>, 2011-2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-10-08 21:01+0000\n"
-"PO-Revision-Date: 2021-10-10 12:33+0200\n"
+"POT-Creation-Date: 2022-01-08 23:40+0000\n"
+"PO-Revision-Date: 2022-01-09 14:58+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -903,8 +903,8 @@ msgstr ""
 msgid "translator-credits"
 msgstr ""
 "Marcin Floryan <mfloryan@mm.waw.pl>, 2011\n"
-"Piotr Drąg <piotrdrag@gmail.com>, 2011-2021\n"
-"Aviary.pl <community-poland@mozilla.org>, 2011-2021"
+"Piotr Drąg <piotrdrag@gmail.com>, 2011-2022\n"
+"Aviary.pl <community-poland@mozilla.org>, 2011-2022"
 
 #: meld/resources/ui/appwindow.ui:30
 msgid "Start a new comparison"
@@ -1149,7 +1149,7 @@ msgstr "1. plik"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:530
+#: meld/dirdiff.py:537
 msgid "Name"
 msgstr "Nazwa"
 
@@ -1189,7 +1189,7 @@ msgstr "Automatyczny powrót do początku"
 msgid "Replace _All"
 msgstr "Zamień _wszystkie"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1092 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1157 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "Z_amień"
 
@@ -1577,7 +1577,7 @@ msgstr ""
 msgid "Close _without Saving"
 msgstr "Zamknij _bez zapisywania"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1091
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1156
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Anuluj"
@@ -1687,43 +1687,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:551 meld/preferences.py:132
+#: meld/dirdiff.py:558 meld/preferences.py:132
 msgid "Size"
 msgstr "Rozmiar"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:559 meld/preferences.py:133
+#: meld/dirdiff.py:566 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Czas modyfikacji"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:574 meld/preferences.py:134
+msgid "Modification time (ISO)"
+msgstr "Czas modyfikacji (ISO)"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:567 meld/preferences.py:134
+#: meld/dirdiff.py:582 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: meld/dirdiff.py:803 meld/dirdiff.py:827
+#: meld/dirdiff.py:832
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (skanowanie…)"
+
+#: meld/dirdiff.py:864 meld/dirdiff.py:888
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Skanowanie {folder}"
 
-#: meld/dirdiff.py:967
+#: meld/dirdiff.py:1028
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Ukończono"
 
-#: meld/dirdiff.py:976
+#: meld/dirdiff.py:1041
 msgid "Folder {} is being compared to itself"
 msgstr "Katalog {} jest porównywany z samym sobą"
 
-#: meld/dirdiff.py:982
+#: meld/dirdiff.py:1047
 msgid "Folders have no differences"
 msgstr "Katalogi się nie różnią"
 
-#: meld/dirdiff.py:984
+#: meld/dirdiff.py:1049
 msgid "Contents of scanned files in folders are identical."
 msgstr "Treść zeskanowanych plików w katalogach jest identyczna."
 
-#: meld/dirdiff.py:986
+#: meld/dirdiff.py:1051
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1731,44 +1741,44 @@ msgstr ""
 "Zeskanowane pliki wydają się identyczne, ale treść mogła nie zostać "
 "zeskanowana."
 
-#: meld/dirdiff.py:989
+#: meld/dirdiff.py:1054
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Filtry plików są używane, więc nie wszystkie pliki zostały zeskanowane."
 
-#: meld/dirdiff.py:991
+#: meld/dirdiff.py:1056
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Filtry tekstowe są używane i mogą ukrywać różnice między plikami."
 
-#: meld/dirdiff.py:1007 meld/filediff.py:1907
+#: meld/dirdiff.py:1072 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Ukryj"
 
-#: meld/dirdiff.py:1009 meld/filediff.py:1909 meld/filediff.py:1939
-#: meld/filediff.py:1941 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1074 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Ukryj"
 
-#: meld/dirdiff.py:1018
+#: meld/dirdiff.py:1083
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Wystąpiło wiele błędów podczas skanowania tego katalogu"
 
-#: meld/dirdiff.py:1019
+#: meld/dirdiff.py:1084
 msgid "Files with invalid encodings found"
 msgstr "Odnaleziono pliki z nieprawidłowym kodowaniem znaków"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1021
+#: meld/dirdiff.py:1086
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Niektóre pliki mają nieprawidłowe kodowanie znaków. Nazwy tych plików to:"
 
-#: meld/dirdiff.py:1023
+#: meld/dirdiff.py:1088
 msgid "Files hidden by case insensitive comparison"
 msgstr "Pliku ukryte przez porównywanie bez uwzględniania wielkości liter"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1025
+#: meld/dirdiff.py:1090
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1777,17 +1787,17 @@ msgstr ""
 "w systemie plików, który rozróżnia wielkość liter. Następujące pliki w tym "
 "katalogu zostały ukryte:"
 
-#: meld/dirdiff.py:1036
+#: meld/dirdiff.py:1101
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "„{first_file}” ukryty przez „{second_file}”"
 
-#: meld/dirdiff.py:1095
+#: meld/dirdiff.py:1160
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Zastąpić katalog „%s”?"
 
-#: meld/dirdiff.py:1097
+#: meld/dirdiff.py:1162
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1797,11 +1807,11 @@ msgstr ""
 "Zastąpienie istniejącego katalogu spowoduje utratę wszystkich plików w nim "
 "zawartych."
 
-#: meld/dirdiff.py:1110
+#: meld/dirdiff.py:1175
 msgid "Error copying file"
 msgstr "Błąd podczas kopiowania pliku"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1176
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1814,11 +1824,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1136 meld/vcview.py:764
+#: meld/dirdiff.py:1201 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Błąd podczas usuwania {}"
 
-#: meld/dirdiff.py:1626
+#: meld/dirdiff.py:1691
 msgid "No folder"
 msgstr "Brak katalogu"
 
@@ -1853,56 +1863,56 @@ msgstr "Anuluj"
 msgid "Mark _Resolved"
 msgstr "Oznacz jako _rozwiązane"
 
-#: meld/filediff.py:1589
+#: meld/filediff.py:1591
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Wystąpił problem podczas otwierania pliku „%s”."
 
-#: meld/filediff.py:1598
+#: meld/filediff.py:1600
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Plik %s wygląda na plik binarny."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1602
 msgid "Do you want to open the file using the default application?"
 msgstr "Otworzyć go w domyślnym programie?"
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1604
 msgid "Open"
 msgstr "Otwórz"
 
-#: meld/filediff.py:1616
+#: meld/filediff.py:1626
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Scalanie plików"
 
-#: meld/filediff.py:1630
+#: meld/filediff.py:1640
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Analizowanie różnic"
 
-#: meld/filediff.py:1690
+#: meld/filediff.py:1700
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Plik %s został zmieniony na dysku"
 
-#: meld/filediff.py:1691
+#: meld/filediff.py:1701
 msgid "Do you want to reload the file?"
 msgstr "Ponownie wczytać plik?"
 
-#: meld/filediff.py:1693
+#: meld/filediff.py:1703
 msgid "_Reload"
 msgstr "_Wczytaj ponownie"
 
-#: meld/filediff.py:1863
+#: meld/filediff.py:1873
 msgid "File {} is being compared to itself"
 msgstr "Plik {} jest porównywany z samym sobą"
 
-#: meld/filediff.py:1872
+#: meld/filediff.py:1882
 msgid "Files are identical"
 msgstr "Pliki są identyczne"
 
-#: meld/filediff.py:1885
+#: meld/filediff.py:1895
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1910,11 +1920,11 @@ msgstr ""
 "Filtry tekstowe są używane i mogą ukrywać różnice między plikami. Porównać "
 "pliki bez uwzględniania filtrów?"
 
-#: meld/filediff.py:1890
+#: meld/filediff.py:1900
 msgid "Files differ in line endings only"
 msgstr "Pliki różnią się tylko znacznikami końca wierszy"
 
-#: meld/filediff.py:1892
+#: meld/filediff.py:1902
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1923,15 +1933,15 @@ msgstr ""
 "Pliki są identyczne, z wyjątkiem różnych znaczników końca wierszy:\n"
 "%s"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1922
 msgid "Show without filters"
 msgstr "Wyświetl bez filtrów"
 
-#: meld/filediff.py:1934
+#: meld/filediff.py:1944
 msgid "Change highlighting incomplete"
 msgstr "Wyróżnianie zmian jest niepełne"
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1945
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1939,19 +1949,19 @@ msgstr ""
 "Niektóre zmiany nie zostały wyróżnione, ponieważ były za duże. Można "
 "wymusić, aby program Meld wyróżnił większe zmiany, ale może to być wolne."
 
-#: meld/filediff.py:1943
+#: meld/filediff.py:1953
 msgid "Keep highlighting"
 msgstr "Wyróżniaj dalej"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1955
 msgid "_Keep highlighting"
 msgstr "_Wyróżniaj dalej"
 
-#: meld/filediff.py:1958
+#: meld/filediff.py:1968
 msgid "Saving failed"
 msgstr "Zapisanie się nie powiodło"
 
-#: meld/filediff.py:1959
+#: meld/filediff.py:1969
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1959,38 +1969,38 @@ msgstr ""
 "Proszę rozważyć skopiowanie wszelkich ważnych zmian w innym programie lub "
 "pliku, aby uniknąć utraty danych."
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:1978
 msgid "Save Left Pane As"
 msgstr "Zapis lewego panelu jako"
 
-#: meld/filediff.py:1970
+#: meld/filediff.py:1980
 msgid "Save Middle Pane As"
 msgstr "Zapis środkowego panelu jako"
 
-#: meld/filediff.py:1972
+#: meld/filediff.py:1982
 msgid "Save Right Pane As"
 msgstr "Zapis prawego panelu jako"
 
-#: meld/filediff.py:1983
+#: meld/filediff.py:1993
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Plik %s został zmieniony na dysku od czasu jego otwarcia"
 
-#: meld/filediff.py:1985
+#: meld/filediff.py:1995
 msgid "If you save it, any external changes will be lost."
 msgstr ""
 "Jeżeli plik zostanie zapisany, to wszystkie zewnętrzne zmiany zostaną "
 "utracone."
 
-#: meld/filediff.py:1988
+#: meld/filediff.py:1998
 msgid "Save Anyway"
 msgstr "Zapisz mimo to"
 
-#: meld/filediff.py:1989
+#: meld/filediff.py:1999
 msgid "Don’t Save"
 msgstr "Nie zapisuj"
 
-#: meld/filediff.py:2031
+#: meld/filediff.py:2041
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1998,7 +2008,7 @@ msgstr ""
 "Plik „{}” zawiera znaki, których nie można zakodować za pomocą jego obecnego "
 "kodowania, „{}”."
 
-#: meld/filediff.py:2035 meld/patchdialog.py:138
+#: meld/filediff.py:2045 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2007,16 +2017,16 @@ msgstr ""
 "Nie można zapisać pliku z powodu:\n"
 "%s"
 
-#: meld/filediff.py:2039 meld/patchdialog.py:137
+#: meld/filediff.py:2049 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Nie można zapisać pliku %s."
 
-#: meld/filediff.py:2440
+#: meld/filediff.py:2450
 msgid "Live comparison updating disabled"
 msgstr "Wyłączono aktualizowanie porównań na żywo"
 
-#: meld/filediff.py:2441
+#: meld/filediff.py:2451
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2330,6 +2340,10 @@ msgstr "Brakujący"
 msgid "Not present"
 msgstr "Nieobecny"
 
+#: meld/vc/_vc.py:82
+msgid "Scanning…"
+msgstr "Skanowanie…"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
 #: meld/vcview.py:334

From cc7746c141d976a4779cf868774fae1fe7627a6d Mon Sep 17 00:00:00 2001
From: Silvio Fricke <silvio.fricke@gmail.com>
Date: Thu, 13 Jan 2022 16:06:58 +0100
Subject: [PATCH 028/116] build: fix i18n usage on data/meson.build for meson
 0.61.0

With the latest meson the code doesn't compile anymore and reports an
error:

	meld/data/meson.build:34:0: ERROR: Function does not take positional arguments.

This patch tries to fix that problem.

Close #645

Signed-off-by: Silvio Fricke <silvio.fricke@gmail.com>
---
 data/meson.build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/meson.build b/data/meson.build
index 01949188..de099d3b 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -32,7 +32,6 @@ if desktop_file_validate.found()
 endif
 
 appdata_file = i18n.merge_file(
-  'appdata',
   input: configure_file(
     input: files('org.gnome.meld.appdata.xml.in.in'),
     output: 'org.gnome.meld.appdata.xml.in',

From 612ad16c79ba517159f81c6aac60cd6228eb8ffa Mon Sep 17 00:00:00 2001
From: Boyuan Yang <073plan@gmail.com>
Date: Thu, 13 Jan 2022 20:34:03 +0000
Subject: [PATCH 029/116] Update Chinese (China) translation

---
 po/zh_CN.po | 449 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 247 insertions(+), 202 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index bcc1aadd..6d48853f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,19 +14,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-08-10 16:20+0000\n"
-"PO-Revision-Date: 2021-08-18 20:35+0800\n"
-"Last-Translator: Dingzhong Chen <wsxy162@gmail.com>\n"
+"POT-Creation-Date: 2022-01-08 23:40+0000\n"
+"PO-Revision-Date: 2022-01-13 15:33-0500\n"
+"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese - China <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
-#: meld/resources/ui/appwindow.ui:9
+#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
 msgid "Meld"
 msgstr "Meld"
 
@@ -769,11 +769,11 @@ msgstr "合并右侧的全部更改"
 msgid "Merge All"
 msgstr "合并全部"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
 msgid "Add Synchronization Point"
 msgstr "增加同步点"
 
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
 msgid "Clear Synchronization Points"
 msgstr "清除同步点"
 
@@ -852,39 +852,39 @@ msgstr ""
 "Wylmer Wang <wantinghard@gmail.com>, 2013\n"
 "Whired Planck <fungdaat31@outlook.com>, 2020-2021"
 
-#: meld/resources/ui/appwindow.ui:29
+#: meld/resources/ui/appwindow.ui:30
 msgid "Start a new comparison"
 msgstr "开始新的比较"
 
-#: meld/resources/ui/appwindow.ui:45
+#: meld/resources/ui/appwindow.ui:46
 msgid "Open a recent comparison"
 msgstr "打开最近进行的比较"
 
-#: meld/resources/ui/appwindow.ui:73
+#: meld/resources/ui/appwindow.ui:74
 msgid "Go to the previous change"
 msgstr "转到上一个更改"
 
-#: meld/resources/ui/appwindow.ui:93
+#: meld/resources/ui/appwindow.ui:94
 msgid "Go to the next change"
 msgstr "转到下一个更改"
 
-#: meld/resources/ui/appwindow.ui:123
+#: meld/resources/ui/appwindow.ui:124
 msgid "Go to the previous conflict"
 msgstr "转到上一个冲突"
 
-#: meld/resources/ui/appwindow.ui:143
+#: meld/resources/ui/appwindow.ui:144
 msgid "Go to the next conflict"
 msgstr "转到下一个冲突"
 
-#: meld/resources/ui/appwindow.ui:192
+#: meld/resources/ui/appwindow.ui:193
 msgid "Version Filters"
 msgstr "版本过滤"
 
-#: meld/resources/ui/appwindow.ui:207 meld/resources/ui/preferences.ui:1472
+#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472
 msgid "File Filters"
 msgstr "文件过滤"
 
-#: meld/resources/ui/appwindow.ui:222 meld/resources/ui/preferences.ui:1657
+#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657
 msgid "Text Filters"
 msgstr "文本过滤"
 
@@ -897,7 +897,7 @@ msgid "Column Name"
 msgstr "列名称"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -981,6 +981,23 @@ msgstr "使用外部工具打开(_O)"
 msgid "_Copy File Paths"
 msgstr "复制文件路径(_C)"
 
+#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
+#: meld/resources/ui/dirdiff.ui:117
+msgid "Select folder to open in this pane"
+msgstr "选择在该窗格中打开的文件夹"
+
+#: meld/resources/ui/dirdiff.ui:43
+msgid "Folder 1"
+msgstr "文件夹 1"
+
+#: meld/resources/ui/dirdiff.ui:84
+msgid "Folder 2"
+msgstr "文件夹 2"
+
+#: meld/resources/ui/dirdiff.ui:125
+msgid "Folder 3"
+msgstr "文件夹 3"
+
 #: meld/resources/ui/encoding-selector.ui:31
 msgid "Search text encoding…"
 msgstr "搜索文本编码…"
@@ -1037,8 +1054,16 @@ msgstr "复制(_C)"
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
-#: meld/resources/ui/filediff.ui:171
+#: meld/resources/ui/filediff-menus.ui:54
+msgid "Open Containing Folder"
+msgstr "打开所在文件夹"
+
+#: meld/resources/ui/filediff-menus.ui:58
+msgid "Copy Full Path"
+msgstr "复制完整路径"
+
+#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
+#: meld/resources/ui/filediff.ui:169
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -1046,31 +1071,31 @@ msgstr ""
 "无法写入此文件。您可以点击此处解锁文件仍然进行更改，但这些更改必须保存到一个"
 "新的文件上。"
 
-#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
-#: meld/resources/ui/filediff.ui:185
-msgid "Open file in this pane"
-msgstr "在此窗格中打开文件"
-
-#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
-#: meld/resources/ui/filediff.ui:194
+#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
+#: meld/resources/ui/filediff.ui:183
 msgid "Save file in this pane"
 msgstr "保存该窗格中的文件"
 
-#: meld/resources/ui/filediff.ui:73
+#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
+#: meld/resources/ui/filediff.ui:209
+msgid "Open file in this pane"
+msgstr "在此窗格中打开文件"
+
+#: meld/resources/ui/filediff.ui:79
 msgid "File 3"
 msgstr "文件 3"
 
-#: meld/resources/ui/filediff.ui:142
+#: meld/resources/ui/filediff.ui:148
 msgid "File 2"
 msgstr "文件 2"
 
-#: meld/resources/ui/filediff.ui:207
+#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148
 msgid "File 1"
 msgstr "文件 1"
 
 #. Create icon and filename CellRenderer
-#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
-#: meld/dirdiff.py:517
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
+#: meld/dirdiff.py:537
 msgid "Name"
 msgstr "名称"
 
@@ -1082,7 +1107,7 @@ msgstr "模式"
 msgid "Add new filter"
 msgstr "添加新过滤器"
 
-#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18
 msgid "_Add"
 msgstr "添加(_A)"
 
@@ -1110,7 +1135,7 @@ msgstr "有换行"
 msgid "Replace _All"
 msgstr "全部替换(_A)"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1067 meld/iohelpers.py:113
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1157 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "替换(_R)"
 
@@ -1122,7 +1147,7 @@ msgstr "在“查找”和“查找与替换”之间切换"
 msgid "Search highlight mode…"
 msgstr "搜索高亮模式…"
 
-#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:349
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342
 #: meld/newdifftab.py:49
 msgid "New comparison"
 msgstr "新比较"
@@ -1211,6 +1236,18 @@ msgstr "中间和右侧窗格"
 msgid "_Reverse patch direction"
 msgstr "反转打补丁方向(_R)"
 
+#: meld/resources/ui/path-label.ui:23
+msgid "Path"
+msgstr "路径"
+
+#: meld/resources/ui/path-label.ui:62
+msgid "Copy Path"
+msgstr "复制路径"
+
+#: meld/resources/ui/path-label.ui:78
+msgid "Open Folder"
+msgstr "打开文件夹"
+
 #: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
 msgid "Preferences"
 msgstr "首选项"
@@ -1478,8 +1515,8 @@ msgstr "如果您不保存，更改将永久丢失。"
 msgid "Close _without Saving"
 msgstr "关闭但不保存(_W)"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1066
-#: meld/iohelpers.py:55 meld/iohelpers.py:112
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1156
+#: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -1503,95 +1540,67 @@ msgstr "比较(_C)"
 msgid "Co_mmit…"
 msgstr "提交(_M)…"
 
-#: meld/resources/ui/vcview-menus.ui:15
-msgid "_Update"
-msgstr "更新(_U)"
-
-#: meld/resources/ui/vcview-menus.ui:30
+#: meld/resources/ui/vcview-menus.ui:26
 msgid "Re_vert"
 msgstr "还原(_V)"
 
-#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+#: meld/resources/ui/vcview-menus.ui:30
 msgid "Delete"
 msgstr "删除"
 
-#: meld/resources/ui/vcview-menus.ui:41
-msgid "Mar_k as Resolved"
-msgstr "标记为已解决(_K)"
+#: meld/resources/ui/vcview-menus.ui:37
+msgid "Resolve Conflict"
+msgstr "解决冲突"
 
-#: meld/resources/ui/vcview.ui:73
-msgid "Commit…"
-msgstr "提交…"
-
-#: meld/resources/ui/vcview.ui:74
+#: meld/resources/ui/vcview.ui:16
 msgid "Commit changes to version control"
 msgstr "提交更改至版本控制"
 
-#: meld/resources/ui/vcview.ui:86
-msgid "Update"
-msgstr "更新"
-
-#: meld/resources/ui/vcview.ui:87
-msgid "Update working copy from version control"
-msgstr "从版本控制更新工作副本"
+#: meld/resources/ui/vcview.ui:21
+msgid "Commit…"
+msgstr "提交…"
 
-#: meld/resources/ui/vcview.ui:99
-msgid "Push"
-msgstr "推送"
+#: meld/resources/ui/vcview.ui:38
+msgid "Pull remote changes to the local repository"
+msgstr "从远端拉取修改至本地仓库"
 
-#: meld/resources/ui/vcview.ui:100
+#: meld/resources/ui/vcview.ui:51
 msgid "Push local changes to remote"
 msgstr "推送本地更改至远端"
 
-#: meld/resources/ui/vcview.ui:112
-msgid "Add"
-msgstr "添加"
-
-#: meld/resources/ui/vcview.ui:113
+#: meld/resources/ui/vcview.ui:74
 msgid "Add to version control"
 msgstr "添加到版本控制"
 
-#: meld/resources/ui/vcview.ui:125
-msgid "Remove"
-msgstr "移除"
-
-#: meld/resources/ui/vcview.ui:126
+#: meld/resources/ui/vcview.ui:87
 msgid "Remove from version control"
 msgstr "从版本控制中移除"
 
-#: meld/resources/ui/vcview.ui:138
-msgid "Mark as Resolved"
-msgstr "标记为已解决"
+#: meld/resources/ui/vcview.ui:100
+msgid "Revert working copy to original state"
+msgstr "将工作副本还原为原始状态"
 
-#: meld/resources/ui/vcview.ui:139
+#: meld/resources/ui/vcview.ui:113
 msgid "Mark as resolved in version control"
 msgstr "在版本控制中标记为已解决"
 
-#: meld/resources/ui/vcview.ui:151
-msgid "Revert"
-msgstr "还原"
+#: meld/resources/ui/vcview.ui:140
+msgid "Open version controlled folder in this pane"
+msgstr "在该窗格中打开受版本控制的文件夹"
 
-#: meld/resources/ui/vcview.ui:152
-msgid "Revert working copy to original state"
-msgstr "将工作副本还原为原始状态"
-
-#: meld/resources/ui/vcview.ui:165
-msgid "Delete from working copy"
-msgstr "从工作副本删除"
-
-#: meld/resources/ui/vcview.ui:220
+#: meld/resources/ui/vcview.ui:229
 msgid "Location"
 msgstr "位置"
 
-#: meld/resources/ui/vcview.ui:229
+#: meld/resources/ui/vcview.ui:238
 msgid "Status"
 msgstr "状态"
 
-#: meld/resources/ui/vcview.ui:238
+#: meld/resources/ui/vcview.ui:247
 msgid "Extra"
 msgstr "额外"
 
-#: meld/resources/ui/vcview.ui:270
+#: meld/resources/ui/vcview.ui:279
 msgid "Console output"
 msgstr "终端输出"
 
@@ -1616,84 +1625,94 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:538 meld/preferences.py:132
+#: meld/dirdiff.py:558 meld/preferences.py:132
 msgid "Size"
 msgstr "大小"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:546 meld/preferences.py:133
+#: meld/dirdiff.py:566 meld/preferences.py:133
 msgid "Modification time"
 msgstr "修改时间"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:574 meld/preferences.py:134
+msgid "Modification time (ISO)"
+msgstr "修改时间（ISO）"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:554 meld/preferences.py:134
+#: meld/dirdiff.py:582 meld/preferences.py:135
 msgid "Permissions"
 msgstr "权限"
 
-#: meld/dirdiff.py:778 meld/dirdiff.py:802
+#: meld/dirdiff.py:832
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (正在扫描…)"
+
+#: meld/dirdiff.py:864 meld/dirdiff.py:888
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] 正在扫描 {folder}"
 
-#: meld/dirdiff.py:942
+#: meld/dirdiff.py:1028
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] 完成"
 
-#: meld/dirdiff.py:951
+#: meld/dirdiff.py:1041
 msgid "Folder {} is being compared to itself"
 msgstr "文件夹 {} 正与自己进行比较"
 
-#: meld/dirdiff.py:957
+#: meld/dirdiff.py:1047
 msgid "Folders have no differences"
 msgstr "文件夹间没有差异"
 
-#: meld/dirdiff.py:959
+#: meld/dirdiff.py:1049
 msgid "Contents of scanned files in folders are identical."
 msgstr "文件夹中的已扫描文件的内容相同。"
 
-#: meld/dirdiff.py:961
+#: meld/dirdiff.py:1051
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr "文件夹中的已扫描文件似乎相同，但是内容尚未被扫描。"
 
-#: meld/dirdiff.py:964
+#: meld/dirdiff.py:1054
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "文件过滤器正在使用中，因此并非所有文件都已被扫描。"
 
-#: meld/dirdiff.py:966
+#: meld/dirdiff.py:1056
 msgid "Text filters are in use and may be masking content differences."
 msgstr "正在使用文本过滤器，可能会屏蔽文件之间的差异。"
 
-#: meld/dirdiff.py:982 meld/filediff.py:1874
+#: meld/dirdiff.py:1072 meld/filediff.py:1917
 msgid "Hide"
 msgstr "隐藏"
 
-#: meld/dirdiff.py:984 meld/filediff.py:1876 meld/filediff.py:1906
-#: meld/filediff.py:1908 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1074 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "隐藏(_D)"
 
-#: meld/dirdiff.py:993
+#: meld/dirdiff.py:1083
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "扫描此文件夹时出现了多个错误"
 
-#: meld/dirdiff.py:994
+#: meld/dirdiff.py:1084
 msgid "Files with invalid encodings found"
 msgstr "发现编码无效的文件"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:996
+#: meld/dirdiff.py:1086
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "某些文件编码不正确。名称是这样的："
 
-#: meld/dirdiff.py:998
+#: meld/dirdiff.py:1088
 msgid "Files hidden by case insensitive comparison"
 msgstr "因不区分大小写比较而隐藏的文件"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1000
+#: meld/dirdiff.py:1090
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1701,17 +1720,17 @@ msgstr ""
 "您正在区分大小写的文件系统上运行不区分大小写的比较。此文件夹中的以下文件被隐"
 "藏："
 
-#: meld/dirdiff.py:1011
+#: meld/dirdiff.py:1101
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}” 已被 “{second_file}”隐藏"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1160
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "要替换文件夹“%s”吗？"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1162
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1720,11 +1739,11 @@ msgstr ""
 "另一个同名的文件夹已存在于“%s”中。\n"
 "如果要替换已存在的文件夹，其中的所有文件都将丢失。"
 
-#: meld/dirdiff.py:1085
+#: meld/dirdiff.py:1175
 msgid "Error copying file"
 msgstr "复制文件时出错"
 
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1176
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1737,101 +1756,101 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1111 meld/vcview.py:759
+#: meld/dirdiff.py:1201 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "删除 {} 时出错"
 
-#: meld/dirdiff.py:1604
+#: meld/dirdiff.py:1691
 msgid "No folder"
 msgstr "没有文件夹"
 
-#: meld/filediff.py:1144
+#: meld/filediff.py:1149
 msgid "Comparison results will be inaccurate"
 msgstr "比较结果将会不准确"
 
-#: meld/filediff.py:1146
+#: meld/filediff.py:1151
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
 msgstr "过滤器更改了文件的行数，该行为不受支持。比较的结果将不准确。"
 
-#: meld/filediff.py:1218
+#: meld/filediff.py:1223
 msgid "Mark conflict as resolved?"
 msgstr "要标记冲突为“已解决”吗？"
 
-#: meld/filediff.py:1220
+#: meld/filediff.py:1225
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "如果冲突已成功解决，可以现在将其标记为已解决。"
 
-#: meld/filediff.py:1222
+#: meld/filediff.py:1227
 msgid "Cancel"
 msgstr "取消"
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1228
 msgid "Mark _Resolved"
 msgstr "标记为已解决(_R)"
 
-#: meld/filediff.py:1556
+#: meld/filediff.py:1591
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "打开文件“%s”时出现问题。"
 
-#: meld/filediff.py:1564
+#: meld/filediff.py:1600
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "文件 %s 似乎是二进制文件。"
 
-#: meld/filediff.py:1566
+#: meld/filediff.py:1602
 msgid "Do you want to open the file using the default application?"
 msgstr "确定要使用默认程序打开文件吗？"
 
-#: meld/filediff.py:1568
+#: meld/filediff.py:1604
 msgid "Open"
 msgstr "打开"
 
-#: meld/filediff.py:1582
+#: meld/filediff.py:1626
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] 合并文件"
 
-#: meld/filediff.py:1596
+#: meld/filediff.py:1640
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] 计算差异"
 
-#: meld/filediff.py:1657
+#: meld/filediff.py:1700
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "文件 %s 在磁盘上已更改"
 
-#: meld/filediff.py:1658
+#: meld/filediff.py:1701
 msgid "Do you want to reload the file?"
 msgstr "您想重新加载该文件吗？"
 
-#: meld/filediff.py:1660
+#: meld/filediff.py:1703
 msgid "_Reload"
 msgstr "重新加载(_R)"
 
-#: meld/filediff.py:1830
+#: meld/filediff.py:1873
 msgid "File {} is being compared to itself"
 msgstr "文件 {} 正与自己进行比较"
 
-#: meld/filediff.py:1839
+#: meld/filediff.py:1882
 msgid "Files are identical"
 msgstr "文件完全相同"
 
-#: meld/filediff.py:1852
+#: meld/filediff.py:1895
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
 msgstr "正在使用文本过滤器，可能会屏蔽文件之间的差异。您想比较未过滤的文件吗？"
 
-#: meld/filediff.py:1857
+#: meld/filediff.py:1900
 msgid "Files differ in line endings only"
 msgstr "文件间仅行尾存在差异"
 
-#: meld/filediff.py:1859
+#: meld/filediff.py:1902
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1840,75 +1859,75 @@ msgstr ""
 "文件除了行尾均相同，差异细节：\n"
 "%s"
 
-#: meld/filediff.py:1879
+#: meld/filediff.py:1922
 msgid "Show without filters"
 msgstr "显示不过滤的结果"
 
-#: meld/filediff.py:1901
+#: meld/filediff.py:1944
 msgid "Change highlighting incomplete"
 msgstr "更改的高亮显示不完整"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1945
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
 msgstr ""
 "某些更改由于太大没有被高亮。您可以强制高亮显示大幅的更改，尽管这可能很慢。"
 
-#: meld/filediff.py:1910
+#: meld/filediff.py:1953
 msgid "Keep highlighting"
 msgstr "保持语法高亮"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1955
 msgid "_Keep highlighting"
 msgstr "保持语法高亮(_K)"
 
-#: meld/filediff.py:1925
+#: meld/filediff.py:1968
 msgid "Saving failed"
 msgstr "保存失败"
 
-#: meld/filediff.py:1926
+#: meld/filediff.py:1969
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
 msgstr "请考虑将任何重要的更改复制到其他程序或文件中以避免数据丢失。"
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1978
 msgid "Save Left Pane As"
 msgstr "左侧窗格保存为"
 
-#: meld/filediff.py:1937
+#: meld/filediff.py:1980
 msgid "Save Middle Pane As"
 msgstr "中间窗格保存为"
 
-#: meld/filediff.py:1939
+#: meld/filediff.py:1982
 msgid "Save Right Pane As"
 msgstr "右侧窗格保存为"
 
-#: meld/filediff.py:1950
+#: meld/filediff.py:1993
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "文件 %s 打开后在磁盘上已更改"
 
-#: meld/filediff.py:1952
+#: meld/filediff.py:1995
 msgid "If you save it, any external changes will be lost."
 msgstr "如果您保存它，外部的更改将丢失。"
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:1998
 msgid "Save Anyway"
 msgstr "依然保存"
 
-#: meld/filediff.py:1956
+#: meld/filediff.py:1999
 msgid "Don’t Save"
 msgstr "不保存"
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2041
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
 msgstr "文件“{}”包含了其当前编码“{}”无法编码的字符。"
 
-#: meld/filediff.py:2002 meld/patchdialog.py:138
+#: meld/filediff.py:2045 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1917,20 +1936,16 @@ msgstr ""
 "由于以下原因无法保存文件：\n"
 "%s"
 
-#: meld/filediff.py:2006 meld/patchdialog.py:137
+#: meld/filediff.py:2049 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "无法保存文件 %s。"
 
-#: meld/filediff.py:2067
-msgid "Open File"
-msgstr "打开文件"
-
-#: meld/filediff.py:2421
+#: meld/filediff.py:2450
 msgid "Live comparison updating disabled"
 msgstr "实时比较更新已禁用"
 
-#: meld/filediff.py:2422
+#: meld/filediff.py:2451
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1939,32 +1954,32 @@ msgstr ""
 "使用同步点时比较的实时更新会禁用。您仍然可以手动刷新比较，实时更新会在同步点"
 "清除后恢复启用。"
 
-#: meld/iohelpers.py:40
+#: meld/iohelpers.py:41
 msgid "Deleting remote folders is not supported"
 msgstr "不支持删除远端文件夹"
 
-#: meld/iohelpers.py:42
+#: meld/iohelpers.py:43
 msgid "Not a file or directory"
 msgstr "不是文件或目录"
 
-#: meld/iohelpers.py:46
+#: meld/iohelpers.py:47
 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
 msgstr "无法将“{}”放入回收站。确定要立即删除它吗？"
 
-#: meld/iohelpers.py:51
+#: meld/iohelpers.py:52
 msgid "This remote location does not support sending items to the trash."
 msgstr "该远端位置不支持移动项目到回收站。"
 
-#: meld/iohelpers.py:56
+#: meld/iohelpers.py:57
 msgid "_Delete Permanently"
 msgstr "永久删除(_D)"
 
-#: meld/iohelpers.py:106
+#: meld/iohelpers.py:107
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "要替换文件“%s”吗？"
 
-#: meld/iohelpers.py:108
+#: meld/iohelpers.py:109
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2073,20 +2088,20 @@ msgstr "不支持远端文件夹“{}”"
 msgid "<unnamed>"
 msgstr "<未命名>"
 
-#: meld/melddoc.py:61
+#: meld/melddoc.py:124
 msgid "untitled"
 msgstr "无标题"
 
-#: meld/meldwindow.py:155
+#: meld/meldwindow.py:158
 msgid "Filename"
 msgstr "文件名"
 
-#: meld/meldwindow.py:384
+#: meld/meldwindow.py:381
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "需要三个文件以自动合并，已得到：%r"
 
-#: meld/meldwindow.py:406
+#: meld/meldwindow.py:403
 msgid "Cannot compare a mixture of files and directories"
 msgstr "无法对文件和目录混合比较"
 
@@ -2114,7 +2129,7 @@ msgstr "标签"
 msgid "pattern"
 msgstr "模式"
 
-#: meld/recent.py:104
+#: meld/recent.py:111
 msgid "Version control:"
 msgstr "版本控制："
 
@@ -2131,6 +2146,10 @@ msgstr "{name}（{charset}）"
 msgid "Plain Text"
 msgstr "纯文本"
 
+#: meld/ui/pathlabel.py:36
+msgid "Unnamed file"
+msgstr "未命名文件"
+
 #. Abbreviation for line, column so that it will fit in the status bar
 #: meld/ui/statusbar.py:125
 #, python-brace-format
@@ -2153,9 +2172,7 @@ msgstr "没有文件会被提交"
 msgid "{unpushed_commits} in {unpushed_branches}"
 msgstr "在 {unpushed_branches} 中有 {unpushed_commits}"
 
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: meld/vc/git.py:94 meld/vc/git.py:103
+#: meld/vc/git.py:94 meld/vc/git.py:104
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -2167,16 +2184,16 @@ msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "%d 个分支"
 
-#: meld/vc/git.py:344
+#: meld/vc/git.py:345
 #, python-brace-format
 msgid "Mode changed from {old_mode} to {new_mode}"
 msgstr "模式已从 {old_mode} 更改为 {new_mode}"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Partially staged"
 msgstr "已暂存部分"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Staged"
 msgstr "已暂存"
 
@@ -2235,106 +2252,140 @@ msgstr "缺失"
 msgid "Not present"
 msgstr "不存在"
 
+#: meld/vc/_vc.py:82
+msgid "Scanning…"
+msgstr "正在扫描……"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
-#: meld/vcview.py:333
+#: meld/vcview.py:334
 #, python-format
 msgid "%(name)s (not found)"
 msgstr "%(name)s（未找到）"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: meld/vcview.py:337
+#: meld/vcview.py:338
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s（%(cmd)s 未安装）"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: meld/vcview.py:341
+#: meld/vcview.py:342
 #, python-format
 msgid "%(name)s (invalid repository)"
 msgstr "%(name)s（无效的仓库）"
 
-#: meld/vcview.py:355
+#: meld/vcview.py:356
 msgid "No valid version control system found in this folder"
 msgstr "此文件夹中未找到有效的版本控制系统"
 
-#: meld/vcview.py:357
+#: meld/vcview.py:358
 msgid "Choose which version control system to use"
 msgstr "选择要使用的版本控制系统"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:411
+#: meld/vcview.py:412
 #, python-brace-format
 msgid "Location: {path}"
 msgstr "位置：{path}"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:418
+#: meld/vcview.py:419
 msgid "Scanning repository"
 msgstr "正在扫描仓库"
 
-#: meld/vcview.py:447
+#: meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "正在扫描 %s"
 
-#: meld/vcview.py:486
+#: meld/vcview.py:487
 msgid "(Empty)"
 msgstr "（空）"
 
-#: meld/vcview.py:533
+#: meld/vcview.py:535
 #, python-format
 msgid "%s — local"
 msgstr "%s — 本地"
 
-#: meld/vcview.py:534
+#: meld/vcview.py:536
 #, python-format
 msgid "%s — remote"
 msgstr "%s — 远端"
 
-#: meld/vcview.py:542
+#: meld/vcview.py:544
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s（本地，合并，远端）"
 
-#: meld/vcview.py:547
+#: meld/vcview.py:549
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s（远端，合并，本地）"
 
-#: meld/vcview.py:558
+#: meld/vcview.py:560
 #, python-format
 msgid "%s — repository"
 msgstr "%s — 仓库"
 
-#: meld/vcview.py:564
+#: meld/vcview.py:566
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s（工作区，仓库）"
 
-#: meld/vcview.py:568
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s（仓库，工作区）"
 
-#: meld/vcview.py:730
+#: meld/vcview.py:735
 msgid "Remove folder and all its files?"
 msgstr "移除文件夹及其所有文件？"
 
-#: meld/vcview.py:732
+#: meld/vcview.py:737
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
 msgstr ""
 "这将从版本控制中移除所有选中的文件及文件夹，以及选中文件夹中的所有文件。"
 
-#: meld/vcview.py:845
+#: meld/vcview.py:850
 msgid "Clear"
 msgstr "清除"
 
+#~ msgid "_Update"
+#~ msgstr "更新(_U)"
+
+#~ msgid "Mar_k as Resolved"
+#~ msgstr "标记为已解决(_K)"
+
+#~ msgid "Update"
+#~ msgstr "更新"
+
+#~ msgid "Update working copy from version control"
+#~ msgstr "从版本控制更新工作副本"
+
+#~ msgid "Push"
+#~ msgstr "推送"
+
+#~ msgid "Add"
+#~ msgstr "添加"
+
+#~ msgid "Remove"
+#~ msgstr "移除"
+
+#~ msgid "Mark as Resolved"
+#~ msgstr "标记为已解决"
+
+#~ msgid "Revert"
+#~ msgstr "还原"
+
+#~ msgid "Delete from working copy"
+#~ msgstr "从工作副本删除"
+
 #~ msgid "[%s] Scanning %s"
 #~ msgstr "[%s] 正在扫描 %s"
 
@@ -2721,9 +2772,6 @@ msgstr "清除"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Only one version control system found in this folder"
-#~ msgstr "此目录中只找到一个版本控制系统"
-
 #~| msgid ""
 #~| "Error removing %s\n"
 #~| "\n"
@@ -2840,9 +2888,6 @@ msgstr "清除"
 #~ msgid "_Browse..."
 #~ msgstr "浏览(_B)..."
 
-#~ msgid "Path"
-#~ msgstr "路径"
-
 #~ msgid "Path to file"
 #~ msgstr "文件路径"
 

From f4782bc573b8843f086990151d9349aa898018e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Urban=C4=8Di=C4=8D?= <mateju@src.gnome.org>
Date: Mon, 17 Jan 2022 21:20:06 +0000
Subject: [PATCH 030/116] Update Slovenian translation

---
 po/sl.po | 102 ++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 74 insertions(+), 28 deletions(-)

diff --git a/po/sl.po b/po/sl.po
index c48ab72e..b735837d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2009 meld's COPYRIGHT HOLDER
 # This file is distributed under the same license as the meld package.
 #
-# Matej Urbančič <mateju@src.gnome.org>, 2009–2021.
+# Matej Urbančič <mateju@src.gnome.org>, 2009–2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
 "POT-Creation-Date: 2021-05-11 10:00+0000\n"
-"PO-Revision-Date: 2021-11-21 21:52+0100\n"
+"PO-Revision-Date: 2022-01-17 22:13+0100\n"
 "Last-Translator: Matej Urbančič <mateju@src.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
@@ -46,12 +46,20 @@ msgid ""
 "two- and three-way comparison of both files and directories, and supports "
 "many version control systems including Git, Mercurial, Bazaar and Subversion."
 msgstr ""
+"Meld je napredno orodje za primerjavo in združevanje sprememb vsebine v "
+"različnih virih. Omogoča primerjavo datotek, map in virov sistema nadzora "
+"različic. Omogoča dvojno in trojno primerjavo datotek in map, podpira pa "
+"tudi različne sisteme za nadzov različic, vključno z Git, Mercurial, Bazaar "
+"in Subversion."
 
 #: data/org.gnome.meld.appdata.xml.in.in:21
+#, fuzzy
 msgid ""
 "Meld helps you review code changes, understand patches, and makes enormous "
 "merge conflicts slightly less painful."
 msgstr ""
+"Meld vam pomaga pregledati spremembe kode, razumeti obliže in naredi ogromne "
+"spajanje konfliktov nekoliko manj boleče."
 
 #: data/org.gnome.meld.appdata.xml.in.in:51
 msgid "The GNOME Project"
@@ -82,12 +90,17 @@ msgid "Additional automatically detected text encodings"
 msgstr "Dodatna samodejno zaznana kodiranja"
 
 #: data/org.gnome.meld.gschema.xml:59
+#, fuzzy
 msgid ""
 "Meld will use these text encodings to try to decode loaded text files before "
 "trying any other encodings. In addition to the encodings in this list, UTF-8 "
 "and the current locale-default encoding will always be used; other encodings "
 "may also be tried, depending on the user’s locale."
 msgstr ""
+"Meld bo s temi kodiranje besedila poskušal dekodirati naložene besedilne "
+"datoteke, preden poskusite katero koli drugo kodiranje. Poleg kodiranja na "
+"tem seznamu bosta vedno uporabljena UTF-8 in trenutno kodiranje na lokalni "
+"ravni; lahko tudi druge kodiranje, odvisno od uporabnikovega lokala."
 
 #: data/org.gnome.meld.gschema.xml:66
 msgid "Width of an indentation step"
@@ -98,9 +111,9 @@ msgid "The number of spaces to use for a single indent step"
 msgstr "Število presledkov za vsak korak zamika"
 
 #: data/org.gnome.meld.gschema.xml:71
-#, fuzzy
 msgid "Whether to indent using spaces or tabs"
-msgstr "Ali naj gedit vstavlja presledke namesto zamikov (tabulatorjev)."
+msgstr ""
+"Ali naj bodo za zamik besedila uporabljeni presledki namesto tabulatorjev"
 
 #: data/org.gnome.meld.gschema.xml:72
 msgid "If true, any new indentation will use spaces instead of tabs."
@@ -113,67 +126,83 @@ msgid "Show line numbers"
 msgstr "Pokaži številke vrstic"
 
 #: data/org.gnome.meld.gschema.xml:77
+#, fuzzy
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
-msgstr ""
+msgstr "Če je res, bodo številke vrstice prikazane v čreh primerjave datotek."
 
 #: data/org.gnome.meld.gschema.xml:81
 msgid "Highlight syntax"
 msgstr "Poudarjanje skladnje"
 
 #: data/org.gnome.meld.gschema.xml:82
+#, fuzzy
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld’s own color "
 "highlighting, this is off by default."
 msgstr ""
+"Ali poudariti sintakso v primerjavah. Zaradi Meld-ovega označevanje barv je "
+"to privzeto izklopljeno."
 
 #: data/org.gnome.meld.gschema.xml:86
-#, fuzzy
 msgid "Color scheme to use for syntax highlighting"
-msgstr "Ime barvne sheme gtksourceview za poudarjanje skladnje."
+msgstr "Barvna shema za poudarjanje skladnje."
 
 #: data/org.gnome.meld.gschema.xml:87
+#, fuzzy
 msgid "Used by GtkSourceView to determine colors for syntax highlighting"
-msgstr ""
+msgstr "GtkSourceView uporablja za določanje barv za označevanje sintakse"
 
 #: data/org.gnome.meld.gschema.xml:91
 msgid "Draw whitespace"
 msgstr "Pokaži presledne znake"
 
 #: data/org.gnome.meld.gschema.xml:92
+#, fuzzy
 msgid ""
 "If true, whitespace characters will be drawn in comparisons even if they are "
 "not in a changed area."
 msgstr ""
+"Če je res, bodo znaki belega prostora narisani v primerjavah, tudi če niso v "
+"spremenjenem območju."
 
 #: data/org.gnome.meld.gschema.xml:101
 msgid "Wrap mode"
 msgstr "Način preloma"
 
 #: data/org.gnome.meld.gschema.xml:102
+#, fuzzy
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
 "('word')."
 msgstr ""
+"Vrstice v primerjavah datotek bodo zavite v skladu s to nastavitev, bodisi "
+"sploh ne (\"nobena\"), pri nobenem znaku (\"char\") ali samo na koncu besed "
+"(\"beseda\")."
 
 #: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
 msgid "Highlight current line"
 msgstr "Poudari trenutno vrstico"
 
 #: data/org.gnome.meld.gschema.xml:110
+#, fuzzy
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr ""
+"Če je res, bo vrstica, ki vsebuje kazalko, označena v primerjavah datotek."
 
 #: data/org.gnome.meld.gschema.xml:114
 msgid "Use the system default monospace font"
 msgstr "Uporabi privzeto sistemsko pisavo stalne širine"
 
 #: data/org.gnome.meld.gschema.xml:115
+#, fuzzy
 msgid ""
 "If false, custom-font will be used instead of the system monospace font."
 msgstr ""
+"Če je napačna, bo namesto pisave v enoprostornem sistemu uporabljena pisava "
+"po meri."
 
 #: data/org.gnome.meld.gschema.xml:119
 msgid "Custom font"
@@ -184,6 +213,8 @@ msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
 msgstr ""
+"Pisava po meri za uporabo, shranjena kot niz in razčlenjena kot opis pisave "
+"Pango."
 
 #: data/org.gnome.meld.gschema.xml:126
 msgid "Show overview source map"
@@ -200,7 +231,7 @@ msgstr "Slog preglednega zemljevida"
 
 #: data/org.gnome.meld.gschema.xml:133
 msgid "Style options for how the overview map is displayed."
-msgstr ""
+msgstr "Možnosti sloga prikaza preglednega zemljevida."
 
 #: data/org.gnome.meld.gschema.xml:139
 msgid "Ignore blank lines when comparing files"
@@ -222,9 +253,8 @@ msgid ""
 msgstr ""
 
 #: data/org.gnome.meld.gschema.xml:152
-#, fuzzy
 msgid "The custom editor launch command"
-msgstr "Ukaz za zagon urejevalnika: "
+msgstr "Ukaz za zagon urejevalnika po meri"
 
 #: data/org.gnome.meld.gschema.xml:153
 msgid ""
@@ -257,28 +287,36 @@ msgid "Use shallow comparison"
 msgstr "Uporabi grobo primerjavo"
 
 #: data/org.gnome.meld.gschema.xml:170
+#, fuzzy
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
 "different otherwise."
 msgstr ""
+"Če je res, primerjave map primerjajo datoteke, ki temeljijo samo na "
+"velikosti in mtime, glede na to, da so datoteke enake, če se njihova "
+"velikost in mtime ujemata, in drugače."
 
 #: data/org.gnome.meld.gschema.xml:174
-#, fuzzy
 msgid "File timestamp resolution"
-msgstr "Ločljivost časovnega _žiga:"
+msgstr "Ločljivost časovnega žiga"
 
 #: data/org.gnome.meld.gschema.xml:175
+#, fuzzy
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
 "between two files before they’re considered to have different mtimes. This "
 "is useful when comparing files between filesystems with different timestamp "
 "resolution."
 msgstr ""
+"Pri primerjavi na podlagi mtime je to najmanjša razlika v nanosekondih med "
+"dvema datotekama, preden se šteje, da imajo različne mtimes. To je uporabno "
+"pri primerjanju datotek med datotečnimi stemi z različno ločljivostjo "
+"časovnega žiga."
 
 #: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
 msgid "Apply text filters during folder comparisons"
-msgstr ""
+msgstr "Uveljavi besedilne filtre med primerjavo map"
 
 #: data/org.gnome.meld.gschema.xml:180
 msgid ""
@@ -296,9 +334,8 @@ msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 
 #: data/org.gnome.meld.gschema.xml:191
-#, fuzzy
 msgid "Show the version control console output"
-msgstr "Pokaži/Skrij odvod konzole"
+msgstr "Pokaži odvod konzole nadzora različic"
 
 #: data/org.gnome.meld.gschema.xml:192
 msgid ""
@@ -319,6 +356,8 @@ msgstr ""
 #: data/org.gnome.meld.gschema.xml:201
 msgid "Present version comparisons as left-local/right-remote"
 msgstr ""
+"Trenutna primerjava različice poteka kot levo je krajevno / desno je "
+"oddaljeno"
 
 #: data/org.gnome.meld.gschema.xml:202
 msgid ""
@@ -340,9 +379,8 @@ msgid ""
 msgstr ""
 
 #: data/org.gnome.meld.gschema.xml:211
-#, fuzzy
 msgid "Show margin in commit message editor"
-msgstr "Pokaži desni rob v pogledu sporočil uveljavitev"
+msgstr "Pokaži rob v urejevalniku sporočila uveljavitve"
 
 #: data/org.gnome.meld.gschema.xml:212
 msgid ""
@@ -360,6 +398,8 @@ msgid ""
 "The column at which to show the margin in the version control commit message "
 "editor."
 msgstr ""
+"Stolpec pri katerem naj bo pokazan rob v urejevalniku sistema nadzora "
+"uveljavitve različic."
 
 #: data/org.gnome.meld.gschema.xml:221
 msgid "Automatically hard-wrap commit messages"
@@ -379,6 +419,8 @@ msgstr "Filtri nadzora različic"
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
+"Seznam stanj, uporabljenih za filtriranje vidnih datotek pri primerjavi "
+"različic."
 
 #: data/org.gnome.meld.gschema.xml:241
 msgid "Filename-based filters"
@@ -1080,7 +1122,7 @@ msgstr "_Zamenjaj"
 
 #: meld/resources/ui/findbar.ui:226
 msgid "Switch between Find and Find-and-Replace"
-msgstr ""
+msgstr "Preklop med možnostima Najdi in Najdi in Zamenjaj"
 
 #: meld/resources/ui/language-selector.ui:31
 msgid "Search highlight mode…"
@@ -1294,9 +1336,8 @@ msgid "Version Comparisons"
 msgstr "Primerjave različic"
 
 #: meld/resources/ui/preferences.ui:1104
-#, fuzzy
 msgid "_Order when comparing file revisions:"
-msgstr "_Med primerjavo predelav datotek"
+msgstr "Vrstni red primerjave predelav datotek:"
 
 #: meld/resources/ui/preferences.ui:1151
 msgid "Order when _merging files:"
@@ -1608,7 +1649,7 @@ msgstr "[{label}] končano"
 
 #: meld/dirdiff.py:951
 msgid "Folder {} is being compared to itself"
-msgstr ""
+msgstr "Mapo {} primerjate samo s seboj"
 
 #: meld/dirdiff.py:957
 msgid "Folders have no differences"
@@ -1616,7 +1657,7 @@ msgstr "V mapah ni razlik"
 
 #: meld/dirdiff.py:959
 msgid "Contents of scanned files in folders are identical."
-msgstr ""
+msgstr "Vsebina preiskanih datotek v mapah je enaka."
 
 #: meld/dirdiff.py:961
 msgid ""
@@ -1786,7 +1827,7 @@ msgstr "_Ponovno naloži"
 
 #: meld/filediff.py:1830
 msgid "File {} is being compared to itself"
-msgstr ""
+msgstr "Datoteko {} primerjate samo s seboj"
 
 #: meld/filediff.py:1839
 msgid "Files are identical"
@@ -1802,7 +1843,7 @@ msgstr ""
 
 #: meld/filediff.py:1857
 msgid "Files differ in line endings only"
-msgstr ""
+msgstr "Datoteki se razlikujeta le v končnih vrstičnih oznakah"
 
 #: meld/filediff.py:1859
 #, python-format
@@ -1810,6 +1851,8 @@ msgid ""
 "Files are identical except for differing line endings:\n"
 "%s"
 msgstr ""
+"Datoteki sta enaki, razlikujeta se le v končnih vrstičnih oznakah:\n"
+"%s"
 
 #: meld/filediff.py:1879
 msgid "Show without filters"
@@ -1914,7 +1957,7 @@ msgstr ""
 
 #: meld/iohelpers.py:40
 msgid "Deleting remote folders is not supported"
-msgstr ""
+msgstr "Brisanje oddaljenih map ni podprto"
 
 #: meld/iohelpers.py:42
 msgid "Not a file or directory"
@@ -1943,6 +1986,8 @@ msgid ""
 "A file with this name already exists in “%s”.\n"
 "If you replace the existing file, its contents will be lost."
 msgstr ""
+"Datoteka s tem imenom v »%s« žeobstaja.\n"
+"Če zamenjate obstoječo datoteko, bo izgubljena celotna vsebina."
 
 #: meld/meldapp.py:188
 msgid "wrong number of arguments supplied to --diff"
@@ -2055,7 +2100,7 @@ msgstr "Ime datoteke"
 #: meld/meldwindow.py:384
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
-msgstr ""
+msgstr "Za samodejno združevanje morajo biti navedene tri datoteke (ne %r)"
 
 #: meld/meldwindow.py:406
 msgid "Cannot compare a mixture of files and directories"
@@ -2088,6 +2133,7 @@ msgstr "Nadzor različic:"
 #: meld/style.py:91
 msgid "Couldn’t find colour scheme details for {}; this is a bad install"
 msgstr ""
+"Podrobnosti barvne sheme za {} ni mogoče najti! Namestitev je okvarjena."
 
 #: meld/ui/bufferselectors.py:110
 #, python-brace-format
@@ -2106,7 +2152,7 @@ msgstr "Vrstica {line}, Stolpec {column}"
 
 #: meld/ui/statusbar.py:185
 msgid "Line you want to move the cursor to"
-msgstr ""
+msgstr "Vrstica, na katero želite postaviti kazalko"
 
 #: meld/ui/vcdialogs.py:50
 msgid "No files will be committed"

From 1c75d2ec72d26050c8a3cebd78fdf224f2bed298 Mon Sep 17 00:00:00 2001
From: Matheus Barbosa <mdpb.matheus@gmail.com>
Date: Fri, 28 Jan 2022 15:59:16 +0000
Subject: [PATCH 031/116] Update Brazilian Portuguese translation

---
 po/pt_BR.po | 164 ++++++++++++++++++++++++++++------------------------
 1 file changed, 90 insertions(+), 74 deletions(-)

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4c82de98..941871b3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,5 +1,5 @@
 # Brazilian Portuguese translation of meld.
-# Copyright (C) 2021 Free Software Foundation, Inc.
+# Copyright (C) 2022 Free Software Foundation, Inc.
 # This file is distributed under the same license as the meld package.
 # Raphael Higino <In memoriam>, 2004.
 # Djavan Fagundes <dnoway@gmail.com>, 2008, 2009.
@@ -10,21 +10,22 @@
 # Florêncio Neves <florencioneves@gmail.com>, 2012.
 # Enrico Nicoletto <liverig@gmail.com>, 2013, 2018-2021.
 # Rafael Fontenelle <rafaelff@gnome.org>, 2013-2021.
+# Matheus Barbosa <mdpb.matheus@gmail.com>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-10-08 21:01+0000\n"
-"PO-Revision-Date: 2021-10-11 18:26-0300\n"
-"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
+"POT-Creation-Date: 2022-01-17 21:20+0000\n"
+"PO-Revision-Date: 2022-01-24 20:24-0300\n"
+"Last-Translator: Matheus Barbosa <mdpb.matheus@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.0\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"X-Generator: Gtranslator 40.0\n"
 "X-Project-Style: gnome\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
@@ -910,7 +911,8 @@ msgstr ""
 "Florêncio Neves <florencioneves@gmail.com>\n"
 "Enrico Nicoletto <liverig@gmail.com>\n"
 "Rafael Fontenelle <rafaelff@gnome.org>\n"
-"Reginaldo Izidório <misteregis@gmail.com>"
+"Reginaldo Izidório <misteregis@gmail.com>\n"
+"Matheus Barbosa <mdpb.matheus@gmail.com>"
 
 #: meld/resources/ui/appwindow.ui:30
 msgid "Start a new comparison"
@@ -1156,7 +1158,7 @@ msgstr "Arquivo 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:530
+#: meld/dirdiff.py:537
 msgid "Name"
 msgstr "Nome"
 
@@ -1196,7 +1198,7 @@ msgstr "Voltou ao início"
 msgid "Replace _All"
 msgstr "Substituir _todos"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1092 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1157 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "_Substituir"
 
@@ -1584,7 +1586,7 @@ msgstr "Se você não salvar, as mudanças serão perdidas permanentemente."
 msgid "Close _without Saving"
 msgstr "_Fechar sem salvar"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1091
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1156
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -1694,43 +1696,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:551 meld/preferences.py:132
+#: meld/dirdiff.py:558 meld/preferences.py:132
 msgid "Size"
 msgstr "Tamanho"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:559 meld/preferences.py:133
+#: meld/dirdiff.py:566 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Hora da modificação"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:574 meld/preferences.py:134
+msgid "Modification time (ISO)"
+msgstr "Hora da modificação (ISO)"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:567 meld/preferences.py:134
+#: meld/dirdiff.py:582 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Permissões"
 
-#: meld/dirdiff.py:803 meld/dirdiff.py:827
+#: meld/dirdiff.py:832
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (escaneando…)"
+
+#: meld/dirdiff.py:864 meld/dirdiff.py:888
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
-msgstr "[{label}] Varrendo {folder}"
+msgstr "[{label}] Escaneando {folder}"
 
-#: meld/dirdiff.py:967
+#: meld/dirdiff.py:1028
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Concluído"
 
-#: meld/dirdiff.py:976
+#: meld/dirdiff.py:1041
 msgid "Folder {} is being compared to itself"
 msgstr "Pasta {} sendo comparada consigo própria"
 
-#: meld/dirdiff.py:982
+#: meld/dirdiff.py:1047
 msgid "Folders have no differences"
 msgstr "As pastas têm nenhuma diferença"
 
-#: meld/dirdiff.py:984
+#: meld/dirdiff.py:1049
 msgid "Contents of scanned files in folders are identical."
 msgstr "Conteúdos de arquivos verificados em pastas são idênticos."
 
-#: meld/dirdiff.py:986
+#: meld/dirdiff.py:1051
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1738,48 +1750,48 @@ msgstr ""
 "Arquivos verificados em pastas parecem ser idênticos, mas conteúdos não "
 "foram verificados."
 
-#: meld/dirdiff.py:989
+#: meld/dirdiff.py:1054
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Filtros de arquivo estão em uso, portanto nem todos os arquivos foram "
 "verificados."
 
-#: meld/dirdiff.py:991
+#: meld/dirdiff.py:1056
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Filtros de texto estão sendo usados e podem estar escondendo diferenças no "
 "conteúdo."
 
-#: meld/dirdiff.py:1007 meld/filediff.py:1907
+#: meld/dirdiff.py:1072 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Ocultar"
 
-#: meld/dirdiff.py:1009 meld/filediff.py:1909 meld/filediff.py:1939
-#: meld/filediff.py:1941 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1074 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "Ocu_ltar"
 
-#: meld/dirdiff.py:1018
+#: meld/dirdiff.py:1083
 msgid "Multiple errors occurred while scanning this folder"
-msgstr "Ocorreram vários erros ao varrer este diretório"
+msgstr "Ocorreram vários erros ao escanear este diretório"
 
-#: meld/dirdiff.py:1019
+#: meld/dirdiff.py:1084
 msgid "Files with invalid encodings found"
 msgstr "Arquivos com codificações inválidas encontrados"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1021
+#: meld/dirdiff.py:1086
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Alguns arquivos estavam com uma codificação incorreta. Os nomes são algo "
 "como:"
 
-#: meld/dirdiff.py:1023
+#: meld/dirdiff.py:1088
 msgid "Files hidden by case insensitive comparison"
 msgstr "Arquivos ocultos pela comparação não sensível a maiusculização"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1025
+#: meld/dirdiff.py:1090
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1788,17 +1800,17 @@ msgstr ""
 "minúsculas em um sistema de arquivos que diferencia. Os seguintes arquivos "
 "neste diretório ficam ocultos:"
 
-#: meld/dirdiff.py:1036
+#: meld/dirdiff.py:1101
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}” ocultado por “{second_file}”"
 
-#: meld/dirdiff.py:1095
+#: meld/dirdiff.py:1160
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Substituir pasta “%s”?"
 
-#: meld/dirdiff.py:1097
+#: meld/dirdiff.py:1162
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1807,11 +1819,11 @@ msgstr ""
 "Uma outra pasta com o mesmo nome já existe em “%s”.\n"
 "Se você substituir a pasta existente, todos os arquivos nela serão perdidos."
 
-#: meld/dirdiff.py:1110
+#: meld/dirdiff.py:1175
 msgid "Error copying file"
 msgstr "Erro ao copiar arquivo"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1176
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1824,11 +1836,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1136 meld/vcview.py:764
+#: meld/dirdiff.py:1201 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Erro ao excluir {}"
 
-#: meld/dirdiff.py:1626
+#: meld/dirdiff.py:1692
 msgid "No folder"
 msgstr "Nenhum pasta"
 
@@ -1863,56 +1875,56 @@ msgstr "Cancelar"
 msgid "Mark _Resolved"
 msgstr "Marcar como _resolvido"
 
-#: meld/filediff.py:1589
+#: meld/filediff.py:1591
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Ocorreu um problema ao abrir o arquivo “%s”."
 
-#: meld/filediff.py:1598
+#: meld/filediff.py:1600
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "O arquivo %s parece ser um arquivo binário."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1602
 msgid "Do you want to open the file using the default application?"
 msgstr "Você gostaria de abrir o arquivo usando o aplicativo padrão?"
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1604
 msgid "Open"
 msgstr "Abrir"
 
-#: meld/filediff.py:1616
+#: meld/filediff.py:1626
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Mesclando arquivos"
 
-#: meld/filediff.py:1630
+#: meld/filediff.py:1640
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Analisando diferenças"
 
-#: meld/filediff.py:1690
+#: meld/filediff.py:1700
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "O arquivo %s foi alterado em disco"
 
-#: meld/filediff.py:1691
+#: meld/filediff.py:1701
 msgid "Do you want to reload the file?"
 msgstr "Deseja recarregar o arquivo?"
 
-#: meld/filediff.py:1693
+#: meld/filediff.py:1703
 msgid "_Reload"
 msgstr "_Recarregar"
 
-#: meld/filediff.py:1863
+#: meld/filediff.py:1873
 msgid "File {} is being compared to itself"
 msgstr "Arquivo {} sendo comparado consigo próprio"
 
-#: meld/filediff.py:1872
+#: meld/filediff.py:1882
 msgid "Files are identical"
 msgstr "Os arquivos são idênticos"
 
-#: meld/filediff.py:1885
+#: meld/filediff.py:1895
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1920,11 +1932,11 @@ msgstr ""
 "Filtros de texto estão sendo usados e podem estar escondendo diferenças "
 "entre os arquivos. Você gostaria de comparar os arquivos sem filtro?"
 
-#: meld/filediff.py:1890
+#: meld/filediff.py:1900
 msgid "Files differ in line endings only"
 msgstr "Arquivos se diferenciam nos fins de linha apenas"
 
-#: meld/filediff.py:1892
+#: meld/filediff.py:1902
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1933,15 +1945,15 @@ msgstr ""
 "Arquivos são idênticos, exceto pela diferença entre fins de linha:\n"
 "%s"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1922
 msgid "Show without filters"
 msgstr "Mostrar sem filtros"
 
-#: meld/filediff.py:1934
+#: meld/filediff.py:1944
 msgid "Change highlighting incomplete"
 msgstr "Alteração de destaque incompleta"
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1945
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1950,19 +1962,19 @@ msgstr ""
 "grandes. Você pode forçar o Meld a levar mais tempo para destacar alterações "
 "longas, porém isso pode ser bem lento."
 
-#: meld/filediff.py:1943
+#: meld/filediff.py:1953
 msgid "Keep highlighting"
 msgstr "Manter destaque"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1955
 msgid "_Keep highlighting"
 msgstr "_Manter destaque"
 
-#: meld/filediff.py:1958
+#: meld/filediff.py:1968
 msgid "Saving failed"
 msgstr "Salvamento falhou"
 
-#: meld/filediff.py:1959
+#: meld/filediff.py:1969
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1970,36 +1982,36 @@ msgstr ""
 "Por favor, considere copiar quaisquer alterações críticas para outro "
 "programa ou arquivo para evita perda de dados."
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:1978
 msgid "Save Left Pane As"
 msgstr "Salvar o painel esquerdo como"
 
-#: meld/filediff.py:1970
+#: meld/filediff.py:1980
 msgid "Save Middle Pane As"
 msgstr "Salvar o painel do meio como"
 
-#: meld/filediff.py:1972
+#: meld/filediff.py:1982
 msgid "Save Right Pane As"
 msgstr "Salvar o painel direito como"
 
-#: meld/filediff.py:1983
+#: meld/filediff.py:1993
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "O arquivo %s foi alterado em disco após ter sido aberto"
 
-#: meld/filediff.py:1985
+#: meld/filediff.py:1995
 msgid "If you save it, any external changes will be lost."
 msgstr "Se você não salvá-lo, quaisquer mudanças externas serão perdidas."
 
-#: meld/filediff.py:1988
+#: meld/filediff.py:1998
 msgid "Save Anyway"
 msgstr "Salvar mesmo assim"
 
-#: meld/filediff.py:1989
+#: meld/filediff.py:1999
 msgid "Don’t Save"
 msgstr "Não salvar"
 
-#: meld/filediff.py:2031
+#: meld/filediff.py:2041
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2007,7 +2019,7 @@ msgstr ""
 "O arquivo “{}” contém caracteres que não pode ser codificado usando "
 "codificação “{}”."
 
-#: meld/filediff.py:2035 meld/patchdialog.py:138
+#: meld/filediff.py:2045 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2016,16 +2028,16 @@ msgstr ""
 "Não foi possível salvar o arquivo pois:\n"
 "%s"
 
-#: meld/filediff.py:2039 meld/patchdialog.py:137
+#: meld/filediff.py:2049 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Não foi possível salvar o arquivo %s."
 
-#: meld/filediff.py:2440
+#: meld/filediff.py:2450
 msgid "Live comparison updating disabled"
 msgstr "Atualização em tempo real de comparação desabilitada"
 
-#: meld/filediff.py:2441
+#: meld/filediff.py:2451
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2185,7 +2197,7 @@ msgid "Need three files to auto-merge, got: %r"
 msgstr ""
 "É necessário ter três arquivos para mesclar automaticamente, obtive: %r"
 
-#: meld/meldwindow.py:403
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Não foi possível comparar uma mistura de arquivos e diretórios"
 
@@ -2340,6 +2352,10 @@ msgstr "Faltando"
 msgid "Not present"
 msgstr "Não presente"
 
+#: meld/vc/_vc.py:82
+msgid "Scanning…"
+msgstr "Escaneando…"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
 #: meld/vcview.py:334
@@ -2379,12 +2395,12 @@ msgstr "Localização: {path}"
 #. create iterators that may be invalidated.
 #: meld/vcview.py:419
 msgid "Scanning repository"
-msgstr "Varrendo repositório"
+msgstr "Escaneando repositório"
 
 #: meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
-msgstr "Varrendo %s"
+msgstr "Escaneando %s"
 
 #: meld/vcview.py:487
 msgid "(Empty)"

From ef859d8edf8f9a0ba09688344bae5ab3d2f0a336 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Mon, 31 Jan 2022 07:17:42 +1000
Subject: [PATCH 032/116] dirdiff: Fix lint errors and update CanonicalListing
 typing

This adds in some additional typing for the update CanonicalListing
class, and also fixes some minor linting problems.
---
 meld/dirdiff.py | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index d168423e..67de2187 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -27,7 +27,7 @@
 from collections import namedtuple
 from decimal import Decimal
 from mmap import ACCESS_COPY, mmap
-from typing import List, Optional, Tuple
+from typing import DefaultDict, List, Optional, Tuple
 
 from gi.repository import Gdk, Gio, GLib, GObject, Gtk
 
@@ -263,6 +263,7 @@ def add_error(self, parent, msg, pane):
         }
         super().add_error(parent, msg, pane, defaults)
 
+
 class ComparisonOptions:
     def __init__(self):
         self.ignore_case = False
@@ -272,26 +273,30 @@ def __init__(self):
 class CanonicalListing:
     """Multi-pane lists with canonicalised matching and error detection"""
 
-    def __init__(self, n, compare):
+    items: DefaultDict[str, List[Optional[str]]]
+    errors: List[Tuple[int, str, str]]
+
+    def __init__(self, n: int, options: ComparisonOptions):
         self.items = collections.defaultdict(lambda: [None] * n)
         self.errors = []
-        self.compare = compare
+        self.options = options
 
-    def add(self, pane, item):
+    def add(self, pane: int, item: str):
         # normalize the name depending on settings
         ci = item
-        if self.compare.ignore_case:
+        if self.options.ignore_case:
             ci = ci.lower()
-        if self.compare.normalize_encoding:
+        if self.options.normalize_encoding:
             # NFC or NFD will work here, changing all composed or decomposed
             # characters to the same set for matching only.
             ci = unicodedata.normalize('NFC', ci)
 
         # add the item to the comparison tree
-        if self.items[ci][pane] is None:
+        existing_item = self.items[ci][pane]
+        if existing_item is None:
             self.items[ci][pane] = item
         else:
-            self.errors.append((pane, item, self.items[ci][pane]))
+            self.errors.append((pane, item, existing_item))
 
     def get(self):
         def filled(seq):

From fb3b03b088f6e9d1654d0b174a43d6717d581c6f Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Mon, 31 Jan 2022 07:23:33 +1000
Subject: [PATCH 033/116] dirdiff: Re-jig comparison option usage

The main change here is making comparison options not be an attribute,
but rather just recreate it when doing our scan. The reason here is that
it's nicer to not have duplicate state on the class, and it's somewhat
better to have the action state be explicit.

This change also fixes a linting error that was breaking CI.
---
 meld/dirdiff.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 67de2187..971dd61f 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -265,9 +265,14 @@ def add_error(self, parent, msg, pane):
 
 
 class ComparisonOptions:
-    def __init__(self):
-        self.ignore_case = False
-        self.normalize_encoding = False
+    def __init__(
+        self,
+        *,
+        ignore_case: bool = False,
+        normalize_encoding: bool = False,
+    ):
+        self.ignore_case = ignore_case
+        self.normalize_encoding = normalize_encoding
 
 
 class CanonicalListing:
@@ -495,8 +500,6 @@ def __init__(self, num_panes):
                 "text-filters-changed", self.on_text_filters_changed)
         ]
 
-        self.compare = ComparisonOptions()
-
         # Handle overview map visibility binding. Because of how we use
         # grid packing, we need two revealers here instead of the more
         # obvious one.
@@ -830,9 +833,12 @@ def _search_recursively_iter(self, rootpath):
         shadowed_entries = []
         invalid_filenames = []
 
-        # TODO: Map this to a GObject prop instead?
-        self.compare.ignore_case = self.get_action_state('folder-ignore-case')
-        self.compare.normalize_encoding = self.get_action_state('folder-normalize-encoding')
+        # TODO: Map these action states to GObject props instead?
+        comparison_options = ComparisonOptions(
+            ignore_case=self.get_action_state('folder-ignore-case'),
+            normalize_encoding=self.get_action_state(
+                'folder-normalize-encoding'),
+        )
 
         while len(todo):
             todo.sort()  # depth first
@@ -850,8 +856,8 @@ def _search_recursively_iter(self, rootpath):
             differences = False
             encoding_errors = []
 
-            dirs = CanonicalListing(self.num_panes, self.compare)
-            files = CanonicalListing(self.num_panes, self.compare)
+            dirs = CanonicalListing(self.num_panes, comparison_options)
+            files = CanonicalListing(self.num_panes, comparison_options)
 
             for pane, root in enumerate(roots):
                 if not os.path.isdir(root):

From 02d5f6c97ce2366a2feb1191468bf2df1d2cba9b Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Mon, 31 Jan 2022 07:53:02 +0000
Subject: [PATCH 034/116] Update Ukrainian translation

---
 po/uk.po | 86 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index 91966aaa..e90c334c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-01-08 23:40+0000\n"
-"PO-Revision-Date: 2022-01-09 14:36+0200\n"
+"POT-Creation-Date: 2022-01-30 21:55+0000\n"
+"PO-Revision-Date: 2022-01-31 09:52+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\n"
@@ -869,7 +869,7 @@ msgstr "Однакові"
 msgid "New"
 msgstr "Новий"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Змінено"
@@ -878,19 +878,24 @@ msgstr "Змінено"
 msgid "Ignore filename case"
 msgstr "Ігнорувати регістр літер у назвах файлів"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr ""
+"Нормалізувати шляхи у Unicode"
+
+#: meld/resources/gtk/menus.ui:175
 msgid "Normal"
 msgstr "Звичайний"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Поза керуванням версіями"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Проігноровано"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:190
 msgid "Flatten folders"
 msgstr "Сплощувати теки"
 
@@ -1150,7 +1155,7 @@ msgstr "Файл 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:537
+#: meld/dirdiff.py:556
 msgid "Name"
 msgstr "Назва"
 
@@ -1190,7 +1195,7 @@ msgstr "Циклічний пошук"
 msgid "Replace _All"
 msgstr "Замінити _все"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1157 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1180 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "За_мінити"
 
@@ -1577,7 +1582,7 @@ msgstr "Якщо ви не збережете внесені зміни, їх б
 msgid "Close _without Saving"
 msgstr "Закрити _без збереження"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1156
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1179
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Скасувати"
@@ -1687,55 +1692,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:558 meld/preferences.py:132
+#: meld/dirdiff.py:577 meld/preferences.py:132
 msgid "Size"
 msgstr "Розмір"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:566 meld/preferences.py:133
+#: meld/dirdiff.py:585 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Час внесення змін"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:574 meld/preferences.py:134
-#| msgid "Modification time"
+#: meld/dirdiff.py:593 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Час внесення змін (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:582 meld/preferences.py:135
+#: meld/dirdiff.py:601 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Права доступу"
 
-#: meld/dirdiff.py:832
+#: meld/dirdiff.py:851
 #, python-brace-format
 msgid "{filename} (scanning…)"
-msgstr ""
-"{filename} (сканування…)"
+msgstr "{filename} (сканування…)"
 
-#: meld/dirdiff.py:864 meld/dirdiff.py:888
+#: meld/dirdiff.py:883 meld/dirdiff.py:915
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Скануємо {folder}"
 
-#: meld/dirdiff.py:1028
+#: meld/dirdiff.py:1051
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Виконано"
 
-#: meld/dirdiff.py:1041
+#: meld/dirdiff.py:1064
 msgid "Folder {} is being compared to itself"
 msgstr "Виконуємо порівняння теки {} із самою собою"
 
-#: meld/dirdiff.py:1047
+#: meld/dirdiff.py:1070
 msgid "Folders have no differences"
 msgstr "Між теками немає відмінностей"
 
-#: meld/dirdiff.py:1049
+#: meld/dirdiff.py:1072
 msgid "Contents of scanned files in folders are identical."
 msgstr "Вміст сканованих файлів у теках є тотожним."
 
-#: meld/dirdiff.py:1051
+#: meld/dirdiff.py:1074
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1743,45 +1746,45 @@ msgstr ""
 "Здається, скановані файли у теках є тотожними, але програма не перевіряла "
 "їхній вміст."
 
-#: meld/dirdiff.py:1054
+#: meld/dirdiff.py:1077
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Використано фільтри файлів, тому сканування виконувалося не для усіх файлів."
 
-#: meld/dirdiff.py:1056
+#: meld/dirdiff.py:1079
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Використано текстові фільтри, що могли замаскувати відмінності у вмісті "
 "файлів."
 
-#: meld/dirdiff.py:1072 meld/filediff.py:1917
+#: meld/dirdiff.py:1095 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Приховати"
 
-#: meld/dirdiff.py:1074 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/dirdiff.py:1097 meld/filediff.py:1919 meld/filediff.py:1949
 #: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Сховати"
 
-#: meld/dirdiff.py:1083
+#: meld/dirdiff.py:1106
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Під час сканування цієї теки було виявлено декілька помилок"
 
-#: meld/dirdiff.py:1084
+#: meld/dirdiff.py:1107
 msgid "Files with invalid encodings found"
 msgstr "Знайдено файли із некоректним кодуванням"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1109
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Кодування деяких файлів є помилковим. Назви десь такі:"
 
-#: meld/dirdiff.py:1088
+#: meld/dirdiff.py:1111
 msgid "Files hidden by case insensitive comparison"
 msgstr "Файли приховано нечутливим до регістру порівнянням"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1090
+#: meld/dirdiff.py:1113
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1789,17 +1792,17 @@ msgstr ""
 "Ви виконуєте нечутливе до регістру порівняння в чутливій до регістру "
 "файловій системі. Вказані нижче рядки у цій теці приховано:"
 
-#: meld/dirdiff.py:1101
+#: meld/dirdiff.py:1124
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "«{first_file}» приховано «{second_file}»"
 
-#: meld/dirdiff.py:1160
+#: meld/dirdiff.py:1183
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Замінити теку «%s»?"
 
-#: meld/dirdiff.py:1162
+#: meld/dirdiff.py:1185
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1808,11 +1811,11 @@ msgstr ""
 "У «%s» вже існує інша тека з такою ж назвою.\n"
 "Якщо ви замістите наявну теку, усі файли у ній буде втрачено."
 
-#: meld/dirdiff.py:1175
+#: meld/dirdiff.py:1198
 msgid "Error copying file"
 msgstr "Помилка під час копіювання файла"
 
-#: meld/dirdiff.py:1176
+#: meld/dirdiff.py:1199
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1825,11 +1828,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1201 meld/vcview.py:764
+#: meld/dirdiff.py:1224 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Помилка під час спроби вилучити {}"
 
-#: meld/dirdiff.py:1691
+#: meld/dirdiff.py:1715
 msgid "No folder"
 msgstr "Немає теки"
 
@@ -2183,7 +2186,7 @@ msgstr "Назва файла"
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Для автоматичного об'єднання потрібно 3 файли. Маємо: %r"
 
-#: meld/meldwindow.py:403
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Неможливо порівняти суміш файлів і тек"
 
@@ -2343,7 +2346,6 @@ msgid "Not present"
 msgstr "Немає"
 
 #: meld/vc/_vc.py:82
-#| msgid "Scanning %s"
 msgid "Scanning…"
 msgstr "Сканування…"
 

From d46b1e0463c0221029610538b8dfca7c66cd8352 Mon Sep 17 00:00:00 2001
From: Matheus Barbosa <mdpb.matheus@gmail.com>
Date: Sat, 5 Feb 2022 08:11:55 +0000
Subject: [PATCH 035/116] Update Brazilian Portuguese translation

---
 po/pt_BR.po | 78 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 941871b3..2fca3eca 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-01-17 21:20+0000\n"
-"PO-Revision-Date: 2022-01-24 20:24-0300\n"
+"POT-Creation-Date: 2022-01-30 21:55+0000\n"
+"PO-Revision-Date: 2022-01-31 14:23-0300\n"
 "Last-Translator: Matheus Barbosa <mdpb.matheus@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -866,7 +866,7 @@ msgstr "Iguais"
 msgid "New"
 msgstr "Novos"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Modificados"
@@ -875,19 +875,23 @@ msgstr "Modificados"
 msgid "Ignore filename case"
 msgstr "Ignorar maiúsculas/minúsculas em nomes de arquivos"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr "Normalizar caminhos Unicode"
+
+#: meld/resources/gtk/menus.ui:175
 msgid "Normal"
 msgstr "Normal"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Sem controle de versão"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:190
 msgid "Flatten folders"
 msgstr "Achata pastas"
 
@@ -1158,7 +1162,7 @@ msgstr "Arquivo 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:537
+#: meld/dirdiff.py:556
 msgid "Name"
 msgstr "Nome"
 
@@ -1198,7 +1202,7 @@ msgstr "Voltou ao início"
 msgid "Replace _All"
 msgstr "Substituir _todos"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1157 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1180 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "_Substituir"
 
@@ -1586,7 +1590,7 @@ msgstr "Se você não salvar, as mudanças serão perdidas permanentemente."
 msgid "Close _without Saving"
 msgstr "_Fechar sem salvar"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1156
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1179
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -1696,53 +1700,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:558 meld/preferences.py:132
+#: meld/dirdiff.py:577 meld/preferences.py:132
 msgid "Size"
 msgstr "Tamanho"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:566 meld/preferences.py:133
+#: meld/dirdiff.py:585 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Hora da modificação"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:574 meld/preferences.py:134
+#: meld/dirdiff.py:593 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Hora da modificação (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:582 meld/preferences.py:135
+#: meld/dirdiff.py:601 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Permissões"
 
-#: meld/dirdiff.py:832
+#: meld/dirdiff.py:851
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (escaneando…)"
 
-#: meld/dirdiff.py:864 meld/dirdiff.py:888
+#: meld/dirdiff.py:883 meld/dirdiff.py:915
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Escaneando {folder}"
 
-#: meld/dirdiff.py:1028
+#: meld/dirdiff.py:1051
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Concluído"
 
-#: meld/dirdiff.py:1041
+#: meld/dirdiff.py:1064
 msgid "Folder {} is being compared to itself"
 msgstr "Pasta {} sendo comparada consigo própria"
 
-#: meld/dirdiff.py:1047
+#: meld/dirdiff.py:1070
 msgid "Folders have no differences"
 msgstr "As pastas têm nenhuma diferença"
 
-#: meld/dirdiff.py:1049
+#: meld/dirdiff.py:1072
 msgid "Contents of scanned files in folders are identical."
 msgstr "Conteúdos de arquivos verificados em pastas são idênticos."
 
-#: meld/dirdiff.py:1051
+#: meld/dirdiff.py:1074
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1750,48 +1754,48 @@ msgstr ""
 "Arquivos verificados em pastas parecem ser idênticos, mas conteúdos não "
 "foram verificados."
 
-#: meld/dirdiff.py:1054
+#: meld/dirdiff.py:1077
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Filtros de arquivo estão em uso, portanto nem todos os arquivos foram "
 "verificados."
 
-#: meld/dirdiff.py:1056
+#: meld/dirdiff.py:1079
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Filtros de texto estão sendo usados e podem estar escondendo diferenças no "
 "conteúdo."
 
-#: meld/dirdiff.py:1072 meld/filediff.py:1917
+#: meld/dirdiff.py:1095 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Ocultar"
 
-#: meld/dirdiff.py:1074 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/dirdiff.py:1097 meld/filediff.py:1919 meld/filediff.py:1949
 #: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "Ocu_ltar"
 
-#: meld/dirdiff.py:1083
+#: meld/dirdiff.py:1106
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Ocorreram vários erros ao escanear este diretório"
 
-#: meld/dirdiff.py:1084
+#: meld/dirdiff.py:1107
 msgid "Files with invalid encodings found"
 msgstr "Arquivos com codificações inválidas encontrados"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1109
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Alguns arquivos estavam com uma codificação incorreta. Os nomes são algo "
 "como:"
 
-#: meld/dirdiff.py:1088
+#: meld/dirdiff.py:1111
 msgid "Files hidden by case insensitive comparison"
 msgstr "Arquivos ocultos pela comparação não sensível a maiusculização"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1090
+#: meld/dirdiff.py:1113
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1800,17 +1804,17 @@ msgstr ""
 "minúsculas em um sistema de arquivos que diferencia. Os seguintes arquivos "
 "neste diretório ficam ocultos:"
 
-#: meld/dirdiff.py:1101
+#: meld/dirdiff.py:1124
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}” ocultado por “{second_file}”"
 
-#: meld/dirdiff.py:1160
+#: meld/dirdiff.py:1183
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Substituir pasta “%s”?"
 
-#: meld/dirdiff.py:1162
+#: meld/dirdiff.py:1185
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1819,11 +1823,11 @@ msgstr ""
 "Uma outra pasta com o mesmo nome já existe em “%s”.\n"
 "Se você substituir a pasta existente, todos os arquivos nela serão perdidos."
 
-#: meld/dirdiff.py:1175
+#: meld/dirdiff.py:1198
 msgid "Error copying file"
 msgstr "Erro ao copiar arquivo"
 
-#: meld/dirdiff.py:1176
+#: meld/dirdiff.py:1199
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1836,11 +1840,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1201 meld/vcview.py:764
+#: meld/dirdiff.py:1224 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Erro ao excluir {}"
 
-#: meld/dirdiff.py:1692
+#: meld/dirdiff.py:1715
 msgid "No folder"
 msgstr "Nenhum pasta"
 

From 5059238bb421b07f82e34e52f40539fe61e7fe0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Sun, 6 Feb 2022 12:09:06 +0100
Subject: [PATCH 036/116] Update Polish translation

---
 po/pl.po | 80 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 59d256d9..5756f12e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-01-08 23:40+0000\n"
-"PO-Revision-Date: 2022-01-09 14:58+0100\n"
+"POT-Creation-Date: 2022-01-30 21:55+0000\n"
+"PO-Revision-Date: 2022-02-06 12:08+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -866,7 +866,7 @@ msgstr "Takie same"
 msgid "New"
 msgstr "Nowe"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Zmodyfikowane"
@@ -875,19 +875,23 @@ msgstr "Zmodyfikowane"
 msgid "Ignore filename case"
 msgstr "Ignorowanie wielkości liter w nazwach plików"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr "Normalizowanie ścieżek Unicode"
+
+#: meld/resources/gtk/menus.ui:175
 msgid "Normal"
 msgstr "Zwykłe"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Poza systemem kontroli wersji"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Zignorowane"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:190
 msgid "Flatten folders"
 msgstr "Uprość wyświetlaną strukturę katalogów"
 
@@ -1149,7 +1153,7 @@ msgstr "1. plik"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:537
+#: meld/dirdiff.py:556
 msgid "Name"
 msgstr "Nazwa"
 
@@ -1189,7 +1193,7 @@ msgstr "Automatyczny powrót do początku"
 msgid "Replace _All"
 msgstr "Zamień _wszystkie"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1157 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1180 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "Z_amień"
 
@@ -1577,7 +1581,7 @@ msgstr ""
 msgid "Close _without Saving"
 msgstr "Zamknij _bez zapisywania"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1156
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1179
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Anuluj"
@@ -1687,53 +1691,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:558 meld/preferences.py:132
+#: meld/dirdiff.py:577 meld/preferences.py:132
 msgid "Size"
 msgstr "Rozmiar"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:566 meld/preferences.py:133
+#: meld/dirdiff.py:585 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Czas modyfikacji"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:574 meld/preferences.py:134
+#: meld/dirdiff.py:593 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Czas modyfikacji (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:582 meld/preferences.py:135
+#: meld/dirdiff.py:601 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: meld/dirdiff.py:832
+#: meld/dirdiff.py:851
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (skanowanie…)"
 
-#: meld/dirdiff.py:864 meld/dirdiff.py:888
+#: meld/dirdiff.py:883 meld/dirdiff.py:915
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Skanowanie {folder}"
 
-#: meld/dirdiff.py:1028
+#: meld/dirdiff.py:1051
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Ukończono"
 
-#: meld/dirdiff.py:1041
+#: meld/dirdiff.py:1064
 msgid "Folder {} is being compared to itself"
 msgstr "Katalog {} jest porównywany z samym sobą"
 
-#: meld/dirdiff.py:1047
+#: meld/dirdiff.py:1070
 msgid "Folders have no differences"
 msgstr "Katalogi się nie różnią"
 
-#: meld/dirdiff.py:1049
+#: meld/dirdiff.py:1072
 msgid "Contents of scanned files in folders are identical."
 msgstr "Treść zeskanowanych plików w katalogach jest identyczna."
 
-#: meld/dirdiff.py:1051
+#: meld/dirdiff.py:1074
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1741,44 +1745,44 @@ msgstr ""
 "Zeskanowane pliki wydają się identyczne, ale treść mogła nie zostać "
 "zeskanowana."
 
-#: meld/dirdiff.py:1054
+#: meld/dirdiff.py:1077
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Filtry plików są używane, więc nie wszystkie pliki zostały zeskanowane."
 
-#: meld/dirdiff.py:1056
+#: meld/dirdiff.py:1079
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Filtry tekstowe są używane i mogą ukrywać różnice między plikami."
 
-#: meld/dirdiff.py:1072 meld/filediff.py:1917
+#: meld/dirdiff.py:1095 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Ukryj"
 
-#: meld/dirdiff.py:1074 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/dirdiff.py:1097 meld/filediff.py:1919 meld/filediff.py:1949
 #: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Ukryj"
 
-#: meld/dirdiff.py:1083
+#: meld/dirdiff.py:1106
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Wystąpiło wiele błędów podczas skanowania tego katalogu"
 
-#: meld/dirdiff.py:1084
+#: meld/dirdiff.py:1107
 msgid "Files with invalid encodings found"
 msgstr "Odnaleziono pliki z nieprawidłowym kodowaniem znaków"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1109
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Niektóre pliki mają nieprawidłowe kodowanie znaków. Nazwy tych plików to:"
 
-#: meld/dirdiff.py:1088
+#: meld/dirdiff.py:1111
 msgid "Files hidden by case insensitive comparison"
 msgstr "Pliku ukryte przez porównywanie bez uwzględniania wielkości liter"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1090
+#: meld/dirdiff.py:1113
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1787,17 +1791,17 @@ msgstr ""
 "w systemie plików, który rozróżnia wielkość liter. Następujące pliki w tym "
 "katalogu zostały ukryte:"
 
-#: meld/dirdiff.py:1101
+#: meld/dirdiff.py:1124
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "„{first_file}” ukryty przez „{second_file}”"
 
-#: meld/dirdiff.py:1160
+#: meld/dirdiff.py:1183
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Zastąpić katalog „%s”?"
 
-#: meld/dirdiff.py:1162
+#: meld/dirdiff.py:1185
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1807,11 +1811,11 @@ msgstr ""
 "Zastąpienie istniejącego katalogu spowoduje utratę wszystkich plików w nim "
 "zawartych."
 
-#: meld/dirdiff.py:1175
+#: meld/dirdiff.py:1198
 msgid "Error copying file"
 msgstr "Błąd podczas kopiowania pliku"
 
-#: meld/dirdiff.py:1176
+#: meld/dirdiff.py:1199
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1824,11 +1828,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1201 meld/vcview.py:764
+#: meld/dirdiff.py:1224 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Błąd podczas usuwania {}"
 
-#: meld/dirdiff.py:1691
+#: meld/dirdiff.py:1715
 msgid "No folder"
 msgstr "Brak katalogu"
 
@@ -2184,7 +2188,7 @@ msgstr "Nazwa pliku"
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Automatyczne scalenie wymaga trzech plików, otrzymano: %r"
 
-#: meld/meldwindow.py:403
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Jednoczesne porównanie plików i katalogów nie jest możliwe"
 

From 679f803ec8e87d79a446aef9454411e75b249008 Mon Sep 17 00:00:00 2001
From: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Mon, 7 Feb 2022 13:22:15 +0100
Subject: [PATCH 037/116] Updated Spanish translation

---
 po/es.po | 482 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 270 insertions(+), 212 deletions(-)

diff --git a/po/es.po b/po/es.po
index cca5a75f..13ed149e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,25 +8,25 @@
 # Jorge González <jorgegonz@svn.gnome.org>, 2004, 2005, 2007, 2008, 2009, 2010, 2011.
 #
 # Luisa Ceron <luisacerpe@gmail.com>, 2016.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011-2021.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011-2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld.master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-08-07 23:17+0000\n"
-"PO-Revision-Date: 2021-08-27 21:46+0200\n"
+"POT-Creation-Date: 2022-01-30 21:55+0000\n"
+"PO-Revision-Date: 2022-02-07 13:12+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Spanish - Spain <gnome-es-list@gnome.org>\n"
 "Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Gtranslator 41.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
-#: meld/resources/ui/appwindow.ui:9
+#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
 msgid "Meld"
 msgstr "Meld"
 
@@ -828,11 +828,11 @@ msgstr "Mezclar desde la derecha"
 msgid "Merge All"
 msgstr "Mezclar todo"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
 msgid "Add Synchronization Point"
 msgstr "Añadir punto de sincronización"
 
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
 msgid "Clear Synchronization Points"
 msgstr "Limpiar puntos de sincronización"
 
@@ -868,7 +868,7 @@ msgstr "Iguales"
 msgid "New"
 msgstr "Nuevo"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Modificado"
@@ -877,19 +877,23 @@ msgstr "Modificado"
 msgid "Ignore filename case"
 msgstr "Ignorar mayúsculas en nombres de archivos"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr "Normalizar rutas Unicode"
+
+#: meld/resources/gtk/menus.ui:175
 msgid "Normal"
 msgstr "Normal"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Sin versión"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:190
 msgid "Flatten folders"
 msgstr "Aplanar carpetas"
 
@@ -904,43 +908,43 @@ msgstr ""
 #: meld/resources/ui/about-dialog.ui:14
 msgid "translator-credits"
 msgstr ""
-"Daniel Mustieles <daniel.mustieles@gmail.com>, 2011 - 2013\n"
+"Daniel Mustieles <daniel.mustieles@gmail.com>, 2011 - 2022\n"
 "Jorge González <jorgegonz@svn.gnome.org>, 2004-2011\n"
 "Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004-2006"
 
-#: meld/resources/ui/appwindow.ui:29
+#: meld/resources/ui/appwindow.ui:30
 msgid "Start a new comparison"
 msgstr "Iniciar una nueva comparación"
 
-#: meld/resources/ui/appwindow.ui:45
+#: meld/resources/ui/appwindow.ui:46
 msgid "Open a recent comparison"
 msgstr "Abrir una comparación reciente"
 
-#: meld/resources/ui/appwindow.ui:73
+#: meld/resources/ui/appwindow.ui:74
 msgid "Go to the previous change"
 msgstr "Ir al cambio anterior"
 
-#: meld/resources/ui/appwindow.ui:93
+#: meld/resources/ui/appwindow.ui:94
 msgid "Go to the next change"
 msgstr "Ir al siguiente cambio"
 
-#: meld/resources/ui/appwindow.ui:123
+#: meld/resources/ui/appwindow.ui:124
 msgid "Go to the previous conflict"
 msgstr "Ir al conflicto anterior"
 
-#: meld/resources/ui/appwindow.ui:143
+#: meld/resources/ui/appwindow.ui:144
 msgid "Go to the next conflict"
 msgstr "Ir al siguiente conflicto"
 
-#: meld/resources/ui/appwindow.ui:192
+#: meld/resources/ui/appwindow.ui:193
 msgid "Version Filters"
 msgstr "Filtros de versión"
 
-#: meld/resources/ui/appwindow.ui:207 meld/resources/ui/preferences.ui:1472
+#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472
 msgid "File Filters"
 msgstr "Filtros de archivos"
 
-#: meld/resources/ui/appwindow.ui:222 meld/resources/ui/preferences.ui:1657
+#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657
 msgid "Text Filters"
 msgstr "Filtros de texto"
 
@@ -953,7 +957,7 @@ msgid "Column Name"
 msgstr "Nombre de la columna"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
 msgid "_Remove"
 msgstr "_Eliminar"
 
@@ -1037,6 +1041,27 @@ msgstr "A_brir externamente"
 msgid "_Copy File Paths"
 msgstr "_Copiar rutas de archivos"
 
+#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
+#: meld/resources/ui/dirdiff.ui:117
+#| msgid "Save file in this pane"
+msgid "Select folder to open in this pane"
+msgstr "Seleccione la carpeta que abrir en éste panel"
+
+#: meld/resources/ui/dirdiff.ui:43
+#| msgid "Folder"
+msgid "Folder 1"
+msgstr "Carpeta 1"
+
+#: meld/resources/ui/dirdiff.ui:84
+#| msgid "Folder"
+msgid "Folder 2"
+msgstr "Carpeta 2"
+
+#: meld/resources/ui/dirdiff.ui:125
+#| msgid "Folder"
+msgid "Folder 3"
+msgstr "Carpeta 3"
+
 #: meld/resources/ui/encoding-selector.ui:31
 msgid "Search text encoding…"
 msgstr "Codificación de texto de la búsqueda…"
@@ -1093,8 +1118,17 @@ msgstr "_Copiar"
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
-#: meld/resources/ui/filediff.ui:171
+#: meld/resources/ui/filediff-menus.ui:54
+msgid "Open Containing Folder"
+msgstr "Abrir la carpeta contenedora"
+
+#: meld/resources/ui/filediff-menus.ui:58
+#| msgid "_Copy File Paths"
+msgid "Copy Full Path"
+msgstr "Copiar la ruta completa"
+
+#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
+#: meld/resources/ui/filediff.ui:169
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -1103,31 +1137,31 @@ msgstr ""
 "archivo y realizar los cambios, pero estos cambios se deben guardar en un "
 "archivo nuevo."
 
-#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
-#: meld/resources/ui/filediff.ui:185
-msgid "Open file in this pane"
-msgstr "Abrir archivo en este panel"
-
-#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
-#: meld/resources/ui/filediff.ui:194
+#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
+#: meld/resources/ui/filediff.ui:183
 msgid "Save file in this pane"
 msgstr "Guardar archivo en este panel"
 
-#: meld/resources/ui/filediff.ui:73
+#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
+#: meld/resources/ui/filediff.ui:209
+msgid "Open file in this pane"
+msgstr "Abrir archivo en este panel"
+
+#: meld/resources/ui/filediff.ui:79
 msgid "File 3"
 msgstr "Fila 3"
 
-#: meld/resources/ui/filediff.ui:142
+#: meld/resources/ui/filediff.ui:148
 msgid "File 2"
 msgstr "Fila 2"
 
-#: meld/resources/ui/filediff.ui:207
+#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148
 msgid "File 1"
 msgstr "Fila 1"
 
 #. Create icon and filename CellRenderer
-#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
-#: meld/dirdiff.py:517
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
+#: meld/dirdiff.py:556
 msgid "Name"
 msgstr "Nombre"
 
@@ -1139,7 +1173,7 @@ msgstr "Patrón"
 msgid "Add new filter"
 msgstr "Añadir filtro nuevo"
 
-#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18
 msgid "_Add"
 msgstr "_Añadir"
 
@@ -1167,7 +1201,7 @@ msgstr "Ajustada"
 msgid "Replace _All"
 msgstr "Reemplazar _todo"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1067 meld/iohelpers.py:113
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1180 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "_Reemplazar"
 
@@ -1179,7 +1213,7 @@ msgstr "Cambiar entre busca y buscar y reemplazar"
 msgid "Search highlight mode…"
 msgstr "Modo de resaltado de la búsqueda…"
 
-#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:349
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342
 #: meld/newdifftab.py:49
 msgid "New comparison"
 msgstr "Nueva comparación"
@@ -1268,6 +1302,20 @@ msgstr "Paneles derecho y del medio"
 msgid "_Reverse patch direction"
 msgstr "Dirección in_versa del parche"
 
+#: meld/resources/ui/path-label.ui:23
+msgid "Path"
+msgstr "Ruta"
+
+#: meld/resources/ui/path-label.ui:62
+#| msgid "_Copy File Paths"
+msgid "Copy Path"
+msgstr "Copiar ruta"
+
+#: meld/resources/ui/path-label.ui:78
+#| msgid "Open File"
+msgid "Open Folder"
+msgstr "Abrir carpeta"
+
 #: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
 msgid "Preferences"
 msgstr "Preferencias"
@@ -1544,8 +1592,8 @@ msgstr "Los cambios se perderán permanentemente si no los guarda."
 msgid "Close _without Saving"
 msgstr "Cerrar _sin guardar"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1066
-#: meld/iohelpers.py:55 meld/iohelpers.py:112
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1179
+#: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -1569,95 +1617,70 @@ msgstr "_Comparar"
 msgid "Co_mmit…"
 msgstr "Co_mmit…"
 
-#: meld/resources/ui/vcview-menus.ui:15
-msgid "_Update"
-msgstr "_Actualizar"
-
-#: meld/resources/ui/vcview-menus.ui:30
+#: meld/resources/ui/vcview-menus.ui:26
 msgid "Re_vert"
 msgstr "Re_vertir"
 
-#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+#: meld/resources/ui/vcview-menus.ui:30
 msgid "Delete"
 msgstr "Eliminar"
 
-#: meld/resources/ui/vcview-menus.ui:41
-msgid "Mar_k as Resolved"
-msgstr "Mar_car como resuelto"
-
-#: meld/resources/ui/vcview.ui:73
-msgid "Commit…"
-msgstr "Efectuar…"
+#: meld/resources/ui/vcview-menus.ui:37
+#| msgid "Next Conflict"
+msgid "Resolve Conflict"
+msgstr "Resolver conflicto"
 
-#: meld/resources/ui/vcview.ui:74
+#: meld/resources/ui/vcview.ui:16
 msgid "Commit changes to version control"
 msgstr "Efectuar cambios en el control de versiones"
 
-#: meld/resources/ui/vcview.ui:86
-msgid "Update"
-msgstr "Actualizar"
-
-#: meld/resources/ui/vcview.ui:87
-msgid "Update working copy from version control"
-msgstr "Actualizar la copia de trabajo desde el control de versiones"
+#: meld/resources/ui/vcview.ui:21
+msgid "Commit…"
+msgstr "Efectuar…"
 
-#: meld/resources/ui/vcview.ui:99
-msgid "Push"
-msgstr "Empujar"
+#: meld/resources/ui/vcview.ui:38
+#| msgid "Push current change to the left"
+msgid "Pull remote changes to the local repository"
+msgstr "Descargar cambios remotos en el repositorio local"
 
-#: meld/resources/ui/vcview.ui:100
+#: meld/resources/ui/vcview.ui:51
 msgid "Push local changes to remote"
 msgstr "Empujar los cambios locales al equipo remoto"
 
-#: meld/resources/ui/vcview.ui:112
-msgid "Add"
-msgstr "Añadir"
-
-#: meld/resources/ui/vcview.ui:113
+#: meld/resources/ui/vcview.ui:74
 msgid "Add to version control"
 msgstr "Añadir al control de versiones"
 
-#: meld/resources/ui/vcview.ui:125
-msgid "Remove"
-msgstr "Quitar"
-
-#: meld/resources/ui/vcview.ui:126
+#: meld/resources/ui/vcview.ui:87
 msgid "Remove from version control"
 msgstr "Quitar del control de versiones"
 
-#: meld/resources/ui/vcview.ui:138
-msgid "Mark as Resolved"
-msgstr "Marcar como resuelto"
+#: meld/resources/ui/vcview.ui:100
+msgid "Revert working copy to original state"
+msgstr "Revertir la copia de trabajo al estado original"
 
-#: meld/resources/ui/vcview.ui:139
+#: meld/resources/ui/vcview.ui:113
 msgid "Mark as resolved in version control"
 msgstr "Marcar como resuelto en el control de versiones"
 
-#: meld/resources/ui/vcview.ui:151
-msgid "Revert"
-msgstr "Revertir"
+#: meld/resources/ui/vcview.ui:140
+#| msgid "Only one version control system found in this folder"
+msgid "Open version controlled folder in this pane"
+msgstr "Abrir carpeta controlada por versión en este panel"
 
-#: meld/resources/ui/vcview.ui:152
-msgid "Revert working copy to original state"
-msgstr "Revertir la copia de trabajo al estado original"
-
-#: meld/resources/ui/vcview.ui:165
-msgid "Delete from working copy"
-msgstr "Eliminar de la copia de trabajo"
-
-#: meld/resources/ui/vcview.ui:220
+#: meld/resources/ui/vcview.ui:229
 msgid "Location"
 msgstr "Lugar"
 
-#: meld/resources/ui/vcview.ui:229
+#: meld/resources/ui/vcview.ui:238
 msgid "Status"
 msgstr "Estado"
 
-#: meld/resources/ui/vcview.ui:238
+#: meld/resources/ui/vcview.ui:247
 msgid "Extra"
 msgstr "Adicional"
 
-#: meld/resources/ui/vcview.ui:270
+#: meld/resources/ui/vcview.ui:279
 msgid "Console output"
 msgstr "Salida de la consola"
 
@@ -1682,43 +1705,54 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:538 meld/preferences.py:132
+#: meld/dirdiff.py:577 meld/preferences.py:132
 msgid "Size"
 msgstr "Tamaño"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:546 meld/preferences.py:133
+#: meld/dirdiff.py:585 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Hora de modificación"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:593 meld/preferences.py:134
+#| msgid "Modification time"
+msgid "Modification time (ISO)"
+msgstr "Hora de modificación (ISO)"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:554 meld/preferences.py:134
+#: meld/dirdiff.py:601 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Permisos"
 
-#: meld/dirdiff.py:778 meld/dirdiff.py:802
+#: meld/dirdiff.py:851
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (analizando…)"
+
+#: meld/dirdiff.py:883 meld/dirdiff.py:915
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Analizando {folder}"
 
-#: meld/dirdiff.py:942
+#: meld/dirdiff.py:1051
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Hecho"
 
-#: meld/dirdiff.py:951
+#: meld/dirdiff.py:1064
 msgid "Folder {} is being compared to itself"
 msgstr "La carpeta {} se está comparando consigo misma"
 
-#: meld/dirdiff.py:957
+#: meld/dirdiff.py:1070
 msgid "Folders have no differences"
 msgstr "No hay diferencias entre las carpetas"
 
-#: meld/dirdiff.py:959
+#: meld/dirdiff.py:1072
 msgid "Contents of scanned files in folders are identical."
 msgstr "El contenido de los archivos analizados en carpetas es idéntico."
 
-#: meld/dirdiff.py:961
+#: meld/dirdiff.py:1074
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1726,48 +1760,48 @@ msgstr ""
 "Los archivos analizados en las carpetas parecen idénticos, pero no se ha "
 "analizado el contenido."
 
-#: meld/dirdiff.py:964
+#: meld/dirdiff.py:1077
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Se están usando filtros de archivos, por lo que no se han analizado todos "
 "los archivos."
 
-#: meld/dirdiff.py:966
+#: meld/dirdiff.py:1079
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Se están usando filtros de texto, y pueden estar ocultando diferencias entre "
 "archivos."
 
-#: meld/dirdiff.py:982 meld/filediff.py:1874
+#: meld/dirdiff.py:1095 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Ocultar"
 
-#: meld/dirdiff.py:984 meld/filediff.py:1876 meld/filediff.py:1906
-#: meld/filediff.py:1908 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1097 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Ocultar"
 
-#: meld/dirdiff.py:993
+#: meld/dirdiff.py:1106
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Ocurrieron varios errores al escanear esta carpeta"
 
-#: meld/dirdiff.py:994
+#: meld/dirdiff.py:1107
 msgid "Files with invalid encodings found"
 msgstr "Se encontraron archivos con codificaciones no válidas"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:996
+#: meld/dirdiff.py:1109
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Algunos archivos tienen una codificación incorrecta. Los nombres son como "
 "esto:"
 
-#: meld/dirdiff.py:998
+#: meld/dirdiff.py:1111
 msgid "Files hidden by case insensitive comparison"
 msgstr "Archivos ocultos por una comparación no sensible a capitalización"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1000
+#: meld/dirdiff.py:1113
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1776,17 +1810,17 @@ msgstr ""
 "sensible a capitalización. Los siguientes archivos de esta carpeta archivos "
 "están ocultos:"
 
-#: meld/dirdiff.py:1011
+#: meld/dirdiff.py:1124
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "«{first_file}» oculto por «{second_file}»"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1183
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "¿Reemplazar la carpeta «%s»?"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1185
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1795,11 +1829,11 @@ msgstr ""
 "Ya existe otra carpeta con el mismo nombre en «%s».\n"
 "Si reemplaza la carpeta existente, se perderán todos sus archivos."
 
-#: meld/dirdiff.py:1085
+#: meld/dirdiff.py:1198
 msgid "Error copying file"
 msgstr "Error al copiar el archivo"
 
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1199
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1812,19 +1846,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1111 meld/vcview.py:759
+#: meld/dirdiff.py:1224 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Error al eliminar {}"
 
-#: meld/dirdiff.py:1604
+#: meld/dirdiff.py:1715
 msgid "No folder"
 msgstr "No hay ninguna carpeta"
 
-#: meld/filediff.py:1144
+#: meld/filediff.py:1149
 msgid "Comparison results will be inaccurate"
 msgstr "Los resultados de la comparación pueden no ser precisos"
 
-#: meld/filediff.py:1146
+#: meld/filediff.py:1151
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1832,74 +1866,74 @@ msgstr ""
 "Un filtro cambia el número de líneas en el archivo, lo que no está "
 "soportado. La comparación no será exacta."
 
-#: meld/filediff.py:1218
+#: meld/filediff.py:1223
 msgid "Mark conflict as resolved?"
 msgstr "¿Marcar conflicto como resuelto?"
 
-#: meld/filediff.py:1220
+#: meld/filediff.py:1225
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Si el conflicto se ha resuelto con éxito, debe marcarlo como resuelto ahora."
 
-#: meld/filediff.py:1222
+#: meld/filediff.py:1227
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1228
 msgid "Mark _Resolved"
 msgstr "Mar_car como resuelto"
 
-#: meld/filediff.py:1556
+#: meld/filediff.py:1591
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Ha habido un problema al abrir el archivo «%s»."
 
-#: meld/filediff.py:1564
+#: meld/filediff.py:1600
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "El archivo %s parece ser un archivo binario."
 
-#: meld/filediff.py:1566
+#: meld/filediff.py:1602
 msgid "Do you want to open the file using the default application?"
 msgstr "¿Quiere abrir el archivo usando la aplicación predeterminada?"
 
-#: meld/filediff.py:1568
+#: meld/filediff.py:1604
 msgid "Open"
 msgstr "Abrir"
 
-#: meld/filediff.py:1582
+#: meld/filediff.py:1626
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Mezclando archivos"
 
-#: meld/filediff.py:1596
+#: meld/filediff.py:1640
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calculando las diferencias"
 
-#: meld/filediff.py:1657
+#: meld/filediff.py:1700
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "El archivo %s ha cambiado en el disco"
 
-#: meld/filediff.py:1658
+#: meld/filediff.py:1701
 msgid "Do you want to reload the file?"
 msgstr "¿Quiere recargar el archivo?"
 
-#: meld/filediff.py:1660
+#: meld/filediff.py:1703
 msgid "_Reload"
 msgstr "_Recargar"
 
-#: meld/filediff.py:1830
+#: meld/filediff.py:1873
 msgid "File {} is being compared to itself"
 msgstr "El archivo {]} se está comparando consigo mismo"
 
-#: meld/filediff.py:1839
+#: meld/filediff.py:1882
 msgid "Files are identical"
 msgstr "Los campos son idénticos"
 
-#: meld/filediff.py:1852
+#: meld/filediff.py:1895
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1907,11 +1941,11 @@ msgstr ""
 "Se están usando filtros de texto, y pueden estar ocultando diferencias entre "
 "archivos. ¿Quiere comparar los archivos no filtrados?"
 
-#: meld/filediff.py:1857
+#: meld/filediff.py:1900
 msgid "Files differ in line endings only"
 msgstr "Los archivos difieren en los finales de línea"
 
-#: meld/filediff.py:1859
+#: meld/filediff.py:1902
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1920,15 +1954,15 @@ msgstr ""
 "Los archivos son idénticos excepto por los finales de línea:\n"
 "%s"
 
-#: meld/filediff.py:1879
+#: meld/filediff.py:1922
 msgid "Show without filters"
 msgstr "Mostrar sin filtros"
 
-#: meld/filediff.py:1901
+#: meld/filediff.py:1944
 msgid "Change highlighting incomplete"
 msgstr "Cambiar el resaltado incompleto"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1945
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1937,19 +1971,19 @@ msgstr ""
 "forzar a Meld para que resalte los cambios largos, aunque esto haga que sea "
 "más lento."
 
-#: meld/filediff.py:1910
+#: meld/filediff.py:1953
 msgid "Keep highlighting"
 msgstr "Mantener el resaltado"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1955
 msgid "_Keep highlighting"
 msgstr "_Mantener el resaltado"
 
-#: meld/filediff.py:1925
+#: meld/filediff.py:1968
 msgid "Saving failed"
 msgstr "Falló al guardar"
 
-#: meld/filediff.py:1926
+#: meld/filediff.py:1969
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1957,36 +1991,36 @@ msgstr ""
 "Considere copiar cualquier cambio crítico a otro programa o archivo para "
 "evitar pérdida de datos."
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1978
 msgid "Save Left Pane As"
 msgstr "Guardar panel izquierdo como"
 
-#: meld/filediff.py:1937
+#: meld/filediff.py:1980
 msgid "Save Middle Pane As"
 msgstr "Guardar el panel central como"
 
-#: meld/filediff.py:1939
+#: meld/filediff.py:1982
 msgid "Save Right Pane As"
 msgstr "Guardar el panel derecho como"
 
-#: meld/filediff.py:1950
+#: meld/filediff.py:1993
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "El archivo %s ha cambiado en el disco desde que se abrió"
 
-#: meld/filediff.py:1952
+#: meld/filediff.py:1995
 msgid "If you save it, any external changes will be lost."
 msgstr "Si lo guarda, los cambios externos se perderán."
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:1998
 msgid "Save Anyway"
 msgstr "Guardar de todas formas"
 
-#: meld/filediff.py:1956
+#: meld/filediff.py:1999
 msgid "Don’t Save"
 msgstr "No guardar"
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2041
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1994,7 +2028,7 @@ msgstr ""
 "El archivo «{}» contiene caracteres no codificables con la codificación «{}» "
 "actual."
 
-#: meld/filediff.py:2002 meld/patchdialog.py:138
+#: meld/filediff.py:2045 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2003,20 +2037,16 @@ msgstr ""
 "No se pudo guardar el archivo debido a:\n"
 "%s"
 
-#: meld/filediff.py:2006 meld/patchdialog.py:137
+#: meld/filediff.py:2049 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "No se pudo guardar el archivo %s."
 
-#: meld/filediff.py:2067
-msgid "Open File"
-msgstr "Abrir archivo"
-
-#: meld/filediff.py:2421
+#: meld/filediff.py:2450
 msgid "Live comparison updating disabled"
 msgstr "Actualización de la comparación en directo desactivada"
 
-#: meld/filediff.py:2422
+#: meld/filediff.py:2451
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2027,32 +2057,32 @@ msgstr ""
 "manualmente la comparación y la comparación en directo se reanudará cuando "
 "se limpien los puntos de sincronización."
 
-#: meld/iohelpers.py:40
+#: meld/iohelpers.py:41
 msgid "Deleting remote folders is not supported"
 msgstr "No se soporta eliminar carpetas remotas"
 
-#: meld/iohelpers.py:42
+#: meld/iohelpers.py:43
 msgid "Not a file or directory"
 msgstr "No es un archivo ni una carpeta"
 
-#: meld/iohelpers.py:46
+#: meld/iohelpers.py:47
 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
 msgstr "No puede mover «{}» a la papelera. ¿Quiere eliminarlo inmediatamente?"
 
-#: meld/iohelpers.py:51
+#: meld/iohelpers.py:52
 msgid "This remote location does not support sending items to the trash."
 msgstr "Este lugar remoto no soporta enviar elementos a la papelera."
 
-#: meld/iohelpers.py:56
+#: meld/iohelpers.py:57
 msgid "_Delete Permanently"
 msgstr "_Eliminar permanentemente"
 
-#: meld/iohelpers.py:106
+#: meld/iohelpers.py:107
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "¿Reemplazar el archivo «%s»?"
 
-#: meld/iohelpers.py:108
+#: meld/iohelpers.py:109
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2163,20 +2193,20 @@ msgstr "carpeta remota «{}» no soportada"
 msgid "<unnamed>"
 msgstr "<sin nombre>"
 
-#: meld/melddoc.py:61
+#: meld/melddoc.py:124
 msgid "untitled"
 msgstr "sin título"
 
-#: meld/meldwindow.py:155
+#: meld/meldwindow.py:158
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: meld/meldwindow.py:384
+#: meld/meldwindow.py:381
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Se necesita tres archivos para la mezcla automática, se obtuvieron: %r"
 
-#: meld/meldwindow.py:406
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "No se puede comparar una mezcla de archivos y carpetas"
 
@@ -2204,7 +2234,7 @@ msgstr "etiqueta"
 msgid "pattern"
 msgstr "patrón"
 
-#: meld/recent.py:104
+#: meld/recent.py:111
 msgid "Version control:"
 msgstr "Control de versión:"
 
@@ -2223,6 +2253,11 @@ msgstr "{name} ({charset})"
 msgid "Plain Text"
 msgstr "Texto plano"
 
+#: meld/ui/pathlabel.py:36
+#| msgid "Filename filters"
+msgid "Unnamed file"
+msgstr "Archivo sin nombre"
+
 #. Abbreviation for line, column so that it will fit in the status bar
 #: meld/ui/statusbar.py:125
 #, python-brace-format
@@ -2245,9 +2280,7 @@ msgstr "No se efectuarán cambios en archivos"
 msgid "{unpushed_commits} in {unpushed_branches}"
 msgstr "{unpushed_commits} en {unpushed_branches}"
 
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: meld/vc/git.py:94 meld/vc/git.py:103
+#: meld/vc/git.py:94 meld/vc/git.py:104
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -2261,16 +2294,16 @@ msgid_plural "%d branches"
 msgstr[0] "%d rama"
 msgstr[1] "%d ramas"
 
-#: meld/vc/git.py:344
+#: meld/vc/git.py:345
 #, python-brace-format
 msgid "Mode changed from {old_mode} to {new_mode}"
 msgstr "Modo cambiado de {old_mode} a {new_mode}"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Partially staged"
 msgstr "Reservado parcialmente"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Staged"
 msgstr "Reservado"
 
@@ -2329,97 +2362,102 @@ msgstr "Falta"
 msgid "Not present"
 msgstr "No presente"
 
+#: meld/vc/_vc.py:82
+#| msgid "Scanning %s"
+msgid "Scanning…"
+msgstr "Analizando…"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
-#: meld/vcview.py:333
+#: meld/vcview.py:334
 #, python-format
 msgid "%(name)s (not found)"
 msgstr "%(name)s (no encontrado"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: meld/vcview.py:337
+#: meld/vcview.py:338
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s no está instalado)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: meld/vcview.py:341
+#: meld/vcview.py:342
 #, python-format
 msgid "%(name)s (invalid repository)"
 msgstr "%(name)s (repositorio no válido)"
 
-#: meld/vcview.py:355
+#: meld/vcview.py:356
 msgid "No valid version control system found in this folder"
 msgstr ""
 "No se ha encontrado un sistema de control de versiones válido en esta carpeta"
 
-#: meld/vcview.py:357
+#: meld/vcview.py:358
 msgid "Choose which version control system to use"
 msgstr "Elegir qué sistema de control de versiones usar"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:411
+#: meld/vcview.py:412
 #, python-brace-format
 msgid "Location: {path}"
 msgstr "Ubicación: {path}"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:418
+#: meld/vcview.py:419
 msgid "Scanning repository"
 msgstr "Analizando repositorio"
 
-#: meld/vcview.py:447
+#: meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "Analizando %s"
 
-#: meld/vcview.py:486
+#: meld/vcview.py:487
 msgid "(Empty)"
 msgstr "(Vacío)"
 
-#: meld/vcview.py:533
+#: meld/vcview.py:535
 #, python-format
 msgid "%s — local"
 msgstr "%s — local"
 
-#: meld/vcview.py:534
+#: meld/vcview.py:536
 #, python-format
 msgid "%s — remote"
 msgstr "%s — remoto"
 
-#: meld/vcview.py:542
+#: meld/vcview.py:544
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (local, mezcla, remoto)"
 
-#: meld/vcview.py:547
+#: meld/vcview.py:549
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (remoto, mezcla, local)"
 
-#: meld/vcview.py:558
+#: meld/vcview.py:560
 #, python-format
 msgid "%s — repository"
 msgstr "%s — repositorio"
 
-#: meld/vcview.py:564
+#: meld/vcview.py:566
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (funcionando, repositorio)"
 
-#: meld/vcview.py:568
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (repositorio, funcionando)"
 
-#: meld/vcview.py:730
+#: meld/vcview.py:735
 msgid "Remove folder and all its files?"
 msgstr "¿Quitar la carpeta y todos sus archivos?"
 
-#: meld/vcview.py:732
+#: meld/vcview.py:737
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2427,10 +2465,40 @@ msgstr ""
 "Esto quitará todos los archivos y carpetas seleccionadas, y todos los "
 "archivos de las carpetas seleccionadas, del control de versiones."
 
-#: meld/vcview.py:845
+#: meld/vcview.py:850
 msgid "Clear"
 msgstr "Limpiar"
 
+#~ msgid "_Update"
+#~ msgstr "_Actualizar"
+
+#~ msgid "Mar_k as Resolved"
+#~ msgstr "Mar_car como resuelto"
+
+#~ msgid "Update"
+#~ msgstr "Actualizar"
+
+#~ msgid "Update working copy from version control"
+#~ msgstr "Actualizar la copia de trabajo desde el control de versiones"
+
+#~ msgid "Push"
+#~ msgstr "Empujar"
+
+#~ msgid "Add"
+#~ msgstr "Añadir"
+
+#~ msgid "Remove"
+#~ msgstr "Quitar"
+
+#~ msgid "Mark as Resolved"
+#~ msgstr "Marcar como resuelto"
+
+#~ msgid "Revert"
+#~ msgstr "Revertir"
+
+#~ msgid "Delete from working copy"
+#~ msgstr "Eliminar de la copia de trabajo"
+
 #~ msgid "[%s] Scanning %s"
 #~ msgstr "[%s] Buscando %s"
 
@@ -2550,9 +2618,6 @@ msgstr "Limpiar"
 #~ msgid "Previous Conflict"
 #~ msgstr "Conflicto anterior"
 
-#~ msgid "Next Conflict"
-#~ msgstr "Siguiente conflicto"
-
 #~ msgid "Push to Left"
 #~ msgstr "Pasar a la izquierda"
 
@@ -2740,10 +2805,6 @@ msgstr "Limpiar"
 #~ msgid "Open Recent"
 #~ msgstr "Abrir recientes"
 
-#~ msgid "Only one version control system found in this folder"
-#~ msgstr ""
-#~ "Sólo se ha encontrado un sistema de control de versiones en esta carpeta"
-
 #~ msgid "Show toolbar"
 #~ msgstr "Mostrar la barra de herramientas"
 
@@ -3097,9 +3158,6 @@ msgstr "Limpiar"
 #~ msgid "_Browse..."
 #~ msgstr "_Examinar…"
 
-#~ msgid "Path"
-#~ msgstr "Ruta"
-
 #~ msgid "Path to file"
 #~ msgstr "Ruta al archivo"
 

From fc0cec87d2308a890466329d6005ad8f8d3b9d13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Urban=C4=8Di=C4=8D?= <mateju@src.gnome.org>
Date: Mon, 7 Feb 2022 19:55:13 +0000
Subject: [PATCH 038/116] Update Slovenian translation

---
 po/sl.po | 102 +++++++++++++++----------------------------------------
 1 file changed, 28 insertions(+), 74 deletions(-)

diff --git a/po/sl.po b/po/sl.po
index b735837d..c48ab72e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2009 meld's COPYRIGHT HOLDER
 # This file is distributed under the same license as the meld package.
 #
-# Matej Urbančič <mateju@src.gnome.org>, 2009–2022.
+# Matej Urbančič <mateju@src.gnome.org>, 2009–2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
 "POT-Creation-Date: 2021-05-11 10:00+0000\n"
-"PO-Revision-Date: 2022-01-17 22:13+0100\n"
+"PO-Revision-Date: 2021-11-21 21:52+0100\n"
 "Last-Translator: Matej Urbančič <mateju@src.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
@@ -46,20 +46,12 @@ msgid ""
 "two- and three-way comparison of both files and directories, and supports "
 "many version control systems including Git, Mercurial, Bazaar and Subversion."
 msgstr ""
-"Meld je napredno orodje za primerjavo in združevanje sprememb vsebine v "
-"različnih virih. Omogoča primerjavo datotek, map in virov sistema nadzora "
-"različic. Omogoča dvojno in trojno primerjavo datotek in map, podpira pa "
-"tudi različne sisteme za nadzov različic, vključno z Git, Mercurial, Bazaar "
-"in Subversion."
 
 #: data/org.gnome.meld.appdata.xml.in.in:21
-#, fuzzy
 msgid ""
 "Meld helps you review code changes, understand patches, and makes enormous "
 "merge conflicts slightly less painful."
 msgstr ""
-"Meld vam pomaga pregledati spremembe kode, razumeti obliže in naredi ogromne "
-"spajanje konfliktov nekoliko manj boleče."
 
 #: data/org.gnome.meld.appdata.xml.in.in:51
 msgid "The GNOME Project"
@@ -90,17 +82,12 @@ msgid "Additional automatically detected text encodings"
 msgstr "Dodatna samodejno zaznana kodiranja"
 
 #: data/org.gnome.meld.gschema.xml:59
-#, fuzzy
 msgid ""
 "Meld will use these text encodings to try to decode loaded text files before "
 "trying any other encodings. In addition to the encodings in this list, UTF-8 "
 "and the current locale-default encoding will always be used; other encodings "
 "may also be tried, depending on the user’s locale."
 msgstr ""
-"Meld bo s temi kodiranje besedila poskušal dekodirati naložene besedilne "
-"datoteke, preden poskusite katero koli drugo kodiranje. Poleg kodiranja na "
-"tem seznamu bosta vedno uporabljena UTF-8 in trenutno kodiranje na lokalni "
-"ravni; lahko tudi druge kodiranje, odvisno od uporabnikovega lokala."
 
 #: data/org.gnome.meld.gschema.xml:66
 msgid "Width of an indentation step"
@@ -111,9 +98,9 @@ msgid "The number of spaces to use for a single indent step"
 msgstr "Število presledkov za vsak korak zamika"
 
 #: data/org.gnome.meld.gschema.xml:71
+#, fuzzy
 msgid "Whether to indent using spaces or tabs"
-msgstr ""
-"Ali naj bodo za zamik besedila uporabljeni presledki namesto tabulatorjev"
+msgstr "Ali naj gedit vstavlja presledke namesto zamikov (tabulatorjev)."
 
 #: data/org.gnome.meld.gschema.xml:72
 msgid "If true, any new indentation will use spaces instead of tabs."
@@ -126,83 +113,67 @@ msgid "Show line numbers"
 msgstr "Pokaži številke vrstic"
 
 #: data/org.gnome.meld.gschema.xml:77
-#, fuzzy
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
-msgstr "Če je res, bodo številke vrstice prikazane v čreh primerjave datotek."
+msgstr ""
 
 #: data/org.gnome.meld.gschema.xml:81
 msgid "Highlight syntax"
 msgstr "Poudarjanje skladnje"
 
 #: data/org.gnome.meld.gschema.xml:82
-#, fuzzy
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld’s own color "
 "highlighting, this is off by default."
 msgstr ""
-"Ali poudariti sintakso v primerjavah. Zaradi Meld-ovega označevanje barv je "
-"to privzeto izklopljeno."
 
 #: data/org.gnome.meld.gschema.xml:86
+#, fuzzy
 msgid "Color scheme to use for syntax highlighting"
-msgstr "Barvna shema za poudarjanje skladnje."
+msgstr "Ime barvne sheme gtksourceview za poudarjanje skladnje."
 
 #: data/org.gnome.meld.gschema.xml:87
-#, fuzzy
 msgid "Used by GtkSourceView to determine colors for syntax highlighting"
-msgstr "GtkSourceView uporablja za določanje barv za označevanje sintakse"
+msgstr ""
 
 #: data/org.gnome.meld.gschema.xml:91
 msgid "Draw whitespace"
 msgstr "Pokaži presledne znake"
 
 #: data/org.gnome.meld.gschema.xml:92
-#, fuzzy
 msgid ""
 "If true, whitespace characters will be drawn in comparisons even if they are "
 "not in a changed area."
 msgstr ""
-"Če je res, bodo znaki belega prostora narisani v primerjavah, tudi če niso v "
-"spremenjenem območju."
 
 #: data/org.gnome.meld.gschema.xml:101
 msgid "Wrap mode"
 msgstr "Način preloma"
 
 #: data/org.gnome.meld.gschema.xml:102
-#, fuzzy
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
 "('word')."
 msgstr ""
-"Vrstice v primerjavah datotek bodo zavite v skladu s to nastavitev, bodisi "
-"sploh ne (\"nobena\"), pri nobenem znaku (\"char\") ali samo na koncu besed "
-"(\"beseda\")."
 
 #: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
 msgid "Highlight current line"
 msgstr "Poudari trenutno vrstico"
 
 #: data/org.gnome.meld.gschema.xml:110
-#, fuzzy
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr ""
-"Če je res, bo vrstica, ki vsebuje kazalko, označena v primerjavah datotek."
 
 #: data/org.gnome.meld.gschema.xml:114
 msgid "Use the system default monospace font"
 msgstr "Uporabi privzeto sistemsko pisavo stalne širine"
 
 #: data/org.gnome.meld.gschema.xml:115
-#, fuzzy
 msgid ""
 "If false, custom-font will be used instead of the system monospace font."
 msgstr ""
-"Če je napačna, bo namesto pisave v enoprostornem sistemu uporabljena pisava "
-"po meri."
 
 #: data/org.gnome.meld.gschema.xml:119
 msgid "Custom font"
@@ -213,8 +184,6 @@ msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
 msgstr ""
-"Pisava po meri za uporabo, shranjena kot niz in razčlenjena kot opis pisave "
-"Pango."
 
 #: data/org.gnome.meld.gschema.xml:126
 msgid "Show overview source map"
@@ -231,7 +200,7 @@ msgstr "Slog preglednega zemljevida"
 
 #: data/org.gnome.meld.gschema.xml:133
 msgid "Style options for how the overview map is displayed."
-msgstr "Možnosti sloga prikaza preglednega zemljevida."
+msgstr ""
 
 #: data/org.gnome.meld.gschema.xml:139
 msgid "Ignore blank lines when comparing files"
@@ -253,8 +222,9 @@ msgid ""
 msgstr ""
 
 #: data/org.gnome.meld.gschema.xml:152
+#, fuzzy
 msgid "The custom editor launch command"
-msgstr "Ukaz za zagon urejevalnika po meri"
+msgstr "Ukaz za zagon urejevalnika: "
 
 #: data/org.gnome.meld.gschema.xml:153
 msgid ""
@@ -287,36 +257,28 @@ msgid "Use shallow comparison"
 msgstr "Uporabi grobo primerjavo"
 
 #: data/org.gnome.meld.gschema.xml:170
-#, fuzzy
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
 "different otherwise."
 msgstr ""
-"Če je res, primerjave map primerjajo datoteke, ki temeljijo samo na "
-"velikosti in mtime, glede na to, da so datoteke enake, če se njihova "
-"velikost in mtime ujemata, in drugače."
 
 #: data/org.gnome.meld.gschema.xml:174
+#, fuzzy
 msgid "File timestamp resolution"
-msgstr "Ločljivost časovnega žiga"
+msgstr "Ločljivost časovnega _žiga:"
 
 #: data/org.gnome.meld.gschema.xml:175
-#, fuzzy
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
 "between two files before they’re considered to have different mtimes. This "
 "is useful when comparing files between filesystems with different timestamp "
 "resolution."
 msgstr ""
-"Pri primerjavi na podlagi mtime je to najmanjša razlika v nanosekondih med "
-"dvema datotekama, preden se šteje, da imajo različne mtimes. To je uporabno "
-"pri primerjanju datotek med datotečnimi stemi z različno ločljivostjo "
-"časovnega žiga."
 
 #: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
 msgid "Apply text filters during folder comparisons"
-msgstr "Uveljavi besedilne filtre med primerjavo map"
+msgstr ""
 
 #: data/org.gnome.meld.gschema.xml:180
 msgid ""
@@ -334,8 +296,9 @@ msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 
 #: data/org.gnome.meld.gschema.xml:191
+#, fuzzy
 msgid "Show the version control console output"
-msgstr "Pokaži odvod konzole nadzora različic"
+msgstr "Pokaži/Skrij odvod konzole"
 
 #: data/org.gnome.meld.gschema.xml:192
 msgid ""
@@ -356,8 +319,6 @@ msgstr ""
 #: data/org.gnome.meld.gschema.xml:201
 msgid "Present version comparisons as left-local/right-remote"
 msgstr ""
-"Trenutna primerjava različice poteka kot levo je krajevno / desno je "
-"oddaljeno"
 
 #: data/org.gnome.meld.gschema.xml:202
 msgid ""
@@ -379,8 +340,9 @@ msgid ""
 msgstr ""
 
 #: data/org.gnome.meld.gschema.xml:211
+#, fuzzy
 msgid "Show margin in commit message editor"
-msgstr "Pokaži rob v urejevalniku sporočila uveljavitve"
+msgstr "Pokaži desni rob v pogledu sporočil uveljavitev"
 
 #: data/org.gnome.meld.gschema.xml:212
 msgid ""
@@ -398,8 +360,6 @@ msgid ""
 "The column at which to show the margin in the version control commit message "
 "editor."
 msgstr ""
-"Stolpec pri katerem naj bo pokazan rob v urejevalniku sistema nadzora "
-"uveljavitve različic."
 
 #: data/org.gnome.meld.gschema.xml:221
 msgid "Automatically hard-wrap commit messages"
@@ -419,8 +379,6 @@ msgstr "Filtri nadzora različic"
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
-"Seznam stanj, uporabljenih za filtriranje vidnih datotek pri primerjavi "
-"različic."
 
 #: data/org.gnome.meld.gschema.xml:241
 msgid "Filename-based filters"
@@ -1122,7 +1080,7 @@ msgstr "_Zamenjaj"
 
 #: meld/resources/ui/findbar.ui:226
 msgid "Switch between Find and Find-and-Replace"
-msgstr "Preklop med možnostima Najdi in Najdi in Zamenjaj"
+msgstr ""
 
 #: meld/resources/ui/language-selector.ui:31
 msgid "Search highlight mode…"
@@ -1336,8 +1294,9 @@ msgid "Version Comparisons"
 msgstr "Primerjave različic"
 
 #: meld/resources/ui/preferences.ui:1104
+#, fuzzy
 msgid "_Order when comparing file revisions:"
-msgstr "Vrstni red primerjave predelav datotek:"
+msgstr "_Med primerjavo predelav datotek"
 
 #: meld/resources/ui/preferences.ui:1151
 msgid "Order when _merging files:"
@@ -1649,7 +1608,7 @@ msgstr "[{label}] končano"
 
 #: meld/dirdiff.py:951
 msgid "Folder {} is being compared to itself"
-msgstr "Mapo {} primerjate samo s seboj"
+msgstr ""
 
 #: meld/dirdiff.py:957
 msgid "Folders have no differences"
@@ -1657,7 +1616,7 @@ msgstr "V mapah ni razlik"
 
 #: meld/dirdiff.py:959
 msgid "Contents of scanned files in folders are identical."
-msgstr "Vsebina preiskanih datotek v mapah je enaka."
+msgstr ""
 
 #: meld/dirdiff.py:961
 msgid ""
@@ -1827,7 +1786,7 @@ msgstr "_Ponovno naloži"
 
 #: meld/filediff.py:1830
 msgid "File {} is being compared to itself"
-msgstr "Datoteko {} primerjate samo s seboj"
+msgstr ""
 
 #: meld/filediff.py:1839
 msgid "Files are identical"
@@ -1843,7 +1802,7 @@ msgstr ""
 
 #: meld/filediff.py:1857
 msgid "Files differ in line endings only"
-msgstr "Datoteki se razlikujeta le v končnih vrstičnih oznakah"
+msgstr ""
 
 #: meld/filediff.py:1859
 #, python-format
@@ -1851,8 +1810,6 @@ msgid ""
 "Files are identical except for differing line endings:\n"
 "%s"
 msgstr ""
-"Datoteki sta enaki, razlikujeta se le v končnih vrstičnih oznakah:\n"
-"%s"
 
 #: meld/filediff.py:1879
 msgid "Show without filters"
@@ -1957,7 +1914,7 @@ msgstr ""
 
 #: meld/iohelpers.py:40
 msgid "Deleting remote folders is not supported"
-msgstr "Brisanje oddaljenih map ni podprto"
+msgstr ""
 
 #: meld/iohelpers.py:42
 msgid "Not a file or directory"
@@ -1986,8 +1943,6 @@ msgid ""
 "A file with this name already exists in “%s”.\n"
 "If you replace the existing file, its contents will be lost."
 msgstr ""
-"Datoteka s tem imenom v »%s« žeobstaja.\n"
-"Če zamenjate obstoječo datoteko, bo izgubljena celotna vsebina."
 
 #: meld/meldapp.py:188
 msgid "wrong number of arguments supplied to --diff"
@@ -2100,7 +2055,7 @@ msgstr "Ime datoteke"
 #: meld/meldwindow.py:384
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
-msgstr "Za samodejno združevanje morajo biti navedene tri datoteke (ne %r)"
+msgstr ""
 
 #: meld/meldwindow.py:406
 msgid "Cannot compare a mixture of files and directories"
@@ -2133,7 +2088,6 @@ msgstr "Nadzor različic:"
 #: meld/style.py:91
 msgid "Couldn’t find colour scheme details for {}; this is a bad install"
 msgstr ""
-"Podrobnosti barvne sheme za {} ni mogoče najti! Namestitev je okvarjena."
 
 #: meld/ui/bufferselectors.py:110
 #, python-brace-format
@@ -2152,7 +2106,7 @@ msgstr "Vrstica {line}, Stolpec {column}"
 
 #: meld/ui/statusbar.py:185
 msgid "Line you want to move the cursor to"
-msgstr "Vrstica, na katero želite postaviti kazalko"
+msgstr ""
 
 #: meld/ui/vcdialogs.py:50
 msgid "No files will be committed"

From 35af887fe02ce4648118bd58e6056475be2c67a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Urban=C4=8Di=C4=8D?= <mateju@src.gnome.org>
Date: Mon, 7 Feb 2022 19:57:02 +0000
Subject: [PATCH 039/116] Update Slovenian translation

---
 po/sl.po | 832 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 474 insertions(+), 358 deletions(-)

diff --git a/po/sl.po b/po/sl.po
index c48ab72e..b83a3702 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2009 meld's COPYRIGHT HOLDER
 # This file is distributed under the same license as the meld package.
 #
-# Matej Urbančič <mateju@src.gnome.org>, 2009–2021.
+# Matej Urbančič <mateju@src.gnome.org>, 2009–2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-05-11 10:00+0000\n"
-"PO-Revision-Date: 2021-11-21 21:52+0100\n"
+"POT-Creation-Date: 2022-01-17 21:20+0000\n"
+"PO-Revision-Date: 2022-02-07 20:48+0100\n"
 "Last-Translator: Matej Urbančič <mateju@src.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Generator: Poedit 3.0\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
-#: meld/resources/ui/appwindow.ui:9
+#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
 msgid "Meld"
 msgstr "Meld"
 
@@ -46,12 +46,20 @@ msgid ""
 "two- and three-way comparison of both files and directories, and supports "
 "many version control systems including Git, Mercurial, Bazaar and Subversion."
 msgstr ""
+"Meld je napredno orodje za primerjavo in združevanje sprememb vsebine v "
+"različnih virih. Omogoča primerjavo datotek, map in virov sistema nadzora "
+"različic. Omogoča dvojno in trojno primerjavo datotek in map, podpira pa "
+"tudi različne sisteme za nadzov različic, vključno z Git, Mercurial, Bazaar "
+"in Subversion."
 
 #: data/org.gnome.meld.appdata.xml.in.in:21
+#, fuzzy
 msgid ""
 "Meld helps you review code changes, understand patches, and makes enormous "
 "merge conflicts slightly less painful."
 msgstr ""
+"Meld vam pomaga pregledati spremembe kode, razumeti obliže in naredi ogromne "
+"spajanje konfliktov nekoliko manj boleče."
 
 #: data/org.gnome.meld.appdata.xml.in.in:51
 msgid "The GNOME Project"
@@ -78,323 +86,388 @@ msgid "Default window fullscreen state"
 msgstr "Privzeto celozaslonsko stanje okna"
 
 #: data/org.gnome.meld.gschema.xml:58
+msgid "Prefer application-wide dark theme"
+msgstr "Prednostno uporabi temno različico programa."
+
+#: data/org.gnome.meld.gschema.xml:59
+#, fuzzy
+msgid ""
+"If true, the GTK dark theme variant will be used, if available. Note that "
+"this is separate from the syntax highlighting scheme."
+msgstr ""
+"Če je res, bo uporabljena različica temne teme GTK, če je na voljo. "
+"Upoštevajte, da je to ločeno od sheme za označevanje sintakse."
+
+#: data/org.gnome.meld.gschema.xml:65
 msgid "Additional automatically detected text encodings"
 msgstr "Dodatna samodejno zaznana kodiranja"
 
-#: data/org.gnome.meld.gschema.xml:59
+#: data/org.gnome.meld.gschema.xml:66
+#, fuzzy
 msgid ""
 "Meld will use these text encodings to try to decode loaded text files before "
 "trying any other encodings. In addition to the encodings in this list, UTF-8 "
 "and the current locale-default encoding will always be used; other encodings "
 "may also be tried, depending on the user’s locale."
 msgstr ""
+"Meld bo s temi kodiranje besedila poskušal dekodirati naložene besedilne "
+"datoteke, preden poskusite katero koli drugo kodiranje. Poleg kodiranja na "
+"tem seznamu bosta vedno uporabljena UTF-8 in trenutno kodiranje na lokalni "
+"ravni; lahko tudi druge kodiranje, odvisno od uporabnikovega lokala."
 
-#: data/org.gnome.meld.gschema.xml:66
+#: data/org.gnome.meld.gschema.xml:73
 msgid "Width of an indentation step"
 msgstr "Širina zamika"
 
-#: data/org.gnome.meld.gschema.xml:67
+#: data/org.gnome.meld.gschema.xml:74
 msgid "The number of spaces to use for a single indent step"
 msgstr "Število presledkov za vsak korak zamika"
 
-#: data/org.gnome.meld.gschema.xml:71
-#, fuzzy
+#: data/org.gnome.meld.gschema.xml:78
 msgid "Whether to indent using spaces or tabs"
-msgstr "Ali naj gedit vstavlja presledke namesto zamikov (tabulatorjev)."
+msgstr ""
+"Ali naj bodo za zamik besedila uporabljeni presledki namesto tabulatorjev"
 
-#: data/org.gnome.meld.gschema.xml:72
+#: data/org.gnome.meld.gschema.xml:79
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr ""
 "Izbrana možnost določa, da bo vsako novo zamikanje uporabljalo presledke "
 "namesto tabulatorja."
 
-#: data/org.gnome.meld.gschema.xml:76 meld/resources/ui/statusbar-menu.ui:5
+#: data/org.gnome.meld.gschema.xml:83 meld/resources/ui/statusbar-menu.ui:5
 msgid "Show line numbers"
 msgstr "Pokaži številke vrstic"
 
-#: data/org.gnome.meld.gschema.xml:77
+#: data/org.gnome.meld.gschema.xml:84
+#, fuzzy
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
-msgstr ""
+msgstr "Če je res, bodo številke vrstice prikazane v čreh primerjave datotek."
 
-#: data/org.gnome.meld.gschema.xml:81
+#: data/org.gnome.meld.gschema.xml:88
 msgid "Highlight syntax"
 msgstr "Poudarjanje skladnje"
 
-#: data/org.gnome.meld.gschema.xml:82
+#: data/org.gnome.meld.gschema.xml:89
+#, fuzzy
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld’s own color "
 "highlighting, this is off by default."
 msgstr ""
+"Ali poudariti sintakso v primerjavah. Zaradi Meld-ovega označevanje barv je "
+"to privzeto izklopljeno."
 
-#: data/org.gnome.meld.gschema.xml:86
-#, fuzzy
+#: data/org.gnome.meld.gschema.xml:93
 msgid "Color scheme to use for syntax highlighting"
-msgstr "Ime barvne sheme gtksourceview za poudarjanje skladnje."
+msgstr "Barvna shema za poudarjanje skladnje."
 
-#: data/org.gnome.meld.gschema.xml:87
+#: data/org.gnome.meld.gschema.xml:94
 msgid "Used by GtkSourceView to determine colors for syntax highlighting"
-msgstr ""
+msgstr "V uporabi pri GtkSourceView za določanje barv poudarjanja skladnje"
 
-#: data/org.gnome.meld.gschema.xml:91
+#: data/org.gnome.meld.gschema.xml:98
 msgid "Draw whitespace"
 msgstr "Pokaži presledne znake"
 
-#: data/org.gnome.meld.gschema.xml:92
+#: data/org.gnome.meld.gschema.xml:99
+#, fuzzy
 msgid ""
 "If true, whitespace characters will be drawn in comparisons even if they are "
 "not in a changed area."
 msgstr ""
+"Če je res, bodo znaki belega prostora narisani v primerjavah, tudi če niso v "
+"spremenjenem območju."
 
-#: data/org.gnome.meld.gschema.xml:101
+#: data/org.gnome.meld.gschema.xml:108
 msgid "Wrap mode"
 msgstr "Način preloma"
 
-#: data/org.gnome.meld.gschema.xml:102
+#: data/org.gnome.meld.gschema.xml:109
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
 "('word')."
 msgstr ""
+"Vrstice pri primerjavi datotek se prelamljajo po teh določili, bodisi sploh "
+"ne (»brez«), pri kateremkoli znaku (»char«) ali samo po koncu besed "
+"(»beseda«)."
 
-#: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
+#: data/org.gnome.meld.gschema.xml:116 meld/resources/ui/statusbar-menu.ui:13
 msgid "Highlight current line"
 msgstr "Poudari trenutno vrstico"
 
-#: data/org.gnome.meld.gschema.xml:110
+#: data/org.gnome.meld.gschema.xml:117
+#, fuzzy
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr ""
+"Če je res, bo vrstica, ki vsebuje kazalko, označena v primerjavah datotek."
 
-#: data/org.gnome.meld.gschema.xml:114
+#: data/org.gnome.meld.gschema.xml:121
 msgid "Use the system default monospace font"
 msgstr "Uporabi privzeto sistemsko pisavo stalne širine"
 
-#: data/org.gnome.meld.gschema.xml:115
+#: data/org.gnome.meld.gschema.xml:122
+#, fuzzy
 msgid ""
 "If false, custom-font will be used instead of the system monospace font."
 msgstr ""
+"Če je napačna, bo namesto pisave v enoprostornem sistemu uporabljena pisava "
+"po meri."
 
-#: data/org.gnome.meld.gschema.xml:119
+#: data/org.gnome.meld.gschema.xml:126
 msgid "Custom font"
 msgstr "Pisava po meri"
 
-#: data/org.gnome.meld.gschema.xml:120
+#: data/org.gnome.meld.gschema.xml:127
 msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
 msgstr ""
+"Pisava po meri za uporabo, shranjena kot niz in razčlenjena kot opis pisave "
+"Pango."
 
-#: data/org.gnome.meld.gschema.xml:126
+#: data/org.gnome.meld.gschema.xml:133
 msgid "Show overview source map"
 msgstr "Pokaži izvorni predogledni zemljevid"
 
-#: data/org.gnome.meld.gschema.xml:127
+#: data/org.gnome.meld.gschema.xml:134
+#, fuzzy
 msgid ""
 "If true, file comparisons will have paired source maps for compared files."
 msgstr ""
+"Če je res, bodo primerjave datotek imele združene izvorne zemljevide za "
+"primerjane datoteke."
 
-#: data/org.gnome.meld.gschema.xml:132
+#: data/org.gnome.meld.gschema.xml:139
 msgid "Style of overview map"
 msgstr "Slog preglednega zemljevida"
 
-#: data/org.gnome.meld.gschema.xml:133
+#: data/org.gnome.meld.gschema.xml:140
 msgid "Style options for how the overview map is displayed."
-msgstr ""
+msgstr "Možnosti sloga prikaza preglednega zemljevida."
 
-#: data/org.gnome.meld.gschema.xml:139
+#: data/org.gnome.meld.gschema.xml:146
 msgid "Ignore blank lines when comparing files"
 msgstr "Prezri prazne vrstice med primerjavo datotek"
 
-#: data/org.gnome.meld.gschema.xml:140
+#: data/org.gnome.meld.gschema.xml:147
+#, fuzzy
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
+"Če je res, bodo prazne vrstice pri označevanje sprememb med datotekami "
+"ošiljene."
 
-#: data/org.gnome.meld.gschema.xml:147
+#: data/org.gnome.meld.gschema.xml:154
 msgid "Use the system default editor"
 msgstr "Uporabi privzet sistemski urejevalnik besedil"
 
-#: data/org.gnome.meld.gschema.xml:148
+#: data/org.gnome.meld.gschema.xml:155
+#, fuzzy
 msgid ""
 "If false, custom-editor-command will be used instead of the system editor "
 "when opening files externally."
 msgstr ""
+"Če je napačno, bo namesto urejevalnika sistema uporabljen ukaz »Urejevalnik "
+"po meri« pri zunanjem odpiranju datotek."
 
-#: data/org.gnome.meld.gschema.xml:152
-#, fuzzy
+#: data/org.gnome.meld.gschema.xml:159
 msgid "The custom editor launch command"
-msgstr "Ukaz za zagon urejevalnika: "
+msgstr "Ukaz za zagon urejevalnika po meri"
 
-#: data/org.gnome.meld.gschema.xml:153
+#: data/org.gnome.meld.gschema.xml:160
 msgid ""
 "The command used to launch a custom editor. Some limited templating is "
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
 msgstr ""
+"Ukaz za zagon urejevalnika po meri. Podprta je osnovna predloga; trenutno "
+"prepoznana sta žetona »{file}« in »{line}«."
 
-#: data/org.gnome.meld.gschema.xml:159
+#: data/org.gnome.meld.gschema.xml:166
 msgid "Columns to display"
 msgstr "Prikazani stolpci"
 
-#: data/org.gnome.meld.gschema.xml:160
+#: data/org.gnome.meld.gschema.xml:167
+#, fuzzy
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
 msgstr ""
+"Seznam imen stolpcev v primerjavi z mapami in ali jih je treba prikazati."
 
-#: data/org.gnome.meld.gschema.xml:164 meld/resources/ui/preferences.ui:935
+#: data/org.gnome.meld.gschema.xml:171 meld/resources/ui/preferences.ui:951
 msgid "Ignore symbolic links"
 msgstr "Prezri simbolne povezave"
 
-#: data/org.gnome.meld.gschema.xml:165
+#: data/org.gnome.meld.gschema.xml:172
+#, fuzzy
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
 msgstr ""
+"Če je res, primerjave map pri prehodu drevesa mape ne sledijo simbolnim "
+"povezavam."
 
-#: data/org.gnome.meld.gschema.xml:169
+#: data/org.gnome.meld.gschema.xml:176
 msgid "Use shallow comparison"
 msgstr "Uporabi grobo primerjavo"
 
-#: data/org.gnome.meld.gschema.xml:170
+#: data/org.gnome.meld.gschema.xml:177
+#, fuzzy
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
 "different otherwise."
 msgstr ""
+"Če je res, primerjave map primerjajo datoteke, ki temeljijo samo na "
+"velikosti in mtime, glede na to, da so datoteke enake, če se njihova "
+"velikost in mtime ujemata, in drugače."
 
-#: data/org.gnome.meld.gschema.xml:174
-#, fuzzy
+#: data/org.gnome.meld.gschema.xml:181
 msgid "File timestamp resolution"
-msgstr "Ločljivost časovnega _žiga:"
+msgstr "Ločljivost časovnega žiga"
 
-#: data/org.gnome.meld.gschema.xml:175
+#: data/org.gnome.meld.gschema.xml:182
+#, fuzzy
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
 "between two files before they’re considered to have different mtimes. This "
 "is useful when comparing files between filesystems with different timestamp "
 "resolution."
 msgstr ""
+"Pri primerjavi na podlagi mtime je to najmanjša razlika v nanosekondih med "
+"dvema datotekama, preden se šteje, da imajo različne mtimes. To je uporabno "
+"pri primerjanju datotek med datotečnimi stemi z različno ločljivostjo "
+"časovnega žiga."
 
-#: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
+#: data/org.gnome.meld.gschema.xml:186 meld/resources/ui/preferences.ui:852
 msgid "Apply text filters during folder comparisons"
-msgstr ""
+msgstr "Uveljavi besedilne filtre med primerjavo map"
 
-#: data/org.gnome.meld.gschema.xml:180
+#: data/org.gnome.meld.gschema.xml:187
+#, fuzzy
 msgid ""
 "If true, folder comparisons that compare file contents also apply active "
 "text filters and the blank line trimming option, and ignore newline "
 "differences."
 msgstr ""
+"Če je res, primerjave map, ki primerjajo vsebino datoteke, uporabljajo tudi "
+"aktivne filtre besedila in možnost prazna črta za obrezovanje in prezrejo "
+"razlike v novi vrstici."
 
-#: data/org.gnome.meld.gschema.xml:184
+#: data/org.gnome.meld.gschema.xml:191
 msgid "File status filters"
 msgstr "Filtri stanja datotek"
 
-#: data/org.gnome.meld.gschema.xml:185
+#: data/org.gnome.meld.gschema.xml:192
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
+"Seznam stanj, uporabljenih za filtriranje vidnih datotek pri primerjavi map."
 
-#: data/org.gnome.meld.gschema.xml:191
-#, fuzzy
+#: data/org.gnome.meld.gschema.xml:198
 msgid "Show the version control console output"
-msgstr "Pokaži/Skrij odvod konzole"
+msgstr "Pokaži odvod konzole nadzora različic"
 
-#: data/org.gnome.meld.gschema.xml:192
+#: data/org.gnome.meld.gschema.xml:199
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:196
+#: data/org.gnome.meld.gschema.xml:203
 msgid "Version control pane position"
 msgstr "Položaj okna nadzora različic"
 
-#: data/org.gnome.meld.gschema.xml:197
+#: data/org.gnome.meld.gschema.xml:204
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:201
+#: data/org.gnome.meld.gschema.xml:208
 msgid "Present version comparisons as left-local/right-remote"
 msgstr ""
+"Trenutna primerjava različice poteka kot levo je krajevno / desno je "
+"oddaljeno"
 
-#: data/org.gnome.meld.gschema.xml:202
+#: data/org.gnome.meld.gschema.xml:209
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
 "a left-is-theirs, right-is-mine scheme is used."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:206
+#: data/org.gnome.meld.gschema.xml:213
 #, fuzzy
 msgid "Order for files in three-way version control merge comparisons"
 msgstr "Zagon primerjave nadzora različic"
 
-#: data/org.gnome.meld.gschema.xml:207
+#: data/org.gnome.meld.gschema.xml:214
 msgid ""
 "Choices for file order are remote/merged/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
 "control view, so is used solely for merges/conflict resolution within Meld."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:211
-#, fuzzy
+#: data/org.gnome.meld.gschema.xml:218
 msgid "Show margin in commit message editor"
-msgstr "Pokaži desni rob v pogledu sporočil uveljavitev"
+msgstr "Pokaži rob v urejevalniku sporočila uveljavitve"
 
-#: data/org.gnome.meld.gschema.xml:212
+#: data/org.gnome.meld.gschema.xml:219
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:216
-#, fuzzy
+#: data/org.gnome.meld.gschema.xml:223
 msgid "Margin column in commit message editor"
-msgstr "Pokaži desni rob v pogledu sporočil uveljavitev"
+msgstr "Stolpec roba v urejevalniku sporočil uveljavitev"
 
-#: data/org.gnome.meld.gschema.xml:217
+#: data/org.gnome.meld.gschema.xml:224
 msgid ""
 "The column at which to show the margin in the version control commit message "
 "editor."
 msgstr ""
+"Stolpec pri katerem naj bo pokazan rob v urejevalniku sistema nadzora "
+"uveljavitve različic."
 
-#: data/org.gnome.meld.gschema.xml:221
+#: data/org.gnome.meld.gschema.xml:228
 msgid "Automatically hard-wrap commit messages"
 msgstr "Samodejno na silo prelomi sporočila uveljavitve"
 
-#: data/org.gnome.meld.gschema.xml:222
+#: data/org.gnome.meld.gschema.xml:229
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the commit margin before commit."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:226
+#: data/org.gnome.meld.gschema.xml:233
 msgid "Version control status filters"
 msgstr "Filtri nadzora različic"
 
-#: data/org.gnome.meld.gschema.xml:227
+#: data/org.gnome.meld.gschema.xml:234
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
+"Seznam stanj, uporabljenih za filtriranje vidnih datotek pri primerjavi "
+"različic."
 
-#: data/org.gnome.meld.gschema.xml:241
+#: data/org.gnome.meld.gschema.xml:248
 msgid "Filename-based filters"
 msgstr "Filtri poimenovanja datotek"
 
-#: data/org.gnome.meld.gschema.xml:242
+#: data/org.gnome.meld.gschema.xml:249
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:256
+#: data/org.gnome.meld.gschema.xml:263
 msgid "Text-based filters"
 msgstr "Filtri besedila"
 
-#: data/org.gnome.meld.gschema.xml:257
+#: data/org.gnome.meld.gschema.xml:264
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
@@ -736,11 +809,11 @@ msgstr "Združi vse spremembe z desne"
 msgid "Merge All"
 msgstr "Združi vse"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
 msgid "Add Synchronization Point"
 msgstr "Dodaj točko usklajevanja"
 
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
 msgid "Clear Synchronization Points"
 msgstr "Počisti točke usklajevanja"
 
@@ -804,48 +877,48 @@ msgstr "Splošči mape"
 #: meld/resources/ui/about-dialog.ui:8
 msgid ""
 "Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2019 Kai Willadsen"
+"Copyright © 2009-2021 Kai Willadsen"
 msgstr ""
 "Avtorske pravice © 2002-2009 Stephen Kennedy\n"
-"Avtorske pravice © 2009-2019 Kai Willadsen"
+"Avtorske pravice © 2009-2021 Kai Willadsen"
 
 #: meld/resources/ui/about-dialog.ui:14
 msgid "translator-credits"
 msgstr "Matej Urbančič <mateju@src.gnome.org>"
 
-#: meld/resources/ui/appwindow.ui:29
+#: meld/resources/ui/appwindow.ui:30
 msgid "Start a new comparison"
 msgstr "Nova primerjava"
 
-#: meld/resources/ui/appwindow.ui:45
+#: meld/resources/ui/appwindow.ui:46
 msgid "Open a recent comparison"
 msgstr "Odpri nedavno primerjavo"
 
-#: meld/resources/ui/appwindow.ui:73
+#: meld/resources/ui/appwindow.ui:74
 msgid "Go to the previous change"
 msgstr "Skoči na predhodno spremembo"
 
-#: meld/resources/ui/appwindow.ui:93
+#: meld/resources/ui/appwindow.ui:94
 msgid "Go to the next change"
 msgstr "Skoči na naslednjo spremembo"
 
-#: meld/resources/ui/appwindow.ui:123
+#: meld/resources/ui/appwindow.ui:124
 msgid "Go to the previous conflict"
 msgstr "Skoči na predhodni niz v sporu"
 
-#: meld/resources/ui/appwindow.ui:143
+#: meld/resources/ui/appwindow.ui:144
 msgid "Go to the next conflict"
 msgstr "Skoči na naslednji niz v sporu"
 
-#: meld/resources/ui/appwindow.ui:192
+#: meld/resources/ui/appwindow.ui:193
 msgid "Version Filters"
 msgstr "Filtri različice"
 
-#: meld/resources/ui/appwindow.ui:207 meld/resources/ui/preferences.ui:1456
+#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472
 msgid "File Filters"
 msgstr "Filtri datotek"
 
-#: meld/resources/ui/appwindow.ui:222 meld/resources/ui/preferences.ui:1641
+#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657
 msgid "Text Filters"
 msgstr "Filtri besedila"
 
@@ -858,7 +931,7 @@ msgid "Column Name"
 msgstr "Ime stolpca"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -942,6 +1015,23 @@ msgstr "_Odpri v zunanjem programu"
 msgid "_Copy File Paths"
 msgstr "_Kopiraj poti datoteke"
 
+#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
+#: meld/resources/ui/dirdiff.ui:117
+msgid "Select folder to open in this pane"
+msgstr "Izbor mape za to okno"
+
+#: meld/resources/ui/dirdiff.ui:43
+msgid "Folder 1"
+msgstr "Mapa 1"
+
+#: meld/resources/ui/dirdiff.ui:84
+msgid "Folder 2"
+msgstr "Mapa 2"
+
+#: meld/resources/ui/dirdiff.ui:125
+msgid "Folder 3"
+msgstr "Mapa 3"
+
 #: meld/resources/ui/encoding-selector.ui:31
 msgid "Search text encoding…"
 msgstr "Iskanje kodiranja besedila …"
@@ -1000,8 +1090,16 @@ msgstr "_Kopiraj"
 msgid "_Paste"
 msgstr "Pr_ilepi"
 
-#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
-#: meld/resources/ui/filediff.ui:171
+#: meld/resources/ui/filediff-menus.ui:54
+msgid "Open Containing Folder"
+msgstr "Odpri vsebujočo mapo"
+
+#: meld/resources/ui/filediff-menus.ui:58
+msgid "Copy Full Path"
+msgstr "Kopiraj polno pot"
+
+#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
+#: meld/resources/ui/filediff.ui:169
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -1010,31 +1108,31 @@ msgstr ""
 "in vsebino spreminjate, vendar pa je treba spremembe shraniti v datoteko z "
 "drugim imenom."
 
-#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
-#: meld/resources/ui/filediff.ui:185
-msgid "Open file in this pane"
-msgstr "Odpri datoteko v tem oknu"
-
-#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
-#: meld/resources/ui/filediff.ui:194
+#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
+#: meld/resources/ui/filediff.ui:183
 msgid "Save file in this pane"
 msgstr "Shrani datoteko v tem oknu"
 
-#: meld/resources/ui/filediff.ui:73
+#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
+#: meld/resources/ui/filediff.ui:209
+msgid "Open file in this pane"
+msgstr "Odpri datoteko v tem oknu"
+
+#: meld/resources/ui/filediff.ui:79
 msgid "File 3"
 msgstr "Datoteka 3"
 
-#: meld/resources/ui/filediff.ui:142
+#: meld/resources/ui/filediff.ui:148
 msgid "File 2"
 msgstr "Datoteka 2"
 
-#: meld/resources/ui/filediff.ui:207
+#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148
 msgid "File 1"
 msgstr "Datoteka 1"
 
 #. Create icon and filename CellRenderer
-#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
-#: meld/dirdiff.py:517
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
+#: meld/dirdiff.py:537
 msgid "Name"
 msgstr "Ime"
 
@@ -1046,7 +1144,7 @@ msgstr "Vzorec"
 msgid "Add new filter"
 msgstr "Dodaj nov filter"
 
-#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -1074,19 +1172,19 @@ msgstr "Prelomljeno"
 msgid "Replace _All"
 msgstr "Zamenjaj _vse"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1067 meld/iohelpers.py:113
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1157 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
 #: meld/resources/ui/findbar.ui:226
 msgid "Switch between Find and Find-and-Replace"
-msgstr ""
+msgstr "Preklop med možnostima Najdi in Najdi in Zamenjaj"
 
 #: meld/resources/ui/language-selector.ui:31
 msgid "Search highlight mode…"
 msgstr "Način iskanja s poudarjanjem …"
 
-#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:349
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342
 #: meld/newdifftab.py:49
 msgid "New comparison"
 msgstr "Nova primerjava"
@@ -1103,43 +1201,43 @@ msgstr "Mapa"
 msgid "Version control"
 msgstr "Nadzor različic"
 
-#: meld/resources/ui/new-diff-tab.ui:235 meld/resources/ui/new-diff-tab.ui:355
+#: meld/resources/ui/new-diff-tab.ui:236 meld/resources/ui/new-diff-tab.ui:357
 msgid "_3-way comparison"
 msgstr "_Trojna primerjava"
 
-#: meld/resources/ui/new-diff-tab.ui:255
+#: meld/resources/ui/new-diff-tab.ui:256
 msgid "Select First File"
 msgstr "Izbor prve datoteke"
 
-#: meld/resources/ui/new-diff-tab.ui:269
+#: meld/resources/ui/new-diff-tab.ui:270
 msgid "Select Second File"
 msgstr "Izbor druge datoteke"
 
-#: meld/resources/ui/new-diff-tab.ui:284
+#: meld/resources/ui/new-diff-tab.ui:285
 msgid "Select Third File"
 msgstr "Izbor tretje datoteke"
 
-#: meld/resources/ui/new-diff-tab.ui:319
+#: meld/resources/ui/new-diff-tab.ui:321
 msgid "Select First Folder"
 msgstr "Izbor prve mape"
 
-#: meld/resources/ui/new-diff-tab.ui:332
+#: meld/resources/ui/new-diff-tab.ui:334
 msgid "Select Second Folder"
 msgstr "Izbor druge mape"
 
-#: meld/resources/ui/new-diff-tab.ui:346
+#: meld/resources/ui/new-diff-tab.ui:348
 msgid "Select Third Folder"
 msgstr "Izbor tretje mape"
 
-#: meld/resources/ui/new-diff-tab.ui:396
+#: meld/resources/ui/new-diff-tab.ui:399
 msgid "Select A Version-Controlled Folder"
 msgstr "Izbor mape nadzora različic"
 
-#: meld/resources/ui/new-diff-tab.ui:445
+#: meld/resources/ui/new-diff-tab.ui:448
 msgid "_Blank comparison"
 msgstr "_Prazna primerjava"
 
-#: meld/resources/ui/new-diff-tab.ui:462
+#: meld/resources/ui/new-diff-tab.ui:466
 msgid "C_ompare"
 msgstr "_Primerjava"
 
@@ -1175,6 +1273,18 @@ msgstr "Srednji in desni pladenj"
 msgid "_Reverse patch direction"
 msgstr "Obrni smer popravka"
 
+#: meld/resources/ui/path-label.ui:23
+msgid "Path"
+msgstr "Pot"
+
+#: meld/resources/ui/path-label.ui:62
+msgid "Copy Path"
+msgstr "Kopiraj pot"
+
+#: meld/resources/ui/path-label.ui:78
+msgid "Open Folder"
+msgstr "Odpri mapo"
+
 #: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
 msgid "Preferences"
 msgstr "Možnosti"
@@ -1226,103 +1336,106 @@ msgid "Show w_hitespace"
 msgstr "Pokaži _presledne znake"
 
 #: meld/resources/ui/preferences.ui:381
+msgid "Prefer dark theme"
+msgstr "Uporabi temno temo"
+
+#: meld/resources/ui/preferences.ui:397
 msgid "Use s_yntax highlighting"
 msgstr "Uporabi _barvno poudarjanje skladnje"
 
-#: meld/resources/ui/preferences.ui:404
+#: meld/resources/ui/preferences.ui:420
 msgid "Syntax highlighting color scheme:"
 msgstr "Barvna shema poudarjanja skladnje:"
 
-#: meld/resources/ui/preferences.ui:469
+#: meld/resources/ui/preferences.ui:485
 msgid "Code Overview"
 msgstr "Pregled kode"
 
-#: meld/resources/ui/preferences.ui:506
+#: meld/resources/ui/preferences.ui:522
 msgid "Show overview map"
 msgstr "Pokaži predogledni zemljevid"
 
-#: meld/resources/ui/preferences.ui:529
+#: meld/resources/ui/preferences.ui:545
 msgid "Overview map style:"
 msgstr "Slog predoglednega zemljevida:"
 
-#: meld/resources/ui/preferences.ui:596
+#: meld/resources/ui/preferences.ui:612
 msgid "External Editor"
 msgstr "Zunanji urejevalnik"
 
-#: meld/resources/ui/preferences.ui:632
+#: meld/resources/ui/preferences.ui:648
 msgid "Use _default system editor"
 msgstr "Uporabi _privzet sistemski urejevalnik besedil"
 
-#: meld/resources/ui/preferences.ui:655
+#: meld/resources/ui/preferences.ui:671
 msgid "Edito_r command:"
 msgstr "Ukaz _urejevalnika:"
 
-#: meld/resources/ui/preferences.ui:711
+#: meld/resources/ui/preferences.ui:727
 msgid "Editor"
 msgstr "Urejevalnik"
 
-#: meld/resources/ui/preferences.ui:732
+#: meld/resources/ui/preferences.ui:748
 msgid "Shallow Comparison"
 msgstr "Groba primerjava"
 
-#: meld/resources/ui/preferences.ui:768
+#: meld/resources/ui/preferences.ui:784
 msgid "C_ompare files based only on size and timestamp"
 msgstr "_Primerjaj datoteke na osnovi velikosti in časovnega žiga"
 
-#: meld/resources/ui/preferences.ui:791
+#: meld/resources/ui/preferences.ui:807
 msgid "_Timestamp resolution:"
 msgstr "Ločljivost časovnega _žiga:"
 
-#: meld/resources/ui/preferences.ui:855
+#: meld/resources/ui/preferences.ui:871
 msgid "Note: enabling text filters may make comparing large files much slower"
 msgstr ""
 
-#: meld/resources/ui/preferences.ui:904
+#: meld/resources/ui/preferences.ui:920
 msgid "Symbolic Links"
 msgstr "Simbolne povezave"
 
-#: meld/resources/ui/preferences.ui:972
+#: meld/resources/ui/preferences.ui:988
 msgid "Visible Columns"
 msgstr "Vidni stolpci"
 
-#: meld/resources/ui/preferences.ui:1039
+#: meld/resources/ui/preferences.ui:1055
 msgid "Folder Comparisons"
 msgstr "Primerjava map"
 
-#: meld/resources/ui/preferences.ui:1061
+#: meld/resources/ui/preferences.ui:1077
 msgid "Version Comparisons"
 msgstr "Primerjave različic"
 
-#: meld/resources/ui/preferences.ui:1104
-#, fuzzy
+#: meld/resources/ui/preferences.ui:1120
 msgid "_Order when comparing file revisions:"
-msgstr "_Med primerjavo predelav datotek"
+msgstr "Vrstni red primerjave predelav datotek:"
 
-#: meld/resources/ui/preferences.ui:1151
+#: meld/resources/ui/preferences.ui:1167
 msgid "Order when _merging files:"
 msgstr "Vrstni red _združevanja datotek:"
 
-#: meld/resources/ui/preferences.ui:1219
+#: meld/resources/ui/preferences.ui:1235
 msgid "Commit Messages"
 msgstr "Uveljavi sporočila"
 
-#: meld/resources/ui/preferences.ui:1260
+#: meld/resources/ui/preferences.ui:1276
 msgid "Show _right margin at:"
 msgstr "Pokaži _desni rob pri:"
 
-#: meld/resources/ui/preferences.ui:1301
+#: meld/resources/ui/preferences.ui:1317
 msgid "Automatically _break lines at right margin on commit"
 msgstr "Samodejno _prelomi vrstice na desnem robu ob uveljavitvi"
 
-#: meld/resources/ui/preferences.ui:1351
+#: meld/resources/ui/preferences.ui:1367
 msgid "Version Control"
 msgstr "Nadzor različic"
 
-#: meld/resources/ui/preferences.ui:1373
+#: meld/resources/ui/preferences.ui:1389
 msgid "Filename filters"
 msgstr "Datotečni filtri"
 
-#: meld/resources/ui/preferences.ui:1411
+#: meld/resources/ui/preferences.ui:1427
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -1332,20 +1445,19 @@ msgstr ""
 "vzorec na seznamu je zapisan z nadomestnimi znaki (npr: * in ?), ločenimi s "
 "presledki."
 
-#: meld/resources/ui/preferences.ui:1478
-#, fuzzy
+#: meld/resources/ui/preferences.ui:1494
 msgid "Change trimming"
-msgstr "Spremeni _v:"
+msgstr "Spremeni obrezovanje"
 
-#: meld/resources/ui/preferences.ui:1514
+#: meld/resources/ui/preferences.ui:1530
 msgid "Trim blank line differences from the start and end of changes"
 msgstr ""
 
-#: meld/resources/ui/preferences.ui:1558
+#: meld/resources/ui/preferences.ui:1574
 msgid "Text filters"
 msgstr "Filtri besedila"
 
-#: meld/resources/ui/preferences.ui:1596
+#: meld/resources/ui/preferences.ui:1612
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -1359,47 +1471,47 @@ msgstr ""
 "izraz vključuje skupine, so zamenjane le te. Več podrobnosti je zapisanih v "
 "priročniku."
 
-#: meld/resources/ui/preferences.ui:1687
+#: meld/resources/ui/preferences.ui:1703
 msgid "Left is remote, right is local"
 msgstr "Levo je oddaljeno, desno krajevno"
 
-#: meld/resources/ui/preferences.ui:1691
+#: meld/resources/ui/preferences.ui:1707
 msgid "Left is local, right is remote"
 msgstr "Levo je krajevno, desno oddaljeno"
 
-#: meld/resources/ui/preferences.ui:1705
+#: meld/resources/ui/preferences.ui:1721
 msgid "Simple change map"
 msgstr "Enostavno menjanje zemljevida"
 
-#: meld/resources/ui/preferences.ui:1709
+#: meld/resources/ui/preferences.ui:1725
 msgid "Compact source map"
 msgstr "Stisnjen zemljevid vira"
 
-#: meld/resources/ui/preferences.ui:1713
+#: meld/resources/ui/preferences.ui:1729
 msgid "Full source map"
 msgstr "Poln zemljevid vira"
 
-#: meld/resources/ui/preferences.ui:1727
+#: meld/resources/ui/preferences.ui:1743
 msgid "Remote, merge, local"
 msgstr "Oddaljeno, združi, krajevno"
 
-#: meld/resources/ui/preferences.ui:1731
+#: meld/resources/ui/preferences.ui:1747
 msgid "Local, merge, remote"
 msgstr "Krajevno, združi, oddaljeno"
 
-#: meld/resources/ui/preferences.ui:1753
+#: meld/resources/ui/preferences.ui:1769
 msgid "1ns (ext4)"
 msgstr "1ns (ext4)"
 
-#: meld/resources/ui/preferences.ui:1757
+#: meld/resources/ui/preferences.ui:1773
 msgid "100ns (NTFS)"
 msgstr "100ns (NTFS)"
 
-#: meld/resources/ui/preferences.ui:1761
+#: meld/resources/ui/preferences.ui:1777
 msgid "1s (ext2/ext3)"
 msgstr "1s (ext2/ext3)"
 
-#: meld/resources/ui/preferences.ui:1765
+#: meld/resources/ui/preferences.ui:1781
 msgid "2s (VFAT)"
 msgstr "2s (VFAT)"
 
@@ -1443,8 +1555,8 @@ msgstr "V kolikor sprememb ne shranite, bodo te trajno izgubljene."
 msgid "Close _without Saving"
 msgstr "Zapri _brez shranjevanja"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1066
-#: meld/iohelpers.py:55 meld/iohelpers.py:112
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1156
+#: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Prekliči"
 
@@ -1468,95 +1580,69 @@ msgstr "_Primerjava"
 msgid "Co_mmit…"
 msgstr "U_veljavi …"
 
-#: meld/resources/ui/vcview-menus.ui:15
-msgid "_Update"
-msgstr "_Posodobi"
-
-#: meld/resources/ui/vcview-menus.ui:30
+#: meld/resources/ui/vcview-menus.ui:26
 msgid "Re_vert"
 msgstr "Po&vrni"
 
-#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+#: meld/resources/ui/vcview-menus.ui:30
 msgid "Delete"
 msgstr "Izbriši"
 
-#: meld/resources/ui/vcview-menus.ui:41
-msgid "Mar_k as Resolved"
-msgstr "Označi kot _razrešeno"
-
-#: meld/resources/ui/vcview.ui:73
-msgid "Commit…"
-msgstr "Uveljavi …"
+#: meld/resources/ui/vcview-menus.ui:37
+msgid "Resolve Conflict"
+msgstr "Razreši spor"
 
-#: meld/resources/ui/vcview.ui:74
+#: meld/resources/ui/vcview.ui:16
 msgid "Commit changes to version control"
 msgstr "Uveljavi spremembe v sistem za nadzor različic"
 
-#: meld/resources/ui/vcview.ui:86
-msgid "Update"
-msgstr "Posodobi"
-
-#: meld/resources/ui/vcview.ui:87
-msgid "Update working copy from version control"
-msgstr "Posodobi delovno kopijo preko nadzora različic"
+#: meld/resources/ui/vcview.ui:21
+msgid "Commit…"
+msgstr "Uveljavi …"
 
-#: meld/resources/ui/vcview.ui:99
-msgid "Push"
-msgstr "Objavi"
+#: meld/resources/ui/vcview.ui:38
+#, fuzzy
+#| msgid "Push current change to the left"
+msgid "Pull remote changes to the local repository"
+msgstr "Potisni trenutne spremembe na levo"
 
-#: meld/resources/ui/vcview.ui:100
+#: meld/resources/ui/vcview.ui:51
 msgid "Push local changes to remote"
 msgstr "Objavi spremembe v oddaljeno skladišče"
 
-#: meld/resources/ui/vcview.ui:112
-msgid "Add"
-msgstr "Dodaj"
-
-#: meld/resources/ui/vcview.ui:113
+#: meld/resources/ui/vcview.ui:74
 msgid "Add to version control"
 msgstr "Dodaj v sistem nadzora različic"
 
-#: meld/resources/ui/vcview.ui:125
-msgid "Remove"
-msgstr "Odstrani"
-
-#: meld/resources/ui/vcview.ui:126
+#: meld/resources/ui/vcview.ui:87
 msgid "Remove from version control"
 msgstr "Odstrani iz sistema nadzora različic"
 
-#: meld/resources/ui/vcview.ui:138
-msgid "Mark as Resolved"
-msgstr "Označi kot razrešeno"
+#: meld/resources/ui/vcview.ui:100
+msgid "Revert working copy to original state"
+msgstr "Povrni delovno kopijo na izvorno stanje"
 
-#: meld/resources/ui/vcview.ui:139
+#: meld/resources/ui/vcview.ui:113
 msgid "Mark as resolved in version control"
 msgstr "Označi kot razrešeno v sistemu nadzora različic"
 
-#: meld/resources/ui/vcview.ui:151
-msgid "Revert"
-msgstr "Povrni"
-
-#: meld/resources/ui/vcview.ui:152
-msgid "Revert working copy to original state"
-msgstr "Povrni delovno kopijo na izvorno stanje"
-
-#: meld/resources/ui/vcview.ui:165
-msgid "Delete from working copy"
-msgstr "Izbriši iz delovne kopije"
+#: meld/resources/ui/vcview.ui:140
+msgid "Open version controlled folder in this pane"
+msgstr "Odpri mapo nadzora različic v tem oknu"
 
-#: meld/resources/ui/vcview.ui:220
+#: meld/resources/ui/vcview.ui:229
 msgid "Location"
 msgstr "Mesto"
 
-#: meld/resources/ui/vcview.ui:229
+#: meld/resources/ui/vcview.ui:238
 msgid "Status"
 msgstr "Stanje"
 
-#: meld/resources/ui/vcview.ui:238
+#: meld/resources/ui/vcview.ui:247
 msgid "Extra"
 msgstr "Dodatno"
 
-#: meld/resources/ui/vcview.ui:270
+#: meld/resources/ui/vcview.ui:279
 msgid "Console output"
 msgstr "Odvod konzole"
 
@@ -1581,86 +1667,95 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:538 meld/preferences.py:132
+#: meld/dirdiff.py:558 meld/preferences.py:132
 msgid "Size"
 msgstr "Velikost"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:546 meld/preferences.py:133
+#: meld/dirdiff.py:566 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Čas spremembe"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:574 meld/preferences.py:134
+msgid "Modification time (ISO)"
+msgstr "Čas spremembe (ISO)"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:554 meld/preferences.py:134
+#: meld/dirdiff.py:582 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: meld/dirdiff.py:778 meld/dirdiff.py:802
+#: meld/dirdiff.py:832
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (poteka preiskovanje …)"
+
+#: meld/dirdiff.py:864 meld/dirdiff.py:888
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Prebiranje mape {folder}"
 
-#: meld/dirdiff.py:942
+#: meld/dirdiff.py:1028
 #, python-brace-format
-#| msgid "[%s] Done"
 msgid "[{label}] Done"
 msgstr "[{label}] končano"
 
-#: meld/dirdiff.py:951
+#: meld/dirdiff.py:1041
 msgid "Folder {} is being compared to itself"
-msgstr ""
+msgstr "Mapo {} primerjate samo s seboj"
 
-#: meld/dirdiff.py:957
+#: meld/dirdiff.py:1047
 msgid "Folders have no differences"
 msgstr "V mapah ni razlik"
 
-#: meld/dirdiff.py:959
+#: meld/dirdiff.py:1049
 msgid "Contents of scanned files in folders are identical."
-msgstr ""
+msgstr "Vsebina preiskanih datotek v mapah je enaka."
 
-#: meld/dirdiff.py:961
+#: meld/dirdiff.py:1051
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 
-#: meld/dirdiff.py:964
+#: meld/dirdiff.py:1054
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 
-#: meld/dirdiff.py:966
+#: meld/dirdiff.py:1056
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 
-#: meld/dirdiff.py:982 meld/filediff.py:1874
+#: meld/dirdiff.py:1072 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Skrij"
 
-#: meld/dirdiff.py:984 meld/filediff.py:1876 meld/filediff.py:1906
-#: meld/filediff.py:1908 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1074 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: meld/dirdiff.py:993
+#: meld/dirdiff.py:1083
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape je prišlo do več napak."
 
-#: meld/dirdiff.py:994
+#: meld/dirdiff.py:1084
 msgid "Files with invalid encodings found"
 msgstr "Zaznane so datoteke z neveljavnim znakovnim naborom"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:996
+#: meld/dirdiff.py:1086
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Zaznane so datoteke z neveljavnim znakovnim naborom. Imena so na primer:"
 
-#: meld/dirdiff.py:998
+#: meld/dirdiff.py:1088
 msgid "Files hidden by case insensitive comparison"
 msgstr "Datoteke skrite zaradi primerjave brez upoštevanja velikosti črk"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1000
+#: meld/dirdiff.py:1090
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1668,35 +1763,30 @@ msgstr ""
 "Zagnan je način primerjave brez upoštevanja velikosti črk na sistemu, ki "
 "razlike velikosti upošteva. Nekatere datoteke so skrite:"
 
-#: meld/dirdiff.py:1011
+#: meld/dirdiff.py:1101
 #, fuzzy, python-brace-format
 #| msgid "'%s' hidden by '%s'"
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "'%s' je skrit; '%s'"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1160
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ali želite zamenjati mapo »%s«?"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1162
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
 "If you replace the existing folder, all files in it will be lost."
 msgstr ""
 
-#: meld/dirdiff.py:1085
+#: meld/dirdiff.py:1175
 msgid "Error copying file"
 msgstr "Napaka kopiranja datoteke"
 
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1176
 #, python-brace-format
-#| msgid ""
-#| "Couldn’t copy %s\n"
-#| "to %s.\n"
-#| "\n"
-#| "%s"
 msgid ""
 "Couldn’t copy {source}\n"
 "to {dest}.\n"
@@ -1708,91 +1798,91 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1111 meld/vcview.py:759
+#: meld/dirdiff.py:1201 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Napaka med brisanjem {}"
 
-#: meld/dirdiff.py:1604
+#: meld/dirdiff.py:1692
 msgid "No folder"
 msgstr "Ni mape"
 
-#: meld/filediff.py:1144
+#: meld/filediff.py:1149
 msgid "Comparison results will be inaccurate"
 msgstr "Rezultati primerjave ne bodo natančni"
 
-#: meld/filediff.py:1146
+#: meld/filediff.py:1151
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
 msgstr ""
 
-#: meld/filediff.py:1218
+#: meld/filediff.py:1223
 msgid "Mark conflict as resolved?"
 msgstr "Ali naj se spor označi kot razrešen?"
 
-#: meld/filediff.py:1220
+#: meld/filediff.py:1225
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 
-#: meld/filediff.py:1222
+#: meld/filediff.py:1227
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1228
 msgid "Mark _Resolved"
 msgstr "Označi kot _razrešeno"
 
-#: meld/filediff.py:1556
+#: meld/filediff.py:1591
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Prišlo je do napake med odpiranjem datoteke “%s”."
 
-#: meld/filediff.py:1564
+#: meld/filediff.py:1600
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Datoteka %s je videti kot dvojiška datoteka."
 
-#: meld/filediff.py:1566
+#: meld/filediff.py:1602
 msgid "Do you want to open the file using the default application?"
-msgstr ""
+msgstr "Ali želite odpreti datoteko z uporabo privzetega programa?"
 
-#: meld/filediff.py:1568
+#: meld/filediff.py:1604
 msgid "Open"
 msgstr "Odpri"
 
-#: meld/filediff.py:1582
+#: meld/filediff.py:1626
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Združevanje datotek"
 
-#: meld/filediff.py:1596
+#: meld/filediff.py:1640
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Računanje razlik"
 
-#: meld/filediff.py:1657
+#: meld/filediff.py:1700
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Datoteka %s je bila na disku spremenjena."
 
-#: meld/filediff.py:1658
+#: meld/filediff.py:1701
 msgid "Do you want to reload the file?"
 msgstr "Ali želite ponovno naložiti datoteko?"
 
-#: meld/filediff.py:1660
+#: meld/filediff.py:1703
 msgid "_Reload"
 msgstr "_Ponovno naloži"
 
-#: meld/filediff.py:1830
+#: meld/filediff.py:1873
 msgid "File {} is being compared to itself"
-msgstr ""
+msgstr "Datoteko {} primerjate samo s seboj"
 
-#: meld/filediff.py:1839
+#: meld/filediff.py:1882
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: meld/filediff.py:1852
+#: meld/filediff.py:1895
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1800,26 +1890,28 @@ msgstr ""
 "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
 "Ali naj se primerja vsebina brez dejavnih filtrov?"
 
-#: meld/filediff.py:1857
+#: meld/filediff.py:1900
 msgid "Files differ in line endings only"
-msgstr ""
+msgstr "Datoteki se razlikujeta le v končnih vrstičnih oznakah"
 
-#: meld/filediff.py:1859
+#: meld/filediff.py:1902
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
 "%s"
 msgstr ""
+"Datoteki sta enaki, razlikujeta se le v končnih vrstičnih oznakah:\n"
+"%s"
 
-#: meld/filediff.py:1879
+#: meld/filediff.py:1922
 msgid "Show without filters"
 msgstr "Pokaži brez filtrov"
 
-#: meld/filediff.py:1901
+#: meld/filediff.py:1944
 msgid "Change highlighting incomplete"
 msgstr "Spremeni označevanje kot nedokončano"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1945
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1827,60 +1919,60 @@ msgstr ""
 "Nekaterih sprememb ni mogoče poudariti, ker so prevelike. Označevanje je "
 "mogoče vsiliti, vendar je postopek lahko zelo dolgotrajen."
 
-#: meld/filediff.py:1910
+#: meld/filediff.py:1953
 msgid "Keep highlighting"
 msgstr "Poudarjanje skladnje"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1955
 msgid "_Keep highlighting"
 msgstr "_Poudarjanje skladnje"
 
-#: meld/filediff.py:1925
+#: meld/filediff.py:1968
 msgid "Saving failed"
 msgstr "Shranjevanje je spodletelo."
 
-#: meld/filediff.py:1926
+#: meld/filediff.py:1969
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
 msgstr ""
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1978
 msgid "Save Left Pane As"
 msgstr "Shrani levi pladenj kot"
 
-#: meld/filediff.py:1937
+#: meld/filediff.py:1980
 msgid "Save Middle Pane As"
 msgstr "Shrani srednji pladenj kot"
 
-#: meld/filediff.py:1939
+#: meld/filediff.py:1982
 msgid "Save Right Pane As"
 msgstr "Shrani desni pladenj kot"
 
-#: meld/filediff.py:1950
+#: meld/filediff.py:1993
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Datoteka %s je bila po odpiranju na disku spremenjena."
 
-#: meld/filediff.py:1952
+#: meld/filediff.py:1995
 msgid "If you save it, any external changes will be lost."
 msgstr "Če datoteko shranite, bodo vse zunanje spremembe izgubljene."
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:1998
 msgid "Save Anyway"
 msgstr "Vseeno shrani"
 
-#: meld/filediff.py:1956
+#: meld/filediff.py:1999
 msgid "Don’t Save"
 msgstr "Ne shrani"
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2041
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
 msgstr "Datoteka »{}« vsebuje znake, ki jih ni mogoče kodirati v naboru »{}«."
 
-#: meld/filediff.py:2002 meld/patchdialog.py:138
+#: meld/filediff.py:2045 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1889,20 +1981,16 @@ msgstr ""
 "Ni mogoče shraniti datoteko zaradi:\n"
 "%s"
 
-#: meld/filediff.py:2006 meld/patchdialog.py:137
+#: meld/filediff.py:2049 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Ni mogoče shraniti datoteke %s."
 
-#: meld/filediff.py:2067
-msgid "Open File"
-msgstr "Odpri datoteko"
-
-#: meld/filediff.py:2421
+#: meld/filediff.py:2450
 msgid "Live comparison updating disabled"
 msgstr "Živo posodabljanje ob primerjavi je onemogočeno"
 
-#: meld/filediff.py:2422
+#: meld/filediff.py:2451
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1912,37 +2000,39 @@ msgstr ""
 "Še vedno je mogoče ročno osvežiti primerjavo, živo posodabljanje pa bo spet "
 "na voljo, ko bo usklajevanje končano."
 
-#: meld/iohelpers.py:40
+#: meld/iohelpers.py:41
 msgid "Deleting remote folders is not supported"
-msgstr ""
+msgstr "Brisanje oddaljenih map ni podprto"
 
-#: meld/iohelpers.py:42
+#: meld/iohelpers.py:43
 msgid "Not a file or directory"
 msgstr "Predmet ni ne datoteka ne mapa"
 
-#: meld/iohelpers.py:46
+#: meld/iohelpers.py:47
 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
 msgstr ""
 
-#: meld/iohelpers.py:51
+#: meld/iohelpers.py:52
 msgid "This remote location does not support sending items to the trash."
 msgstr ""
 
-#: meld/iohelpers.py:56
+#: meld/iohelpers.py:57
 msgid "_Delete Permanently"
 msgstr "_Trajno izbriši"
 
-#: meld/iohelpers.py:106
+#: meld/iohelpers.py:107
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Ali želite zamenjati datoteko »%s«?"
 
-#: meld/iohelpers.py:108
+#: meld/iohelpers.py:109
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
 "If you replace the existing file, its contents will be lost."
 msgstr ""
+"Datoteka s tem imenom v »%s« žeobstaja.\n"
+"Če zamenjate obstoječo datoteko, bo izgubljena celotna vsebina."
 
 #: meld/meldapp.py:188
 msgid "wrong number of arguments supplied to --diff"
@@ -2040,24 +2130,24 @@ msgid "remote folder “{}” not supported"
 msgstr "oddaljena mapa »{}« ni podprta"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: meld/meldbuffer.py:114
+#: meld/meldbuffer.py:115
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
-#: meld/melddoc.py:61
+#: meld/melddoc.py:124
 msgid "untitled"
 msgstr "neimenovano"
 
-#: meld/meldwindow.py:155
+#: meld/meldwindow.py:158
 msgid "Filename"
 msgstr "Ime datoteke"
 
-#: meld/meldwindow.py:384
+#: meld/meldwindow.py:381
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
-msgstr ""
+msgstr "Za samodejno združevanje morajo biti navedene tri datoteke (ne %r)"
 
-#: meld/meldwindow.py:406
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Ni mogoče sočasno primerjati datotek in map"
 
@@ -2081,13 +2171,14 @@ msgstr "oznaka"
 msgid "pattern"
 msgstr "vzorec"
 
-#: meld/recent.py:104
+#: meld/recent.py:111
 msgid "Version control:"
 msgstr "Nadzor različic:"
 
 #: meld/style.py:91
 msgid "Couldn’t find colour scheme details for {}; this is a bad install"
 msgstr ""
+"Podrobnosti barvne sheme za {} ni mogoče najti! Namestitev je okvarjena."
 
 #: meld/ui/bufferselectors.py:110
 #, python-brace-format
@@ -2098,6 +2189,10 @@ msgstr "{name} ({charset})"
 msgid "Plain Text"
 msgstr "Običajno besedilo"
 
+#: meld/ui/pathlabel.py:36
+msgid "Unnamed file"
+msgstr "Neimenovano"
+
 #. Abbreviation for line, column so that it will fit in the status bar
 #: meld/ui/statusbar.py:125
 #, python-brace-format
@@ -2106,7 +2201,7 @@ msgstr "Vrstica {line}, Stolpec {column}"
 
 #: meld/ui/statusbar.py:185
 msgid "Line you want to move the cursor to"
-msgstr ""
+msgstr "Vrstica, na katero želite postaviti kazalko"
 
 #: meld/ui/vcdialogs.py:50
 msgid "No files will be committed"
@@ -2117,13 +2212,10 @@ msgstr "Ni pripravljenih datotek za uveljavitev"
 #. "%d branches"
 #: meld/vc/git.py:92
 #, python-brace-format
-#| msgid "%d unpushed commits in %d branches"
 msgid "{unpushed_commits} in {unpushed_branches}"
 msgstr "{unpushed_commits} v {unpushed_branches}"
 
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: meld/vc/git.py:94 meld/vc/git.py:103
+#: meld/vc/git.py:94 meld/vc/git.py:104
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -2141,16 +2233,16 @@ msgstr[1] "%d veja"
 msgstr[2] "%d veji"
 msgstr[3] "%d veje"
 
-#: meld/vc/git.py:344
+#: meld/vc/git.py:345
 #, python-brace-format
 msgid "Mode changed from {old_mode} to {new_mode}"
 msgstr "Način je spremenjen iz {old_mode} v {new_mode}"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Partially staged"
 msgstr "Delno v pripravljenosti"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Staged"
 msgstr "V pripravljenosti"
 
@@ -2209,97 +2301,100 @@ msgstr "Manjkajoče"
 msgid "Not present"
 msgstr "Ni na voljo"
 
+#: meld/vc/_vc.py:82
+msgid "Scanning…"
+msgstr "Poteka preiskovanje …"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
-#: meld/vcview.py:333
+#: meld/vcview.py:334
 #, python-format
 msgid "%(name)s (not found)"
 msgstr "%(name)s (ni mogoče najti)"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: meld/vcview.py:337
+#: meld/vcview.py:338
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (ukaz %(cmd)s ni nameščen)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: meld/vcview.py:341
+#: meld/vcview.py:342
 #, python-format
 msgid "%(name)s (invalid repository)"
 msgstr "%(name)s (neveljavno skladišče)"
 
-#: meld/vcview.py:355
+#: meld/vcview.py:356
 msgid "No valid version control system found in this folder"
 msgstr "Ni veljavnega sistema za nadzor različic v tej mapi"
 
-#: meld/vcview.py:357
+#: meld/vcview.py:358
 msgid "Choose which version control system to use"
 msgstr "Izbor različice sistema za nadzor različic za uporabo"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:411
+#: meld/vcview.py:412
 #, python-brace-format
-#| msgid "Location"
 msgid "Location: {path}"
 msgstr "Mesto: {path}"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:418
+#: meld/vcview.py:419
 msgid "Scanning repository"
 msgstr "Poteka preiskovanje skladišča"
 
-#: meld/vcview.py:447
+#: meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "Preiskovanje %s"
 
-#: meld/vcview.py:486
+#: meld/vcview.py:487
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: meld/vcview.py:533
+#: meld/vcview.py:535
 #, python-format
 msgid "%s — local"
 msgstr "%s — krajevno"
 
-#: meld/vcview.py:534
+#: meld/vcview.py:536
 #, python-format
 msgid "%s — remote"
 msgstr "%s — oddaljeno"
 
-#: meld/vcview.py:542
+#: meld/vcview.py:544
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (krajevno, združi, oddaljeno)"
 
-#: meld/vcview.py:547
+#: meld/vcview.py:549
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (oddaljeno, združi, krajevno)"
 
-#: meld/vcview.py:558
+#: meld/vcview.py:560
 #, python-format
 msgid "%s — repository"
 msgstr "%s — skladišče"
 
-#: meld/vcview.py:564
+#: meld/vcview.py:566
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (delovno, skladišče)"
 
-#: meld/vcview.py:568
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (skladišče, delovno)"
 
-#: meld/vcview.py:730
+#: meld/vcview.py:735
 msgid "Remove folder and all its files?"
 msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
 
-#: meld/vcview.py:732
+#: meld/vcview.py:737
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2307,10 +2402,40 @@ msgstr ""
 "S tem dejanjem bodo odstranjene vse izbrane datoteke in mape in vse "
 "podrejene datoteke iz sistema za nadzor različic"
 
-#: meld/vcview.py:845
+#: meld/vcview.py:850
 msgid "Clear"
 msgstr "Počisti"
 
+#~ msgid "_Update"
+#~ msgstr "_Posodobi"
+
+#~ msgid "Mar_k as Resolved"
+#~ msgstr "Označi kot _razrešeno"
+
+#~ msgid "Update"
+#~ msgstr "Posodobi"
+
+#~ msgid "Update working copy from version control"
+#~ msgstr "Posodobi delovno kopijo preko nadzora različic"
+
+#~ msgid "Push"
+#~ msgstr "Objavi"
+
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#~ msgid "Remove"
+#~ msgstr "Odstrani"
+
+#~ msgid "Mark as Resolved"
+#~ msgstr "Označi kot razrešeno"
+
+#~ msgid "Revert"
+#~ msgstr "Povrni"
+
+#~ msgid "Delete from working copy"
+#~ msgstr "Izbriši iz delovne kopije"
+
 #, python-format
 #~ msgid "[%s] Scanning %s"
 #~ msgstr "[%s] Preiskovanje %s"
@@ -2434,9 +2559,6 @@ msgstr "Počisti"
 #~ msgid "Previous Conflict"
 #~ msgstr "Predhodni spor"
 
-#~ msgid "Next Conflict"
-#~ msgstr "Naslednji spor"
-
 #~ msgid "Push to Left"
 #~ msgstr "Potisni levo"
 
@@ -2645,9 +2767,6 @@ msgstr "Počisti"
 #~ msgid "About this application"
 #~ msgstr "O programu"
 
-#~ msgid "Only one version control system found in this folder"
-#~ msgstr "V tej mapi je le en sistem nadzora različic"
-
 #~ msgid "_Save as UTF-8"
 #~ msgstr "_Shrani kot UTF-8"
 
@@ -2969,9 +3088,6 @@ msgstr "Počisti"
 #~ msgid "_Browse..."
 #~ msgstr "_Prebrskaj ..."
 
-#~ msgid "Path"
-#~ msgstr "Pot"
-
 #~ msgid "Path to file"
 #~ msgstr "Pot do datoteke"
 

From 92c533a9cabfe375920b5be3af787751e0626ddc Mon Sep 17 00:00:00 2001
From: Helly Guo <buffoonguo@gmail.com>
Date: Sat, 12 Feb 2022 06:05:46 +0800
Subject: [PATCH 040/116] ignore vscode settings

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index fc1209e4..ffd23e5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,6 @@ MANIFEST
 *.desktop
 data/appdata.xml
 data/mime/meld.xml
+
+# vscode settings
+.vscode

From e7436eecd998c8eead69fa2ddccd9293613cc2bd Mon Sep 17 00:00:00 2001
From: Helly Guo <buffoonguo@gmail.com>
Date: Sat, 12 Feb 2022 06:06:35 +0800
Subject: [PATCH 041/116] [feat] mark file and compare with marked file

---
 meld/dirdiff.py                    | 46 ++++++++++++++++++++++++++++++
 meld/resources/ui/dirdiff-menus.ui | 12 ++++++++
 2 files changed, 58 insertions(+)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 318370eb..c59bc2bb 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -422,6 +422,8 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
         tree.STATE_MODIFIED: ("modified", "folder-status-modified"),
     }
 
+    marked = None
+
     def __init__(self, num_panes):
         super().__init__()
         # FIXME:
@@ -449,6 +451,9 @@ def __init__(self, num_panes):
             ('find', self.action_find),
             ('folder-collapse', self.action_folder_collapse),
             ('folder-compare', self.action_diff),
+            ('folder-mark', self.action_mark),
+            ('folder-unmark', self.action_unmark),
+            ('folder-compare-marked', self.action_diff_marked),
             ('folder-copy-left', self.action_copy_left),
             ('folder-copy-right', self.action_copy_right),
             ('folder-delete', self.action_delete),
@@ -1271,6 +1276,9 @@ def update_action_sensitivity(self):
             self.set_action_enabled('folder-collapse', is_single_foldable_row)
             self.set_action_enabled('folder-expand', is_single_foldable_row)
             self.set_action_enabled('folder-compare', True)
+            self.set_action_enabled('folder-mark', True)
+            self.set_action_enabled('folder-unmark', self.marked != None)
+            self.set_action_enabled('folder-compare-marked', self.marked != None)
             self.set_action_enabled('folder-delete', is_valid)
             self.set_action_enabled('folder-copy-left', is_valid and pane > 0)
             self.set_action_enabled(
@@ -1280,6 +1288,9 @@ def update_action_sensitivity(self):
             actions = (
                 'folder-collapse',
                 'folder-compare',
+                'folder-mark',
+                'folder-unmark',
+                'folder-compare-marked',
                 'folder-copy-left',
                 'folder-copy-right',
                 'folder-delete',
@@ -1445,6 +1456,41 @@ def action_diff(self, *args):
         for row in selected:
             self.run_diff_from_iter(self.model.get_iter(row))
 
+    def action_mark(self, *args):
+        pane = self._get_focused_pane()
+        if pane is None:
+            return
+
+        selected = self._get_selected_paths(pane)
+        self.marked = {}
+        self.marked['mark'] = self.model.get_iter(selected[0])
+        self.marked['pane'] = pane
+        #print(self.marked)
+
+    def action_unmark(self, *args):
+        self.marked = None
+        #print(self.marked)
+
+    def action_diff_marked(self, *args):
+        if self.marked is None:
+            return
+        marked = self.marked['mark']
+        markedPane = self.marked['pane']
+        self.action_unmark()
+
+        pane = self._get_focused_pane()
+        if pane is None:
+            return
+
+        selected = self.model.get_iter(self._get_selected_paths(pane)[0])
+        row_paths = []
+        row_paths.append(self.model.value_paths(marked)[markedPane])
+        row_paths.append(self.model.value_paths(selected)[pane])
+        #print(row_paths)
+        gfiles = [Gio.File.new_for_path(p)
+                  for p in row_paths if os.path.exists(p)]
+        self.create_diff_signal.emit(gfiles, {})
+
     def action_folder_collapse(self, *args):
         pane = self._get_focused_pane()
         if pane is None:
diff --git a/meld/resources/ui/dirdiff-menus.ui b/meld/resources/ui/dirdiff-menus.ui
index 4a2b459c..4544744f 100644
--- a/meld/resources/ui/dirdiff-menus.ui
+++ b/meld/resources/ui/dirdiff-menus.ui
@@ -7,6 +7,18 @@
         <attribute name="label" translatable="yes">_Compare selected files</attribute>
         <attribute name="action">view.folder-compare</attribute>
       </item>
+      <item>
+        <attribute name="label" translatable="yes">_Mark selected file</attribute>
+        <attribute name="action">view.folder-mark</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Unmark selected file</attribute>
+        <attribute name="action">view.folder-unmark</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Compare _with marked file</attribute>
+        <attribute name="action">view.folder-compare-marked</attribute>
+      </item>
     </section>
     <section>
       <attribute name="id">actions-section</attribute>

From f8ca5cf53e79e8dddd630b9c2ae737b8580e6acb Mon Sep 17 00:00:00 2001
From: Helly Guo <buffoonguo@gmail.com>
Date: Sat, 12 Feb 2022 13:34:48 +0800
Subject: [PATCH 042/116] remove print and rename markedPane -> marked_pane

---
 meld/dirdiff.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index c59bc2bb..767d9e1f 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -1465,17 +1465,15 @@ def action_mark(self, *args):
         self.marked = {}
         self.marked['mark'] = self.model.get_iter(selected[0])
         self.marked['pane'] = pane
-        #print(self.marked)
 
     def action_unmark(self, *args):
         self.marked = None
-        #print(self.marked)
 
     def action_diff_marked(self, *args):
         if self.marked is None:
             return
         marked = self.marked['mark']
-        markedPane = self.marked['pane']
+        marked_pane = self.marked['pane']
         self.action_unmark()
 
         pane = self._get_focused_pane()
@@ -1484,9 +1482,8 @@ def action_diff_marked(self, *args):
 
         selected = self.model.get_iter(self._get_selected_paths(pane)[0])
         row_paths = []
-        row_paths.append(self.model.value_paths(marked)[markedPane])
+        row_paths.append(self.model.value_paths(marked)[marked_pane])
         row_paths.append(self.model.value_paths(selected)[pane])
-        #print(row_paths)
         gfiles = [Gio.File.new_for_path(p)
                   for p in row_paths if os.path.exists(p)]
         self.create_diff_signal.emit(gfiles, {})

From f577a22f070c98ca087889120e090754f84cbffa Mon Sep 17 00:00:00 2001
From: sicklylife <translation@sicklylife.jp>
Date: Mon, 14 Feb 2022 13:17:38 +0000
Subject: [PATCH 043/116] Update Japanese translation

---
 po/ja.po | 834 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 472 insertions(+), 362 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index d7542023..6158389d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2020-01-11 21:55+0000\n"
+"POT-Creation-Date: 2022-01-30 21:55+0000\n"
 "PO-Revision-Date: 2020-02-13 23:40+0900\n"
 "Last-Translator: sicklylife <translation@sicklylife.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
-#: meld/resources/ui/appwindow.ui:9
+#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
 msgid "Meld"
 msgstr "Meld"
 
@@ -77,10 +77,20 @@ msgid "Default window fullscreen state"
 msgstr "デフォルトでウィンドウがフルスクリーン表示されるかどうか"
 
 #: data/org.gnome.meld.gschema.xml:58
+msgid "Prefer application-wide dark theme"
+msgstr ""
+
+#: data/org.gnome.meld.gschema.xml:59
+msgid ""
+"If true, the GTK dark theme variant will be used, if available. Note that "
+"this is separate from the syntax highlighting scheme."
+msgstr ""
+
+#: data/org.gnome.meld.gschema.xml:65
 msgid "Additional automatically detected text encodings"
 msgstr "自動検出される追加のテキストエンコーディング"
 
-#: data/org.gnome.meld.gschema.xml:59
+#: data/org.gnome.meld.gschema.xml:66
 msgid ""
 "Meld will use these text encodings to try to decode loaded text files before "
 "trying any other encodings. In addition to the encodings in this list, UTF-8 "
@@ -93,66 +103,66 @@ msgstr ""
 "用されます。ユーザーのロケールによっては、他のエンコーディングでのデコードも"
 "試されるかもしれません。"
 
-#: data/org.gnome.meld.gschema.xml:66
+#: data/org.gnome.meld.gschema.xml:73
 msgid "Width of an indentation step"
 msgstr "タブの幅"
 
-#: data/org.gnome.meld.gschema.xml:67
+#: data/org.gnome.meld.gschema.xml:74
 msgid "The number of spaces to use for a single indent step"
 msgstr "インデント幅をスペース何個分にするか"
 
-#: data/org.gnome.meld.gschema.xml:71
+#: data/org.gnome.meld.gschema.xml:78
 msgid "Whether to indent using spaces or tabs"
 msgstr "スペースとタブのどちらを使ってインデントするか"
 
-#: data/org.gnome.meld.gschema.xml:72
+#: data/org.gnome.meld.gschema.xml:79
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr ""
 "true の場合、新しいインデントではタブの代わりにスペースが使用されます。"
 
-#: data/org.gnome.meld.gschema.xml:76 meld/resources/ui/statusbar-menu.ui:5
+#: data/org.gnome.meld.gschema.xml:83 meld/resources/ui/statusbar-menu.ui:5
 msgid "Show line numbers"
 msgstr "行番号を表示する"
 
-#: data/org.gnome.meld.gschema.xml:77
+#: data/org.gnome.meld.gschema.xml:84
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr "true の場合、ファイル比較時のガター部分に行番号を表示します。"
 
-#: data/org.gnome.meld.gschema.xml:81
+#: data/org.gnome.meld.gschema.xml:88
 msgid "Highlight syntax"
 msgstr "シンタックスハイライト"
 
-#: data/org.gnome.meld.gschema.xml:82
+#: data/org.gnome.meld.gschema.xml:89
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld’s own color "
 "highlighting, this is off by default."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:86
+#: data/org.gnome.meld.gschema.xml:93
 msgid "Color scheme to use for syntax highlighting"
 msgstr "シンタックスハイライトに使用するカラースキーマ"
 
-#: data/org.gnome.meld.gschema.xml:87
+#: data/org.gnome.meld.gschema.xml:94
 msgid "Used by GtkSourceView to determine colors for syntax highlighting"
 msgstr ""
 "シンタックスハイライトのために決められた色は GtkSourceView によって使用されま"
 "す"
 
-#: data/org.gnome.meld.gschema.xml:91
+#: data/org.gnome.meld.gschema.xml:98
 msgid "Draw whitespace"
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:92
+#: data/org.gnome.meld.gschema.xml:99
 msgid ""
 "If true, whitespace characters will be drawn in comparisons even if they are "
 "not in a changed area."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:101
+#: data/org.gnome.meld.gschema.xml:108
 msgid "Wrap mode"
 msgstr "折り返しのモード"
 
-#: data/org.gnome.meld.gschema.xml:102
+#: data/org.gnome.meld.gschema.xml:109
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
@@ -162,70 +172,70 @@ msgstr ""
 "'none'、任意の文字で折り返す場合は 'char'、単語の末尾で折り返す場合は 'word' "
 "を指定します。"
 
-#: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
+#: data/org.gnome.meld.gschema.xml:116 meld/resources/ui/statusbar-menu.ui:13
 msgid "Highlight current line"
 msgstr "現在の行のハイライト"
 
-#: data/org.gnome.meld.gschema.xml:110
+#: data/org.gnome.meld.gschema.xml:117
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr "true の場合、ファイル比較時にカーソルのある行がハイライトされます。"
 
-#: data/org.gnome.meld.gschema.xml:114
+#: data/org.gnome.meld.gschema.xml:121
 msgid "Use the system default monospace font"
 msgstr "システムデフォルトの等幅フォントを使用する"
 
-#: data/org.gnome.meld.gschema.xml:115
+#: data/org.gnome.meld.gschema.xml:122
 msgid ""
 "If false, custom-font will be used instead of the system monospace font."
 msgstr ""
 "false の場合、システムの monospace フォントの代わりにカスタムフォントが使用さ"
 "れます。"
 
-#: data/org.gnome.meld.gschema.xml:119
+#: data/org.gnome.meld.gschema.xml:126
 msgid "Custom font"
 msgstr "カスタムフォント"
 
-#: data/org.gnome.meld.gschema.xml:120
+#: data/org.gnome.meld.gschema.xml:127
 msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:126
+#: data/org.gnome.meld.gschema.xml:133
 msgid "Show overview source map"
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:127
+#: data/org.gnome.meld.gschema.xml:134
 msgid ""
 "If true, file comparisons will have paired source maps for compared files."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:132
+#: data/org.gnome.meld.gschema.xml:139
 msgid "Style of overview map"
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:133
+#: data/org.gnome.meld.gschema.xml:140
 msgid "Style options for how the overview map is displayed."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:139
+#: data/org.gnome.meld.gschema.xml:146
 msgid "Ignore blank lines when comparing files"
 msgstr "ファイル比較時に空行を無視する"
 
-#: data/org.gnome.meld.gschema.xml:140
+#: data/org.gnome.meld.gschema.xml:147
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
 "true の場合、ファイル間の変更点をハイライトする際に、空行の差異をハイライトし"
 "ません。"
 
-#: data/org.gnome.meld.gschema.xml:147
+#: data/org.gnome.meld.gschema.xml:154
 msgid "Use the system default editor"
 msgstr "システムデフォルトのエディターを使用する"
 
-#: data/org.gnome.meld.gschema.xml:148
+#: data/org.gnome.meld.gschema.xml:155
 msgid ""
 "If false, custom-editor-command will be used instead of the system editor "
 "when opening files externally."
@@ -233,32 +243,32 @@ msgstr ""
 "false の場合、ファイルを別のアプリで開く際に、システムのエディターの代わりに"
 "指定したエディターコマンドを使用します。"
 
-#: data/org.gnome.meld.gschema.xml:152
+#: data/org.gnome.meld.gschema.xml:159
 msgid "The custom editor launch command"
 msgstr "カスタムエディター起動コマンド"
 
-#: data/org.gnome.meld.gschema.xml:153
+#: data/org.gnome.meld.gschema.xml:160
 msgid ""
 "The command used to launch a custom editor. Some limited templating is "
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:159
+#: data/org.gnome.meld.gschema.xml:166
 msgid "Columns to display"
 msgstr "表示するカラム"
 
-#: data/org.gnome.meld.gschema.xml:160
+#: data/org.gnome.meld.gschema.xml:167
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
 msgstr ""
 "フォルダー比較時のカラム名の一覧と、それらを表示するかどうかの設定です。"
 
-#: data/org.gnome.meld.gschema.xml:164 meld/resources/ui/preferences.ui:935
+#: data/org.gnome.meld.gschema.xml:171 meld/resources/ui/preferences.ui:951
 msgid "Ignore symbolic links"
 msgstr "シンボリックリンクを無視する"
 
-#: data/org.gnome.meld.gschema.xml:165
+#: data/org.gnome.meld.gschema.xml:172
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
@@ -266,11 +276,11 @@ msgstr ""
 "true の場合、フォルダー比較時のフォルダーツリー走査において、シンボリックリン"
 "クのリンク先を走査しません。"
 
-#: data/org.gnome.meld.gschema.xml:169
+#: data/org.gnome.meld.gschema.xml:176
 msgid "Use shallow comparison"
 msgstr "浅い比較を使用する"
 
-#: data/org.gnome.meld.gschema.xml:170
+#: data/org.gnome.meld.gschema.xml:177
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
@@ -279,11 +289,11 @@ msgstr ""
 "true の場合、フォルダー比較時にサイズと mtime だけを基準にしてファイルを比較"
 "し、それらが一致すれば同一のファイルであると見做します。"
 
-#: data/org.gnome.meld.gschema.xml:174
+#: data/org.gnome.meld.gschema.xml:181
 msgid "File timestamp resolution"
 msgstr "ファイルのタイムスタンプ分解能"
 
-#: data/org.gnome.meld.gschema.xml:175
+#: data/org.gnome.meld.gschema.xml:182
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
 "between two files before they’re considered to have different mtimes. This "
@@ -294,11 +304,11 @@ msgstr ""
 "と見做される最小の差異(ナノ秒)です。これはタイムスタンプ分解能が異なるファイ"
 "ルシステム間で、ファイルの比較を行う際に役立ちます。"
 
-#: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
+#: data/org.gnome.meld.gschema.xml:186 meld/resources/ui/preferences.ui:852
 msgid "Apply text filters during folder comparisons"
 msgstr "フォルダーの比較中にテキストフィルターを適用する"
 
-#: data/org.gnome.meld.gschema.xml:180
+#: data/org.gnome.meld.gschema.xml:187
 msgid ""
 "If true, folder comparisons that compare file contents also apply active "
 "text filters and the blank line trimming option, and ignore newline "
@@ -308,102 +318,102 @@ msgstr ""
 "フィルターと空行のトリミングオプションが適用され、改行による差異は無視しま"
 "す。"
 
-#: data/org.gnome.meld.gschema.xml:184
+#: data/org.gnome.meld.gschema.xml:191
 msgid "File status filters"
 msgstr "ファイルの状態フィルター"
 
-#: data/org.gnome.meld.gschema.xml:185
+#: data/org.gnome.meld.gschema.xml:192
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 "フォルダー比較時に、表示するファイルをフィルタリングするために使用されるス"
 "テータスのリスト。"
 
-#: data/org.gnome.meld.gschema.xml:191
+#: data/org.gnome.meld.gschema.xml:198
 msgid "Show the version control console output"
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:192
+#: data/org.gnome.meld.gschema.xml:199
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:196
+#: data/org.gnome.meld.gschema.xml:203
 msgid "Version control pane position"
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:197
+#: data/org.gnome.meld.gschema.xml:204
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:201
+#: data/org.gnome.meld.gschema.xml:208
 msgid "Present version comparisons as left-local/right-remote"
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:202
+#: data/org.gnome.meld.gschema.xml:209
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
 "a left-is-theirs, right-is-mine scheme is used."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:206
+#: data/org.gnome.meld.gschema.xml:213
 msgid "Order for files in three-way version control merge comparisons"
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:207
+#: data/org.gnome.meld.gschema.xml:214
 msgid ""
 "Choices for file order are remote/merged/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
 "control view, so is used solely for merges/conflict resolution within Meld."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:211
+#: data/org.gnome.meld.gschema.xml:218
 msgid "Show margin in commit message editor"
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:212
+#: data/org.gnome.meld.gschema.xml:219
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:216
+#: data/org.gnome.meld.gschema.xml:223
 msgid "Margin column in commit message editor"
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:217
+#: data/org.gnome.meld.gschema.xml:224
 msgid ""
 "The column at which to show the margin in the version control commit message "
 "editor."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:221
+#: data/org.gnome.meld.gschema.xml:228
 msgid "Automatically hard-wrap commit messages"
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:222
+#: data/org.gnome.meld.gschema.xml:229
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the commit margin before commit."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:226
+#: data/org.gnome.meld.gschema.xml:233
 msgid "Version control status filters"
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:227
+#: data/org.gnome.meld.gschema.xml:234
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 
-#: data/org.gnome.meld.gschema.xml:241
+#: data/org.gnome.meld.gschema.xml:248
 msgid "Filename-based filters"
 msgstr "ファイル名を対象としたフィルター"
 
-#: data/org.gnome.meld.gschema.xml:242
+#: data/org.gnome.meld.gschema.xml:249
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
@@ -411,11 +421,11 @@ msgstr ""
 "ファイル名が対象の定義されたフィルターのリスト。有効な場合、フォルダーの比較"
 "から一致するファイルを除外します。"
 
-#: data/org.gnome.meld.gschema.xml:256
+#: data/org.gnome.meld.gschema.xml:263
 msgid "Text-based filters"
 msgstr "テキストを対象としたフィルター"
 
-#: data/org.gnome.meld.gschema.xml:257
+#: data/org.gnome.meld.gschema.xml:264
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
@@ -760,11 +770,11 @@ msgstr "右からすべてをマージ"
 msgid "Merge All"
 msgstr "すべてをマージ"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
 msgid "Add Synchronization Point"
 msgstr "同期点を追加"
 
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
 msgid "Clear Synchronization Points"
 msgstr "同期点をクリア"
 
@@ -800,7 +810,7 @@ msgstr "同じ部分"
 msgid "New"
 msgstr "新しい部分"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "変更済"
@@ -809,26 +819,34 @@ msgstr "変更済"
 msgid "Ignore filename case"
 msgstr "ファイル名の大/小文字を無視"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr ""
+
+#: meld/resources/gtk/menus.ui:175
 msgid "Normal"
 msgstr ""
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr ""
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr ""
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:190
 msgid "Flatten folders"
 msgstr ""
 
 #: meld/resources/ui/about-dialog.ui:8
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2002-2009 Stephen Kennedy\n"
+#| "Copyright © 2009-2019 Kai Willadsen"
 msgid ""
 "Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2019 Kai Willadsen"
+"Copyright © 2009-2021 Kai Willadsen"
 msgstr ""
 "Copyright © 2002-2009 Stephen Kennedy\n"
 "Copyright © 2009-2019 Kai Willadsen"
@@ -841,39 +859,39 @@ msgstr ""
 "sicklylife <translation@sicklylife.jp>\n"
 "Toshiharu Kudoh <toshi.kd2@gmail.com>"
 
-#: meld/resources/ui/appwindow.ui:29
+#: meld/resources/ui/appwindow.ui:30
 msgid "Start a new comparison"
 msgstr "新しい比較を開始します"
 
-#: meld/resources/ui/appwindow.ui:45
+#: meld/resources/ui/appwindow.ui:46
 msgid "Open a recent comparison"
 msgstr "最近の比較を開きます"
 
-#: meld/resources/ui/appwindow.ui:73
+#: meld/resources/ui/appwindow.ui:74
 msgid "Go to the previous change"
 msgstr "前の変更点へジャンプします"
 
-#: meld/resources/ui/appwindow.ui:93
+#: meld/resources/ui/appwindow.ui:94
 msgid "Go to the next change"
 msgstr "次の変更点へジャンプします"
 
-#: meld/resources/ui/appwindow.ui:123
+#: meld/resources/ui/appwindow.ui:124
 msgid "Go to the previous conflict"
 msgstr "前の衝突箇所へジャンプします"
 
-#: meld/resources/ui/appwindow.ui:143
+#: meld/resources/ui/appwindow.ui:144
 msgid "Go to the next conflict"
 msgstr "次の衝突箇所へジャンプします"
 
-#: meld/resources/ui/appwindow.ui:191
+#: meld/resources/ui/appwindow.ui:193
 msgid "Version Filters"
 msgstr "バージョンフィルター"
 
-#: meld/resources/ui/appwindow.ui:206 meld/resources/ui/preferences.ui:1456
+#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472
 msgid "File Filters"
 msgstr "ファイルフィルター"
 
-#: meld/resources/ui/appwindow.ui:221 meld/resources/ui/preferences.ui:1641
+#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657
 msgid "Text Filters"
 msgstr "テキストフィルター"
 
@@ -886,7 +904,7 @@ msgid "Column Name"
 msgstr "カラム名"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:735
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
 msgid "_Remove"
 msgstr "削除(_R)"
 
@@ -970,6 +988,29 @@ msgstr "別のアプリで開く(_O)"
 msgid "_Copy File Paths"
 msgstr "ファイルパスをコピー(_C)"
 
+#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
+#: meld/resources/ui/dirdiff.ui:117
+msgid "Select folder to open in this pane"
+msgstr ""
+
+#: meld/resources/ui/dirdiff.ui:43
+#, fuzzy
+#| msgid "Folder"
+msgid "Folder 1"
+msgstr "フォルダー"
+
+#: meld/resources/ui/dirdiff.ui:84
+#, fuzzy
+#| msgid "Folder"
+msgid "Folder 2"
+msgstr "フォルダー"
+
+#: meld/resources/ui/dirdiff.ui:125
+#, fuzzy
+#| msgid "Folder"
+msgid "Folder 3"
+msgstr "フォルダー"
+
 #: meld/resources/ui/encoding-selector.ui:31
 msgid "Search text encoding…"
 msgstr "テキストエンコーディングを検索…"
@@ -1026,8 +1067,18 @@ msgstr "コピー(_C)"
 msgid "_Paste"
 msgstr "貼り付け(_P)"
 
-#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:99
-#: meld/resources/ui/filediff.ui:165
+#: meld/resources/ui/filediff-menus.ui:54
+msgid "Open Containing Folder"
+msgstr ""
+
+#: meld/resources/ui/filediff-menus.ui:58
+#, fuzzy
+#| msgid "_Copy File Paths"
+msgid "Copy Full Path"
+msgstr "ファイルパスをコピー(_C)"
+
+#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
+#: meld/resources/ui/filediff.ui:169
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -1036,21 +1087,34 @@ msgstr ""
 "ルのロックを解除して変更を加えることができますが、これらの変更は新しいファイ"
 "ルに保存しなければなりません。"
 
-#: meld/resources/ui/filediff.ui:71
+#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
+#: meld/resources/ui/filediff.ui:183
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Save all files in comparison"
+msgid "Save file in this pane"
+msgstr "比較中のすべてのファイルを保存する"
+
+#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
+#: meld/resources/ui/filediff.ui:209
+msgid "Open file in this pane"
+msgstr ""
+
+#: meld/resources/ui/filediff.ui:79
 msgid "File 3"
 msgstr "ファイル 3"
 
-#: meld/resources/ui/filediff.ui:137
+#: meld/resources/ui/filediff.ui:148
 msgid "File 2"
 msgstr "ファイル 2"
 
-#: meld/resources/ui/filediff.ui:199
+#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148
 msgid "File 1"
 msgstr "ファイル 1"
 
 #. Create icon and filename CellRenderer
-#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
-#: meld/dirdiff.py:508
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
+#: meld/dirdiff.py:556
 msgid "Name"
 msgstr "名前"
 
@@ -1062,7 +1126,7 @@ msgstr "パターン"
 msgid "Add new filter"
 msgstr "新しいフィルターを追加します"
 
-#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18
 msgid "_Add"
 msgstr "追加(_A)"
 
@@ -1090,7 +1154,7 @@ msgstr "折り返しました"
 msgid "Replace _All"
 msgstr "すべて置換(_A)"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1041 meld/iohelpers.py:115
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1180 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "置換(_R)"
 
@@ -1102,7 +1166,7 @@ msgstr "“検索”と“検索して置換”を切り替えます"
 msgid "Search highlight mode…"
 msgstr "ハイライトモードを検索…"
 
-#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:345
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342
 #: meld/newdifftab.py:49
 msgid "New comparison"
 msgstr "新しい比較"
@@ -1119,43 +1183,43 @@ msgstr "フォルダー"
 msgid "Version control"
 msgstr "バージョン管理"
 
-#: meld/resources/ui/new-diff-tab.ui:235 meld/resources/ui/new-diff-tab.ui:352
+#: meld/resources/ui/new-diff-tab.ui:236 meld/resources/ui/new-diff-tab.ui:357
 msgid "_3-way comparison"
 msgstr "3つを比較(_3)"
 
-#: meld/resources/ui/new-diff-tab.ui:254
+#: meld/resources/ui/new-diff-tab.ui:256
 msgid "Select First File"
 msgstr "1番目のファイルを選択"
 
-#: meld/resources/ui/new-diff-tab.ui:267
+#: meld/resources/ui/new-diff-tab.ui:270
 msgid "Select Second File"
 msgstr "2番目のファイルを選択"
 
-#: meld/resources/ui/new-diff-tab.ui:281
+#: meld/resources/ui/new-diff-tab.ui:285
 msgid "Select Third File"
 msgstr "3番目のファイルを選択"
 
-#: meld/resources/ui/new-diff-tab.ui:316
+#: meld/resources/ui/new-diff-tab.ui:321
 msgid "Select First Folder"
 msgstr "1番目のフォルダーを選択"
 
-#: meld/resources/ui/new-diff-tab.ui:329
+#: meld/resources/ui/new-diff-tab.ui:334
 msgid "Select Second Folder"
 msgstr "2番目のフォルダーを選択"
 
-#: meld/resources/ui/new-diff-tab.ui:343
+#: meld/resources/ui/new-diff-tab.ui:348
 msgid "Select Third Folder"
 msgstr "3番目のフォルダーを選択"
 
-#: meld/resources/ui/new-diff-tab.ui:393
+#: meld/resources/ui/new-diff-tab.ui:399
 msgid "Select A Version-Controlled Folder"
 msgstr ""
 
-#: meld/resources/ui/new-diff-tab.ui:442
+#: meld/resources/ui/new-diff-tab.ui:448
 msgid "_Blank comparison"
 msgstr "空の比較(_B)"
 
-#: meld/resources/ui/new-diff-tab.ui:459
+#: meld/resources/ui/new-diff-tab.ui:466
 msgid "C_ompare"
 msgstr "比較(_O)"
 
@@ -1191,6 +1255,22 @@ msgstr "中央と右のペイン"
 msgid "_Reverse patch direction"
 msgstr "パッチの対象を逆にする(_R)"
 
+#: meld/resources/ui/path-label.ui:23
+msgid "Path"
+msgstr ""
+
+#: meld/resources/ui/path-label.ui:62
+#, fuzzy
+#| msgid "_Copy File Paths"
+msgid "Copy Path"
+msgstr "ファイルパスをコピー(_C)"
+
+#: meld/resources/ui/path-label.ui:78
+#, fuzzy
+#| msgid "Open File"
+msgid "Open Folder"
+msgstr "ファイルを開く"
+
 #: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
 msgid "Preferences"
 msgstr "設定"
@@ -1209,7 +1289,7 @@ msgstr "エディターのフォント(_E):"
 
 #. TRANSLATORS: This is the status bar label for a group of settings,
 #. such as text wrapping, show line numbers, whitespace, etc.
-#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:288
+#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:291
 msgid "Display"
 msgstr "表示"
 
@@ -1242,104 +1322,110 @@ msgid "Show w_hitespace"
 msgstr "空白や改行を表示する(_H)"
 
 #: meld/resources/ui/preferences.ui:381
+#, fuzzy
+#| msgid "Meld dark scheme"
+msgid "Prefer dark theme"
+msgstr "Meld ダークスキーマ"
+
+#: meld/resources/ui/preferences.ui:397
 msgid "Use s_yntax highlighting"
 msgstr "シンタックスハイライトを有効にする(_Y)"
 
-#: meld/resources/ui/preferences.ui:404
+#: meld/resources/ui/preferences.ui:420
 msgid "Syntax highlighting color scheme:"
 msgstr "シンタックスハイライトのカラースキーマ:"
 
-#: meld/resources/ui/preferences.ui:469
+#: meld/resources/ui/preferences.ui:485
 msgid "Code Overview"
 msgstr "コードの概要"
 
-#: meld/resources/ui/preferences.ui:506
+#: meld/resources/ui/preferences.ui:522
 msgid "Show overview map"
 msgstr "概要マップを表示する"
 
-#: meld/resources/ui/preferences.ui:529
+#: meld/resources/ui/preferences.ui:545
 msgid "Overview map style:"
 msgstr "概要マップのスタイル:"
 
-#: meld/resources/ui/preferences.ui:596
+#: meld/resources/ui/preferences.ui:612
 msgid "External Editor"
 msgstr "外部エディター"
 
-#: meld/resources/ui/preferences.ui:632
+#: meld/resources/ui/preferences.ui:648
 msgid "Use _default system editor"
 msgstr "デフォルトのエディターを使用する(_D)"
 
-#: meld/resources/ui/preferences.ui:655
+#: meld/resources/ui/preferences.ui:671
 msgid "Edito_r command:"
 msgstr "エディターをコマンドで指定する(_R):"
 
-#: meld/resources/ui/preferences.ui:711
+#: meld/resources/ui/preferences.ui:727
 msgid "Editor"
 msgstr "エディター"
 
-#: meld/resources/ui/preferences.ui:732
+#: meld/resources/ui/preferences.ui:748
 msgid "Shallow Comparison"
 msgstr "浅い比較"
 
-#: meld/resources/ui/preferences.ui:768
+#: meld/resources/ui/preferences.ui:784
 msgid "C_ompare files based only on size and timestamp"
 msgstr "サイズとタイムスタンプだけを基準にしてファイルを比較する(_O)"
 
-#: meld/resources/ui/preferences.ui:791
+#: meld/resources/ui/preferences.ui:807
 msgid "_Timestamp resolution:"
 msgstr "タイムスタンプ分解能(_T):"
 
-#: meld/resources/ui/preferences.ui:855
+#: meld/resources/ui/preferences.ui:871
 msgid "Note: enabling text filters may make comparing large files much slower"
 msgstr ""
 "備考: テキストフィルターを有効にすると、大きなファイルの比較が遅くなる可能性"
 "があります"
 
-#: meld/resources/ui/preferences.ui:904
+#: meld/resources/ui/preferences.ui:920
 msgid "Symbolic Links"
 msgstr "シンボリックリンク"
 
-#: meld/resources/ui/preferences.ui:972
+#: meld/resources/ui/preferences.ui:988
 msgid "Visible Columns"
 msgstr "表示するカラム"
 
-#: meld/resources/ui/preferences.ui:1039
+#: meld/resources/ui/preferences.ui:1055
 msgid "Folder Comparisons"
 msgstr "フォルダーの比較"
 
-#: meld/resources/ui/preferences.ui:1061
+#: meld/resources/ui/preferences.ui:1077
 msgid "Version Comparisons"
 msgstr ""
 
-#: meld/resources/ui/preferences.ui:1104
+#: meld/resources/ui/preferences.ui:1120
 msgid "_Order when comparing file revisions:"
 msgstr ""
 
-#: meld/resources/ui/preferences.ui:1151
+#: meld/resources/ui/preferences.ui:1167
 msgid "Order when _merging files:"
 msgstr ""
 
-#: meld/resources/ui/preferences.ui:1219
+#: meld/resources/ui/preferences.ui:1235
 msgid "Commit Messages"
 msgstr "コミットメッセージ"
 
-#: meld/resources/ui/preferences.ui:1260
+#: meld/resources/ui/preferences.ui:1276
 msgid "Show _right margin at:"
 msgstr "右マージンを表示する(_R):"
 
-#: meld/resources/ui/preferences.ui:1301
+#: meld/resources/ui/preferences.ui:1317
 msgid "Automatically _break lines at right margin on commit"
 msgstr ""
 
-#: meld/resources/ui/preferences.ui:1351
+#: meld/resources/ui/preferences.ui:1367
 msgid "Version Control"
 msgstr "バージョン管理"
 
-#: meld/resources/ui/preferences.ui:1373
+#: meld/resources/ui/preferences.ui:1389
 msgid "Filename filters"
 msgstr "ファイル名フィルター"
 
-#: meld/resources/ui/preferences.ui:1411
+#: meld/resources/ui/preferences.ui:1427
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -1349,20 +1435,20 @@ msgstr ""
 "す。フィルタリングのパターンはそれぞれ、スペースで区切った SHELL 型式のワイル"
 "ドカードの並びです。"
 
-#: meld/resources/ui/preferences.ui:1478
+#: meld/resources/ui/preferences.ui:1494
 msgid "Change trimming"
 msgstr "変更のトリミング"
 
-#: meld/resources/ui/preferences.ui:1514
+#: meld/resources/ui/preferences.ui:1530
 msgid "Trim blank line differences from the start and end of changes"
 msgstr ""
 "変更点の始まりと終わりの部分から、空行の差異をハイライトしないように除外する"
 
-#: meld/resources/ui/preferences.ui:1558
+#: meld/resources/ui/preferences.ui:1574
 msgid "Text filters"
 msgstr "テキストフィルター"
 
-#: meld/resources/ui/preferences.ui:1596
+#: meld/resources/ui/preferences.ui:1612
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -1376,47 +1462,47 @@ msgstr ""
 "ら、該当するグループの文字列だけ置き換えます。詳細はユーザーズ・マニュアルを"
 "ご覧下さい。"
 
-#: meld/resources/ui/preferences.ui:1687
+#: meld/resources/ui/preferences.ui:1703
 msgid "Left is remote, right is local"
 msgstr ""
 
-#: meld/resources/ui/preferences.ui:1691
+#: meld/resources/ui/preferences.ui:1707
 msgid "Left is local, right is remote"
 msgstr ""
 
-#: meld/resources/ui/preferences.ui:1705
+#: meld/resources/ui/preferences.ui:1721
 msgid "Simple change map"
 msgstr ""
 
-#: meld/resources/ui/preferences.ui:1709
+#: meld/resources/ui/preferences.ui:1725
 msgid "Compact source map"
 msgstr ""
 
-#: meld/resources/ui/preferences.ui:1713
+#: meld/resources/ui/preferences.ui:1729
 msgid "Full source map"
 msgstr ""
 
-#: meld/resources/ui/preferences.ui:1727
+#: meld/resources/ui/preferences.ui:1743
 msgid "Remote, merge, local"
 msgstr ""
 
-#: meld/resources/ui/preferences.ui:1731
+#: meld/resources/ui/preferences.ui:1747
 msgid "Local, merge, remote"
 msgstr ""
 
-#: meld/resources/ui/preferences.ui:1753
+#: meld/resources/ui/preferences.ui:1769
 msgid "1ns (ext4)"
 msgstr "1ナノ秒 (ext4)"
 
-#: meld/resources/ui/preferences.ui:1757
+#: meld/resources/ui/preferences.ui:1773
 msgid "100ns (NTFS)"
 msgstr "100ナノ秒 (NTFS)"
 
-#: meld/resources/ui/preferences.ui:1761
+#: meld/resources/ui/preferences.ui:1777
 msgid "1s (ext2/ext3)"
 msgstr "1秒 (ext2/ext3)"
 
-#: meld/resources/ui/preferences.ui:1765
+#: meld/resources/ui/preferences.ui:1781
 msgid "2s (VFAT)"
 msgstr "2秒 (VFAT)"
 
@@ -1460,8 +1546,8 @@ msgstr "保存しない場合、変更は永久に失われます。"
 msgid "Close _without Saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1040
-#: meld/iohelpers.py:56 meld/iohelpers.py:114
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1179
+#: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
@@ -1485,95 +1571,71 @@ msgstr "比較(_C)"
 msgid "Co_mmit…"
 msgstr "コミット(_M)…"
 
-#: meld/resources/ui/vcview-menus.ui:15
-msgid "_Update"
-msgstr ""
-
-#: meld/resources/ui/vcview-menus.ui:30
+#: meld/resources/ui/vcview-menus.ui:26
 msgid "Re_vert"
 msgstr ""
 
-#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+#: meld/resources/ui/vcview-menus.ui:30
 msgid "Delete"
 msgstr "削除"
 
-#: meld/resources/ui/vcview-menus.ui:41
-msgid "Mar_k as Resolved"
-msgstr ""
-
-#: meld/resources/ui/vcview.ui:73
-msgid "Commit…"
-msgstr "コミット…"
+#: meld/resources/ui/vcview-menus.ui:37
+#, fuzzy
+#| msgid "Next Conflict"
+msgid "Resolve Conflict"
+msgstr "次の衝突箇所"
 
-#: meld/resources/ui/vcview.ui:74
+#: meld/resources/ui/vcview.ui:16
 msgid "Commit changes to version control"
 msgstr ""
 
-#: meld/resources/ui/vcview.ui:86
-msgid "Update"
-msgstr ""
-
-#: meld/resources/ui/vcview.ui:87
-msgid "Update working copy from version control"
-msgstr ""
+#: meld/resources/ui/vcview.ui:21
+msgid "Commit…"
+msgstr "コミット…"
 
-#: meld/resources/ui/vcview.ui:99
-msgid "Push"
-msgstr ""
+#: meld/resources/ui/vcview.ui:38
+#, fuzzy
+#| msgid "Push current change to the left"
+msgid "Pull remote changes to the local repository"
+msgstr "現在の変更を左にも適用します"
 
-#: meld/resources/ui/vcview.ui:100
+#: meld/resources/ui/vcview.ui:51
 msgid "Push local changes to remote"
 msgstr ""
 
-#: meld/resources/ui/vcview.ui:112
-msgid "Add"
-msgstr "追加"
-
-#: meld/resources/ui/vcview.ui:113
+#: meld/resources/ui/vcview.ui:74
 msgid "Add to version control"
 msgstr ""
 
-#: meld/resources/ui/vcview.ui:125
-msgid "Remove"
-msgstr "削除"
-
-#: meld/resources/ui/vcview.ui:126
+#: meld/resources/ui/vcview.ui:87
 msgid "Remove from version control"
 msgstr ""
 
-#: meld/resources/ui/vcview.ui:138
-msgid "Mark as Resolved"
-msgstr "解決済みとしてマーク"
-
-#: meld/resources/ui/vcview.ui:139
-msgid "Mark as resolved in version control"
-msgstr ""
-
-#: meld/resources/ui/vcview.ui:151
-msgid "Revert"
+#: meld/resources/ui/vcview.ui:100
+msgid "Revert working copy to original state"
 msgstr ""
 
-#: meld/resources/ui/vcview.ui:152
-msgid "Revert working copy to original state"
+#: meld/resources/ui/vcview.ui:113
+msgid "Mark as resolved in version control"
 msgstr ""
 
-#: meld/resources/ui/vcview.ui:165
-msgid "Delete from working copy"
+#: meld/resources/ui/vcview.ui:140
+msgid "Open version controlled folder in this pane"
 msgstr ""
 
-#: meld/resources/ui/vcview.ui:220 meld/vcview.py:410
+#: meld/resources/ui/vcview.ui:229
 msgid "Location"
 msgstr ""
 
-#: meld/resources/ui/vcview.ui:229
+#: meld/resources/ui/vcview.ui:238
 msgid "Status"
 msgstr ""
 
-#: meld/resources/ui/vcview.ui:238
+#: meld/resources/ui/vcview.ui:247
 msgid "Extra"
 msgstr ""
 
-#: meld/resources/ui/vcview.ui:270
+#: meld/resources/ui/vcview.ui:279
 msgid "Console output"
 msgstr "コンソール出力"
 
@@ -1598,39 +1660,56 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:529 meld/preferences.py:132
+#: meld/dirdiff.py:577 meld/preferences.py:132
 msgid "Size"
 msgstr "サイズ"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:537 meld/preferences.py:133
+#: meld/dirdiff.py:585 meld/preferences.py:133
 msgid "Modification time"
 msgstr "更新日時"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:593 meld/preferences.py:134
+#, fuzzy
+#| msgid "Modification time"
+msgid "Modification time (ISO)"
+msgstr "更新日時"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:545 meld/preferences.py:134
+#: meld/dirdiff.py:601 meld/preferences.py:135
 msgid "Permissions"
 msgstr "アクセス権"
 
-#: meld/dirdiff.py:768 meld/dirdiff.py:791
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr "[%s] %s をスキャン中"
+#: meld/dirdiff.py:851
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr ""
 
-#: meld/dirdiff.py:927
-#, python-format
-msgid "[%s] Done"
+#: meld/dirdiff.py:883 meld/dirdiff.py:915
+#, python-brace-format
+msgid "[{label}] Scanning {folder}"
+msgstr ""
+
+#: meld/dirdiff.py:1051
+#, fuzzy, python-brace-format
+#| msgid "[%s] Done"
+msgid "[{label}] Done"
 msgstr "[%s] 完了"
 
-#: meld/dirdiff.py:934
+#: meld/dirdiff.py:1064
+msgid "Folder {} is being compared to itself"
+msgstr ""
+
+#: meld/dirdiff.py:1070
 msgid "Folders have no differences"
 msgstr "フォルダーに差異はありません"
 
-#: meld/dirdiff.py:936
+#: meld/dirdiff.py:1072
 msgid "Contents of scanned files in folders are identical."
 msgstr "フォルダー内のスキャンされたファイルの内容は同一です。"
 
-#: meld/dirdiff.py:938
+#: meld/dirdiff.py:1074
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1638,48 +1717,48 @@ msgstr ""
 "フォルダー内のスキャンされたファイルは同一のように見えますが、内容はスキャン"
 "されていません。"
 
-#: meld/dirdiff.py:941
+#: meld/dirdiff.py:1077
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "ファイルフィルターが使用されているため、すべてのファイルがスキャンされたわけ"
 "ではありません。"
 
-#: meld/dirdiff.py:943
+#: meld/dirdiff.py:1079
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "テキストフィルターが使用されているため、内容の差異が遮蔽されている可能性があ"
 "ります。"
 
-#: meld/dirdiff.py:959 meld/filediff.py:1824
+#: meld/dirdiff.py:1095 meld/filediff.py:1917
 msgid "Hide"
 msgstr "隠す"
 
-#: meld/dirdiff.py:961 meld/filediff.py:1826 meld/filediff.py:1856
-#: meld/filediff.py:1858 meld/ui/msgarea.py:106 meld/ui/msgarea.py:119
+#: meld/dirdiff.py:1097 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "隠す(_D)"
 
-#: meld/dirdiff.py:970
+#: meld/dirdiff.py:1106
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "このフォルダーの走査中に複数回のエラーが発生しました"
 
-#: meld/dirdiff.py:971
+#: meld/dirdiff.py:1107
 msgid "Files with invalid encodings found"
 msgstr "間違ったエンコーディングを持つファイルが見つかりました"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:973
+#: meld/dirdiff.py:1109
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "いくつかのファイルが間違ったエンコーディングを持っていました (次のようなファ"
 "イル名です):"
 
-#: meld/dirdiff.py:975
+#: meld/dirdiff.py:1111
 msgid "Files hidden by case insensitive comparison"
 msgstr "大/小文字を区別せずに比較したファイルの一覧"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:977
+#: meld/dirdiff.py:1113
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1687,17 +1766,18 @@ msgstr ""
 "大/小文字を区別するファイルシステム上で大/小文字を無視した比較を行っていま"
 "す。このフォルダーでは次のファイルは表示されません:"
 
-#: meld/dirdiff.py:988
-#, python-format
-msgid "“%s” hidden by “%s”"
+#: meld/dirdiff.py:1124
+#, fuzzy, python-brace-format
+#| msgid "“%s” hidden by “%s”"
+msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“%s”は“%s”によって隠されています"
 
-#: meld/dirdiff.py:1044
+#: meld/dirdiff.py:1183
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "“%s”を置き換えますか?"
 
-#: meld/dirdiff.py:1046
+#: meld/dirdiff.py:1185
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1706,36 +1786,41 @@ msgstr ""
 "“%s”に同じ名前の別のフォルダーがすでに存在します。\n"
 "フォルダーを置き換えると、既存のファイルはすべて失われます。"
 
-#: meld/dirdiff.py:1059
+#: meld/dirdiff.py:1198
 msgid "Error copying file"
 msgstr "ファイルのコピーエラー"
 
-#: meld/dirdiff.py:1060
-#, python-format
+#: meld/dirdiff.py:1199
+#, fuzzy, python-brace-format
+#| msgid ""
+#| "Couldn’t copy %s\n"
+#| "to %s.\n"
+#| "\n"
+#| "%s"
 msgid ""
-"Couldn’t copy %s\n"
-"to %s.\n"
+"Couldn’t copy {source}\n"
+"to {dest}.\n"
 "\n"
-"%s"
+"{error}"
 msgstr ""
 "コピーできませんでした。\n"
 "コピー元: %s\n"
 "コピー先: %s\n"
 "%s"
 
-#: meld/dirdiff.py:1085 meld/vcview.py:758
+#: meld/dirdiff.py:1224 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "{} の削除中にエラーが発生しました"
 
-#: meld/dirdiff.py:1578
+#: meld/dirdiff.py:1715
 msgid "No folder"
 msgstr ""
 
-#: meld/filediff.py:1116
+#: meld/filediff.py:1149
 msgid "Comparison results will be inaccurate"
 msgstr "比較結果は不正確です"
 
-#: meld/filediff.py:1118
+#: meld/filediff.py:1151
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1743,70 +1828,74 @@ msgstr ""
 "フィルターがファイル内の行数を変更しましたが、サポートされていないため、比較"
 "は正確ではありません。"
 
-#: meld/filediff.py:1190
+#: meld/filediff.py:1223
 msgid "Mark conflict as resolved?"
 msgstr "衝突箇所を解決済みとしてマークしますか?"
 
-#: meld/filediff.py:1192
+#: meld/filediff.py:1225
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "衝突箇所の解決に成功した場合は、解決済みとしてマークすることができます。"
 
-#: meld/filediff.py:1194
+#: meld/filediff.py:1227
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: meld/filediff.py:1195
+#: meld/filediff.py:1228
 msgid "Mark _Resolved"
 msgstr "解決済みとしてマーク(_R)"
 
-#: meld/filediff.py:1520
+#: meld/filediff.py:1591
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "“%s”を開く際に問題が発生しました。"
 
-#: meld/filediff.py:1528
+#: meld/filediff.py:1600
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "%s はバイナリファイルのようです。"
 
-#: meld/filediff.py:1530
+#: meld/filediff.py:1602
 msgid "Do you want to open the file using the default application?"
 msgstr "デフォルトのアプリケーションを使用してファイルを開きますか?"
 
-#: meld/filediff.py:1532
+#: meld/filediff.py:1604
 msgid "Open"
 msgstr "開く"
 
-#: meld/filediff.py:1546
+#: meld/filediff.py:1626
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] ファイルをマージ中"
 
-#: meld/filediff.py:1560
+#: meld/filediff.py:1640
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] 差分の計算中"
 
-#: meld/filediff.py:1619
+#: meld/filediff.py:1700
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "%s はディスク上で変更されました"
 
-#: meld/filediff.py:1620
+#: meld/filediff.py:1701
 msgid "Do you want to reload the file?"
 msgstr "ファイルを再読み込みしますか?"
 
-#: meld/filediff.py:1622
+#: meld/filediff.py:1703
 msgid "_Reload"
 msgstr "再読み込み(_R)"
 
-#: meld/filediff.py:1789
+#: meld/filediff.py:1873
+msgid "File {} is being compared to itself"
+msgstr ""
+
+#: meld/filediff.py:1882
 msgid "Files are identical"
 msgstr "同一のファイルです"
 
-#: meld/filediff.py:1802
+#: meld/filediff.py:1895
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1814,11 +1903,11 @@ msgstr ""
 "テキストフィルターを使用しているため、ファイル間に違いが生じる場合がありま"
 "す。フィルタリングせずに比較しますか?"
 
-#: meld/filediff.py:1807
+#: meld/filediff.py:1900
 msgid "Files differ in line endings only"
 msgstr "ファイルは行末のみが異なります"
 
-#: meld/filediff.py:1809
+#: meld/filediff.py:1902
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1827,15 +1916,15 @@ msgstr ""
 "改行コード以外のファイルの内容は同一です:\n"
 "%s"
 
-#: meld/filediff.py:1829
+#: meld/filediff.py:1922
 msgid "Show without filters"
 msgstr "フィルター無しで表示する"
 
-#: meld/filediff.py:1851
+#: meld/filediff.py:1944
 msgid "Change highlighting incomplete"
 msgstr "変更点のハイライトが不完全です"
 
-#: meld/filediff.py:1852
+#: meld/filediff.py:1945
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1843,19 +1932,19 @@ msgstr ""
 "変更点が多すぎるため、一部がハイライトされませんでした。Meld にハイライトを強"
 "制することができますが、大きな変更点をハイライトするには時間がかかります。"
 
-#: meld/filediff.py:1860
+#: meld/filediff.py:1953
 msgid "Keep highlighting"
 msgstr "ハイライトを続ける"
 
-#: meld/filediff.py:1862
+#: meld/filediff.py:1955
 msgid "_Keep highlighting"
 msgstr "ハイライトを続ける(_K)"
 
-#: meld/filediff.py:1875
+#: meld/filediff.py:1968
 msgid "Saving failed"
 msgstr "保存に失敗しました"
 
-#: meld/filediff.py:1876
+#: meld/filediff.py:1969
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1863,43 +1952,43 @@ msgstr ""
 "データの喪失を防ぐために、他のファイルやプログラムへ重要な変更点をコピーする"
 "ことを検討してください。"
 
-#: meld/filediff.py:1885
+#: meld/filediff.py:1978
 msgid "Save Left Pane As"
 msgstr "左のペインを別名で保存"
 
-#: meld/filediff.py:1887
+#: meld/filediff.py:1980
 msgid "Save Middle Pane As"
 msgstr "中央のペインを別名で保存"
 
-#: meld/filediff.py:1889
+#: meld/filediff.py:1982
 msgid "Save Right Pane As"
 msgstr "右のペインを別名で保存"
 
-#: meld/filediff.py:1900
+#: meld/filediff.py:1993
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "%s は開かれた後にディスク上で変更されました"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1995
 msgid "If you save it, any external changes will be lost."
 msgstr "保存すると、外部からの変更は失われます。"
 
-#: meld/filediff.py:1905
+#: meld/filediff.py:1998
 msgid "Save Anyway"
 msgstr "とにかく保存する"
 
-#: meld/filediff.py:1906
+#: meld/filediff.py:1999
 msgid "Don’t Save"
 msgstr "保存しない"
 
-#: meld/filediff.py:1948
+#: meld/filediff.py:2041
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
 msgstr ""
 "“{}”には現在のエンコーディング“{}”でエンコードできない文字が含まれています。"
 
-#: meld/filediff.py:1952 meld/patchdialog.py:138
+#: meld/filediff.py:2045 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1908,20 +1997,16 @@ msgstr ""
 "次の理由によりファイルを保存できませんでした:\n"
 "%s"
 
-#: meld/filediff.py:1956 meld/patchdialog.py:137
+#: meld/filediff.py:2049 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "%s を保存できませんでした。"
 
-#: meld/filediff.py:2017
-msgid "Open File"
-msgstr "ファイルを開く"
-
-#: meld/filediff.py:2371
+#: meld/filediff.py:2450
 msgid "Live comparison updating disabled"
 msgstr "比較のライブアップデートは無効です"
 
-#: meld/filediff.py:2372
+#: meld/filediff.py:2451
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1951,12 +2036,12 @@ msgstr "このリモートの場所はゴミ箱にファイルを送ることを
 msgid "_Delete Permanently"
 msgstr "永久に削除(_D)"
 
-#: meld/iohelpers.py:108
+#: meld/iohelpers.py:107
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "“%s”を置き換えますか?"
 
-#: meld/iohelpers.py:110
+#: meld/iohelpers.py:109
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1965,121 +2050,121 @@ msgstr ""
 "“%s”に同じ名前のファイルがすでに存在します。\n"
 "ファイルを置き換えると、既存の内容は失われます。"
 
-#: meld/meldapp.py:179
+#: meld/meldapp.py:188
 msgid "wrong number of arguments supplied to --diff"
 msgstr "--diff オプションに対する引数の数が間違っています"
 
-#: meld/meldapp.py:184
+#: meld/meldapp.py:193
 msgid "Start with an empty window"
 msgstr "空のウィンドウで起動する"
 
-#: meld/meldapp.py:185 meld/meldapp.py:187
+#: meld/meldapp.py:194 meld/meldapp.py:196
 msgid "file"
 msgstr "ファイル"
 
-#: meld/meldapp.py:185 meld/meldapp.py:189
+#: meld/meldapp.py:194 meld/meldapp.py:198
 msgid "folder"
 msgstr "フォルダー"
 
-#: meld/meldapp.py:186
+#: meld/meldapp.py:195
 msgid "Start a version control comparison"
 msgstr "バージョン管理の比較モードで起動する"
 
-#: meld/meldapp.py:188
+#: meld/meldapp.py:197
 msgid "Start a 2- or 3-way file comparison"
 msgstr "2つ、または3つのファイルを比較するモードで起動する"
 
-#: meld/meldapp.py:190
+#: meld/meldapp.py:199
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "2つ、または3つのフォルダーを比較するモードで起動する"
 
-#: meld/meldapp.py:233
+#: meld/meldapp.py:242
 #, python-format
 msgid "Error: %s\n"
 msgstr "エラー: %s\n"
 
-#: meld/meldapp.py:240
+#: meld/meldapp.py:249
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld はファイルとフォルダーの内容を比較するツールです。"
 
-#: meld/meldapp.py:244
+#: meld/meldapp.py:253
 msgid "Set label to use instead of file name"
 msgstr "ファイル名の代わりに使用するラベルを指定する"
 
-#: meld/meldapp.py:247
+#: meld/meldapp.py:256
 msgid "Open a new tab in an already running instance"
 msgstr "すでに実行中のインスタンスで新しいタブを開く"
 
-#: meld/meldapp.py:250
+#: meld/meldapp.py:259
 msgid "Automatically compare all differing files on startup"
 msgstr "起動時にファイルの中にあるすべての差分を自動的に検出する"
 
-#: meld/meldapp.py:253
+#: meld/meldapp.py:262
 msgid "Ignored for compatibility"
 msgstr ""
 
-#: meld/meldapp.py:257
+#: meld/meldapp.py:266
 msgid "Set the target file for saving a merge result"
 msgstr "マージした結果を保存するファイル名を指定する"
 
-#: meld/meldapp.py:260
+#: meld/meldapp.py:269
 msgid "Automatically merge files"
 msgstr "自動的にファイルをマージする"
 
-#: meld/meldapp.py:264
+#: meld/meldapp.py:273
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Meld の比較ファイルから保存された比較を読み込む"
 
-#: meld/meldapp.py:268
+#: meld/meldapp.py:277
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "指定したファイル/フォルダーの比較タブを作成する"
 
-#: meld/meldapp.py:288
+#: meld/meldapp.py:297
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr ""
 "引数が多すぎます (有効な数は 0 〜 3 ですが %d 個の引数を受け取りました)"
 
-#: meld/meldapp.py:291
+#: meld/meldapp.py:300
 msgid "can’t auto-merge less than 3 files"
 msgstr "3つ未満のファイルはオートマージできません"
 
-#: meld/meldapp.py:293
+#: meld/meldapp.py:302
 msgid "can’t auto-merge directories"
 msgstr "ディレクトリはオートマージできません"
 
-#: meld/meldapp.py:308
+#: meld/meldapp.py:317
 msgid "Error reading saved comparison file"
 msgstr "保存された比較ファイルの読み込みエラー"
 
-#: meld/meldapp.py:325
+#: meld/meldapp.py:334
 #, python-format
 msgid "invalid path or URI “%s”"
 msgstr "無効なパスまたは URI “%s”"
 
-#: meld/meldapp.py:331
+#: meld/meldapp.py:341
 msgid "remote folder “{}” not supported"
 msgstr ""
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: meld/meldbuffer.py:114
+#: meld/meldbuffer.py:115
 msgid "<unnamed>"
 msgstr "<名前なし>"
 
-#: meld/melddoc.py:60
+#: meld/melddoc.py:124
 msgid "untitled"
 msgstr "タイトルなし"
 
-#: meld/meldwindow.py:151
+#: meld/meldwindow.py:158
 msgid "Filename"
 msgstr "ファイル名"
 
-#: meld/meldwindow.py:380
+#: meld/meldwindow.py:381
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "オートマージには3つのファイルが必要です: %r"
 
-#: meld/meldwindow.py:402
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "ファイルとフォルダーの間での比較はできません"
 
@@ -2107,13 +2192,14 @@ msgstr "(新しい名前)"
 msgid "pattern"
 msgstr "(新しいパターン)"
 
-#: meld/recent.py:104
+#: meld/recent.py:111
 msgid "Version control:"
 msgstr "バージョン管理:"
 
-#: meld/style.py:90
-#, python-format
-msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
+#: meld/style.py:91
+#, fuzzy
+#| msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
+msgid "Couldn’t find colour scheme details for {}; this is a bad install"
 msgstr ""
 "%s-%s のカラースキーマの詳細が見つかりませんでした。これはインストールが正常"
 "ではありません。"
@@ -2127,21 +2213,19 @@ msgstr ""
 msgid "Plain Text"
 msgstr "プレーンテキスト"
 
-#: meld/ui/filechooser.py:68
-msgid "Autodetect Encoding"
-msgstr "エンコーディングを自動検出"
-
-#: meld/ui/filechooser.py:71
-msgid "Current Locale ({})"
-msgstr "現在のロケール ({})"
+#: meld/ui/pathlabel.py:36
+#, fuzzy
+#| msgid "Filename filters"
+msgid "Unnamed file"
+msgstr "ファイル名フィルター"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: meld/ui/statusbar.py:123
-#, python-format
-msgid "Ln %i, Col %i"
-msgstr "(%i行、%i列)"
+#: meld/ui/statusbar.py:125
+#, python-brace-format
+msgid "Ln {line}, Col {column}"
+msgstr ""
 
-#: meld/ui/statusbar.py:183
+#: meld/ui/statusbar.py:185
 msgid "Line you want to move the cursor to"
 msgstr "カーソルを移動する行"
 
@@ -2149,43 +2233,42 @@ msgstr "カーソルを移動する行"
 msgid "No files will be committed"
 msgstr ""
 
-#. Translators: First %s is replaced by translated "%d unpushed
-#. commits", second %s is replaced by translated "%d branches"
-#: meld/vc/git.py:91
-#, python-format
-msgid "%s in %s"
+#. Translators: First element is replaced by translated "%d
+#. unpushed commits", second element is replaced by translated
+#. "%d branches"
+#: meld/vc/git.py:92
+#, python-brace-format
+msgid "{unpushed_commits} in {unpushed_branches}"
 msgstr ""
 
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: meld/vc/git.py:92 meld/vc/git.py:99
+#: meld/vc/git.py:94 meld/vc/git.py:104
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
 msgstr[0] ""
 
-#: meld/vc/git.py:94
+#: meld/vc/git.py:97
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] ""
 
-#: meld/vc/git.py:333
-#, python-format
-msgid "Mode changed from %s to %s"
+#: meld/vc/git.py:345
+#, python-brace-format
+msgid "Mode changed from {old_mode} to {new_mode}"
 msgstr ""
 
-#: meld/vc/git.py:341
+#: meld/vc/git.py:353
 msgid "Partially staged"
 msgstr ""
 
-#: meld/vc/git.py:341
+#: meld/vc/git.py:353
 msgid "Staged"
 msgstr ""
 
 #. Translators: This is the displayed name of a version control system
 #. when no version control system is actually found.
-#: meld/vc/_null.py:37
+#: meld/vc/_null.py:38
 msgid "None"
 msgstr "なし"
 
@@ -2238,105 +2321,135 @@ msgstr ""
 msgid "Not present"
 msgstr ""
 
+#: meld/vc/_vc.py:82
+#, fuzzy
+#| msgid "Scanning %s"
+msgid "Scanning…"
+msgstr "%s をスキャン中"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
-#: meld/vcview.py:332
+#: meld/vcview.py:334
 #, python-format
 msgid "%(name)s (not found)"
 msgstr ""
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: meld/vcview.py:336
+#: meld/vcview.py:338
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr ""
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: meld/vcview.py:340
+#: meld/vcview.py:342
 #, python-format
 msgid "%(name)s (invalid repository)"
 msgstr ""
 
-#: meld/vcview.py:354
+#: meld/vcview.py:356
 msgid "No valid version control system found in this folder"
 msgstr ""
 
-#: meld/vcview.py:356
+#: meld/vcview.py:358
 msgid "Choose which version control system to use"
 msgstr ""
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:410
-#, python-format
-msgid "%s: %s"
-msgstr "%s: %s"
+#: meld/vcview.py:412
+#, python-brace-format
+msgid "Location: {path}"
+msgstr ""
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:417
+#: meld/vcview.py:419
 msgid "Scanning repository"
 msgstr ""
 
-#: meld/vcview.py:446
+#: meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "%s をスキャン中"
 
-#: meld/vcview.py:485
+#: meld/vcview.py:487
 msgid "(Empty)"
 msgstr "(空)"
 
-#: meld/vcview.py:532
+#: meld/vcview.py:535
 #, python-format
 msgid "%s — local"
 msgstr ""
 
-#: meld/vcview.py:533
+#: meld/vcview.py:536
 #, python-format
 msgid "%s — remote"
 msgstr ""
 
-#: meld/vcview.py:541
+#: meld/vcview.py:544
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr ""
 
-#: meld/vcview.py:546
+#: meld/vcview.py:549
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr ""
 
-#: meld/vcview.py:557
+#: meld/vcview.py:560
 #, python-format
 msgid "%s — repository"
 msgstr ""
 
-#: meld/vcview.py:563
+#: meld/vcview.py:566
 #, python-format
 msgid "%s (working, repository)"
 msgstr ""
 
-#: meld/vcview.py:567
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (repository, working)"
 msgstr ""
 
-#: meld/vcview.py:729
+#: meld/vcview.py:735
 msgid "Remove folder and all its files?"
 msgstr ""
 
-#: meld/vcview.py:731
+#: meld/vcview.py:737
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
 msgstr ""
 
-#: meld/vcview.py:844
+#: meld/vcview.py:850
 msgid "Clear"
 msgstr ""
 
+#~ msgid "Add"
+#~ msgstr "追加"
+
+#~ msgid "Remove"
+#~ msgstr "削除"
+
+#~ msgid "Mark as Resolved"
+#~ msgstr "解決済みとしてマーク"
+
+#~ msgid "[%s] Scanning %s"
+#~ msgstr "[%s] %s をスキャン中"
+
+#~ msgid "Autodetect Encoding"
+#~ msgstr "エンコーディングを自動検出"
+
+#~ msgid "Current Locale ({})"
+#~ msgstr "現在のロケール ({})"
+
+#~ msgid "Ln %i, Col %i"
+#~ msgstr "(%i行、%i列)"
+
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
 #~ msgid "Cannot import: "
 #~ msgstr "インポートできません: "
 
@@ -2420,9 +2533,6 @@ msgstr ""
 #~ msgid "Previous Conflict"
 #~ msgstr "前の衝突箇所"
 
-#~ msgid "Next Conflict"
-#~ msgstr "次の衝突箇所"
-
 #~ msgid "Push to Left"
 #~ msgstr "左へ適用"
 

From 860c06b01edc5363bc3047447df7b208c0ee562b Mon Sep 17 00:00:00 2001
From: sicklylife <translation@sicklylife.jp>
Date: Mon, 14 Feb 2022 13:33:23 +0000
Subject: [PATCH 044/116] Update Japanese translation

---
 po/ja.po | 231 +++++++++++++++++++++++--------------------------------
 1 file changed, 97 insertions(+), 134 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 6158389d..0a523298 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,16 +1,16 @@
 # meld ja.po.
-# Copyright (C) 2003-2013, 2017-2020. Free Software Foundation, Inc.
+# Copyright (C) 2003-2013, 2017-2020, 2022. Free Software Foundation, Inc.
 # Takeshi AIHANA <takeshi.aihana@gmail.com>, 2003-2011.
 # Toshiharu Kudoh <toshi.kd2@gmail.com>, 2012-2013.
 # Shinichirou Yamada <yamada_strong_yamada_nice_64bit@yahoo.co.jp>, 2017.
-# sicklylife <translation@sicklylife.jp>, 2019-2020.
+# sicklylife <translation@sicklylife.jp>, 2019-2020, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
 "POT-Creation-Date: 2022-01-30 21:55+0000\n"
-"PO-Revision-Date: 2020-02-13 23:40+0900\n"
+"PO-Revision-Date: 2022-02-14 22:18+0900\n"
 "Last-Translator: sicklylife <translation@sicklylife.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "Language: ja\n"
@@ -174,7 +174,7 @@ msgstr ""
 
 #: data/org.gnome.meld.gschema.xml:116 meld/resources/ui/statusbar-menu.ui:13
 msgid "Highlight current line"
-msgstr "現在の行のハイライト"
+msgstr "現在の行をハイライトする"
 
 #: data/org.gnome.meld.gschema.xml:117
 msgid ""
@@ -300,9 +300,9 @@ msgid ""
 "is useful when comparing files between filesystems with different timestamp "
 "resolution."
 msgstr ""
-"mtime に基づいて比較する場合、この値が2つのファイル間において mtime が異なる"
-"と見做される最小の差異(ナノ秒)です。これはタイムスタンプ分解能が異なるファイ"
-"ルシステム間で、ファイルの比較を行う際に役立ちます。"
+"mtime に基づいて比較する場合、この値が 2 つのファイル間において mtime が異な"
+"ると見做される最小の差異 (ナノ秒) です。これはタイムスタンプ分解能が異なるフ"
+"ァイルシステム間で、ファイルの比較を行う際に役立ちます。"
 
 #: data/org.gnome.meld.gschema.xml:186 meld/resources/ui/preferences.ui:852
 msgid "Apply text filters during folder comparisons"
@@ -748,7 +748,7 @@ msgstr "概要マップ"
 
 #: meld/resources/gtk/menus.ui:63
 msgid "Version control console"
-msgstr ""
+msgstr "バージョン管理コンソール"
 
 #: meld/resources/gtk/menus.ui:67
 msgid "Lock scrolling"
@@ -840,16 +840,12 @@ msgid "Flatten folders"
 msgstr ""
 
 #: meld/resources/ui/about-dialog.ui:8
-#, fuzzy
-#| msgid ""
-#| "Copyright © 2002-2009 Stephen Kennedy\n"
-#| "Copyright © 2009-2019 Kai Willadsen"
 msgid ""
 "Copyright © 2002-2009 Stephen Kennedy\n"
 "Copyright © 2009-2021 Kai Willadsen"
 msgstr ""
 "Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2019 Kai Willadsen"
+"Copyright © 2009-2021 Kai Willadsen"
 
 #: meld/resources/ui/about-dialog.ui:14
 msgid "translator-credits"
@@ -926,19 +922,19 @@ msgstr "下へ移動する(_D)"
 
 #: meld/resources/ui/commit-dialog.ui:8
 msgid "Commit"
-msgstr ""
+msgstr "コミット"
 
 #: meld/resources/ui/commit-dialog.ui:36
 msgid "Commit Files"
-msgstr ""
+msgstr "コミットするファイル"
 
 #: meld/resources/ui/commit-dialog.ui:117
 msgid "Log Message"
-msgstr ""
+msgstr "ログメッセージ"
 
 #: meld/resources/ui/commit-dialog.ui:181
 msgid "Previous logs:"
-msgstr ""
+msgstr "以前のログ:"
 
 #: meld/resources/ui/commit-dialog.ui:259
 msgid "Co_mmit"
@@ -991,25 +987,19 @@ msgstr "ファイルパスをコピー(_C)"
 #: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
 #: meld/resources/ui/dirdiff.ui:117
 msgid "Select folder to open in this pane"
-msgstr ""
+msgstr "このペインで開くフォルダーを選択してください"
 
 #: meld/resources/ui/dirdiff.ui:43
-#, fuzzy
-#| msgid "Folder"
 msgid "Folder 1"
-msgstr "フォルダー"
+msgstr "フォルダー 1"
 
 #: meld/resources/ui/dirdiff.ui:84
-#, fuzzy
-#| msgid "Folder"
 msgid "Folder 2"
-msgstr "フォルダー"
+msgstr "フォルダー 2"
 
 #: meld/resources/ui/dirdiff.ui:125
-#, fuzzy
-#| msgid "Folder"
 msgid "Folder 3"
-msgstr "フォルダー"
+msgstr "フォルダー 3"
 
 #: meld/resources/ui/encoding-selector.ui:31
 msgid "Search text encoding…"
@@ -1033,19 +1023,19 @@ msgstr "変更点を削除します"
 
 #: meld/resources/ui/filediff-menus.ui:7
 msgid "Copy change above the left chunk"
-msgstr "左の変更点の上にコピーします"
+msgstr "左の変更点の上にコピーする"
 
 #: meld/resources/ui/filediff-menus.ui:11
 msgid "Copy change below the left chunk"
-msgstr "左の変更点の下にコピーします"
+msgstr "左の変更点の下にコピーする"
 
 #: meld/resources/ui/filediff-menus.ui:15
 msgid "Copy change above the right chunk"
-msgstr "右の変更点の上にコピーします"
+msgstr "右の変更点の上にコピーする"
 
 #: meld/resources/ui/filediff-menus.ui:19
 msgid "Copy change below the right chunk"
-msgstr "右の変更点の下にコピーします"
+msgstr "右の変更点の下にコピーする"
 
 #: meld/resources/ui/filediff-menus.ui:28
 msgid "_Undo"
@@ -1069,13 +1059,11 @@ msgstr "貼り付け(_P)"
 
 #: meld/resources/ui/filediff-menus.ui:54
 msgid "Open Containing Folder"
-msgstr ""
+msgstr "ファイルがあるフォルダーを開く"
 
 #: meld/resources/ui/filediff-menus.ui:58
-#, fuzzy
-#| msgid "_Copy File Paths"
 msgid "Copy Full Path"
-msgstr "ファイルパスをコピー(_C)"
+msgstr "フルパスをコピー"
 
 #: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
 #: meld/resources/ui/filediff.ui:169
@@ -1089,16 +1077,13 @@ msgstr ""
 
 #: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
 #: meld/resources/ui/filediff.ui:183
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Save all files in comparison"
 msgid "Save file in this pane"
-msgstr "比較中のすべてのファイルを保存する"
+msgstr "このペインのファイルを保存します"
 
 #: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
 #: meld/resources/ui/filediff.ui:209
 msgid "Open file in this pane"
-msgstr ""
+msgstr "このペインでファイルを開きます"
 
 #: meld/resources/ui/filediff.ui:79
 msgid "File 3"
@@ -1185,35 +1170,35 @@ msgstr "バージョン管理"
 
 #: meld/resources/ui/new-diff-tab.ui:236 meld/resources/ui/new-diff-tab.ui:357
 msgid "_3-way comparison"
-msgstr "3つを比較(_3)"
+msgstr "3 つを比較(_3)"
 
 #: meld/resources/ui/new-diff-tab.ui:256
 msgid "Select First File"
-msgstr "1番目のファイルを選択"
+msgstr "1 番目のファイルを選択"
 
 #: meld/resources/ui/new-diff-tab.ui:270
 msgid "Select Second File"
-msgstr "2番目のファイルを選択"
+msgstr "2 番目のファイルを選択"
 
 #: meld/resources/ui/new-diff-tab.ui:285
 msgid "Select Third File"
-msgstr "3番目のファイルを選択"
+msgstr "3 番目のファイルを選択"
 
 #: meld/resources/ui/new-diff-tab.ui:321
 msgid "Select First Folder"
-msgstr "1番目のフォルダーを選択"
+msgstr "1 番目のフォルダーを選択"
 
 #: meld/resources/ui/new-diff-tab.ui:334
 msgid "Select Second Folder"
-msgstr "2番目のフォルダーを選択"
+msgstr "2 番目のフォルダーを選択"
 
 #: meld/resources/ui/new-diff-tab.ui:348
 msgid "Select Third Folder"
-msgstr "3番目のフォルダーを選択"
+msgstr "3 番目のフォルダーを選択"
 
 #: meld/resources/ui/new-diff-tab.ui:399
 msgid "Select A Version-Controlled Folder"
-msgstr ""
+msgstr "バージョン管理フォルダーを選択"
 
 #: meld/resources/ui/new-diff-tab.ui:448
 msgid "_Blank comparison"
@@ -1257,19 +1242,15 @@ msgstr "パッチの対象を逆にする(_R)"
 
 #: meld/resources/ui/path-label.ui:23
 msgid "Path"
-msgstr ""
+msgstr "パス"
 
 #: meld/resources/ui/path-label.ui:62
-#, fuzzy
-#| msgid "_Copy File Paths"
 msgid "Copy Path"
-msgstr "ファイルパスをコピー(_C)"
+msgstr "パスをコピー"
 
 #: meld/resources/ui/path-label.ui:78
-#, fuzzy
-#| msgid "Open File"
 msgid "Open Folder"
-msgstr "ファイルを開く"
+msgstr "フォルダーを開く"
 
 #: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
 msgid "Preferences"
@@ -1307,7 +1288,7 @@ msgstr "文字列の折り返しを有効にする(_W)"
 
 #: meld/resources/ui/preferences.ui:312
 msgid "Do not _split words over two lines"
-msgstr "単語が二行に跨がらないようにする(_S)"
+msgstr "単語が 2 行に跨がらないようにする(_S)"
 
 #: meld/resources/ui/preferences.ui:333
 msgid "Highlight _current line"
@@ -1322,10 +1303,8 @@ msgid "Show w_hitespace"
 msgstr "空白や改行を表示する(_H)"
 
 #: meld/resources/ui/preferences.ui:381
-#, fuzzy
-#| msgid "Meld dark scheme"
 msgid "Prefer dark theme"
-msgstr "Meld ダークスキーマ"
+msgstr "ダークテーマを適用する"
 
 #: meld/resources/ui/preferences.ui:397
 msgid "Use s_yntax highlighting"
@@ -1395,7 +1374,7 @@ msgstr "フォルダーの比較"
 
 #: meld/resources/ui/preferences.ui:1077
 msgid "Version Comparisons"
-msgstr ""
+msgstr "バージョンの比較"
 
 #: meld/resources/ui/preferences.ui:1120
 msgid "_Order when comparing file revisions:"
@@ -1464,11 +1443,11 @@ msgstr ""
 
 #: meld/resources/ui/preferences.ui:1703
 msgid "Left is remote, right is local"
-msgstr ""
+msgstr "左がリモート、右がローカル"
 
 #: meld/resources/ui/preferences.ui:1707
 msgid "Left is local, right is remote"
-msgstr ""
+msgstr "左がローカル、右がリモート"
 
 #: meld/resources/ui/preferences.ui:1721
 msgid "Simple change map"
@@ -1484,39 +1463,39 @@ msgstr ""
 
 #: meld/resources/ui/preferences.ui:1743
 msgid "Remote, merge, local"
-msgstr ""
+msgstr "リモート、マージ、ローカル"
 
 #: meld/resources/ui/preferences.ui:1747
 msgid "Local, merge, remote"
-msgstr ""
+msgstr "ローカル、マージ、リモート"
 
 #: meld/resources/ui/preferences.ui:1769
 msgid "1ns (ext4)"
-msgstr "1ナノ秒 (ext4)"
+msgstr "1 ナノ秒 (ext4)"
 
 #: meld/resources/ui/preferences.ui:1773
 msgid "100ns (NTFS)"
-msgstr "100ナノ秒 (NTFS)"
+msgstr "100 ナノ秒 (NTFS)"
 
 #: meld/resources/ui/preferences.ui:1777
 msgid "1s (ext2/ext3)"
-msgstr "1秒 (ext2/ext3)"
+msgstr "1 秒 (ext2/ext3)"
 
 #: meld/resources/ui/preferences.ui:1781
 msgid "2s (VFAT)"
-msgstr "2秒 (VFAT)"
+msgstr "2 秒 (VFAT)"
 
 #: meld/resources/ui/push-dialog.ui:9
 msgid "Push local commits to remote?"
-msgstr ""
+msgstr "ローカルのコミットをリモートにプッシュしますか?"
 
 #: meld/resources/ui/push-dialog.ui:10
 msgid "The commits to be pushed are determined by your version control system."
-msgstr ""
+msgstr "プッシュされるコミットはバージョン管理システムが決定します。"
 
 #: meld/resources/ui/push-dialog.ui:38
 msgid "_Push commits"
-msgstr ""
+msgstr "コミットをプッシュ(_P)"
 
 #: meld/resources/ui/recent-selector.ui:16
 msgid "Search recent comparisons…"
@@ -1528,7 +1507,7 @@ msgstr "ドキュメントへの変更を保存せずに破棄しますか?"
 
 #: meld/resources/ui/revert-dialog.ui:10
 msgid "Changes made to the following documents will be permanently lost:"
-msgstr "次のドキュメントへの変更は永久に失われます:"
+msgstr "次のドキュメントへの変更は完全に失われます:"
 
 #: meld/resources/ui/revert-dialog.ui:39
 msgid "_Discard"
@@ -1540,7 +1519,7 @@ msgstr "閉じる前にドキュメントへの変更を保存しますか?"
 
 #: meld/resources/ui/save-confirm-dialog.ui:10
 msgid "If you don’t save, changes will be permanently lost."
-msgstr "保存しない場合、変更は永久に失われます。"
+msgstr "保存しない場合、変更は完全に失われます。"
 
 #: meld/resources/ui/save-confirm-dialog.ui:24
 msgid "Close _without Saving"
@@ -1580,48 +1559,44 @@ msgid "Delete"
 msgstr "削除"
 
 #: meld/resources/ui/vcview-menus.ui:37
-#, fuzzy
-#| msgid "Next Conflict"
 msgid "Resolve Conflict"
-msgstr "次の衝突箇所"
+msgstr ""
 
 #: meld/resources/ui/vcview.ui:16
 msgid "Commit changes to version control"
-msgstr ""
+msgstr "変更をバージョン管理にコミットします"
 
 #: meld/resources/ui/vcview.ui:21
 msgid "Commit…"
 msgstr "コミット…"
 
 #: meld/resources/ui/vcview.ui:38
-#, fuzzy
-#| msgid "Push current change to the left"
 msgid "Pull remote changes to the local repository"
-msgstr "現在の変更を左にも適用します"
+msgstr "リモートの変更をローカルのリポジトリにプルします"
 
 #: meld/resources/ui/vcview.ui:51
 msgid "Push local changes to remote"
-msgstr ""
+msgstr "ローカルの変更をリモートにプッシュします"
 
 #: meld/resources/ui/vcview.ui:74
 msgid "Add to version control"
-msgstr ""
+msgstr "バージョン管理に追加します"
 
 #: meld/resources/ui/vcview.ui:87
 msgid "Remove from version control"
-msgstr ""
+msgstr "バージョン管理から削除します"
 
 #: meld/resources/ui/vcview.ui:100
 msgid "Revert working copy to original state"
-msgstr ""
+msgstr "作業コピーを元の状態に差し戻します"
 
 #: meld/resources/ui/vcview.ui:113
 msgid "Mark as resolved in version control"
-msgstr ""
+msgstr "バージョン管理で解決済みとしてマークします"
 
 #: meld/resources/ui/vcview.ui:140
 msgid "Open version controlled folder in this pane"
-msgstr ""
+msgstr "このペインでバージョン管理フォルダーを開きます"
 
 #: meld/resources/ui/vcview.ui:229
 msgid "Location"
@@ -1671,10 +1646,8 @@ msgstr "更新日時"
 
 #. Create ISO-format date-time CellRenderer
 #: meld/dirdiff.py:593 meld/preferences.py:134
-#, fuzzy
-#| msgid "Modification time"
 msgid "Modification time (ISO)"
-msgstr "更新日時"
+msgstr "更新日時 (ISO)"
 
 #. Create permissions CellRenderer
 #: meld/dirdiff.py:601 meld/preferences.py:135
@@ -1692,10 +1665,9 @@ msgid "[{label}] Scanning {folder}"
 msgstr ""
 
 #: meld/dirdiff.py:1051
-#, fuzzy, python-brace-format
-#| msgid "[%s] Done"
+#, python-brace-format
 msgid "[{label}] Done"
-msgstr "[%s] 完了"
+msgstr "[{label}] 完了"
 
 #: meld/dirdiff.py:1064
 msgid "Folder {} is being compared to itself"
@@ -1767,10 +1739,9 @@ msgstr ""
 "す。このフォルダーでは次のファイルは表示されません:"
 
 #: meld/dirdiff.py:1124
-#, fuzzy, python-brace-format
-#| msgid "“%s” hidden by “%s”"
+#, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
-msgstr "“%s”は“%s”によって隠されています"
+msgstr "“{first_file}”は“{second_file}”によって隠されています"
 
 #: meld/dirdiff.py:1183
 #, python-format
@@ -1791,22 +1762,18 @@ msgid "Error copying file"
 msgstr "ファイルのコピーエラー"
 
 #: meld/dirdiff.py:1199
-#, fuzzy, python-brace-format
-#| msgid ""
-#| "Couldn’t copy %s\n"
-#| "to %s.\n"
-#| "\n"
-#| "%s"
+#, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
 "to {dest}.\n"
 "\n"
 "{error}"
 msgstr ""
-"コピーできませんでした。\n"
-"コピー元: %s\n"
-"コピー先: %s\n"
-"%s"
+"コピーできませんでした\n"
+"コピー元: {source}\n"
+"コピー先: {dest}\n"
+"\n"
+"{error}"
 
 #: meld/dirdiff.py:1224 meld/vcview.py:764
 msgid "Error deleting {}"
@@ -2034,7 +2001,7 @@ msgstr "このリモートの場所はゴミ箱にファイルを送ることを
 
 #: meld/iohelpers.py:57
 msgid "_Delete Permanently"
-msgstr "永久に削除(_D)"
+msgstr "完全に削除(_D)"
 
 #: meld/iohelpers.py:107
 #, python-format
@@ -2072,11 +2039,11 @@ msgstr "バージョン管理の比較モードで起動する"
 
 #: meld/meldapp.py:197
 msgid "Start a 2- or 3-way file comparison"
-msgstr "2つ、または3つのファイルを比較するモードで起動する"
+msgstr "2 つ、または 3 つのファイルを比較するモードで起動する"
 
 #: meld/meldapp.py:199
 msgid "Start a 2- or 3-way folder comparison"
-msgstr "2つ、または3つのフォルダーを比較するモードで起動する"
+msgstr "2 つ、または 3 つのフォルダーを比較するモードで起動する"
 
 #: meld/meldapp.py:242
 #, python-format
@@ -2197,33 +2164,29 @@ msgid "Version control:"
 msgstr "バージョン管理:"
 
 #: meld/style.py:91
-#, fuzzy
-#| msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
 msgid "Couldn’t find colour scheme details for {}; this is a bad install"
 msgstr ""
-"%s-%s のカラースキーマの詳細が見つかりませんでした。これはインストールが正常"
-"ではありません。"
+"{} のカラースキーマの詳細が見つかりませんでした。インストールが正常ではあ"
+"りません。"
 
 #: meld/ui/bufferselectors.py:110
 #, python-brace-format
 msgid "{name} ({charset})"
-msgstr ""
+msgstr "{name} ({charset})"
 
 #: meld/ui/bufferselectors.py:140 meld/ui/bufferselectors.py:148
 msgid "Plain Text"
 msgstr "プレーンテキスト"
 
 #: meld/ui/pathlabel.py:36
-#, fuzzy
-#| msgid "Filename filters"
 msgid "Unnamed file"
-msgstr "ファイル名フィルター"
+msgstr "名前なしのファイル"
 
 #. Abbreviation for line, column so that it will fit in the status bar
 #: meld/ui/statusbar.py:125
 #, python-brace-format
 msgid "Ln {line}, Col {column}"
-msgstr ""
+msgstr "{line} 行、{column} 列"
 
 #: meld/ui/statusbar.py:185
 msgid "Line you want to move the cursor to"
@@ -2322,39 +2285,37 @@ msgid "Not present"
 msgstr ""
 
 #: meld/vc/_vc.py:82
-#, fuzzy
-#| msgid "Scanning %s"
 msgid "Scanning…"
-msgstr "%s をスキャン中"
+msgstr ""
 
 #. Translators: This error message is shown when no
 #. repository of this type is found.
 #: meld/vcview.py:334
 #, python-format
 msgid "%(name)s (not found)"
-msgstr ""
+msgstr "%(name)s (見つかりません)"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
 #: meld/vcview.py:338
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
-msgstr ""
+msgstr "%(name)s (%(cmd)s がインストールされていません)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
 #: meld/vcview.py:342
 #, python-format
 msgid "%(name)s (invalid repository)"
-msgstr ""
+msgstr "%(name)s (無効なリポジトリです)"
 
 #: meld/vcview.py:356
 msgid "No valid version control system found in this folder"
-msgstr ""
+msgstr "このフォルダーの有効なバージョン管理システムが見つかりませんでした"
 
 #: meld/vcview.py:358
 msgid "Choose which version control system to use"
-msgstr ""
+msgstr "使用するバージョン管理システムを選択してください"
 
 #. TRANSLATORS: This is the location of the directory being viewed
 #: meld/vcview.py:412
@@ -2380,51 +2341,53 @@ msgstr "(空)"
 #: meld/vcview.py:535
 #, python-format
 msgid "%s — local"
-msgstr ""
+msgstr "%s — ローカル"
 
 #: meld/vcview.py:536
 #, python-format
 msgid "%s — remote"
-msgstr ""
+msgstr "%s — リモート"
 
 #: meld/vcview.py:544
 #, python-format
 msgid "%s (local, merge, remote)"
-msgstr ""
+msgstr "%s (ローカル、マージ、リモート)"
 
 #: meld/vcview.py:549
 #, python-format
 msgid "%s (remote, merge, local)"
-msgstr ""
+msgstr "%s (リモート、マージ、ローカル)"
 
 #: meld/vcview.py:560
 #, python-format
 msgid "%s — repository"
-msgstr ""
+msgstr "%s — リポジトリ"
 
 #: meld/vcview.py:566
 #, python-format
 msgid "%s (working, repository)"
-msgstr ""
+msgstr "%s (ワーキング、リポジトリ)"
 
 #: meld/vcview.py:570
 #, python-format
 msgid "%s (repository, working)"
-msgstr ""
+msgstr "%s (リポジトリ、ワーキング)"
 
 #: meld/vcview.py:735
 msgid "Remove folder and all its files?"
-msgstr ""
+msgstr "すべてのフォルダーとファイルを削除しますか?"
 
 #: meld/vcview.py:737
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
 msgstr ""
+"選択したファイルとフォルダーを (フォルダー内のファイルも含めて) すべてバー"
+"ジョン管理から削除します。"
 
 #: meld/vcview.py:850
 msgid "Clear"
-msgstr ""
+msgstr "クリア"
 
 #~ msgid "Add"
 #~ msgstr "追加"

From 8292e53d883e35128d4949fff9f77a23e9d71f90 Mon Sep 17 00:00:00 2001
From: Helly Guo <buffoonguo@gmail.com>
Date: Wed, 16 Feb 2022 09:20:51 +0800
Subject: [PATCH 045/116] fix code to pass the lint check

---
 meld/dirdiff.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 767d9e1f..2e894088 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -1277,8 +1277,9 @@ def update_action_sensitivity(self):
             self.set_action_enabled('folder-expand', is_single_foldable_row)
             self.set_action_enabled('folder-compare', True)
             self.set_action_enabled('folder-mark', True)
-            self.set_action_enabled('folder-unmark', self.marked != None)
-            self.set_action_enabled('folder-compare-marked', self.marked != None)
+            self.set_action_enabled('folder-unmark', self.marked is not None)
+            self.set_action_enabled(
+                'folder-compare-marked', self.marked is not None)
             self.set_action_enabled('folder-delete', is_valid)
             self.set_action_enabled('folder-copy-left', is_valid and pane > 0)
             self.set_action_enabled(

From fd506faf845df724bb2f410c497d33e0ddd4c056 Mon Sep 17 00:00:00 2001
From: Luna Jernberg <droidbittin@gmail.com>
Date: Sun, 20 Feb 2022 20:06:16 +0000
Subject: [PATCH 046/116] Update Swedish translation

---
 po/sv.po | 82 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 43 insertions(+), 39 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index 4940dd52..d2ac86d0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,14 +5,14 @@
 # Sebastian Rasmussen <sebras@gmail.com>, 2015.
 # Anders Jonsson <anders.jonsson@norsjovallen.se>, 2016, 2018, 2019, 2020, 2021, 2022.
 # Josef Andersson <l10nl18nsweja@gmail.com>, 2014, 2015, 2016, 2017.
-# Luna Jernberg <droidbittin@gmail.com>, 2021.
+# Luna Jernberg <droidbittin@gmail.com>, 2021, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-01-08 23:40+0000\n"
-"PO-Revision-Date: 2022-01-09 02:03+0100\n"
+"POT-Creation-Date: 2022-01-31 07:53+0000\n"
+"PO-Revision-Date: 2022-02-20 21:04+0100\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -850,7 +850,7 @@ msgstr "Samma"
 msgid "New"
 msgstr "Nya"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Ändrade"
@@ -859,19 +859,23 @@ msgstr "Ändrade"
 msgid "Ignore filename case"
 msgstr "Ignorera skiftlägeskänslighet för filnamn"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr "Normalisera Unicode-sökvägar"
+
+#: meld/resources/gtk/menus.ui:175
 msgid "Normal"
 msgstr "Normala"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Oversionerade"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Ignorerade"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:190
 msgid "Flatten folders"
 msgstr "Platta till mappar"
 
@@ -1138,7 +1142,7 @@ msgstr "Fil ett"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:537
+#: meld/dirdiff.py:556
 msgid "Name"
 msgstr "Namn"
 
@@ -1178,7 +1182,7 @@ msgstr "Radbruten"
 msgid "Replace _All"
 msgstr "Ersätt _alla"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1157 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1180 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "_Ersätt"
 
@@ -1564,7 +1568,7 @@ msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid."
 msgid "Close _without Saving"
 msgstr "Stäng _utan att spara"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1156
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1179
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Avbryt"
@@ -1674,95 +1678,95 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:558 meld/preferences.py:132
+#: meld/dirdiff.py:577 meld/preferences.py:132
 msgid "Size"
 msgstr "Storlek"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:566 meld/preferences.py:133
+#: meld/dirdiff.py:585 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Ändringstid"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:574 meld/preferences.py:134
+#: meld/dirdiff.py:593 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Ändringstid (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:582 meld/preferences.py:135
+#: meld/dirdiff.py:601 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Rättigheter"
 
-#: meld/dirdiff.py:832
+#: meld/dirdiff.py:851
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (söker igenom…)"
 
-#: meld/dirdiff.py:864 meld/dirdiff.py:888
+#: meld/dirdiff.py:883 meld/dirdiff.py:915
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Söker igenom {folder}"
 
-#: meld/dirdiff.py:1028
+#: meld/dirdiff.py:1051
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Klar"
 
-#: meld/dirdiff.py:1041
+#: meld/dirdiff.py:1064
 msgid "Folder {} is being compared to itself"
 msgstr "Mappen {} jämförs med sig själv"
 
-#: meld/dirdiff.py:1047
+#: meld/dirdiff.py:1070
 msgid "Folders have no differences"
 msgstr "Mapparna skiljer sig inte åt"
 
-#: meld/dirdiff.py:1049
+#: meld/dirdiff.py:1072
 msgid "Contents of scanned files in folders are identical."
 msgstr "Innehållet i mapparnas avsökta filer är identiskt."
 
-#: meld/dirdiff.py:1051
+#: meld/dirdiff.py:1074
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 "Mapparnas avsökta filer verkar identiska, men innehållet har inte genomsökts."
 
-#: meld/dirdiff.py:1054
+#: meld/dirdiff.py:1077
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Filfilter används, och därför har inte alla filer genomsökts."
 
-#: meld/dirdiff.py:1056
+#: meld/dirdiff.py:1079
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Textfilter används och kan dölja skillnader i innehåll."
 
-#: meld/dirdiff.py:1072 meld/filediff.py:1917
+#: meld/dirdiff.py:1095 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Dölj"
 
-#: meld/dirdiff.py:1074 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/dirdiff.py:1097 meld/filediff.py:1919 meld/filediff.py:1949
 #: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Dölj"
 
-#: meld/dirdiff.py:1083
+#: meld/dirdiff.py:1106
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Flera fel inträffade vid avsökning av denna mapp"
 
-#: meld/dirdiff.py:1084
+#: meld/dirdiff.py:1107
 msgid "Files with invalid encodings found"
 msgstr "Filer med ogiltiga teckenkodningar hittades"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1109
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "En del filer hade en felaktig kodning. Namnen är ungefär:"
 
-#: meld/dirdiff.py:1088
+#: meld/dirdiff.py:1111
 msgid "Files hidden by case insensitive comparison"
 msgstr "Filer dolda av skiftlägeskänslig jämförelse"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1090
+#: meld/dirdiff.py:1113
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1770,17 +1774,17 @@ msgstr ""
 "Du gör en skiftlägesokänslig jämförelse på ett skiftlägeskänsligt filsystem. "
 "En del filer syns inte:"
 
-#: meld/dirdiff.py:1101
+#: meld/dirdiff.py:1124
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "”{first_file}” dold av ”{second_file}”"
 
-#: meld/dirdiff.py:1160
+#: meld/dirdiff.py:1183
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ersätt mappen ”%s”?"
 
-#: meld/dirdiff.py:1162
+#: meld/dirdiff.py:1185
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1789,11 +1793,11 @@ msgstr ""
 "En annan mapp med samma namn existerar redan i ”%s”.\n"
 "Om du ersätter befintlig mapp kommer alla filer att förloras."
 
-#: meld/dirdiff.py:1175
+#: meld/dirdiff.py:1198
 msgid "Error copying file"
 msgstr "Fel vid filkopiering"
 
-#: meld/dirdiff.py:1176
+#: meld/dirdiff.py:1199
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1806,11 +1810,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1201 meld/vcview.py:764
+#: meld/dirdiff.py:1224 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Fel vid borttagning av {}"
 
-#: meld/dirdiff.py:1691
+#: meld/dirdiff.py:1715
 msgid "No folder"
 msgstr "Ingen mapp"
 
@@ -2164,7 +2168,7 @@ msgstr "Filnamn"
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Behöver tre filer för att sammanfoga automatiskt, fick: %r"
 
-#: meld/meldwindow.py:403
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Kan inte jämföra en blandning av filer och kataloger"
 

From 4a357665fa6cdab7543fca950408e198a53e82bf Mon Sep 17 00:00:00 2001
From: Sergej A <sw@atrus.ru>
Date: Mon, 21 Feb 2022 20:40:31 +0000
Subject: [PATCH 047/116] Update Russian translation

---
 po/ru.po | 3327 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 2022 insertions(+), 1305 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index d4efaed4..b4cc1c87 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,11 +9,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Meld 1.4.0\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-05-16 22:39+0000\n"
-"PO-Revision-Date: 2014-06-14 10:33+0400\n"
-"Last-Translator: Yuri Myasoedov <ymyasoedov@yandex.ru>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
+"POT-Creation-Date: 2022-01-30 21:55+0000\n"
+"PO-Revision-Date: 2022-02-20 20:20+1000\n"
+"Last-Translator: Ser82-png <sw@atrus.ru>\n"
 "Language-Team: Русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -21,51 +20,40 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.6.5\n"
+"X-Generator: Poedit 2.3\n"
 
-#: ../bin/meld:134
-msgid "Cannot import: "
-msgstr "Не удалось импортировать: "
-
-#: ../bin/meld:137
-#, c-format
-msgid "Meld requires %s or higher."
-msgstr "Meld требует версию %s или более позднюю."
-
-#: ../bin/meld:141
-msgid "Meld does not support Python 3."
-msgstr "Meld не поддерживает Python 3."
-
-#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+#: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
+#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
 msgid "Meld"
 msgstr "Meld"
 
-#: ../data/meld.desktop.in.h:2
+#: data/org.gnome.meld.desktop.in.in:4
 msgid "Diff Viewer"
 msgstr "Просмотр различий"
 
-#: ../data/meld.desktop.in.h:3
-msgid "Meld Diff Viewer"
-msgstr "Meld — приложение для просмотра различий"
-
-#: ../data/meld.desktop.in.h:4
+#: data/org.gnome.meld.desktop.in.in:5 data/org.gnome.meld.appdata.xml.in.in:12
 msgid "Compare and merge your files"
 msgstr "Сравнение и объединение файлов"
 
-#: ../data/meld.appdata.xml.in.h:1
+#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/org.gnome.meld.desktop.in.in:7
+msgid "diff;merge;"
+msgstr "diff;merge;сравнение;объединение;"
+
+#: data/org.gnome.meld.appdata.xml.in.in:14
 msgid ""
 "Meld is a visual diff and merge tool targeted at developers. Meld helps you "
 "compare files, directories, and version controlled projects. It provides "
 "two- and three-way comparison of both files and directories, and supports "
 "many version control systems including Git, Mercurial, Bazaar and Subversion."
 msgstr ""
-"Meld — это программа для визуального сравнения различий, предназначенная для "
-"разработчиков. Meld помогает сравнивать файлы, каталоги и контролировать "
+"Meld — это приложение для визуального сравнения различий, предназначенная "
+"для разработчиков. Meld помогает сравнивать файлы, каталоги и контролировать "
 "версии проектов. Она обеспечивает двух- и трёхстороннее сравнение обоих "
 "файлов/каталогов, а также имеет поддержку многих популярных систем контроля "
 "версий, в том числе Git, Mercurial, Bazaar и Subversion."
 
-#: ../data/meld.appdata.xml.in.h:2
+#: data/org.gnome.meld.appdata.xml.in.in:21
 msgid ""
 "Meld helps you review code changes, understand patches, and makes enormous "
 "merge conflicts slightly less painful."
@@ -73,225 +61,269 @@ msgstr ""
 "Meld помогает просматривать изменения кода, разбираться в патчах и "
 "предотвращать конфликты при слиянии кода."
 
-#: ../data/mime/meld.xml.in.h:1
+#: data/org.gnome.meld.appdata.xml.in.in:51
+msgid "The GNOME Project"
+msgstr "Проект GNOME"
+
+#: data/mime/org.gnome.meld.xml.in:4
 msgid "Meld comparison description"
 msgstr "Описание сравнения Meld"
 
-#: ../data/org.gnome.meld.gschema.xml.h:1
-msgid "Default window size"
-msgstr "Размер окна по умолчанию"
+#: data/org.gnome.meld.gschema.xml:37
+msgid "Default window width"
+msgstr "Ширина окна по умолчанию"
 
-#: ../data/org.gnome.meld.gschema.xml.h:2
-msgid "Show toolbar"
-msgstr "Панель инструментов"
+#: data/org.gnome.meld.gschema.xml:41
+msgid "Default window height"
+msgstr "Высота окна по умолчанию"
 
-#: ../data/org.gnome.meld.gschema.xml.h:3
-msgid "If true, the window toolbar is visible."
-msgstr "Если отмечено, то панель инструментов видна."
+#: data/org.gnome.meld.gschema.xml:45
+msgid "Default window maximised state"
+msgstr "Окно развёрнуто на максимальный размер по умолчанию"
 
-#: ../data/org.gnome.meld.gschema.xml.h:4
-msgid "Show statusbar"
-msgstr "Строка состояния"
+#: data/org.gnome.meld.gschema.xml:49
+msgid "Default window fullscreen state"
+msgstr "Полноэкранное состояние окна по умолчанию"
 
-#: ../data/org.gnome.meld.gschema.xml.h:5
-msgid "If true, the window statusbar is visible."
-msgstr "Если отмечено, то строка состояния видна."
+#: data/org.gnome.meld.gschema.xml:58
+msgid "Prefer application-wide dark theme"
+msgstr "Предпочитаю тёмный вариант темы для приложения"
+
+#: data/org.gnome.meld.gschema.xml:59
+msgid ""
+"If true, the GTK dark theme variant will be used, if available. Note that "
+"this is separate from the syntax highlighting scheme."
+msgstr ""
+"Если значение \"true\", будет использоваться тёмный вариант темы GTK, если "
+"он доступен. Обратите внимание, что это отдельная настройка, не зависимая от "
+"схемы подсветки синтаксиса."
 
-#: ../data/org.gnome.meld.gschema.xml.h:6
-msgid "Automatically detected text encodings"
-msgstr "Автоматическое обнаружение кодировок текста"
+#: data/org.gnome.meld.gschema.xml:65
+msgid "Additional automatically detected text encodings"
+msgstr "Дополнительное автоматическое обнаружение кодировок текста"
 
-#: ../data/org.gnome.meld.gschema.xml.h:7
+#: data/org.gnome.meld.gschema.xml:66
 msgid ""
-"These text encodings will be automatically used (in order) to try to decode "
-"loaded text files."
+"Meld will use these text encodings to try to decode loaded text files before "
+"trying any other encodings. In addition to the encodings in this list, UTF-8 "
+"and the current locale-default encoding will always be used; other encodings "
+"may also be tried, depending on the user’s locale."
 msgstr ""
-"Данные кодировки текста будут автоматически использованы (по порядку) при "
-"декодировании загруженных текстовых файлов."
+"Meld будет использовать следующие кодировки в первую очередь для "
+"декодирования текста. UTF-8 и текущая кодировка будут использоваться в "
+"дополнение к кодировкам из этого списка. В зависимости от настроек "
+"пользователя, могут быть использованы другие кодировки."
 
-#: ../data/org.gnome.meld.gschema.xml.h:8
+#: data/org.gnome.meld.gschema.xml:73
 msgid "Width of an indentation step"
 msgstr "Ширина шага отступа"
 
-#: ../data/org.gnome.meld.gschema.xml.h:9
+#: data/org.gnome.meld.gschema.xml:74
 msgid "The number of spaces to use for a single indent step"
-msgstr "Количество пробелов для отступа одного шага"
+msgstr "Количество пробелов, используемых для одного шага отступа"
 
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: data/org.gnome.meld.gschema.xml:78
 msgid "Whether to indent using spaces or tabs"
 msgstr "Вставлять пробелы вместо табуляций"
 
-#: ../data/org.gnome.meld.gschema.xml.h:11
+#: data/org.gnome.meld.gschema.xml:79
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr ""
-"Если отмечено, то новый отступ будет вставлять пробелы вместо табуляций."
+"Если значение \"true\", то новый отступ будет вставлять пробелы вместо "
+"табуляций."
 
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: data/org.gnome.meld.gschema.xml:83 meld/resources/ui/statusbar-menu.ui:5
 msgid "Show line numbers"
 msgstr "Показывать номера строк"
 
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: data/org.gnome.meld.gschema.xml:84
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr ""
-"Если отмечено, то номера строк будут показаны в столбцах сравнения файлов."
+"Если значение \"true\", то номера строк будут показаны в столбцах сравнения "
+"файлов."
 
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: data/org.gnome.meld.gschema.xml:88
 msgid "Highlight syntax"
 msgstr "Подсвечивать синтаксис"
 
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: data/org.gnome.meld.gschema.xml:89
 msgid ""
-"Whether to highlight syntax in comparisons. Because of Meld's own color "
+"Whether to highlight syntax in comparisons. Because of Meld’s own color "
 "highlighting, this is off by default."
 msgstr ""
-"Следует ли выделять синтаксис в сравнениях. Так как в Meld есть подсветка "
-"цветом, данная функция по умолчанию отключена."
+"Следует ли подсвечивать синтаксис в сравнениях. Так как в Meld есть "
+"собственная схема подсветки, данная функция по умолчанию отключена."
 
-#: ../data/org.gnome.meld.gschema.xml.h:16
-msgid "Displayed whitespace"
-msgstr "Показывать пробелы"
+#: data/org.gnome.meld.gschema.xml:93
+msgid "Color scheme to use for syntax highlighting"
+msgstr "Цветовая схема для подсветки синтаксиса"
 
-#: ../data/org.gnome.meld.gschema.xml.h:17
-#, fuzzy
+#: data/org.gnome.meld.gschema.xml:94
+msgid "Used by GtkSourceView to determine colors for syntax highlighting"
+msgstr ""
+"Используется в GtkSourceView для определения цветов для подсветки синтаксиса"
+
+#: data/org.gnome.meld.gschema.xml:98
+msgid "Draw whitespace"
+msgstr "Показывать непечатаемые символы"
+
+#: data/org.gnome.meld.gschema.xml:99
 msgid ""
-"Selector for individual whitespace character types to be shown. Possible "
-"values are 'space', 'tab', 'newline' and 'nbsp'."
+"If true, whitespace characters will be drawn in comparisons even if they are "
+"not in a changed area."
 msgstr ""
-"Разделитель для индивидуальных типов символов пробела для показа. Возможные "
-"значения: 'пробел', 'табулятор', 'новая_строка' и 'кавычка'."
+"Если значение \"true\", непечатаемые символы будут отрисованы в том числе и "
+"в неизменённых участках."
 
-#: ../data/org.gnome.meld.gschema.xml.h:18
-#, fuzzy
+#: data/org.gnome.meld.gschema.xml:108
 msgid "Wrap mode"
 msgstr "Режим переноса строк"
 
-#: ../data/org.gnome.meld.gschema.xml.h:19
-#, fuzzy
+#: data/org.gnome.meld.gschema.xml:109
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
 "('word')."
 msgstr ""
-"Строки в сравнении файлов будут перенесены в соответствии с этой установкой, "
-"либо нет для всех ('нет'), либо любой символ ('символ'), либо только в конце "
-"слов ('слово')."
+"Строки в сравнении файлов будут перенесены в соответствии с этой настройкой. "
+"Возможные варианты: без переноса ('none'), любой символ ('char'), только в "
+"конце слов ('word')."
 
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: data/org.gnome.meld.gschema.xml:116 meld/resources/ui/statusbar-menu.ui:13
 msgid "Highlight current line"
 msgstr "Подсвечивать текущую строку"
 
-#: ../data/org.gnome.meld.gschema.xml.h:21
+#: data/org.gnome.meld.gschema.xml:117
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr ""
-"Если отмечено, то строка, на которой находится курсор, будет подсвечена в "
-"окне сравнения файлов."
+"Если значение \"true\", то строка, на которой находится курсор, будет "
+"подсвечена в окне сравнения файлов."
 
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: data/org.gnome.meld.gschema.xml:121
 msgid "Use the system default monospace font"
 msgstr "Использовать системный моноширинный шрифт"
 
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: data/org.gnome.meld.gschema.xml:122
 msgid ""
-"If false, the defined custom font will be used instead of the system "
-"monospace font."
+"If false, custom-font will be used instead of the system monospace font."
 msgstr ""
-"Если не отмечено, то будет использоваться пользовательский шрифт вместо "
-"системного."
+"Если значение \"false\", то будет использоваться пользовательский шрифт "
+"вместо системного."
 
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: data/org.gnome.meld.gschema.xml:126
 msgid "Custom font"
 msgstr "Пользовательский шрифт"
 
-#: ../data/org.gnome.meld.gschema.xml.h:25
-#, fuzzy
+#: data/org.gnome.meld.gschema.xml:127
 msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
 msgstr ""
 "Пользовательский шрифт для использования, сохранённый в виде строки и "
-"проанализированный как описание шрифта Pango"
+"проанализированный как описание шрифта Pango."
+
+#: data/org.gnome.meld.gschema.xml:133
+msgid "Show overview source map"
+msgstr "Показывать мини-карту"
+
+#: data/org.gnome.meld.gschema.xml:134
+msgid ""
+"If true, file comparisons will have paired source maps for compared files."
+msgstr ""
+"Если значение \"true\", при сравнении файлов мини-карты будут отображаться "
+"парой."
+
+#: data/org.gnome.meld.gschema.xml:139
+msgid "Style of overview map"
+msgstr "Стиль мини-карты"
 
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: data/org.gnome.meld.gschema.xml:140
+msgid "Style options for how the overview map is displayed."
+msgstr "Настройки стиля отображения мини-карты."
+
+#: data/org.gnome.meld.gschema.xml:146
 msgid "Ignore blank lines when comparing files"
 msgstr "Игнорировать пустые строки при сравнении файлов"
 
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: data/org.gnome.meld.gschema.xml:147
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
-"Если отмечено, то пустые строки будут опущены при подсвечивании различий "
-"между файлами."
+"Если значение \"true\", то пустые строки будут опущены при подсвечивании "
+"различий между файлами."
 
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: data/org.gnome.meld.gschema.xml:154
 msgid "Use the system default editor"
 msgstr "Использовать системный редактор по умолчанию"
 
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: data/org.gnome.meld.gschema.xml:155
 msgid ""
-"If false, the defined custom editor will be used instead of the system "
-"editor when opening files externally."
+"If false, custom-editor-command will be used instead of the system editor "
+"when opening files externally."
 msgstr ""
-"Если не отмечено, то при открытии внешних файлов будет использоваться "
+"Если значение \"false\", то при открытии внешних файлов будет использоваться "
 "сторонний редактор вместо системного."
 
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: data/org.gnome.meld.gschema.xml:159
 msgid "The custom editor launch command"
 msgstr "Команда запуска стороннего редактора"
 
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: data/org.gnome.meld.gschema.xml:160
 msgid ""
 "The command used to launch a custom editor. Some limited templating is "
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
 msgstr ""
-"Команда для запуска стороннего редактора. Есть некоторые ограниченные "
-"шаблонов; на данный момент '{file}' и '{line}' являются зарезервированными."
+"Команда для запуска стороннего редактора. Предусмотрена ограниченная "
+"поддержка использования шаблонов; на данный момент '{file}' и '{line}' "
+"являются зарезервированными."
 
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: data/org.gnome.meld.gschema.xml:166
 msgid "Columns to display"
-msgstr "Отображаемые столбцы"
+msgstr "Отображение столбцов"
 
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: data/org.gnome.meld.gschema.xml:167
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
 msgstr "Список столбцов при сравнении папок и должны ли они отображаться."
 
-#: ../data/org.gnome.meld.gschema.xml.h:34 ../data/ui/preferences.ui.h:30
+#: data/org.gnome.meld.gschema.xml:171 meld/resources/ui/preferences.ui:951
 msgid "Ignore symbolic links"
 msgstr "Игнорировать символические ссылки"
 
-#: ../data/org.gnome.meld.gschema.xml.h:35
+#: data/org.gnome.meld.gschema.xml:172
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
 msgstr ""
-"Если отмечено, то при сравнении папок при прохождении по дереву каталогов "
-"символические ссылки игнорируются."
+"Если значение \"true\", то при сравнении папок при прохождении по дереву "
+"каталогов символические ссылки игнорируются."
 
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: data/org.gnome.meld.gschema.xml:176
 msgid "Use shallow comparison"
 msgstr "Использовать поверхностное сравнение"
 
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: data/org.gnome.meld.gschema.xml:177
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
 "different otherwise."
 msgstr ""
-"Если отмечено, то при сравнении папок, сравнение файлов основывается только "
-"на основе размера и изменения времени. Если размер и изменения времени "
-"совпадают, то файлы считаются идентичными, в противном случае — разными."
+"Если значение \"true\", то при сравнении папок, сравнение файлов "
+"осуществляется только на основе размера и изменения времени. Если размер и "
+"время совпадают, то файлы считаются идентичными, в противном случае — "
+"разными."
 
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: data/org.gnome.meld.gschema.xml:181
 msgid "File timestamp resolution"
 msgstr "Файл отметки времени"
 
-#: ../data/org.gnome.meld.gschema.xml.h:39
+#: data/org.gnome.meld.gschema.xml:182
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
-"between two files before they're considered to have different mtimes. This "
+"between two files before they’re considered to have different mtimes. This "
 "is useful when comparing files between filesystems with different timestamp "
 "resolution."
 msgstr ""
@@ -300,119 +332,139 @@ msgstr ""
 "времени. Может пригодиться при сравнении файлов между файловыми системами, с "
 "разным разрешением отметки времени."
 
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: data/org.gnome.meld.gschema.xml:186 meld/resources/ui/preferences.ui:852
+msgid "Apply text filters during folder comparisons"
+msgstr "Применять текстовые фильтры во время сравнения папок"
+
+#: data/org.gnome.meld.gschema.xml:187
+msgid ""
+"If true, folder comparisons that compare file contents also apply active "
+"text filters and the blank line trimming option, and ignore newline "
+"differences."
+msgstr ""
+"Если значение \"true\", сравнение содержания файлов в режиме сравнения папок "
+"будет использовать текущие текстовые фильтры, настройку скрытия изменений в "
+"пустых строках, а также игнорировать отличия в окончаниях строк."
+
+#: data/org.gnome.meld.gschema.xml:191
 msgid "File status filters"
 msgstr "Фильтры статуса файлов"
 
-#: ../data/org.gnome.meld.gschema.xml.h:41
+#: data/org.gnome.meld.gschema.xml:192
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 "Список статусов, используемых для фильтрации видимых файлов в папке "
 "сравнения."
 
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: data/org.gnome.meld.gschema.xml:198
 msgid "Show the version control console output"
-msgstr "Показать консольный вывод контроля версий"
+msgstr "Показать вывод консоли контроля версий"
 
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: data/org.gnome.meld.gschema.xml:199
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
 msgstr ""
-"Если отмечено, то секция консольного вывода будет показана в виде контроля "
-"версий, отображая команды запуска для операций контроля версий."
+"Если значение \"true\", то на панелях сравнения изменений в системе "
+"управления версиями будет показан раздел вывода данных в консоли, отображая "
+"команды выполняемые для операций управления версиями."
 
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: data/org.gnome.meld.gschema.xml:203
 msgid "Version control pane position"
-msgstr "Позиция панели контроля версий"
+msgstr "Положение панели контроля версий"
 
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: data/org.gnome.meld.gschema.xml:204
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
 msgstr ""
-"Высота панели главного дерева контроля версий, когда панель консоли показана."
+"Высота панели основного дерева контроля версий, когда показана панель "
+"консоли."
 
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: data/org.gnome.meld.gschema.xml:208
 msgid "Present version comparisons as left-local/right-remote"
 msgstr "Отображать сравнение версий как левый-локальный/правый-удалённый"
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
-#, fuzzy
+#: data/org.gnome.meld.gschema.xml:209
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
 "a left-is-theirs, right-is-mine scheme is used."
 msgstr ""
-"Если отмечено, то сравнения контроля версий будут использовать лево как "
-"локальную, право как удалённую схему, чтобы определить, в каком порядке "
-"представить файлы в панелях. В противном случае, лево — это использованная "
-"мной схема."
+"Если значение \"true\", то сравнения контроля версий будут использовать "
+"\"лево-как-локальную\", \"право-как-удалённую\" схему, чтобы определить, в "
+"каком порядке представить файлы в панелях. В противном случае, будет "
+"использоваться \"лево-как-удалённая\", \"право-как-локальная\" схема."
 
-#: ../data/org.gnome.meld.gschema.xml.h:48
-#, fuzzy
-#| msgid "Start a version control comparison"
+#: data/org.gnome.meld.gschema.xml:213
 msgid "Order for files in three-way version control merge comparisons"
-msgstr "Начать сравнение, используя сравнение контроля версий (СКВ)"
+msgstr "Порядок файлов в трёхполосном сравнении системы контроля версий"
 
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: data/org.gnome.meld.gschema.xml:214
 msgid ""
-"Choices for file order are remote/merge/local and local/merged/remote. This "
+"Choices for file order are remote/merged/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
 "control view, so is used solely for merges/conflict resolution within Meld."
 msgstr ""
+"Выбор между порядком файлов \"удалённые/объединённые/локальные\" или "
+"\"локальные/объединённые/удалённые\". Эта настройка затрагивает только "
+"трёхполосные сравнения, запускаемые с панели системы контроля версий, "
+"которые используются для разрешения конфликтов и объединения изменений в "
+"Meld."
 
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: data/org.gnome.meld.gschema.xml:218
 msgid "Show margin in commit message editor"
-msgstr "Показать поле в редакторе сообщения журнала"
+msgstr "Показывать поле в редакторе коммитов"
 
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: data/org.gnome.meld.gschema.xml:219
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
 msgstr ""
-"Если стоит галочка, то руководство будет отображаться, чтобы показать, что "
-"колонка поля присутствует в контроле версий в редакторе сообщений журнала."
+"Если значение \"true\", то будет показана направляющая, которая будет "
+"определять позицию поля в редакторе коммитов системы управления версиями."
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: data/org.gnome.meld.gschema.xml:223
 msgid "Margin column in commit message editor"
-msgstr "Колонка поля в редакторе сообщений журнала"
+msgstr "Правый край в редакторе коммитов"
 
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: data/org.gnome.meld.gschema.xml:224
 msgid ""
-"The column of the margin is at in the version control commit message editor."
+"The column at which to show the margin in the version control commit message "
+"editor."
 msgstr ""
-"Колонка поля присутствует в контроле версий в редакторе сообщений журнала."
+"Позиция, на которой отображается правый край поля в редакторе коммитов в "
+"системе управления версиями."
 
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: data/org.gnome.meld.gschema.xml:228
 msgid "Automatically hard-wrap commit messages"
-msgstr "Автоматически жёстко перенесённые сообщения журнала"
+msgstr "Автоматически жёстко переносить строки в коммитах"
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: data/org.gnome.meld.gschema.xml:229
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
-"insert line breaks) at the defined commit margin before commit."
+"insert line breaks) at the commit margin before commit."
 msgstr ""
-"Если стоит галочка, то контроль версий в редакторе сообщений журнала будет "
-"жёстко перенесённым (т.е. вставка разрывов строк) на определённую фиксацию "
-"поля до фиксации."
+"Если значение \"true\", то в редакторе коммитов контроля версий будут жёстко "
+"переносится строки при достижении правого края поля коммита (т.е. вставка "
+"разрывов строк)."
 
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: data/org.gnome.meld.gschema.xml:233
 msgid "Version control status filters"
 msgstr "Фильтры статуса контроля версий"
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: data/org.gnome.meld.gschema.xml:234
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 "Список статусов, используемых для фильтрации видимых файлов в системе "
 "контроля версий сравнения."
 
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: data/org.gnome.meld.gschema.xml:248
 msgid "Filename-based filters"
 msgstr "Фильтры на основе имени файла"
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: data/org.gnome.meld.gschema.xml:249
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
@@ -420,473 +472,993 @@ msgstr ""
 "Список фильтров на основе имени файла, если их применить, будут удалены "
 "соответствующие файлы из папок сравнения."
 
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: data/org.gnome.meld.gschema.xml:263
 msgid "Text-based filters"
 msgstr "Текстовые фильтры"
 
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: data/org.gnome.meld.gschema.xml:264
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
-"but won't contribute to the comparison itself."
+"but won’t contribute to the comparison itself."
 msgstr ""
-"Список фильтров на основе регулярных выражений текста, если применить, то "
-"фильтр исключит их из сравнения файлов. Выражения будут отображаться, но "
-"участвовать в сравнении не будут."
+"Список текстовых фильтров на основе регулярных выражений. Если применить, то "
+"фильтры будут извлекать фрагменты текста при сравнении файлов. Текст по-"
+"прежнему будет отображаться, но не будет участвовать в самом сравнении."
 
-#: ../data/ui/application.ui.h:1
-msgid "About Meld"
-msgstr "О программе Meld"
+#: data/styles/meld-base.style-scheme.xml.in:1
+msgid "Classic (Meld)"
+msgstr "Классическая (Meld)"
 
-#: ../data/ui/application.ui.h:2
-msgid ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2013 Kai Willadsen"
-msgstr ""
-"Авторское право © 2002-2009 Stephen Kennedy\n"
-"Авторское право © 2009-2013 Kai Willadsen"
+#: data/styles/meld-base.style-scheme.xml.in:3
+msgid "Base color scheme for Meld highlighting"
+msgstr "Базовая цветовая схема для подсветки изменений"
 
-#: ../data/ui/application.ui.h:4
-msgid "Website"
-msgstr "Веб-сайт"
+#: data/styles/meld-dark.style-scheme.xml.in:1
+msgid "Meld dark scheme"
+msgstr "Тёмная"
 
-#: ../data/ui/application.ui.h:5
-msgid "translator-credits"
-msgstr ""
-"Носенко Андрей <awn@bcs.zp.ua>, 2003\n"
-"Дмитрий Мастрюков <dmitry@taurussoft.org>, 2004\n"
-"Леонид Кантер <leon@asplinux.ru>, 2006\n"
-"Тарасов Александр <algri14@mail.ru>, 2013\n"
-"Станислав Соловей <whats_up@tut.by>, 2014"
+#: data/styles/meld-dark.style-scheme.xml.in:3
+msgid "Dark color scheme for Meld highlighting"
+msgstr "Тёмная цветовая схема для подсветки изменений"
 
-#: ../data/ui/application.ui.h:6
-msgid "_Preferences"
-msgstr "_Настройки"
+#: meld/resources/gtk/help-overlay.ui:14
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Общие"
 
-#: ../data/ui/application.ui.h:7
-msgid "_Help"
-msgstr "_Справка"
+#: meld/resources/gtk/help-overlay.ui:19
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr "Начать сравнение в новой вкладке"
 
-#: ../data/ui/application.ui.h:8
-msgid "_About"
-msgstr "_О программе"
+#: meld/resources/gtk/help-overlay.ui:26
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "Закрыть текущую вкладку сравнения"
 
-#: ../data/ui/application.ui.h:9
-msgid "_Quit"
-msgstr "_Завершить"
+#: meld/resources/gtk/help-overlay.ui:33
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Выйти из приложения Meld"
 
-#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
-msgid "_Compare"
-msgstr "_Сравнить"
+#: meld/resources/gtk/help-overlay.ui:40
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "Остановить текущее действие"
 
-#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
-msgid "Compare selected files"
-msgstr "Сравнить выбранные файлы"
+#: meld/resources/gtk/help-overlay.ui:47
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr "Обновить сравнение"
 
-#: ../data/ui/dirdiff.ui.h:3
-msgid "Copy _Left"
-msgstr "Копировать в_лево"
+#: meld/resources/gtk/help-overlay.ui:54
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "Переключить полноэкранный режим"
+
+#: meld/resources/gtk/help-overlay.ui:63
+msgctxt "shortcut window"
+msgid "Panes"
+msgstr "Панели"
+
+#: meld/resources/gtk/help-overlay.ui:68
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "Перейти к предыдущей панели сравнения"
+
+#: meld/resources/gtk/help-overlay.ui:75
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "Перейти к следующей панели сравнения"
+
+#: meld/resources/gtk/help-overlay.ui:84
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Изменения"
+
+#: meld/resources/gtk/help-overlay.ui:89
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Перейти к предыдущему изменению"
 
-#: ../data/ui/dirdiff.ui.h:4
-msgid "Copy to left"
-msgstr "Копировать влево"
+#: meld/resources/gtk/help-overlay.ui:96
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Перейти к следующему изменению"
 
-#: ../data/ui/dirdiff.ui.h:5
-msgid "Copy _Right"
-msgstr "Копировать в_право"
+# Ускоритель установлен на букву К, т. к. В конфликтует с _Вид
+#: meld/resources/gtk/help-overlay.ui:105
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "Вкладки"
+
+#: meld/resources/gtk/help-overlay.ui:110
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr "Перейти к предыдущей вкладке"
 
-#: ../data/ui/dirdiff.ui.h:6
-msgid "Copy to right"
-msgstr "Копировать вправо"
+#: meld/resources/gtk/help-overlay.ui:117
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr "Перейти к следующей вкладке"
 
-#: ../data/ui/dirdiff.ui.h:7
-msgid "Delete selected"
-msgstr "Удалить выделенное"
+#: meld/resources/gtk/help-overlay.ui:124
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "Переключиться на вкладку"
+
+#: meld/resources/gtk/help-overlay.ui:131
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "Переместить вкладку влево"
+
+#: meld/resources/gtk/help-overlay.ui:138
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "Переместить вкладку вправо"
+
+#: meld/resources/gtk/help-overlay.ui:147
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Правка"
+
+#: meld/resources/gtk/help-overlay.ui:152
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "Отменить"
+
+#: meld/resources/gtk/help-overlay.ui:159
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "Повторить"
+
+#: meld/resources/gtk/help-overlay.ui:166
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr "Вырезать"
+
+#: meld/resources/gtk/help-overlay.ui:173
+msgctxt "shortcut window"
+msgid "Copy"
+msgstr "Копировать"
+
+#: meld/resources/gtk/help-overlay.ui:180
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr "Вставить"
+
+#: meld/resources/gtk/help-overlay.ui:187
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "Найти"
+
+#: meld/resources/gtk/help-overlay.ui:194
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "Найти следующее"
+
+#: meld/resources/gtk/help-overlay.ui:201
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "Найти предыдущее"
+
+#: meld/resources/gtk/help-overlay.ui:208
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "Заменить"
+
+#: meld/resources/gtk/help-overlay.ui:217
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr "Сравнение файлов"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1448
-msgid "Hide"
-msgstr "Скрыть"
+#: meld/resources/gtk/help-overlay.ui:222
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "Сохранить текущий файл"
 
-#: ../data/ui/dirdiff.ui.h:9
-msgid "Hide selected"
-msgstr "Скрыть выделенное"
+#: meld/resources/gtk/help-overlay.ui:229
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr "Сохранить текущий файл по новому пути"
 
-#: ../data/ui/dirdiff.ui.h:10
-msgid "Ignore Filename Case"
-msgstr "Игнорировать регистр имени файла"
+#: meld/resources/gtk/help-overlay.ui:236
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr "Сохраните все файлы в текущем сравнении"
 
-#: ../data/ui/dirdiff.ui.h:11
-msgid ""
-"Consider differently-cased filenames that are otherwise-identical to be the "
-"same"
-msgstr ""
-"Рассматривать имена файлов в разных регистрах, в противном случае они будут "
-"одинаковыми"
+#: meld/resources/gtk/help-overlay.ui:243
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "Предыдущий конфликт"
 
-#: ../data/ui/dirdiff.ui.h:12
-msgid "Same"
-msgstr "Одинаковые"
+#: meld/resources/gtk/help-overlay.ui:250
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr "Следующий конфликт"
 
-#: ../data/ui/dirdiff.ui.h:13
-msgid "Show identical"
-msgstr "Показывать одинаковые"
+#: meld/resources/gtk/help-overlay.ui:257
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr "Переместить текущее изменение влево"
 
-#: ../data/ui/dirdiff.ui.h:14
-msgid "New"
-msgstr "Новые"
+#: meld/resources/gtk/help-overlay.ui:264
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr "Переместить текущее изменение вправо"
 
-#: ../data/ui/dirdiff.ui.h:15
-msgid "Show new"
-msgstr "Показывать новые"
+#: meld/resources/gtk/help-overlay.ui:271
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr "Взять изменение слева"
 
-#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:71
-msgid "Modified"
-msgstr "Изменённые"
+#: meld/resources/gtk/help-overlay.ui:278
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr "Взять изменение справа"
 
-#: ../data/ui/dirdiff.ui.h:17
-msgid "Show modified"
-msgstr "Показывать изменённые"
+#: meld/resources/gtk/help-overlay.ui:285
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "Копировать изменение выше левого блока"
 
-#: ../data/ui/dirdiff.ui.h:18
-msgid "Filters"
-msgstr "Фильтры"
+#: meld/resources/gtk/help-overlay.ui:292
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "Копировать изменение ниже левого блока"
 
-#: ../data/ui/dirdiff.ui.h:19
-msgid "Set active filters"
-msgstr "Установить фильтры"
+#: meld/resources/gtk/help-overlay.ui:299
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr "Копировать изменения выше правого блока"
 
-#: ../data/ui/EditableList.ui.h:1
-msgid "Editable List"
-msgstr "Редактируемый список"
+#: meld/resources/gtk/help-overlay.ui:306
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr "Копировать изменения ниже правого блока"
 
-#: ../data/ui/EditableList.ui.h:2
-msgid "Active"
-msgstr "Активен"
+#: meld/resources/gtk/help-overlay.ui:313
+#: meld/resources/gtk/help-overlay.ui:341
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "Удалить изменения"
 
-#: ../data/ui/EditableList.ui.h:3
-msgid "Column Name"
-msgstr "Название столбца"
+#: meld/resources/gtk/help-overlay.ui:322
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "Сравнение папок"
 
-#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9
-msgid "_Add"
-msgstr "_Добавить"
+#: meld/resources/gtk/help-overlay.ui:327
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "Копировать влево"
 
-#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:735
-msgid "_Remove"
-msgstr "_Удалить"
+#: meld/resources/gtk/help-overlay.ui:334
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr "Копировать вправо"
 
-#: ../data/ui/EditableList.ui.h:6
-msgid "Move item up"
-msgstr "Переместить элемент вверх"
+#: meld/resources/gtk/help-overlay.ui:350
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr "Начать сравнение, используя сравнение контроля версий"
 
-#: ../data/ui/EditableList.ui.h:7
-msgid "Move _Up"
-msgstr "Переместить в_верх"
+#: meld/resources/gtk/help-overlay.ui:355
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr "Зафиксировать изменения в системе контроля версий"
 
-#: ../data/ui/EditableList.ui.h:8
-msgid "Move item down"
-msgstr "Переместить элемент вниз"
+#: meld/resources/gtk/help-overlay.ui:362
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr "Показать/скрыть вывод консоли"
 
-#: ../data/ui/EditableList.ui.h:9
-msgid "Move _Down"
-msgstr "Переместить в_низ"
+#: meld/resources/gtk/menus.ui:7
+msgid "Refresh"
+msgstr "Обновить"
 
-#. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:363
-#: ../meld/vcview.py:203
-msgid "Name"
-msgstr "Имя"
+#: meld/resources/gtk/menus.ui:12
+msgid "Stop"
+msgstr "Остановить"
 
-#: ../data/ui/EditableList.ui.h:11
-msgid "Pattern"
-msgstr "Шаблон"
+#: meld/resources/gtk/menus.ui:17
+msgid "Fullscreen"
+msgstr "Во весь экран"
 
-#: ../data/ui/EditableList.ui.h:12
-msgid "Add new filter"
-msgstr "Добавить новый фильтр"
+#: meld/resources/gtk/menus.ui:26
+msgid "Save As…"
+msgstr "Сохранить как…"
 
-#: ../data/ui/EditableList.ui.h:13
-msgid "Remove selected filter"
-msgstr "Удалить выбранный фильтр"
+#: meld/resources/gtk/menus.ui:30
+msgid "Save A_ll"
+msgstr "Сохранить в_се"
 
-#: ../data/ui/filediff.ui.h:1
-msgid "Save changes to documents before closing?"
-msgstr "Сохранить изменения в документах, перед закрытием?"
+#: meld/resources/gtk/menus.ui:34
+msgid "Revert files…"
+msgstr "Отменить изменения в файлах…"
 
-#: ../data/ui/filediff.ui.h:2
-msgid "If you don't save, changes will be permanently lost."
-msgstr "Если вы не сохраните изменения они будут безвозвратно потеряны."
+#: meld/resources/gtk/menus.ui:38
+msgid "Open Externally"
+msgstr "Открыть во внешнем приложении"
 
-#: ../data/ui/filediff.ui.h:3
-msgid "Close _without Saving"
-msgstr "Закрыть _без сохранения"
+#: meld/resources/gtk/menus.ui:45
+msgid "_Find…"
+msgstr "_Найти…"
 
-#: ../data/ui/filediff.ui.h:4
-msgid "_Cancel"
-msgstr "О_тменить"
+#: meld/resources/gtk/menus.ui:49
+msgid "_Replace…"
+msgstr "_Заменить…"
 
-#: ../data/ui/filediff.ui.h:5
-msgid "_Save"
-msgstr "Со_хранить"
+#: meld/resources/gtk/menus.ui:55
+msgid "View"
+msgstr "Вид"
 
-#: ../data/ui/filediff.ui.h:6
-msgid ""
-"This file can not be written to. You may click here to unlock this file and "
-"make changes anyway, but these changes must be saved to a new file."
-msgstr ""
-"Этот файл не может быть записан. Вы можете нажать здесь, чтобы "
-"разблокировать этот файл и внести изменения, но эти изменения должны быть "
-"сохранены как новый файл."
+#: meld/resources/gtk/menus.ui:59
+msgid "Overview Map"
+msgstr "Мини-карта"
 
-#: ../data/ui/filediff.ui.h:7
-msgid "File 3"
-msgstr "Файл 3"
+#: meld/resources/gtk/menus.ui:63
+msgid "Version control console"
+msgstr "Консоль контроля версий"
 
-#: ../data/ui/filediff.ui.h:8
-msgid "File 2"
-msgstr "Файл 2"
+#: meld/resources/gtk/menus.ui:67
+msgid "Lock scrolling"
+msgstr "Заблокировать прокрутку"
 
-#: ../data/ui/filediff.ui.h:9
-msgid "File 1"
-msgstr "Файл 1"
+#: meld/resources/gtk/menus.ui:73
+msgid "Comparison"
+msgstr "Сравнение"
 
-#: ../data/ui/filediff.ui.h:10
-msgid "Revert unsaved changes to documents?"
-msgstr "Отменить несохранённые изменения в документах?"
+#: meld/resources/gtk/menus.ui:77
+msgid "Merge All from Left"
+msgstr "Объединить все с левой панели"
 
-#: ../data/ui/filediff.ui.h:11
-msgid "Changes made to the following documents will be permanently lost:\n"
-msgstr ""
-"Изменения, внесённые в следующие документы будут безвозвратно потеряны:\n"
+#: meld/resources/gtk/menus.ui:81
+msgid "Merge All from Right"
+msgstr "Объединить все с правой панели"
 
-#: ../data/ui/findbar.ui.h:1
-msgid "_Replace"
-msgstr "_Заменить"
+#: meld/resources/gtk/menus.ui:85
+msgid "Merge All"
+msgstr "Объединить все"
 
-#: ../data/ui/findbar.ui.h:2
-msgid "Replace _All"
-msgstr "Заменить _все"
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
+msgid "Add Synchronization Point"
+msgstr "Добавить точку синхронизации"
 
-#: ../data/ui/findbar.ui.h:3
-msgid "_Previous"
-msgstr "_Предыдущее"
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
+msgid "Clear Synchronization Points"
+msgstr "Удалить точки синхронизации"
 
-#: ../data/ui/findbar.ui.h:4
-msgid "_Next"
-msgstr "_Следующее"
+#: meld/resources/gtk/menus.ui:103
+msgid "Format as Patch…"
+msgstr "Сформировать патч…"
 
-#: ../data/ui/findbar.ui.h:5
-msgid "Find:"
-msgstr "Найти:"
+#: meld/resources/gtk/menus.ui:112
+msgid "_Preferences"
+msgstr "_Параметры"
 
-#: ../data/ui/findbar.ui.h:6
-msgid "Replace _with:"
-msgstr "Заменить _на:"
+#: meld/resources/gtk/menus.ui:116
+msgid "Keyboard Shortcuts"
+msgstr "Клавиатурные сочетания"
 
-#: ../data/ui/findbar.ui.h:7
-msgid "_Match case"
-msgstr "_Учитывать регистр"
+#: meld/resources/gtk/menus.ui:120
+msgid "_Help"
+msgstr "_Справка"
 
-#: ../data/ui/findbar.ui.h:8
-msgid "Who_le word"
-msgstr "Слово _целиком"
+#: meld/resources/gtk/menus.ui:125
+msgid "_About Meld"
+msgstr "О приложении Meld"
 
-#: ../data/ui/findbar.ui.h:9
-msgid "Regular e_xpression"
-msgstr "_Регулярное выражение"
+#: meld/resources/gtk/menus.ui:138
+msgid "File status"
+msgstr "Статус файла"
 
-#: ../data/ui/findbar.ui.h:10
-msgid "Wrapped"
-msgstr "Перенесённый"
+#: meld/resources/gtk/menus.ui:140
+msgid "Same"
+msgstr "Одинаковые"
 
-#: ../data/ui/patch-dialog.ui.h:1
-msgid "Format as Patch"
-msgstr "В формате патча"
+#: meld/resources/gtk/menus.ui:144
+msgid "New"
+msgstr "Новые"
 
-#: ../data/ui/patch-dialog.ui.h:2
-msgid "Use differences between:"
-msgstr "Использовать различия между:"
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
+#: meld/vc/_vc.py:76
+msgid "Modified"
+msgstr "Изменён"
 
-#: ../data/ui/patch-dialog.ui.h:3
-msgid "Left and middle panes"
-msgstr "Левая и средняя панель"
+#: meld/resources/gtk/menus.ui:158
+msgid "Ignore filename case"
+msgstr "Игнорировать регистр имени файла"
 
-#: ../data/ui/patch-dialog.ui.h:4
-msgid "Middle and right panes"
-msgstr "Средняя и правая панель"
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr "Нормализовать пути в Unicode"
 
-#: ../data/ui/patch-dialog.ui.h:5
-msgid "_Reverse patch direction"
-msgstr "_Обратить направление патча"
+#: meld/resources/gtk/menus.ui:175
+msgid "Normal"
+msgstr "Стандартные"
 
-#: ../data/ui/patch-dialog.ui.h:6
-msgid "Copy to Clipboard"
-msgstr "Копировать в буфер обмена"
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
+msgid "Unversioned"
+msgstr "Без версии"
 
-#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:119
-msgid "Save Patch"
-msgstr "Сохранить патч"
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
+msgid "Ignored"
+msgstr "Игнорируемые"
 
-#: ../data/ui/preferences.ui.h:1
-msgid "Left is remote, right is local"
-msgstr "Слева на удалённой машине, справа на локальной"
+#: meld/resources/gtk/menus.ui:190
+msgid "Flatten folders"
+msgstr "Выровнять каталоги"
 
-#: ../data/ui/preferences.ui.h:2
-msgid "Left is local, right is remote"
-msgstr "Слева на локальной машине, справа на удалённой"
+#: meld/resources/ui/about-dialog.ui:8
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2021 Kai Willadsen"
+msgstr ""
+"Авторское право © 2002-2009 Stephen Kennedy\n"
+"Авторское право © 2009-2021 Kai Willadsen"
 
-#: ../data/ui/preferences.ui.h:3
-#, fuzzy
-#| msgid "Left is remote, right is local"
-msgid "Remote, merge, local"
-msgstr "Слева на удалённой машине, справа на локальной"
+#: meld/resources/ui/about-dialog.ui:14
+msgid "translator-credits"
+msgstr ""
+"Носенко Андрей <awn@bcs.zp.ua>, 2003\n"
+"Дмитрий Мастрюков <dmitry@taurussoft.org>, 2004\n"
+"Леонид Кантер <leon@asplinux.ru>, 2006\n"
+"Тарасов Александр <algri14@mail.ru>, 2013\n"
+"Станислав Соловей <whats_up@tut.by>, 2014\n"
+"Илья Мазуренко <ivmazurenko@yandex.ru>, 2020"
 
-#: ../data/ui/preferences.ui.h:4
-#, fuzzy
-#| msgid "Left is local, right is remote"
-msgid "Local, merge, remote"
-msgstr "Слева на локальной машине, справа на удалённой"
+#: meld/resources/ui/appwindow.ui:30
+msgid "Start a new comparison"
+msgstr "Начать новое сравнение"
 
-#: ../data/ui/preferences.ui.h:5
-msgid "1ns (ext4)"
-msgstr "1нс (ext4)"
+#: meld/resources/ui/appwindow.ui:46
+msgid "Open a recent comparison"
+msgstr "Открыть недавнее сравнение"
 
-#: ../data/ui/preferences.ui.h:6
-msgid "100ns (NTFS)"
-msgstr "100нс (NTFS)"
+#: meld/resources/ui/appwindow.ui:74
+msgid "Go to the previous change"
+msgstr "Перейти к предыдущему изменению"
 
-#: ../data/ui/preferences.ui.h:7
-msgid "1s (ext2/ext3)"
-msgstr "1с (ext2/ext3)"
+#: meld/resources/ui/appwindow.ui:94
+msgid "Go to the next change"
+msgstr "Перейти к следующему изменению"
 
-#: ../data/ui/preferences.ui.h:8
-msgid "2s (VFAT)"
-msgstr "2с (VFAT)"
+#: meld/resources/ui/appwindow.ui:124
+msgid "Go to the previous conflict"
+msgstr "Перейти к предыдущему конфликту"
 
-#: ../data/ui/preferences.ui.h:9
-msgid "Meld Preferences"
-msgstr "Параметры Meld"
+#: meld/resources/ui/appwindow.ui:144
+msgid "Go to the next conflict"
+msgstr "Перейти к следующему конфликту"
 
-#: ../data/ui/preferences.ui.h:10
-msgid "Font"
-msgstr "Шрифт"
+#: meld/resources/ui/appwindow.ui:193
+msgid "Version Filters"
+msgstr "Фильтры версии"
 
-#: ../data/ui/preferences.ui.h:11
-msgid "_Use the system fixed width font"
-msgstr "_Использовать системный моноширинный шрифт"
+#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472
+msgid "File Filters"
+msgstr "Фильтры файлов"
 
-#: ../data/ui/preferences.ui.h:12
-msgid "_Editor font:"
-msgstr "_Шрифт редактора:"
+#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657
+msgid "Text Filters"
+msgstr "Текстовые фильтры"
 
-#: ../data/ui/preferences.ui.h:13
-msgid "Display"
-msgstr "Внешний вид"
+#: meld/resources/ui/column-list.ui:37 meld/resources/ui/filter-list.ui:40
+msgid "Active"
+msgstr "Активен"
 
-#: ../data/ui/preferences.ui.h:14
-msgid "_Tab width:"
-msgstr "_Ширина табуляции:"
+#: meld/resources/ui/column-list.ui:50
+msgid "Column Name"
+msgstr "Название столбца"
 
-#: ../data/ui/preferences.ui.h:15
-msgid "_Insert spaces instead of tabs"
-msgstr "_Вставлять пробелы вместо табуляций"
+#: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
+msgid "_Remove"
+msgstr "_Удалить"
 
-#: ../data/ui/preferences.ui.h:16
-msgid "Enable text _wrapping"
-msgstr "Разрешить _перенос текста"
+#: meld/resources/ui/column-list.ui:96 meld/resources/ui/filter-list.ui:152
+msgid "Move item up"
+msgstr "Переместить элемент вверх"
 
-#: ../data/ui/preferences.ui.h:17
-msgid "Do not _split words over two lines"
+#: meld/resources/ui/column-list.ui:98 meld/resources/ui/filter-list.ui:154
+msgid "Move _Up"
+msgstr "Переместить в_верх"
+
+#: meld/resources/ui/column-list.ui:112 meld/resources/ui/filter-list.ui:168
+msgid "Move item down"
+msgstr "Переместить элемент вниз"
+
+#: meld/resources/ui/column-list.ui:114 meld/resources/ui/filter-list.ui:170
+msgid "Move _Down"
+msgstr "Переместить в_низ"
+
+#: meld/resources/ui/commit-dialog.ui:8
+msgid "Commit"
+msgstr "Зафиксировать"
+
+#: meld/resources/ui/commit-dialog.ui:36
+msgid "Commit Files"
+msgstr "Зафиксировать файлы"
+
+#: meld/resources/ui/commit-dialog.ui:117
+msgid "Log Message"
+msgstr "Запись в журнале"
+
+#: meld/resources/ui/commit-dialog.ui:181
+msgid "Previous logs:"
+msgstr "Предыдущие записи журнала:"
+
+#: meld/resources/ui/commit-dialog.ui:259
+msgid "Co_mmit"
+msgstr "_Зафиксировать"
+
+#: meld/resources/ui/dirdiff-actions.ui:20
+msgid "Copy to left"
+msgstr "Копировать влево"
+
+#: meld/resources/ui/dirdiff-actions.ui:42
+msgid "Copy to right"
+msgstr "Копировать вправо"
+
+#: meld/resources/ui/dirdiff-actions.ui:66
+msgid "Delete selected"
+msgstr "Удалить выделенное"
+
+#: meld/resources/ui/dirdiff-menus.ui:7
+msgid "_Compare selected files"
+msgstr "Сравнить выбранные файлы"
+
+#: meld/resources/ui/dirdiff-menus.ui:14
+msgid "Copy to _left"
+msgstr "Копировать в левую панель"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Copy to _right"
+msgstr "Копировать в правую панель"
+
+#: meld/resources/ui/dirdiff-menus.ui:22
+msgid "_Delete selected"
+msgstr "Удалить выделенное"
+
+#: meld/resources/ui/dirdiff-menus.ui:29
+msgid "Collapse Recursively"
+msgstr "Свернуть рекурсивно"
+
+#: meld/resources/ui/dirdiff-menus.ui:33
+msgid "Expand Recursively"
+msgstr "Развернуть рекурсивно"
+
+#: meld/resources/ui/dirdiff-menus.ui:40
+msgid "_Open Externally"
+msgstr "Открыть внешним приложением"
+
+#: meld/resources/ui/dirdiff-menus.ui:44
+msgid "_Copy File Paths"
+msgstr "Копировать пути файлов"
+
+#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
+#: meld/resources/ui/dirdiff.ui:117
+msgid "Select folder to open in this pane"
+msgstr "Выберите папку, чтобы открыть на этой панели"
+
+#: meld/resources/ui/dirdiff.ui:43
+msgid "Folder 1"
+msgstr "Папка 1"
+
+#: meld/resources/ui/dirdiff.ui:84
+msgid "Folder 2"
+msgstr "Папка 2"
+
+#: meld/resources/ui/dirdiff.ui:125
+msgid "Folder 3"
+msgstr "Папка 3"
+
+#: meld/resources/ui/encoding-selector.ui:31
+msgid "Search text encoding…"
+msgstr "Поиск кодировки текста…"
+
+#: meld/resources/ui/filediff-actions.ui:20
+msgid "Push current change to the left"
+msgstr "Переместить текущее изменение влево"
+
+#: meld/resources/ui/filediff-actions.ui:42
+msgid "Push current change to the right"
+msgstr "Переместить текущее изменение вправо"
+
+#: meld/resources/ui/filediff-actions.ui:65
+msgid "Copy chunks"
+msgstr "Копировать блоки"
+
+#: meld/resources/ui/filediff-actions.ui:87
+msgid "Delete change"
+msgstr "Удалить изменения"
+
+#: meld/resources/ui/filediff-menus.ui:7
+msgid "Copy change above the left chunk"
+msgstr "Копировать изменение выше левого блока"
+
+#: meld/resources/ui/filediff-menus.ui:11
+msgid "Copy change below the left chunk"
+msgstr "Копировать изменение ниже левого блока"
+
+#: meld/resources/ui/filediff-menus.ui:15
+msgid "Copy change above the right chunk"
+msgstr "Копировать изменения выше правого блока"
+
+#: meld/resources/ui/filediff-menus.ui:19
+msgid "Copy change below the right chunk"
+msgstr "Копировать изменения ниже правого блока"
+
+#: meld/resources/ui/filediff-menus.ui:28
+msgid "_Undo"
+msgstr "Отменить"
+
+#: meld/resources/ui/filediff-menus.ui:32
+msgid "_Redo"
+msgstr "Повторить"
+
+#: meld/resources/ui/filediff-menus.ui:39
+msgid "Cu_t"
+msgstr "Вырезать"
+
+#: meld/resources/ui/filediff-menus.ui:43
+msgid "_Copy"
+msgstr "_Копировать"
+
+#: meld/resources/ui/filediff-menus.ui:47
+msgid "_Paste"
+msgstr "_Вставить"
+
+#: meld/resources/ui/filediff-menus.ui:54
+msgid "Open Containing Folder"
+msgstr "Открыть папку с данными"
+
+#: meld/resources/ui/filediff-menus.ui:58
+msgid "Copy Full Path"
+msgstr "Копировать полные пути"
+
+#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
+#: meld/resources/ui/filediff.ui:169
+msgid ""
+"This file can not be written to. You may click here to unlock this file and "
+"make changes anyway, but these changes must be saved to a new file."
+msgstr ""
+"Этот файл не может быть записан. Вы можете нажать здесь, чтобы "
+"разблокировать этот файл и внести изменения, но эти изменения должны быть "
+"сохранены как новый файл."
+
+#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
+#: meld/resources/ui/filediff.ui:183
+msgid "Save file in this pane"
+msgstr "Сохранить файл на этой панели"
+
+#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
+#: meld/resources/ui/filediff.ui:209
+msgid "Open file in this pane"
+msgstr "Открыть файл на этой панели"
+
+#: meld/resources/ui/filediff.ui:79
+msgid "File 3"
+msgstr "Файл 3"
+
+#: meld/resources/ui/filediff.ui:148
+msgid "File 2"
+msgstr "Файл 2"
+
+#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148
+msgid "File 1"
+msgstr "Файл 1"
+
+#. Create icon and filename CellRenderer
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
+#: meld/dirdiff.py:556
+msgid "Name"
+msgstr "Имя"
+
+#: meld/resources/ui/filter-list.ui:68
+msgid "Pattern"
+msgstr "Шаблон"
+
+#: meld/resources/ui/filter-list.ui:110
+msgid "Add new filter"
+msgstr "Добавить новый фильтр"
+
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18
+msgid "_Add"
+msgstr "_Добавить"
+
+#: meld/resources/ui/filter-list.ui:126
+msgid "Remove selected filter"
+msgstr "Удалить выбранный фильтр"
+
+#: meld/resources/ui/findbar.ui:103
+msgid "_Match case"
+msgstr "_Учитывать регистр"
+
+#: meld/resources/ui/findbar.ui:119
+msgid "Who_le word"
+msgstr "Слово _целиком"
+
+#: meld/resources/ui/findbar.ui:135
+msgid "Regular e_xpression"
+msgstr "_Регулярное выражение"
+
+#: meld/resources/ui/findbar.ui:175
+msgid "Wrapped"
+msgstr "Перенесённый"
+
+#: meld/resources/ui/findbar.ui:193
+msgid "Replace _All"
+msgstr "Заменить _все"
+
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1180 meld/iohelpers.py:114
+msgid "_Replace"
+msgstr "_Заменить"
+
+#: meld/resources/ui/findbar.ui:226
+msgid "Switch between Find and Find-and-Replace"
+msgstr "Переключение между Поиском и Заменой"
+
+#: meld/resources/ui/language-selector.ui:31
+msgid "Search highlight mode…"
+msgstr "Режим подсветки во время поиска…"
+
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342
+#: meld/newdifftab.py:49
+msgid "New comparison"
+msgstr "Новое сравнение"
+
+#: meld/resources/ui/new-diff-tab.ui:72
+msgid "File"
+msgstr "Файл"
+
+#: meld/resources/ui/new-diff-tab.ui:121
+msgid "Folder"
+msgstr "Папка"
+
+#: meld/resources/ui/new-diff-tab.ui:170
+msgid "Version control"
+msgstr "Контроль версий"
+
+#: meld/resources/ui/new-diff-tab.ui:236 meld/resources/ui/new-diff-tab.ui:357
+msgid "_3-way comparison"
+msgstr "_3-х полосное сравнение"
+
+#: meld/resources/ui/new-diff-tab.ui:256
+msgid "Select First File"
+msgstr "Выберите первый файл"
+
+#: meld/resources/ui/new-diff-tab.ui:270
+msgid "Select Second File"
+msgstr "Выберите второй файл"
+
+#: meld/resources/ui/new-diff-tab.ui:285
+msgid "Select Third File"
+msgstr "Выберите третий файл"
+
+#: meld/resources/ui/new-diff-tab.ui:321
+msgid "Select First Folder"
+msgstr "Выберите первую папку"
+
+#: meld/resources/ui/new-diff-tab.ui:334
+msgid "Select Second Folder"
+msgstr "Выберите вторую папку"
+
+#: meld/resources/ui/new-diff-tab.ui:348
+msgid "Select Third Folder"
+msgstr "Выберите третью папку"
+
+#: meld/resources/ui/new-diff-tab.ui:399
+msgid "Select A Version-Controlled Folder"
+msgstr "Выберите папку с контролируемой версией"
+
+#: meld/resources/ui/new-diff-tab.ui:448
+msgid "_Blank comparison"
+msgstr "_Пустое сравнение"
+
+#: meld/resources/ui/new-diff-tab.ui:466
+msgid "C_ompare"
+msgstr "_Сравнить"
+
+#: meld/resources/ui/notebook-label.ui:24
+msgid "Close Tab"
+msgstr "Закрыть вкладку"
+
+#: meld/resources/ui/patch-dialog.ui:9
+msgid "Format as Patch"
+msgstr "В формате патча"
+
+#: meld/resources/ui/patch-dialog.ui:26
+msgid "Copy to Clipboard"
+msgstr "Копировать в буфер обмена"
+
+#: meld/resources/ui/patch-dialog.ui:57 meld/patchdialog.py:159
+msgid "Save Patch"
+msgstr "Сохранить патч"
+
+#: meld/resources/ui/patch-dialog.ui:88
+msgid "Use differences between:"
+msgstr "Использовать различия между:"
+
+#: meld/resources/ui/patch-dialog.ui:105
+msgid "Left and middle panes"
+msgstr "Левая и средняя панель"
+
+#: meld/resources/ui/patch-dialog.ui:123
+msgid "Middle and right panes"
+msgstr "Средняя и правая панель"
+
+#: meld/resources/ui/patch-dialog.ui:149
+msgid "_Reverse patch direction"
+msgstr "_Обратить направление патча"
+
+#: meld/resources/ui/path-label.ui:23
+msgid "Path"
+msgstr "Путь"
+
+#: meld/resources/ui/path-label.ui:62
+msgid "Copy Path"
+msgstr "Копировать путь"
+
+#: meld/resources/ui/path-label.ui:78
+msgid "Open Folder"
+msgstr "Открыть папку"
+
+#: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
+msgid "Preferences"
+msgstr "Параметры"
+
+#: meld/resources/ui/preferences.ui:75
+msgid "Font"
+msgstr "Шрифт"
+
+#: meld/resources/ui/preferences.ui:112
+msgid "_Use the system fixed width font"
+msgstr "_Использовать системный моноширинный шрифт"
+
+#: meld/resources/ui/preferences.ui:136
+msgid "_Editor font:"
+msgstr "_Шрифт редактора:"
+
+#. TRANSLATORS: This is the status bar label for a group of settings,
+#. such as text wrapping, show line numbers, whitespace, etc.
+#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:291
+msgid "Display"
+msgstr "Внешний вид"
+
+#: meld/resources/ui/preferences.ui:241
+msgid "_Tab width:"
+msgstr "_Ширина табуляции:"
+
+#: meld/resources/ui/preferences.ui:274
+msgid "_Insert spaces instead of tabs"
+msgstr "_Вставлять пробелы вместо табуляций"
+
+#: meld/resources/ui/preferences.ui:290
+msgid "Enable text _wrapping"
+msgstr "Разрешить _перенос текста"
+
+#: meld/resources/ui/preferences.ui:312
+msgid "Do not _split words over two lines"
 msgstr "Не _разбивать слова на две строки"
 
-#: ../data/ui/preferences.ui.h:18
+#: meld/resources/ui/preferences.ui:333
 msgid "Highlight _current line"
 msgstr "Выделять _текущую строку"
 
-#: ../data/ui/preferences.ui.h:19
+#: meld/resources/ui/preferences.ui:349
 msgid "Show _line numbers"
 msgstr "Показывать _номера строк"
 
-#: ../data/ui/preferences.ui.h:20
+#: meld/resources/ui/preferences.ui:365
 msgid "Show w_hitespace"
-msgstr "Показывать _пробелы"
+msgstr "Показывать не_печатаемые символы"
 
-#: ../data/ui/preferences.ui.h:21
+#: meld/resources/ui/preferences.ui:381
+msgid "Prefer dark theme"
+msgstr "Предпочтительна тёмная тема"
+
+#: meld/resources/ui/preferences.ui:397
 msgid "Use s_yntax highlighting"
 msgstr "Включить подсветку _синтаксиса"
 
-#: ../data/ui/preferences.ui.h:22
+#: meld/resources/ui/preferences.ui:420
+msgid "Syntax highlighting color scheme:"
+msgstr "Цветовая схема подсветки синтаксиса:"
+
+#: meld/resources/ui/preferences.ui:485
+msgid "Code Overview"
+msgstr "Обзор"
+
+#: meld/resources/ui/preferences.ui:522
+msgid "Show overview map"
+msgstr "Показывать мини-карту"
+
+#: meld/resources/ui/preferences.ui:545
+msgid "Overview map style:"
+msgstr "Стиль мини-карты:"
+
+#: meld/resources/ui/preferences.ui:612
 msgid "External Editor"
 msgstr "Внешний редактор"
 
-#: ../data/ui/preferences.ui.h:23
+#: meld/resources/ui/preferences.ui:648
 msgid "Use _default system editor"
 msgstr "Использовать системный редактор _по умолчанию"
 
-#: ../data/ui/preferences.ui.h:24
+#: meld/resources/ui/preferences.ui:671
 msgid "Edito_r command:"
 msgstr "Команда _редактора:"
 
-#: ../data/ui/preferences.ui.h:25
+#: meld/resources/ui/preferences.ui:727
 msgid "Editor"
 msgstr "Редактор"
 
-#: ../data/ui/preferences.ui.h:26
+#: meld/resources/ui/preferences.ui:748
 msgid "Shallow Comparison"
 msgstr "Поверхностное _сравнение"
 
-#: ../data/ui/preferences.ui.h:27
+#: meld/resources/ui/preferences.ui:784
 msgid "C_ompare files based only on size and timestamp"
 msgstr "С_равнение файлов только на основе размера и отметки времени"
 
-#: ../data/ui/preferences.ui.h:28
+#: meld/resources/ui/preferences.ui:807
 msgid "_Timestamp resolution:"
 msgstr "_Разрешение отметки времени :"
 
-#: ../data/ui/preferences.ui.h:29
+#: meld/resources/ui/preferences.ui:871
+msgid "Note: enabling text filters may make comparing large files much slower"
+msgstr ""
+"Примечание: включение текстовых фильтров может снизить производительность "
+"сравнения больших файлов"
+
+#: meld/resources/ui/preferences.ui:920
 msgid "Symbolic Links"
 msgstr "Символические ссылки"
 
-#: ../data/ui/preferences.ui.h:31
+#: meld/resources/ui/preferences.ui:988
 msgid "Visible Columns"
 msgstr "Видимые столбцы"
 
-#: ../data/ui/preferences.ui.h:32
+#: meld/resources/ui/preferences.ui:1055
 msgid "Folder Comparisons"
-msgstr "Папка сравнения"
+msgstr "Сравнение папок"
 
-#: ../data/ui/preferences.ui.h:33
+#: meld/resources/ui/preferences.ui:1077
 msgid "Version Comparisons"
 msgstr "Сравнения версий"
 
-#: ../data/ui/preferences.ui.h:34
-#, fuzzy
-#| msgid "_When comparing file revisions:"
+#: meld/resources/ui/preferences.ui:1120
 msgid "_Order when comparing file revisions:"
-msgstr "_Сравнение изменений файла:"
+msgstr "_Порядок при сравнении ревизий файлов:"
 
-#: ../data/ui/preferences.ui.h:35
+#: meld/resources/ui/preferences.ui:1167
 msgid "Order when _merging files:"
 msgstr "Порядок при _объединении файлов:"
 
-#: ../data/ui/preferences.ui.h:36
+#: meld/resources/ui/preferences.ui:1235
 msgid "Commit Messages"
 msgstr "Запись в журнал"
 
-#: ../data/ui/preferences.ui.h:37
+#: meld/resources/ui/preferences.ui:1276
 msgid "Show _right margin at:"
 msgstr "Показать _правое поле на:"
 
-#: ../data/ui/preferences.ui.h:38
+#: meld/resources/ui/preferences.ui:1317
 msgid "Automatically _break lines at right margin on commit"
 msgstr "Автоматически _разбивать строки на правом поле при коммите"
 
-#: ../data/ui/preferences.ui.h:39
+#: meld/resources/ui/preferences.ui:1367
 msgid "Version Control"
 msgstr "Контроль версий"
 
-#: ../data/ui/preferences.ui.h:40
+#: meld/resources/ui/preferences.ui:1389
+msgid "Filename filters"
+msgstr "Фильтры на основе имён файлов"
+
+#: meld/resources/ui/preferences.ui:1427
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -895,11 +1467,19 @@ msgstr ""
 "При сравнении каталогов можно фильтровать файлы и каталоги по их названиям. "
 "Каждая строка — это список файловых шаблонов, разделённых пробелами."
 
-#: ../data/ui/preferences.ui.h:41 ../meld/meldwindow.py:103
-msgid "File Filters"
-msgstr "Фильтры файлов"
+#: meld/resources/ui/preferences.ui:1494
+msgid "Change trimming"
+msgstr "Скрытие изменённых пустых строк"
+
+#: meld/resources/ui/preferences.ui:1530
+msgid "Trim blank line differences from the start and end of changes"
+msgstr "Скрывать изменения в пустых строках во всей области изменений"
 
-#: ../data/ui/preferences.ui.h:42
+#: meld/resources/ui/preferences.ui:1574
+msgid "Text filters"
+msgstr "Текстовые фильтры"
+
+#: meld/resources/ui/preferences.ui:1612
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -912,255 +1492,294 @@ msgstr ""
 "заменяется пустой строкой. Если выражение содержит группы, заменяются только "
 "группы. Подробнее см. руководство пользователя."
 
-#: ../data/ui/preferences.ui.h:43
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "Игнорировать изменения пустых строк"
+#: meld/resources/ui/preferences.ui:1703
+msgid "Left is remote, right is local"
+msgstr "Слева - удалённый, справа - локальный"
 
-#: ../data/ui/preferences.ui.h:44
-msgid "Text Filters"
-msgstr "Текстовые фильтры"
+#: meld/resources/ui/preferences.ui:1707
+msgid "Left is local, right is remote"
+msgstr "Слева - локальный, справа - удалённый"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:583
-msgid "New comparison"
-msgstr "Новое сравнение"
+#: meld/resources/ui/preferences.ui:1721
+msgid "Simple change map"
+msgstr "Простая карта изменений"
 
-#: ../data/ui/tab-placeholder.ui.h:2
-msgid "File comparison"
-msgstr "Сравнение файлов"
+#: meld/resources/ui/preferences.ui:1725
+msgid "Compact source map"
+msgstr "Компактная мини-карта"
 
-#: ../data/ui/tab-placeholder.ui.h:3
-msgid "Directory comparison"
-msgstr "Сравнение каталогов"
+#: meld/resources/ui/preferences.ui:1729
+msgid "Full source map"
+msgstr "Полная мини-карта"
 
-#: ../data/ui/tab-placeholder.ui.h:4
-msgid "Version control view"
-msgstr "Просмотр контроля версий"
+#: meld/resources/ui/preferences.ui:1743
+msgid "Remote, merge, local"
+msgstr "Удалённый, объединённый, локальный"
 
-#: ../data/ui/tab-placeholder.ui.h:5
-msgid "_3-way comparison"
-msgstr "_3-х полосное сравнение"
+#: meld/resources/ui/preferences.ui:1747
+msgid "Local, merge, remote"
+msgstr "Локальный, объединённый, удалённый"
 
-#: ../data/ui/tab-placeholder.ui.h:6
-msgid "Select Third File"
-msgstr "Выберите третий файл"
+#: meld/resources/ui/preferences.ui:1769
+msgid "1ns (ext4)"
+msgstr "1нс (ext4)"
 
-#: ../data/ui/tab-placeholder.ui.h:7
-msgid "Select Second File"
-msgstr "Выберите второй файл"
+#: meld/resources/ui/preferences.ui:1773
+msgid "100ns (NTFS)"
+msgstr "100нс (NTFS)"
 
-#: ../data/ui/tab-placeholder.ui.h:8
-msgid "Select First File"
-msgstr "Выберите первый файл"
+#: meld/resources/ui/preferences.ui:1777
+msgid "1s (ext2/ext3)"
+msgstr "1с (ext2/ext3)"
 
-#: ../data/ui/tab-placeholder.ui.h:9
-msgid "Select First Folder"
-msgstr "Выберите первую папку"
+#: meld/resources/ui/preferences.ui:1781
+msgid "2s (VFAT)"
+msgstr "2с (VFAT)"
 
-#: ../data/ui/tab-placeholder.ui.h:10
-msgid "Select Second Folder"
-msgstr "Выберите вторую папку"
+#: meld/resources/ui/push-dialog.ui:9
+msgid "Push local commits to remote?"
+msgstr "Отправить локальные изменения в удалённый репозиторий?"
 
-#: ../data/ui/tab-placeholder.ui.h:11
-msgid "Select Third Folder"
-msgstr "Выберите третью папку"
+#: meld/resources/ui/push-dialog.ui:10
+msgid "The commits to be pushed are determined by your version control system."
+msgstr ""
+"Коммиты для синхронизации определены вашей версией системы контроля версий."
 
-#: ../data/ui/tab-placeholder.ui.h:12
-msgid "Select A Version-Controlled Folder"
-msgstr "Выберите папку под контролем версий"
+#: meld/resources/ui/push-dialog.ui:38
+msgid "_Push commits"
+msgstr "_Отправить коммиты"
 
-#: ../data/ui/tab-placeholder.ui.h:13
-msgid "_Blank comparison"
-msgstr "_Пустое сравнение"
+#: meld/resources/ui/recent-selector.ui:16
+msgid "Search recent comparisons…"
+msgstr "Поиск по недавним сравнениям…"
 
-#: ../data/ui/tab-placeholder.ui.h:14
-msgid "C_ompare"
-msgstr "_Сравнить"
+#: meld/resources/ui/revert-dialog.ui:9
+msgid "Discard unsaved changes to documents?"
+msgstr "Отменить несохранённые изменения в документах?"
 
-#: ../data/ui/vcview.ui.h:3
-msgid "Co_mmit..."
-msgstr "_Зафиксировать…"
+#: meld/resources/ui/revert-dialog.ui:10
+msgid "Changes made to the following documents will be permanently lost:"
+msgstr ""
+"Изменения, внесённые в следующие документы будут безвозвратно потеряны:"
 
-#: ../data/ui/vcview.ui.h:4
-msgid "Commit changes to version control"
-msgstr "Зафиксировать изменения в системе контроля версий"
+#: meld/resources/ui/revert-dialog.ui:39
+msgid "_Discard"
+msgstr "_Не сохранять"
 
-#: ../data/ui/vcview.ui.h:5
-msgid "_Update"
-msgstr "_Обновить"
+#: meld/resources/ui/save-confirm-dialog.ui:9
+msgid "Save changes to documents before closing?"
+msgstr "Сохранить изменения в файлах перед закрытием?"
 
-#: ../data/ui/vcview.ui.h:6
-msgid "Update working copy from version control"
-msgstr "Обновить рабочую копию из контроля версий"
+#: meld/resources/ui/save-confirm-dialog.ui:10
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Если вы не сохраните изменения они будут безвозвратно потеряны."
+
+#: meld/resources/ui/save-confirm-dialog.ui:24
+msgid "Close _without Saving"
+msgstr "Закрыть _без сохранения"
 
-#: ../data/ui/vcview.ui.h:7
-msgid "_Push"
-msgstr "О_тправить"
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1179
+#: meld/iohelpers.py:56 meld/iohelpers.py:113
+msgid "_Cancel"
+msgstr "_Отменить"
 
-#: ../data/ui/vcview.ui.h:8
-msgid "Push local changes to remote"
-msgstr "Отправить локальные изменения в удалённый репозиторий"
+#: meld/resources/ui/save-confirm-dialog.ui:52
+msgid "_Save"
+msgstr "С_охранить"
 
-#: ../data/ui/vcview.ui.h:10
-msgid "Add to version control"
-msgstr "Добавить в управление версиями"
+#: meld/resources/ui/statusbar-menu.ui:9
+msgid "Show whitespace"
+msgstr "Показывать пробелы"
 
-#: ../data/ui/vcview.ui.h:12
-msgid "Remove from version control"
-msgstr "Удалить из управления версиями"
+#: meld/resources/ui/statusbar-menu.ui:17
+msgid "Text wrapping"
+msgstr "Разрешить перенос текста"
 
-#: ../data/ui/vcview.ui.h:13
-msgid "Mar_k as Resolved"
-msgstr "Отметить как _решено"
+#: meld/resources/ui/vcview-menus.ui:7
+msgid "_Compare"
+msgstr "_Сравнить"
 
-#: ../data/ui/vcview.ui.h:14
-msgid "Mark as resolved in version control"
-msgstr "Отметить как решено в системе контроля версиями"
+#: meld/resources/ui/vcview-menus.ui:11
+msgid "Co_mmit…"
+msgstr "_Зафиксировать…"
 
-#: ../data/ui/vcview.ui.h:15
+#: meld/resources/ui/vcview-menus.ui:26
 msgid "Re_vert"
 msgstr "В_осстановить"
 
-#: ../data/ui/vcview.ui.h:16
-msgid "Revert working copy to original state"
-msgstr "Восстановить оригинал"
-
-#: ../data/ui/vcview.ui.h:17
-msgid "Delete from working copy"
-msgstr "Удалить из рабочей копии"
-
-#: ../data/ui/vcview.ui.h:18
-msgid "Console"
-msgstr "Консоль"
-
-#: ../data/ui/vcview.ui.h:19
-msgid "Show or hide the version control console output pane"
-msgstr "Показать или скрыть выходную консоль панели контроля версий"
-
-#: ../data/ui/vcview.ui.h:20
-msgid "_Flatten"
-msgstr "_Выравнить"
+#: meld/resources/ui/vcview-menus.ui:30
+msgid "Delete"
+msgstr "Удалить файл"
 
-#: ../data/ui/vcview.ui.h:21
-msgid "Flatten directories"
-msgstr "Выравнить каталоги"
+#: meld/resources/ui/vcview-menus.ui:37
+msgid "Resolve Conflict"
+msgstr "Разрешить конфликт"
 
-#: ../data/ui/vcview.ui.h:22
-msgid "_Modified"
-msgstr "_Изменённые"
+#: meld/resources/ui/vcview.ui:16
+msgid "Commit changes to version control"
+msgstr "Зафиксировать изменения в системе контроля версий"
 
-#: ../data/ui/vcview.ui.h:23
-msgid "Show modified files"
-msgstr "Показывать изменённые файлы"
+#: meld/resources/ui/vcview.ui:21
+msgid "Commit…"
+msgstr "Зафиксировать…"
 
-#: ../data/ui/vcview.ui.h:24
-msgid "_Normal"
-msgstr "_Стандартные"
+#: meld/resources/ui/vcview.ui:38
+msgid "Pull remote changes to the local repository"
+msgstr "Получить изменения из удалённого репозитория в локальный"
 
-#: ../data/ui/vcview.ui.h:25
-msgid "Show normal files"
-msgstr "Показывать стандартные файлы"
+#: meld/resources/ui/vcview.ui:51
+msgid "Push local changes to remote"
+msgstr "Отправить локальные изменения в удалённый репозиторий"
 
-#: ../data/ui/vcview.ui.h:26
-msgid "Un_versioned"
-msgstr "Бе_з версии"
+#: meld/resources/ui/vcview.ui:74
+msgid "Add to version control"
+msgstr "Подготовить к фиксации"
 
-#: ../data/ui/vcview.ui.h:27
-msgid "Show unversioned files"
-msgstr "Показывать файлы без версий"
+#: meld/resources/ui/vcview.ui:87
+msgid "Remove from version control"
+msgstr "Убрать из списка файлов, подготовленных к фиксации"
 
-#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:64
-msgid "Ignored"
-msgstr "Игнорируемые"
+#: meld/resources/ui/vcview.ui:100
+msgid "Revert working copy to original state"
+msgstr "Восстановить оригинал"
 
-#: ../data/ui/vcview.ui.h:29
-msgid "Show ignored files"
-msgstr "Показывать игнорируемые файлы"
+#: meld/resources/ui/vcview.ui:113
+msgid "Mark as resolved in version control"
+msgstr "Отметить как решено в системе контроля версиями"
 
-#: ../data/ui/vcview.ui.h:30
-msgid "Commit"
-msgstr "Зафиксировать"
+#: meld/resources/ui/vcview.ui:140
+msgid "Open version controlled folder in this pane"
+msgstr "Открыть папку с контролируемой версией на этой панели"
 
-#: ../data/ui/vcview.ui.h:31
-msgid "Commit Files"
-msgstr "Зафиксировать файлы"
+#: meld/resources/ui/vcview.ui:229
+msgid "Location"
+msgstr "Местоположение"
 
-#: ../data/ui/vcview.ui.h:32
-msgid "Log Message"
-msgstr "Запись в журнале"
+#: meld/resources/ui/vcview.ui:238
+msgid "Status"
+msgstr "Состояние"
 
-#: ../data/ui/vcview.ui.h:33
-msgid "Previous logs:"
-msgstr "Предыдущие записи журнала:"
+#: meld/resources/ui/vcview.ui:247
+msgid "Extra"
+msgstr "Дополнительно"
 
-#: ../data/ui/vcview.ui.h:34
-msgid "Co_mmit"
-msgstr "_Зафиксировать"
-
-#: ../data/ui/vcview.ui.h:35
+#: meld/resources/ui/vcview.ui:279
 msgid "Console output"
 msgstr "Консоль вывода"
 
-#: ../data/ui/vcview.ui.h:36
-msgid "Push local commits to remote?"
-msgstr "Толкнуть локальные изменения в удалённые?"
+#: meld/actiongutter.py:247
+msgid "Copy _up"
+msgstr "Копировать в_верх"
 
-#: ../data/ui/vcview.ui.h:37
-msgid "The commits to be pushed are determined by your version control system."
-msgstr "Коммиты для толчка определены вашей версией системы контроля версий."
+#: meld/actiongutter.py:248
+msgid "Copy _down"
+msgstr "Копировать в_низ"
 
-#: ../data/ui/vcview.ui.h:38
-msgid "_Push commits"
-msgstr "_Толкнуть коммиты"
+#: meld/const.py:30
+msgid "UNIX (LF)"
+msgstr "UNIX (LF)"
+
+#: meld/const.py:31
+msgid "DOS/Windows (CR-LF)"
+msgstr "DOS/Windows (CR-LF)"
+
+#: meld/const.py:32
+msgid "Mac OS (CR)"
+msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:381
+#: meld/dirdiff.py:577 meld/preferences.py:132
 msgid "Size"
 msgstr "Размер"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:389
+#: meld/dirdiff.py:585 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Время изменения"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:593 meld/preferences.py:134
+msgid "Modification time (ISO)"
+msgstr "Время изменения (ISO)"
+
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:397
+#: meld/dirdiff.py:601 meld/preferences.py:135
 msgid "Permissions"
-msgstr "Разрешения"
+msgstr "Права доступа"
 
-#: ../meld/dirdiff.py:543
-#, python-format
-msgid "Hide %s"
-msgstr "Скрывать %s"
+#: meld/dirdiff.py:851
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (сканирование…)"
 
-#: ../meld/dirdiff.py:672 ../meld/dirdiff.py:694
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr "[%s] Сканирование %s"
+#: meld/dirdiff.py:883 meld/dirdiff.py:915
+#, python-brace-format
+msgid "[{label}] Scanning {folder}"
+msgstr "[{label}] Сканирование {folder}"
 
-#: ../meld/dirdiff.py:823
-#, python-format
-msgid "[%s] Done"
-msgstr "[%s] Готово"
+#: meld/dirdiff.py:1051
+#, python-brace-format
+#| msgid "[%s] Done"
+msgid "[{label}] Done"
+msgstr "[{label}] Готово"
+
+#: meld/dirdiff.py:1064
+msgid "Folder {} is being compared to itself"
+msgstr "Выполняется сравнение папки {} с самой собой"
+
+#: meld/dirdiff.py:1070
+msgid "Folders have no differences"
+msgstr "Папки не имеют различий"
+
+#: meld/dirdiff.py:1072
+msgid "Contents of scanned files in folders are identical."
+msgstr "Содержание сканированных файлов в папках идентично."
+
+#: meld/dirdiff.py:1074
+msgid ""
+"Scanned files in folders appear identical, but contents have not been "
+"scanned."
+msgstr ""
+"Структура папок идентична, но содержание файлов не было просканированно."
+
+#: meld/dirdiff.py:1077
+msgid "File filters are in use, so not all files have been scanned."
+msgstr "Включены фильтры файлов, поэтому часть файлов не учтена."
+
+#: meld/dirdiff.py:1079
+msgid "Text filters are in use and may be masking content differences."
+msgstr ""
+"Используются текстовые фильтры, которые могут маскировать различия между "
+"файлами."
+
+#: meld/dirdiff.py:1095 meld/filediff.py:1917
+msgid "Hide"
+msgstr "Скрыть"
+
+#: meld/dirdiff.py:1097 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+msgid "Hi_de"
+msgstr "С_крыть"
 
-#: ../meld/dirdiff.py:830
+#: meld/dirdiff.py:1106
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "При сканировании этой папки произошло несколько ошибок"
 
-#: ../meld/dirdiff.py:831
+#: meld/dirdiff.py:1107
 msgid "Files with invalid encodings found"
 msgstr "Найдены файлы с неверными кодировками"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:833
+#: meld/dirdiff.py:1109
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Некоторые файлы имеют неправильную кодировку. Названия что-то вроде:"
 
-#: ../meld/dirdiff.py:835
+#: meld/dirdiff.py:1111
 msgid "Files hidden by case insensitive comparison"
 msgstr "Файлы, исключённые из сравнения из-за разного регистра"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:837
+#: meld/dirdiff.py:1113
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1168,306 +1787,134 @@ msgstr ""
 "Вы запускаете сравнение без учёта регистра в файловой системе, "
 "чувствительной к регистру. Следующие файлы в этой папке скрыты:"
 
-#: ../meld/dirdiff.py:848
-#, python-format
-msgid "'%s' hidden by '%s'"
-msgstr "«%s» скрыт «%s»"
+#: meld/dirdiff.py:1124
+#, python-brace-format
+#| msgid "“%s” hidden by “%s”"
+msgid "“{first_file}” hidden by “{second_file}”"
+msgstr "“{first_file}” скрыто “{second_file}”"
 
-#: ../meld/dirdiff.py:873 ../meld/filediff.py:1123 ../meld/filediff.py:1274
-#: ../meld/filediff.py:1450 ../meld/filediff.py:1480 ../meld/filediff.py:1482
-msgid "Hi_de"
-msgstr "С_крыть"
+#: meld/dirdiff.py:1183
+#, python-format
+msgid "Replace folder “%s”?"
+msgstr "Заменить папку “%s”?"
 
-#: ../meld/dirdiff.py:904
+#: meld/dirdiff.py:1185
 #, python-format
 msgid ""
-"'%s' exists.\n"
-"Overwrite?"
+"Another folder with the same name already exists in “%s”.\n"
+"If you replace the existing folder, all files in it will be lost."
 msgstr ""
-"«%s» существует.\n"
-"Перезаписать?"
+"Другая папка с таким же именем уже существует в “%s”.\n"
+"При замене существующей папки всё содержимое будет утеряно."
 
-#: ../meld/dirdiff.py:912
+#: meld/dirdiff.py:1198
 msgid "Error copying file"
 msgstr "Ошибка при копировании файла"
 
-#: ../meld/dirdiff.py:913
-#, python-format
+#: meld/dirdiff.py:1199
+#, python-brace-format
+#| msgid ""
+#| "Couldn’t copy %s\n"
+#| "to %s.\n"
+#| "\n"
+#| "%s"
 msgid ""
-"Couldn't copy %s\n"
-"to %s.\n"
+"Couldn’t copy {source}\n"
+"to {dest}.\n"
 "\n"
-"%s"
+"{error}"
 msgstr ""
-"Не удаётся скопировать %s\n"
-"в %s.\n"
+"Не удаётся скопировать {source}\n"
+"в {dest}.\n"
 "\n"
-"%s"
-
-#: ../meld/dirdiff.py:936
-#, python-format
-msgid "Error deleting %s"
-msgstr "Ошибка при удалении %s"
-
-#: ../meld/filediff.py:243
-msgid "Format as Patch..."
-msgstr "В формате патча…"
-
-#: ../meld/filediff.py:244
-msgid "Create a patch using differences between files"
-msgstr "Создать патч, используя различия между файлами"
-
-#: ../meld/filediff.py:246
-msgid "Save A_ll"
-msgstr "Сохранить в_се"
-
-#: ../meld/filediff.py:247
-msgid "Save all files in the current comparison"
-msgstr "Сохраните все файлы в текущем сравнении"
-
-#: ../meld/filediff.py:250
-msgid "Revert files to their saved versions"
-msgstr "Восстановить файлы, вернув их к сохранённым версиям"
-
-#: ../meld/filediff.py:252
-msgid "Add Synchronization Point"
-msgstr "Добавить точку синхронизации"
-
-#: ../meld/filediff.py:253
-msgid "Add a manual point for synchronization of changes between files"
-msgstr "Добавить вручную точку для синхронизации изменений между файлами"
-
-#: ../meld/filediff.py:256
-msgid "Clear Synchronization Points"
-msgstr "Удалить точки синхронизации"
-
-#: ../meld/filediff.py:257
-msgid "Clear manual change sychronization points"
-msgstr "Удалить точки синхронизации вручную"
-
-#: ../meld/filediff.py:259
-msgid "Previous Conflict"
-msgstr "Предыдущий конфликт"
-
-#: ../meld/filediff.py:260
-msgid "Go to the previous conflict"
-msgstr "Перейти к предыдущему конфликту"
-
-#: ../meld/filediff.py:262
-msgid "Next Conflict"
-msgstr "Следующий конфликт"
-
-#: ../meld/filediff.py:263
-msgid "Go to the next conflict"
-msgstr "Перейти к следующему конфликту"
-
-#: ../meld/filediff.py:265
-msgid "Push to Left"
-msgstr "Переместить влево"
-
-#: ../meld/filediff.py:266
-msgid "Push current change to the left"
-msgstr "Переместить текущее изменение влево"
-
-#: ../meld/filediff.py:269
-msgid "Push to Right"
-msgstr "Переместить вправо"
-
-#: ../meld/filediff.py:270
-msgid "Push current change to the right"
-msgstr "Переместить текущее изменение вправо"
+"{error}"
 
-#: ../meld/filediff.py:274
-msgid "Pull from Left"
-msgstr "Взять слева"
+#: meld/dirdiff.py:1224 meld/vcview.py:764
+msgid "Error deleting {}"
+msgstr "Ошибка при удалении {}"
 
-#: ../meld/filediff.py:275
-msgid "Pull change from the left"
-msgstr "Взять изменение слева"
-
-#: ../meld/filediff.py:278
-msgid "Pull from Right"
-msgstr "Взять справа"
-
-#: ../meld/filediff.py:279
-msgid "Pull change from the right"
-msgstr "Взять изменение справа"
-
-#: ../meld/filediff.py:281
-msgid "Copy Above Left"
-msgstr "Копировать вверху слева"
-
-#: ../meld/filediff.py:282
-msgid "Copy change above the left chunk"
-msgstr "Копировать изменение выше левого блока"
+#: meld/dirdiff.py:1715
+msgid "No folder"
+msgstr "Нет папки"
 
-#: ../meld/filediff.py:284
-msgid "Copy Below Left"
-msgstr "Копировать ниже слева"
-
-#: ../meld/filediff.py:285
-msgid "Copy change below the left chunk"
-msgstr "Копировать изменение ниже левого блока"
-
-#: ../meld/filediff.py:287
-msgid "Copy Above Right"
-msgstr "Копировать вверху справа"
-
-#: ../meld/filediff.py:288
-msgid "Copy change above the right chunk"
-msgstr "Копировать изменения выше правого блока"
+#: meld/filediff.py:1149
+msgid "Comparison results will be inaccurate"
+msgstr "Результаты сравнения будут некорректными"
 
-#: ../meld/filediff.py:290
-msgid "Copy Below Right"
-msgstr "Копировать ниже справа"
-
-#: ../meld/filediff.py:291
-msgid "Copy change below the right chunk"
-msgstr "Копировать изменения ниже правого блока"
-
-#: ../meld/filediff.py:293
-msgid "Delete"
-msgstr "Удалить"
-
-#: ../meld/filediff.py:294
-msgid "Delete change"
-msgstr "Удалить изменения"
-
-#: ../meld/filediff.py:296
-msgid "Merge All from Left"
-msgstr "Объединить все изменения слева"
-
-#: ../meld/filediff.py:297
-msgid "Merge all non-conflicting changes from the left"
-msgstr "Объединить все неконфликтующие изменения слева"
-
-#: ../meld/filediff.py:299
-msgid "Merge All from Right"
-msgstr "Объединить все изменения справа"
-
-#: ../meld/filediff.py:300
-msgid "Merge all non-conflicting changes from the right"
-msgstr "Объединить все неконфликтующие изменения справа"
-
-#: ../meld/filediff.py:302
-msgid "Merge All"
-msgstr "Объединить все"
-
-#: ../meld/filediff.py:303
-msgid "Merge all non-conflicting changes from left and right panes"
-msgstr "Объединить все неконфликтующие изменения с левой и правой панели"
-
-#: ../meld/filediff.py:307
-msgid "Cycle Through Documents"
-msgstr "Пройти по документам циклически"
-
-#: ../meld/filediff.py:308
-msgid "Move keyboard focus to the next document in this comparison"
-msgstr "Переместить фокус ввода на следующий документ в сравнении"
-
-#: ../meld/filediff.py:314
-msgid "Lock Scrolling"
-msgstr "Заблокировать прокрутку"
-
-#: ../meld/filediff.py:315
-msgid "Lock scrolling of all panes"
-msgstr "Заблокировать прокрутку для всех панелей"
-
-#. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:472
-msgid "INS"
-msgstr "ВСТ"
-
-#: ../meld/filediff.py:472
-msgid "OVR"
-msgstr "ЗАМ"
-
-#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:474
-#, python-format
-msgid "Ln %i, Col %i"
-msgstr "Стр %i, Стлб %i"
-
-#: ../meld/filediff.py:821
-#, python-format
+#: meld/filediff.py:1151
 msgid ""
-"Filter '%s' changed the number of lines in the file. Comparison will be "
-"incorrect. See the user manual for more details."
-msgstr ""
-"Фильтр «%s» изменил количество строк в файле. Сравнение будет некорректным. "
-"Подробнее см. руководство пользователя."
+"A filter changed the number of lines in the file, which is unsupported. The "
+"comparison will not be accurate."
+msgstr "Фильтр изменил количество строк в файле. Сравнение будет не точным."
 
-#: ../meld/filediff.py:890
-#| msgid "Mar_k as Resolved"
+#: meld/filediff.py:1223
 msgid "Mark conflict as resolved?"
-msgstr "Разрешить конфликт?"
+msgstr "Отметить конфликт как разрешённый?"
 
-#: ../meld/filediff.py:892
+#: meld/filediff.py:1225
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
-"Если конфликт был успешно разрешён, вы можете пометить его как решённый."
+"Если конфликт был успешно разрешён, вы можете отметить его как решённый."
 
-#: ../meld/filediff.py:894
-#, fuzzy
-#| msgid "_Cancel"
+#: meld/filediff.py:1227
 msgid "Cancel"
-msgstr "О_тменить"
+msgstr "Отменить"
 
-#: ../meld/filediff.py:895
-#| msgid "Mar_k as Resolved"
+#: meld/filediff.py:1228
 msgid "Mark _Resolved"
-msgstr "_Разрешить"
+msgstr "Отметить как _разрешённый"
 
-#: ../meld/filediff.py:1111
+#: meld/filediff.py:1591
 #, python-format
-msgid "[%s] Set num panes"
-msgstr "[%s] Установка панелей"
+msgid "There was a problem opening the file “%s”."
+msgstr "Возникла проблема при открытии файла “%s”."
 
-#: ../meld/filediff.py:1117
+#: meld/filediff.py:1600
 #, python-format
-msgid "[%s] Opening files"
-msgstr "[%s] Открытие файлов"
+msgid "File %s appears to be a binary file."
+msgstr "Файл %s выглядит как двоичный файл."
 
-#: ../meld/filediff.py:1140 ../meld/filediff.py:1150 ../meld/filediff.py:1163
-#: ../meld/filediff.py:1169
-msgid "Could not read file"
-msgstr "Не удалось прочитать файл"
-
-#: ../meld/filediff.py:1141
-#, python-format
-msgid "[%s] Reading files"
-msgstr "[%s] Чтение файлов"
+#: meld/filediff.py:1602
+msgid "Do you want to open the file using the default application?"
+msgstr "Открыть выбранный файл в приложении по умолчанию?"
 
-#: ../meld/filediff.py:1151
-#, python-format
-msgid "%s appears to be a binary file."
-msgstr "%s является двоичным файлом."
+#: meld/filediff.py:1604
+msgid "Open"
+msgstr "Открыть"
 
-#: ../meld/filediff.py:1164
+#: meld/filediff.py:1626
 #, python-format
-msgid "%s is not in encodings: %s"
-msgstr "%s не входит в список кодировок: %s"
+msgid "[%s] Merging files"
+msgstr "[%s] Объединение файлов"
 
-#: ../meld/filediff.py:1202
+#: meld/filediff.py:1640
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Вычисление различий"
 
-#: ../meld/filediff.py:1269
+#: meld/filediff.py:1700
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Файл %s изменился на диске"
 
-#: ../meld/filediff.py:1270
+#: meld/filediff.py:1701
 msgid "Do you want to reload the file?"
 msgstr "Хотите перезагрузить файл?"
 
-#: ../meld/filediff.py:1273
+#: meld/filediff.py:1703
 msgid "_Reload"
 msgstr "_Перезагрузить"
 
-#: ../meld/filediff.py:1439
+#: meld/filediff.py:1873
+msgid "File {} is being compared to itself"
+msgstr "Выполняется сравнение файла {} с самим собой"
+
+#: meld/filediff.py:1882
+msgid "Files are identical"
+msgstr "Файлы идентичны"
+
+#: meld/filediff.py:1895
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1475,19 +1922,28 @@ msgstr ""
 "Используются текстовые фильтры, которые могут маскировать различия между "
 "файлами. Хотите сравнить файлы без использования фильтров?"
 
-#: ../meld/filediff.py:1445
-msgid "Files are identical"
-msgstr "Файлы идентичны"
+#: meld/filediff.py:1900
+msgid "Files differ in line endings only"
+msgstr "Файлы различаются только окончаниями строк"
 
-#: ../meld/filediff.py:1453
+#: meld/filediff.py:1902
+#, python-format
+msgid ""
+"Files are identical except for differing line endings:\n"
+"%s"
+msgstr ""
+"Файлы идентичны, но различаются окончаниями строк:\n"
+"%s"
+
+#: meld/filediff.py:1922
 msgid "Show without filters"
 msgstr "Показать без фильтров"
 
-#: ../meld/filediff.py:1475
+#: meld/filediff.py:1944
 msgid "Change highlighting incomplete"
 msgstr "Выделение изменений неполное"
 
-#: ../meld/filediff.py:1476
+#: meld/filediff.py:1945
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1496,88 +1952,80 @@ msgstr ""
 "можете дать Meld больше времени, чтобы их выделить, возможно это будет "
 "медленно."
 
-#: ../meld/filediff.py:1484
+#: meld/filediff.py:1953
 msgid "Keep highlighting"
 msgstr "Сохранить выделение"
 
-#: ../meld/filediff.py:1486
+#: meld/filediff.py:1955
 msgid "_Keep highlighting"
 msgstr "Сохранить в_ыделение"
 
-#: ../meld/filediff.py:1617
-#, python-format
-msgid ""
-"\"%s\" exists!\n"
-"Overwrite?"
-msgstr ""
-"«%s» не существует!\n"
-"Переписать?"
+#: meld/filediff.py:1968
+msgid "Saving failed"
+msgstr "Сохранение не удалось"
 
-#: ../meld/filediff.py:1630
-#, python-format
+#: meld/filediff.py:1969
 msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
+"Please consider copying any critical changes to another program or file to "
+"avoid data loss."
 msgstr ""
-"Ошибка записи в «%s»\n"
-"\n"
-"%s."
+"Рекомендуется скопировать критичные изменения в другую программу или файл "
+"для избежания потери данных."
 
-#: ../meld/filediff.py:1641
+#: meld/filediff.py:1978
 msgid "Save Left Pane As"
 msgstr "Сохранить левую панель как"
 
-#: ../meld/filediff.py:1643
+#: meld/filediff.py:1980
 msgid "Save Middle Pane As"
 msgstr "Сохранить среднюю панель как"
 
-#: ../meld/filediff.py:1645
+#: meld/filediff.py:1982
 msgid "Save Right Pane As"
 msgstr "Сохранить правую панель как"
 
-#: ../meld/filediff.py:1658
+#: meld/filediff.py:1993
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Файл %s изменился на диске, так как он был открыт"
 
-#: ../meld/filediff.py:1660
+#: meld/filediff.py:1995
 msgid "If you save it, any external changes will be lost."
 msgstr "Если вы сохраните его, любые внешние изменения будут потеряны."
 
-#: ../meld/filediff.py:1663
+#: meld/filediff.py:1998
 msgid "Save Anyway"
 msgstr "Всё равно сохранить"
 
-#: ../meld/filediff.py:1664
-msgid "Don't Save"
+#: meld/filediff.py:1999
+msgid "Don’t Save"
 msgstr "Не сохранять"
 
-#: ../meld/filediff.py:1688
-#, python-format
+#: meld/filediff.py:2041
 msgid ""
-"This file '%s' contains a mixture of line endings.\n"
-"\n"
-"Which format would you like to use?"
-msgstr ""
-"Файл «%s» содержит концы строк в разных форматах.\n"
-"\n"
-"Какой формат необходимо использовать?"
+"File “{}” contains characters that can’t be encoded using its current "
+"encoding “{}”."
+msgstr "Файл “{}” содержит символы, недопустимые для текущей кодировки “{}”."
 
-#: ../meld/filediff.py:1704
+#: meld/filediff.py:2045 meld/patchdialog.py:138
 #, python-format
 msgid ""
-"'%s' contains characters not encodable with '%s'\n"
-"Would you like to save as UTF-8?"
+"Couldn’t save file due to:\n"
+"%s"
 msgstr ""
-"«%s» содержит символы, которые невозможно закодировать в «%s».\n"
-"Хотите сохранить в UTF-8?"
+"Нельзя сохранить файл по следующей причине:\n"
+"%s"
+
+#: meld/filediff.py:2049 meld/patchdialog.py:137
+#, python-format
+msgid "Could not save file %s."
+msgstr "Не удалось сохранить файл %s."
 
-#: ../meld/filediff.py:2065
+#: meld/filediff.py:2450
 msgid "Live comparison updating disabled"
 msgstr "Обновление Онлайн сравнения отключено"
 
-#: ../meld/filediff.py:2066
+#: meld/filediff.py:2451
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1587,359 +2035,236 @@ msgstr ""
 "Вы можете вручную обновить сравнение, онлайн обновления возобновятся, когда "
 "удалятся точки синхронизации."
 
-#: ../meld/filemerge.py:48
-#, python-format
-msgid "[%s] Merging files"
-msgstr "[%s] Объединение файлов"
+#: meld/iohelpers.py:41
+msgid "Deleting remote folders is not supported"
+msgstr "Удаление сетевых папок не поддерживается"
 
-#: ../meld/gutterrendererchunk.py:90
-msgid "Copy _up"
-msgstr "Копировать в_верх"
+#: meld/iohelpers.py:43
+msgid "Not a file or directory"
+msgstr "Не является файлом или папкой"
 
-#: ../meld/gutterrendererchunk.py:91
-msgid "Copy _down"
-msgstr "Копировать в_низ"
+#: meld/iohelpers.py:47
+msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
+msgstr ""
+"“{}” не может быть помещён в корзину. Вы хотите удалить его минуя корзину?"
+
+#: meld/iohelpers.py:52
+msgid "This remote location does not support sending items to the trash."
+msgstr "Этот сетевой адрес не поддерживает удаление элементов в корзину."
+
+#: meld/iohelpers.py:57
+msgid "_Delete Permanently"
+msgstr "Удалить изменения навсегда"
+
+#: meld/iohelpers.py:107
+#, python-format
+msgid "Replace file “%s”?"
+msgstr "Заменить файл “%s”?"
 
-#: ../meld/meldapp.py:160
+#: meld/iohelpers.py:109
+#, python-format
+msgid ""
+"A file with this name already exists in “%s”.\n"
+"If you replace the existing file, its contents will be lost."
+msgstr ""
+"Файл с таким именем уже существует “%s”.\n"
+"Если вы замените его, текущее содержание будет утеряно."
+
+#: meld/meldapp.py:188
 msgid "wrong number of arguments supplied to --diff"
 msgstr "неверное число аргументов, предоставленных --diff"
 
-#: ../meld/meldapp.py:165
+#: meld/meldapp.py:193
 msgid "Start with an empty window"
 msgstr "Начать с пустого окна"
 
-#: ../meld/meldapp.py:166 ../meld/meldapp.py:168
+#: meld/meldapp.py:194 meld/meldapp.py:196
 msgid "file"
 msgstr "файл"
 
-#: ../meld/meldapp.py:166 ../meld/meldapp.py:170
+#: meld/meldapp.py:194 meld/meldapp.py:198
 msgid "folder"
 msgstr "папка"
 
-#: ../meld/meldapp.py:167
+#: meld/meldapp.py:195
 msgid "Start a version control comparison"
 msgstr "Начать сравнение, используя сравнение контроля версий"
 
-#: ../meld/meldapp.py:169
+#: meld/meldapp.py:197
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Начать сравнение 2-х или 3-х файлов"
 
-#: ../meld/meldapp.py:171
+#: meld/meldapp.py:199
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Начать 2-х или 3-х стороннее сравнение папок"
 
-#: ../meld/meldapp.py:209
+#: meld/meldapp.py:242
+#, python-format
+msgid "Error: %s\n"
+msgstr "Ошибка: %s\n"
+
+#: meld/meldapp.py:249
 msgid "Meld is a file and directory comparison tool."
-msgstr "Meld — это программа для сравнения файлов и каталогов."
+msgstr "Meld — это приложение для сравнения файлов и каталогов."
 
-#: ../meld/meldapp.py:213
+#: meld/meldapp.py:253
 msgid "Set label to use instead of file name"
 msgstr "Задайте метку для использования вместо имени файла"
 
-#: ../meld/meldapp.py:216
+#: meld/meldapp.py:256
 msgid "Open a new tab in an already running instance"
 msgstr "Открыть новую вкладку в уже запущенном экземпляре"
 
-#: ../meld/meldapp.py:219
+#: meld/meldapp.py:259
 msgid "Automatically compare all differing files on startup"
 msgstr "Автоматически сравнивать все различающиеся файлы при запуске"
 
-#: ../meld/meldapp.py:222
+#: meld/meldapp.py:262
 msgid "Ignored for compatibility"
 msgstr "Игнорируется для совместимости"
 
-#: ../meld/meldapp.py:226
+#: meld/meldapp.py:266
 msgid "Set the target file for saving a merge result"
 msgstr "Выбрать целевой файл для сохранения результата объединения"
 
-#: ../meld/meldapp.py:229
+#: meld/meldapp.py:269
 msgid "Automatically merge files"
 msgstr "Автоматически объединять файлы"
 
-#: ../meld/meldapp.py:233
+#: meld/meldapp.py:273
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Загрузить сохранённое сравнение из файла сравнения Meld"
 
-#: ../meld/meldapp.py:237
+#: meld/meldapp.py:277
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Создать закладку различий для предоставленных файлов или папок"
 
-#: ../meld/meldapp.py:249
+#: meld/meldapp.py:297
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "слишком много параметров (ожидалось 0-3, получено %d)"
 
-#: ../meld/meldapp.py:252
-msgid "can't auto-merge less than 3 files"
-msgstr "не может автоматически объединять менее 3-х файлов"
+#: meld/meldapp.py:300
+msgid "can’t auto-merge less than 3 files"
+msgstr "не может автоматически объединить менее трёх файлов"
 
-#: ../meld/meldapp.py:254
-msgid "can't auto-merge directories"
-msgstr "не может автоматически объединять каталоги"
+#: meld/meldapp.py:302
+msgid "can’t auto-merge directories"
+msgstr "не может автоматически объединить каталоги"
 
-#: ../meld/meldapp.py:264
+#: meld/meldapp.py:317
 msgid "Error reading saved comparison file"
 msgstr "Ошибка при чтении сохранённого файла сравнения"
 
+#: meld/meldapp.py:334
+#, python-format
+msgid "invalid path or URI “%s”"
+msgstr "недопустимый путь “%s”"
+
+#: meld/meldapp.py:341
+msgid "remote folder “{}” not supported"
+msgstr "удалённая папка “{}” не поддерживается"
+
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:131
+#: meld/meldbuffer.py:115
 msgid "<unnamed>"
 msgstr "<без имени>"
 
-#: ../meld/melddoc.py:76 ../meld/melddoc.py:77
+#: meld/melddoc.py:124
 msgid "untitled"
 msgstr "без имени"
 
-#: ../meld/meldwindow.py:48
-msgid "_File"
-msgstr "_Файл"
-
-#: ../meld/meldwindow.py:49
-msgid "_New Comparison..."
-msgstr "_Новое сравнение…"
-
-#: ../meld/meldwindow.py:50
-msgid "Start a new comparison"
-msgstr "Начать новое сравнение"
-
-#: ../meld/meldwindow.py:53
-msgid "Save the current file"
-msgstr "Сохранить текущий файл"
-
-#: ../meld/meldwindow.py:55
-msgid "Save As…"
-msgstr "Сохранить как…"
-
-#: ../meld/meldwindow.py:56
-msgid "Save the current file with a different name"
-msgstr "Сохранить текущий файл под другим именем"
-
-#: ../meld/meldwindow.py:59
-msgid "Close the current file"
-msgstr "Закрыть текущий файл"
-
-#: ../meld/meldwindow.py:62
-msgid "_Edit"
-msgstr "_Правка"
-
-#: ../meld/meldwindow.py:64
-msgid "Undo the last action"
-msgstr "Отменить последнее действие"
-
-#: ../meld/meldwindow.py:67
-msgid "Redo the last undone action"
-msgstr "Повторить последнее отменённое действие"
-
-#: ../meld/meldwindow.py:69
-msgid "Cut the selection"
-msgstr "Вырезать выделенное"
-
-#: ../meld/meldwindow.py:71
-msgid "Copy the selection"
-msgstr "Копировать выделенное"
-
-#: ../meld/meldwindow.py:73
-msgid "Paste the clipboard"
-msgstr "Вставить из буфера обмена"
-
-#: ../meld/meldwindow.py:75
-msgid "Find..."
-msgstr "Найти…"
-
-#: ../meld/meldwindow.py:75
-msgid "Search for text"
-msgstr "Искать текст"
-
-#: ../meld/meldwindow.py:77
-msgid "Find Ne_xt"
-msgstr "Найти _следующее"
-
-#: ../meld/meldwindow.py:78
-msgid "Search forwards for the same text"
-msgstr "Искать далее этот же текст"
-
-#: ../meld/meldwindow.py:80
-msgid "Find _Previous"
-msgstr "Найти _предыдущее"
-
-#: ../meld/meldwindow.py:81
-msgid "Search backwards for the same text"
-msgstr "Искать тот же текст в обратном направлении"
-
-#: ../meld/meldwindow.py:84
-msgid "_Replace..."
-msgstr "_Заменить…"
-
-#: ../meld/meldwindow.py:85
-msgid "Find and replace text"
-msgstr "Поиск и замена текста"
-
-#: ../meld/meldwindow.py:88
-msgid "_Changes"
-msgstr "_Изменения"
-
-#: ../meld/meldwindow.py:89
-msgid "Next Change"
-msgstr "Следующее изменение"
-
-#: ../meld/meldwindow.py:90
-msgid "Go to the next change"
-msgstr "Перейти к следующему изменению"
-
-#: ../meld/meldwindow.py:92
-msgid "Previous Change"
-msgstr "Предыдущее изменение"
-
-#: ../meld/meldwindow.py:93
-msgid "Go to the previous change"
-msgstr "Перейти к предыдущему изменению"
-
-#: ../meld/meldwindow.py:95
-msgid "Open Externally"
-msgstr "Открыть внешним приложением"
-
-#: ../meld/meldwindow.py:96
-msgid "Open selected file or directory in the default external application"
-msgstr ""
-"Открыть выбранный файл или каталог во внешнем приложении, обычно назначенным "
-"по умолчанию"
-
-#: ../meld/meldwindow.py:100
-msgid "_View"
-msgstr "_Вид"
-
-#: ../meld/meldwindow.py:101
-msgid "File Status"
-msgstr "Статус файла"
-
-#: ../meld/meldwindow.py:102
-msgid "Version Status"
-msgstr "Статус версии"
-
-#: ../meld/meldwindow.py:105
-msgid "Stop the current action"
-msgstr "Остановить текущее действие"
-
-#: ../meld/meldwindow.py:108
-msgid "Refresh the view"
-msgstr "Обновить вид"
-
-# Ускоритель установлен на букву К, т. к. В конфликтует с _Вид
-#: ../meld/meldwindow.py:111
-msgid "_Tabs"
-msgstr "В_кладки"
-
-#: ../meld/meldwindow.py:112
-msgid "_Previous Tab"
-msgstr "_Предыдущая вкладка"
-
-#: ../meld/meldwindow.py:113
-msgid "Activate previous tab"
-msgstr "Перейти к предыдущей вкладке"
-
-#: ../meld/meldwindow.py:115
-msgid "_Next Tab"
-msgstr "_Следующая вкладка"
-
-#: ../meld/meldwindow.py:116
-msgid "Activate next tab"
-msgstr "Перейти к следующей вкладке"
-
-#: ../meld/meldwindow.py:119
-msgid "Move Tab _Left"
-msgstr "Переместить вкладку в_лево"
-
-#: ../meld/meldwindow.py:120
-msgid "Move current tab to left"
-msgstr "Переместить текущую вкладку влево"
-
-#: ../meld/meldwindow.py:123
-msgid "Move Tab _Right"
-msgstr "Переместить вкладку в_право"
-
-#: ../meld/meldwindow.py:124
-msgid "Move current tab to right"
-msgstr "Переместить текущую вкладку вправо"
-
-#: ../meld/meldwindow.py:128
-msgid "Fullscreen"
-msgstr "Во весь экран"
+#: meld/meldwindow.py:158
+msgid "Filename"
+msgstr "Файл"
 
-#: ../meld/meldwindow.py:129
-msgid "View the comparison in fullscreen"
-msgstr "Показать сравнение в полноэкранном режиме"
-
-#: ../meld/meldwindow.py:131
-msgid "_Toolbar"
-msgstr "_Панель инструментов"
-
-#: ../meld/meldwindow.py:132
-msgid "Show or hide the toolbar"
-msgstr "Показывать или скрывать панель инструментов"
-
-#: ../meld/meldwindow.py:141
-msgid "Open Recent"
-msgstr "Открыть недавние"
-
-#: ../meld/meldwindow.py:142
-msgid "Open recent files"
-msgstr "Открыть недавно использованные файлы"
-
-#: ../meld/meldwindow.py:506
-msgid "Switch to this tab"
-msgstr "Переключиться на эту вкладку"
+#: meld/meldwindow.py:381
+#, python-format
+msgid "Need three files to auto-merge, got: %r"
+msgstr "Необходимо три файла для автоматического слияния, в наличии: %r"
 
-#: ../meld/meldwindow.py:629
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Можно сравнивать только файлы или только каталоги"
 
-#. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:213
+#: meld/misc.py:150
+msgid ""
+"{}\n"
+"\n"
+"Meld encountered a critical error while running:\n"
+"<tt>{}</tt>"
+msgstr ""
+"{}\n"
+"\n"
+"Meld столкнулся с критической ошибкой во время запуска:\n"
+"<tt>{}</tt>"
+
+#: meld/misc.py:201
 msgid "[None]"
 msgstr "[Нет]"
 
-#: ../meld/preferences.py:33
+#: meld/preferences.py:37 meld/preferences.py:129
 msgid "label"
 msgstr "метка"
 
-#: ../meld/preferences.py:33
+#: meld/preferences.py:37 meld/preferences.py:129
 msgid "pattern"
 msgstr "шаблон"
 
-#: ../meld/recent.py:105
+#: meld/recent.py:111
 msgid "Version control:"
 msgstr "Контроль версий:"
 
-#: ../meld/ui/findbar.py:141
-msgid "Regular expression error"
-msgstr "Ошибка в регулярном выражении"
+#: meld/style.py:91
+msgid "Couldn’t find colour scheme details for {}; this is a bad install"
+msgstr ""
+"Ну удаётся найти параметры цветовой схемы для {}; обусловлено некорректной "
+"установкой"
+
+#: meld/ui/bufferselectors.py:110
+#, python-brace-format
+msgid "{name} ({charset})"
+msgstr "{name} ({charset})"
 
-#: ../meld/ui/notebooklabel.py:65
-msgid "Close tab"
-msgstr "Закрыть вкладку"
+#: meld/ui/bufferselectors.py:140 meld/ui/bufferselectors.py:148
+msgid "Plain Text"
+msgstr "Просто текст"
+
+#: meld/ui/pathlabel.py:36
+msgid "Unnamed file"
+msgstr "Файл без названия"
+
+#. Abbreviation for line, column so that it will fit in the status bar
+#: meld/ui/statusbar.py:125
+#, python-brace-format
+msgid "Ln {line}, Col {column}"
+msgstr "Стр {line}, Поз {column}"
+
+#: meld/ui/statusbar.py:185
+msgid "Line you want to move the cursor to"
+msgstr "Строка, к которой нужно переместить курсор"
 
-#: ../meld/ui/vcdialogs.py:61
+#: meld/ui/vcdialogs.py:50
 msgid "No files will be committed"
-msgstr "Нет файлов для коммита (фиксации)"
+msgstr "Нет файлов для фиксации (коммита)"
 
-#. Translators: First %s is replaced by translated "%d unpushed
-#. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:126
-#, python-format
-msgid "%s in %s"
-msgstr "%s в %s"
+#. Translators: First element is replaced by translated "%d
+#. unpushed commits", second element is replaced by translated
+#. "%d branches"
+#: meld/vc/git.py:92
+#, python-brace-format
+msgid "{unpushed_commits} in {unpushed_branches}"
+msgstr "{unpushed_commits} в {unpushed_branches}"
 
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:127 ../meld/vc/git.py:134
+#: meld/vc/git.py:94 meld/vc/git.py:104
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
-msgstr[0] "%d запуск фиксации"
-msgstr[1] "%d запуска фиксаций"
-msgstr[2] "%d запусков фиксаций"
+msgstr[0] "%d неотправленный коммит"
+msgstr[1] "%d неотправленных коммитов"
+msgstr[2] "%d неотправленных коммитов"
 
-#: ../meld/vc/git.py:129
+#: meld/vc/git.py:97
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
@@ -1947,163 +2272,168 @@ msgstr[0] "%d бранч"
 msgstr[1] "%d бранча"
 msgstr[2] "%d бранчей"
 
-#: ../meld/vc/git.py:348
+#: meld/vc/git.py:345
+#, python-brace-format
+msgid "Mode changed from {old_mode} to {new_mode}"
+msgstr "Режим был изменён {old_mode} на {new_mode}"
+
+#: meld/vc/git.py:353
+msgid "Partially staged"
+msgstr "Подготовлен к фиксации (частично)"
+
+#: meld/vc/git.py:353
+msgid "Staged"
+msgstr "Подготовлен к фиксации"
+
+#. Translators: This is the displayed name of a version control system
+#. when no version control system is actually found.
+#: meld/vc/_null.py:38
+msgid "None"
+msgstr "Нет"
+
+#: meld/vc/svn.py:203
 #, python-format
-msgid "Mode changed from %s to %s"
-msgstr "Режим был изменён с %s на %s"
+msgid "Rev %s"
+msgstr "РЕВ %s"
 
-#: ../meld/vc/_vc.py:47
+#: meld/vc/_vc.py:54
 msgid "Merged"
-msgstr "Объединить"
+msgstr "Объедененные"
 
-#: ../meld/vc/_vc.py:47
+#: meld/vc/_vc.py:54
 msgid "Base"
 msgstr "Базовый"
 
-#: ../meld/vc/_vc.py:47
+#: meld/vc/_vc.py:54
 msgid "Local"
 msgstr "Локальный"
 
-#: ../meld/vc/_vc.py:47
+#: meld/vc/_vc.py:54
 msgid "Remote"
 msgstr "Удалённый"
 
-#: ../meld/vc/_vc.py:65
-msgid "Unversioned"
-msgstr "Без версии"
-
-#: ../meld/vc/_vc.py:68
+#: meld/vc/_vc.py:73
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../meld/vc/_vc.py:70
+#: meld/vc/_vc.py:75
 msgid "Newly added"
 msgstr "Новый добавленный"
 
-#: ../meld/vc/_vc.py:72
+#: meld/vc/_vc.py:77
+msgid "Renamed"
+msgstr "Переименован"
+
+#: meld/vc/_vc.py:78
 msgid "Conflict"
 msgstr "Конфликт"
 
-#: ../meld/vc/_vc.py:73
+#: meld/vc/_vc.py:79
 msgid "Removed"
-msgstr "Удалённый"
+msgstr "Удалён"
 
-#: ../meld/vc/_vc.py:74
+#: meld/vc/_vc.py:80
 msgid "Missing"
 msgstr "Отсутствует"
 
-#: ../meld/vc/_vc.py:75
+#: meld/vc/_vc.py:81
 msgid "Not present"
 msgstr "Не представлен"
 
-#: ../meld/vcview.py:233 ../meld/vcview.py:413
-msgid "Location"
-msgstr "Местоположение"
-
-#: ../meld/vcview.py:234
-msgid "Status"
-msgstr "Состояние"
-
-#: ../meld/vcview.py:235
-msgid "Revision"
-msgstr "Версия"
+#: meld/vc/_vc.py:82
+msgid "Scanning…"
+msgstr "Сканирование…"
 
-#: ../meld/vcview.py:236
-msgid "Options"
-msgstr "Параметры"
-
-#. TRANSLATORS: this is an error message when a version control
-#. application isn't installed or can't be found
-#: ../meld/vcview.py:324
+#. Translators: This error message is shown when no
+#. repository of this type is found.
+#: meld/vcview.py:334
 #, python-format
-msgid "%s not installed"
-msgstr "%s не установлен"
+msgid "%(name)s (not found)"
+msgstr "%(name)s (не найден)"
 
-#. TRANSLATORS: this is an error message when a version
-#. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:328
-msgid "Invalid repository"
-msgstr "Неверный репозиторий"
-
-#: ../meld/vcview.py:337
+#. Translators: This error message is shown when a version
+#. control binary isn't installed.
+#: meld/vcview.py:338
 #, python-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "%(name)s (%(cmd)s not installed)"
+msgstr "%(name)s (%(cmd)s не установлен)"
 
-#: ../meld/vcview.py:339 ../meld/vcview.py:347
-msgid "None"
-msgstr "Нет"
+#. Translators: This error message is shown when a version
+#. controlled repository is invalid.
+#: meld/vcview.py:342
+#, python-format
+msgid "%(name)s (invalid repository)"
+msgstr "%(name)s (невалидный репозиторий)"
 
-#: ../meld/vcview.py:358
+#: meld/vcview.py:356
 msgid "No valid version control system found in this folder"
 msgstr "Нет системы контроля версий в этой папке"
 
-#: ../meld/vcview.py:360
-msgid "Only one version control system found in this folder"
-msgstr "Только одна система контроля версий в этой папке"
-
-#: ../meld/vcview.py:362
+#: meld/vcview.py:358
 msgid "Choose which version control system to use"
-msgstr "Выберите используемую систему контроля версий"
+msgstr "Выбрать используемую систему контроля версий"
 
-#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:413
-#, python-format
-msgid "%s: %s"
-msgstr "%s: %s"
+#. TRANSLATORS: This is the location of the directory being viewed
+#: meld/vcview.py:412
+#, python-brace-format
+msgid "Location: {path}"
+msgstr "Местоположение: {path}"
 
-#: ../meld/vcview.py:427 ../meld/vcview.py:435
+#. Initial yield so when we add this to our tasks, we don't
+#. create iterators that may be invalidated.
+#: meld/vcview.py:419
+msgid "Scanning repository"
+msgstr "Сканируется репозиторий"
+
+#: meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "Сканирование %s"
 
-#: ../meld/vcview.py:470
+#: meld/vcview.py:487
 msgid "(Empty)"
 msgstr "(Пусто)"
 
-#: ../meld/vcview.py:510
+#: meld/vcview.py:535
 #, python-format
 msgid "%s — local"
 msgstr "%s — локальный"
 
-#: ../meld/vcview.py:511
+#: meld/vcview.py:536
 #, python-format
 msgid "%s — remote"
 msgstr "%s — удалённый"
 
-#: ../meld/vcview.py:519
-#, fuzzy, python-format
-#| msgid "Left is local, right is remote"
+#: meld/vcview.py:544
+#, python-format
 msgid "%s (local, merge, remote)"
-msgstr "Слева на локальной машине, справа на удалённой"
+msgstr "%s (локальный, объединённый, удалённый)"
 
-#: ../meld/vcview.py:524
-#, fuzzy, python-format
-#| msgid "Left is remote, right is local"
+#: meld/vcview.py:549
+#, python-format
 msgid "%s (remote, merge, local)"
-msgstr "Слева на удалённой машине, справа на локальной"
+msgstr "%s (удалённый, объединённый, локальный)"
 
-#: ../meld/vcview.py:535
+#: meld/vcview.py:560
 #, python-format
-#| msgid "Invalid repository"
 msgid "%s — repository"
 msgstr "%s — репозиторий"
 
-#: ../meld/vcview.py:541
+#: meld/vcview.py:566
 #, python-format
 msgid "%s (working, repository)"
-msgstr ""
+msgstr "%s (текущие изменения, состояние в репозитории)"
 
-#: ../meld/vcview.py:545
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (repository, working)"
-msgstr ""
+msgstr "%s (состояние в репозитории, текущие изменения)"
 
-#: ../meld/vcview.py:729
+#: meld/vcview.py:735
 msgid "Remove folder and all its files?"
 msgstr "Удалить папку и все файлы?"
 
-#: ../meld/vcview.py:731
+#: meld/vcview.py:737
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2111,7 +2441,394 @@ msgstr ""
 "Это удалит все выбранные файлы и папки, а так же файлы в любых выбранных "
 "папках, из системы контроля версий."
 
-#: ../meld/vcview.py:765
-#, python-format
-msgid "Error removing %s"
-msgstr "Ошибка при удалении %s"
+#: meld/vcview.py:850
+msgid "Clear"
+msgstr "Очистить"
+
+#~ msgid "_Update"
+#~ msgstr "_Обновить"
+
+#~ msgid "Mar_k as Resolved"
+#~ msgstr "Отметить как _решено"
+
+#~ msgid "Update"
+#~ msgstr "_Обновить"
+
+#~ msgid "Update working copy from version control"
+#~ msgstr "Обновить рабочую копию из системы контроля версий"
+
+#~ msgid "Push"
+#~ msgstr "Отправить"
+
+#~ msgid "Add"
+#~ msgstr "_Добавить"
+
+#~ msgid "Remove"
+#~ msgstr "Убрать"
+
+#~ msgid "Mark as Resolved"
+#~ msgstr "Отметить как _решённый"
+
+#~ msgid "Revert"
+#~ msgstr "В_осстановить"
+
+#~ msgid "Delete from working copy"
+#~ msgstr "Удалить файл из рабочей копии"
+
+#~ msgid "[%s] Scanning %s"
+#~ msgstr "[%s] Сканирование %s"
+
+#~ msgid "Autodetect Encoding"
+#~ msgstr "Автоматическое обнаружение кодировки текста"
+
+#~ msgid "Current Locale ({})"
+#~ msgstr "Текущая кодировка ({})"
+
+#~ msgid "Ln %i, Col %i"
+#~ msgstr "Стр %i, Стлб %i"
+
+#~ msgid "%s in %s"
+#~ msgstr "%s в %s"
+
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
+#~ msgid "Cannot import: "
+#~ msgstr "Не удалось импортировать: "
+
+#~ msgid "Meld requires %s or higher."
+#~ msgstr "Meld требует версию %s или более позднюю."
+
+#~ msgid "Meld does not support Python 3."
+#~ msgstr "Meld не поддерживает Python 3."
+
+#~ msgid "Meld Diff Viewer"
+#~ msgstr "Meld — приложение для просмотра различий"
+
+#~ msgid "Show toolbar"
+#~ msgstr "Панель инструментов"
+
+#~ msgid "If true, the window toolbar is visible."
+#~ msgstr "Если отмечено, то панель инструментов видна."
+
+#~ msgid "Show statusbar"
+#~ msgstr "Строка состояния"
+
+#~ msgid "If true, the window statusbar is visible."
+#~ msgstr "Если отмечено, то строка состояния видна."
+
+#~ msgid ""
+#~ "These text encodings will be automatically used (in order) to try to "
+#~ "decode loaded text files."
+#~ msgstr ""
+#~ "Данные кодировки текста будут автоматически использованы (по порядку) при "
+#~ "декодировании загруженных текстовых файлов."
+
+#~ msgid "Displayed whitespace"
+#~ msgstr "Показывать пробелы"
+
+#, fuzzy
+#~ msgid ""
+#~ "Selector for individual whitespace character types to be shown. Possible "
+#~ "values are 'space', 'tab', 'newline' and 'nbsp'."
+#~ msgstr ""
+#~ "Разделитель для индивидуальных типов символов пробела для показа. "
+#~ "Возможные значения: 'пробел', 'табулятор', 'новая_строка' и 'кавычка'."
+
+#~ msgid "Website"
+#~ msgstr "Веб-сайт"
+
+#~ msgid "_About"
+#~ msgstr "_О программе"
+
+#~ msgid "_Quit"
+#~ msgstr "_Завершить"
+
+#~ msgid "Copy _Left"
+#~ msgstr "Копировать в_лево"
+
+#~ msgid "Copy _Right"
+#~ msgstr "Копировать в_право"
+
+#~ msgid "Hide selected"
+#~ msgstr "Скрыть выделенное"
+
+#~ msgid ""
+#~ "Consider differently-cased filenames that are otherwise-identical to be "
+#~ "the same"
+#~ msgstr ""
+#~ "Рассматривать имена файлов в разных регистрах, в противном случае они "
+#~ "будут одинаковыми"
+
+#~ msgid "Show identical"
+#~ msgstr "Показывать одинаковые"
+
+#~ msgid "Show new"
+#~ msgstr "Показывать новые"
+
+#~ msgid "Show modified"
+#~ msgstr "Показывать изменённые"
+
+#~ msgid "Filters"
+#~ msgstr "Фильтры"
+
+#~ msgid "Set active filters"
+#~ msgstr "Установить фильтры"
+
+#~ msgid "Editable List"
+#~ msgstr "Редактируемый список"
+
+#~ msgid "_Previous"
+#~ msgstr "_Предыдущее"
+
+#~ msgid "_Next"
+#~ msgstr "_Следующее"
+
+#~ msgid "Replace _with:"
+#~ msgstr "Заменить _на:"
+
+#~ msgid "Meld Preferences"
+#~ msgstr "Параметры Meld"
+
+#~ msgid "Ignore changes which insert or delete blank lines"
+#~ msgstr "Игнорировать изменения пустых строк"
+
+#~ msgid "Co_mmit..."
+#~ msgstr "_Зафиксировать…"
+
+#~ msgid "Console"
+#~ msgstr "Консоль"
+
+#~ msgid "Show or hide the version control console output pane"
+#~ msgstr "Показать или скрыть выходную консоль панели контроля версий"
+
+#~ msgid "_Flatten"
+#~ msgstr "_Выравнить"
+
+#~ msgid "_Modified"
+#~ msgstr "_Изменённые"
+
+#~ msgid "Show modified files"
+#~ msgstr "Показывать изменённые файлы"
+
+#~ msgid "Show normal files"
+#~ msgstr "Показывать стандартные файлы"
+
+#~ msgid "Un_versioned"
+#~ msgstr "Бе_з версии"
+
+#~ msgid "Show unversioned files"
+#~ msgstr "Показывать файлы без версий"
+
+#~ msgid "Show ignored files"
+#~ msgstr "Показывать игнорируемые файлы"
+
+#~ msgid "Hide %s"
+#~ msgstr "Скрывать %s"
+
+#~ msgid ""
+#~ "'%s' exists.\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "«%s» существует.\n"
+#~ "Перезаписать?"
+
+#~ msgid "Format as Patch..."
+#~ msgstr "В формате патча…"
+
+#~ msgid "Create a patch using differences between files"
+#~ msgstr "Создать патч, используя различия между файлами"
+
+#~ msgid "Revert files to their saved versions"
+#~ msgstr "Восстановить файлы, вернув их к сохранённым версиям"
+
+#~ msgid "Add a manual point for synchronization of changes between files"
+#~ msgstr "Добавить вручную точку для синхронизации изменений между файлами"
+
+#~ msgid "Clear manual change sychronization points"
+#~ msgstr "Удалить точки синхронизации вручную"
+
+#~ msgid "Push to Left"
+#~ msgstr "Переместить влево"
+
+#~ msgid "Push to Right"
+#~ msgstr "Переместить вправо"
+
+#~ msgid "Pull from Left"
+#~ msgstr "Взять слева"
+
+#~ msgid "Pull from Right"
+#~ msgstr "Взять справа"
+
+#~ msgid "Copy Above Left"
+#~ msgstr "Копировать вверху слева"
+
+#~ msgid "Copy Below Left"
+#~ msgstr "Копировать ниже слева"
+
+#~ msgid "Copy Above Right"
+#~ msgstr "Копировать вверху справа"
+
+#~ msgid "Copy Below Right"
+#~ msgstr "Копировать ниже справа"
+
+#~ msgid "Merge all non-conflicting changes from the left"
+#~ msgstr "Объединить все неконфликтующие изменения слева"
+
+#~ msgid "Merge all non-conflicting changes from the right"
+#~ msgstr "Объединить все неконфликтующие изменения справа"
+
+#~ msgid "Merge all non-conflicting changes from left and right panes"
+#~ msgstr "Объединить все неконфликтующие изменения с левой и правой панели"
+
+#~ msgid "Cycle Through Documents"
+#~ msgstr "Пройти по документам циклически"
+
+#~ msgid "Move keyboard focus to the next document in this comparison"
+#~ msgstr "Переместить фокус ввода на следующий документ в сравнении"
+
+#~ msgid "Lock scrolling of all panes"
+#~ msgstr "Заблокировать прокрутку для всех панелей"
+
+#~ msgid "INS"
+#~ msgstr "ВСТ"
+
+#~ msgid "OVR"
+#~ msgstr "ЗАМ"
+
+#~ msgid "[%s] Set num panes"
+#~ msgstr "[%s] Установка панелей"
+
+#~ msgid "[%s] Opening files"
+#~ msgstr "[%s] Открытие файлов"
+
+#~ msgid "[%s] Reading files"
+#~ msgstr "[%s] Чтение файлов"
+
+#~ msgid "%s is not in encodings: %s"
+#~ msgstr "%s не входит в список кодировок: %s"
+
+#~ msgid ""
+#~ "\"%s\" exists!\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "«%s» не существует!\n"
+#~ "Переписать?"
+
+#~ msgid ""
+#~ "Error writing to %s\n"
+#~ "\n"
+#~ "%s."
+#~ msgstr ""
+#~ "Ошибка записи в «%s»\n"
+#~ "\n"
+#~ "%s."
+
+#~ msgid ""
+#~ "This file '%s' contains a mixture of line endings.\n"
+#~ "\n"
+#~ "Which format would you like to use?"
+#~ msgstr ""
+#~ "Файл «%s» содержит концы строк в разных форматах.\n"
+#~ "\n"
+#~ "Какой формат необходимо использовать?"
+
+#~ msgid ""
+#~ "'%s' contains characters not encodable with '%s'\n"
+#~ "Would you like to save as UTF-8?"
+#~ msgstr ""
+#~ "«%s» содержит символы, которые невозможно закодировать в «%s».\n"
+#~ "Хотите сохранить в UTF-8?"
+
+#~ msgid "_New Comparison..."
+#~ msgstr "_Новое сравнение…"
+
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Сохранить текущий файл под другим именем"
+
+#~ msgid "Close the current file"
+#~ msgstr "Закрыть текущий файл"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Отменить последнее действие"
+
+#~ msgid "Redo the last undone action"
+#~ msgstr "Повторить последнее отменённое действие"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Вырезать выделенное"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Копировать выделенное"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "Вставить из буфера обмена"
+
+#~ msgid "Find..."
+#~ msgstr "Найти…"
+
+#~ msgid "Search for text"
+#~ msgstr "Искать текст"
+
+#~ msgid "Search forwards for the same text"
+#~ msgstr "Искать далее этот же текст"
+
+#~ msgid "Search backwards for the same text"
+#~ msgstr "Искать тот же текст в обратном направлении"
+
+#~ msgid "_Replace..."
+#~ msgstr "_Заменить…"
+
+#~ msgid "Find and replace text"
+#~ msgstr "Поиск и замена текста"
+
+#~ msgid "Next Change"
+#~ msgstr "Следующее изменение"
+
+#~ msgid "Previous Change"
+#~ msgstr "Предыдущее изменение"
+
+#~ msgid "_Previous Tab"
+#~ msgstr "_Предыдущая вкладка"
+
+#~ msgid "Activate previous tab"
+#~ msgstr "Перейти к предыдущей вкладке"
+
+#~ msgid "_Next Tab"
+#~ msgstr "_Следующая вкладка"
+
+#~ msgid "Activate next tab"
+#~ msgstr "Перейти к следующей вкладке"
+
+#~ msgid "Move current tab to left"
+#~ msgstr "Переместить текущую вкладку влево"
+
+#~ msgid "Move current tab to right"
+#~ msgstr "Переместить текущую вкладку вправо"
+
+#~ msgid "View the comparison in fullscreen"
+#~ msgstr "Показать сравнение в полноэкранном режиме"
+
+#~ msgid "_Toolbar"
+#~ msgstr "_Панель инструментов"
+
+#~ msgid "Show or hide the toolbar"
+#~ msgstr "Показывать или скрывать панель инструментов"
+
+#~ msgid "Open Recent"
+#~ msgstr "Открыть недавние"
+
+#~ msgid "Regular expression error"
+#~ msgstr "Ошибка в регулярном выражении"
+
+#~ msgid "Revision"
+#~ msgstr "Версия"
+
+#~ msgid "Options"
+#~ msgstr "Параметры"
+
+#~ msgid "%s (%s)"
+#~ msgstr "%s (%s)"
+
+#~ msgid "Error removing %s"
+#~ msgstr "Ошибка при удалении %s"

From 5188a6cf26db24e78546c840b3ea429b926d46b3 Mon Sep 17 00:00:00 2001
From: Hugo Carvalho <hugokarvalho@hotmail.com>
Date: Sat, 26 Feb 2022 22:08:18 +0000
Subject: [PATCH 048/116] Update Portuguese translation

---
 po/pt.po | 162 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 90 insertions(+), 72 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index 900ec938..d4f82cda 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,14 +4,14 @@
 # Duarte Loreto <happyguy_pt@hotmail.com>, 2003.
 # Pedro Albuquerque <palbuquerque73@gmail.com>, 2015.
 # Tiago Santos <tiagofsantos81@sapo.pt>, 2014 - 2016.
-# Hugo Carvalho <hugokarvalho@hotmail.com>, 2020, 2021.
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2020, 2021, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.6\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-10-08 21:01+0000\n"
-"PO-Revision-Date: 2022-01-04 14:19+0000\n"
+"POT-Creation-Date: 2022-01-30 21:55+0000\n"
+"PO-Revision-Date: 2022-02-26 22:07+0000\n"
 "Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
 "Language-Team: Português <https://l10n.gnome.org/teams/pt/>\n"
 "Language: pt\n"
@@ -855,7 +855,7 @@ msgstr "Mesmo"
 msgid "New"
 msgstr "Novo"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Alterado"
@@ -864,19 +864,23 @@ msgstr "Alterado"
 msgid "Ignore filename case"
 msgstr "Ignorar maiúsculas/minúsculas em nomes de ficheiros"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr "Normalizar as localizações Unicode"
+
+#: meld/resources/gtk/menus.ui:175
 msgid "Normal"
 msgstr "Normal"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Sem versão"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:190
 msgid "Flatten folders"
 msgstr "Pastas planas"
 
@@ -1138,7 +1142,7 @@ msgstr "Ficheiro 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:530
+#: meld/dirdiff.py:556
 msgid "Name"
 msgstr "Nome"
 
@@ -1178,7 +1182,7 @@ msgstr "Ajustado"
 msgid "Replace _All"
 msgstr "Su_bstituir tudo"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1092 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1180 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "Substitui_r"
 
@@ -1566,7 +1570,7 @@ msgstr "Se não guardar, as alterações serão perdidas permanentemente."
 msgid "Close _without Saving"
 msgstr "Fechar sem guardar"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1091
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1179
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -1676,43 +1680,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:551 meld/preferences.py:132
+#: meld/dirdiff.py:577 meld/preferences.py:132
 msgid "Size"
 msgstr "Tamanho"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:559 meld/preferences.py:133
+#: meld/dirdiff.py:585 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Hora de modificação"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:593 meld/preferences.py:134
+msgid "Modification time (ISO)"
+msgstr "Hora de modificação (ISO)"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:567 meld/preferences.py:134
+#: meld/dirdiff.py:601 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Permissões"
 
-#: meld/dirdiff.py:803 meld/dirdiff.py:827
+#: meld/dirdiff.py:851
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (a analisar…)"
+
+#: meld/dirdiff.py:883 meld/dirdiff.py:915
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
-msgstr "[{label}] Varrendo {folder}"
+msgstr "[{label}] A analisar {folder}"
 
-#: meld/dirdiff.py:967
+#: meld/dirdiff.py:1051
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Concluído"
 
-#: meld/dirdiff.py:976
+#: meld/dirdiff.py:1064
 msgid "Folder {} is being compared to itself"
 msgstr "Pasta {} sendo comparada consigo própria"
 
-#: meld/dirdiff.py:982
+#: meld/dirdiff.py:1070
 msgid "Folders have no differences"
 msgstr "As pastas não têm diferenças"
 
-#: meld/dirdiff.py:984
+#: meld/dirdiff.py:1072
 msgid "Contents of scanned files in folders are identical."
 msgstr "Os conteúdos de ficheiros pesquisados nas pastas são idênticos."
 
-#: meld/dirdiff.py:986
+#: meld/dirdiff.py:1074
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1720,47 +1734,47 @@ msgstr ""
 "Os ficheiros pesquisados nas pastas parecem idênticos, mas os conteúdos não "
 "foram pesquisados."
 
-#: meld/dirdiff.py:989
+#: meld/dirdiff.py:1077
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Os filtros de ficheiros estão em uso, pelo que nem todos os ficheiros foram "
 "pesquisados."
 
-#: meld/dirdiff.py:991
+#: meld/dirdiff.py:1079
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Os filtros de texto estão em uso e podem estar a mascarar diferenças de "
 "conteúdo."
 
-#: meld/dirdiff.py:1007 meld/filediff.py:1907
+#: meld/dirdiff.py:1095 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Ocultar %s"
 
-#: meld/dirdiff.py:1009 meld/filediff.py:1909 meld/filediff.py:1939
-#: meld/filediff.py:1941 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1097 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Ocultar"
 
-#: meld/dirdiff.py:1018
+#: meld/dirdiff.py:1106
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Ocorreram múltiplos erros ao pesquisar esta pasta"
 
-#: meld/dirdiff.py:1019
+#: meld/dirdiff.py:1107
 msgid "Files with invalid encodings found"
 msgstr "Encontrados ficheiros com codificação inválida"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1021
+#: meld/dirdiff.py:1109
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Alguns ficheiros tinham uma codificação incorreta. Os nomes são algo como:"
 
-#: meld/dirdiff.py:1023
+#: meld/dirdiff.py:1111
 msgid "Files hidden by case insensitive comparison"
 msgstr "Ficheiros ocultos por comparação insensível a maiúsculas"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1025
+#: meld/dirdiff.py:1113
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1769,17 +1783,17 @@ msgstr ""
 "ficheiros sensível a maiúsculas. Os seguintes ficheiros nesta pasta estão "
 "ocultos:"
 
-#: meld/dirdiff.py:1036
+#: meld/dirdiff.py:1124
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}” ocultado por “{second_file}”"
 
-#: meld/dirdiff.py:1095
+#: meld/dirdiff.py:1183
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Substituir pasta “%s”?"
 
-#: meld/dirdiff.py:1097
+#: meld/dirdiff.py:1185
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1789,11 +1803,11 @@ msgstr ""
 "Se substituir a pasta existente, todos os ficheiros nela contidos serão "
 "perdidos."
 
-#: meld/dirdiff.py:1110
+#: meld/dirdiff.py:1198
 msgid "Error copying file"
 msgstr "Erro ao copiar o ficheiro"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1199
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1806,11 +1820,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1136 meld/vcview.py:764
+#: meld/dirdiff.py:1224 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Erro ao eliminar {}"
 
-#: meld/dirdiff.py:1626
+#: meld/dirdiff.py:1715
 msgid "No folder"
 msgstr "Sem pasta"
 
@@ -1844,56 +1858,56 @@ msgstr "Cancelar"
 msgid "Mark _Resolved"
 msgstr "Marcar _resolvido"
 
-#: meld/filediff.py:1589
+#: meld/filediff.py:1591
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Houve um problema ao abrir o ficheiro \"%s\"."
 
-#: meld/filediff.py:1598
+#: meld/filediff.py:1600
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "%s parece ser um ficheiro binário."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1602
 msgid "Do you want to open the file using the default application?"
 msgstr "Quer abrir o ficheiro usando a aplicação predefinida?"
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1604
 msgid "Open"
 msgstr "Abrir"
 
-#: meld/filediff.py:1616
+#: meld/filediff.py:1626
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] A unir ficheiros"
 
-#: meld/filediff.py:1630
+#: meld/filediff.py:1640
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] A calcular diferenças"
 
-#: meld/filediff.py:1690
+#: meld/filediff.py:1700
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "O ficheiro %s foi alterado no disco"
 
-#: meld/filediff.py:1691
+#: meld/filediff.py:1701
 msgid "Do you want to reload the file?"
 msgstr "Quer recarregar o ficheiro?"
 
-#: meld/filediff.py:1693
+#: meld/filediff.py:1703
 msgid "_Reload"
 msgstr "_Recarregar"
 
-#: meld/filediff.py:1863
+#: meld/filediff.py:1873
 msgid "File {} is being compared to itself"
 msgstr "Arquivo {} sendo comparado consigo próprio"
 
-#: meld/filediff.py:1872
+#: meld/filediff.py:1882
 msgid "Files are identical"
 msgstr "Os ficheiros são idênticos"
 
-#: meld/filediff.py:1885
+#: meld/filediff.py:1895
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1901,11 +1915,11 @@ msgstr ""
 "Os filtros de texto estão em uso e podem estar a mascarar diferenças entre "
 "os ficheiros. Quer comparar os ficheiros sem filtragem?"
 
-#: meld/filediff.py:1890
+#: meld/filediff.py:1900
 msgid "Files differ in line endings only"
 msgstr "Os ficheiros só diferem nos fins de linha"
 
-#: meld/filediff.py:1892
+#: meld/filediff.py:1902
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1914,15 +1928,15 @@ msgstr ""
 "Os ficheiros são idênticos, exceto por diferentes fins de linha:\n"
 "%s"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1922
 msgid "Show without filters"
 msgstr "Mostrar sem filtros"
 
-#: meld/filediff.py:1934
+#: meld/filediff.py:1944
 msgid "Change highlighting incomplete"
 msgstr "Alterar realce incompleto"
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1945
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1931,19 +1945,19 @@ msgstr ""
 "forçar o Meld para demorar mais a realçar alterações grandes, mas pode ser "
 "lento."
 
-#: meld/filediff.py:1943
+#: meld/filediff.py:1953
 msgid "Keep highlighting"
 msgstr "Manter realce"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1955
 msgid "_Keep highlighting"
 msgstr "_Manter realce"
 
-#: meld/filediff.py:1958
+#: meld/filediff.py:1968
 msgid "Saving failed"
 msgstr "Falha ao guardar"
 
-#: meld/filediff.py:1959
+#: meld/filediff.py:1969
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1951,36 +1965,36 @@ msgstr ""
 "Por favor, considere copiar quaisquer alterações críticas para outro "
 "programa ou ficheiro para evitar a perda de dados."
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:1978
 msgid "Save Left Pane As"
 msgstr "Guardar painel esquerdo como"
 
-#: meld/filediff.py:1970
+#: meld/filediff.py:1980
 msgid "Save Middle Pane As"
 msgstr "Guardar painel central como"
 
-#: meld/filediff.py:1972
+#: meld/filediff.py:1982
 msgid "Save Right Pane As"
 msgstr "Guardar painel direito como"
 
-#: meld/filediff.py:1983
+#: meld/filediff.py:1993
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "O ficheiro %s foi alterado no disco desde que foi aberto"
 
-#: meld/filediff.py:1985
+#: meld/filediff.py:1995
 msgid "If you save it, any external changes will be lost."
 msgstr "Se o guardar, todas as alterações externas serão perdidas."
 
-#: meld/filediff.py:1988
+#: meld/filediff.py:1998
 msgid "Save Anyway"
 msgstr "Guardar mesmo assim"
 
-#: meld/filediff.py:1989
+#: meld/filediff.py:1999
 msgid "Don’t Save"
 msgstr "Não guardar"
 
-#: meld/filediff.py:2031
+#: meld/filediff.py:2041
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1988,7 +2002,7 @@ msgstr ""
 "O ficheiro “{}” contém caracteres que não podem ser codificados ao usar a "
 "sua codificação atual “{}”."
 
-#: meld/filediff.py:2035 meld/patchdialog.py:138
+#: meld/filediff.py:2045 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1997,16 +2011,16 @@ msgstr ""
 "Não foi possível guardar o ficheiro devido a:\n"
 "%s"
 
-#: meld/filediff.py:2039 meld/patchdialog.py:137
+#: meld/filediff.py:2049 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Impossível guardar o ficheiro %s."
 
-#: meld/filediff.py:2440
+#: meld/filediff.py:2450
 msgid "Live comparison updating disabled"
 msgstr "Atualização ao vivo da comparação desativada"
 
-#: meld/filediff.py:2441
+#: meld/filediff.py:2451
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2163,7 +2177,7 @@ msgstr "Nome do ficheiro"
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Necessários três ficheiros para união automática, obtidos %r"
 
-#: meld/meldwindow.py:403
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Impossível comparar uma mistura de ficheiros e pastas"
 
@@ -2318,6 +2332,10 @@ msgstr "Em falta"
 msgid "Not present"
 msgstr "Não presentes"
 
+#: meld/vc/_vc.py:82
+msgid "Scanning…"
+msgstr "A analisar…"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
 #: meld/vcview.py:334

From 5944d0254cf58175299fc81047f5fc796a994025 Mon Sep 17 00:00:00 2001
From: Helly Guo <buffoonguo@gmail.com>
Date: Sun, 27 Feb 2022 20:02:24 +0800
Subject: [PATCH 049/116] [FIX] change code as discussed in !79

1 remove unmark
2 sperate the section, use a new section
3 after mark-then-compare, do not set marked = None. It can be reused.
4 coding as a pythoner, change code to fit python style
---
 meld/dirdiff.py                    | 30 ++++++++++++++++--------------
 meld/resources/ui/dirdiff-menus.ui |  7 +++----
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 2e894088..ba45f1c9 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -452,7 +452,6 @@ def __init__(self, num_panes):
             ('folder-collapse', self.action_folder_collapse),
             ('folder-compare', self.action_diff),
             ('folder-mark', self.action_mark),
-            ('folder-unmark', self.action_unmark),
             ('folder-compare-marked', self.action_diff_marked),
             ('folder-copy-left', self.action_copy_left),
             ('folder-copy-right', self.action_copy_right),
@@ -1277,9 +1276,8 @@ def update_action_sensitivity(self):
             self.set_action_enabled('folder-expand', is_single_foldable_row)
             self.set_action_enabled('folder-compare', True)
             self.set_action_enabled('folder-mark', True)
-            self.set_action_enabled('folder-unmark', self.marked is not None)
-            self.set_action_enabled(
-                'folder-compare-marked', self.marked is not None)
+            self.set_action_enabled('folder-compare-marked',
+                self.marked is not None and self.marked.get('pane', -1) != pane)
             self.set_action_enabled('folder-delete', is_valid)
             self.set_action_enabled('folder-copy-left', is_valid and pane > 0)
             self.set_action_enabled(
@@ -1290,7 +1288,6 @@ def update_action_sensitivity(self):
                 'folder-collapse',
                 'folder-compare',
                 'folder-mark',
-                'folder-unmark',
                 'folder-compare-marked',
                 'folder-copy-left',
                 'folder-copy-right',
@@ -1463,28 +1460,33 @@ def action_mark(self, *args):
             return
 
         selected = self._get_selected_paths(pane)
-        self.marked = {}
-        self.marked['mark'] = self.model.get_iter(selected[0])
-        self.marked['pane'] = pane
+        if selected is None:
+            return
 
-    def action_unmark(self, *args):
-        self.marked = None
+        self.marked = {
+            'mark': self.model.get_iter(selected[0]),
+            'pane': pane
+        }
 
     def action_diff_marked(self, *args):
         if self.marked is None:
             return
+
         marked = self.marked['mark']
         marked_pane = self.marked['pane']
-        self.action_unmark()
 
         pane = self._get_focused_pane()
         if pane is None:
             return
 
         selected = self.model.get_iter(self._get_selected_paths(pane)[0])
-        row_paths = []
-        row_paths.append(self.model.value_paths(marked)[marked_pane])
-        row_paths.append(self.model.value_paths(selected)[pane])
+        if selected is None:
+            return
+
+        row_paths = [
+            self.model.value_paths(marked)[marked_pane],
+            self.model.value_paths(selected)[pane]
+        ]
         gfiles = [Gio.File.new_for_path(p)
                   for p in row_paths if os.path.exists(p)]
         self.create_diff_signal.emit(gfiles, {})
diff --git a/meld/resources/ui/dirdiff-menus.ui b/meld/resources/ui/dirdiff-menus.ui
index 4544744f..2ff85982 100644
--- a/meld/resources/ui/dirdiff-menus.ui
+++ b/meld/resources/ui/dirdiff-menus.ui
@@ -7,14 +7,13 @@
         <attribute name="label" translatable="yes">_Compare selected files</attribute>
         <attribute name="action">view.folder-compare</attribute>
       </item>
+    </section>
+    <section>
+      <attribute name="id">mark-then-compare-section</attribute>
       <item>
         <attribute name="label" translatable="yes">_Mark selected file</attribute>
         <attribute name="action">view.folder-mark</attribute>
       </item>
-      <item>
-        <attribute name="label" translatable="yes">_Unmark selected file</attribute>
-        <attribute name="action">view.folder-unmark</attribute>
-      </item>
       <item>
         <attribute name="label" translatable="yes">Compare _with marked file</attribute>
         <attribute name="action">view.folder-compare-marked</attribute>

From 882d023338c63085d3384e0f493394b265c0da5a Mon Sep 17 00:00:00 2001
From: Helly Guo <buffoonguo@gmail.com>
Date: Sun, 27 Feb 2022 20:13:35 +0800
Subject: [PATCH 050/116] [FIX] 1. inline 2. shorten the line

---
 meld/dirdiff.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index ba45f1c9..336f1c41 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -1277,7 +1277,8 @@ def update_action_sensitivity(self):
             self.set_action_enabled('folder-compare', True)
             self.set_action_enabled('folder-mark', True)
             self.set_action_enabled('folder-compare-marked',
-                self.marked is not None and self.marked.get('pane', -1) != pane)
+                                    self.marked is not None and
+                                    self.marked.get('pane', -1) != pane)
             self.set_action_enabled('folder-delete', is_valid)
             self.set_action_enabled('folder-copy-left', is_valid and pane > 0)
             self.set_action_enabled(
@@ -1469,12 +1470,6 @@ def action_mark(self, *args):
         }
 
     def action_diff_marked(self, *args):
-        if self.marked is None:
-            return
-
-        marked = self.marked['mark']
-        marked_pane = self.marked['pane']
-
         pane = self._get_focused_pane()
         if pane is None:
             return
@@ -1484,7 +1479,7 @@ def action_diff_marked(self, *args):
             return
 
         row_paths = [
-            self.model.value_paths(marked)[marked_pane],
+            self.model.value_paths(self.marked['mark'])[self.marked['pane']],
             self.model.value_paths(selected)[pane]
         ]
         gfiles = [Gio.File.new_for_path(p)

From 5d0cffb4df7e1642b7735899ff8c8d4ac094f250 Mon Sep 17 00:00:00 2001
From: Helly Guo <buffoonguo@gmail.com>
Date: Mon, 28 Feb 2022 09:03:14 +0800
Subject: [PATCH 051/116] [FIX] as a object's field is enough.

---
 meld/dirdiff.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 336f1c41..f99b7167 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -422,8 +422,6 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
         tree.STATE_MODIFIED: ("modified", "folder-status-modified"),
     }
 
-    marked = None
-
     def __init__(self, num_panes):
         super().__init__()
         # FIXME:
@@ -644,6 +642,8 @@ def __init__(self, num_panes):
 
         self._scan_in_progress = 0
 
+        self.marked = None
+
     def queue_draw(self):
         for treeview in self.treeview:
             treeview.queue_draw()

From a21d98516dfbcf39bd2a4383eb70246bcd479c7b Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Tue, 1 Mar 2022 07:58:19 +0000
Subject: [PATCH 052/116] Update Ukrainian translation

---
 po/uk.po | 89 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 49 insertions(+), 40 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index e90c334c..87463410 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-01-30 21:55+0000\n"
-"PO-Revision-Date: 2022-01-31 09:52+0200\n"
+"POT-Creation-Date: 2022-02-28 21:56+0000\n"
+"PO-Revision-Date: 2022-03-01 09:57+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\n"
@@ -880,8 +880,7 @@ msgstr "Ігнорувати регістр літер у назвах файл
 
 #: meld/resources/gtk/menus.ui:162
 msgid "Normalize Unicode paths"
-msgstr ""
-"Нормалізувати шляхи у Unicode"
+msgstr "Нормалізувати шляхи у Unicode"
 
 #: meld/resources/gtk/menus.ui:175
 msgid "Normal"
@@ -1013,30 +1012,40 @@ msgid "_Compare selected files"
 msgstr "По_рівняти позначені файли"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+#| msgid "_Compare selected files"
+msgid "_Mark selected file"
+msgstr "Поз_начити вибраний файл"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+#| msgid "_Compare selected files"
+msgid "Compare _with marked file"
+msgstr "Порівняти _із позначеним файлом"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "Копіювати _ліворуч"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "Копіювати _праворуч"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "Ви_лучити позначене"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "Згорнути рекурсивно"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "Розгорнути рекурсивно"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "Від_крити у сторонній програмі"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "_Копіювати шляхи до файлів"
 
@@ -1155,7 +1164,7 @@ msgstr "Файл 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:556
+#: meld/dirdiff.py:558
 msgid "Name"
 msgstr "Назва"
 
@@ -1195,7 +1204,7 @@ msgstr "Циклічний пошук"
 msgid "Replace _All"
 msgstr "Замінити _все"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1180 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1184 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "За_мінити"
 
@@ -1582,7 +1591,7 @@ msgstr "Якщо ви не збережете внесені зміни, їх б
 msgid "Close _without Saving"
 msgstr "Закрити _без збереження"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1179
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1183
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Скасувати"
@@ -1692,53 +1701,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:577 meld/preferences.py:132
+#: meld/dirdiff.py:579 meld/preferences.py:132
 msgid "Size"
 msgstr "Розмір"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:585 meld/preferences.py:133
+#: meld/dirdiff.py:587 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Час внесення змін"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:593 meld/preferences.py:134
+#: meld/dirdiff.py:595 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Час внесення змін (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:601 meld/preferences.py:135
+#: meld/dirdiff.py:603 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Права доступу"
 
-#: meld/dirdiff.py:851
+#: meld/dirdiff.py:855
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (сканування…)"
 
-#: meld/dirdiff.py:883 meld/dirdiff.py:915
+#: meld/dirdiff.py:887 meld/dirdiff.py:919
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Скануємо {folder}"
 
-#: meld/dirdiff.py:1051
+#: meld/dirdiff.py:1055
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Виконано"
 
-#: meld/dirdiff.py:1064
+#: meld/dirdiff.py:1068
 msgid "Folder {} is being compared to itself"
 msgstr "Виконуємо порівняння теки {} із самою собою"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1074
 msgid "Folders have no differences"
 msgstr "Між теками немає відмінностей"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1076
 msgid "Contents of scanned files in folders are identical."
 msgstr "Вміст сканованих файлів у теках є тотожним."
 
-#: meld/dirdiff.py:1074
+#: meld/dirdiff.py:1078
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1746,45 +1755,45 @@ msgstr ""
 "Здається, скановані файли у теках є тотожними, але програма не перевіряла "
 "їхній вміст."
 
-#: meld/dirdiff.py:1077
+#: meld/dirdiff.py:1081
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Використано фільтри файлів, тому сканування виконувалося не для усіх файлів."
 
-#: meld/dirdiff.py:1079
+#: meld/dirdiff.py:1083
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Використано текстові фільтри, що могли замаскувати відмінності у вмісті "
 "файлів."
 
-#: meld/dirdiff.py:1095 meld/filediff.py:1917
+#: meld/dirdiff.py:1099 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Приховати"
 
-#: meld/dirdiff.py:1097 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/dirdiff.py:1101 meld/filediff.py:1919 meld/filediff.py:1949
 #: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Сховати"
 
-#: meld/dirdiff.py:1106
+#: meld/dirdiff.py:1110
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Під час сканування цієї теки було виявлено декілька помилок"
 
-#: meld/dirdiff.py:1107
+#: meld/dirdiff.py:1111
 msgid "Files with invalid encodings found"
 msgstr "Знайдено файли із некоректним кодуванням"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1109
+#: meld/dirdiff.py:1113
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Кодування деяких файлів є помилковим. Назви десь такі:"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1115
 msgid "Files hidden by case insensitive comparison"
 msgstr "Файли приховано нечутливим до регістру порівнянням"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1117
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1792,17 +1801,17 @@ msgstr ""
 "Ви виконуєте нечутливе до регістру порівняння в чутливій до регістру "
 "файловій системі. Вказані нижче рядки у цій теці приховано:"
 
-#: meld/dirdiff.py:1124
+#: meld/dirdiff.py:1128
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "«{first_file}» приховано «{second_file}»"
 
-#: meld/dirdiff.py:1183
+#: meld/dirdiff.py:1187
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Замінити теку «%s»?"
 
-#: meld/dirdiff.py:1185
+#: meld/dirdiff.py:1189
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1811,11 +1820,11 @@ msgstr ""
 "У «%s» вже існує інша тека з такою ж назвою.\n"
 "Якщо ви замістите наявну теку, усі файли у ній буде втрачено."
 
-#: meld/dirdiff.py:1198
+#: meld/dirdiff.py:1202
 msgid "Error copying file"
 msgstr "Помилка під час копіювання файла"
 
-#: meld/dirdiff.py:1199
+#: meld/dirdiff.py:1203
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1828,11 +1837,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1224 meld/vcview.py:764
+#: meld/dirdiff.py:1228 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Помилка під час спроби вилучити {}"
 
-#: meld/dirdiff.py:1715
+#: meld/dirdiff.py:1756
 msgid "No folder"
 msgstr "Немає теки"
 

From ada76642f4184c957d640ab824f4d693101632f5 Mon Sep 17 00:00:00 2001
From: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Thu, 3 Mar 2022 11:59:15 +0100
Subject: [PATCH 053/116] Updated Spanish translation

---
 po/es.po | 104 +++++++++++++++++++++++++++----------------------------
 1 file changed, 51 insertions(+), 53 deletions(-)

diff --git a/po/es.po b/po/es.po
index 13ed149e..b2bad86f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,21 +9,22 @@
 #
 # Luisa Ceron <luisacerpe@gmail.com>, 2016.
 # Daniel Mustieles <daniel.mustieles@gmail.com>, 2011-2022.
+# Daniel Mustieles García <daniel.mustieles@gmail.com>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld.master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-01-30 21:55+0000\n"
-"PO-Revision-Date: 2022-02-07 13:12+0100\n"
-"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
+"POT-Creation-Date: 2022-02-28 21:56+0000\n"
+"PO-Revision-Date: 2022-03-03 11:58+0100\n"
+"Last-Translator: Daniel Mustieles García <daniel.mustieles@gmail.com>\n"
 "Language-Team: Spanish - Spain <gnome-es-list@gnome.org>\n"
 "Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Gtranslator 41.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
 #: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
@@ -1014,51 +1015,57 @@ msgid "_Compare selected files"
 msgstr "_Comparar los archivos seleccionados"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+#| msgid "_Compare selected files"
+msgid "_Mark selected file"
+msgstr "Marcar el archivo seleccionado"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+#| msgid "_Compare selected files"
+msgid "Compare _with marked file"
+msgstr "_Comparar _con el archivo marcado"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "Copiar a la _izquierda"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "Copiar a la _derecha"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "_Eliminar seleccionados"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "Contraer recursivamente"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "Expandir recursivamente"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "A_brir externamente"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "_Copiar rutas de archivos"
 
 #: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
 #: meld/resources/ui/dirdiff.ui:117
-#| msgid "Save file in this pane"
 msgid "Select folder to open in this pane"
 msgstr "Seleccione la carpeta que abrir en éste panel"
 
 #: meld/resources/ui/dirdiff.ui:43
-#| msgid "Folder"
 msgid "Folder 1"
 msgstr "Carpeta 1"
 
 #: meld/resources/ui/dirdiff.ui:84
-#| msgid "Folder"
 msgid "Folder 2"
 msgstr "Carpeta 2"
 
 #: meld/resources/ui/dirdiff.ui:125
-#| msgid "Folder"
 msgid "Folder 3"
 msgstr "Carpeta 3"
 
@@ -1123,7 +1130,6 @@ msgid "Open Containing Folder"
 msgstr "Abrir la carpeta contenedora"
 
 #: meld/resources/ui/filediff-menus.ui:58
-#| msgid "_Copy File Paths"
 msgid "Copy Full Path"
 msgstr "Copiar la ruta completa"
 
@@ -1161,7 +1167,7 @@ msgstr "Fila 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:556
+#: meld/dirdiff.py:558
 msgid "Name"
 msgstr "Nombre"
 
@@ -1201,7 +1207,7 @@ msgstr "Ajustada"
 msgid "Replace _All"
 msgstr "Reemplazar _todo"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1180 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1184 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "_Reemplazar"
 
@@ -1307,12 +1313,10 @@ msgid "Path"
 msgstr "Ruta"
 
 #: meld/resources/ui/path-label.ui:62
-#| msgid "_Copy File Paths"
 msgid "Copy Path"
 msgstr "Copiar ruta"
 
 #: meld/resources/ui/path-label.ui:78
-#| msgid "Open File"
 msgid "Open Folder"
 msgstr "Abrir carpeta"
 
@@ -1592,7 +1596,7 @@ msgstr "Los cambios se perderán permanentemente si no los guarda."
 msgid "Close _without Saving"
 msgstr "Cerrar _sin guardar"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1179
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1183
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -1626,7 +1630,6 @@ msgid "Delete"
 msgstr "Eliminar"
 
 #: meld/resources/ui/vcview-menus.ui:37
-#| msgid "Next Conflict"
 msgid "Resolve Conflict"
 msgstr "Resolver conflicto"
 
@@ -1639,7 +1642,6 @@ msgid "Commit…"
 msgstr "Efectuar…"
 
 #: meld/resources/ui/vcview.ui:38
-#| msgid "Push current change to the left"
 msgid "Pull remote changes to the local repository"
 msgstr "Descargar cambios remotos en el repositorio local"
 
@@ -1664,7 +1666,6 @@ msgid "Mark as resolved in version control"
 msgstr "Marcar como resuelto en el control de versiones"
 
 #: meld/resources/ui/vcview.ui:140
-#| msgid "Only one version control system found in this folder"
 msgid "Open version controlled folder in this pane"
 msgstr "Abrir carpeta controlada por versión en este panel"
 
@@ -1705,54 +1706,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:577 meld/preferences.py:132
+#: meld/dirdiff.py:579 meld/preferences.py:132
 msgid "Size"
 msgstr "Tamaño"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:585 meld/preferences.py:133
+#: meld/dirdiff.py:587 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Hora de modificación"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:593 meld/preferences.py:134
-#| msgid "Modification time"
+#: meld/dirdiff.py:595 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Hora de modificación (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:601 meld/preferences.py:135
+#: meld/dirdiff.py:603 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Permisos"
 
-#: meld/dirdiff.py:851
+#: meld/dirdiff.py:855
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (analizando…)"
 
-#: meld/dirdiff.py:883 meld/dirdiff.py:915
+#: meld/dirdiff.py:887 meld/dirdiff.py:919
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Analizando {folder}"
 
-#: meld/dirdiff.py:1051
+#: meld/dirdiff.py:1055
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Hecho"
 
-#: meld/dirdiff.py:1064
+#: meld/dirdiff.py:1068
 msgid "Folder {} is being compared to itself"
 msgstr "La carpeta {} se está comparando consigo misma"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1074
 msgid "Folders have no differences"
 msgstr "No hay diferencias entre las carpetas"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1076
 msgid "Contents of scanned files in folders are identical."
 msgstr "El contenido de los archivos analizados en carpetas es idéntico."
 
-#: meld/dirdiff.py:1074
+#: meld/dirdiff.py:1078
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1760,48 +1760,48 @@ msgstr ""
 "Los archivos analizados en las carpetas parecen idénticos, pero no se ha "
 "analizado el contenido."
 
-#: meld/dirdiff.py:1077
+#: meld/dirdiff.py:1081
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Se están usando filtros de archivos, por lo que no se han analizado todos "
 "los archivos."
 
-#: meld/dirdiff.py:1079
+#: meld/dirdiff.py:1083
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Se están usando filtros de texto, y pueden estar ocultando diferencias entre "
 "archivos."
 
-#: meld/dirdiff.py:1095 meld/filediff.py:1917
+#: meld/dirdiff.py:1099 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Ocultar"
 
-#: meld/dirdiff.py:1097 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/dirdiff.py:1101 meld/filediff.py:1919 meld/filediff.py:1949
 #: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Ocultar"
 
-#: meld/dirdiff.py:1106
+#: meld/dirdiff.py:1110
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Ocurrieron varios errores al escanear esta carpeta"
 
-#: meld/dirdiff.py:1107
+#: meld/dirdiff.py:1111
 msgid "Files with invalid encodings found"
 msgstr "Se encontraron archivos con codificaciones no válidas"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1109
+#: meld/dirdiff.py:1113
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Algunos archivos tienen una codificación incorrecta. Los nombres son como "
 "esto:"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1115
 msgid "Files hidden by case insensitive comparison"
 msgstr "Archivos ocultos por una comparación no sensible a capitalización"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1117
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1810,17 +1810,17 @@ msgstr ""
 "sensible a capitalización. Los siguientes archivos de esta carpeta archivos "
 "están ocultos:"
 
-#: meld/dirdiff.py:1124
+#: meld/dirdiff.py:1128
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "«{first_file}» oculto por «{second_file}»"
 
-#: meld/dirdiff.py:1183
+#: meld/dirdiff.py:1187
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "¿Reemplazar la carpeta «%s»?"
 
-#: meld/dirdiff.py:1185
+#: meld/dirdiff.py:1189
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1829,11 +1829,11 @@ msgstr ""
 "Ya existe otra carpeta con el mismo nombre en «%s».\n"
 "Si reemplaza la carpeta existente, se perderán todos sus archivos."
 
-#: meld/dirdiff.py:1198
+#: meld/dirdiff.py:1202
 msgid "Error copying file"
 msgstr "Error al copiar el archivo"
 
-#: meld/dirdiff.py:1199
+#: meld/dirdiff.py:1203
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1846,11 +1846,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1224 meld/vcview.py:764
+#: meld/dirdiff.py:1228 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Error al eliminar {}"
 
-#: meld/dirdiff.py:1715
+#: meld/dirdiff.py:1756
 msgid "No folder"
 msgstr "No hay ninguna carpeta"
 
@@ -2254,7 +2254,6 @@ msgid "Plain Text"
 msgstr "Texto plano"
 
 #: meld/ui/pathlabel.py:36
-#| msgid "Filename filters"
 msgid "Unnamed file"
 msgstr "Archivo sin nombre"
 
@@ -2363,7 +2362,6 @@ msgid "Not present"
 msgstr "No presente"
 
 #: meld/vc/_vc.py:82
-#| msgid "Scanning %s"
 msgid "Scanning…"
 msgstr "Analizando…"
 

From 1709d0530ae0d4fbd2601169450460243e383d2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=80=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=9D?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B8=D1=9B?=
 <miroslavnikolic@rocketmail.com>
Date: Fri, 4 Mar 2022 04:57:44 +0000
Subject: [PATCH 054/116] Update Serbian translation

---
 po/sr.po | 198 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 109 insertions(+), 89 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index 82f216c4..e3d9f522 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,15 +1,15 @@
 # Serbian translation of meld
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003–2021.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003–2022.
 # This file is distributed under the same license as the meld package.
 # Translators:
 # Данило Шеган <dsegan@gmx.net>
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011–2021.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011–2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-10-08 21:01+0000\n"
-"PO-Revision-Date: 2021-12-30 14:56+0200\n"
+"POT-Creation-Date: 2022-02-28 21:56+0000\n"
+"PO-Revision-Date: 2022-03-04 05:56+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
@@ -849,7 +849,7 @@ msgstr "Исто"
 msgid "New"
 msgstr "Нови"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Измењени"
@@ -858,19 +858,23 @@ msgstr "Измењени"
 msgid "Ignore filename case"
 msgstr "Занемари величину слова назива датотеке"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr "Нормализуј Јуникод путање"
+
+#: meld/resources/gtk/menus.ui:175
 msgid "Normal"
 msgstr "Обично"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Необрађено"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Занемарене"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:190
 msgid "Flatten folders"
 msgstr "Поравнате фасцикле"
 
@@ -992,51 +996,57 @@ msgid "_Compare selected files"
 msgstr "_Упореди изабране датотеке"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+#| msgid "_Compare selected files"
+msgid "_Mark selected file"
+msgstr "_Означи изабране датотеке"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+#| msgid "_Compare selected files"
+msgid "Compare _with marked file"
+msgstr "Упореди _са означеном датотеком"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "Умножи _лево"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "Умножи _десно"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "_Обриши изабрано"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "Скупи дубински"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "Рашири дубински"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "_Отвори спољним"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "_Умножи путање датотека"
 
 #: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
 #: meld/resources/ui/dirdiff.ui:117
-#| msgid "Save file in this pane"
 msgid "Select folder to open in this pane"
 msgstr "Изаберите фасциклу за отварање у овом окну"
 
 #: meld/resources/ui/dirdiff.ui:43
-#| msgid "Folder"
 msgid "Folder 1"
 msgstr "Фасцикла 1"
 
 #: meld/resources/ui/dirdiff.ui:84
-#| msgid "Folder"
 msgid "Folder 2"
 msgstr "Фасцикла 2"
 
 #: meld/resources/ui/dirdiff.ui:125
-#| msgid "Folder"
 msgid "Folder 3"
 msgstr "Фасцикла 3"
 
@@ -1101,7 +1111,6 @@ msgid "Open Containing Folder"
 msgstr "Отвори фасциклу садржаја"
 
 #: meld/resources/ui/filediff-menus.ui:58
-#| msgid "_Copy File Paths"
 msgid "Copy Full Path"
 msgstr "Умножи пуну путању"
 
@@ -1139,7 +1148,7 @@ msgstr "1. датотека"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:530
+#: meld/dirdiff.py:558
 msgid "Name"
 msgstr "Назив"
 
@@ -1179,7 +1188,7 @@ msgstr "Преломљено"
 msgid "Replace _All"
 msgstr "Замени с_ве"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1092 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1184 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "_Замени"
 
@@ -1285,12 +1294,10 @@ msgid "Path"
 msgstr "Путања"
 
 #: meld/resources/ui/path-label.ui:62
-#| msgid "_Copy File Paths"
 msgid "Copy Path"
 msgstr "Умножи путању"
 
 #: meld/resources/ui/path-label.ui:78
-#| msgid "Open File"
 msgid "Open Folder"
 msgstr "Отвори фасциклу"
 
@@ -1566,7 +1573,7 @@ msgstr "Ако не сачувате, измене ће бити трајно и
 msgid "Close _without Saving"
 msgstr "Затвори _без чувања"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1091
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1183
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Откажи"
@@ -1600,7 +1607,6 @@ msgid "Delete"
 msgstr "Обриши"
 
 #: meld/resources/ui/vcview-menus.ui:37
-#| msgid "Next Conflict"
 msgid "Resolve Conflict"
 msgstr "Реши сукоб"
 
@@ -1613,7 +1619,6 @@ msgid "Commit…"
 msgstr "Угради…"
 
 #: meld/resources/ui/vcview.ui:38
-#| msgid "Push current change to the left"
 msgid "Pull remote changes to the local repository"
 msgstr "Повуците удаљене измене у локалну ризницу"
 
@@ -1638,7 +1643,6 @@ msgid "Mark as resolved in version control"
 msgstr "Означите као решено у управљању издањем"
 
 #: meld/resources/ui/vcview.ui:140
-#| msgid "Only one version control system found in this folder"
 msgid "Open version controlled folder in this pane"
 msgstr "Отворите фасциклу управљану издањем у овом окну"
 
@@ -1679,43 +1683,54 @@ msgid "Mac OS (CR)"
 msgstr "Мек ОС (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:551 meld/preferences.py:132
+#: meld/dirdiff.py:579 meld/preferences.py:132
 msgid "Size"
 msgstr "Величина"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:559 meld/preferences.py:133
+#: meld/dirdiff.py:587 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Време измене"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:595 meld/preferences.py:134
+#| msgid "Modification time"
+msgid "Modification time (ISO)"
+msgstr "Време измене (ISO)"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:567 meld/preferences.py:134
+#: meld/dirdiff.py:603 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Овлашћења"
 
-#: meld/dirdiff.py:803 meld/dirdiff.py:827
+#: meld/dirdiff.py:855
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (скенирам…)"
+
+#: meld/dirdiff.py:887 meld/dirdiff.py:919
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Скенирам „{folder}“"
 
-#: meld/dirdiff.py:967
+#: meld/dirdiff.py:1055
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Готово"
 
-#: meld/dirdiff.py:976
+#: meld/dirdiff.py:1068
 msgid "Folder {} is being compared to itself"
 msgstr "Фасцикла „{}“ је упоређена са самом собом"
 
-#: meld/dirdiff.py:982
+#: meld/dirdiff.py:1074
 msgid "Folders have no differences"
 msgstr "Фасцикле се не разликују"
 
-#: meld/dirdiff.py:984
+#: meld/dirdiff.py:1076
 msgid "Contents of scanned files in folders are identical."
 msgstr "Садржаји прегледаних датотека у фасциклама су исти."
 
-#: meld/dirdiff.py:986
+#: meld/dirdiff.py:1078
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1723,42 +1738,42 @@ msgstr ""
 "Прегледане датотеке у фасциклама изгледа да су исте, али садржај није "
 "прегледан."
 
-#: meld/dirdiff.py:989
+#: meld/dirdiff.py:1081
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Филтери датотека су у употреби, тако да нису све датотеке прегледане."
 
-#: meld/dirdiff.py:991
+#: meld/dirdiff.py:1083
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Филтери текста су у употреби и можда су замаскирали разлике садржаја."
 
-#: meld/dirdiff.py:1007 meld/filediff.py:1907
+#: meld/dirdiff.py:1099 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Сакриј"
 
-#: meld/dirdiff.py:1009 meld/filediff.py:1909 meld/filediff.py:1939
-#: meld/filediff.py:1941 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1101 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Сакриј"
 
-#: meld/dirdiff.py:1018
+#: meld/dirdiff.py:1110
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Дошло је до више грешака за време претраживања ове фасцикле"
 
-#: meld/dirdiff.py:1019
+#: meld/dirdiff.py:1111
 msgid "Files with invalid encodings found"
 msgstr "Пронађене су датотеке са неисправним кодирањем"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1021
+#: meld/dirdiff.py:1113
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Неке датотеке бејаху у неисправном кодирању. Називи су нешто као:"
 
-#: meld/dirdiff.py:1023
+#: meld/dirdiff.py:1115
 msgid "Files hidden by case insensitive comparison"
 msgstr "Датотеке скривене поређењем неосетљивим на величину слова"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1025
+#: meld/dirdiff.py:1117
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1766,17 +1781,17 @@ msgstr ""
 "Покренули сте поређење независно од величине слова на систему датотека где "
 "је она битна. Неке датотеке нису видљиве:"
 
-#: meld/dirdiff.py:1036
+#: meld/dirdiff.py:1128
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "„{first_file}“ је скривена од стране „{second_file}“"
 
-#: meld/dirdiff.py:1095
+#: meld/dirdiff.py:1187
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Да заменим фасциклу „%s“?"
 
-#: meld/dirdiff.py:1097
+#: meld/dirdiff.py:1189
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1785,11 +1800,11 @@ msgstr ""
 "Фасцикла са истим називом већ постоји у „%s“.\n"
 "Ако замените постојећу фасциклу, све датотеке у њој биће изгубљене."
 
-#: meld/dirdiff.py:1110
+#: meld/dirdiff.py:1202
 msgid "Error copying file"
 msgstr "Грешка умножавања датотеке"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1203
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1802,11 +1817,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1136 meld/vcview.py:764
+#: meld/dirdiff.py:1228 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Грешка брисања {}"
 
-#: meld/dirdiff.py:1626
+#: meld/dirdiff.py:1756
 msgid "No folder"
 msgstr "Нема фасцикле"
 
@@ -1839,56 +1854,56 @@ msgstr "Откажи"
 msgid "Mark _Resolved"
 msgstr "Означи _решеним"
 
-#: meld/filediff.py:1589
+#: meld/filediff.py:1591
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Дошло је до проблема отварања датотеке „%s“."
 
-#: meld/filediff.py:1598
+#: meld/filediff.py:1600
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Изгледа да је „%s“ извршна датотека."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1602
 msgid "Do you want to open the file using the default application?"
 msgstr "Да ли желите да отворите датотеку користећи основни програм?"
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1604
 msgid "Open"
 msgstr "Отвори"
 
-#: meld/filediff.py:1616
+#: meld/filediff.py:1626
 #, python-format
 msgid "[%s] Merging files"
 msgstr "Обједињујем датотеке [%s]"
 
-#: meld/filediff.py:1630
+#: meld/filediff.py:1640
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "Срачунавам разлике [%s]"
 
-#: meld/filediff.py:1690
+#: meld/filediff.py:1700
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Датотека „%s“ је измењена на диску"
 
-#: meld/filediff.py:1691
+#: meld/filediff.py:1701
 msgid "Do you want to reload the file?"
 msgstr "Да ли желите поново да учитате датотеку?"
 
-#: meld/filediff.py:1693
+#: meld/filediff.py:1703
 msgid "_Reload"
 msgstr "_Учитај поново"
 
-#: meld/filediff.py:1863
+#: meld/filediff.py:1873
 msgid "File {} is being compared to itself"
 msgstr "Датотека „{}“ је упоређена са самом собом"
 
-#: meld/filediff.py:1872
+#: meld/filediff.py:1882
 msgid "Files are identical"
 msgstr "Датотеке су истоветне"
 
-#: meld/filediff.py:1885
+#: meld/filediff.py:1895
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1896,11 +1911,11 @@ msgstr ""
 "Коришћени су филтери текста, а могу постојати и замаскиране разлике између "
 "датотека. Да ли желите да поредите неиздвојене датотеке?"
 
-#: meld/filediff.py:1890
+#: meld/filediff.py:1900
 msgid "Files differ in line endings only"
 msgstr "Датотеке се разликују само по завршецима редова"
 
-#: meld/filediff.py:1892
+#: meld/filediff.py:1902
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1909,15 +1924,15 @@ msgstr ""
 "Датотеке су истоветне али се разликују само по завршецима редова:\n"
 "%s"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1922
 msgid "Show without filters"
 msgstr "Приказује без филтера"
 
-#: meld/filediff.py:1934
+#: meld/filediff.py:1944
 msgid "Change highlighting incomplete"
 msgstr "Истицање измена није довршено"
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1945
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1925,19 +1940,19 @@ msgstr ""
 "Неке измене нису истакнуте зато што су превелике. Можете да приморате Мелд "
 "да продужи са истицањем већих измена, иако то може бити споро."
 
-#: meld/filediff.py:1943
+#: meld/filediff.py:1953
 msgid "Keep highlighting"
 msgstr "Задржите истицање"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1955
 msgid "_Keep highlighting"
 msgstr "_Задржи истицање"
 
-#: meld/filediff.py:1958
+#: meld/filediff.py:1968
 msgid "Saving failed"
 msgstr "Чување није успело"
 
-#: meld/filediff.py:1959
+#: meld/filediff.py:1969
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1945,36 +1960,36 @@ msgstr ""
 "Размотрите умножавање свих ризичних измена у други програм или датотеку да "
 "избегнете губитак података."
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:1978
 msgid "Save Left Pane As"
 msgstr "Сачувај леву површ као"
 
-#: meld/filediff.py:1970
+#: meld/filediff.py:1980
 msgid "Save Middle Pane As"
 msgstr "Сачувај средњу површ као"
 
-#: meld/filediff.py:1972
+#: meld/filediff.py:1982
 msgid "Save Right Pane As"
 msgstr "Сачувај десну површ као"
 
-#: meld/filediff.py:1983
+#: meld/filediff.py:1993
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Датотека „%s“ је измењена на диску након отварања"
 
-#: meld/filediff.py:1985
+#: meld/filediff.py:1995
 msgid "If you save it, any external changes will be lost."
 msgstr "Ако је сачувате, све спољне измене ће бити изгубљене."
 
-#: meld/filediff.py:1988
+#: meld/filediff.py:1998
 msgid "Save Anyway"
 msgstr "Ипак сачувај"
 
-#: meld/filediff.py:1989
+#: meld/filediff.py:1999
 msgid "Don’t Save"
 msgstr "Немој чувати"
 
-#: meld/filediff.py:2031
+#: meld/filediff.py:2041
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1982,7 +1997,7 @@ msgstr ""
 "Датотека „{}“ садржи знакове који се не могу кодирати употребом њеног "
 "тренутног кодирања „{}“."
 
-#: meld/filediff.py:2035 meld/patchdialog.py:138
+#: meld/filediff.py:2045 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1991,16 +2006,16 @@ msgstr ""
 "Не могу да сачувам датотеку због следећег:\n"
 "%s"
 
-#: meld/filediff.py:2039 meld/patchdialog.py:137
+#: meld/filediff.py:2049 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Не могу да сачувам датотеку „%s“."
 
-#: meld/filediff.py:2440
+#: meld/filediff.py:2450
 msgid "Live comparison updating disabled"
 msgstr "Искључено је живо ажурирање поређења"
 
-#: meld/filediff.py:2441
+#: meld/filediff.py:2451
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2158,7 +2173,7 @@ msgstr "Назив датотеке"
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Потребне су три датотеке за само-спајање, добих: %r"
 
-#: meld/meldwindow.py:403
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Не могу да поредим мешавину датотека и фасцикли"
 
@@ -2205,7 +2220,6 @@ msgid "Plain Text"
 msgstr "Обичан текст"
 
 #: meld/ui/pathlabel.py:36
-#| msgid "Filename filters"
 msgid "Unnamed file"
 msgstr "Неименована датотека"
 
@@ -2317,6 +2331,12 @@ msgstr "Недостаје"
 msgid "Not present"
 msgstr "Није присутно"
 
+#: meld/vc/_vc.py:82
+#, fuzzy
+#| msgid "Scanning %s"
+msgid "Scanning…"
+msgstr "Прегледам…"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
 #: meld/vcview.py:334

From ca2dcda53b9181f10073532891e6df26835a4912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=80=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=9D?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B8=D1=9B?=
 <miroslavnikolic@rocketmail.com>
Date: Fri, 4 Mar 2022 05:22:02 +0000
Subject: [PATCH 055/116] Update Serbian translation

---
 po/sr.po | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index e3d9f522..00135f51 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
 "POT-Creation-Date: 2022-02-28 21:56+0000\n"
-"PO-Revision-Date: 2022-03-04 05:56+0200\n"
+"PO-Revision-Date: 2022-03-04 06:20+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
@@ -2332,7 +2332,6 @@ msgid "Not present"
 msgstr "Није присутно"
 
 #: meld/vc/_vc.py:82
-#, fuzzy
 #| msgid "Scanning %s"
 msgid "Scanning…"
 msgstr "Прегледам…"

From 741fd2f0d9e77f412a3d99a2d2db6a3392401583 Mon Sep 17 00:00:00 2001
From: Enrico Nicoletto <hiko@duck.com>
Date: Fri, 4 Mar 2022 23:01:01 +0000
Subject: [PATCH 056/116] Update Brazilian Portuguese translation

---
 po/pt_BR.po | 94 +++++++++++++++++++++++++++++------------------------
 1 file changed, 51 insertions(+), 43 deletions(-)

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2fca3eca..028088c7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,24 +8,24 @@
 # Leonardo Ferreira Fontenelle <leonardof@gnome.org>, 2008.
 # Gabriel Speckhahn <gabspeck@gmail.com>, 2011.
 # Florêncio Neves <florencioneves@gmail.com>, 2012.
-# Enrico Nicoletto <liverig@gmail.com>, 2013, 2018-2021.
 # Rafael Fontenelle <rafaelff@gnome.org>, 2013-2021.
 # Matheus Barbosa <mdpb.matheus@gmail.com>, 2022.
+# Enrico Nicoletto <hiko@duck.com>, 2013, 2018-2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-01-30 21:55+0000\n"
-"PO-Revision-Date: 2022-01-31 14:23-0300\n"
-"Last-Translator: Matheus Barbosa <mdpb.matheus@gmail.com>\n"
+"POT-Creation-Date: 2022-02-28 21:56+0000\n"
+"PO-Revision-Date: 2022-03-04 19:59-0300\n"
+"Last-Translator: Enrico Nicoletto <hiko@duck.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-"X-Generator: Gtranslator 40.0\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 3.0.1\n"
 "X-Project-Style: gnome\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
@@ -913,7 +913,7 @@ msgstr ""
 "Leonardo Ferreira Fontenelle <leonardof@gnome.org>\n"
 "Gabriel Speckhahn <gabspeck@gmail.com>\n"
 "Florêncio Neves <florencioneves@gmail.com>\n"
-"Enrico Nicoletto <liverig@gmail.com>\n"
+"Enrico Nicoletto <hiko@duck.com>\n"
 "Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Reginaldo Izidório <misteregis@gmail.com>\n"
 "Matheus Barbosa <mdpb.matheus@gmail.com>"
@@ -1020,30 +1020,38 @@ msgid "_Compare selected files"
 msgstr "_Comparar arquivos selecionados"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+msgid "_Mark selected file"
+msgstr "_Marcar arquivo selecionado"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Compare _with marked file"
+msgstr "Comparar c_om arquivo selecionado"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "Copiar para a _esquerda"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "Copiar para a _direita"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "E_xcluir selecionados"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "Recolher recursivamente"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "Expandir recursivamente"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "_Abrir externamente"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "_Copiar caminhos de arquivos"
 
@@ -1162,7 +1170,7 @@ msgstr "Arquivo 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:556
+#: meld/dirdiff.py:558
 msgid "Name"
 msgstr "Nome"
 
@@ -1202,7 +1210,7 @@ msgstr "Voltou ao início"
 msgid "Replace _All"
 msgstr "Substituir _todos"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1180 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1184 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "_Substituir"
 
@@ -1590,7 +1598,7 @@ msgstr "Se você não salvar, as mudanças serão perdidas permanentemente."
 msgid "Close _without Saving"
 msgstr "_Fechar sem salvar"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1179
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1183
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -1700,53 +1708,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:577 meld/preferences.py:132
+#: meld/dirdiff.py:579 meld/preferences.py:132
 msgid "Size"
 msgstr "Tamanho"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:585 meld/preferences.py:133
+#: meld/dirdiff.py:587 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Hora da modificação"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:593 meld/preferences.py:134
+#: meld/dirdiff.py:595 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Hora da modificação (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:601 meld/preferences.py:135
+#: meld/dirdiff.py:603 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Permissões"
 
-#: meld/dirdiff.py:851
+#: meld/dirdiff.py:855
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (escaneando…)"
 
-#: meld/dirdiff.py:883 meld/dirdiff.py:915
+#: meld/dirdiff.py:887 meld/dirdiff.py:919
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Escaneando {folder}"
 
-#: meld/dirdiff.py:1051
+#: meld/dirdiff.py:1055
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Concluído"
 
-#: meld/dirdiff.py:1064
+#: meld/dirdiff.py:1068
 msgid "Folder {} is being compared to itself"
 msgstr "Pasta {} sendo comparada consigo própria"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1074
 msgid "Folders have no differences"
 msgstr "As pastas têm nenhuma diferença"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1076
 msgid "Contents of scanned files in folders are identical."
 msgstr "Conteúdos de arquivos verificados em pastas são idênticos."
 
-#: meld/dirdiff.py:1074
+#: meld/dirdiff.py:1078
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1754,48 +1762,48 @@ msgstr ""
 "Arquivos verificados em pastas parecem ser idênticos, mas conteúdos não "
 "foram verificados."
 
-#: meld/dirdiff.py:1077
+#: meld/dirdiff.py:1081
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Filtros de arquivo estão em uso, portanto nem todos os arquivos foram "
 "verificados."
 
-#: meld/dirdiff.py:1079
+#: meld/dirdiff.py:1083
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Filtros de texto estão sendo usados e podem estar escondendo diferenças no "
 "conteúdo."
 
-#: meld/dirdiff.py:1095 meld/filediff.py:1917
+#: meld/dirdiff.py:1099 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Ocultar"
 
-#: meld/dirdiff.py:1097 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/dirdiff.py:1101 meld/filediff.py:1919 meld/filediff.py:1949
 #: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "Ocu_ltar"
 
-#: meld/dirdiff.py:1106
+#: meld/dirdiff.py:1110
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Ocorreram vários erros ao escanear este diretório"
 
-#: meld/dirdiff.py:1107
+#: meld/dirdiff.py:1111
 msgid "Files with invalid encodings found"
 msgstr "Arquivos com codificações inválidas encontrados"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1109
+#: meld/dirdiff.py:1113
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Alguns arquivos estavam com uma codificação incorreta. Os nomes são algo "
 "como:"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1115
 msgid "Files hidden by case insensitive comparison"
 msgstr "Arquivos ocultos pela comparação não sensível a maiusculização"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1117
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1804,17 +1812,17 @@ msgstr ""
 "minúsculas em um sistema de arquivos que diferencia. Os seguintes arquivos "
 "neste diretório ficam ocultos:"
 
-#: meld/dirdiff.py:1124
+#: meld/dirdiff.py:1128
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}” ocultado por “{second_file}”"
 
-#: meld/dirdiff.py:1183
+#: meld/dirdiff.py:1187
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Substituir pasta “%s”?"
 
-#: meld/dirdiff.py:1185
+#: meld/dirdiff.py:1189
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1823,11 +1831,11 @@ msgstr ""
 "Uma outra pasta com o mesmo nome já existe em “%s”.\n"
 "Se você substituir a pasta existente, todos os arquivos nela serão perdidos."
 
-#: meld/dirdiff.py:1198
+#: meld/dirdiff.py:1202
 msgid "Error copying file"
 msgstr "Erro ao copiar arquivo"
 
-#: meld/dirdiff.py:1199
+#: meld/dirdiff.py:1203
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1840,11 +1848,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1224 meld/vcview.py:764
+#: meld/dirdiff.py:1228 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Erro ao excluir {}"
 
-#: meld/dirdiff.py:1715
+#: meld/dirdiff.py:1756
 msgid "No folder"
 msgstr "Nenhum pasta"
 

From cc38cb7c43d3047978da254d08ef4d59c008e9da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Sun, 6 Mar 2022 12:30:40 +0100
Subject: [PATCH 057/116] Update Polish translation

---
 po/pl.po | 84 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 46 insertions(+), 38 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 5756f12e..7720633a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-01-30 21:55+0000\n"
-"PO-Revision-Date: 2022-02-06 12:08+0100\n"
+"POT-Creation-Date: 2022-02-28 21:56+0000\n"
+"PO-Revision-Date: 2022-03-06 12:30+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -1012,30 +1012,38 @@ msgid "_Compare selected files"
 msgstr "_Porównaj zaznaczone pliki"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+msgid "_Mark selected file"
+msgstr "O_znacz zaznaczony plik"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Compare _with marked file"
+msgstr "Poró_wnaj z oznaczonym plikiem"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "S_kopiuj element na lewo"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "Sk_opiuj element na prawo"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "_Usuń zaznaczone"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "Zwiń rekursywnie"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "Rozwiń rekursywnie"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "_Otwórz zewnętrznie"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "Skopiuj ś_cieżki do plików"
 
@@ -1153,7 +1161,7 @@ msgstr "1. plik"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:556
+#: meld/dirdiff.py:558
 msgid "Name"
 msgstr "Nazwa"
 
@@ -1193,7 +1201,7 @@ msgstr "Automatyczny powrót do początku"
 msgid "Replace _All"
 msgstr "Zamień _wszystkie"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1180 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1184 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "Z_amień"
 
@@ -1581,7 +1589,7 @@ msgstr ""
 msgid "Close _without Saving"
 msgstr "Zamknij _bez zapisywania"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1179
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1183
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Anuluj"
@@ -1691,53 +1699,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:577 meld/preferences.py:132
+#: meld/dirdiff.py:579 meld/preferences.py:132
 msgid "Size"
 msgstr "Rozmiar"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:585 meld/preferences.py:133
+#: meld/dirdiff.py:587 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Czas modyfikacji"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:593 meld/preferences.py:134
+#: meld/dirdiff.py:595 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Czas modyfikacji (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:601 meld/preferences.py:135
+#: meld/dirdiff.py:603 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: meld/dirdiff.py:851
+#: meld/dirdiff.py:855
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (skanowanie…)"
 
-#: meld/dirdiff.py:883 meld/dirdiff.py:915
+#: meld/dirdiff.py:887 meld/dirdiff.py:919
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Skanowanie {folder}"
 
-#: meld/dirdiff.py:1051
+#: meld/dirdiff.py:1055
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Ukończono"
 
-#: meld/dirdiff.py:1064
+#: meld/dirdiff.py:1068
 msgid "Folder {} is being compared to itself"
 msgstr "Katalog {} jest porównywany z samym sobą"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1074
 msgid "Folders have no differences"
 msgstr "Katalogi się nie różnią"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1076
 msgid "Contents of scanned files in folders are identical."
 msgstr "Treść zeskanowanych plików w katalogach jest identyczna."
 
-#: meld/dirdiff.py:1074
+#: meld/dirdiff.py:1078
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1745,44 +1753,44 @@ msgstr ""
 "Zeskanowane pliki wydają się identyczne, ale treść mogła nie zostać "
 "zeskanowana."
 
-#: meld/dirdiff.py:1077
+#: meld/dirdiff.py:1081
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Filtry plików są używane, więc nie wszystkie pliki zostały zeskanowane."
 
-#: meld/dirdiff.py:1079
+#: meld/dirdiff.py:1083
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Filtry tekstowe są używane i mogą ukrywać różnice między plikami."
 
-#: meld/dirdiff.py:1095 meld/filediff.py:1917
+#: meld/dirdiff.py:1099 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Ukryj"
 
-#: meld/dirdiff.py:1097 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/dirdiff.py:1101 meld/filediff.py:1919 meld/filediff.py:1949
 #: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Ukryj"
 
-#: meld/dirdiff.py:1106
+#: meld/dirdiff.py:1110
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Wystąpiło wiele błędów podczas skanowania tego katalogu"
 
-#: meld/dirdiff.py:1107
+#: meld/dirdiff.py:1111
 msgid "Files with invalid encodings found"
 msgstr "Odnaleziono pliki z nieprawidłowym kodowaniem znaków"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1109
+#: meld/dirdiff.py:1113
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Niektóre pliki mają nieprawidłowe kodowanie znaków. Nazwy tych plików to:"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1115
 msgid "Files hidden by case insensitive comparison"
 msgstr "Pliku ukryte przez porównywanie bez uwzględniania wielkości liter"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1117
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1791,17 +1799,17 @@ msgstr ""
 "w systemie plików, który rozróżnia wielkość liter. Następujące pliki w tym "
 "katalogu zostały ukryte:"
 
-#: meld/dirdiff.py:1124
+#: meld/dirdiff.py:1128
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "„{first_file}” ukryty przez „{second_file}”"
 
-#: meld/dirdiff.py:1183
+#: meld/dirdiff.py:1187
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Zastąpić katalog „%s”?"
 
-#: meld/dirdiff.py:1185
+#: meld/dirdiff.py:1189
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1811,11 +1819,11 @@ msgstr ""
 "Zastąpienie istniejącego katalogu spowoduje utratę wszystkich plików w nim "
 "zawartych."
 
-#: meld/dirdiff.py:1198
+#: meld/dirdiff.py:1202
 msgid "Error copying file"
 msgstr "Błąd podczas kopiowania pliku"
 
-#: meld/dirdiff.py:1199
+#: meld/dirdiff.py:1203
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1828,11 +1836,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1224 meld/vcview.py:764
+#: meld/dirdiff.py:1228 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Błąd podczas usuwania {}"
 
-#: meld/dirdiff.py:1715
+#: meld/dirdiff.py:1756
 msgid "No folder"
 msgstr "Brak katalogu"
 

From 47f36a533702912d14de6a11da58f1ccf2634409 Mon Sep 17 00:00:00 2001
From: Jordi Mas <jmas@softcatala.org>
Date: Sun, 6 Mar 2022 14:56:19 +0100
Subject: [PATCH 058/116] Update Catalan translation

---
 po/ca.po | 262 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 122 insertions(+), 140 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index b64e5afe..ab2f27bb 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,12 +7,12 @@
 # Pere Orga <pere@orga.cat>, 2012.
 # Joan Coll i Teixidor <jcoll2@gmail.com>, 2014.
 # Jordi Serratosa <jordis@softcatala.cat>, 2017.
-# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2021
+# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2021, 2022
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-10-08 21:01+0000\n"
+"POT-Creation-Date: 2022-02-28 21:56+0000\n"
 "PO-Revision-Date: 2014-10-13 00:01+0200\n"
 "Last-Translator: Jordi Mas i Hernàndez <jmas@softcatala.org>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -95,13 +95,12 @@ msgid "Prefer application-wide dark theme"
 msgstr "Prefereix el tema fosc per a tota l'aplicació"
 
 #: data/org.gnome.meld.gschema.xml:59
-#, fuzzy
 msgid ""
 "If true, the GTK dark theme variant will be used, if available. Note that "
 "this is separate from the syntax highlighting scheme."
 msgstr ""
 "Si és cert, s'utilitzarà la variant del tema fosc GTK, si està disponible. "
-"Tingueu en compte que això està separat de l'esquema de ressaltat de "
+"Tingueu en compte que això és independent de l'esquema de ressaltat de "
 "sintaxi."
 
 #: data/org.gnome.meld.gschema.xml:65
@@ -109,16 +108,15 @@ msgid "Additional automatically detected text encodings"
 msgstr "Codificacions de text addicionals detectades automàticament"
 
 #: data/org.gnome.meld.gschema.xml:66
-#, fuzzy
 msgid ""
 "Meld will use these text encodings to try to decode loaded text files before"
 " trying any other encodings. In addition to the encodings in this list, "
 "UTF-8 and the current locale-default encoding will always be used; other "
 "encodings may also be tried, depending on the user’s locale."
 msgstr ""
-"Meld utilitzarà aquestes codificacions de text per intentar descodificar els"
-" fitxers de text carregats abans de provar qualsevol altra codificació. A "
-"més de les codificacions d'aquesta llista, sempre s'utilitzarà UTF-8 i la "
+"Meld utilitzarà aquestes codificacions de text per a intentar descodificar "
+"els fitxers de text carregats abans de provar qualsevol altra codificació. A"
+" més de les codificacions d'aquesta llista, sempre s'utilitzaran UTF-8 i la "
 "codificació actual per defecte de la configuració regional; també es poden "
 "provar altres codificacions, depenent de la configuració regional de "
 "l'usuari."
@@ -235,17 +233,15 @@ msgstr ""
 "d'acord amb la descripció de tipus de lletra de la Pango."
 
 #: data/org.gnome.meld.gschema.xml:133
-#, fuzzy
 msgid "Show overview source map"
-msgstr "Mostra el mapa de fonts de visió general"
+msgstr "Mostra la vista general del mapa d'origen"
 
 #: data/org.gnome.meld.gschema.xml:134
-#, fuzzy
 msgid ""
 "If true, file comparisons will have paired source maps for compared files."
 msgstr ""
 "Si és «true» (cert), les comparacions de fitxers tindran mapes d'origen "
-"parells per als fitxers comparats."
+"emparellats per als fitxers comparats."
 
 #: data/org.gnome.meld.gschema.xml:139
 msgid "Style of overview map"
@@ -272,15 +268,11 @@ msgid "Use the system default editor"
 msgstr "Utilitza l'editor per defecte del sistema"
 
 #: data/org.gnome.meld.gschema.xml:155
-#, fuzzy
-#| msgid ""
-#| "If false, the defined custom editor will be used instead of the system "
-#| "editor when opening files externally."
 msgid ""
 "If false, custom-editor-command will be used instead of the system editor "
 "when opening files externally."
 msgstr ""
-"Si és fals, s'utilitzarà l'editor de editor personalitzat en comptes de "
+"Si és fals, s'utilitzarà l'editor personalitzat definit en comptes de "
 "l'editor del sistema quan s'obrin els fitxers externament."
 
 #: data/org.gnome.meld.gschema.xml:159
@@ -340,12 +332,6 @@ msgid "File timestamp resolution"
 msgstr "Resolució de la marca de temps del fitxer"
 
 #: data/org.gnome.meld.gschema.xml:182
-#, fuzzy
-#| msgid ""
-#| "When comparing based on mtime, this is the minimum difference in nanoseconds"
-#| " between two files before they're considered to have different mtimes. This "
-#| "is useful when comparing files between filesystems with different timestamp "
-#| "resolution."
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds"
 " between two files before they’re considered to have different mtimes. This "
@@ -354,7 +340,7 @@ msgid ""
 msgstr ""
 "Quan es compara basant-se en mtime, aquesta és la diferència mínima en "
 "nanosegons entre dos fitxers abans que es consideri que tenen diferents "
-"hores. Això és útil quan es comparen fitxers entre sistemes de fitxers amb "
+"mtime. Això és útil quan es comparen fitxers entre sistemes de fitxers amb "
 "una resolució de marca horària diferent."
 
 #: data/org.gnome.meld.gschema.xml:186 meld/resources/ui/preferences.ui:852
@@ -362,7 +348,6 @@ msgid "Apply text filters during folder comparisons"
 msgstr "Aplica els filtres de text durant les comparacions de carpetes"
 
 #: data/org.gnome.meld.gschema.xml:187
-#, fuzzy
 msgid ""
 "If true, folder comparisons that compare file contents also apply active "
 "text filters and the blank line trimming option, and ignore newline "
@@ -370,7 +355,7 @@ msgid ""
 msgstr ""
 "Si és «true» (cert), les comparacions de carpetes que comparen el contingut "
 "dels fitxers també apliquen els filtres de text actius i l'opció de retallar"
-" la línia en blanc, i ignoren les diferències de la línia nova."
+" línies en blanc, i ignoren les diferències de la línia nova."
 
 #: data/org.gnome.meld.gschema.xml:191
 msgid "File status filters"
@@ -430,11 +415,6 @@ msgstr ""
 "tres fitxers"
 
 #: data/org.gnome.meld.gschema.xml:214
-#, fuzzy
-#| msgid ""
-#| "Choices for file order are remote/merge/local and local/merged/remote. This "
-#| "preference only affects three-way comparisons launched from the version "
-#| "control view, so is used solely for merges/conflict resolution within Meld."
 msgid ""
 "Choices for file order are remote/merged/local and local/merged/remote. This"
 " preference only affects three-way comparisons launched from the version "
@@ -463,9 +443,6 @@ msgid "Margin column in commit message editor"
 msgstr "La columna del marge en l'editor de missatges de publicació"
 
 #: data/org.gnome.meld.gschema.xml:224
-#, fuzzy
-#| msgid ""
-#| "The column of the margin is at in the version control commit message editor."
 msgid ""
 "The column at which to show the margin in the version control commit message"
 " editor."
@@ -478,10 +455,6 @@ msgid "Automatically hard-wrap commit messages"
 msgstr "Força l'ajust automàtic de línia en missatges de publicació"
 
 #: data/org.gnome.meld.gschema.xml:229
-#, fuzzy
-#| msgid ""
-#| "If true, the version control commit message editor will hard-wrap (i.e., "
-#| "insert line breaks) at the defined commit margin before commit."
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the commit margin before commit."
@@ -519,11 +492,6 @@ msgid "Text-based filters"
 msgstr "Filtres basats en text"
 
 #: data/org.gnome.meld.gschema.xml:264
-#, fuzzy
-#| msgid ""
-#| "List of predefined text-based regex filters that, if active, will remove "
-#| "text from being used in a file comparison. The text will still be displayed,"
-#| " but won't contribute to the comparison itself."
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed,"
@@ -908,7 +876,7 @@ msgstr "Iguals"
 msgid "New"
 msgstr "Nou"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Modificat"
@@ -917,19 +885,23 @@ msgstr "Modificat"
 msgid "Ignore filename case"
 msgstr "Ignora les majúscules i minúscules del nom de fitxer"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr "Normalitza els camins Unicode"
+
+#: meld/resources/gtk/menus.ui:175
 msgid "Normal"
 msgstr "Normal"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Sense versió"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Ignorat"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:190
 msgid "Flatten folders"
 msgstr "Aplana les carpetes"
 
@@ -1053,30 +1025,38 @@ msgid "_Compare selected files"
 msgstr "_Compara els fitxers seleccionats"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+msgid "_Mark selected file"
+msgstr "_Marca el fitxer seleccionat"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Compare _with marked file"
+msgstr "_Compara amb el fitxer marcat"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "C_opia a l'esquerra"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "_Copia a la dreta"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "_Suprimeix els seleccionats"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "Col·lapsa recursivament"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "Expandeix recursivament"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "_Obre externament"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "_Copia els camins del fitxer"
 
@@ -1154,15 +1134,12 @@ msgid "_Paste"
 msgstr "E_nganxa"
 
 #: meld/resources/ui/filediff-menus.ui:54
-#, fuzzy
 msgid "Open Containing Folder"
 msgstr "Obre la carpeta contenidora"
 
 #: meld/resources/ui/filediff-menus.ui:58
-#, fuzzy
-#| msgid "_Copy File Paths"
 msgid "Copy Full Path"
-msgstr "_Copia els camins del fitxer"
+msgstr "Copia el camí complet"
 
 #: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
 #: meld/resources/ui/filediff.ui:169
@@ -1197,7 +1174,7 @@ msgstr "Fitxer 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:530
+#: meld/dirdiff.py:558
 msgid "Name"
 msgstr "Nom"
 
@@ -1237,7 +1214,7 @@ msgstr "Ajustat"
 msgid "Replace _All"
 msgstr "Reemplaça-ho _tot"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1092 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1184 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "_Reemplaça"
 
@@ -1629,7 +1606,7 @@ msgstr "Si no ho deseu, els canvis es perdran definitivament."
 msgid "Close _without Saving"
 msgstr "Tanca _sense desar"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1091
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1183
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Cancel·la"
@@ -1739,43 +1716,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:551 meld/preferences.py:132
+#: meld/dirdiff.py:579 meld/preferences.py:132
 msgid "Size"
 msgstr "Mida"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:559 meld/preferences.py:133
+#: meld/dirdiff.py:587 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Hora de modificació"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:595 meld/preferences.py:134
+msgid "Modification time (ISO)"
+msgstr "Hora de modificació (ISO)"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:567 meld/preferences.py:134
+#: meld/dirdiff.py:603 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Permisos"
 
-#: meld/dirdiff.py:803 meld/dirdiff.py:827
+#: meld/dirdiff.py:855
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (s'està escanejant…)"
+
+#: meld/dirdiff.py:887 meld/dirdiff.py:919
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] S'està escanejant {folder}"
 
-#: meld/dirdiff.py:967
+#: meld/dirdiff.py:1055
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Fet"
 
-#: meld/dirdiff.py:976
+#: meld/dirdiff.py:1068
 msgid "Folder {} is being compared to itself"
 msgstr "S'està comparant la carpeta {} amb ella mateixa"
 
-#: meld/dirdiff.py:982
+#: meld/dirdiff.py:1074
 msgid "Folders have no differences"
 msgstr "Les carpetes no tenen diferències"
 
-#: meld/dirdiff.py:984
+#: meld/dirdiff.py:1076
 msgid "Contents of scanned files in folders are identical."
 msgstr "El contingut dels fitxers escanejats a les carpetes és idèntic."
 
-#: meld/dirdiff.py:986
+#: meld/dirdiff.py:1078
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1783,51 +1770,51 @@ msgstr ""
 "Els fitxers escanejats en carpetes semblen idèntics, però els continguts no "
 "s'han escanejat."
 
-#: meld/dirdiff.py:989
+#: meld/dirdiff.py:1081
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Els filtres de fitxers estan en ús, de manera que no s'han escanejat tots "
 "els fitxers."
 
-#: meld/dirdiff.py:991
+#: meld/dirdiff.py:1083
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Els filtres de text estan en ús i poden estar emmascarant diferències de "
 "contingut."
 
-#: meld/dirdiff.py:1007 meld/filediff.py:1907
+#: meld/dirdiff.py:1099 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Amaga"
 
-#: meld/dirdiff.py:1009 meld/filediff.py:1909 meld/filediff.py:1939
-#: meld/filediff.py:1941 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1101 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "A_maga"
 
-#: meld/dirdiff.py:1018
+#: meld/dirdiff.py:1110
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "S'ha produït més d'un error en analitzar aquesta carpeta"
 
-#: meld/dirdiff.py:1019
+#: meld/dirdiff.py:1111
 msgid "Files with invalid encodings found"
 msgstr "S'han trobat fitxers amb codificacions no vàlides"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1021
+#: meld/dirdiff.py:1113
 msgid ""
 "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Alguns fitxers tenien una codificació incorrecta. Els noms són alguna cosa "
 "com:"
 
-#: meld/dirdiff.py:1023
+#: meld/dirdiff.py:1115
 msgid "Files hidden by case insensitive comparison"
 msgstr ""
 "Fitxers amagats per la comparació que no té en compte les "
 "majúscules/minúscules"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1025
+#: meld/dirdiff.py:1117
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1836,17 +1823,17 @@ msgstr ""
 " un sistema de fitxers que sí que les diferencia. S'han amagat els fitxers "
 "següents d'aquesta carpeta:"
 
-#: meld/dirdiff.py:1036
+#: meld/dirdiff.py:1128
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "«{first_file}» ocultat per «{second_file}»"
 
-#: meld/dirdiff.py:1095
+#: meld/dirdiff.py:1187
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Voleu reemplaçar la carpeta «%s»?"
 
-#: meld/dirdiff.py:1097
+#: meld/dirdiff.py:1189
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1855,11 +1842,11 @@ msgstr ""
 "Ja existeix una altra carpeta amb el mateix nom a «%s».\n"
 "Si substituïu la carpeta existent, es perdran tots els fitxers que hi hagi."
 
-#: meld/dirdiff.py:1110
+#: meld/dirdiff.py:1202
 msgid "Error copying file"
 msgstr "S'ha produït un error en copiar el fitxer"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1203
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1872,11 +1859,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1136 meld/vcview.py:764
+#: meld/dirdiff.py:1228 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Error en suprimir {}"
 
-#: meld/dirdiff.py:1626
+#: meld/dirdiff.py:1756
 msgid "No folder"
 msgstr "Sense carpeta"
 
@@ -1885,16 +1872,12 @@ msgid "Comparison results will be inaccurate"
 msgstr "Els resultats de comparació seran inexactes"
 
 #: meld/filediff.py:1151
-#, fuzzy
-#| msgid ""
-#| "Filter '%s' changed the number of lines in the file. Comparison will be "
-#| "incorrect. See the user manual for more details."
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
 msgstr ""
-"Un filtre ha canviat el nombre de línies del fitxer, que no és compatible. "
-"La comparació no serà precisa."
+"Un filtre ha canviat el nombre de línies del fitxer, quelcom no admès. La "
+"comparació no serà precisa."
 
 #: meld/filediff.py:1223
 msgid "Mark conflict as resolved?"
@@ -1914,56 +1897,56 @@ msgstr "Cancel·la"
 msgid "Mark _Resolved"
 msgstr "Marca com a _resolt"
 
-#: meld/filediff.py:1589
+#: meld/filediff.py:1591
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "S'ha produït un problema en obrir el fitxer «%s»."
 
-#: meld/filediff.py:1598
+#: meld/filediff.py:1600
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "El fitxer %s sembla ser un fitxer binari."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1602
 msgid "Do you want to open the file using the default application?"
 msgstr "Voleu obrir el fitxer utilitzant l'aplicació predeterminada?"
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1604
 msgid "Open"
 msgstr "Obre"
 
-#: meld/filediff.py:1616
+#: meld/filediff.py:1626
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] S'estan fusionant els fitxers"
 
-#: meld/filediff.py:1630
+#: meld/filediff.py:1640
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] S'estan calculant les diferències"
 
-#: meld/filediff.py:1690
+#: meld/filediff.py:1700
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "El fitxer %s ha canviat en el disc"
 
-#: meld/filediff.py:1691
+#: meld/filediff.py:1701
 msgid "Do you want to reload the file?"
 msgstr "Voleu carregar el fitxer de nou?"
 
-#: meld/filediff.py:1693
+#: meld/filediff.py:1703
 msgid "_Reload"
 msgstr "Torna a _carregar-lo"
 
-#: meld/filediff.py:1863
+#: meld/filediff.py:1873
 msgid "File {} is being compared to itself"
 msgstr "El fitxer {} s'està comparant amb ell mateix"
 
-#: meld/filediff.py:1872
+#: meld/filediff.py:1882
 msgid "Files are identical"
 msgstr "Els fitxers són idèntics"
 
-#: meld/filediff.py:1885
+#: meld/filediff.py:1895
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1971,11 +1954,11 @@ msgstr ""
 "S'estan fent servir filtres de text i potser s'estan emmascarant les "
 "diferències entre fitxers. Voleu comparar els fitxers sense filtrar?"
 
-#: meld/filediff.py:1890
+#: meld/filediff.py:1900
 msgid "Files differ in line endings only"
 msgstr "Els fitxers només difereixen en els finals de línia"
 
-#: meld/filediff.py:1892
+#: meld/filediff.py:1902
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1984,15 +1967,15 @@ msgstr ""
 "Els fitxers són idèntics excepte pels finals de línia que són diferents:\n"
 "%s"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1922
 msgid "Show without filters"
 msgstr "Mostra sense filtres"
 
-#: meld/filediff.py:1934
+#: meld/filediff.py:1944
 msgid "Change highlighting incomplete"
 msgstr "El ressaltat dels canvis és incomplet"
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1945
 msgid ""
 "Some changes were not highlighted because they were too large. You can force"
 " Meld to take longer to highlight larger changes, though this may be slow."
@@ -2000,19 +1983,19 @@ msgstr ""
 "Algunes diferències no s'han ressaltat perquè eren molt grans. Podeu forçar "
 "el Meld perquè ressalti els canvis grans, encara que el pugui alentir."
 
-#: meld/filediff.py:1943
+#: meld/filediff.py:1953
 msgid "Keep highlighting"
 msgstr "Mantén el ressaltat"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1955
 msgid "_Keep highlighting"
 msgstr "_Mantén el ressaltat"
 
-#: meld/filediff.py:1958
+#: meld/filediff.py:1968
 msgid "Saving failed"
 msgstr "Ha fallat el desament"
 
-#: meld/filediff.py:1959
+#: meld/filediff.py:1969
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -2020,44 +2003,44 @@ msgstr ""
 "Considereu copiar qualsevol canvi crític a un altre programa o fitxer per a "
 "evitar la pèrdua de dades."
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:1978
 msgid "Save Left Pane As"
 msgstr "Anomena i desa la subfinestra esquerra"
 
-#: meld/filediff.py:1970
+#: meld/filediff.py:1980
 msgid "Save Middle Pane As"
 msgstr "Anomena i desa la subfinestra del mig"
 
-#: meld/filediff.py:1972
+#: meld/filediff.py:1982
 msgid "Save Right Pane As"
 msgstr "Anomena i desa la subfinestra dreta"
 
-#: meld/filediff.py:1983
+#: meld/filediff.py:1993
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "El fitxer %s ha canviat des que s'ha obert"
 
-#: meld/filediff.py:1985
+#: meld/filediff.py:1995
 msgid "If you save it, any external changes will be lost."
 msgstr "Si el deseu, es perdrà qualsevol canvi extern."
 
-#: meld/filediff.py:1988
+#: meld/filediff.py:1998
 msgid "Save Anyway"
 msgstr "Desa de totes maneres"
 
-#: meld/filediff.py:1989
+#: meld/filediff.py:1999
 msgid "Don’t Save"
 msgstr "No desis"
 
-#: meld/filediff.py:2031
+#: meld/filediff.py:2041
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
 msgstr ""
-"El fitxer «{}» conté caràcters que no es poden codificar amb la "
-"codificació actual «{}»."
+"El fitxer «{}» conté caràcters que no es poden codificar amb la codificació "
+"actual «{}»."
 
-#: meld/filediff.py:2035 meld/patchdialog.py:138
+#: meld/filediff.py:2045 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2066,16 +2049,16 @@ msgstr ""
 "No s'ha pogut desar el fitxer a causa de:\n"
 "%s"
 
-#: meld/filediff.py:2039 meld/patchdialog.py:137
+#: meld/filediff.py:2049 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "No s'ha pogut desar el fitxer %s."
 
-#: meld/filediff.py:2440
+#: meld/filediff.py:2450
 msgid "Live comparison updating disabled"
 msgstr "Desactivada l'actualització automàtica de la comparació"
 
-#: meld/filediff.py:2441
+#: meld/filediff.py:2451
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will"
@@ -2211,14 +2194,13 @@ msgid "Error reading saved comparison file"
 msgstr "S'ha produït un error en llegir el fitxer de comparació desat"
 
 #: meld/meldapp.py:334
-#, fuzzy, python-format
+#, python-format
 msgid "invalid path or URI “%s”"
-msgstr "el camí o l'URI «%s» no són vàlids"
+msgstr "camí o URI «%s» no vàlids"
 
 #: meld/meldapp.py:341
-#, fuzzy
 msgid "remote folder “{}” not supported"
-msgstr "no s'admet la carpeta remota “{}”"
+msgstr "no s'admet la carpeta remota «{}»"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
 #: meld/meldbuffer.py:115
@@ -2239,7 +2221,7 @@ msgid "Need three files to auto-merge, got: %r"
 msgstr ""
 "Necessiteu tres fitxers per a fusionar automàticament, s'ha obtingut: %r"
 
-#: meld/meldwindow.py:403
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "No es pot comparar una barreja de fitxers i directoris"
 
@@ -2272,11 +2254,10 @@ msgid "Version control:"
 msgstr "Control de versions:"
 
 #: meld/style.py:91
-#, fuzzy
 msgid "Couldn’t find colour scheme details for {}; this is a bad install"
 msgstr ""
-"No s'han pogut trobar els detalls de l'esquema de color per a {}; això és "
-"una instal·lació incorrecta"
+"No s'han pogut trobar els detalls de l'esquema de color per a {}; aquesta és"
+" una instal·lació defectuosa"
 
 #: meld/ui/bufferselectors.py:110
 #, python-brace-format
@@ -2288,7 +2269,6 @@ msgid "Plain Text"
 msgstr "Text pla"
 
 #: meld/ui/pathlabel.py:36
-#, fuzzy
 msgid "Unnamed file"
 msgstr "Fitxer sense nom"
 
@@ -2334,12 +2314,10 @@ msgid "Mode changed from {old_mode} to {new_mode}"
 msgstr "S'ha canviat el mode de {old_mode} a {new_mode}"
 
 #: meld/vc/git.py:353
-#, fuzzy
 msgid "Partially staged"
-msgstr "Parcialment esglaonat"
+msgstr "Parcialment staged"
 
 #: meld/vc/git.py:353
-#, fuzzy
 msgid "Staged"
 msgstr "Staged"
 
@@ -2398,6 +2376,10 @@ msgstr "Perdut"
 msgid "Not present"
 msgstr "No hi és"
 
+#: meld/vc/_vc.py:82
+msgid "Scanning…"
+msgstr "S'està escanejant…"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
 #: meld/vcview.py:334

From e6eae2f5c00ceba9f34b044c1a7a07018da8f8e8 Mon Sep 17 00:00:00 2001
From: Roberto Vidal <vidal.roberto.j@gmail.com>
Date: Sat, 5 Mar 2022 11:00:52 +0100
Subject: [PATCH 059/116] [FIX] Improve synchronization points

---
 help/C/syncpoints.page              |  58 ++++++++
 meld/filediff.py                    | 196 ++++++++++++++++++++++++++--
 meld/resources/ui/filediff-menus.ui |  12 ++
 3 files changed, 255 insertions(+), 11 deletions(-)
 create mode 100644 help/C/syncpoints.page

diff --git a/help/C/syncpoints.page b/help/C/syncpoints.page
new file mode 100644
index 00000000..1dc0ce11
--- /dev/null
+++ b/help/C/syncpoints.page
@@ -0,0 +1,58 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="syncpoints">
+<info>
+  <title type="sort">2</title>
+  <link type="guide" xref="index#file-mode"/>
+  <revision docversion="1.6" status="draft"/>
+  <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  <credit type="author copyright">
+    <name>Kai Willadsen</name>
+    <email>kai.willadsen@gmail.com</email>
+    <years>2012</years>
+  </credit>
+</info>
+
+<title>Synchronization Points</title>
+
+<p>
+Synchronization points help <app>Meld</app> perform a more fine-grained comparison between your files. When a synchronization point is added to each file, <app>Meld</app> effectively performs two comparisons: one for the chunk above the synchronization point and another for the one below.
+</p>
+
+<p>
+To add a synchronization point, click on a line and then right-click and select <gui style="menu">Add Synchronization Point</gui>. Repeat this with each file in your comparison and the synchronization points will match each other and TODO
+</p>
+
+<note>
+  <p>
+    All actions related to synchronization points are also accessible from <gui style="menu">Comparison</gui>.
+  </p>
+</note>
+
+<p>
+You can add successive synchronization points and subdivide your files even further by repeating the steps above. Note that synchronization points are matched to each other in the order they appear in the text, which might not correspond to the order they were created.
+</p>
+
+<p>
+To remove all synchronization points from a comparison, right-click anywhere in the file and select <gui style="menu">Clear Synchronization Points</gui>.
+</p>
+
+
+<section id="dangling-syncpoints">
+<title>Dangling and matched syncpoints</title>
+
+<p>
+A synchronization point is "dangling" if it has not been matched yet to other files. For instance, if you have 1 synchronization point in each file, they are all matched together and affect the comparison. If you now add a synchronization point to the first file, it is dangling until we add a second synchronization point to the rest of the files.
+</p>
+
+<p>
+Dangling synchronization points can be moved around: click on a different line, and then right-click and select <gui style="menu">Move Synchronization Point</gui>. Dangling synchronization points can be removed: click on the line where it was set, right-click and select <gui style="menu">Remove Synchronization Point</gui>.
+</p>
+
+<p>
+Matched synchronization points can be removed as well. Note that removing a matched synchronization point also removes its siblings in the other files. To remove a matched synchronization point, click on the line where it is set, then right-click and select <gui style="menu">Remove Synchronization Point</gui>.
+</p>
+
+</section>
+
+</page>
diff --git a/meld/filediff.py b/meld/filediff.py
index 436fabf8..e0b0aabf 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -221,6 +221,8 @@ class FileDiff(Gtk.VBox, MeldDoc):
         default=False,
     )
 
+    ADD_SYNCPOINT_OFFSET = 10
+
     def __init__(
         self,
         num_panes,
@@ -281,7 +283,11 @@ def __init__(
         self._sync_hscroll_lock = False
         self.linediffer = self.differ()
         self.force_highlight = False
-        self.syncpoints = []
+
+        def get_mark_line(pane, mark):
+            return self.textbuffer[pane].get_iter_at_mark(mark).get_line()
+
+        self.syncpoints = Syncpoints(num_panes, get_mark_line)
         self.in_nested_textview_gutter_expose = False
         self._cached_match = CachedSequenceMatcher(self.scheduler)
 
@@ -313,6 +319,7 @@ def __init__(
         # Manually handle GAction additions
         actions = (
             ('add-sync-point', self.add_sync_point),
+            ('remove-sync-point', self.remove_sync_point),
             ('clear-sync-point', self.clear_sync_points),
             ('copy', self.action_copy),
             ('copy-full-path', self.action_copy_full_path),
@@ -363,6 +370,18 @@ def __init__(
         self.popup_menu = Gtk.Menu.new_from_model(context_menu)
         self.popup_menu.attach_to_widget(self)
 
+        popup_options = self.popup_menu.get_children()
+
+        offset = FileDiff.ADD_SYNCPOINT_OFFSET
+        self.add_sync_point_opt = popup_options[offset]
+        self.move_sync_point_opt = popup_options[offset + 1]
+        self.match_sync_point_opt = popup_options[offset + 2]
+        self.remove_sync_point_opt = popup_options[offset + 3]
+
+        self.popup_menu.remove(self.move_sync_point_opt)
+        self.popup_menu.remove(self.match_sync_point_opt)
+        self.popup_menu.remove(self.remove_sync_point_opt)
+
         builder = Gtk.Builder.new_from_resource(
             '/org/gnome/meld/ui/filediff-actions.ui')
         self.toolbar_actions = builder.get_object('view-toolbar')
@@ -1390,6 +1409,9 @@ def on_textview_popup_menu(self, textview):
         rect.x, rect.y = textview.buffer_to_window_coords(
             Gtk.TextWindowType.WIDGET, location.x, location.y)
 
+        pane = self.textview.index(textview)
+        self.set_syncpoint_menuitem(pane)
+
         self.popup_menu.popup_at_rect(
             Gtk.Widget.get_window(textview),
             rect,
@@ -1403,10 +1425,47 @@ def on_textview_popup_menu(self, textview):
     def on_textview_button_press_event(self, textview, event):
         if event.button == 3:
             textview.grab_focus()
+            pane = self.textview.index(textview)
+            self.set_syncpoint_menuitem(pane)
             self.popup_menu.popup_at_pointer(event)
             return True
         return False
 
+    def set_syncpoint_menuitem(self, pane):
+        state = self.syncpoints.pane_sync_state(pane)
+
+        popup_options = self.popup_menu.get_children()
+        current_option = popup_options[FileDiff.ADD_SYNCPOINT_OFFSET]
+        next_option = None
+
+        if state == Syncpoints.DANGLING:
+            next_option = self.move_sync_point_opt
+        elif state == Syncpoints.MATCHED:
+            next_option = self.add_sync_point_opt
+        elif state == Syncpoints.SHORT:
+            next_option = self.match_sync_point_opt
+
+        if state == Syncpoints.MATCHED:
+            mark = self.textbuffer[pane].get_insert()
+            if self.syncpoints.can_delete_matched_at(pane, mark):
+                next_option = self.remove_sync_point_opt
+
+        elif state == Syncpoints.DANGLING:
+            mark = self.textbuffer[pane].get_insert()
+            action = self.syncpoints.can_move_at(pane, mark)
+
+            if action == Syncpoints.CAN_DELETE:
+                next_option = self.remove_sync_point_opt
+            else:
+                next_option.set_sensitive(bool(action))
+
+        if next_option is not current_option:
+            self.popup_menu.insert(
+                next_option,
+                FileDiff.ADD_SYNCPOINT_OFFSET + 1
+            )
+            self.popup_menu.remove(current_option)
+
     def set_labels(self, labels):
         labels = labels[:self.num_panes]
         for label, buf in zip(labels, self.textbuffer):
@@ -2409,18 +2468,24 @@ def delete_chunk(self, src, chunk):
 
     @with_focused_pane
     def add_sync_point(self, pane, *args):
-        # Find a non-complete syncpoint, or create a new one
-        if self.syncpoints and None in self.syncpoints[-1]:
-            syncpoint = self.syncpoints.pop()
-        else:
-            syncpoint = [None] * self.num_panes
         cursor_it = self.textbuffer[pane].get_iter_at_mark(
             self.textbuffer[pane].get_insert())
-        syncpoint[pane] = self.textbuffer[pane].create_mark(None, cursor_it)
-        self.syncpoints.append(syncpoint)
 
+        self.syncpoints.add(
+            pane,
+            self.textbuffer[pane].create_mark(None, cursor_it)
+        )
+
+        self.refresh_sync_points()
+
+    @with_focused_pane
+    def remove_sync_point(self, pane, *args):
+        self.syncpoints.remove(pane, self.textbuffer[pane].get_insert())
+        self.refresh_sync_points()
+
+    def refresh_sync_points(self):
         for i, t in enumerate(self.textview[:self.num_panes]):
-            t.syncpoints = [p[i] for p in self.syncpoints if p[i] is not None]
+            t.syncpoints = self.syncpoints.points(i)
 
         def make_line_retriever(pane, marks):
             buf = self.textbuffer[pane]
@@ -2430,7 +2495,8 @@ def get_line_for_mark():
                 return buf.get_iter_at_mark(mark).get_line()
             return get_line_for_mark
 
-        valid_points = [p for p in self.syncpoints if all(p)]
+        valid_points = self.syncpoints.valid_points()
+
         if valid_points and self.num_panes == 2:
             self.linediffer.syncpoints = [
                 ((make_line_retriever(1, p), make_line_retriever(0, p)), )
@@ -2442,6 +2508,8 @@ def get_line_for_mark():
                  (make_line_retriever(1, p), make_line_retriever(2, p)))
                 for p in valid_points
             ]
+        elif not valid_points:
+            self.linediffer.syncpoints = []
 
         if valid_points:
             for mgr in self.msgarea_mgr:
@@ -2458,7 +2526,7 @@ def get_line_for_mark():
         self.refresh_comparison()
 
     def clear_sync_points(self, *args):
-        self.syncpoints = []
+        self.syncpoints.clear()
         self.linediffer.syncpoints = []
         for t in self.textview:
             t.syncpoints = []
@@ -2469,3 +2537,109 @@ def clear_sync_points(self, *args):
 
 
 FileDiff.set_css_name('meld-file-diff')
+
+
+class Syncpoints:
+    # The state of a pane with all its syncpoints matched
+    MATCHED = "matched"
+    # The state of a pane waiting to be matched to existing syncpoints
+    # in other panes
+    SHORT = "short"
+    # The state of a pane with a dangling syncpoint, not yet matched
+    # across all panes
+    DANGLING = "DANGLING"
+
+    # The state of a line when a dangling syncpoint can be moved to it
+    CAN_MOVE = "can_move"
+    # The state of a line where a dangling syncpoint sits
+    CAN_DELETE = "can_delete"
+
+    def __init__(self, num_panes, get_line):
+        self._num_panes = num_panes
+        self._points = [[] for p in range(0, num_panes)]
+        self._get_line = get_line
+
+    def add(self, pane_idx, point):
+        pane_state = self.pane_sync_state(pane_idx)
+
+        if pane_state == Syncpoints.DANGLING:
+            self._points[pane_idx].pop()
+
+        self._points[pane_idx].append(point)
+
+        lengths = set(len(p) for p in self._points)
+
+        if len(lengths) == 1:
+            for (i, p) in enumerate(self._points):
+                p.sort(key=lambda point: self._get_line(i, point))
+
+    def remove(self, pane_idx, cursor_point):
+        line = self._get_line(pane_idx, cursor_point)
+
+        index = None
+
+        for (i, point) in enumerate(self._points[pane_idx]):
+            if self._get_line(pane_idx, point) == line:
+                index = i
+                break
+
+        if index is None:
+            return
+
+        pane_state = self.pane_sync_state(pane_idx)
+
+        if pane_state == Syncpoints.MATCHED:
+            for pane in self._points:
+                pane.pop(index)
+        elif pane_state == Syncpoints.DANGLING:
+            self._points[pane_idx].pop()
+
+    def clear(self):
+        self._points = [[] for _i in range(0, self._num_panes)]
+
+    def points(self, pane_idx):
+        return self._points[pane_idx].copy()
+
+    def can_move_at(self, pane_idx, mark):
+        target_line = self._get_line(pane_idx, mark)
+        pane_syncpoints = self._points[pane_idx]
+
+        if self._get_line(pane_idx, pane_syncpoints[-1]) == target_line:
+            return Syncpoints.CAN_DELETE
+
+        for syncpoint in pane_syncpoints[:-1]:
+            if self._get_line(pane_idx, syncpoint) == target_line:
+                return None
+
+        return Syncpoints.CAN_MOVE
+
+    def can_delete_matched_at(self, pane_idx, mark):
+        target_line = self._get_line(pane_idx, mark)
+        return any(
+            self._get_line(pane_idx, syncpoint) == target_line
+            for syncpoint in self._points[pane_idx]
+        )
+
+    def valid_points(self):
+        num_matched = min(len(p) for p in self._points)
+
+        if not num_matched:
+            return []
+
+        matched = [p[:num_matched] for p in self._points]
+
+        return [
+            tuple(matched_point[i] for matched_point in matched)
+            for i in range(0, num_matched)
+        ]
+
+    def pane_sync_state(self, pane_idx):
+        lengths = set(len(points) for points in self._points)
+
+        if len(lengths) == 1:
+            return Syncpoints.MATCHED
+
+        if len(self._points[pane_idx]) == min(lengths):
+            return Syncpoints.SHORT
+        else:
+            return Syncpoints.DANGLING
diff --git a/meld/resources/ui/filediff-menus.ui b/meld/resources/ui/filediff-menus.ui
index 288250f2..bc1fb3cc 100644
--- a/meld/resources/ui/filediff-menus.ui
+++ b/meld/resources/ui/filediff-menus.ui
@@ -65,6 +65,18 @@
         <attribute name="label" translatable="yes">Add Synchronization Point</attribute>
         <attribute name="action">view.add-sync-point</attribute>
       </item>
+      <item>
+        <attribute name="label" translatable="yes">Move Synchronization Point</attribute>
+        <attribute name="action">view.add-sync-point</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Match Synchronization Point</attribute>
+        <attribute name="action">view.add-sync-point</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Remove Synchronization Point</attribute>
+        <attribute name="action">view.remove-sync-point</attribute>
+      </item>
       <item>
         <attribute name="label" translatable="yes">Clear Synchronization Points</attribute>
         <attribute name="action">view.clear-sync-point</attribute>

From 35e67612e0f0f68b5d4c79e6fa45573060a0e736 Mon Sep 17 00:00:00 2001
From: Roberto Vidal <vidal.roberto.j@gmail.com>
Date: Thu, 10 Mar 2022 18:02:16 +0100
Subject: [PATCH 060/116] fix authorship info

---
 help/C/syncpoints.page | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/help/C/syncpoints.page b/help/C/syncpoints.page
index 1dc0ce11..cddf5591 100644
--- a/help/C/syncpoints.page
+++ b/help/C/syncpoints.page
@@ -7,9 +7,9 @@
   <revision docversion="1.6" status="draft"/>
   <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   <credit type="author copyright">
-    <name>Kai Willadsen</name>
-    <email>kai.willadsen@gmail.com</email>
-    <years>2012</years>
+    <name>Roberto Vidal</name>
+    <email>vidal.roberto.j@gmail.com</email>
+    <years>2022</years>
   </credit>
 </info>
 

From 3134f32305d0aea097afb09613563505729b222a Mon Sep 17 00:00:00 2001
From: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date: Thu, 10 Mar 2022 22:43:28 +0000
Subject: [PATCH 061/116] Update Swedish translation

---
 po/sv.po | 94 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 46 insertions(+), 48 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index d2ac86d0..44ae3bdb 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-01-31 07:53+0000\n"
-"PO-Revision-Date: 2022-02-20 21:04+0100\n"
+"POT-Creation-Date: 2022-02-28 21:56+0000\n"
+"PO-Revision-Date: 2022-03-10 23:40+0100\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -1001,30 +1001,38 @@ msgid "_Compare selected files"
 msgstr "_Jämför markerade filer"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+msgid "_Mark selected file"
+msgstr "_Märk markerad fil"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Compare _with marked file"
+msgstr "Jäm_för med märkt fil"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "Kopiera till _vänster"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "Kopiera till _höger"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "_Ta bort markerade"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "Fäll ihop rekursivt"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "Expandera rekursivt"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "Ö_ppna externt"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "_Kopiera filsökvägar"
 
@@ -1142,7 +1150,7 @@ msgstr "Fil ett"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:556
+#: meld/dirdiff.py:558
 msgid "Name"
 msgstr "Namn"
 
@@ -1182,7 +1190,7 @@ msgstr "Radbruten"
 msgid "Replace _All"
 msgstr "Ersätt _alla"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1180 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1184 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "_Ersätt"
 
@@ -1568,7 +1576,7 @@ msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid."
 msgid "Close _without Saving"
 msgstr "Stäng _utan att spara"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1179
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1183
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Avbryt"
@@ -1678,95 +1686,95 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:577 meld/preferences.py:132
+#: meld/dirdiff.py:579 meld/preferences.py:132
 msgid "Size"
 msgstr "Storlek"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:585 meld/preferences.py:133
+#: meld/dirdiff.py:587 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Ändringstid"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:593 meld/preferences.py:134
+#: meld/dirdiff.py:595 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Ändringstid (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:601 meld/preferences.py:135
+#: meld/dirdiff.py:603 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Rättigheter"
 
-#: meld/dirdiff.py:851
+#: meld/dirdiff.py:855
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (söker igenom…)"
 
-#: meld/dirdiff.py:883 meld/dirdiff.py:915
+#: meld/dirdiff.py:887 meld/dirdiff.py:919
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Söker igenom {folder}"
 
-#: meld/dirdiff.py:1051
+#: meld/dirdiff.py:1055
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Klar"
 
-#: meld/dirdiff.py:1064
+#: meld/dirdiff.py:1068
 msgid "Folder {} is being compared to itself"
 msgstr "Mappen {} jämförs med sig själv"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1074
 msgid "Folders have no differences"
 msgstr "Mapparna skiljer sig inte åt"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1076
 msgid "Contents of scanned files in folders are identical."
 msgstr "Innehållet i mapparnas avsökta filer är identiskt."
 
-#: meld/dirdiff.py:1074
+#: meld/dirdiff.py:1078
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 "Mapparnas avsökta filer verkar identiska, men innehållet har inte genomsökts."
 
-#: meld/dirdiff.py:1077
+#: meld/dirdiff.py:1081
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Filfilter används, och därför har inte alla filer genomsökts."
 
-#: meld/dirdiff.py:1079
+#: meld/dirdiff.py:1083
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Textfilter används och kan dölja skillnader i innehåll."
 
-#: meld/dirdiff.py:1095 meld/filediff.py:1917
+#: meld/dirdiff.py:1099 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Dölj"
 
-#: meld/dirdiff.py:1097 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/dirdiff.py:1101 meld/filediff.py:1919 meld/filediff.py:1949
 #: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Dölj"
 
-#: meld/dirdiff.py:1106
+#: meld/dirdiff.py:1110
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Flera fel inträffade vid avsökning av denna mapp"
 
-#: meld/dirdiff.py:1107
+#: meld/dirdiff.py:1111
 msgid "Files with invalid encodings found"
 msgstr "Filer med ogiltiga teckenkodningar hittades"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1109
+#: meld/dirdiff.py:1113
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "En del filer hade en felaktig kodning. Namnen är ungefär:"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1115
 msgid "Files hidden by case insensitive comparison"
 msgstr "Filer dolda av skiftlägeskänslig jämförelse"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1117
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1774,17 +1782,17 @@ msgstr ""
 "Du gör en skiftlägesokänslig jämförelse på ett skiftlägeskänsligt filsystem. "
 "En del filer syns inte:"
 
-#: meld/dirdiff.py:1124
+#: meld/dirdiff.py:1128
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "”{first_file}” dold av ”{second_file}”"
 
-#: meld/dirdiff.py:1183
+#: meld/dirdiff.py:1187
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ersätt mappen ”%s”?"
 
-#: meld/dirdiff.py:1185
+#: meld/dirdiff.py:1189
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1793,11 +1801,11 @@ msgstr ""
 "En annan mapp med samma namn existerar redan i ”%s”.\n"
 "Om du ersätter befintlig mapp kommer alla filer att förloras."
 
-#: meld/dirdiff.py:1198
+#: meld/dirdiff.py:1202
 msgid "Error copying file"
 msgstr "Fel vid filkopiering"
 
-#: meld/dirdiff.py:1199
+#: meld/dirdiff.py:1203
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1810,11 +1818,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1224 meld/vcview.py:764
+#: meld/dirdiff.py:1228 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Fel vid borttagning av {}"
 
-#: meld/dirdiff.py:1715
+#: meld/dirdiff.py:1756
 msgid "No folder"
 msgstr "Ingen mapp"
 
@@ -2500,16 +2508,6 @@ msgstr "Töm"
 #~ msgid "Displayed whitespace"
 #~ msgstr "Visade tomrum"
 
-#
-# Detta är värden för gschema-nycklar, använd \" runt dem
-# http://listor.tp-sv.se/pipermail/tp-sv/2014-July/000779.html
-#~ msgid ""
-#~ "Selector for individual whitespace character types to be shown. Possible "
-#~ "values are 'space', 'tab', 'newline' and 'nbsp'."
-#~ msgstr ""
-#~ "Väljare för individuella tomrumsteckentyper att visa. Möjliga värden är "
-#~ "\"space\", \"tab\", \"newline\" och \"nbsp\"."
-
 #~ msgid "Meld base scheme"
 #~ msgstr "Meld basschema"
 

From ac88778e9b367d475f8c89552224d653207a254f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20=C4=8Cernock=C3=BD?= <marek@manet.cz>
Date: Fri, 11 Mar 2022 10:23:40 +0100
Subject: [PATCH 062/116] Updated Czech translation

---
 po/cs.po | 210 +++++++++++++++++++++++++++----------------------------
 1 file changed, 103 insertions(+), 107 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 299e89fc..58fc01ea 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,14 +4,14 @@
 #
 # Miloslav Trmac <mitr@volny.cz>, 2003, 2004, 2005.
 # Petr Kovar <pknbe@volny.cz>, 2008, 2009, 2010, 2011.
-# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021.
+# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-10-08 21:01+0000\n"
-"PO-Revision-Date: 2021-10-17 20:07+0200\n"
+"POT-Creation-Date: 2022-03-10 22:43+0000\n"
+"PO-Revision-Date: 2022-03-11 10:19+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -853,7 +853,7 @@ msgstr "Stejné"
 msgid "New"
 msgstr "Nové"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Změněné"
@@ -862,19 +862,23 @@ msgstr "Změněné"
 msgid "Ignore filename case"
 msgstr "Ignorovat velikost písmen v názvu souboru"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr "Normalizovat cesty v Unikódu"
+
+#: meld/resources/gtk/menus.ui:175
 msgid "Normal"
 msgstr "Normální"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Neverzováno"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Ignorované"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:190
 msgid "Flatten folders"
 msgstr "Zploštit složky"
 
@@ -995,30 +999,38 @@ msgid "_Compare selected files"
 msgstr "_Porovnat vybrané soubory"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+msgid "_Mark selected file"
+msgstr "Oz_načit vybrané soubory"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Compare _with marked file"
+msgstr "_Porovnat s označenými soubory"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "Kopírovat do_leva"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "Kopírovat dop_rava"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "O_dstranit vybrané"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "Sbalit včetně potomků"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "Rozbalit včetně potomků"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "_Otevřít externě"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "Z_kopírovat cestu k souboru"
 
@@ -1137,7 +1149,7 @@ msgstr "Soubor 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:530
+#: meld/dirdiff.py:558
 msgid "Name"
 msgstr "Název"
 
@@ -1177,7 +1189,7 @@ msgstr "Prošlo přes okraj"
 msgid "Replace _All"
 msgstr "Nahradit _vše"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1092 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1184 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "Nahradi_t"
 
@@ -1563,7 +1575,7 @@ msgstr "Pokud se změny neuloží, budou trvale ztraceny."
 msgid "Close _without Saving"
 msgstr "Zavřít _bez uložení"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1091
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1183
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Zrušit"
@@ -1673,43 +1685,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:551 meld/preferences.py:132
+#: meld/dirdiff.py:579 meld/preferences.py:132
 msgid "Size"
 msgstr "Velikost"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:559 meld/preferences.py:133
+#: meld/dirdiff.py:587 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Čas změny"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:595 meld/preferences.py:134
+msgid "Modification time (ISO)"
+msgstr "Čas změny (ISO)"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:567 meld/preferences.py:134
+#: meld/dirdiff.py:603 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Oprávnění"
 
-#: meld/dirdiff.py:803 meld/dirdiff.py:827
+#: meld/dirdiff.py:855
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (kontroluje se…)"
+
+#: meld/dirdiff.py:887 meld/dirdiff.py:919
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Kontroluje se {folder}"
 
-#: meld/dirdiff.py:967
+#: meld/dirdiff.py:1055
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Hotovo"
 
-#: meld/dirdiff.py:976
+#: meld/dirdiff.py:1068
 msgid "Folder {} is being compared to itself"
 msgstr "Složka {} je porovnávána sama se sebou"
 
-#: meld/dirdiff.py:982
+#: meld/dirdiff.py:1074
 msgid "Folders have no differences"
 msgstr "Mezi složkami není žádný rozdíl"
 
-#: meld/dirdiff.py:984
+#: meld/dirdiff.py:1076
 msgid "Contents of scanned files in folders are identical."
 msgstr "Obsah kontrolovaných souborů ve složkách je stejný."
 
-#: meld/dirdiff.py:986
+#: meld/dirdiff.py:1078
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1717,46 +1739,46 @@ msgstr ""
 "Kontrolované soubory ve složkách vypadají stejně, ale nebyl kontrolován "
 "jejich obsah."
 
-#: meld/dirdiff.py:989
+#: meld/dirdiff.py:1081
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Jsou používány filtry souborů, takže ne všechny soubory byly kontrolovány."
 
-#: meld/dirdiff.py:991
+#: meld/dirdiff.py:1083
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Jsou používány textové filtry a může dojít k zamaskování rozdílů mezi "
 "soubory."
 
-#: meld/dirdiff.py:1007 meld/filediff.py:1907
+#: meld/dirdiff.py:1099 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Skrýt"
 
-#: meld/dirdiff.py:1009 meld/filediff.py:1909 meld/filediff.py:1939
-#: meld/filediff.py:1941 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1101 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Skrýt"
 
-#: meld/dirdiff.py:1018
+#: meld/dirdiff.py:1110
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Při skenování této složky došlo k několika chybám"
 
-#: meld/dirdiff.py:1019
+#: meld/dirdiff.py:1111
 msgid "Files with invalid encodings found"
 msgstr "Nalezeny soubory s neplatným kódováním"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1021
+#: meld/dirdiff.py:1113
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Některé soubory měly neplatné kódování. Názvy jsou přibližně následující:"
 
-#: meld/dirdiff.py:1023
+#: meld/dirdiff.py:1115
 msgid "Files hidden by case insensitive comparison"
 msgstr "Soubory skryty porovnáním nerozlišujícím velikost písmen"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1025
+#: meld/dirdiff.py:1117
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1764,17 +1786,17 @@ msgstr ""
 "Provádí se porovnání nerozlišující velikost písmen na systému souborů "
 "rozlišujícím velikost písmen. Některé soubory v této složce jsou skryté:"
 
-#: meld/dirdiff.py:1036
+#: meld/dirdiff.py:1128
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "„{first_file}“ skryto v „{second_file}“"
 
-#: meld/dirdiff.py:1095
+#: meld/dirdiff.py:1187
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Nahradit složku „%s“?"
 
-#: meld/dirdiff.py:1097
+#: meld/dirdiff.py:1189
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1783,11 +1805,11 @@ msgstr ""
 "V „%s“ již existuje jiná složka se stejným názvem.\n"
 "Pokud stávající složku nahradíte, budou všechny soubory v ní ztraceny."
 
-#: meld/dirdiff.py:1110
+#: meld/dirdiff.py:1202
 msgid "Error copying file"
 msgstr "Chyba při kopírování souboru"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1203
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1800,11 +1822,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1136 meld/vcview.py:764
+#: meld/dirdiff.py:1228 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Chyba při mazání {}"
 
-#: meld/dirdiff.py:1626
+#: meld/dirdiff.py:1756
 msgid "No folder"
 msgstr "Žádná složka"
 
@@ -1837,56 +1859,56 @@ msgstr "Zrušit"
 msgid "Mark _Resolved"
 msgstr "Označi_t za vyřešené"
 
-#: meld/filediff.py:1589
+#: meld/filediff.py:1591
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Vyskytl se problém při otevírání souboru „%s“."
 
-#: meld/filediff.py:1598
+#: meld/filediff.py:1600
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Soubor %s je zřejmě binární."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1602
 msgid "Do you want to open the file using the default application?"
 msgstr "Chcete soubor otevřít pomocí výchozí aplikace?"
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1604
 msgid "Open"
 msgstr "Otevřít"
 
-#: meld/filediff.py:1616
+#: meld/filediff.py:1626
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Slučují se soubory"
 
-#: meld/filediff.py:1630
+#: meld/filediff.py:1640
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Počítají se rozdíly"
 
-#: meld/filediff.py:1690
+#: meld/filediff.py:1700
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Soubor „%s“ byl změněn na disku."
 
-#: meld/filediff.py:1691
+#: meld/filediff.py:1701
 msgid "Do you want to reload the file?"
 msgstr "Chcete soubor znovu načíst?"
 
-#: meld/filediff.py:1693
+#: meld/filediff.py:1703
 msgid "_Reload"
 msgstr "Zno_vu načíst"
 
-#: meld/filediff.py:1863
+#: meld/filediff.py:1873
 msgid "File {} is being compared to itself"
 msgstr "Soubor {} je porovnáván sám se sebou"
 
-#: meld/filediff.py:1872
+#: meld/filediff.py:1882
 msgid "Files are identical"
 msgstr "Soubory jsou stejné"
 
-#: meld/filediff.py:1885
+#: meld/filediff.py:1895
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1894,11 +1916,11 @@ msgstr ""
 "Jsou používány textové filtry a může dojít k zamaskování rozdílů mezi "
 "soubory. Chcete porovnat nefiltrované soubory?"
 
-#: meld/filediff.py:1890
+#: meld/filediff.py:1900
 msgid "Files differ in line endings only"
 msgstr "Soubory se liší pouze zakončením řádků"
 
-#: meld/filediff.py:1892
+#: meld/filediff.py:1902
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1907,15 +1929,15 @@ msgstr ""
 "Soubory jsou shodné, vyjma rozdílného zakončení řádků:\n"
 "%s"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1922
 msgid "Show without filters"
 msgstr "Zobrazit bez filtrů"
 
-#: meld/filediff.py:1934
+#: meld/filediff.py:1944
 msgid "Change highlighting incomplete"
 msgstr "Změnit zvýraznění neúplných"
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1945
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1924,19 +1946,19 @@ msgstr ""
 "přimět k používání větší délky, aby se zvýraznily i rozsáhlé změny, ale může "
 "to pak být pomalé."
 
-#: meld/filediff.py:1943
+#: meld/filediff.py:1953
 msgid "Keep highlighting"
 msgstr "Zachovat zvýrazňování"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1955
 msgid "_Keep highlighting"
 msgstr "Z_achovat zvýrazňování"
 
-#: meld/filediff.py:1958
+#: meld/filediff.py:1968
 msgid "Saving failed"
 msgstr "Ukládání selhalo"
 
-#: meld/filediff.py:1959
+#: meld/filediff.py:1969
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1944,36 +1966,36 @@ msgstr ""
 "Jestli jste provedli nějaký důležité změny, zvažte jejich zkopírování do "
 "jiné aplikace nebo souboru, abyste o ně nepřišli."
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:1978
 msgid "Save Left Pane As"
 msgstr "Uložení levého panelu jako"
 
-#: meld/filediff.py:1970
+#: meld/filediff.py:1980
 msgid "Save Middle Pane As"
 msgstr "Uložení prostředního panelu jako"
 
-#: meld/filediff.py:1972
+#: meld/filediff.py:1982
 msgid "Save Right Pane As"
 msgstr "Uložení pravého panelu jako"
 
-#: meld/filediff.py:1983
+#: meld/filediff.py:1993
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Soubor „%s“ byl od doby, co jste jej otevřeli, změněn."
 
-#: meld/filediff.py:1985
+#: meld/filediff.py:1995
 msgid "If you save it, any external changes will be lost."
 msgstr "Pokud jej uložíte, budou vnější změny ztraceny."
 
-#: meld/filediff.py:1988
+#: meld/filediff.py:1998
 msgid "Save Anyway"
 msgstr "Přesto uložit"
 
-#: meld/filediff.py:1989
+#: meld/filediff.py:1999
 msgid "Don’t Save"
 msgstr "Neukládat"
 
-#: meld/filediff.py:2031
+#: meld/filediff.py:2041
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1981,7 +2003,7 @@ msgstr ""
 "Soubor {} obsahuje znaky, které nelze zakódovat pomocí jeho akuálního "
 "kódování „{}“."
 
-#: meld/filediff.py:2035 meld/patchdialog.py:138
+#: meld/filediff.py:2045 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1990,16 +2012,16 @@ msgstr ""
 "Nezdařilo se uložit soubor z důvodu:\n"
 "%s"
 
-#: meld/filediff.py:2039 meld/patchdialog.py:137
+#: meld/filediff.py:2049 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Nezdařilo se uložit soubor %s."
 
-#: meld/filediff.py:2440
+#: meld/filediff.py:2450
 msgid "Live comparison updating disabled"
 msgstr "Živá aktualizace porovnání zakázána"
 
-#: meld/filediff.py:2441
+#: meld/filediff.py:2451
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2156,7 +2178,7 @@ msgstr "Název souboru"
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Pro automatické sloučení jsou zapotřebí tři soubory, obdržen: %r"
 
-#: meld/meldwindow.py:403
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Nelze porovnávat směs souborů a složek"
 
@@ -2313,6 +2335,10 @@ msgstr "Schází"
 msgid "Not present"
 msgstr "Není přítomno"
 
+#: meld/vc/_vc.py:82
+msgid "Scanning…"
+msgstr "Prochází se…"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
 #: meld/vcview.py:334
@@ -2413,33 +2439,3 @@ msgstr ""
 #: meld/vcview.py:850
 msgid "Clear"
 msgstr "Vymazat"
-
-#~ msgid "_Update"
-#~ msgstr "Akt_ualizovat"
-
-#~ msgid "Mar_k as Resolved"
-#~ msgstr "Označi_t jako vyřešené"
-
-#~ msgid "Update"
-#~ msgstr "Aktualizovat"
-
-#~ msgid "Update working copy from version control"
-#~ msgstr "Aktualizovat pracovní kopii ze správy verzí"
-
-#~ msgid "Push"
-#~ msgstr "Odeslat"
-
-#~ msgid "Add"
-#~ msgstr "Přidat"
-
-#~ msgid "Remove"
-#~ msgstr "Odebrat"
-
-#~ msgid "Mark as Resolved"
-#~ msgstr "Označit jako vyřešené"
-
-#~ msgid "Revert"
-#~ msgstr "Vrátit zpět"
-
-#~ msgid "Delete from working copy"
-#~ msgstr "Smazat z pracovní kopie"

From 8f37141419005d103b1ec1042c5dcfd085eb03c2 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 12 Mar 2022 09:13:57 +1000
Subject: [PATCH 063/116] dirdiff: Maintain pane order in marked comparisons

If the user marks file X in the left pane and compares file Y in the
right, the launched comparison should be the same as if they mark file
Y in the right and compare with file X in the left; in both cases, the
comparison should be X -> Y.
---
 meld/dirdiff.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index f99b7167..2e024431 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -1478,10 +1478,17 @@ def action_diff_marked(self, *args):
         if selected is None:
             return
 
-        row_paths = [
-            self.model.value_paths(self.marked['mark'])[self.marked['pane']],
-            self.model.value_paths(selected)[pane]
-        ]
+        mark, mark_pane = self.marked['mark'], self.marked['pane']
+        marked_path = self.model.value_paths(mark)[mark_pane]
+        selected_path = self.model.value_paths(selected)[pane]
+
+        # Maintain the pane ordering in the new comparison, regardless
+        # of which pane is the marked one.
+        if pane < mark_pane:
+            row_paths = [selected_path, marked_path]
+        else:
+            row_paths = [marked_path, selected_path]
+
         gfiles = [Gio.File.new_for_path(p)
                   for p in row_paths if os.path.exists(p)]
         self.create_diff_signal.emit(gfiles, {})

From 036c7ac027fe3ddb4898037ddfe4211ed23b1376 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 12 Mar 2022 09:28:10 +1000
Subject: [PATCH 064/116] dirdiff: Add an emblem indicator for the current
 marked path

This is deliberately choosing to override the "newest" marker for two
reasons:
 - if you're manually marking something for comparison like this, you
   probably don't actually care about whether this one or the other side
   is newest, since you're basically indicating that the file you're
   comparing to on the other side isn't the correct one; and
 - adding a new tree store column (or a third emblem location) just to
   store mark information seems like massive overkill.
---
 meld/dirdiff.py | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 2e024431..5e8de5a2 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -248,6 +248,7 @@ def _files_same(files, regexes, comparison_args):
 
 
 EMBLEM_NEW = "emblem-new"
+EMBLEM_SELECTED = "emblem-default-symbolic"
 EMBLEM_SYMLINK = "emblem-symbolic-link"
 
 COL_EMBLEM, COL_EMBLEM_SECONDARY, COL_SIZE, COL_TIME, COL_PERMS, COL_END = (
@@ -821,6 +822,7 @@ def set_locations(self) -> None:
         locations = [os.path.abspath(l) if l else '' for l in locations]
 
         self.current_path = None
+        self.marked = None
         self.model.clear()
         for m in self.msgarea_mgr:
             m.clear()
@@ -1464,10 +1466,14 @@ def action_mark(self, *args):
         if selected is None:
             return
 
-        self.marked = {
-            'mark': self.model.get_iter(selected[0]),
-            'pane': pane
-        }
+        old_it = self.marked['mark'] if self.marked else None
+        it = self.model.get_iter(selected[0])
+
+        self.marked = {'mark': it, 'pane': pane}
+
+        self._update_item_state(it)
+        if old_it:
+            self._update_item_state(old_it)
 
     def action_diff_marked(self, *args):
         pane = self._get_focused_pane()
@@ -1706,7 +1712,17 @@ def format_name_override(f):
             if stats[j]:
                 self.model.set_path_state(
                     it, j, state, isdir[j], display_text=name_overrides[j])
-                emblem = EMBLEM_NEW if j in newest else None
+
+                if (
+                    self.marked and
+                    self.marked["pane"] == j and
+                    self.model.get_string_from_iter(self.marked["mark"]) ==
+                    self.model.get_string_from_iter(it)
+                ):
+                    emblem = EMBLEM_SELECTED
+                else:
+                    emblem = EMBLEM_NEW if j in newest else None
+
                 link_emblem = EMBLEM_SYMLINK if j in symlinks else None
                 self.model.unsafe_set(it, j, {
                     COL_EMBLEM: emblem,

From a6338386042dda23d7e77d7a3f3e14f0afa400d4 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 12 Mar 2022 10:25:14 +1000
Subject: [PATCH 065/116] dirdiff: Refactor comparison marker to use row
 references

The goal here is to have the marker survive tree modifications, and also
to make the comparison that we do for rendering emblems somewhat more
correct. Because handling TreeRowReferences is slightly more annoying
than dealing with pure TreeIters, I've moved the marker to be a
NamedTuple to make the rest of our logic appear slightly simpler.
---
 meld/dirdiff.py | 77 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 57 insertions(+), 20 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 5e8de5a2..36e71606 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -28,7 +28,7 @@
 from collections import namedtuple
 from decimal import Decimal
 from mmap import ACCESS_COPY, mmap
-from typing import DefaultDict, List, Optional, Tuple
+from typing import DefaultDict, List, NamedTuple, Optional, Tuple
 
 from gi.repository import Gdk, Gio, GLib, GObject, Gtk
 
@@ -316,6 +316,49 @@ def filled(seq):
         return sorted(filled(v) for v in self.items.values())
 
 
+class ComparisonMarker(NamedTuple):
+    """A stable row + pane marker
+
+    This marker is used for selecting a specific file or folder when
+    the user wants to compare paths that don't have matching names, and
+    so aren't aligned in our tree view.
+    """
+
+    pane: int
+    row: Gtk.TreeRowReference
+
+    def get_iter(self) -> Gtk.TreeIter:
+        return self.row.get_model().get_iter(self.row.get_path())
+
+    def matches_iter(self, pane: int, it: Gtk.TreeIter) -> bool:
+        return (
+            pane == self.pane and
+            self.row.get_model().get_path(it) == self.row.get_path()
+        )
+
+    @classmethod
+    def from_selection(
+        cls,
+        treeview: Gtk.TreeView,
+        pane: int,
+    ) -> "ComparisonMarker":
+
+        if pane is None or pane == -1:
+            raise ValueError("Invalid pane for marker")
+
+        model = treeview.get_model()
+        _, selected_paths = treeview.get_selection().get_selected_rows()
+
+        # We'll assume that in any multi-select, the first row was the
+        # intended mark.
+        selected_row = Gtk.TreeRowReference.new(model, selected_paths[0])
+
+        return cls(
+            pane=pane,
+            row=selected_row,
+        )
+
+
 @Gtk.Template(resource_path='/org/gnome/meld/ui/dirdiff.ui')
 class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
 
@@ -1278,9 +1321,9 @@ def update_action_sensitivity(self):
             self.set_action_enabled('folder-expand', is_single_foldable_row)
             self.set_action_enabled('folder-compare', True)
             self.set_action_enabled('folder-mark', True)
-            self.set_action_enabled('folder-compare-marked',
-                                    self.marked is not None and
-                                    self.marked.get('pane', -1) != pane)
+            self.set_action_enabled(
+                'folder-compare-marked',
+                self.marked is not None and self.marked.pane != pane)
             self.set_action_enabled('folder-delete', is_valid)
             self.set_action_enabled('folder-copy-left', is_valid and pane > 0)
             self.set_action_enabled(
@@ -1466,14 +1509,13 @@ def action_mark(self, *args):
         if selected is None:
             return
 
-        old_it = self.marked['mark'] if self.marked else None
-        it = self.model.get_iter(selected[0])
-
-        self.marked = {'mark': it, 'pane': pane}
+        old_mark_it = self.marked.get_iter() if self.marked else None
+        self.marked = ComparisonMarker.from_selection(
+            self.treeview[pane], pane)
 
-        self._update_item_state(it)
-        if old_it:
-            self._update_item_state(old_it)
+        self._update_item_state(self.marked.get_iter())
+        if old_mark_it:
+            self._update_item_state(old_mark_it)
 
     def action_diff_marked(self, *args):
         pane = self._get_focused_pane()
@@ -1484,13 +1526,13 @@ def action_diff_marked(self, *args):
         if selected is None:
             return
 
-        mark, mark_pane = self.marked['mark'], self.marked['pane']
-        marked_path = self.model.value_paths(mark)[mark_pane]
+        mark_it = self.marked.get_iter()
+        marked_path = self.model.value_paths(mark_it)[self.marked.pane]
         selected_path = self.model.value_paths(selected)[pane]
 
         # Maintain the pane ordering in the new comparison, regardless
         # of which pane is the marked one.
-        if pane < mark_pane:
+        if pane < self.marked.pane:
             row_paths = [selected_path, marked_path]
         else:
             row_paths = [marked_path, selected_path]
@@ -1713,12 +1755,7 @@ def format_name_override(f):
                 self.model.set_path_state(
                     it, j, state, isdir[j], display_text=name_overrides[j])
 
-                if (
-                    self.marked and
-                    self.marked["pane"] == j and
-                    self.model.get_string_from_iter(self.marked["mark"]) ==
-                    self.model.get_string_from_iter(it)
-                ):
+                if self.marked and self.marked.matches_iter(j, it):
                     emblem = EMBLEM_SELECTED
                 else:
                     emblem = EMBLEM_NEW if j in newest else None

From c4b9deb214e9921ec68506b6352e7f9d02026912 Mon Sep 17 00:00:00 2001
From: Roberto Vidal <vidal.roberto.j@gmail.com>
Date: Sat, 12 Mar 2022 14:36:11 +0100
Subject: [PATCH 066/116] refactor a bit, use enums

---
 meld/filediff.py | 161 +++++++++++++++++++++++++++--------------------
 1 file changed, 94 insertions(+), 67 deletions(-)

diff --git a/meld/filediff.py b/meld/filediff.py
index e0b0aabf..000b7444 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -18,6 +18,7 @@
 import functools
 import logging
 import math
+from enum import Enum
 from typing import Optional, Tuple, Type
 
 from gi.repository import Gdk, Gio, GLib, GObject, Gtk, GtkSource
@@ -1432,32 +1433,25 @@ def on_textview_button_press_event(self, textview, event):
         return False
 
     def set_syncpoint_menuitem(self, pane):
-        state = self.syncpoints.pane_sync_state(pane)
+        action = self._syncpoint_action(pane)
 
         popup_options = self.popup_menu.get_children()
         current_option = popup_options[FileDiff.ADD_SYNCPOINT_OFFSET]
         next_option = None
 
-        if state == Syncpoints.DANGLING:
-            next_option = self.move_sync_point_opt
-        elif state == Syncpoints.MATCHED:
+        if action == SyncpointState.CAN_ADD:
             next_option = self.add_sync_point_opt
-        elif state == Syncpoints.SHORT:
+        elif action == SyncpointState.CAN_MATCH:
             next_option = self.match_sync_point_opt
+        elif action == SyncpointState.CAN_DELETE:
+            next_option = self.remove_sync_point_opt
+        elif action == SyncpointState.CAN_MOVE:
+            next_option = self.move_sync_point_opt
+        elif action is SyncpointState.DISABLED:
+            next_option = self.move_sync_point_opt
 
-        if state == Syncpoints.MATCHED:
-            mark = self.textbuffer[pane].get_insert()
-            if self.syncpoints.can_delete_matched_at(pane, mark):
-                next_option = self.remove_sync_point_opt
-
-        elif state == Syncpoints.DANGLING:
-            mark = self.textbuffer[pane].get_insert()
-            action = self.syncpoints.can_move_at(pane, mark)
 
-            if action == Syncpoints.CAN_DELETE:
-                next_option = self.remove_sync_point_opt
-            else:
-                next_option.set_sensitive(bool(action))
+        self.set_action_enabled("add-sync-point", action != SyncpointState.DISABLED)
 
         if next_option is not current_option:
             self.popup_menu.insert(
@@ -1466,6 +1460,12 @@ def set_syncpoint_menuitem(self, pane):
             )
             self.popup_menu.remove(current_option)
 
+    def _syncpoint_action(self, pane):
+        def get_mark():
+            return self.textbuffer[pane].get_insert()
+
+        return self.syncpoints.state(pane, get_mark)
+
     def set_labels(self, labels):
         labels = labels[:self.num_panes]
         for label, buf in zip(labels, self.textbuffer):
@@ -2539,30 +2539,31 @@ def clear_sync_points(self, *args):
 FileDiff.set_css_name('meld-file-diff')
 
 
-class Syncpoints:
-    # The state of a pane with all its syncpoints matched
-    MATCHED = "matched"
-    # The state of a pane waiting to be matched to existing syncpoints
-    # in other panes
-    SHORT = "short"
-    # The state of a pane with a dangling syncpoint, not yet matched
-    # across all panes
-    DANGLING = "DANGLING"
 
+class SyncpointState(Enum):
     # The state of a line when a dangling syncpoint can be moved to it
     CAN_MOVE = "can_move"
     # The state of a line where a dangling syncpoint sits
     CAN_DELETE = "can_delete"
+    # The state of a line when a syncpoint can be added to match existing ones
+    CAN_MATCH = "can_match"
+    # The state of a line when a new, dangling syncpoint can be added to it
+    CAN_ADD = "can_add"
+    # The state of a line when no syncpoint action can be taken
+    DISABLED = "disabled"
 
-    def __init__(self, num_panes, get_line):
+
+
+class Syncpoints:
+    def __init__(self, num_panes: int, comparator):
         self._num_panes = num_panes
-        self._points = [[] for p in range(0, num_panes)]
-        self._get_line = get_line
+        self._points = [[] for _i in range(0, num_panes)]
+        self._comparator = comparator
 
-    def add(self, pane_idx, point):
-        pane_state = self.pane_sync_state(pane_idx)
+    def add(self, pane_idx: int, point):
+        pane_state = self._pane_state(pane_idx)
 
-        if pane_state == Syncpoints.DANGLING:
+        if pane_state == self.PaneState.DANGLING:
             self._points[pane_idx].pop()
 
         self._points[pane_idx].append(point)
@@ -2571,55 +2572,36 @@ def add(self, pane_idx, point):
 
         if len(lengths) == 1:
             for (i, p) in enumerate(self._points):
-                p.sort(key=lambda point: self._get_line(i, point))
+                p.sort(key=lambda point: self._comparator(i, point))
 
-    def remove(self, pane_idx, cursor_point):
-        line = self._get_line(pane_idx, cursor_point)
+    def remove(self, pane_idx: int, cursor_point):
+        cursor_key = self._comparator(pane_idx, cursor_point)
 
-        index = None
+        index = -1
 
         for (i, point) in enumerate(self._points[pane_idx]):
-            if self._get_line(pane_idx, point) == line:
+            if self._comparator(pane_idx, point) == cursor_key:
                 index = i
                 break
 
-        if index is None:
-            return
+        assert index is not None
 
-        pane_state = self.pane_sync_state(pane_idx)
+        pane_state = self._pane_state(pane_idx)
 
-        if pane_state == Syncpoints.MATCHED:
+        assert pane_state != self.PaneState.SHORT
+
+        if pane_state == self.PaneState.MATCHED:
             for pane in self._points:
                 pane.pop(index)
-        elif pane_state == Syncpoints.DANGLING:
+        elif pane_state == self.PaneState.DANGLING:
             self._points[pane_idx].pop()
 
     def clear(self):
         self._points = [[] for _i in range(0, self._num_panes)]
 
-    def points(self, pane_idx):
+    def points(self, pane_idx: int):
         return self._points[pane_idx].copy()
 
-    def can_move_at(self, pane_idx, mark):
-        target_line = self._get_line(pane_idx, mark)
-        pane_syncpoints = self._points[pane_idx]
-
-        if self._get_line(pane_idx, pane_syncpoints[-1]) == target_line:
-            return Syncpoints.CAN_DELETE
-
-        for syncpoint in pane_syncpoints[:-1]:
-            if self._get_line(pane_idx, syncpoint) == target_line:
-                return None
-
-        return Syncpoints.CAN_MOVE
-
-    def can_delete_matched_at(self, pane_idx, mark):
-        target_line = self._get_line(pane_idx, mark)
-        return any(
-            self._get_line(pane_idx, syncpoint) == target_line
-            for syncpoint in self._points[pane_idx]
-        )
-
     def valid_points(self):
         num_matched = min(len(p) for p in self._points)
 
@@ -2633,13 +2615,58 @@ def valid_points(self):
             for i in range(0, num_matched)
         ]
 
-    def pane_sync_state(self, pane_idx):
+    def _pane_state(self, pane_idx: int):
         lengths = set(len(points) for points in self._points)
 
         if len(lengths) == 1:
-            return Syncpoints.MATCHED
+            return self.PaneState.MATCHED
 
         if len(self._points[pane_idx]) == min(lengths):
-            return Syncpoints.SHORT
+            return self.PaneState.SHORT
+        else:
+            return self.PaneState.DANGLING
+
+    def state(self, pane_idx: int, get_mark):
+        state = self._pane_state(pane_idx)
+
+        if state == self.PaneState.SHORT:
+            return SyncpointState.CAN_MATCH
+
+        target = self._comparator(pane_idx, get_mark())
+
+        points = self._points[pane_idx]
+
+        if state == self.PaneState.MATCHED:
+            is_syncpoint = any(
+                self._comparator(pane_idx, point) == target
+                for point in points
+            )
+
+            if is_syncpoint:
+                return SyncpointState.CAN_DELETE
+            else:
+                return SyncpointState.CAN_ADD
+
+        # state == DANGLING
+        if target == self._comparator(pane_idx, points[-1]):
+            return SyncpointState.CAN_DELETE
+
+        is_syncpoint = any(
+            self._comparator(pane_idx, point) == target
+            for point in points
+        )
+
+        if is_syncpoint:
+            return SyncpointState.DISABLED
         else:
-            return Syncpoints.DANGLING
+            return SyncpointState.CAN_MOVE
+
+    class PaneState(Enum):
+        # The state of a pane with all its syncpoints matched
+        MATCHED = "matched"
+        # The state of a pane waiting to be matched to existing syncpoints
+        # in other panes
+        SHORT = "short"
+        # The state of a pane with a dangling syncpoint, not yet matched
+        # across all panes
+        DANGLING = "DANGLING"

From 018965897fea29c0958465a7eb5e518fa9459fd6 Mon Sep 17 00:00:00 2001
From: Roberto Vidal <vidal.roberto.j@gmail.com>
Date: Sat, 12 Mar 2022 14:37:36 +0100
Subject: [PATCH 067/116] prepare for gear menu customization

---
 meld/filediff.py               |  4 ++++
 meld/meldwindow.py             | 27 +++++++++++++++++++++++----
 meld/resources/ui/appwindow.ui |  1 +
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/meld/filediff.py b/meld/filediff.py
index 000b7444..2ff9aa3c 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1432,6 +1432,10 @@ def on_textview_button_press_event(self, textview, event):
             return True
         return False
 
+    def syncpoint_action(self):
+        if self.focus_pane:
+            return self._syncpoint_action(self.textview.index(self.focus_pane))
+
     def set_syncpoint_menuitem(self, pane):
         action = self._syncpoint_action(pane)
 
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index 49c04ee3..d5dd6576 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -30,7 +30,7 @@
     FileComparisonMode,
 )
 from meld.dirdiff import DirDiff
-from meld.filediff import FileDiff
+from meld.filediff import FileDiff, SyncpointState
 from meld.melddoc import ComparisonState, MeldDoc
 from meld.menuhelpers import replace_menu_section
 from meld.newdifftab import NewDiffTab
@@ -121,9 +121,9 @@ def do_realize(self):
         Gtk.ApplicationWindow.do_realize(self)
 
         app = self.get_application()
-        menu = app.get_menu_by_id("gear-menu")
+        gear_menu = app.get_menu_by_id("gear-menu")
         self.gear_menu_button.set_popover(
-            Gtk.Popover.new_from_model(self.gear_menu_button, menu))
+            Gtk.Popover.new_from_model(self.gear_menu_button, gear_menu))
 
         filter_model = app.get_menu_by_id("text-filter-menu")
         self.text_filter_button.set_popover(
@@ -147,7 +147,7 @@ def do_realize(self):
                 "file-filters-changed", self.update_filename_filters),
         ]
 
-        meld.ui.util.extract_accels_from_menu(menu, self.get_application())
+        meld.ui.util.extract_accels_from_menu(gear_menu, self.get_application())
 
     def update_filename_filters(self, settings):
         filter_items_model = Gio.Menu()
@@ -363,6 +363,25 @@ def append_dirdiff(
             doc.scheduler.add_task(doc.auto_compare)
         return doc
 
+    @Gtk.Template.Callback()
+    def on_gear_popup_menu(self, menubutton):
+        if not menubutton.get_active():
+            return
+
+        current_page_idx = self.notebook.get_current_page()
+
+        if current_page_idx == -1:
+            return
+
+        page = self.notebook.get_nth_page(current_page_idx)
+
+        if not isinstance(page, FileDiff):
+            return
+
+        action = page.syncpoint_action()
+
+        # TODO: recompute menu items
+
     def append_filediff(
             self, gfiles, *, encodings=None, merge_output=None, meta=None):
         assert len(gfiles) in (1, 2, 3)
diff --git a/meld/resources/ui/appwindow.ui b/meld/resources/ui/appwindow.ui
index 6717a3ff..7b952f54 100644
--- a/meld/resources/ui/appwindow.ui
+++ b/meld/resources/ui/appwindow.ui
@@ -172,6 +172,7 @@
             <property name="action-name">win.gear-menu</property>
             <property name="visible">true</property>
             <property name="can_focus">False</property>
+            <signal name="toggled" handler="on_gear_popup_menu"></signal>
             <child>
               <object class="GtkImage">
                 <property name="icon-name">open-menu-symbolic</property>

From c6840efd397244080e319cbe917c22b8c9824939 Mon Sep 17 00:00:00 2001
From: Roberto Vidal <vidal.roberto.j@gmail.com>
Date: Sat, 12 Mar 2022 14:55:08 +0100
Subject: [PATCH 068/116] linting

---
 meld/filediff.py   |  8 ++++----
 meld/meldwindow.py | 11 +++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/meld/filediff.py b/meld/filediff.py
index 2ff9aa3c..8b79d9dd 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1454,8 +1454,10 @@ def set_syncpoint_menuitem(self, pane):
         elif action is SyncpointState.DISABLED:
             next_option = self.move_sync_point_opt
 
-
-        self.set_action_enabled("add-sync-point", action != SyncpointState.DISABLED)
+        self.set_action_enabled(
+            "add-sync-point",
+            action != SyncpointState.DISABLED
+        )
 
         if next_option is not current_option:
             self.popup_menu.insert(
@@ -2543,7 +2545,6 @@ def clear_sync_points(self, *args):
 FileDiff.set_css_name('meld-file-diff')
 
 
-
 class SyncpointState(Enum):
     # The state of a line when a dangling syncpoint can be moved to it
     CAN_MOVE = "can_move"
@@ -2557,7 +2558,6 @@ class SyncpointState(Enum):
     DISABLED = "disabled"
 
 
-
 class Syncpoints:
     def __init__(self, num_panes: int, comparator):
         self._num_panes = num_panes
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index d5dd6576..e9d30dd1 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -30,7 +30,7 @@
     FileComparisonMode,
 )
 from meld.dirdiff import DirDiff
-from meld.filediff import FileDiff, SyncpointState
+from meld.filediff import FileDiff
 from meld.melddoc import ComparisonState, MeldDoc
 from meld.menuhelpers import replace_menu_section
 from meld.newdifftab import NewDiffTab
@@ -121,9 +121,9 @@ def do_realize(self):
         Gtk.ApplicationWindow.do_realize(self)
 
         app = self.get_application()
-        gear_menu = app.get_menu_by_id("gear-menu")
+        menu = app.get_menu_by_id("gear-menu")
         self.gear_menu_button.set_popover(
-            Gtk.Popover.new_from_model(self.gear_menu_button, gear_menu))
+            Gtk.Popover.new_from_model(self.gear_menu_button, menu))
 
         filter_model = app.get_menu_by_id("text-filter-menu")
         self.text_filter_button.set_popover(
@@ -147,7 +147,7 @@ def do_realize(self):
                 "file-filters-changed", self.update_filename_filters),
         ]
 
-        meld.ui.util.extract_accels_from_menu(gear_menu, self.get_application())
+        meld.ui.util.extract_accels_from_menu(menu, self.get_application())
 
     def update_filename_filters(self, settings):
         filter_items_model = Gio.Menu()
@@ -378,9 +378,8 @@ def on_gear_popup_menu(self, menubutton):
         if not isinstance(page, FileDiff):
             return
 
-        action = page.syncpoint_action()
-
         # TODO: recompute menu items
+        # action = page.syncpoint_action()
 
     def append_filediff(
             self, gfiles, *, encodings=None, merge_output=None, meta=None):

From 8da440c0cc8ad64dc2016ec86392a29e8e8bbfe0 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 13 Mar 2022 09:46:04 +1000
Subject: [PATCH 069/116] Update destructive dialog actions with appropriate
 styling (#660)

---
 meld/dirdiff.py                          |  7 +++++--
 meld/filediff.py                         |  6 ++++--
 meld/iohelpers.py                        | 11 +++++++----
 meld/misc.py                             | 16 ++++++++++------
 meld/resources/ui/save-confirm-dialog.ui |  3 +++
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 36e71606..34dffc07 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -1225,8 +1225,11 @@ def copy_selected(self, direction):
                         parent_name = os.path.dirname(dst)
                         folder_name = os.path.basename(dst)
                         dialog_buttons = [
-                            (_("_Cancel"), Gtk.ResponseType.CANCEL),
-                            (_("_Replace"), Gtk.ResponseType.OK),
+                            (_("_Cancel"), Gtk.ResponseType.CANCEL, None),
+                            (
+                                _("_Replace"), Gtk.ResponseType.OK,
+                                Gtk.STYLE_CLASS_DESTRUCTIVE_ACTION,
+                            ),
                         ]
                         replace = misc.modal_dialog(
                             primary=_("Replace folder “%s”?") % folder_name,
diff --git a/meld/filediff.py b/meld/filediff.py
index 436fabf8..108a68b8 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1224,8 +1224,10 @@ def prompt_resolve_conflict(self):
             secondary = _(
                 "If the conflict was resolved successfully, you may mark "
                 "it as resolved now.")
-            buttons = ((_("Cancel"), Gtk.ResponseType.CANCEL),
-                       (_("Mark _Resolved"), Gtk.ResponseType.OK))
+            buttons = (
+                (_("Cancel"), Gtk.ResponseType.CANCEL, None),
+                (_("Mark _Resolved"), Gtk.ResponseType.OK, None),
+            )
             resolve_response = misc.modal_dialog(
                 primary, secondary, buttons, parent=self,
                 messagetype=Gtk.MessageType.QUESTION)
diff --git a/meld/iohelpers.py b/meld/iohelpers.py
index a7882386..d8ad74db 100644
--- a/meld/iohelpers.py
+++ b/meld/iohelpers.py
@@ -53,8 +53,11 @@ def trash_or_confirm(gfile: Gio.File) -> bool:
             "to the trash."
         ),
         buttons=[
-            (_("_Cancel"), Gtk.ResponseType.CANCEL),
-            (_("_Delete Permanently"), Gtk.ResponseType.OK),
+            (_("_Cancel"), Gtk.ResponseType.CANCEL, None),
+            (
+                _("_Delete Permanently"), Gtk.ResponseType.OK,
+                Gtk.STYLE_CLASS_DESTRUCTIVE_ACTION,
+            ),
         ],
     )
 
@@ -110,8 +113,8 @@ def prompt_save_filename(
             "If you replace the existing file, its contents "
             "will be lost.") % parent_name,
         buttons=[
-            (_("_Cancel"), Gtk.ResponseType.CANCEL),
-            (_("_Replace"), Gtk.ResponseType.OK),
+            (_("_Cancel"), Gtk.ResponseType.CANCEL, None),
+            (_("_Replace"), Gtk.ResponseType.OK, None),
         ],
         messagetype=Gtk.MessageType.WARNING,
     )
diff --git a/meld/misc.py b/meld/misc.py
index b7f7ef4f..d7255f84 100644
--- a/meld/misc.py
+++ b/meld/misc.py
@@ -94,9 +94,10 @@ def error_dialog(primary: str, secondary: str) -> Gtk.ResponseType:
 def modal_dialog(
     primary: str,
     secondary: str,
-    buttons: Union[Gtk.ButtonsType, Sequence[Tuple[str, int]]],
+    buttons: Union[Gtk.ButtonsType, Sequence[Tuple[str, int, Optional[str]]]],
+    *,
     parent: Optional[Gtk.Window] = None,
-    messagetype: Gtk.MessageType = Gtk.MessageType.WARNING
+    messagetype: Gtk.MessageType = Gtk.MessageType.WARNING,
 ) -> Gtk.ResponseType:
     """A common message dialog handler for Meld
 
@@ -106,7 +107,7 @@ def modal_dialog(
     Primary must be plain text. Secondary must be valid markup.
     """
 
-    custom_buttons: Sequence[Tuple[str, int]] = []
+    custom_buttons: Sequence[Tuple[str, int, Optional[str]]] = []
     if not isinstance(buttons, Gtk.ButtonsType):
         custom_buttons, buttons = buttons, Gtk.ButtonsType.NONE
 
@@ -116,11 +117,14 @@ def modal_dialog(
         destroy_with_parent=True,
         message_type=messagetype,
         buttons=buttons,
-        text=primary)
+        text=primary,
+    )
     dialog.format_secondary_markup(secondary)
 
-    for label, response_id in custom_buttons:
-        dialog.add_button(label, response_id)
+    for label, response_id, style_class in custom_buttons:
+        button = dialog.add_button(label, response_id)
+        if style_class:
+            button.get_style_context().add_class(style_class)
 
     response = dialog.run()
     dialog.destroy()
diff --git a/meld/resources/ui/save-confirm-dialog.ui b/meld/resources/ui/save-confirm-dialog.ui
index 3b613fc1..92517d99 100644
--- a/meld/resources/ui/save-confirm-dialog.ui
+++ b/meld/resources/ui/save-confirm-dialog.ui
@@ -26,6 +26,9 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
+                <style>
+                  <class name="destructive-action"/>
+                </style>
               </object>
               <packing>
                 <property name="expand">False</property>

From 3f3b86bc09047e79dbf3c7d580b70041cf5fa917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jiri=20Gr=C3=B6nroos?= <jiri.gronroos@iki.fi>
Date: Mon, 14 Mar 2022 19:46:34 +0000
Subject: [PATCH 070/116] Update Finnish translation

---
 po/fi.po | 181 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 104 insertions(+), 77 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index 2c72a218..2d4320e2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-10-08 21:01+0000\n"
-"PO-Revision-Date: 2021-11-22 14:08+0200\n"
+"POT-Creation-Date: 2022-03-10 22:43+0000\n"
+"PO-Revision-Date: 2022-03-14 21:45+0200\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <lokalisointi-lista@googlegroups.com>\n"
 "Language: fi\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
 #: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
@@ -790,7 +790,7 @@ msgstr "Sama"
 msgid "New"
 msgstr "Uusi"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Muokattu"
@@ -801,19 +801,23 @@ msgstr "Muokattu"
 msgid "Ignore filename case"
 msgstr "Älä huomioi kirjainkoon eroja tiedostonimessä"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr "Normalisoi Unicode-polut"
+
+#: meld/resources/gtk/menus.ui:175
 msgid "Normal"
 msgstr "Normaali"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Versioimaton"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Huomiotta jätetyt"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:190
 msgid "Flatten folders"
 msgstr "Litistetyt kansiot"
 
@@ -931,30 +935,38 @@ msgid "_Compare selected files"
 msgstr "_Vertaa valittuja tiedostoja"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+msgid "_Mark selected file"
+msgstr "_Merkitse valittu tiedosto"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Compare _with marked file"
+msgstr "_Vertaa merkityn tiedoston kanssa"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "Kopioi _vasemmalle"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "Kopioi _oikealle"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "Poista _valittu"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "Supista rekursiivisesti"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "Laajenna rekursiivisesti"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "Avaa _ulkoisesti"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "_Kopioi tiedostopolut"
 
@@ -1073,7 +1085,7 @@ msgstr "Tiedosto 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:530
+#: meld/dirdiff.py:558
 msgid "Name"
 msgstr "Nimi"
 
@@ -1113,7 +1125,7 @@ msgstr "Rivitetty"
 msgid "Replace _All"
 msgstr "K_orvaa kaikki"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1092 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1184 meld/iohelpers.py:114
 msgid "_Replace"
 msgstr "_Korvaa"
 
@@ -1499,7 +1511,7 @@ msgstr "Jos et tallenna, muutokset häviävät pysyvästi."
 msgid "Close _without Saving"
 msgstr "Sulje _tallentamatta"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1091
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1183
 #: meld/iohelpers.py:56 meld/iohelpers.py:113
 msgid "_Cancel"
 msgstr "_Peru"
@@ -1609,43 +1621,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:551 meld/preferences.py:132
+#: meld/dirdiff.py:579 meld/preferences.py:132
 msgid "Size"
 msgstr "Koko"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:559 meld/preferences.py:133
+#: meld/dirdiff.py:587 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Muokkausaika"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:595 meld/preferences.py:134
+msgid "Modification time (ISO)"
+msgstr "Muokkausaika (ISO)"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:567 meld/preferences.py:134
+#: meld/dirdiff.py:603 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Oikeudet"
 
-#: meld/dirdiff.py:803 meld/dirdiff.py:827
+#: meld/dirdiff.py:855
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (kartoitetaan…)"
+
+#: meld/dirdiff.py:887 meld/dirdiff.py:919
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Kartoitetaan {folder}"
 
-#: meld/dirdiff.py:967
+#: meld/dirdiff.py:1055
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Valmis"
 
-#: meld/dirdiff.py:976
+#: meld/dirdiff.py:1068
 msgid "Folder {} is being compared to itself"
 msgstr "Kansiota {} vertaillaan itseensä"
 
-#: meld/dirdiff.py:982
+#: meld/dirdiff.py:1074
 msgid "Folders have no differences"
 msgstr "Kansioilla ei ole eroja"
 
-#: meld/dirdiff.py:984
+#: meld/dirdiff.py:1076
 msgid "Contents of scanned files in folders are identical."
 msgstr "Kansioissa olevien tiedostojen sisällöt ovat identtisiä sisällöiltään."
 
-#: meld/dirdiff.py:986
+#: meld/dirdiff.py:1078
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1653,46 +1675,46 @@ msgstr ""
 "Kartoitetut tiedostot kansioissa vaikuttavat identtisiltä, mutta niiden "
 "sisältöä ei ole vielä kartoitettu."
 
-#: meld/dirdiff.py:989
+#: meld/dirdiff.py:1081
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Tiedostosuodattimet ovat käytössä, joten kaikkia tiedostoja ei tarkistettu."
 
-#: meld/dirdiff.py:991
+#: meld/dirdiff.py:1083
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Tekstisuodattimia on käytössä ja ne saattavat naamioida "
 "sisältöeroavaisuuksia."
 
-#: meld/dirdiff.py:1007 meld/filediff.py:1907
+#: meld/dirdiff.py:1099 meld/filediff.py:1917
 msgid "Hide"
 msgstr "Piilota"
 
-#: meld/dirdiff.py:1009 meld/filediff.py:1909 meld/filediff.py:1939
-#: meld/filediff.py:1941 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1101 meld/filediff.py:1919 meld/filediff.py:1949
+#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Piilota"
 
-#: meld/dirdiff.py:1018
+#: meld/dirdiff.py:1110
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Tätä kansiota tutkittaessa tapahtui lukuisia virheitä"
 
-#: meld/dirdiff.py:1019
+#: meld/dirdiff.py:1111
 msgid "Files with invalid encodings found"
 msgstr "Virheellisellä merkistökoodauksella varustettuja tiedostoja löytyi"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1021
+#: meld/dirdiff.py:1113
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Joillain tiedostoilla on virheellinen merkistö. Nimet ovat jotain tällaisia:"
 
-#: meld/dirdiff.py:1023
+#: meld/dirdiff.py:1115
 msgid "Files hidden by case insensitive comparison"
 msgstr ""
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1025
+#: meld/dirdiff.py:1117
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1700,18 +1722,18 @@ msgstr ""
 "Suoritat kirjainkoosta riippumatonta vertailua kirjainkoon huomioivassa "
 "tiedostojärjestelmässä. Seuraavat tiedostot tässä hakemistossa on piilotettu:"
 
-#: meld/dirdiff.py:1036
+#: meld/dirdiff.py:1128
 #, fuzzy, python-brace-format
 #| msgid "'%s' hidden by '%s'"
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "\"%s\" piilottanut \"%s\""
 
-#: meld/dirdiff.py:1095
+#: meld/dirdiff.py:1187
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Korvataanko kansio “%s”?"
 
-#: meld/dirdiff.py:1097
+#: meld/dirdiff.py:1189
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1720,11 +1742,11 @@ msgstr ""
 "Toinen kansio samalla nimellä on jo olemassa sijainnissa “%s”.\n"
 "Jos korvaat olemassa olevan kansion, siinä olevat kaikki tiedostot häviävät."
 
-#: meld/dirdiff.py:1110
+#: meld/dirdiff.py:1202
 msgid "Error copying file"
 msgstr "Virhe tiedostoa kopioitaessa"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1203
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1737,11 +1759,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1136 meld/vcview.py:764
+#: meld/dirdiff.py:1228 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Virhe poistaessa {}"
 
-#: meld/dirdiff.py:1626
+#: meld/dirdiff.py:1756
 msgid "No folder"
 msgstr "Ei kansiota"
 
@@ -1775,56 +1797,56 @@ msgstr "Peru"
 msgid "Mark _Resolved"
 msgstr "Merkitse _selvitetyksi"
 
-#: meld/filediff.py:1589
+#: meld/filediff.py:1591
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Ongelma avatessa tiedostoa “%s”."
 
-#: meld/filediff.py:1598
+#: meld/filediff.py:1600
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "%s vaikuttaa binääritiedostolta."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1602
 msgid "Do you want to open the file using the default application?"
 msgstr "Haluatko avata tiedoston käyttäen oletussovellusta?"
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1604
 msgid "Open"
 msgstr "Avaa"
 
-#: meld/filediff.py:1616
+#: meld/filediff.py:1626
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Yhdistetään tiedostoja"
 
-#: meld/filediff.py:1630
+#: meld/filediff.py:1640
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] lasketaan eroja"
 
-#: meld/filediff.py:1690
+#: meld/filediff.py:1700
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Tiedosto %s on muuttunut levyllä"
 
-#: meld/filediff.py:1691
+#: meld/filediff.py:1701
 msgid "Do you want to reload the file?"
 msgstr "Haluatko ladata tiedoston uudelleen?"
 
-#: meld/filediff.py:1693
+#: meld/filediff.py:1703
 msgid "_Reload"
 msgstr "_Lataa uudestaan"
 
-#: meld/filediff.py:1863
+#: meld/filediff.py:1873
 msgid "File {} is being compared to itself"
 msgstr "Tiedostoa {} vertaillaan itseensä"
 
-#: meld/filediff.py:1872
+#: meld/filediff.py:1882
 msgid "Files are identical"
 msgstr "Tiedostot ovat identtiset"
 
-#: meld/filediff.py:1885
+#: meld/filediff.py:1895
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1832,11 +1854,11 @@ msgstr ""
 "Tekstisuodattimia on käytössä ja ne saattavat naamioida "
 "sisältöeroavaisuuksia. Haluatko verrata suodattamattomia tiedostoja?"
 
-#: meld/filediff.py:1890
+#: meld/filediff.py:1900
 msgid "Files differ in line endings only"
 msgstr "Tiedostot eroavat toisistaan ainoastaan riviloppujen osalta"
 
-#: meld/filediff.py:1892
+#: meld/filediff.py:1902
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1845,15 +1867,15 @@ msgstr ""
 "Tiedostot ovat identtisiä riviloppuja lukuun ottamatta:\n"
 "%s"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1922
 msgid "Show without filters"
 msgstr "Näytä ilman suodattimia"
 
-#: meld/filediff.py:1934
+#: meld/filediff.py:1944
 msgid "Change highlighting incomplete"
 msgstr "Muutosten korostaminen vaillinaista"
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1945
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1862,19 +1884,19 @@ msgstr ""
 "pakottaa Meldin korostamaan myös suuret muutokset, mutta siinä saattaa "
 "kestää hetki."
 
-#: meld/filediff.py:1943
+#: meld/filediff.py:1953
 msgid "Keep highlighting"
 msgstr "Säilytä korostus"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1955
 msgid "_Keep highlighting"
 msgstr "_Säilytä korostus"
 
-#: meld/filediff.py:1958
+#: meld/filediff.py:1968
 msgid "Saving failed"
 msgstr "Tallentaminen epäonnistui"
 
-#: meld/filediff.py:1959
+#: meld/filediff.py:1969
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1882,36 +1904,36 @@ msgstr ""
 "Tärkeiden muutosten kopiointi toiseen ohjelmaan tai tiedostoon on "
 "suositeltavaa tietojen katoamisen estämiseksi."
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:1978
 msgid "Save Left Pane As"
 msgstr "Tallenna vasen paneeli nimellä"
 
-#: meld/filediff.py:1970
+#: meld/filediff.py:1980
 msgid "Save Middle Pane As"
 msgstr "Tallenna keskipaneeli nimellä"
 
-#: meld/filediff.py:1972
+#: meld/filediff.py:1982
 msgid "Save Right Pane As"
 msgstr "Tallenna oikea paneeli nimellä"
 
-#: meld/filediff.py:1983
+#: meld/filediff.py:1993
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Tiedosto %s on muuttunut levyllä sen avaamisen jälkeen"
 
-#: meld/filediff.py:1985
+#: meld/filediff.py:1995
 msgid "If you save it, any external changes will be lost."
 msgstr "Jos tallennat sen, kaikki ulkoiset muutokset häviävät pysyvästi."
 
-#: meld/filediff.py:1988
+#: meld/filediff.py:1998
 msgid "Save Anyway"
 msgstr "Tallenna silti"
 
-#: meld/filediff.py:1989
+#: meld/filediff.py:1999
 msgid "Don’t Save"
 msgstr "Älä tallenna"
 
-#: meld/filediff.py:2031
+#: meld/filediff.py:2041
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1919,7 +1941,7 @@ msgstr ""
 "Tiedosto “{}” sisältää merkkejä, joita ei voi esittää sen nykyisessä "
 "merkistössä “{}”."
 
-#: meld/filediff.py:2035 meld/patchdialog.py:138
+#: meld/filediff.py:2045 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1928,16 +1950,16 @@ msgstr ""
 "Tiedostoa ei voitu tallentaa, syy:\n"
 "%s"
 
-#: meld/filediff.py:2039 meld/patchdialog.py:137
+#: meld/filediff.py:2049 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Tiedoston %s tallentaminen epäonnistui."
 
-#: meld/filediff.py:2440
+#: meld/filediff.py:2450
 msgid "Live comparison updating disabled"
 msgstr "Reaaliaikainen vertailupäivitys poistettu käytöstä"
 
-#: meld/filediff.py:2441
+#: meld/filediff.py:2451
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2100,7 +2122,7 @@ msgid "Need three files to auto-merge, got: %r"
 msgstr ""
 "Automaattista yhdistämistä varten tarvitaan kolme tiedostoa, saatiin: %r"
 
-#: meld/meldwindow.py:403
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Hakemistoja ja tiedostoja ei voi verrata samanaikaisesti"
 
@@ -2253,6 +2275,11 @@ msgstr "Puuttuu"
 msgid "Not present"
 msgstr "Ei läsnä"
 
+#: meld/vc/_vc.py:82
+#| msgid "Scanning %s"
+msgid "Scanning…"
+msgstr "Kartoitetaan…"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
 #: meld/vcview.py:334

From d14ef5e9c37d198c51ce2b02307ee5c8361a6afd Mon Sep 17 00:00:00 2001
From: Kjell Cato Heskjestad <cato@heskjestad.xyz>
Date: Tue, 15 Mar 2022 12:51:10 +0000
Subject: [PATCH 071/116] =?UTF-8?q?Update=20Norwegian=20Bokm=C3=A5l=20tran?=
 =?UTF-8?q?slation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit c07f01ccb198496bc13ba09593978bc914cb2a10)
---
 po/nb.po | 3728 +++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 2673 insertions(+), 1055 deletions(-)

diff --git a/po/nb.po b/po/nb.po
index e7877f41..3b2d9ac8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5,1467 +5,3085 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
-"Report-Msgid-Bugs-To: Stephen Kennedy <stevek@gnome.org>\n"
-"POT-Creation-Date: 2012-02-04 13:06+0100\n"
-"PO-Revision-Date: 2012-02-04 13:15+0100\n"
-"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
+"POT-Creation-Date: 2019-09-24 19:00+0000\n"
+"PO-Revision-Date: 2019-10-15 16:57+0200\n"
+"Last-Translator: Kjell Cato Heskjestad <cato@heskjestad.xyz>\n"
 "Language-Team: Norwegian/Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.2.1\n"
 
-#: ../bin/meld:97
+#: ../bin/meld:194
 msgid "Cannot import: "
 msgstr "Kan ikke importere: "
 
-#: ../bin/meld:100
+#: ../bin/meld:197
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld krever %s eller høyere."
 
-#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+#: ../bin/meld:243
+#, c-format
+msgid ""
+"Couldn’t load Meld-specific CSS (%s)\n"
+"%s"
+msgstr ""
+"Klarte ikke laste Meld-spesifikk CSS (%s)\n"
+"%s"
+
+#: ../data/org.gnome.meld.desktop.in.h:1
+#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1
 msgid "Meld"
 msgstr "Meld"
 
-#: ../data/meld.desktop.in.h:2
+#: ../data/org.gnome.meld.desktop.in.h:2
 msgid "Diff Viewer"
 msgstr "Vis forskjeller"
 
-#: ../data/meld.desktop.in.h:3
+#: ../data/org.gnome.meld.desktop.in.h:3
 msgid "Meld Diff Viewer"
-msgstr "Meld visning av forskjeller"
+msgstr "Meld: visning av forskjeller"
 
-#: ../data/meld.desktop.in.h:4
+#: ../data/org.gnome.meld.desktop.in.h:4
+#: ../data/org.gnome.meld.appdata.xml.in.h:2
 msgid "Compare and merge your files"
 msgstr "Sammenligne og flett sammen dine filer"
 
-#: ../data/ui/EditableList.ui.h:1
-msgid "Editable List"
-msgstr "Redigerbar liste"
+#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: ../data/org.gnome.meld.desktop.in.h:6
+msgid "diff;merge;"
+msgstr "forskjell;flett;"
 
-#: ../data/ui/EditableList.ui.h:2
-msgid "Active"
-msgstr "Aktiv"
+#: ../data/org.gnome.meld.appdata.xml.in.h:3
+msgid ""
+"Meld is a visual diff and merge tool targeted at developers. Meld helps you "
+"compare files, directories, and version controlled projects. It provides "
+"two- and three-way comparison of both files and directories, and supports "
+"many version control systems including Git, Mercurial, Bazaar and Subversion."
+msgstr ""
+"Meld er et visuelt endrings- og fletteverktøy som er rettet mot utviklere. "
+"Meld kan sammenligne filer, mapper og versjonskontrollerte prosjekter. Meld "
+"tilbyr to- og treveissammenligninger av både filer og mapper, og støtter "
+"mange versjonskontrollsystemer, bl.a. Git, Mercurial, Bazaar og Subversion."
 
-#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:166
-msgid "Name"
-msgstr "Navn"
+#: ../data/org.gnome.meld.appdata.xml.in.h:4
+msgid ""
+"Meld helps you review code changes, understand patches, and makes enormous "
+"merge conflicts slightly less painful."
+msgstr ""
+"Meld lar deg gjennomgå kodeforandringer, oppdateringsfiler («patcher») og "
+"gjør svære flettekonflikter litt lettere."
 
-#: ../data/ui/EditableList.ui.h:4
-msgid "Pattern"
-msgstr "Mønster"
+#: ../data/org.gnome.meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr "GNOME-prosjektet"
 
-#: ../data/ui/EditableList.ui.h:5
-msgid "Add new filter"
-msgstr "Legg til nytt filter"
+#: ../data/mime/org.gnome.meld.xml.in.h:1
+msgid "Meld comparison description"
+msgstr "Meld sammenligningsbeskrivelse"
 
-#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:130
-msgid "_Add"
-msgstr "_Legg til"
+#: ../data/org.gnome.meld.gschema.xml.h:1
+msgid "Default window width"
+msgstr "Vinduets standardbredde"
 
-#: ../data/ui/EditableList.ui.h:7
-msgid "Remove selected filter"
-msgstr "Fjern valgt filter"
+#: ../data/org.gnome.meld.gschema.xml.h:2
+msgid "Default window height"
+msgstr "Vinduets standardhøyde"
 
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:132
-msgid "_Remove"
-msgstr "Fje_rn"
+#: ../data/org.gnome.meld.gschema.xml.h:3
+msgid "Default window maximised state"
+msgstr "Er vinduet maksimert som standard"
 
-#: ../data/ui/EditableList.ui.h:9
-msgid "Move item up"
-msgstr "Flytt oppføring opp"
+#: ../data/org.gnome.meld.gschema.xml.h:4
+msgid "Default window fullscreen state"
+msgstr "Er vinduet i fullskjermmodus som standard"
 
-#: ../data/ui/EditableList.ui.h:10
-msgid "Move _Up"
-msgstr "Flytt _opp"
+#: ../data/org.gnome.meld.gschema.xml.h:5
+msgid "Show toolbar"
+msgstr "Vis verktøylinja"
 
-#: ../data/ui/EditableList.ui.h:11
-msgid "Move item down"
-msgstr "Flytt oppføring ned"
+#: ../data/org.gnome.meld.gschema.xml.h:6
+msgid "If true, the window toolbar is visible."
+msgstr "Hvis sann så vil verktøyslinja være synlig."
 
-#: ../data/ui/EditableList.ui.h:12
-msgid "Move _Down"
-msgstr "Flytt ne_d"
+#: ../data/org.gnome.meld.gschema.xml.h:7
+msgid "Show statusbar"
+msgstr "Vis statuslinje"
 
-#: ../data/ui/filediff.ui.h:1
-msgid "Save modified files?"
-msgstr "Lagre endrede filer?"
+#: ../data/org.gnome.meld.gschema.xml.h:8
+msgid "If true, the window statusbar is visible."
+msgstr "Hvis sann så vil vinduets statuslinje være synlig."
 
-#: ../data/ui/filediff.ui.h:2
-msgid ""
-"Some files have been modified.\n"
-"Which ones would you like to save?"
-msgstr ""
+#: ../data/org.gnome.meld.gschema.xml.h:9
+msgid "Additional automatically detected text encodings"
+msgstr "Flere automatisk gjenkjente tegnkodinger"
 
-#: ../data/ui/filediff.ui.h:4
-msgid "_Discard Changes"
+#: ../data/org.gnome.meld.gschema.xml.h:10
+msgid ""
+"Meld will use these text encodings to try to decode loaded text files before "
+"trying any other encodings. In addition to the encodings in this list, UTF-8 "
+"and the current locale-default encoding will always be used; other encodings "
+"may also be tried, depending on the user’s locale."
 msgstr ""
+"Meld bruker disse tegnkodinger til å forsøke å dekode innleste tekstfiler "
+"før andre tegnkodinger forsøkes. I tillegg til tegnkodingene i denne lista "
+"så vil alltid UTF-8 og tegnkodingen til gjeldende regionaltilpasning kunne "
+"brukes. Andre tegnkodinger vil kunne forsøkes avhengig av brukerens region."
 
-#: ../data/ui/filediff.ui.h:5
-msgid "_Save Selected"
-msgstr "_Lagre valgt"
+#: ../data/org.gnome.meld.gschema.xml.h:11
+msgid "Width of an indentation step"
+msgstr "Innrykksbredde"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:141
-msgid "_Replace"
-msgstr "E_rstatt"
+#: ../data/org.gnome.meld.gschema.xml.h:12
+msgid "The number of spaces to use for a single indent step"
+msgstr "Antall mellomrom i et enkelt innrykk"
 
-#: ../data/ui/findbar.ui.h:2
-msgid "Replace _All"
-msgstr "Erstatt _alle"
+#: ../data/org.gnome.meld.gschema.xml.h:13
+msgid "Whether to indent using spaces or tabs"
+msgstr "Om innrykket består av mellomrom eller tabulatortegn"
 
-#: ../data/ui/findbar.ui.h:3
-msgid "_Previous"
-msgstr "_Forrige"
+#: ../data/org.gnome.meld.gschema.xml.h:14
+msgid "If true, any new indentation will use spaces instead of tabs."
+msgstr "Hvis sann så vil nye innrykk bruke mellomrom istedenfor tabulatortegn."
 
-#: ../data/ui/findbar.ui.h:4
-msgid "_Next"
-msgstr "_Neste"
+#: ../data/org.gnome.meld.gschema.xml.h:15
+msgid "Show line numbers"
+msgstr "Vis linjenummer"
 
-#: ../data/ui/findbar.ui.h:5
-msgid "_Search for"
-msgstr "_Søk etter"
+#: ../data/org.gnome.meld.gschema.xml.h:16
+msgid "If true, line numbers will be shown in the gutter of file comparisons."
+msgstr "Velg for å vise linjenummer i filsammenligninger."
 
-#: ../data/ui/findbar.ui.h:6
-msgid "Replace _With"
-msgstr "Erstatt _med"
+#: ../data/org.gnome.meld.gschema.xml.h:17
+msgid "Highlight syntax"
+msgstr "Syntaksmerking"
 
-#: ../data/ui/findbar.ui.h:7
-msgid "_Match Case"
+#: ../data/org.gnome.meld.gschema.xml.h:18
+msgid ""
+"Whether to highlight syntax in comparisons. Because of Meld’s own color "
+"highlighting, this is off by default."
 msgstr ""
+"Velg for å bruke fargekodet syntaksmerking i sammenligninger. Dette er slått "
+"av som standard fordi Meld bruker sin egen utheving med farger."
 
-#: ../data/ui/findbar.ui.h:8
-msgid "Who_le word"
-msgstr "He_le ord"
+#: ../data/org.gnome.meld.gschema.xml.h:19
+msgid "Color scheme to use for syntax highlighting"
+msgstr "Fargeskjema for syntaksmerking"
 
-#: ../data/ui/findbar.ui.h:9
-#, fuzzy
-msgid "Regular E_xpression"
-msgstr "Vanlig uttrykk"
+#: ../data/org.gnome.meld.gschema.xml.h:20
+msgid "Used by GtkSourceView to determine colors for syntax highlighting"
+msgstr "Brukes av GtkSourceView til å bestemme farger for syntaksmerking"
 
-#: ../data/ui/meldapp.ui.h:2
+#: ../data/org.gnome.meld.gschema.xml.h:21
+msgid "Displayed whitespace"
+msgstr "Blanktegn som vises"
+
+#: ../data/org.gnome.meld.gschema.xml.h:22
 msgid ""
-"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
-"Copyright &#xA9; 2009-2011 Kai Willadsen"
+"Selector for individual whitespace character types to be shown. Possible "
+"values are 'space', 'tab', 'newline' and 'nbsp'."
 msgstr ""
+"Utvalg av typer blanktegn som vises. Mulige verdier er «space», «tab», "
+"«newline» og «nbsp»."
 
-#: ../data/ui/meldapp.ui.h:4
-msgid "translator-credits"
-msgstr "Kjartan Maraas <kmaraas@gnome.org>"
+#: ../data/org.gnome.meld.gschema.xml.h:23
+msgid "Wrap mode"
+msgstr "Type linjebryting"
 
-#: ../data/ui/meldapp.ui.h:5
-msgid "Choose Files"
-msgstr "Velg filer"
+#: ../data/org.gnome.meld.gschema.xml.h:24
+msgid ""
+"Lines in file comparisons will be wrapped according to this setting, either "
+"not at all ('none'), at any character ('char') or only at the end of words "
+"('word')."
+msgstr ""
+"Linjer i filsammenligninger vil brytes i henhold til denne innstillingen. "
+"Enten ikke i det hele tatt, i et vilkårlig tegn, eller kun i slutten av ord."
 
-#: ../data/ui/meldapp.ui.h:6
-msgid "_Three Way Compare"
-msgstr "_Treveis sammenligning"
+#: ../data/org.gnome.meld.gschema.xml.h:25
+msgid "Highlight current line"
+msgstr "Uthev gjeldende linje"
 
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:8
-msgid "Mine"
-msgstr "Min"
+#: ../data/org.gnome.meld.gschema.xml.h:26
+msgid ""
+"If true, the line containing the cursor will be highlighted in file "
+"comparisons."
+msgstr "Velg for å utheve linja med skrivemerket i filsammenligninger."
 
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:10
-msgid "Original"
-msgstr "Opprinnelig"
+#: ../data/org.gnome.meld.gschema.xml.h:27
+msgid "Use the system default monospace font"
+msgstr "Bruk systemets skrift med fast bredde"
 
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:12
-msgid "Other"
-msgstr "Andre"
+#: ../data/org.gnome.meld.gschema.xml.h:28
+msgid ""
+"If false, custom-font will be used instead of the system monospace font."
+msgstr ""
+"Fravelg for å bruke en selvvalgt skrift istedenfor systemets skrift med fast "
+"bredde."
 
-#: ../data/ui/meldapp.ui.h:13
-msgid "_File Comparison"
-msgstr "_Filsammenligning"
+#: ../data/org.gnome.meld.gschema.xml.h:29
+msgid "Custom font"
+msgstr "Tilpasset skrift"
 
-#: ../data/ui/meldapp.ui.h:14
-msgid "_Directory Comparison"
-msgstr "_Katalogsammenligning"
+#: ../data/org.gnome.meld.gschema.xml.h:30
+msgid ""
+"The custom font to use, stored as a string and parsed as a Pango font "
+"description."
+msgstr ""
+"Den selvvalgte skriften som skal brukes. Lagres og tolkes som en tekststreng "
+"i Pango-format."
 
-#: ../data/ui/meldapp.ui.h:15
-msgid "Select VC Directory"
-msgstr "Velg katalog under versjonskontroll"
+#: ../data/org.gnome.meld.gschema.xml.h:31
+msgid "Ignore blank lines when comparing files"
+msgstr "Hopp over tomme linjer når filer sammenlignes"
 
-#: ../data/ui/meldapp.ui.h:16
-msgid "Directory"
-msgstr "Katalog"
+#: ../data/org.gnome.meld.gschema.xml.h:32
+msgid ""
+"If true, blank lines will be trimmed when highlighting changes between files."
+msgstr "Velg for å fjerne tomme linjer når endringer mellom filene utheves."
 
-#: ../data/ui/meldapp.ui.h:17
-#, fuzzy
-msgid "_Version Control Browser"
-msgstr "Git versjonskontroll"
+#: ../data/org.gnome.meld.gschema.xml.h:33
+msgid "Use the system default editor"
+msgstr "Bruk systemets forvalgte redigeringsprogram"
 
-#: ../data/ui/patch-dialog.ui.h:1
-#, fuzzy
-msgid "Create Patch"
-msgstr "Opprett"
+#: ../data/org.gnome.meld.gschema.xml.h:34
+msgid ""
+"If false, custom-editor-command will be used instead of the system editor "
+"when opening files externally."
+msgstr ""
+"Fravelg for å bruke en tilpasset redigeringskommando istedenfor systemets "
+"forvalgte redigeringsprogram når filer åpnes eksternt."
 
-#: ../data/ui/patch-dialog.ui.h:2
-#, fuzzy
-msgid "Create a patch"
-msgstr "Opprett"
+#: ../data/org.gnome.meld.gschema.xml.h:35
+msgid "The custom editor launch command"
+msgstr "Kommando som starter det selvvalgte redigeringsprogrammet"
 
-#: ../data/ui/patch-dialog.ui.h:3
-msgid "Use differences between:"
+#: ../data/org.gnome.meld.gschema.xml.h:36
+msgid ""
+"The command used to launch a custom editor. Some limited templating is "
+"supported here; at the moment '{file}' and '{line}' are recognised tokens."
 msgstr ""
+"Kommandoen som starter det selvvalgte redigeringsprogrammet. Symbolene "
+"«{file}» og «{line}» vil erstattes med riktig verdi."
 
-#: ../data/ui/patch-dialog.ui.h:4
-msgid "Left and middle panes"
+#: ../data/org.gnome.meld.gschema.xml.h:37
+msgid "Columns to display"
+msgstr "Vis disse kolonnene"
+
+#: ../data/org.gnome.meld.gschema.xml.h:38
+msgid ""
+"List of column names in folder comparison and whether they should be "
+"displayed."
 msgstr ""
+"Liste med kolonnenavn i mappesammenligninger og hvorvidt de skal vises."
 
-#: ../data/ui/patch-dialog.ui.h:5
-msgid "Middle and right panes"
+#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25
+msgid "Ignore symbolic links"
+msgstr "Ignorer symbolske lenker"
+
+#: ../data/org.gnome.meld.gschema.xml.h:40
+msgid ""
+"If true, folder comparisons do not follow symbolic links when traversing the "
+"folder tree."
 msgstr ""
+"Velg for å ikke følge symbolske lenker når mappetreet gjennomsøkes i "
+"mappesammenligninger."
 
-#: ../data/ui/patch-dialog.ui.h:6
-msgid "_Reverse patch direction"
+#: ../data/org.gnome.meld.gschema.xml.h:41
+msgid "Use shallow comparison"
+msgstr "Bruk grunn sammenligning"
+
+#: ../data/org.gnome.meld.gschema.xml.h:42
+msgid ""
+"If true, folder comparisons compare files based solely on size and mtime, "
+"considering files to be identical if their size and mtime match, and "
+"different otherwise."
 msgstr ""
+"Velg for å sjekke kun størrelse og «mtime» når mapper sammenlignes. Filer er "
+"like hvis størrelse og «mtime» er like, ellers er de forskjellige."
 
-#: ../data/ui/patch-dialog.ui.h:7
-msgid "Copy to Clipboard"
-msgstr "Kopier til utklippstavlen"
+#: ../data/org.gnome.meld.gschema.xml.h:43
+msgid "File timestamp resolution"
+msgstr "Oppløsning til filenes tidsstempler"
 
-#: ../data/ui/preferences.ui.h:1
-msgid "Meld Preferences"
-msgstr "Brukervalg for Meld"
+#: ../data/org.gnome.meld.gschema.xml.h:44
+msgid ""
+"When comparing based on mtime, this is the minimum difference in nanoseconds "
+"between two files before they’re considered to have different mtimes. This "
+"is useful when comparing files between filesystems with different timestamp "
+"resolution."
+msgstr ""
+"Gjelder sammenligninger som bruker «mtime». Dette er minste forskjell i "
+"nanosekunder mellom «mtime» til to filer før de betraktes som forskjellige. "
+"Dette er nyttig når en sammenligner filer mellom filsystemer som har ulik "
+"oppløsning for tidsstempel."
 
-#: ../data/ui/preferences.ui.h:2
-msgid "Font"
-msgstr "Skrift"
+#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22
+msgid "Apply text filters during folder comparisons"
+msgstr "Bruk tekstfiltre når mapper sammenlignes"
 
-#: ../data/ui/preferences.ui.h:3
-msgid "_Use the system fixed width font"
-msgstr "Br_uk systemets skrift med fast bredde"
+#: ../data/org.gnome.meld.gschema.xml.h:46
+msgid ""
+"If true, folder comparisons that compare file contents also apply active "
+"text filters and the blank line trimming option, and ignore newline "
+"differences."
+msgstr ""
+"Velg for å la mappesammenligninger som også sammenligner filinnhold a) bruke "
+"aktive tekstfiltre, b) fjerne tomme linjer og c) se bort fra forskjell i "
+"linjeavslutninger."
 
-#: ../data/ui/preferences.ui.h:4
-msgid "_Editor font:"
-msgstr "Skrift for r_edigering:"
+#: ../data/org.gnome.meld.gschema.xml.h:47
+msgid "File status filters"
+msgstr "Filtre for filstatus"
 
-#: ../data/ui/preferences.ui.h:5
-msgid "Display"
-msgstr "Visning"
+#: ../data/org.gnome.meld.gschema.xml.h:48
+msgid "List of statuses used to filter visible files in folder comparison."
+msgstr ""
+"Liste med statuser som brukes til å filtrere synlige filer når mapper "
+"sammenlignes."
 
-#: ../data/ui/preferences.ui.h:6
-msgid "_Tab width:"
-msgstr "_Tabulatorbredde:"
+#: ../data/org.gnome.meld.gschema.xml.h:49
+msgid "Show the version control console output"
+msgstr "Vis versjonskontrollens konsollutdata"
 
-#: ../data/ui/preferences.ui.h:7
-msgid "_Insert spaces instead of tabs"
-msgstr "Sett _inn mellomrom i stedet for tabulator"
+#: ../data/org.gnome.meld.gschema.xml.h:50
+msgid ""
+"If true, a console output section will be shown in version control views, "
+"showing the commands run for version control operations."
+msgstr ""
+"Hvis sann så vil konsollutdata vises i versjonskontrollmodus. Her vil "
+"kommandoene som kjøres for versjonskontrollering vises."
 
-#: ../data/ui/preferences.ui.h:8
-msgid "Enable text _wrapping"
-msgstr "Slå på tekst_bryting"
+#: ../data/org.gnome.meld.gschema.xml.h:51
+msgid "Version control pane position"
+msgstr "Posisjonen til versjonskontrollruta"
 
-#: ../data/ui/preferences.ui.h:9
-msgid "Do not _split words over two lines"
-msgstr "Ikke _del ord over to linjer"
+#: ../data/org.gnome.meld.gschema.xml.h:52
+msgid ""
+"This is the height of the main version control tree when the console pane is "
+"shown."
+msgstr ""
+"Dette er høyden til hovedtreet for versjonskontrollering når konsollruta "
+"vises."
 
-#: ../data/ui/preferences.ui.h:10
-msgid "Show _line numbers"
-msgstr "Vis _linjenummer"
+#: ../data/org.gnome.meld.gschema.xml.h:53
+msgid "Present version comparisons as left-local/right-remote"
+msgstr "Vis versjonssammenligninger som venstre-lokal/høyre-ekstern"
 
-#: ../data/ui/preferences.ui.h:11
-msgid "Show w_hitespace"
-msgstr "Vis _tomrom"
+#: ../data/org.gnome.meld.gschema.xml.h:54
+msgid ""
+"If true, version control comparisons will use a left-is-local, right-is-"
+"remote scheme to determine what order to present files in panes. Otherwise, "
+"a left-is-theirs, right-is-mine scheme is used."
+msgstr ""
+"Hvis sann så vil versjonskontrollsammenligninger bruke rekkefølgen venstre-"
+"er-lokal og høyre-er-ekstern. Ellers vil rekkefølgen være venstre-er deres, "
+"høyre-er-mitt."
 
-#: ../data/ui/preferences.ui.h:12
-msgid "Use s_yntax highlighting"
-msgstr "Slå på utheving av s_yntaks"
+#: ../data/org.gnome.meld.gschema.xml.h:55
+msgid "Order for files in three-way version control merge comparisons"
+msgstr "Filrekkefølge i flettesammenligninger i treveis-versjonskontrollering"
 
-#: ../data/ui/preferences.ui.h:13
-msgid "External editor"
-msgstr "Eksternt redigeringsprogram"
+#: ../data/org.gnome.meld.gschema.xml.h:56
+msgid ""
+"Choices for file order are remote/merged/local and local/merged/remote. This "
+"preference only affects three-way comparisons launched from the version "
+"control view, so is used solely for merges/conflict resolution within Meld."
+msgstr ""
+"Mulige valg for filrekkefølge er ekstern/flettet/lokal og lokal/flettet/"
+"ekstern. Denne innstillingen gjelder kun treveissammenligninger som startes "
+"fra versjonskontrollvisningen, så den brukes kun til sammenfletting/"
+"konfliktløsing i Meld."
 
-#: ../data/ui/preferences.ui.h:14
-msgid "Use _default system editor"
-msgstr "Bruk systemets _forvalgte redigeringsprogram"
+#: ../data/org.gnome.meld.gschema.xml.h:57
+msgid "Show margin in commit message editor"
+msgstr "Vis margen i redigeringsboksen for innleggingsmeldinger"
 
-#: ../data/ui/preferences.ui.h:15
-msgid "Edito_r command:"
-msgstr "_Redigeringskommando:"
+#: ../data/org.gnome.meld.gschema.xml.h:58
+msgid ""
+"If true, a guide will be displayed to show what column the margin is at in "
+"the version control commit message editor."
+msgstr ""
+"Hvis sann så vil en hjelpelinje vise i hvilken kolonne margen er i "
+"redigeringsboksen for innleggingsmeldinger til versjonskontrollen."
 
-#: ../data/ui/preferences.ui.h:16
-msgid "Editor"
-msgstr "Editor"
+#: ../data/org.gnome.meld.gschema.xml.h:59
+msgid "Margin column in commit message editor"
+msgstr "Margkolonne i redigeringsboks for innleggingsmeldinger"
 
-#: ../data/ui/preferences.ui.h:17
+#: ../data/org.gnome.meld.gschema.xml.h:60
 msgid ""
-"When performing directory comparisons, you may filter out files and "
-"directories by name. Each pattern is a list of shell style wildcards "
-"separated by spaces."
+"The column at which to show the margin in the version control commit message "
+"editor."
 msgstr ""
+"Den kolonnen som margen skal vises i redigeringsboksen til "
+"innleggingsmeldinger."
 
-#: ../data/ui/preferences.ui.h:18
-msgid "Ignore symbolic links"
-msgstr "Ignorer symbolske lenker"
+#: ../data/org.gnome.meld.gschema.xml.h:61
+msgid "Automatically hard-wrap commit messages"
+msgstr "Bryt automatisk tekst i innleggingsmeldinger"
 
-#: ../data/ui/preferences.ui.h:19
-msgid "File Filters"
-msgstr "Filfilter"
+#: ../data/org.gnome.meld.gschema.xml.h:62
+msgid ""
+"If true, the version control commit message editor will hard-wrap (i.e., "
+"insert line breaks) at the commit margin before commit."
+msgstr ""
+"Hvis sann så vil redigeringsboksen til innleggingsmeldinger sette inn "
+"linjeskift i margen før innlegging."
 
-#: ../data/ui/preferences.ui.h:20
+#: ../data/org.gnome.meld.gschema.xml.h:63
+msgid "Version control status filters"
+msgstr "Statusfiltre til versjonskontroll"
+
+#: ../data/org.gnome.meld.gschema.xml.h:64
 msgid ""
-"When performing file comparisons, you may ignore certain types of changes. "
-"Each pattern here is a python regular expression which replaces matching "
-"text with the empty string before comparison is performed. If the expression "
-"contains groups, only the groups are replaced. See the user manual for more "
-"details."
+"List of statuses used to filter visible files in version control comparison."
 msgstr ""
+"En liste med statuser som brukes til å filtrere synlige filer i "
+"versjonskontrollsammenligninger."
 
-#: ../data/ui/preferences.ui.h:21
-msgid "Ignore changes which insert or delete blank lines"
+#: ../data/org.gnome.meld.gschema.xml.h:65
+msgid "Filename-based filters"
+msgstr "Filnavnbaserte filtre"
+
+#: ../data/org.gnome.meld.gschema.xml.h:66
+msgid ""
+"List of predefined filename-based filters that, if active, will remove "
+"matching files from a folder comparison."
 msgstr ""
+"En liste med forhåndsvalgte filnavnbaserte filtre. Hvis de slås på så vil de "
+"fjerne samsvarende filer fra en mappesammenligning."
 
-#: ../data/ui/preferences.ui.h:22
-msgid "Text Filters"
-msgstr "Tekstfiltre"
+#: ../data/org.gnome.meld.gschema.xml.h:67
+msgid "Text-based filters"
+msgstr "Tekstbaserte filtre"
 
-#: ../data/ui/preferences.ui.h:23
-msgid "Loading"
-msgstr "Laster"
+#: ../data/org.gnome.meld.gschema.xml.h:68
+msgid ""
+"List of predefined text-based regex filters that, if active, will remove "
+"text from being used in a file comparison. The text will still be displayed, "
+"but won’t contribute to the comparison itself."
+msgstr ""
+"En liste med forhåndsvalgte tekstbaserte regex-filtre. Hvis de slås på så "
+"vil de utelate tekst fra filsammenligninger. Teksten vil fortsatt vises, men "
+"vil ikke bidra til selve sammenligningen."
 
-#: ../data/ui/preferences.ui.h:24
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+#: ../data/styles/meld-base.xml.h:1
+msgid "Meld base scheme"
+msgstr "Meld grunnleggende skjema"
+
+#: ../data/styles/meld-base.xml.h:2
+msgid "Base color scheme for Meld highlighting"
+msgstr "Grunnleggende fargeskjema for Melds uthevinger"
+
+#: ../data/styles/meld-dark.xml.h:1
+msgid "Meld dark scheme"
+msgstr "Meld mørkt skjema"
+
+#: ../data/styles/meld-dark.xml.h:2
+msgid "Dark color scheme for Meld highlighting"
+msgstr "Mørkt fargeskjema for Melds uthevinger"
+
+#: ../data/ui/application.ui.h:1
+msgid "About Meld"
+msgstr "Om Meld"
+
+#: ../data/ui/application.ui.h:2
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2017 Kai Willadsen"
 msgstr ""
+"Opphavsrett © 2002-2009 Stephen Kennedy\n"
+"Opphavsrett © 2009-2017 Kai Willadsen"
 
-#: ../data/ui/preferences.ui.h:25
-msgid "Encoding"
-msgstr "Koder"
+#: ../data/ui/application.ui.h:4
+msgid "Website"
+msgstr "Nettside"
 
-#: ../data/ui/vcview.ui.h:1
-#, fuzzy
-msgid "VC Log"
-msgstr "Vis logg"
+#: ../data/ui/application.ui.h:5
+msgid "translator-credits"
+msgstr ""
+"Kjartan Maraas <kmaraas@gnome.org> 2001-2012\n"
+"Kjell Cato Heskjestad <cato@heskjestad.xyz> 2019"
 
-#: ../data/ui/vcview.ui.h:2
-#, fuzzy
-msgid "Commit Files"
-msgstr "Ko_mpiler fil"
+#: ../data/ui/application.ui.h:6
+msgid "_Preferences"
+msgstr "_Innstillinger"
 
-#: ../data/ui/vcview.ui.h:3
-#, fuzzy
-msgid "Previous Logs"
-msgstr "Forrige hjelp"
+#: ../data/ui/application.ui.h:7
+msgid "_Help"
+msgstr "_Hjelp"
 
-#: ../data/ui/vcview.ui.h:4
-msgid "Log Message"
-msgstr "Loggmelding"
+#: ../data/ui/application.ui.h:8
+msgid "Keyboard Shortcuts"
+msgstr "Hurtigtaster"
+
+#: ../data/ui/application.ui.h:9
+msgid "_About"
+msgstr "_Om"
 
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
+#: ../data/ui/application.ui.h:10
+msgid "_Quit"
+msgstr "_Avslutt"
+
+#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
 msgid "_Compare"
-msgstr "_Sammenligne"
+msgstr "_Sammenlign"
 
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
-#, fuzzy
-msgid "Compare selected"
-msgstr "Fullført"
+#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
+msgid "Compare selected files"
+msgstr "Sammenlign valgte filer"
 
-#: ../meld/dirdiff.py:233
-msgid "Copy _Left"
-msgstr ""
+#: ../data/ui/dirdiff.ui.h:3
+msgid "Collapse Recursively"
+msgstr "Fold sammen rekursivt"
+
+#: ../data/ui/dirdiff.ui.h:4
+msgid "Collapse selected folder and all subfolders"
+msgstr "Fold sammen valgt mappe og alle undermapper"
 
-#: ../meld/dirdiff.py:233
+#: ../data/ui/dirdiff.ui.h:5
+msgid "Expand Recursively"
+msgstr "Fold ut rekursivt"
+
+#: ../data/ui/dirdiff.ui.h:6
+msgid "Expand selected folder and all subfolders"
+msgstr "Fold ut valgt mappe og alle undermapper"
+
+#: ../data/ui/dirdiff.ui.h:7
+msgid "Copy to _Left"
+msgstr "Kopier til _venstre"
+
+#: ../data/ui/dirdiff.ui.h:8
 msgid "Copy to left"
-msgstr ""
+msgstr "Kopier til venstre"
 
-#: ../meld/dirdiff.py:234
-#, fuzzy
-msgid "Copy _Right"
-msgstr "Høyre"
+#: ../data/ui/dirdiff.ui.h:9
+msgid "Copy to _Right"
+msgstr "Kopier til _høyre"
 
-#: ../meld/dirdiff.py:234
+#: ../data/ui/dirdiff.ui.h:10
 msgid "Copy to right"
-msgstr ""
+msgstr "Kopier til høyre"
 
-#: ../meld/dirdiff.py:235
+#: ../data/ui/dirdiff.ui.h:11
 msgid "Delete selected"
 msgstr "Slett valgte"
 
-#: ../meld/dirdiff.py:236 ../meld/filediff.py:1157
+#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:912 ../meld/filediff.py:1499
 msgid "Hide"
 msgstr "Skjul"
 
-#: ../meld/dirdiff.py:236
+#: ../data/ui/dirdiff.ui.h:13
 msgid "Hide selected"
 msgstr "Skjul valgte"
 
-#: ../meld/dirdiff.py:240
-#, fuzzy
-msgid "Case"
-msgstr "Lukk"
+#: ../data/ui/dirdiff.ui.h:14
+msgid "Ignore Filename Case"
+msgstr "Ikke skill store/små bokstaver i filnavn"
 
-#: ../meld/dirdiff.py:240
-#, fuzzy
-msgid "Ignore case of entries"
-msgstr "Ignorer kataloger:"
+#: ../data/ui/dirdiff.ui.h:15
+msgid ""
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr ""
+"Betrakt filnavn med ulik bokstavstørrelse som ellers er identiske som samme "
+"fil"
 
-#: ../meld/dirdiff.py:241
+#: ../data/ui/dirdiff.ui.h:16
 msgid "Same"
 msgstr "Samme"
 
-#: ../meld/dirdiff.py:241
-#, fuzzy
+#: ../data/ui/dirdiff.ui.h:17
 msgid "Show identical"
-msgstr "Vis signaler fra kjernen"
+msgstr "Vis identiske"
 
-#: ../meld/dirdiff.py:242
+#: ../data/ui/dirdiff.ui.h:18
 msgid "New"
 msgstr "Ny"
 
-#: ../meld/dirdiff.py:242
-#, fuzzy
+#: ../data/ui/dirdiff.ui.h:19
 msgid "Show new"
-msgstr "Vis"
+msgstr "Vis ny"
 
-#: ../meld/dirdiff.py:243
+#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Endret"
 
-#: ../meld/dirdiff.py:243 ../meld/vcview.py:140
+#: ../data/ui/dirdiff.ui.h:21
 msgid "Show modified"
 msgstr "Vis endret"
 
-#: ../meld/dirdiff.py:245
+#: ../data/ui/dirdiff.ui.h:22
 msgid "Filters"
 msgstr "Filtre"
 
-#: ../meld/dirdiff.py:245
+#: ../data/ui/dirdiff.ui.h:23
 msgid "Set active filters"
 msgstr "Sett aktive filtre"
 
-#: ../meld/dirdiff.py:362
-#, python-format
-msgid "Hide %s"
-msgstr "Skjul %s"
+#: ../data/ui/EditableList.ui.h:1
+msgid "Editable List"
+msgstr "Redigerbar liste"
 
-#: ../meld/dirdiff.py:465 ../meld/dirdiff.py:478 ../meld/vcview.py:322
-#: ../meld/vcview.py:346
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr ""
+#: ../data/ui/EditableList.ui.h:2
+msgid "Active"
+msgstr "Aktiv"
 
-#: ../meld/dirdiff.py:577
-#, python-format
-msgid "[%s] Done"
-msgstr ""
+#: ../data/ui/EditableList.ui.h:3
+msgid "Column Name"
+msgstr "Kolonnenavn"
 
-#: ../meld/dirdiff.py:581
-msgid "Multiple errors occurred while scanning this folder"
-msgstr ""
+#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9
+msgid "_Add"
+msgstr "_Legg til"
 
-#: ../meld/dirdiff.py:582
-msgid "Files with invalid encodings found"
-msgstr ""
+#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
+#: ../meld/vcview.py:680
+msgid "_Remove"
+msgstr "Fje_rn"
 
-#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:584
-msgid "Some files were in an incorrect encoding. The names are something like:"
-msgstr ""
+#: ../data/ui/EditableList.ui.h:6
+msgid "Move item up"
+msgstr "Flytt oppføring opp"
 
-#: ../meld/dirdiff.py:586
-msgid "Files hidden by case insensitive comparison"
-msgstr ""
+#: ../data/ui/EditableList.ui.h:7
+msgid "Move _Up"
+msgstr "Flytt _opp"
 
-#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:588
-msgid ""
-"You are running a case insensitive comparison on a case sensitive "
-"filesystem. The following files in this folder are hidden:"
+#: ../data/ui/EditableList.ui.h:8
+msgid "Move item down"
+msgstr "Flytt oppføring ned"
+
+#: ../data/ui/EditableList.ui.h:9
+msgid "Move _Down"
+msgstr "Flytt ne_d"
+
+#. Create icon and filename CellRenderer
+#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
+#: ../meld/dirdiff.py:412
+msgid "Name"
+msgstr "Navn"
+
+#: ../data/ui/EditableList.ui.h:11
+msgid "Pattern"
+msgstr "Mønster"
+
+#: ../data/ui/EditableList.ui.h:12
+msgid "Add new filter"
+msgstr "Legg til nytt filter"
+
+#: ../data/ui/EditableList.ui.h:13
+msgid "Remove selected filter"
+msgstr "Fjern valgt filter"
+
+#: ../data/ui/encoding-selector.ui.h:1
+msgid "Search text encoding…"
+msgstr "Søk etter tegnkoding …"
+
+#: ../data/ui/filediff.ui.h:1
+msgid "Format as Patch…"
+msgstr "Formater som endringsfil …"
+
+#: ../data/ui/filediff.ui.h:2
+msgid "Create a patch using differences between files"
+msgstr "Lag en endringsfil ut fra forskjellene mellom filene"
+
+#: ../data/ui/filediff.ui.h:3
+msgid "Save A_ll"
+msgstr "Lagre _alle"
+
+#: ../data/ui/filediff.ui.h:4
+msgid "Save all files in the current comparison"
+msgstr "Lagre alle filer i gjeldende sammenligning"
+
+#: ../data/ui/filediff.ui.h:5
+msgid "Revert files to their saved versions"
+msgstr "Tilbakestill filer til lagret versjon"
+
+#: ../data/ui/filediff.ui.h:6
+msgid "Add Synchronization Point"
+msgstr "Legg til synkroniseringspunkt"
+
+#: ../data/ui/filediff.ui.h:7
+msgid "Add a synchronization point for changes between files"
+msgstr "Legg til et synkroniseringspunkt for endringer mellom filer"
+
+#: ../data/ui/filediff.ui.h:8
+msgid "Clear Synchronization Points"
+msgstr "Tøm synkroniseringspunkt"
+
+#: ../data/ui/filediff.ui.h:9
+msgid "Clear sychronization points for changes between files"
+msgstr "Tøm synkroniseringspunkt for endringer mellom filer"
+
+#: ../data/ui/filediff.ui.h:10
+msgid "Previous Conflict"
+msgstr "Forrige konflikt"
+
+#: ../data/ui/filediff.ui.h:11
+msgid "Go to the previous conflict"
+msgstr "Gå til forrige konflikt"
+
+#: ../data/ui/filediff.ui.h:12
+msgid "Next Conflict"
+msgstr "Neste konflikt"
+
+#: ../data/ui/filediff.ui.h:13
+msgid "Go to the next conflict"
+msgstr "Gå til neste konflikt"
+
+#: ../data/ui/filediff.ui.h:14
+msgid "Push to Left"
+msgstr "Dytt til venstre"
+
+#: ../data/ui/filediff.ui.h:15
+msgid "Push current change to the left"
+msgstr "Dytt gjeldende endring til venstre"
+
+#: ../data/ui/filediff.ui.h:16
+msgid "Push to Right"
+msgstr "Dytt til høyre"
+
+#: ../data/ui/filediff.ui.h:17
+msgid "Push current change to the right"
+msgstr "Dytt gjeldende endring til høyre"
+
+#: ../data/ui/filediff.ui.h:18
+msgid "Pull from Left"
+msgstr "Dra fra venstre"
+
+#: ../data/ui/filediff.ui.h:19
+msgid "Pull change from the left"
+msgstr "Dra endring fra venstre"
+
+#: ../data/ui/filediff.ui.h:20
+msgid "Pull from Right"
+msgstr "Dra fra høyre"
+
+#: ../data/ui/filediff.ui.h:21
+msgid "Pull change from the right"
+msgstr "Dra endring fra høyre"
+
+#: ../data/ui/filediff.ui.h:22
+msgid "Copy Above Left"
+msgstr "Kopier over til venstre"
+
+#: ../data/ui/filediff.ui.h:23
+msgid "Copy change above the left chunk"
+msgstr "Kopier endring over det venstre stykket"
+
+#: ../data/ui/filediff.ui.h:24
+msgid "Copy Below Left"
+msgstr "Kopier under til venstre"
+
+#: ../data/ui/filediff.ui.h:25
+msgid "Copy change below the left chunk"
+msgstr "Kopier endring under det venstre stykket"
+
+#: ../data/ui/filediff.ui.h:26
+msgid "Copy Above Right"
+msgstr "Kopier over til høyre"
+
+#: ../data/ui/filediff.ui.h:27
+msgid "Copy change above the right chunk"
+msgstr "Kopier endring over det høyre stykket"
+
+#: ../data/ui/filediff.ui.h:28
+msgid "Copy Below Right"
+msgstr "Kopier under til høyre"
+
+#: ../data/ui/filediff.ui.h:29
+msgid "Copy change below the right chunk"
+msgstr "Kopier endring under det høyre stykket"
+
+#: ../data/ui/filediff.ui.h:30
+msgid "Delete"
+msgstr "Slett"
+
+#: ../data/ui/filediff.ui.h:31
+msgid "Delete change"
+msgstr "Slett endring"
+
+#: ../data/ui/filediff.ui.h:32
+msgid "Merge All from Left"
+msgstr "Flett alle fra venstre"
+
+#: ../data/ui/filediff.ui.h:33
+msgid "Merge all non-conflicting changes from the left"
+msgstr "Flett alle endringer uten konflikter fra venstre"
+
+#: ../data/ui/filediff.ui.h:34
+msgid "Merge All from Right"
+msgstr "Flett alle fra høyre"
+
+#: ../data/ui/filediff.ui.h:35
+msgid "Merge all non-conflicting changes from the right"
+msgstr "Flett alle endringer uten konflikter fra høyre"
+
+#: ../data/ui/filediff.ui.h:36
+msgid "Merge All"
+msgstr "Flett alle"
+
+#: ../data/ui/filediff.ui.h:37
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr "Flett alle endringer uten konflikter fra venstre og høyre paneler"
+
+#: ../data/ui/filediff.ui.h:38
+msgid "Previous Pane"
+msgstr "Forrige rute"
+
+#: ../data/ui/filediff.ui.h:39
+msgid "Move keyboard focus to the previous document in this comparison"
+msgstr "Flytt tastaturfokus til forrige dokument i denne sammenligningen"
+
+#: ../data/ui/filediff.ui.h:40
+msgid "Next Pane"
+msgstr "Neste rute"
+
+#: ../data/ui/filediff.ui.h:41
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr "Flytt tastaturfokus til neste dokument i denne sammenligningen"
+
+#: ../data/ui/filediff.ui.h:42
+msgid "Lock Scrolling"
+msgstr "Lås rulling"
+
+#: ../data/ui/filediff.ui.h:43
+msgid "Lock scrolling of all panes"
+msgstr "Lås rulling av alle panelene"
+
+#: ../data/ui/filediff.ui.h:44
+msgid "Save changes to documents before closing?"
+msgstr "Lagre endringer i dokumentene før avslutning?"
+
+#: ../data/ui/filediff.ui.h:45
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Hvis du ikke lagrer så vil endringene gå tapt."
+
+#: ../data/ui/filediff.ui.h:46
+msgid "Close _without Saving"
+msgstr "Lukk _uten å lagre"
+
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:993 ../meld/iohelpers.py:56
+#: ../meld/iohelpers.py:106
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: ../data/ui/filediff.ui.h:48
+msgid "_Save"
+msgstr "_Lagre"
+
+#: ../data/ui/filediff.ui.h:49
+msgid ""
+"This file can not be written to. You may click here to unlock this file and "
+"make changes anyway, but these changes must be saved to a new file."
 msgstr ""
+"Kan ikke skrive til fila. Du kan klikke her for å låse opp fila og endre den "
+"likevel, men disse endringene må lagres til en ny fil."
+
+#: ../data/ui/filediff.ui.h:50
+msgid "File 3"
+msgstr "Fil 3"
+
+#: ../data/ui/filediff.ui.h:51
+msgid "File 2"
+msgstr "Fil 2"
+
+#: ../data/ui/filediff.ui.h:52
+msgid "File 1"
+msgstr "Fil 1"
+
+#: ../data/ui/filediff.ui.h:53
+msgid "Discard unsaved changes to documents?"
+msgstr "Forkast endringer i dokumentene som ikke er lagret?"
+
+#: ../data/ui/filediff.ui.h:54
+msgid "Changes made to the following documents will be permanently lost:"
+msgstr "Endringer i følgende dokumenter vil gå tapt:"
+
+#: ../data/ui/filediff.ui.h:55
+msgid "_Discard"
+msgstr "_Forkast"
+
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:994 ../meld/iohelpers.py:107
+msgid "_Replace"
+msgstr "_Erstatt"
+
+#: ../data/ui/findbar.ui.h:2
+msgid "Replace _All"
+msgstr "Erstatt _alle"
+
+#: ../data/ui/findbar.ui.h:3
+msgid "_Previous"
+msgstr "Forri_ge"
+
+#: ../data/ui/findbar.ui.h:4
+msgid "_Next"
+msgstr "_Neste"
+
+#: ../data/ui/findbar.ui.h:5
+msgid "Find:"
+msgstr "Søk:"
+
+#: ../data/ui/findbar.ui.h:6
+msgid "Replace _with:"
+msgstr "Erstatt _med:"
+
+#: ../data/ui/findbar.ui.h:7
+msgid "_Match case"
+msgstr "Skill store og sm_å bokstaver"
+
+#: ../data/ui/findbar.ui.h:8
+msgid "Who_le word"
+msgstr "_Hele ord"
+
+#: ../data/ui/findbar.ui.h:9
+msgid "Regular e_xpression"
+msgstr "Regul_ært uttrykk"
+
+#: ../data/ui/findbar.ui.h:10
+msgid "Wrapped"
+msgstr "Søk rundt"
+
+#: ../data/ui/language-selector.ui.h:1
+msgid "Search highlight mode…"
+msgstr "Modus for søkeutheving …"
+
+#: ../data/ui/patch-dialog.ui.h:1
+msgid "Format as Patch"
+msgstr "Formater som endringsfil"
+
+#: ../data/ui/patch-dialog.ui.h:2
+msgid "Copy to Clipboard"
+msgstr "Kopier til utklippstavlen"
+
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152
+msgid "Save Patch"
+msgstr "Lagre endringsfil"
+
+#: ../data/ui/patch-dialog.ui.h:4
+msgid "Use differences between:"
+msgstr "Bruk forskjeller mellom:"
+
+#: ../data/ui/patch-dialog.ui.h:5
+msgid "Left and middle panes"
+msgstr "Venstre og midtre rute"
+
+#: ../data/ui/patch-dialog.ui.h:6
+msgid "Middle and right panes"
+msgstr "Midtre og høyre rute"
+
+#: ../data/ui/patch-dialog.ui.h:7
+msgid "_Reverse patch direction"
+msgstr "_Motsatt endringsretning"
+
+#: ../data/ui/preferences.ui.h:1
+msgid "Meld Preferences"
+msgstr "Brukervalg for Meld"
+
+#: ../data/ui/preferences.ui.h:2
+msgid "Font"
+msgstr "Skrift"
+
+#: ../data/ui/preferences.ui.h:3
+msgid "_Use the system fixed width font"
+msgstr "Br_uk systemets skrift med fast bredde"
+
+#: ../data/ui/preferences.ui.h:4
+msgid "_Editor font:"
+msgstr "Skrift for r_edigering:"
+
+#: ../data/ui/preferences.ui.h:5
+msgid "Display"
+msgstr "Visning"
+
+#: ../data/ui/preferences.ui.h:6
+msgid "_Tab width:"
+msgstr "_Tabulatorbredde:"
+
+#: ../data/ui/preferences.ui.h:7
+msgid "_Insert spaces instead of tabs"
+msgstr "Sett _inn mellomrom i stedet for tabulator"
+
+#: ../data/ui/preferences.ui.h:8
+msgid "Enable text _wrapping"
+msgstr "Slå på tekst_bryting"
+
+#: ../data/ui/preferences.ui.h:9
+msgid "Do not _split words over two lines"
+msgstr "Ikke _del ord over to linjer"
+
+#: ../data/ui/preferences.ui.h:10
+msgid "Highlight _current line"
+msgstr "_Uthev gjeldende linje"
+
+#: ../data/ui/preferences.ui.h:11
+msgid "Show _line numbers"
+msgstr "Vis _linjenummer"
+
+#: ../data/ui/preferences.ui.h:12
+msgid "Show w_hitespace"
+msgstr "Vis bla_nktegn"
+
+#: ../data/ui/preferences.ui.h:13
+msgid "Use s_yntax highlighting"
+msgstr "Slå på utheving av s_yntaks"
+
+#: ../data/ui/preferences.ui.h:14
+msgid "Syntax highlighting color scheme:"
+msgstr "Fargeskjema for syntaksmerking:"
+
+#: ../data/ui/preferences.ui.h:15
+msgid "External Editor"
+msgstr "Eksternt redigeringsprogram"
+
+#: ../data/ui/preferences.ui.h:16
+msgid "Use _default system editor"
+msgstr "Bruk systemets _forvalgte redigeringsprogram"
+
+#: ../data/ui/preferences.ui.h:17
+msgid "Edito_r command:"
+msgstr "_Redigeringskommando:"
+
+#: ../data/ui/preferences.ui.h:18
+msgid "Editor"
+msgstr "Redigeringsprogram"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "Shallow Comparison"
+msgstr "Grunn sammenligning"
+
+#: ../data/ui/preferences.ui.h:20
+msgid "C_ompare files based only on size and timestamp"
+msgstr "_Sammenlign filer ut fra størrelse og tidsstempel"
+
+#: ../data/ui/preferences.ui.h:21
+msgid "_Timestamp resolution:"
+msgstr "Oppløsning til _tidsstempel:"
+
+#: ../data/ui/preferences.ui.h:23
+msgid "Note: enabling text filters may make comparing large files much slower"
+msgstr ""
+"Legg merke til at tekstfiltre kan gjøre sammenligning av store filer mye "
+"treigere"
+
+#: ../data/ui/preferences.ui.h:24
+msgid "Symbolic Links"
+msgstr "Symbolske lenker"
+
+#: ../data/ui/preferences.ui.h:26
+msgid "Visible Columns"
+msgstr "Synlige kolonner"
+
+#: ../data/ui/preferences.ui.h:27
+msgid "Folder Comparisons"
+msgstr "Sammenlign mapper"
+
+#: ../data/ui/preferences.ui.h:28
+msgid "Version Comparisons"
+msgstr "Sammenlign versjoner"
+
+#: ../data/ui/preferences.ui.h:29
+msgid "_Order when comparing file revisions:"
+msgstr "_Rekkefølge når filrevisjoner sammenlignes:"
+
+#: ../data/ui/preferences.ui.h:30
+msgid "Order when _merging files:"
+msgstr "Rekkefølge når filer _flettes:"
+
+#: ../data/ui/preferences.ui.h:31
+msgid "Commit Messages"
+msgstr "Innleggingsmeldinger"
+
+#: ../data/ui/preferences.ui.h:32
+msgid "Show _right margin at:"
+msgstr "Vis høyre _marg i:"
+
+#: ../data/ui/preferences.ui.h:33
+msgid "Automatically _break lines at right margin on commit"
+msgstr "_Bryt automatisk linjer i høyre marg ved innlegging"
+
+#: ../data/ui/preferences.ui.h:34
+msgid "Version Control"
+msgstr "Versjonskontroll"
+
+#: ../data/ui/preferences.ui.h:35
+msgid "Filename filters"
+msgstr "Filnavnfiltre"
+
+#: ../data/ui/preferences.ui.h:36
+msgid ""
+"When performing directory comparisons, you may filter out files and "
+"directories by name. Each pattern is a list of shell style wildcards "
+"separated by spaces."
+msgstr ""
+"Under mappesammenligninger kan en filtrere vekkm filer og mapper etter navn. "
+"Hvert mønster er en liste med jokertegn på skallskriptformat som skilles med "
+"mellomrom."
+
+#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105
+msgid "File Filters"
+msgstr "Filfiltre"
+
+#: ../data/ui/preferences.ui.h:38
+msgid "Change trimming"
+msgstr "Endre beskjæring"
+
+#: ../data/ui/preferences.ui.h:39
+msgid "Trim blank line differences from the start and end of changes"
+msgstr "Beskjær tomme linjeforskjeller fra starten og slutten av endringer"
+
+#: ../data/ui/preferences.ui.h:40
+msgid "Text filters"
+msgstr "Tekstfiltre"
+
+#: ../data/ui/preferences.ui.h:41
+msgid ""
+"When performing file comparisons, you may ignore certain types of changes. "
+"Each pattern here is a python regular expression which replaces matching "
+"text with the empty string before comparison is performed. If the expression "
+"contains groups, only the groups are replaced. See the user manual for more "
+"details."
+msgstr ""
+"Under filsammenligninger kan en ignorere visse type endringer. Hvert mønster "
+"er et regulært uttrykk på Python-format som erstatter samsvarende tekst med "
+"en tom streng før sammenligningen utføres. Hvis uttrykket inneholder grupper "
+"så vil kun gruppene erstattes. Se brukerhåndboka for flere detaljer."
+
+#: ../data/ui/preferences.ui.h:42
+msgid "Text Filters"
+msgstr "Tekstfiltre"
+
+#: ../data/ui/preferences.ui.h:43
+msgid "Left is remote, right is local"
+msgstr "Venstre er ekstern, høyre er lokal"
+
+#: ../data/ui/preferences.ui.h:44
+msgid "Left is local, right is remote"
+msgstr "Venstre er lokal, høyre er ekstern"
+
+#: ../data/ui/preferences.ui.h:45
+msgid "Remote, merge, local"
+msgstr "Ekstern, flett, lokal"
+
+#: ../data/ui/preferences.ui.h:46
+msgid "Local, merge, remote"
+msgstr "Lokal, flett, ekstern"
+
+#: ../data/ui/preferences.ui.h:47
+msgid "1ns (ext4)"
+msgstr "1 ns (ext4)"
+
+#: ../data/ui/preferences.ui.h:48
+msgid "100ns (NTFS)"
+msgstr "100 ns (NTFS)"
+
+#: ../data/ui/preferences.ui.h:49
+msgid "1s (ext2/ext3)"
+msgstr "1 s (ext2/ext3)"
+
+#: ../data/ui/preferences.ui.h:50
+msgid "2s (VFAT)"
+msgstr "2 s (VFAT)"
+
+#: ../data/ui/shortcuts.ui.h:1
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Generelt"
+
+#: ../data/ui/shortcuts.ui.h:2
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr "Ny sammenligning"
+
+#: ../data/ui/shortcuts.ui.h:3
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "Lukk en sammenligning"
+
+#: ../data/ui/shortcuts.ui.h:4
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Avslutt Meld"
+
+#: ../data/ui/shortcuts.ui.h:5
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "Stopp gjeldende handling"
+
+#: ../data/ui/shortcuts.ui.h:6
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr "Oppdater sammenligningen"
+
+#: ../data/ui/shortcuts.ui.h:7
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "Fullskjerm"
+
+#: ../data/ui/shortcuts.ui.h:8
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "Faner"
+
+#: ../data/ui/shortcuts.ui.h:9
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr "Gå til forrige fane"
+
+#: ../data/ui/shortcuts.ui.h:10
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr "Gå til neste fane"
+
+#: ../data/ui/shortcuts.ui.h:11
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "Bytt til fane"
+
+#: ../data/ui/shortcuts.ui.h:12
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "Flytt fane til venstre"
+
+#: ../data/ui/shortcuts.ui.h:13
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "Flytt fane til høyre"
+
+#: ../data/ui/shortcuts.ui.h:14
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Endringer"
+
+#: ../data/ui/shortcuts.ui.h:15
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Gå til forrige endring"
+
+#: ../data/ui/shortcuts.ui.h:16
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Gå til neste endring"
+
+#: ../data/ui/shortcuts.ui.h:17
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Redigering"
+
+#: ../data/ui/shortcuts.ui.h:18
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "Angre"
+
+#: ../data/ui/shortcuts.ui.h:19
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "Gjør om"
+
+#: ../data/ui/shortcuts.ui.h:20
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr "Klipp ut"
+
+#: ../data/ui/shortcuts.ui.h:21
+msgctxt "shortcut window"
+msgid "Copy"
+msgstr "Kopier"
+
+#: ../data/ui/shortcuts.ui.h:22
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr "Lim inn"
+
+#: ../data/ui/shortcuts.ui.h:23
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "Søk"
+
+#: ../data/ui/shortcuts.ui.h:24
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "Finn neste"
+
+#: ../data/ui/shortcuts.ui.h:25
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "Finn forrige"
+
+#: ../data/ui/shortcuts.ui.h:26
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "Erstatt"
+
+#: ../data/ui/shortcuts.ui.h:27
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr "Sammenligning av filer"
+
+#: ../data/ui/shortcuts.ui.h:28
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "Lagre gjeldende fil"
+
+#: ../data/ui/shortcuts.ui.h:29
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr "Lagre gjeldende fil til ny sti"
+
+#: ../data/ui/shortcuts.ui.h:30
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr "Lagre alle filer i sammenligning"
+
+#: ../data/ui/shortcuts.ui.h:31
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "Forrige konflikt"
+
+#: ../data/ui/shortcuts.ui.h:32
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr "Neste konflikt"
+
+#: ../data/ui/shortcuts.ui.h:33
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr "Dytt endringen til venstre"
+
+#: ../data/ui/shortcuts.ui.h:34
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr "Dytt endringen til høyre"
+
+#: ../data/ui/shortcuts.ui.h:35
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr "Dra endring fra venstre"
+
+#: ../data/ui/shortcuts.ui.h:36
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr "Dra endring fra høyre"
+
+#: ../data/ui/shortcuts.ui.h:37
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "Kopier endringen ovenfor til venstre"
+
+#: ../data/ui/shortcuts.ui.h:38
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "Kopier endringen nedenfor til venstre"
+
+#: ../data/ui/shortcuts.ui.h:39
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr "Kopier endringen ovenfor til høyre"
+
+#: ../data/ui/shortcuts.ui.h:40
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr "Kopier endringen nedenfor til høyre"
+
+#: ../data/ui/shortcuts.ui.h:41
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "Slett endring"
+
+#: ../data/ui/shortcuts.ui.h:42
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "Forrige sammenligningsrute"
+
+#: ../data/ui/shortcuts.ui.h:43
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "Neste sammenligningsrute"
+
+#: ../data/ui/shortcuts.ui.h:44
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "Sammenligning av mapper"
+
+#: ../data/ui/shortcuts.ui.h:45
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "Kopier til venstre"
+
+#: ../data/ui/shortcuts.ui.h:46
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr "Kopier til høyre"
+
+#: ../data/ui/shortcuts.ui.h:47
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr "Sammenligning av versjoner"
+
+#: ../data/ui/shortcuts.ui.h:48
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr "Legg inn til versjonskontroll"
+
+#: ../data/ui/shortcuts.ui.h:49
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr "Vis/skjul konsollutdata"
+
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567
+#: ../meld/newdifftab.py:49
+msgid "New comparison"
+msgstr "Ny sammenligning"
+
+#: ../data/ui/tab-placeholder.ui.h:2
+msgid "File comparison"
+msgstr "Sammenligning av filer"
+
+#: ../data/ui/tab-placeholder.ui.h:3
+msgid "Directory comparison"
+msgstr "Sammenligning av mapper"
+
+#: ../data/ui/tab-placeholder.ui.h:4
+msgid "Version control view"
+msgstr "Versjonskontroll-visning"
+
+#: ../data/ui/tab-placeholder.ui.h:5
+msgid "_3-way comparison"
+msgstr "_3-veis sammenligning"
+
+#: ../data/ui/tab-placeholder.ui.h:6
+msgid "Select Third File"
+msgstr "Velg tredje fil"
+
+#: ../data/ui/tab-placeholder.ui.h:7
+msgid "Select Second File"
+msgstr "Velg andre fil"
+
+#: ../data/ui/tab-placeholder.ui.h:8
+msgid "Select First File"
+msgstr "Velg første fil"
+
+#: ../data/ui/tab-placeholder.ui.h:9
+msgid "Select First Folder"
+msgstr "Velg første mappe"
+
+#: ../data/ui/tab-placeholder.ui.h:10
+msgid "Select Second Folder"
+msgstr "Velg andre mappe"
+
+#: ../data/ui/tab-placeholder.ui.h:11
+msgid "Select Third Folder"
+msgstr "Velg tredje mappe"
+
+#: ../data/ui/tab-placeholder.ui.h:12
+msgid "Select A Version-Controlled Folder"
+msgstr "Velg en versjonskontrollert mappe"
+
+#: ../data/ui/tab-placeholder.ui.h:13
+msgid "_Blank comparison"
+msgstr "_Blank sammenligning"
+
+#: ../data/ui/tab-placeholder.ui.h:14
+msgid "C_ompare"
+msgstr "_Sammenlign"
+
+#: ../data/ui/vcview.ui.h:3
+msgid "Co_mmit…"
+msgstr "_Legg inn …"
+
+#: ../data/ui/vcview.ui.h:4
+msgid "Commit changes to version control"
+msgstr "Legg inn endringer til versjonskontroll"
+
+#: ../data/ui/vcview.ui.h:5
+msgid "_Update"
+msgstr "_Oppdater"
+
+#: ../data/ui/vcview.ui.h:6
+msgid "Update working copy from version control"
+msgstr "Oppdater arbeidskopi fra versjonskontroll"
+
+#: ../data/ui/vcview.ui.h:7
+msgid "_Push"
+msgstr "_Dytt"
+
+#: ../data/ui/vcview.ui.h:8
+msgid "Push local changes to remote"
+msgstr "Dytt lokale endringer til ekstern"
+
+#: ../data/ui/vcview.ui.h:10
+msgid "Add to version control"
+msgstr "Legg til versjonskontroll"
+
+#: ../data/ui/vcview.ui.h:12
+msgid "Remove from version control"
+msgstr "Fjern fra versjonskontroll"
+
+#: ../data/ui/vcview.ui.h:13
+msgid "Mar_k as Resolved"
+msgstr "_Merk som løst"
+
+#: ../data/ui/vcview.ui.h:14
+msgid "Mark as resolved in version control"
+msgstr "Merk som løst i versjonskontroll"
+
+#: ../data/ui/vcview.ui.h:15
+msgid "Re_vert"
+msgstr "_Tilbakestill"
+
+#: ../data/ui/vcview.ui.h:16
+msgid "Revert working copy to original state"
+msgstr "Tilbakestill arbeidskopien til opprinnelig tilstand"
+
+#: ../data/ui/vcview.ui.h:17
+msgid "Delete from working copy"
+msgstr "Slett fra arbeidskopi"
+
+#: ../data/ui/vcview.ui.h:18
+msgid "Console"
+msgstr "Konsoll"
+
+#: ../data/ui/vcview.ui.h:19
+msgid "Show or hide the version control console output pane"
+msgstr "Vis eller skjul rute med versjonskontrollens konsollutdata"
+
+#: ../data/ui/vcview.ui.h:20
+msgid "_Flatten"
+msgstr "_Forflat"
+
+#: ../data/ui/vcview.ui.h:21
+msgid "Flatten directories"
+msgstr "Forflat mapper"
+
+#: ../data/ui/vcview.ui.h:22
+msgid "_Modified"
+msgstr "_Endret"
+
+#: ../data/ui/vcview.ui.h:23
+msgid "Show modified files"
+msgstr "Vis endrede filer"
+
+#: ../data/ui/vcview.ui.h:24
+msgid "_Normal"
+msgstr "_Normal"
+
+#: ../data/ui/vcview.ui.h:25
+msgid "Show normal files"
+msgstr "Vis normale filer"
+
+#: ../data/ui/vcview.ui.h:26
+msgid "Un_versioned"
+msgstr "_Ikke versjonert"
+
+#: ../data/ui/vcview.ui.h:27
+msgid "Show unversioned files"
+msgstr "Vis filer som ikke er versjonerte"
+
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69
+msgid "Ignored"
+msgstr "Ignorert"
+
+#: ../data/ui/vcview.ui.h:29
+msgid "Show ignored files"
+msgstr "Vis ignorerte filer"
+
+#: ../data/ui/vcview.ui.h:30
+msgid "Commit"
+msgstr "Legg inn"
+
+#: ../data/ui/vcview.ui.h:31
+msgid "Commit Files"
+msgstr "Legg inn filer"
+
+#: ../data/ui/vcview.ui.h:32
+msgid "Log Message"
+msgstr "Loggmelding"
+
+#: ../data/ui/vcview.ui.h:33
+msgid "Previous logs:"
+msgstr "Forrige logger:"
+
+#: ../data/ui/vcview.ui.h:34
+msgid "Co_mmit"
+msgstr "_Legg inn"
+
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331
+msgid "Location"
+msgstr "Plassering"
+
+#: ../data/ui/vcview.ui.h:37
+msgid "Status"
+msgstr "Status"
+
+#: ../data/ui/vcview.ui.h:38
+msgid "Extra"
+msgstr "Ekstra"
+
+#: ../data/ui/vcview.ui.h:39
+msgid "Console output"
+msgstr "Konsollutdata"
+
+#: ../data/ui/vcview.ui.h:40
+msgid "Push local commits to remote?"
+msgstr "Dytt lokale innlegginger eksternt?"
+
+#: ../data/ui/vcview.ui.h:41
+msgid "The commits to be pushed are determined by your version control system."
+msgstr ""
+"Versjonskontrollsystemet bestemmer hvilke innlegginger som skal dyttes."
+
+#: ../data/ui/vcview.ui.h:42
+msgid "_Push commits"
+msgstr "_Dytt innlegginger"
+
+#: ../meld/const.py:12
+msgid "UNIX (LF)"
+msgstr "UNIX (LF)"
+
+#: ../meld/const.py:13
+msgid "DOS/Windows (CR-LF)"
+msgstr "DOS/Windows (CR-LF)"
+
+#: ../meld/const.py:14
+msgid "Mac OS (CR)"
+msgstr "Mac OS (CR)"
+
+#. Create file size CellRenderer
+#: ../meld/dirdiff.py:433 ../meld/preferences.py:81
+msgid "Size"
+msgstr "Størrelse"
+
+#. Create date-time CellRenderer
+#: ../meld/dirdiff.py:441 ../meld/preferences.py:82
+msgid "Modification time"
+msgstr "Endringstid"
+
+#. Create permissions CellRenderer
+#: ../meld/dirdiff.py:449 ../meld/preferences.py:83
+msgid "Permissions"
+msgstr "Rettigheter"
+
+#: ../meld/dirdiff.py:580
+#, python-format
+msgid "Hide %s"
+msgstr "Skjul %s"
+
+#: ../meld/dirdiff.py:721 ../meld/dirdiff.py:744
+#, python-format
+msgid "[%s] Scanning %s"
+msgstr "[%s] Leter gjennom %s"
 
-#: ../meld/dirdiff.py:599
+#: ../meld/dirdiff.py:879
 #, python-format
-msgid "'%s' hidden by '%s'"
+msgid "[%s] Done"
+msgstr "[%s] Ferdig"
+
+#: ../meld/dirdiff.py:887
+msgid "Folders have no differences"
+msgstr "Mappene er ikke forskjellige"
+
+#: ../meld/dirdiff.py:889
+msgid "Contents of scanned files in folders are identical."
+msgstr "Innholdet i de gjennomsøkte filene i mappene er likt."
+
+#: ../meld/dirdiff.py:891
+msgid ""
+"Scanned files in folders appear identical, but contents have not been "
+"scanned."
 msgstr ""
+"De gjennomsøkte filene i mappene fremstår som identiske, men selve innholdet "
+"er ikke gjennomsøkt."
+
+#: ../meld/dirdiff.py:894
+msgid "File filters are in use, so not all files have been scanned."
+msgstr "Filfiltre er i bruk, så ikke alle filer er gjennomsøkte."
 
-#: ../meld/dirdiff.py:624 ../meld/filediff.py:1008 ../meld/filediff.py:1161
+#: ../meld/dirdiff.py:896
+msgid "Text filters are in use and may be masking content differences."
+msgstr "Tekstfiltre er i bruk og kan skjule forskjeller i innholdet."
+
+#: ../meld/dirdiff.py:914 ../meld/filediff.py:1501 ../meld/filediff.py:1531
+#: ../meld/filediff.py:1533 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
 msgid "Hi_de"
+msgstr "_Skjul"
+
+#: ../meld/dirdiff.py:923
+msgid "Multiple errors occurred while scanning this folder"
+msgstr "Det oppstod flere feil mens mappen ble gjennomsøkt"
+
+#: ../meld/dirdiff.py:924
+msgid "Files with invalid encodings found"
+msgstr "Fant filer med ugyldig tegnkoding"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:926
+msgid "Some files were in an incorrect encoding. The names are something like:"
+msgstr "Noen filer har ugyldig tegnkoding. Filnavnene er noe sånt som:"
+
+#: ../meld/dirdiff.py:928
+msgid "Files hidden by case insensitive comparison"
+msgstr ""
+"Filer som skjules av sammenligning som ikke skiller store/små bokstaver"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:930
+msgid ""
+"You are running a case insensitive comparison on a case sensitive "
+"filesystem. The following files in this folder are hidden:"
 msgstr ""
+"Du kjører en sammenligning som ikke skiller store/små bokstaver på et "
+"filsystem som gjør det. De følgende filene i mappa er skjult:"
 
-#: ../meld/dirdiff.py:674
+#: ../meld/dirdiff.py:941
+#, python-format
+msgid "“%s” hidden by “%s”"
+msgstr "«%s» skjules av «%s»"
+
+#: ../meld/dirdiff.py:997
+#, python-format
+msgid "Replace folder “%s”?"
+msgstr "Erstatt mappen «%s»?"
+
+#: ../meld/dirdiff.py:999
 #, python-format
 msgid ""
-"'%s' exists.\n"
-"Overwrite?"
+"Another folder with the same name already exists in “%s”.\n"
+"If you replace the existing folder, all files in it will be lost."
 msgstr ""
+"Det finnes allerede en mappe med dette navnet i «%s».\n"
+"Hvis du erstatter denne mappen så vil alle filene i den slettes."
 
-#: ../meld/dirdiff.py:681
+#: ../meld/dirdiff.py:1012
+msgid "Error copying file"
+msgstr "Klarte ikke kopiere fil"
+
+#: ../meld/dirdiff.py:1013
 #, python-format
 msgid ""
-"Error copying '%s' to '%s'\n"
+"Couldn’t copy %s\n"
+"to %s.\n"
 "\n"
-"%s."
+"%s"
 msgstr ""
+"Klarte ikke kopiere %s\n"
+"til %s.\n"
+"\n"
+"%s"
 
-#: ../meld/dirdiff.py:699 ../meld/vcview.py:526
-#, python-format
+#: ../meld/dirdiff.py:1038 ../meld/vcview.py:703
+msgid "Error deleting {}"
+msgstr "Klarte ikke slette {}"
+
+#: ../meld/dirdiff.py:1549
+msgid "No folder"
+msgstr "Ingen mappe"
+
+#: ../meld/filediff.py:836
+msgid "Comparison results will be inaccurate"
+msgstr "Sammenligningsresultatene vil være unøyaktige"
+
+#: ../meld/filediff.py:838
 msgid ""
-"'%s' is a directory.\n"
-"Remove recursively?"
+"A filter changed the number of lines in the file, which is unsupported. The "
+"comparison will not be accurate."
 msgstr ""
+"Et filter endret antall linjer i fila, dette støttes ikke. Sammenligningen "
+"vil være unøyaktig."
 
-#: ../meld/dirdiff.py:706 ../meld/vcview.py:531
-#, fuzzy, python-format
+#: ../meld/filediff.py:907
+msgid "Mark conflict as resolved?"
+msgstr "Merk konflikten som løst?"
+
+#: ../meld/filediff.py:909
 msgid ""
-"Error removing %s\n"
-"\n"
-"%s."
-msgstr "Feil under skriving til: %s."
+"If the conflict was resolved successfully, you may mark it as resolved now."
+msgstr "Du kan nå merke konflikten som løst dersom den er ordnet."
 
-#: ../meld/dirdiff.py:731
-#, python-format
-msgid "%i second"
-msgid_plural "%i seconds"
-msgstr[0] ""
-msgstr[1] ""
+#: ../meld/filediff.py:911
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: ../meld/dirdiff.py:732
-#, python-format
-msgid "%i minute"
-msgid_plural "%i minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: ../meld/filediff.py:912
+msgid "Mark _Resolved"
+msgstr "Merk som l_øst"
 
-#: ../meld/dirdiff.py:733
+#: ../meld/filediff.py:1216
 #, python-format
-msgid "%i hour"
-msgid_plural "%i hours"
-msgstr[0] ""
-msgstr[1] ""
+msgid "There was a problem opening the file “%s”."
+msgstr "Klarte ikke åpne fila «%s»."
 
-#: ../meld/dirdiff.py:734
+#: ../meld/filediff.py:1224
 #, python-format
-msgid "%i day"
-msgid_plural "%i days"
-msgstr[0] ""
-msgstr[1] ""
+msgid "File %s appears to be a binary file."
+msgstr "Fila %s er tilsynelatende en binær fil."
 
-#: ../meld/dirdiff.py:735
-#, python-format
-msgid "%i week"
-msgid_plural "%i weeks"
-msgstr[0] ""
-msgstr[1] ""
+#: ../meld/filediff.py:1226
+msgid "Do you want to open the file using the default application?"
+msgstr "Vil du åpne fila med standardprogrammet?"
+
+#: ../meld/filediff.py:1228
+msgid "Open"
+msgstr "Åpne"
 
-#: ../meld/dirdiff.py:736
+#: ../meld/filediff.py:1244
 #, python-format
-msgid "%i month"
-msgid_plural "%i months"
-msgstr[0] ""
-msgstr[1] ""
+msgid "[%s] Computing differences"
+msgstr "[%s] Beregner forskjeller"
 
-#: ../meld/dirdiff.py:737
+#: ../meld/filediff.py:1305
 #, python-format
-msgid "%i year"
-msgid_plural "%i years"
-msgstr[0] ""
-msgstr[1] ""
+msgid "File %s has changed on disk"
+msgstr "Fila %s er endret på disken"
 
-#: ../meld/filediff.py:294
-msgid "Format as patch..."
-msgstr ""
+#: ../meld/filediff.py:1306
+msgid "Do you want to reload the file?"
+msgstr "Vil du laste fila på nytt?"
 
-#: ../meld/filediff.py:294
-msgid "Create a patch using differences between files"
-msgstr ""
+#: ../meld/filediff.py:1308
+msgid "_Reload"
+msgstr "_Last på nytt"
 
-#: ../meld/filediff.py:295
-msgid "Previous conflict"
-msgstr "Forrige konflikt"
+#: ../meld/filediff.py:1464
+msgid "Files are identical"
+msgstr "Filene er identiske"
 
-#: ../meld/filediff.py:295
-msgid "Go to the previous conflict"
+#: ../meld/filediff.py:1477
+msgid ""
+"Text filters are being used, and may be masking differences between files. "
+"Would you like to compare the unfiltered files?"
 msgstr ""
+"Tekstfiltre er i bruk og kan skjule forskjeller mellom filene. Vil du "
+"sammenligne de ufiltrerte filene?"
 
-#: ../meld/filediff.py:296
-msgid "Next conflict"
-msgstr "Neste konflikt"
+#: ../meld/filediff.py:1482
+msgid "Files differ in line endings only"
+msgstr "Filene har kun forskjellige linjeavslutninger"
 
-#: ../meld/filediff.py:296
-msgid "Go to the next conflict"
+#: ../meld/filediff.py:1484
+#, python-format
+msgid ""
+"Files are identical except for differing line endings:\n"
+"%s"
 msgstr ""
+"Filene er identiske, bortsett fra ulike linjeavslutninger:\n"
+"%s"
 
-#: ../meld/filediff.py:297
-msgid "Push to left"
-msgstr ""
+#: ../meld/filediff.py:1504
+msgid "Show without filters"
+msgstr "Vis uten filtre"
 
-#: ../meld/filediff.py:297
-msgid "Push current change to the left"
-msgstr ""
+#: ../meld/filediff.py:1526
+msgid "Change highlighting incomplete"
+msgstr "Fullførte ikke utheving av endringer"
 
-#: ../meld/filediff.py:298
-msgid "Push to right"
+#: ../meld/filediff.py:1527
+msgid ""
+"Some changes were not highlighted because they were too large. You can force "
+"Meld to take longer to highlight larger changes, though this may be slow."
 msgstr ""
+"Noen endringer er ikke uthevet fordi de er for store. Du kan tvinge Meld til "
+"å bruke mer tid til å utheve dem, men dette kan gå treigt."
 
-#: ../meld/filediff.py:298
-msgid "Push current change to the right"
-msgstr ""
+#: ../meld/filediff.py:1535
+msgid "Keep highlighting"
+msgstr "Fortsett utheving"
 
-#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:300
-msgid "Pull from left"
-msgstr ""
+#: ../meld/filediff.py:1537
+msgid "_Keep highlighting"
+msgstr "_Fortsett utheving"
 
-#: ../meld/filediff.py:300
-msgid "Pull change from the left"
-msgstr ""
+#: ../meld/filediff.py:1550
+msgid "Saving failed"
+msgstr "Klarte ikke lagre"
 
-#: ../meld/filediff.py:301
-msgid "Pull from right"
+#: ../meld/filediff.py:1551
+msgid ""
+"Please consider copying any critical changes to another program or file to "
+"avoid data loss."
 msgstr ""
+"Vurder å kopiere viktige endringer til et annet program eller fil for å "
+"unngå datatap."
 
-#: ../meld/filediff.py:301
-msgid "Pull change from the right"
-msgstr ""
+#: ../meld/filediff.py:1560
+msgid "Save Left Pane As"
+msgstr "Lagre venstre rute som"
 
-#: ../meld/filediff.py:302
-msgid "Copy above left"
-msgstr ""
+#: ../meld/filediff.py:1562
+msgid "Save Middle Pane As"
+msgstr "Lagre midtre rute som"
 
-#: ../meld/filediff.py:302
-msgid "Copy change above the left chunk"
-msgstr ""
+#: ../meld/filediff.py:1564
+msgid "Save Right Pane As"
+msgstr "Lagre høyre rute som"
 
-#: ../meld/filediff.py:303
-msgid "Copy below left"
-msgstr ""
+#: ../meld/filediff.py:1577
+#, python-format
+msgid "File %s has changed on disk since it was opened"
+msgstr "Fila %s er blitt endret på disk etter at den ble åpnet"
 
-#: ../meld/filediff.py:303
-msgid "Copy change below the left chunk"
-msgstr ""
+#: ../meld/filediff.py:1579
+msgid "If you save it, any external changes will be lost."
+msgstr "Hvis du lagrer den så vil eksterne endringer gå tapt."
 
-#: ../meld/filediff.py:304
-msgid "Copy above right"
-msgstr ""
+#: ../meld/filediff.py:1582
+msgid "Save Anyway"
+msgstr "Lagre likevel"
 
-#: ../meld/filediff.py:304
-msgid "Copy change above the right chunk"
-msgstr ""
+#: ../meld/filediff.py:1583
+msgid "Don’t Save"
+msgstr "Ikke lagre"
 
-#: ../meld/filediff.py:305
-msgid "Copy below right"
+#: ../meld/filediff.py:1625
+msgid ""
+"File “{}” contains characters that can’t be encoded using its current "
+"encoding “{}”."
 msgstr ""
+"Fila «{}» inneholder tegn som ikke kan kodes med dens gjeldende tegnkoding "
+"«{}»."
 
-#: ../meld/filediff.py:305
-msgid "Copy change below the right chunk"
+#: ../meld/filediff.py:1629 ../meld/patchdialog.py:131
+#, python-format
+msgid ""
+"Couldn’t save file due to:\n"
+"%s"
 msgstr ""
+"Klarte ikke lagre fila fordi:\n"
+"%s"
 
-#: ../meld/filediff.py:306
-msgid "Delete"
-msgstr "Slett"
+#: ../meld/filediff.py:1633 ../meld/patchdialog.py:130
+#, python-format
+msgid "Could not save file %s."
+msgstr "Klarte ikke lagre fila %s."
 
-#: ../meld/filediff.py:306
-msgid "Delete change"
-msgstr "Slett endring"
+#: ../meld/filediff.py:2016
+msgid "Live comparison updating disabled"
+msgstr "Sanntidsoppdatering av endringer er slått av"
 
-#: ../meld/filediff.py:307
-msgid "Merge all changes from left"
+#: ../meld/filediff.py:2017
+msgid ""
+"Live updating of comparisons is disabled when synchronization points are "
+"active. You can still manually refresh the comparison, and live updates will "
+"resume when synchronization points are cleared."
 msgstr ""
+"Sanntidsoppdatering av sammenligninger er slått av når "
+"synkroniseringspunkter er slått på. Du kan oppdatere sammenligningen "
+"manuelt, og sanntidsoppdateringen vil fortsette når synkroniseringspunktene "
+"er blitt tømt."
 
-#: ../meld/filediff.py:307
-msgid "Merge all non-conflicting changes from the left"
-msgstr ""
+#: ../meld/filemerge.py:37
+#, python-format
+msgid "[%s] Merging files"
+msgstr "[%s] Fletter filer"
 
-#: ../meld/filediff.py:308
-msgid "Merge all changes from right"
-msgstr ""
+#: ../meld/gutterrendererchunk.py:216
+msgid "Copy _up"
+msgstr "Kopier _opp"
 
-#: ../meld/filediff.py:308
-msgid "Merge all non-conflicting changes from the right"
-msgstr ""
+#: ../meld/gutterrendererchunk.py:217
+msgid "Copy _down"
+msgstr "Kopier _ned"
 
-#: ../meld/filediff.py:309
-msgid "Merge all non-conflicting"
-msgstr ""
+#: ../meld/iohelpers.py:41
+msgid "Deleting remote folders is not supported"
+msgstr "Eksterne mapper kan ikke slettes"
 
-#: ../meld/filediff.py:309
-msgid "Merge all non-conflicting changes from left and right panes"
-msgstr ""
+#: ../meld/iohelpers.py:43
+msgid "Not a file or directory"
+msgstr "Ikke en fil eller mappe"
 
-#: ../meld/filediff.py:310
-msgid "Cycle through documents"
-msgstr ""
+#: ../meld/iohelpers.py:47
+msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
+msgstr "Kan ikke legge «{}» i papirkurven. Vil du slette den nå?"
 
-#: ../meld/filediff.py:310
-msgid "Move keyboard focus to the next document in this comparison"
-msgstr ""
+#: ../meld/iohelpers.py:52
+msgid "This remote location does not support sending items to the trash."
+msgstr "Denne eksterne plasseringen kan ikke legge elementer i papirkurven."
 
-#: ../meld/filediff.py:314
-msgid "Lock scrolling"
-msgstr ""
+#: ../meld/iohelpers.py:57
+msgid "_Delete Permanently"
+msgstr "Slett _permanent"
 
-#: ../meld/filediff.py:315
-msgid "Lock scrolling of all panes"
+#: ../meld/iohelpers.py:100
+#, python-format
+msgid "Replace file “%s”?"
+msgstr "Erstatt fila «%s»?"
+
+#: ../meld/iohelpers.py:102
+#, python-format
+msgid ""
+"A file with this name already exists in “%s”.\n"
+"If you replace the existing file, its contents will be lost."
 msgstr ""
+"Det finnes allerede en fil med dette navnet i «%s».\n"
+"Hvis du erstatter denne fila så vil innholdet gå tapt."
+
+#: ../meld/meldapp.py:181
+msgid "wrong number of arguments supplied to --diff"
+msgstr "feil antall argumenter gitt til --diff"
 
-#. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:396
-msgid "INS"
-msgstr "INS"
+#: ../meld/meldapp.py:186
+msgid "Start with an empty window"
+msgstr "Start med tomt vindu"
 
-#: ../meld/filediff.py:396
-msgid "OVR"
-msgstr "OVR"
+#: ../meld/meldapp.py:187 ../meld/meldapp.py:189
+msgid "file"
+msgstr "fil"
 
-#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:398
+#: ../meld/meldapp.py:187 ../meld/meldapp.py:191
+msgid "folder"
+msgstr "mappe"
+
+#: ../meld/meldapp.py:188
+msgid "Start a version control comparison"
+msgstr "Start en sammenligning av versjoner"
+
+#: ../meld/meldapp.py:190
+msgid "Start a 2- or 3-way file comparison"
+msgstr "Start en 2- eller 3-veis filsammenligning"
+
+#: ../meld/meldapp.py:192
+msgid "Start a 2- or 3-way folder comparison"
+msgstr "Start en 2- eller 3-veis mappesammenligning"
+
+#: ../meld/meldapp.py:235
 #, python-format
-msgid "Ln %i, Col %i"
-msgstr ""
+msgid "Error: %s\n"
+msgstr "Feil: %s\n"
+
+#: ../meld/meldapp.py:242
+msgid "Meld is a file and directory comparison tool."
+msgstr "Meld er et verktøy for sammenligning av filer og mapper."
+
+#: ../meld/meldapp.py:246
+msgid "Set label to use instead of file name"
+msgstr "Angi en etikett som skal brukes istedenfor filnavn"
 
-#: ../meld/filediff.py:722
+#: ../meld/meldapp.py:249
+msgid "Open a new tab in an already running instance"
+msgstr "Åpne en ny fane i en Meld som allerede kjører"
+
+#: ../meld/meldapp.py:252
+msgid "Automatically compare all differing files on startup"
+msgstr "Sammenlign automatisk alle ulike filer ved oppstart"
+
+#: ../meld/meldapp.py:255
+msgid "Ignored for compatibility"
+msgstr "Ignorert pga. kompatibilitet"
+
+#: ../meld/meldapp.py:259
+msgid "Set the target file for saving a merge result"
+msgstr "Velg målfilen der fletteresultatet skal lagres"
+
+#: ../meld/meldapp.py:262
+msgid "Automatically merge files"
+msgstr "Automatisk flett filer"
+
+#: ../meld/meldapp.py:266
+msgid "Load a saved comparison from a Meld comparison file"
+msgstr "Last en lagret sammenligning fra en Meld-sammenligningsfil"
+
+#: ../meld/meldapp.py:270
+msgid "Create a diff tab for the supplied files or folders"
+msgstr "Lager en fane med forskjeller for angitte filer eller mapper"
+
+#: ../meld/meldapp.py:290
 #, python-format
-msgid ""
-"Filter '%s' changed the number of lines in the file. Comparison will be "
-"incorrect. See the user manual for more details."
-msgstr ""
+msgid "too many arguments (wanted 0-3, got %d)"
+msgstr "for mange argumenter (ønsket 0-3, fikk %d)"
+
+#: ../meld/meldapp.py:293
+msgid "can’t auto-merge less than 3 files"
+msgstr "kan ikke autoflette mindre enn 3 filer"
+
+#: ../meld/meldapp.py:295
+msgid "can’t auto-merge directories"
+msgstr "kan ikke autoflette mapper"
+
+#: ../meld/meldapp.py:309
+msgid "Error reading saved comparison file"
+msgstr "Klarte ikke lese lagret sammenligningsfil"
+
+#: ../meld/meldapp.py:326
+#, python-format
+msgid "invalid path or URI “%s”"
+msgstr "ugyldig sti eller adresse «%s»"
+
+#: ../meld/meldapp.py:332
+msgid "remote folder “{}” not supported"
+msgstr "ekstern mappe «{}» støttes ikke"
 
-#. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:809
+#. TRANSLATORS: This is the label of a new, currently-unnamed file.
+#: ../meld/meldbuffer.py:124
 msgid "<unnamed>"
 msgstr "<uten navn>"
 
-#: ../meld/filediff.py:996
-#, python-format
-msgid "[%s] Set num panes"
-msgstr ""
+#: ../meld/melddoc.py:68
+msgid "untitled"
+msgstr "uten navn"
 
-#: ../meld/filediff.py:1002
-#, python-format
-msgid "[%s] Opening files"
-msgstr "[%s] Åpner filer"
+#: ../meld/meldwindow.py:47
+msgid "_File"
+msgstr "_Fil"
 
-#: ../meld/filediff.py:1026 ../meld/filediff.py:1035 ../meld/filediff.py:1047
-#: ../meld/filediff.py:1053
-msgid "Could not read file"
-msgstr "Kunne ikke lese fil"
+#: ../meld/meldwindow.py:48
+msgid "_New Comparison…"
+msgstr "Ny sammenligning …"
 
-#: ../meld/filediff.py:1027
-#, python-format
-msgid "[%s] Reading files"
-msgstr "[%s] Leser filer"
+#: ../meld/meldwindow.py:49
+msgid "Start a new comparison"
+msgstr "Start en ny sammenligning"
+
+#: ../meld/meldwindow.py:52
+msgid "Save the current file"
+msgstr "Lagre gjeldende fil"
+
+#: ../meld/meldwindow.py:54
+msgid "Save As…"
+msgstr "Lagre som …"
+
+#: ../meld/meldwindow.py:55
+msgid "Save the current file with a different name"
+msgstr "Lagre gjeldende fil med nytt navn"
+
+#: ../meld/meldwindow.py:58
+msgid "Close the current file"
+msgstr "Lukk gjeldende fil"
+
+#: ../meld/meldwindow.py:61
+msgid "_Edit"
+msgstr "_Rediger"
+
+#: ../meld/meldwindow.py:63
+msgid "Undo the last action"
+msgstr "Angre forrige handling"
+
+#: ../meld/meldwindow.py:66
+msgid "Redo the last undone action"
+msgstr "Gjør om sist angrede handling"
+
+#: ../meld/meldwindow.py:68
+msgid "Cut the selection"
+msgstr "Klipp ut utvalg"
+
+#: ../meld/meldwindow.py:70
+msgid "Copy the selection"
+msgstr "Kopier utvalg"
+
+#: ../meld/meldwindow.py:72
+msgid "Paste the clipboard"
+msgstr "Lim inn fra utklippstavla"
+
+#: ../meld/meldwindow.py:74
+msgid "Find…"
+msgstr "Søk …"
+
+#: ../meld/meldwindow.py:74
+msgid "Search for text"
+msgstr "Søk etter tekst"
+
+#: ../meld/meldwindow.py:76
+msgid "Find Ne_xt"
+msgstr "Finn _neste"
+
+#: ../meld/meldwindow.py:77
+msgid "Search forwards for the same text"
+msgstr "Let framover etter samme tekst"
+
+#: ../meld/meldwindow.py:79
+msgid "Find _Previous"
+msgstr "Finn _forrige"
+
+#: ../meld/meldwindow.py:80
+msgid "Search backwards for the same text"
+msgstr "Let bakover etter samme tekst"
+
+#: ../meld/meldwindow.py:83
+msgid "_Replace…"
+msgstr "_Erstatt …"
+
+#: ../meld/meldwindow.py:84
+msgid "Find and replace text"
+msgstr "Søk og erstatt tekst"
+
+#: ../meld/meldwindow.py:86
+msgid "Go to _Line"
+msgstr "Gå til _linje"
 
-#: ../meld/filediff.py:1036
+#: ../meld/meldwindow.py:87
+msgid "Go to a specific line"
+msgstr "Gå til en bestemt linje"
+
+#: ../meld/meldwindow.py:90
+msgid "_Changes"
+msgstr "End_ringer"
+
+#: ../meld/meldwindow.py:91
+msgid "Next Change"
+msgstr "Neste endring"
+
+#: ../meld/meldwindow.py:92
+msgid "Go to the next change"
+msgstr "Gå til neste endring"
+
+#: ../meld/meldwindow.py:94
+msgid "Previous Change"
+msgstr "Gå til forrige endring"
+
+#: ../meld/meldwindow.py:95
+msgid "Go to the previous change"
+msgstr "Gå til forrige endring"
+
+#: ../meld/meldwindow.py:97
+msgid "Open Externally"
+msgstr "Åpne eksternt"
+
+#: ../meld/meldwindow.py:98
+msgid "Open selected file or directory in the default external application"
+msgstr "Åpne valgt fil eller mappe i forvalgt eksternt program"
+
+#: ../meld/meldwindow.py:102
+msgid "_View"
+msgstr "_Vis"
+
+#: ../meld/meldwindow.py:103
+msgid "File Status"
+msgstr "Filstatus"
+
+#: ../meld/meldwindow.py:104
+msgid "Version Status"
+msgstr "Versjonsstatus"
+
+#: ../meld/meldwindow.py:107
+msgid "Stop the current action"
+msgstr "Stopp gjeldende handling"
+
+#: ../meld/meldwindow.py:110
+msgid "Refresh the view"
+msgstr "Oppdater visning"
+
+#: ../meld/meldwindow.py:114
+msgid "Fullscreen"
+msgstr "Fullskjerm"
+
+#: ../meld/meldwindow.py:115
+msgid "View the comparison in fullscreen"
+msgstr "Vis sammenligningen i fullskjerm"
+
+#: ../meld/meldwindow.py:117
+msgid "_Toolbar"
+msgstr "Verkt_øylinje"
+
+#: ../meld/meldwindow.py:118
+msgid "Show or hide the toolbar"
+msgstr "Vis eller skjul verktøylinja"
+
+#: ../meld/meldwindow.py:127
+msgid "Open Recent"
+msgstr "Åpne nylig"
+
+#: ../meld/meldwindow.py:128
+msgid "Open recent files"
+msgstr "Åpne nylige filer"
+
+#: ../meld/meldwindow.py:150
+msgid "_Meld"
+msgstr "_Meld"
+
+#: ../meld/meldwindow.py:151
+msgid "Quit the program"
+msgstr "Avslutt programmet"
+
+#: ../meld/meldwindow.py:153
+msgid "Prefere_nces"
+msgstr "_Innstillinger"
+
+#: ../meld/meldwindow.py:154
+msgid "Configure the application"
+msgstr "Sett opp programmet"
+
+#: ../meld/meldwindow.py:156
+msgid "_Contents"
+msgstr "_Innhold"
+
+#: ../meld/meldwindow.py:157
+msgid "Open the Meld manual"
+msgstr "Åpne Meld-håndboka"
+
+#: ../meld/meldwindow.py:159
+msgid "About this application"
+msgstr "Om dette programmet"
+
+#: ../meld/meldwindow.py:602
 #, python-format
-msgid "%s appears to be a binary file."
+msgid "Need three files to auto-merge, got: %r"
+msgstr "Trenger tre filer for å autoflette, fikk: %r"
+
+#: ../meld/meldwindow.py:623
+msgid "Cannot compare a mixture of files and directories"
+msgstr "Kan ikke sammenligne en blanding av filer og mapper"
+
+#: ../meld/misc.py:135
+msgid ""
+"{}\n"
+"\n"
+"Meld encountered a critical error while running:\n"
+"<tt>{}</tt>"
 msgstr ""
+"{}\n"
+"\n"
+"Det oppstod en kritisk feil i Meld under kjøring av:\n"
+"<tt>{}</tt>"
 
-#: ../meld/filediff.py:1048
+#: ../meld/misc.py:254
 #, python-format
-msgid "%s is not in encodings: %s"
-msgstr ""
+msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
+msgstr "Fant ikke fargeskjemadetaljer for %s-%s. Forsøk å installere på nytt."
+
+#: ../meld/misc.py:325
+msgid "[None]"
+msgstr "[Ingen]"
+
+#: ../meld/preferences.py:33
+msgid "label"
+msgstr "etikett"
+
+#: ../meld/preferences.py:33
+msgid "pattern"
+msgstr "mønster"
+
+#: ../meld/recent.py:105
+msgid "Version control:"
+msgstr "Versjonskontroll:"
 
-#: ../meld/filediff.py:1078 ../meld/filemerge.py:67
-#, python-format
-msgid "[%s] Computing differences"
-msgstr ""
+#: ../meld/ui/bufferselectors.py:32
+#, python-brace-format
+msgid "{name} ({charset})"
+msgstr "{name} ({charset})"
 
-#: ../meld/filediff.py:1148
-msgid ""
-"Text filters are being used, and may be masking differences between files. "
-"Would you like to compare the unfiltered files?"
-msgstr ""
+#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73
+msgid "Plain Text"
+msgstr "Ren tekst"
 
-#: ../meld/filediff.py:1154
-msgid "Files are identical"
-msgstr "Filene er identiske"
+#: ../meld/ui/filechooser.py:69
+msgid "Autodetect Encoding"
+msgstr "Gjenkjenn tegnkoding"
 
-#: ../meld/filediff.py:1164
-msgid "Show without filters"
-msgstr "Vis uten filtre"
+#: ../meld/ui/filechooser.py:72
+msgid "Current Locale ({})"
+msgstr "Gjeldende lokaltilpassing ({})"
+
+#: ../meld/ui/notebooklabel.py:63
+msgid "Close tab"
+msgstr "Lukk fane"
 
-#: ../meld/filediff.py:1354
+#. Abbreviation for line, column so that it will fit in the status bar
+#: ../meld/ui/statusbar.py:124
 #, python-format
-msgid ""
-"\"%s\" exists!\n"
-"Overwrite?"
-msgstr ""
-"«%s» eksisterer!\n"
-"Overskriv?"
+msgid "Ln %i, Col %i"
+msgstr "Ln %i, kol %i"
 
-#: ../meld/filediff.py:1367
-#, fuzzy, python-format
-msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
-msgstr "Feil under skriving til: %s."
+#: ../meld/ui/statusbar.py:177
+msgid "Line you want to move the cursor to"
+msgstr "Linje som du vil flytte skrivemerket til"
 
-#: ../meld/filediff.py:1376
-#, python-format
-msgid "Choose a name for buffer %i."
-msgstr ""
+#: ../meld/ui/vcdialogs.py:48
+msgid "No files will be committed"
+msgstr "Ingen filer vil legges inn"
 
-#: ../meld/filediff.py:1391
+#. Translators: First %s is replaced by translated "%d unpushed
+#. commits", second %s is replaced by translated "%d branches"
+#: ../meld/vc/git.py:92
 #, python-format
-msgid ""
-"This file '%s' contains a mixture of line endings.\n"
-"\n"
-"Which format would you like to use?"
-msgstr ""
+msgid "%s in %s"
+msgstr "%s i %s"
 
-#: ../meld/filediff.py:1407
+#. Translators: These messages cover the case where there is
+#. only one branch, and are not part of another message.
+#: ../meld/vc/git.py:93 ../meld/vc/git.py:100
 #, python-format
-msgid ""
-"'%s' contains characters not encodable with '%s'\n"
-"Would you like to save as UTF-8?"
-msgstr ""
+msgid "%d unpushed commit"
+msgid_plural "%d unpushed commits"
+msgstr[0] "%d udyttet innlegging"
+msgstr[1] "%d udyttede innlegginger"
 
-#: ../meld/filediff.py:1466
+#: ../meld/vc/git.py:95
 #, python-format
-msgid ""
-"Reloading will discard changes in:\n"
-"%s\n"
-"\n"
-"You cannot undo this operation."
-msgstr ""
-
-#: ../meld/filemerge.py:82
-#, fuzzy, python-format
-msgid "[%s] Merging files"
-msgstr "Åpne fil"
-
-#: ../meld/meldapp.py:152
-msgid "wrong number of arguments supplied to --diff"
-msgstr ""
-
-#: ../meld/meldapp.py:156
-msgid "Start with an empty window"
-msgstr ""
+msgid "%d branch"
+msgid_plural "%d branches"
+msgstr[0] "%d grein"
+msgstr[1] "%d greiner"
 
-#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160
-msgid "file"
-msgstr "fil"
+#: ../meld/vc/git.py:334
+#, python-format
+msgid "Mode changed from %s to %s"
+msgstr "Endret modus fra %s til %s"
 
-#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160
-msgid "dir"
-msgstr "katalog"
+#: ../meld/vc/git.py:342
+msgid "Partially staged"
+msgstr "Delvis køet"
 
-#: ../meld/meldapp.py:157
-msgid "Start a version control comparison"
-msgstr ""
+#: ../meld/vc/git.py:342
+msgid "Staged"
+msgstr "Køet"
 
-#: ../meld/meldapp.py:158
-msgid "Start a 2- or 3-way file comparison"
-msgstr ""
+#. Translators: This is the displayed name of a version control system
+#. when no version control system is actually found.
+#: ../meld/vc/_null.py:37
+msgid "None"
+msgstr "Ingen"
 
-#: ../meld/meldapp.py:159
-msgid "Start a 2- or 3-way directory comparison"
-msgstr ""
+#: ../meld/vc/svn.py:203
+#, python-format
+msgid "Rev %s"
+msgstr "Rev. %s"
 
-#: ../meld/meldapp.py:160
-msgid "Start a comparison between file and dir/file"
-msgstr ""
+#: ../meld/vc/_vc.py:54
+msgid "Merged"
+msgstr "Flettet"
 
-#: ../meld/meldapp.py:166
-msgid "Meld is a file and directory comparison tool."
-msgstr ""
+#: ../meld/vc/_vc.py:54
+msgid "Base"
+msgstr "Base"
 
-#: ../meld/meldapp.py:169
-msgid "Set label to use instead of file name"
-msgstr ""
+#: ../meld/vc/_vc.py:54
+msgid "Local"
+msgstr "Lokal"
 
-#: ../meld/meldapp.py:171
-msgid "Automatically compare all differing files on startup"
-msgstr ""
+#: ../meld/vc/_vc.py:54
+msgid "Remote"
+msgstr "Ekstern"
 
-#: ../meld/meldapp.py:173
-msgid "Ignored for compatibility"
-msgstr ""
+#: ../meld/vc/_vc.py:70
+msgid "Unversioned"
+msgstr "Ikke versjonert"
 
-#: ../meld/meldapp.py:176
-msgid "Set the target file for saving a merge result"
-msgstr ""
+#: ../meld/vc/_vc.py:73
+msgid "Error"
+msgstr "Feil"
 
-#: ../meld/meldapp.py:179
-msgid "Creates a diff tab for up to 3 supplied files or directories."
-msgstr ""
+#: ../meld/vc/_vc.py:75
+msgid "Newly added"
+msgstr "Nylig lagt til"
 
-#: ../meld/meldapp.py:182
-#, python-format
-msgid "too many arguments (wanted 0-4, got %d)"
-msgstr ""
+#: ../meld/vc/_vc.py:77
+msgid "Renamed"
+msgstr "Har fått nytt navn"
 
-#: ../meld/meldapp.py:184 ../meld/meldapp.py:188
-#, fuzzy
-msgid "can't compare more than three directories"
-msgstr "Opprett nye kataloger"
+#: ../meld/vc/_vc.py:78
+msgid "Conflict"
+msgstr "Konflikt"
 
-#: ../meld/melddoc.py:56 ../meld/melddoc.py:57
-msgid "untitled"
-msgstr "uten navn"
+#: ../meld/vc/_vc.py:79
+msgid "Removed"
+msgstr "Fjernet"
 
-#: ../meld/meldwindow.py:125
-msgid "_File"
-msgstr "_Fil"
+#: ../meld/vc/_vc.py:80
+msgid "Missing"
+msgstr "Mangler"
 
-#: ../meld/meldwindow.py:126
-msgid "_New..."
-msgstr "_Ny …"
+#: ../meld/vc/_vc.py:81
+msgid "Not present"
+msgstr "Ikke til stede"
 
-#: ../meld/meldwindow.py:126
-msgid "Start a new comparison"
-msgstr ""
+#. Translators: This error message is shown when a version
+#. control binary isn't installed.
+#: ../meld/vcview.py:248
+#, python-format
+msgid "%(name)s (%(cmd)s not installed)"
+msgstr "%(name)s (%(cmd)s er ikke installert)"
 
-#: ../meld/meldwindow.py:127
-msgid "Save the current file"
-msgstr ""
+#. Translators: This error message is shown when a version
+#. controlled repository is invalid.
+#: ../meld/vcview.py:252
+#, python-format
+msgid "%(name)s (Invalid repository)"
+msgstr "%(name)s (ugyldig depot)"
 
-#: ../meld/meldwindow.py:129
-msgid "Close the current file"
-msgstr ""
+#: ../meld/vcview.py:273
+msgid "No valid version control system found in this folder"
+msgstr "Fant ikke et gyldig versjonskontrollsystem i denne mappa"
 
-#: ../meld/meldwindow.py:130
-msgid "Quit the program"
-msgstr ""
+#: ../meld/vcview.py:275
+msgid "Only one version control system found in this folder"
+msgstr "Fant kun ett versjonskontrollsystem i denne mappa"
 
-#: ../meld/meldwindow.py:132
-msgid "_Edit"
-msgstr "R_ediger"
+#: ../meld/vcview.py:277
+msgid "Choose which version control system to use"
+msgstr "Velg hvilket versjonskontrollsystem som skal brukes"
 
-#: ../meld/meldwindow.py:133
-msgid "Undo the last action"
-msgstr ""
+#. TRANSLATORS: This is the location of the directory being viewed
+#: ../meld/vcview.py:331
+#, python-format
+msgid "%s: %s"
+msgstr "%s: %s"
 
-#: ../meld/meldwindow.py:134
-msgid "Redo the last undone action"
-msgstr ""
+#. Initial yield so when we add this to our tasks, we don't
+#. create iterators that may be invalidated.
+#: ../meld/vcview.py:338
+msgid "Scanning repository"
+msgstr "Gjennomsøker depot"
 
-#: ../meld/meldwindow.py:135
-msgid "Cut the selection"
-msgstr "Klipp ut utvalg"
+#: ../meld/vcview.py:367
+#, python-format
+msgid "Scanning %s"
+msgstr "Gjennomsøker %s"
 
-#: ../meld/meldwindow.py:136
-msgid "Copy the selection"
-msgstr "Kopier utvalg"
+#: ../meld/vcview.py:406
+msgid "(Empty)"
+msgstr "(Tom)"
 
-#: ../meld/meldwindow.py:137
-msgid "Paste the clipboard"
-msgstr ""
+#: ../meld/vcview.py:450
+#, python-format
+msgid "%s — local"
+msgstr "%s – lokal"
 
-#: ../meld/meldwindow.py:138
-msgid "Search for text"
-msgstr "Søk etter tekst"
+#: ../meld/vcview.py:451
+#, python-format
+msgid "%s — remote"
+msgstr "%s – ekstern"
 
-#: ../meld/meldwindow.py:139
-msgid "Find Ne_xt"
-msgstr "Finn ne_ste"
+#: ../meld/vcview.py:459
+#, python-format
+msgid "%s (local, merge, remote)"
+msgstr "%s (lokal, flett, ekstern)"
 
-#: ../meld/meldwindow.py:139
-msgid "Search forwards for the same text"
-msgstr ""
+#: ../meld/vcview.py:464
+#, python-format
+msgid "%s (remote, merge, local)"
+msgstr "%s (ekstern, flett, lokal)"
 
-#: ../meld/meldwindow.py:140
-msgid "Find _Previous"
-msgstr "Finn _forrige"
+#: ../meld/vcview.py:475
+#, python-format
+msgid "%s — repository"
+msgstr "%s – depot"
 
-#: ../meld/meldwindow.py:140
-msgid "Search backwards for the same text"
-msgstr ""
+#: ../meld/vcview.py:481
+#, python-format
+msgid "%s (working, repository)"
+msgstr "%s (arbeidskopi, depot)"
 
-#: ../meld/meldwindow.py:141
-msgid "Find and replace text"
-msgstr ""
+#: ../meld/vcview.py:485
+#, python-format
+msgid "%s (repository, working)"
+msgstr "%s (depot, arbeidskopi)"
 
-#: ../meld/meldwindow.py:142
-msgid "Prefere_nces"
-msgstr "_Brukervalg"
+#: ../meld/vcview.py:674
+msgid "Remove folder and all its files?"
+msgstr "Fjern mappe og alle filene i den?"
 
-#: ../meld/meldwindow.py:142
-msgid "Configure the application"
+#: ../meld/vcview.py:676
+msgid ""
+"This will remove all selected files and folders, and all files within any "
+"selected folders, from version control."
 msgstr ""
+"Dette vil fjerne alle valgte filer og mapper, og alle filer inni valgte "
+"mapper fra versjonskontrollsystemet."
 
-#: ../meld/meldwindow.py:144
-msgid "_Changes"
-msgstr ""
+#: ../meld/vcview.py:785
+msgid "Clear"
+msgstr "Tøm"
 
-#: ../meld/meldwindow.py:145
-msgid "Next change"
-msgstr "Neste endring"
+#~ msgid ""
+#~ "If true, whitespace characters will be drawn in comparisons even if they "
+#~ "are not in a changed area."
+#~ msgstr ""
+#~ "Velg for å tegne blanktegn i sammenligninger selv om de ikke er i et "
+#~ "område som er endret."
 
-#: ../meld/meldwindow.py:145
-msgid "Go to the next change"
-msgstr ""
+#~ msgid "Show overview source map"
+#~ msgstr "Vis oversiktsstolpe"
 
-#: ../meld/meldwindow.py:146
-#, fuzzy
-msgid "Previous change"
-msgstr "Forrige hjelp"
+#~ msgid ""
+#~ "If true, file comparisons will have paired source maps for compared files."
+#~ msgstr ""
+#~ "Hvis sann så vil filsammenligninger vise to fargekodede stolper som "
+#~ "illustrerer forskjeller og likheter mellom filene."
 
-#: ../meld/meldwindow.py:146
-msgid "Go to the previous change"
-msgstr ""
+#~ msgid "Style of overview map"
+#~ msgstr "Oversiktsstolpens stil"
 
-#: ../meld/meldwindow.py:147
-msgid "Open externally"
-msgstr "Åpne eksternt"
+#~ msgid "Style options for how the overview map is displayed."
+#~ msgstr "Velg hvordan oversiktsstolpen skal vises."
 
-#: ../meld/meldwindow.py:147
-msgid "Open selected file or directory in the default external application"
-msgstr ""
+#~ msgid "Classic (Meld)"
+#~ msgstr "Klassisk (Meld)"
 
-#: ../meld/meldwindow.py:149
-msgid "_View"
-msgstr "_Visning"
+#~ msgctxt "shortcut window"
+#~ msgid "Panes"
+#~ msgstr "Ruter"
 
-#: ../meld/meldwindow.py:150
-msgid "File status"
-msgstr "Filstatus"
+#~ msgid "Stop"
+#~ msgstr "Stopp"
 
-#: ../meld/meldwindow.py:151
-msgid "Version status"
-msgstr ""
+#~ msgid "Revert files…"
+#~ msgstr "Gjenopprett filer …"
 
-#: ../meld/meldwindow.py:152
-#, fuzzy
-msgid "File filters"
-msgstr "<b>Filfilter</b>"
+#~ msgid "Overview Map"
+#~ msgstr "Oversiktsstolpe"
 
-#: ../meld/meldwindow.py:153
-msgid "Stop the current action"
-msgstr ""
+#~ msgid "Version control console"
+#~ msgstr "Versjonskontroll-konsoll"
 
-#: ../meld/meldwindow.py:154
-#, fuzzy
-msgid "Refresh the view"
-msgstr "Oppdater"
+#~ msgid "Comparison"
+#~ msgstr "Sammenligning"
 
-#: ../meld/meldwindow.py:155
-msgid "Reload"
-msgstr "Gjenles"
+#~ msgid "_Delete selected"
+#~ msgstr "_Slett valgte"
 
-#: ../meld/meldwindow.py:155
-msgid "Reload the comparison"
-msgstr ""
+#~ msgid "_Open Externally"
+#~ msgstr "Åpne e_ksternt"
 
-#: ../meld/meldwindow.py:157
-msgid "_Tabs"
-msgstr "_Faner"
+#~ msgid "Copy chunks"
+#~ msgstr "Kopier stykker"
 
-#: ../meld/meldwindow.py:158
-msgid "_Previous Tab"
-msgstr "_Forrige fane"
+#~ msgid "_Undo"
+#~ msgstr "_Angre"
 
-#: ../meld/meldwindow.py:158
-msgid "Activate previous tab"
-msgstr ""
+#~ msgid "_Redo"
+#~ msgstr "_Gjør om"
 
-#: ../meld/meldwindow.py:159
-msgid "_Next Tab"
-msgstr "_Neste fane"
+#~ msgid "Cu_t"
+#~ msgstr "Klipp _ut"
 
-#: ../meld/meldwindow.py:159
-msgid "Activate next tab"
-msgstr ""
+#~ msgid "_Copy"
+#~ msgstr "_Kopier"
 
-#: ../meld/meldwindow.py:160
-msgid "Move Tab _Left"
-msgstr ""
+#~ msgid "_Paste"
+#~ msgstr "_Lim inn"
 
-#: ../meld/meldwindow.py:160
-msgid "Move current tab to left"
-msgstr ""
+#~ msgid "Switch between Find and Find-and-Replace"
+#~ msgstr "Bytt mellom «søk» og «søk og erstatt»"
 
-#: ../meld/meldwindow.py:161
-msgid "Move Tab _Right"
-msgstr ""
+#~ msgid "Folder"
+#~ msgstr "Mappe"
 
-#: ../meld/meldwindow.py:161
-msgid "Move current tab to right"
-msgstr ""
+#~ msgid "Code Overview"
+#~ msgstr "Kodeoversikt"
 
-#: ../meld/meldwindow.py:163
-msgid "_Help"
-msgstr "_Hjelp"
+#~ msgid "Show overview map"
+#~ msgstr "Vis oversiktsstolpe"
 
-#: ../meld/meldwindow.py:164
-#, fuzzy
-msgid "_Contents"
-msgstr "Kjør/_Fortsett"
+#~ msgid "Overview map style:"
+#~ msgstr "Oversiktsstolpens stil:"
 
-#: ../meld/meldwindow.py:164
-msgid "Open the Meld manual"
-msgstr ""
+#~ msgid "Simple change map"
+#~ msgstr "Enkelt endringskart"
 
-#: ../meld/meldwindow.py:165
-msgid "Report _Bug"
-msgstr ""
+#~ msgid "Compact source map"
+#~ msgstr "Lite kildekart"
 
-#: ../meld/meldwindow.py:165
-msgid "Report a bug in Meld"
-msgstr ""
+#~ msgid "Full source map"
+#~ msgstr "Stort kildekart"
 
-#: ../meld/meldwindow.py:166
-msgid "About this program"
-msgstr ""
+#~ msgid "Search recent comparisons…"
+#~ msgstr "Søk nylige sammenligninger …"
 
-#: ../meld/meldwindow.py:169
-msgid "Full Screen"
-msgstr ""
+#~ msgid "Show whitespace"
+#~ msgstr "Vis blanktegn"
 
-#: ../meld/meldwindow.py:169
-msgid "View the comparison in full screen"
-msgstr ""
+#~ msgid "Text wrapping"
+#~ msgstr "Tekstbryting"
 
-#: ../meld/meldwindow.py:170
-msgid "_Toolbar"
-msgstr ""
+#~ msgid "Commit…"
+#~ msgstr "Legg inn …"
 
-#: ../meld/meldwindow.py:170
-msgid "Show or hide the toolbar"
-msgstr ""
+#~ msgid "Update"
+#~ msgstr "Oppdater"
 
-#: ../meld/meldwindow.py:171
-#, fuzzy
-msgid "_Statusbar"
-msgstr "Tilstand"
+#~ msgid "Add"
+#~ msgstr "Legg til"
 
-#: ../meld/meldwindow.py:171
-msgid "Show or hide the statusbar"
-msgstr ""
+#~ msgid "Remove"
+#~ msgstr "Fjern"
 
-#: ../meld/meldwindow.py:538
-msgid "Switch to this tab"
-msgstr ""
+#~ msgid "Mark as Resolved"
+#~ msgstr "Merk som løst"
 
-#. exit at first non found directory + file
-#: ../meld/meldwindow.py:629
-#, fuzzy
-msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "Opprett nye kataloger"
+#~ msgid "Revert"
+#~ msgstr "Tilbakestill"
 
-#. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:174
-#, fuzzy
-msgid "[None]"
-msgstr "Ingen"
+#~ msgid "Filename"
+#~ msgstr "Filnavn"
 
-#: ../meld/patchdialog.py:122
-#, fuzzy
-msgid "Save Patch As..."
-msgstr "Lagrer prosjekt...\n"
+#~ msgid "%(name)s (not found)"
+#~ msgstr "%(name)s (fant ikke)"
 
-#: ../meld/preferences.py:37
-msgid "label"
-msgstr "etikett"
+#~ msgid "org.gnome.meld"
+#~ msgstr "org.gnome.meld"
 
-#: ../meld/preferences.py:37
-#, fuzzy
-msgid "pattern"
-msgstr "Oppdater"
+#~ msgid ""
+#~ "This is a new stable release series. Notable changes compared to 3.18 "
+#~ "include:"
+#~ msgstr ""
+#~ "Dette er en ny serie stabile utgivelser. Blant endringer fra 3.18 kan "
+#~ "nevnes:"
 
-#: ../meld/preferences.py:111
-msgid "Only available if you have gnome-python-desktop installed"
-msgstr ""
+#~ msgid "Support comparing remote files"
+#~ msgstr "Støtter sammenligning av eksterne filer"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:234
-msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-msgstr ""
+#~ msgid "Much faster comparisons for folders with lots of files"
+#~ msgstr "Mye raskere sammenligninger for mapper med mange filer"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:236
-msgid ""
-"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
-"Desktop.ini\n"
-msgstr ""
+#~ msgid "Better handling of encoding failures during file load and save"
+#~ msgstr "Håndterer bedre tegnkodingsfeil under lasting og lagring av filer"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:238
-#, fuzzy, python-format
-msgid "Version Control\t1\t%s\n"
-msgstr "Git versjonskontroll"
+#~ msgid "New status bar for view-specific editor settings"
+#~ msgstr ""
+#~ "Ny statuslinje for visningsspesifikt oppsett av redigeringsprogrammet"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:240
-msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
-msgstr ""
+#~ msgid ""
+#~ "Support user-selected file encodings in dialogs and the new status bar"
+#~ msgstr ""
+#~ "Støtter brukervalgte filkodinger i dialogvinduer og den nye statuslinja"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:242
-msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
-msgstr ""
+#~ msgid "New automated Windows builds using GNOME Gitlab CI"
+#~ msgstr "Ny automatisert bygging av Windows-utgaver med GNOME Gitlab CI"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:244
-msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
-msgstr ""
+#~ msgid "Improved support for Flatpak builds"
+#~ msgstr "Forbedret støtte for Flatpak-utgivelser"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:246
-msgid "C++ comment\t0\t//.*\n"
-msgstr ""
+#~ msgid "Updated translations"
+#~ msgstr "Oppdaterte oversettelser"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:248
-msgid "C comment\t0\t/\\*.*?\\*/\n"
-msgstr ""
+#~ msgid ""
+#~ "Some files have been modified.\n"
+#~ "Which ones would you like to save?"
+#~ msgstr ""
+#~ "Noen filer har blitt endret.\n"
+#~ "Hvilke vil du lagre?"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:250
-msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
-msgstr ""
+#~ msgid "_Save Selected"
+#~ msgstr "_Lagre valgt"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:252
-msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
-msgstr ""
+#~ msgid "_Search for"
+#~ msgstr "_Søk etter"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:254
-msgid "Script comment\t0\t#.*"
-msgstr ""
+#~ msgid "Choose Files"
+#~ msgstr "Velg filer"
 
-#: ../meld/vcview.py:128
-#, fuzzy
-msgid "Co_mmit"
-msgstr "_Sjekk inn"
+#~ msgid "_Three Way Compare"
+#~ msgstr "_Treveis sammenligning"
 
-#: ../meld/vcview.py:128
-#, fuzzy
-msgid "Commit"
-msgstr "_Sjekk inn"
+#~ msgid "Mine"
+#~ msgstr "Min"
 
-#: ../meld/vcview.py:129
-msgid "_Update"
-msgstr "_Oppdater"
+#~ msgid "Original"
+#~ msgstr "Opprinnelig"
 
-#: ../meld/vcview.py:129
-msgid "Update"
-msgstr "Oppdater"
+#~ msgid "Other"
+#~ msgstr "Andre"
 
-#: ../meld/vcview.py:130
-#, fuzzy
-msgid "Add to VC"
-msgstr "Legg til i prosjekt"
+#~ msgid "Select VC Directory"
+#~ msgstr "Velg katalog under versjonskontroll"
 
-#: ../meld/vcview.py:131
-#, fuzzy
-msgid "Add _Binary"
-msgstr "Legg _til mål"
+#~ msgid "Directory"
+#~ msgstr "Katalog"
 
-#: ../meld/vcview.py:131
-#, fuzzy
-msgid "Add binary to VC"
-msgstr "Legg til i prosjekt"
+#~ msgid "Create Patch"
+#~ msgstr "Lag endringsfil"
 
-#: ../meld/vcview.py:132
-#, fuzzy
-msgid "Remove from VC"
-msgstr "Fjern fra prosjekt"
+#~ msgid "Create a patch"
+#~ msgstr "Lag en endringsfil («patch»)"
 
-#: ../meld/vcview.py:133
-msgid "_Resolved"
-msgstr ""
+#~ msgid "Ignore changes which insert or delete blank lines"
+#~ msgstr "Se bort fra endringer som setter inn eller sletter tomme linjer"
 
-#: ../meld/vcview.py:133
-msgid "Mark as resolved for VC"
-msgstr ""
+#~ msgid "Loading"
+#~ msgstr "Laster"
 
-#: ../meld/vcview.py:134
-msgid "Revert to original"
-msgstr ""
+#~ msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+#~ msgstr ""
+#~ "Bruk disse tegnkodingene i rekkefølge ved lasting. (F.eks. utf8, iso8859)."
 
-#: ../meld/vcview.py:135
-#, fuzzy
-msgid "Delete locally"
-msgstr "Slett"
+#~ msgid "Encoding"
+#~ msgstr "Tegnkoding"
 
-#: ../meld/vcview.py:139
 #, fuzzy
-msgid "_Flatten"
-msgstr "_Fil"
+#~ msgid "VC Log"
+#~ msgstr "Vis logg"
 
-#: ../meld/vcview.py:139
 #, fuzzy
-msgid "Flatten directories"
-msgstr "Opprett nye kataloger"
+#~ msgid "Case"
+#~ msgstr "Lukk"
 
-#: ../meld/vcview.py:140
 #, fuzzy
-msgid "_Modified"
-msgstr "Endret"
+#~ msgid "Ignore case of entries"
+#~ msgstr "Ignorer kataloger:"
+
+#~ msgid ""
+#~ "'%s' exists.\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "«%s» eksisterer.\n"
+#~ "Vil du overskrive?"
+
+#~ msgid ""
+#~ "'%s' is a directory.\n"
+#~ "Remove recursively?"
+#~ msgstr ""
+#~ "«%s» er en mappe.\n"
+#~ "Vil du slette gjennomgripende?"
+
+#~ msgid ""
+#~ "Error removing %s\n"
+#~ "\n"
+#~ "%s."
+#~ msgstr ""
+#~ "Klarte ikke fjerne %s.\n"
+#~ "\n"
+#~ "%s."
+
+#~ msgid "%i second"
+#~ msgid_plural "%i seconds"
+#~ msgstr[0] "%i sekund"
+#~ msgstr[1] "%i sekunder"
+
+#~ msgid "%i minute"
+#~ msgid_plural "%i minutes"
+#~ msgstr[0] "%i minutt"
+#~ msgstr[1] "%i minutter"
+
+#~ msgid "%i hour"
+#~ msgid_plural "%i hours"
+#~ msgstr[0] "%i time"
+#~ msgstr[1] "%i timer"
+
+#~ msgid "%i day"
+#~ msgid_plural "%i days"
+#~ msgstr[0] "%i dag"
+#~ msgstr[1] "%i dager"
+
+#~ msgid "%i week"
+#~ msgid_plural "%i weeks"
+#~ msgstr[0] "%i uke"
+#~ msgstr[1] "%i uker"
+
+#~ msgid "%i month"
+#~ msgid_plural "%i months"
+#~ msgstr[0] "%i måned"
+#~ msgstr[1] "%i måneder"
+
+#~ msgid "%i year"
+#~ msgid_plural "%i years"
+#~ msgstr[0] "%i år"
+#~ msgstr[1] "%i år"
+
+#~ msgid "Merge all non-conflicting"
+#~ msgstr "Flett alle uten konflikter"
+
+#~ msgid "INS"
+#~ msgstr "INS"
+
+#~ msgid "OVR"
+#~ msgstr "OVR"
+
+#~ msgid "[%s] Set num panes"
+#~ msgstr "[%s] Velg antall paneler"
+
+#~ msgid "[%s] Opening files"
+#~ msgstr "[%s] Åpner filer"
+
+#~ msgid "[%s] Reading files"
+#~ msgstr "[%s] Leser filer"
+
+#~ msgid "%s is not in encodings: %s"
+#~ msgstr "%s er ikke i tegnkodingene: %s"
+
+#~ msgid ""
+#~ "\"%s\" exists!\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "«%s» eksisterer!\n"
+#~ "Overskriv?"
+
+#~ msgid ""
+#~ "Error writing to %s\n"
+#~ "\n"
+#~ "%s."
+#~ msgstr ""
+#~ "Klarte ikke skrive til %s.\n"
+#~ "\n"
+#~ "%s."
+
+#~ msgid "Choose a name for buffer %i."
+#~ msgstr "Velg et navn for bufferen %i."
+
+#~ msgid ""
+#~ "This file '%s' contains a mixture of line endings.\n"
+#~ "\n"
+#~ "Which format would you like to use?"
+#~ msgstr ""
+#~ "Denne fila «%s» har flere typer linjeslutter.\n"
+#~ "\n"
+#~ "Hvilket format vil du bruke?"
+
+#~ msgid ""
+#~ "'%s' contains characters not encodable with '%s'\n"
+#~ "Would you like to save as UTF-8?"
+#~ msgstr ""
+#~ "«%s» inneholder tegn som ikke kan kodes med «%s».\n"
+#~ "Vil du lagre som UTF-8?"
 
-#: ../meld/vcview.py:141
-msgid "_Normal"
-msgstr ""
+#~ msgid ""
+#~ "Reloading will discard changes in:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "You cannot undo this operation."
+#~ msgstr ""
+#~ "Ny innlasting vil forkaste endringene i:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Du kan ikke angre dette."
 
-#: ../meld/vcview.py:141
-#, fuzzy
-msgid "Show normal"
-msgstr "Vis merker"
+#~ msgid "dir"
+#~ msgstr "mappe"
 
-#: ../meld/vcview.py:142
-msgid "Non _VC"
-msgstr ""
+#~ msgid "Start a 2- or 3-way directory comparison"
+#~ msgstr "Start en 2- eller 3-veis mappesammenligning"
 
-#: ../meld/vcview.py:142
-#, fuzzy
-msgid "Show unversioned files"
-msgstr "Vis signaler fra kjernen"
+#~ msgid "Start a comparison between file and dir/file"
+#~ msgstr "Start en sammenligning mellom fil og mappe/fil"
 
-#: ../meld/vcview.py:143
-#, fuzzy
-msgid "Ignored"
-msgstr "Fje_rn ..."
+#~ msgid "can't compare more than three directories"
+#~ msgstr "kan ikke sammenligne mer enn tre mapper"
 
-#: ../meld/vcview.py:143
-#, fuzzy
-msgid "Show ignored files"
-msgstr "Ignorer filer:"
+#~ msgid "_New..."
+#~ msgstr "_Ny …"
 
-#: ../meld/vcview.py:186 ../meld/vcview.py:318
-msgid "Location"
-msgstr "Lokasjon"
+#~ msgid "Activate previous tab"
+#~ msgstr "Aktiver forrige fane"
 
-#: ../meld/vcview.py:187
-#, fuzzy
-msgid "Status"
-msgstr "Tilstand"
+#~ msgid "_Next Tab"
+#~ msgstr "_Neste fane"
 
-#: ../meld/vcview.py:188
-#, fuzzy
-msgid "Rev"
-msgstr "Fjern"
+#~ msgid "Activate next tab"
+#~ msgstr "Aktiver neste fane"
 
-#: ../meld/vcview.py:189
-msgid "Tag"
-msgstr ""
+#~ msgid "Move current tab to left"
+#~ msgstr "Flytt gjeldende fane til venstre"
 
-#: ../meld/vcview.py:190
-msgid "Options"
-msgstr "Alternativer"
+#~ msgid "Move current tab to right"
+#~ msgstr "Flytt gjeldende fane til høyre"
 
-#: ../meld/vcview.py:249
-#, fuzzy
-msgid "Choose one Version Control"
-msgstr "Git versjonskontroll"
+#~ msgid "Report _Bug"
+#~ msgstr "Rapporter _feil"
 
-#: ../meld/vcview.py:250
-msgid "Only one Version Control in this directory"
-msgstr ""
+#~ msgid "Report a bug in Meld"
+#~ msgstr "Rapporter en feil i Meld"
 
-#. TRANSLATORS: this is an error message when a version control
-#. application isn't installed or can't be found
-#: ../meld/vcview.py:263
-#, python-format
-msgid "%s Not Installed"
-msgstr ""
+#~ msgid "About this program"
+#~ msgstr "Om programmet"
 
-#. TRANSLATORS: this is an error message when a version
-#. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:267
-msgid "Invalid Repository"
-msgstr ""
+#~ msgid "Show or hide the statusbar"
+#~ msgstr "Vis eller skjul statuslinja"
 
-#: ../meld/vcview.py:276
-#, python-format
-msgid "%s (%s)"
-msgstr ""
+#~ msgid "Only available if you have gnome-python-desktop installed"
+#~ msgstr "Kun tilgjengelig hvis du har «gnome-python-desktop» installert"
 
-#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:318
-#, python-format
-msgid "%s: %s"
-msgstr ""
+#~ msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+#~ msgstr "Reservekopier\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 
-#: ../meld/vcview.py:362
-msgid "(Empty)"
-msgstr ""
+#~ msgid ""
+#~ "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
+#~ "Desktop.ini\n"
+#~ msgstr ""
+#~ "OS-spesifikke metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs."
+#~ "db Desktop.ini\n"
 
-#: ../meld/vcview.py:400
-#, python-format
-msgid "[%s] Fetching differences"
-msgstr ""
+#~ msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+#~ msgstr "Binærfiler\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 
-#: ../meld/vcview.py:408
-#, python-format
-msgid "[%s] Applying patch"
-msgstr ""
+#~ msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+#~ msgstr "Mediefiler\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 
-#: ../meld/vcview.py:501
-#, fuzzy
-msgid "Select some files first."
-msgstr "Velg header-fil"
+#~ msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+#~ msgstr "CVS-nøkkelord\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 
-#: ../meld/vcview.py:574
-#, python-format
-msgid ""
-"\n"
-"                    Invoking 'patch' failed.\n"
-"                    \n"
-"                    Maybe you don't have 'GNU patch' installed,\n"
-"                    or you use an untested version of %s.\n"
-"                    \n"
-"                    Please send email bug report to:\n"
-"                    meld-list@gnome.org\n"
-"                    \n"
-"                    Containing the following information:\n"
-"                    \n"
-"                    - meld version: '%s'\n"
-"                    - source control software type: '%s'\n"
-"                    - source control software version: 'X.Y.Z'\n"
-"                    - the output of '%s somefile.txt'\n"
-"                    - patch command: '%s'\n"
-"                    (no need to actually run it, just provide\n"
-"                    the command line) \n"
-"                    \n"
-"                    Replace 'X.Y.Z' by the actual version for the\n"
-"                    source control software you use.\n"
-"                    "
-msgstr ""
+#~ msgid "C++ comment\t0\t//.*\n"
+#~ msgstr "C++-kommentar\t0\t//.*\n"
 
-#: ../meld/ui/findbar.py:127
-#, fuzzy, python-format
-msgid ""
-"Regular expression error\n"
-"'%s'"
-msgstr "Vanlig uttrykk"
+#~ msgid "C comment\t0\t/\\*.*?\\*/\n"
+#~ msgstr "C-kommentar\t0\t/\\*.*?\\*/\n"
 
-#: ../meld/ui/historyentry.py:293
-msgid "_Browse..."
-msgstr ""
+#~ msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
+#~ msgstr "Alle blanktegn\t0\t[ \\t\\r\\f\\v]*\n"
 
-#: ../meld/ui/historyentry.py:301
-msgid "Path"
-msgstr ""
+#~ msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
+#~ msgstr "Ledende blanktegn\t0\t^[ \\t\\r\\f\\v]*\n"
 
-#: ../meld/ui/historyentry.py:302
-msgid "Path to file"
-msgstr ""
+#~ msgid "Script comment\t0\t#.*"
+#~ msgstr "Skriptkommentar\t0\t#.*"
 
-#: ../meld/ui/historyentry.py:303
-msgid "Pop up a file selector to choose a file"
-msgstr ""
+#, fuzzy
+#~ msgid "Add to VC"
+#~ msgstr "Legg til i prosjekt"
 
-#: ../meld/ui/historyentry.py:441
 #, fuzzy
-msgid "Select directory"
-msgstr "Velg katalog"
+#~ msgid "Add _Binary"
+#~ msgstr "Legg _til mål"
 
-#: ../meld/ui/historyentry.py:445
 #, fuzzy
-msgid "Select file"
-msgstr "Velg header-fil"
+#~ msgid "Add binary to VC"
+#~ msgstr "Legg til i prosjekt"
 
-#: ../meld/ui/notebooklabel.py:60
-msgid "Close tab"
-msgstr ""
+#, fuzzy
+#~ msgid "Remove from VC"
+#~ msgstr "Fjern fra prosjekt"
 
-#. These are the possible states of files. Be sure to get the colons correct.
-#: ../meld/vc/_vc.py:40
-msgid ""
-"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
-msgstr ""
+#~ msgid "Delete locally"
+#~ msgstr "Slett lokalt"
 
-#: ../meld/vc/cvs.py:163
-#, python-format
-msgid ""
-"Error converting to a regular expression\n"
-"The pattern was '%s'\n"
-"The error was '%s'"
-msgstr ""
+#, fuzzy
+#~ msgid "Rev"
+#~ msgstr "Fjern"
+
+#~ msgid "Options"
+#~ msgstr "Alternativer"
+
+#~ msgid "%s Not Installed"
+#~ msgstr "%s er ikke installert"
+
+#~ msgid "%s (%s)"
+#~ msgstr "%s (%s)"
+
+#~ msgid "[%s] Applying patch"
+#~ msgstr "[%s] Påfører endringer"
+
+#~ msgid "Select some files first."
+#~ msgstr "Velg noen filer først."
+
+#~ msgid ""
+#~ "Regular expression error\n"
+#~ "'%s'"
+#~ msgstr ""
+#~ "Feil i regulært uttrykk.\n"
+#~ "«%s»"
+
+#~ msgid "Path"
+#~ msgstr "Sti"
+
+#~ msgid "Path to file"
+#~ msgstr "Sti til fila"
+
+#~ msgid "Pop up a file selector to choose a file"
+#~ msgstr "Sprett opp en filvelger for å velge en fil"
+
+#~ msgid ""
+#~ "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
+#~ msgstr ""
+#~ "Ignorert:Ikke versjonskontrollert:::Feil::Nylig lagt til:Endret:Konflikt:"
+#~ "Fjernet:Mangler"
+
+#~ msgid ""
+#~ "Error converting to a regular expression\n"
+#~ "The pattern was '%s'\n"
+#~ "The error was '%s'"
+#~ msgstr ""
+#~ "Klarte ikke konvertere til et regulært uttrykk.\n"
+#~ "Mønsteret er «%s».\n"
+#~ "Feilmeldingen er «%s»."

From 68718f9fb5be41842facf8a8166d76e8e47157ac Mon Sep 17 00:00:00 2001
From: Boyuan Yang <073plan@gmail.com>
Date: Wed, 16 Mar 2022 12:17:52 +0000
Subject: [PATCH 072/116] Update Chinese (China) translation

---
 po/zh_CN.po | 188 ++++++++++++++++++++++++++++------------------------
 1 file changed, 100 insertions(+), 88 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6d48853f..52d25835 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-01-08 23:40+0000\n"
-"PO-Revision-Date: 2022-01-13 15:33-0500\n"
+"POT-Creation-Date: 2022-03-15 12:52+0000\n"
+"PO-Revision-Date: 2022-03-16 08:17-0400\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese - China <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 2.4.3\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
 #: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
@@ -809,7 +809,7 @@ msgstr "相同"
 msgid "New"
 msgstr "新建"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "已修改"
@@ -818,19 +818,23 @@ msgstr "已修改"
 msgid "Ignore filename case"
 msgstr "忽略文件名大小写"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr ""
+
+#: meld/resources/gtk/menus.ui:175
 msgid "Normal"
 msgstr "正常"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "未版本控制"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "已忽略"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:190
 msgid "Flatten folders"
 msgstr "收合文件夹"
 
@@ -954,30 +958,38 @@ msgid "_Compare selected files"
 msgstr "比较选中的文件(_C)"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+msgid "_Mark selected file"
+msgstr "标记选中的文件(_M)"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Compare _with marked file"
+msgstr "与标记的文件比较(_W)"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "复制到左侧(_L)"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "复制到右侧(_R)"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "删除选中项(_D)"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "逐项折叠"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "逐项展开"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "使用外部工具打开(_O)"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "复制文件路径(_C)"
 
@@ -1095,7 +1107,7 @@ msgstr "文件 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:537
+#: meld/dirdiff.py:602
 msgid "Name"
 msgstr "名称"
 
@@ -1135,7 +1147,7 @@ msgstr "有换行"
 msgid "Replace _All"
 msgstr "全部替换(_A)"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1157 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "替换(_R)"
 
@@ -1515,12 +1527,12 @@ msgstr "如果您不保存，更改将永久丢失。"
 msgid "Close _without Saving"
 msgstr "关闭但不保存(_W)"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1156
-#: meld/iohelpers.py:56 meld/iohelpers.py:113
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: meld/resources/ui/save-confirm-dialog.ui:52
+#: meld/resources/ui/save-confirm-dialog.ui:55
 msgid "_Save"
 msgstr "保存(_S)"
 
@@ -1625,94 +1637,94 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:558 meld/preferences.py:132
+#: meld/dirdiff.py:623 meld/preferences.py:132
 msgid "Size"
 msgstr "大小"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:566 meld/preferences.py:133
+#: meld/dirdiff.py:631 meld/preferences.py:133
 msgid "Modification time"
 msgstr "修改时间"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:574 meld/preferences.py:134
+#: meld/dirdiff.py:639 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "修改时间（ISO）"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:582 meld/preferences.py:135
+#: meld/dirdiff.py:647 meld/preferences.py:135
 msgid "Permissions"
 msgstr "权限"
 
-#: meld/dirdiff.py:832
+#: meld/dirdiff.py:900
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (正在扫描…)"
 
-#: meld/dirdiff.py:864 meld/dirdiff.py:888
+#: meld/dirdiff.py:932 meld/dirdiff.py:964
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] 正在扫描 {folder}"
 
-#: meld/dirdiff.py:1028
+#: meld/dirdiff.py:1100
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] 完成"
 
-#: meld/dirdiff.py:1041
+#: meld/dirdiff.py:1113
 msgid "Folder {} is being compared to itself"
 msgstr "文件夹 {} 正与自己进行比较"
 
-#: meld/dirdiff.py:1047
+#: meld/dirdiff.py:1119
 msgid "Folders have no differences"
 msgstr "文件夹间没有差异"
 
-#: meld/dirdiff.py:1049
+#: meld/dirdiff.py:1121
 msgid "Contents of scanned files in folders are identical."
 msgstr "文件夹中的已扫描文件的内容相同。"
 
-#: meld/dirdiff.py:1051
+#: meld/dirdiff.py:1123
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr "文件夹中的已扫描文件似乎相同，但是内容尚未被扫描。"
 
-#: meld/dirdiff.py:1054
+#: meld/dirdiff.py:1126
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "文件过滤器正在使用中，因此并非所有文件都已被扫描。"
 
-#: meld/dirdiff.py:1056
+#: meld/dirdiff.py:1128
 msgid "Text filters are in use and may be masking content differences."
 msgstr "正在使用文本过滤器，可能会屏蔽文件之间的差异。"
 
-#: meld/dirdiff.py:1072 meld/filediff.py:1917
+#: meld/dirdiff.py:1144 meld/filediff.py:1919
 msgid "Hide"
 msgstr "隐藏"
 
-#: meld/dirdiff.py:1074 meld/filediff.py:1919 meld/filediff.py:1949
-#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1146 meld/filediff.py:1921 meld/filediff.py:1951
+#: meld/filediff.py:1953 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "隐藏(_D)"
 
-#: meld/dirdiff.py:1083
+#: meld/dirdiff.py:1155
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "扫描此文件夹时出现了多个错误"
 
-#: meld/dirdiff.py:1084
+#: meld/dirdiff.py:1156
 msgid "Files with invalid encodings found"
 msgstr "发现编码无效的文件"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1158
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "某些文件编码不正确。名称是这样的："
 
-#: meld/dirdiff.py:1088
+#: meld/dirdiff.py:1160
 msgid "Files hidden by case insensitive comparison"
 msgstr "因不区分大小写比较而隐藏的文件"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1090
+#: meld/dirdiff.py:1162
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1720,17 +1732,17 @@ msgstr ""
 "您正在区分大小写的文件系统上运行不区分大小写的比较。此文件夹中的以下文件被隐"
 "藏："
 
-#: meld/dirdiff.py:1101
+#: meld/dirdiff.py:1173
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}” 已被 “{second_file}”隐藏"
 
-#: meld/dirdiff.py:1160
+#: meld/dirdiff.py:1235
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "要替换文件夹“%s”吗？"
 
-#: meld/dirdiff.py:1162
+#: meld/dirdiff.py:1237
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1739,11 +1751,11 @@ msgstr ""
 "另一个同名的文件夹已存在于“%s”中。\n"
 "如果要替换已存在的文件夹，其中的所有文件都将丢失。"
 
-#: meld/dirdiff.py:1175
+#: meld/dirdiff.py:1250
 msgid "Error copying file"
 msgstr "复制文件时出错"
 
-#: meld/dirdiff.py:1176
+#: meld/dirdiff.py:1251
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1756,11 +1768,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1201 meld/vcview.py:764
+#: meld/dirdiff.py:1276 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "删除 {} 时出错"
 
-#: meld/dirdiff.py:1691
+#: meld/dirdiff.py:1819
 msgid "No folder"
 msgstr "没有文件夹"
 
@@ -1783,74 +1795,74 @@ msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "如果冲突已成功解决，可以现在将其标记为已解决。"
 
-#: meld/filediff.py:1227
+#: meld/filediff.py:1228
 msgid "Cancel"
 msgstr "取消"
 
-#: meld/filediff.py:1228
+#: meld/filediff.py:1229
 msgid "Mark _Resolved"
 msgstr "标记为已解决(_R)"
 
-#: meld/filediff.py:1591
+#: meld/filediff.py:1593
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "打开文件“%s”时出现问题。"
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1602
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "文件 %s 似乎是二进制文件。"
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1604
 msgid "Do you want to open the file using the default application?"
 msgstr "确定要使用默认程序打开文件吗？"
 
-#: meld/filediff.py:1604
+#: meld/filediff.py:1606
 msgid "Open"
 msgstr "打开"
 
-#: meld/filediff.py:1626
+#: meld/filediff.py:1628
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] 合并文件"
 
-#: meld/filediff.py:1640
+#: meld/filediff.py:1642
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] 计算差异"
 
-#: meld/filediff.py:1700
+#: meld/filediff.py:1702
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "文件 %s 在磁盘上已更改"
 
-#: meld/filediff.py:1701
+#: meld/filediff.py:1703
 msgid "Do you want to reload the file?"
 msgstr "您想重新加载该文件吗？"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1705
 msgid "_Reload"
 msgstr "重新加载(_R)"
 
-#: meld/filediff.py:1873
+#: meld/filediff.py:1875
 msgid "File {} is being compared to itself"
 msgstr "文件 {} 正与自己进行比较"
 
-#: meld/filediff.py:1882
+#: meld/filediff.py:1884
 msgid "Files are identical"
 msgstr "文件完全相同"
 
-#: meld/filediff.py:1895
+#: meld/filediff.py:1897
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
 msgstr "正在使用文本过滤器，可能会屏蔽文件之间的差异。您想比较未过滤的文件吗？"
 
-#: meld/filediff.py:1900
+#: meld/filediff.py:1902
 msgid "Files differ in line endings only"
 msgstr "文件间仅行尾存在差异"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1904
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1859,75 +1871,75 @@ msgstr ""
 "文件除了行尾均相同，差异细节：\n"
 "%s"
 
-#: meld/filediff.py:1922
+#: meld/filediff.py:1924
 msgid "Show without filters"
 msgstr "显示不过滤的结果"
 
-#: meld/filediff.py:1944
+#: meld/filediff.py:1946
 msgid "Change highlighting incomplete"
 msgstr "更改的高亮显示不完整"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1947
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
 msgstr ""
 "某些更改由于太大没有被高亮。您可以强制高亮显示大幅的更改，尽管这可能很慢。"
 
-#: meld/filediff.py:1953
+#: meld/filediff.py:1955
 msgid "Keep highlighting"
 msgstr "保持语法高亮"
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:1957
 msgid "_Keep highlighting"
 msgstr "保持语法高亮(_K)"
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:1970
 msgid "Saving failed"
 msgstr "保存失败"
 
-#: meld/filediff.py:1969
+#: meld/filediff.py:1971
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
 msgstr "请考虑将任何重要的更改复制到其他程序或文件中以避免数据丢失。"
 
-#: meld/filediff.py:1978
+#: meld/filediff.py:1980
 msgid "Save Left Pane As"
 msgstr "左侧窗格保存为"
 
-#: meld/filediff.py:1980
+#: meld/filediff.py:1982
 msgid "Save Middle Pane As"
 msgstr "中间窗格保存为"
 
-#: meld/filediff.py:1982
+#: meld/filediff.py:1984
 msgid "Save Right Pane As"
 msgstr "右侧窗格保存为"
 
-#: meld/filediff.py:1993
+#: meld/filediff.py:1995
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "文件 %s 打开后在磁盘上已更改"
 
-#: meld/filediff.py:1995
+#: meld/filediff.py:1997
 msgid "If you save it, any external changes will be lost."
 msgstr "如果您保存它，外部的更改将丢失。"
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2000
 msgid "Save Anyway"
 msgstr "依然保存"
 
-#: meld/filediff.py:1999
+#: meld/filediff.py:2001
 msgid "Don’t Save"
 msgstr "不保存"
 
-#: meld/filediff.py:2041
+#: meld/filediff.py:2043
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
 msgstr "文件“{}”包含了其当前编码“{}”无法编码的字符。"
 
-#: meld/filediff.py:2045 meld/patchdialog.py:138
+#: meld/filediff.py:2047 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1936,16 +1948,16 @@ msgstr ""
 "由于以下原因无法保存文件：\n"
 "%s"
 
-#: meld/filediff.py:2049 meld/patchdialog.py:137
+#: meld/filediff.py:2051 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "无法保存文件 %s。"
 
-#: meld/filediff.py:2450
+#: meld/filediff.py:2452
 msgid "Live comparison updating disabled"
 msgstr "实时比较更新已禁用"
 
-#: meld/filediff.py:2451
+#: meld/filediff.py:2453
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1970,16 +1982,16 @@ msgstr "无法将“{}”放入回收站。确定要立即删除它吗？"
 msgid "This remote location does not support sending items to the trash."
 msgstr "该远端位置不支持移动项目到回收站。"
 
-#: meld/iohelpers.py:57
+#: meld/iohelpers.py:58
 msgid "_Delete Permanently"
 msgstr "永久删除(_D)"
 
-#: meld/iohelpers.py:107
+#: meld/iohelpers.py:110
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "要替换文件“%s”吗？"
 
-#: meld/iohelpers.py:109
+#: meld/iohelpers.py:112
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2101,11 +2113,11 @@ msgstr "文件名"
 msgid "Need three files to auto-merge, got: %r"
 msgstr "需要三个文件以自动合并，已得到：%r"
 
-#: meld/meldwindow.py:403
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "无法对文件和目录混合比较"
 
-#: meld/misc.py:150
+#: meld/misc.py:154
 msgid ""
 "{}\n"
 "\n"
@@ -2117,7 +2129,7 @@ msgstr ""
 "Meld 在运行时遭遇严重错误：\n"
 "<tt>{}</tt>"
 
-#: meld/misc.py:201
+#: meld/misc.py:205
 msgid "[None]"
 msgstr "[无]"
 

From 848f4f308ad4307dc4ae0e8376c84227b67a8c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= <balazs@urbalazs.hu>
Date: Fri, 18 Mar 2022 00:41:19 +0000
Subject: [PATCH 073/116] Update Hungarian translation

---
 po/hu.po | 776 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 416 insertions(+), 360 deletions(-)

diff --git a/po/hu.po b/po/hu.po
index 390c0854..d5f4cd82 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,17 +1,17 @@
 # Hungarian translation for meld.
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021. Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
 # This file is distributed under the same license as the meld package.
 #
 # Csécsy László <boobaa at ajrg dot hu>, 2005.
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2014, 2015, 2016.
-# Balázs Úr <ur.balazs at fsf dot hu>, 2017, 2018, 2019, 2020, 2021.
+# Balázs Úr <ur.balazs at fsf dot hu>, 2017, 2018, 2019, 2020, 2021, 2022.
 # Balázs Meskó <mesko.balazs at fsf dot hu>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-03-05 22:54+0000\n"
-"PO-Revision-Date: 2021-03-18 01:39+0100\n"
+"POT-Creation-Date: 2022-03-15 12:52+0000\n"
+"PO-Revision-Date: 2022-03-18 01:39+0100\n"
 "Last-Translator: Balázs Úr <ur.balazs at fsf dot hu>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: hu\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Generator: Lokalize 19.12.3\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
-#: meld/resources/ui/appwindow.ui:9
+#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
 msgid "Meld"
 msgstr "Meld"
 
@@ -85,10 +85,22 @@ msgid "Default window fullscreen state"
 msgstr "Ablak alapértelmezett teljes képernyős állapota"
 
 #: data/org.gnome.meld.gschema.xml:58
+msgid "Prefer application-wide dark theme"
+msgstr "Alkalmazásszintű sötét téma előnyben részesítése"
+
+#: data/org.gnome.meld.gschema.xml:59
+msgid ""
+"If true, the GTK dark theme variant will be used, if available. Note that "
+"this is separate from the syntax highlighting scheme."
+msgstr ""
+"Ha igaz, akkor a GTK sötét téma változata lesz használva, ha elérhető. Ne"
+" feledje, hogy ez független a szintaxiskiemelő sémától."
+
+#: data/org.gnome.meld.gschema.xml:65
 msgid "Additional automatically detected text encodings"
 msgstr "További automatikusan felismert szövegkódolások"
 
-#: data/org.gnome.meld.gschema.xml:59
+#: data/org.gnome.meld.gschema.xml:66
 msgid ""
 "Meld will use these text encodings to try to decode loaded text files before "
 "trying any other encodings. In addition to the encodings in this list, UTF-8 "
@@ -101,39 +113,39 @@ msgstr ""
 "kódolása mindig felhasználásra kerül, a felhasználó területi beállításától "
 "függően más kódolások is kipróbálhatók."
 
-#: data/org.gnome.meld.gschema.xml:66
+#: data/org.gnome.meld.gschema.xml:73
 msgid "Width of an indentation step"
 msgstr "Behúzási lépés szélessége"
 
-#: data/org.gnome.meld.gschema.xml:67
+#: data/org.gnome.meld.gschema.xml:74
 msgid "The number of spaces to use for a single indent step"
 msgstr "Egy behúzási lépéshez használandó szóközök száma"
 
-#: data/org.gnome.meld.gschema.xml:71
+#: data/org.gnome.meld.gschema.xml:78
 msgid "Whether to indent using spaces or tabs"
 msgstr "A behúzáshoz szóközök vagy tabok használandók-e"
 
-#: data/org.gnome.meld.gschema.xml:72
+#: data/org.gnome.meld.gschema.xml:79
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr ""
 "Ha igaz, akkor minden új behúzás szóközöket fog használni tabulátorok "
 "helyett."
 
-#: data/org.gnome.meld.gschema.xml:76 meld/resources/ui/statusbar-menu.ui:5
+#: data/org.gnome.meld.gschema.xml:83 meld/resources/ui/statusbar-menu.ui:5
 msgid "Show line numbers"
 msgstr "Sorszámok megjelenítése"
 
-#: data/org.gnome.meld.gschema.xml:77
+#: data/org.gnome.meld.gschema.xml:84
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr ""
 "Ha igaz, akkor a sorszámok meg fognak jelenni a fájl-összehasonlítások "
 "margóján."
 
-#: data/org.gnome.meld.gschema.xml:81
+#: data/org.gnome.meld.gschema.xml:88
 msgid "Highlight syntax"
 msgstr "Szintaxiskiemelés"
 
-#: data/org.gnome.meld.gschema.xml:82
+#: data/org.gnome.meld.gschema.xml:89
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld’s own color "
 "highlighting, this is off by default."
@@ -141,21 +153,21 @@ msgstr ""
 "A szintaxis kiemelése az összehasonlításokban. A Meld saját színkiemelése "
 "miatt ez alapesetben ki van kapcsolva."
 
-#: data/org.gnome.meld.gschema.xml:86
+#: data/org.gnome.meld.gschema.xml:93
 msgid "Color scheme to use for syntax highlighting"
 msgstr "Szintaxiskiemeléshez használandó színséma"
 
-#: data/org.gnome.meld.gschema.xml:87
+#: data/org.gnome.meld.gschema.xml:94
 msgid "Used by GtkSourceView to determine colors for syntax highlighting"
 msgstr ""
 "A GtkSourceView használja a szintaxiskiemeléshez használandó színek "
 "meghatározásához"
 
-#: data/org.gnome.meld.gschema.xml:91
+#: data/org.gnome.meld.gschema.xml:98
 msgid "Draw whitespace"
 msgstr "Üres helyek kirajzolása"
 
-#: data/org.gnome.meld.gschema.xml:92
+#: data/org.gnome.meld.gschema.xml:99
 msgid ""
 "If true, whitespace characters will be drawn in comparisons even if they are "
 "not in a changed area."
@@ -163,11 +175,11 @@ msgstr ""
 "Ha igaz, akkor az üres hely karakterek ki lesznek rajzolva az "
 "összehasonlításokban, még akkor is ha nincsenek a megváltoztatott területen."
 
-#: data/org.gnome.meld.gschema.xml:101
+#: data/org.gnome.meld.gschema.xml:108
 msgid "Wrap mode"
 msgstr "Tördelés módja"
 
-#: data/org.gnome.meld.gschema.xml:102
+#: data/org.gnome.meld.gschema.xml:109
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
@@ -177,11 +189,11 @@ msgstr ""
 "törni. Lehetséges értékek: „none” (ne törjön), „char” (bármely karakter) "
 "vagy „word” (csak szavak végén)."
 
-#: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
+#: data/org.gnome.meld.gschema.xml:116 meld/resources/ui/statusbar-menu.ui:13
 msgid "Highlight current line"
 msgstr "Aktuális sor kiemelése"
 
-#: data/org.gnome.meld.gschema.xml:110
+#: data/org.gnome.meld.gschema.xml:117
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
@@ -189,23 +201,23 @@ msgstr ""
 "Ha igaz, akkor a kurzort tartalmazó sor ki lesz emelve a fájl-"
 "összehasonlításokban."
 
-#: data/org.gnome.meld.gschema.xml:114
+#: data/org.gnome.meld.gschema.xml:121
 msgid "Use the system default monospace font"
 msgstr ""
 "A rendszer alapértelmezett rögzített szélességű betűkészletének használata"
 
-#: data/org.gnome.meld.gschema.xml:115
+#: data/org.gnome.meld.gschema.xml:122
 msgid ""
 "If false, custom-font will be used instead of the system monospace font."
 msgstr ""
 "Ha hamis, akkor a rendszer rögzített szélességű betűkészlete helyett az "
 "egyéni lesz használva."
 
-#: data/org.gnome.meld.gschema.xml:119
+#: data/org.gnome.meld.gschema.xml:126
 msgid "Custom font"
 msgstr "Egyéni betűkészlet"
 
-#: data/org.gnome.meld.gschema.xml:120
+#: data/org.gnome.meld.gschema.xml:127
 msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
@@ -213,41 +225,41 @@ msgstr ""
 "Használandó egyéni betűkészlet, karakterláncként tárolva és Pango "
 "betűleírásként feldolgozva."
 
-#: data/org.gnome.meld.gschema.xml:126
+#: data/org.gnome.meld.gschema.xml:133
 msgid "Show overview source map"
 msgstr "Áttekintő forrástérkép megjelenítése"
 
-#: data/org.gnome.meld.gschema.xml:127
+#: data/org.gnome.meld.gschema.xml:134
 msgid ""
 "If true, file comparisons will have paired source maps for compared files."
 msgstr ""
 "Ha igaz, akkor a fájl-összehasonlítások összepárosított forrástérképeket "
 "fognak tartalmazni az összehasonlított fájlokhoz."
 
-#: data/org.gnome.meld.gschema.xml:132
+#: data/org.gnome.meld.gschema.xml:139
 msgid "Style of overview map"
 msgstr "Az áttekintő térkép stílusa"
 
-#: data/org.gnome.meld.gschema.xml:133
+#: data/org.gnome.meld.gschema.xml:140
 msgid "Style options for how the overview map is displayed."
 msgstr "Az áttekintő térkép megjelenítését szabályozó stílusbeállítások."
 
-#: data/org.gnome.meld.gschema.xml:139
+#: data/org.gnome.meld.gschema.xml:146
 msgid "Ignore blank lines when comparing files"
 msgstr "Üres sorok figyelmen kívül hagyása fájlok összehasonlításakor"
 
-#: data/org.gnome.meld.gschema.xml:140
+#: data/org.gnome.meld.gschema.xml:147
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
 "Ha igaz, akkor az üres sorok ki lesznek hagyva a fájlok közti különbségek "
 "kiemelésekor."
 
-#: data/org.gnome.meld.gschema.xml:147
+#: data/org.gnome.meld.gschema.xml:154
 msgid "Use the system default editor"
 msgstr "A rendszer alapértelmezett szerkesztőjének használata"
 
-#: data/org.gnome.meld.gschema.xml:148
+#: data/org.gnome.meld.gschema.xml:155
 msgid ""
 "If false, custom-editor-command will be used instead of the system editor "
 "when opening files externally."
@@ -255,11 +267,11 @@ msgstr ""
 "Ha hamis, akkor a custom-editor-command lesz a rendszer alapértelmezett "
 "szerkesztője helyett használva."
 
-#: data/org.gnome.meld.gschema.xml:152
+#: data/org.gnome.meld.gschema.xml:159
 msgid "The custom editor launch command"
 msgstr "Az egyéni szerkesztőt indító parancs"
 
-#: data/org.gnome.meld.gschema.xml:153
+#: data/org.gnome.meld.gschema.xml:160
 msgid ""
 "The command used to launch a custom editor. Some limited templating is "
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
@@ -267,22 +279,22 @@ msgstr ""
 "Az egyéni szerkesztőt indító parancs. Ez a kulcs korlátozottan támogat "
 "sablonokat is. Jelenleg a {file} és {line} a felismert helyettesítők."
 
-#: data/org.gnome.meld.gschema.xml:159
+#: data/org.gnome.meld.gschema.xml:166
 msgid "Columns to display"
 msgstr "Megjelenítendő oszlopok"
 
-#: data/org.gnome.meld.gschema.xml:160
+#: data/org.gnome.meld.gschema.xml:167
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
 msgstr ""
 "Oszlopnevek listája a mappa-összehasonlításban, és hogy megjelenítendők-e."
 
-#: data/org.gnome.meld.gschema.xml:164 meld/resources/ui/preferences.ui:935
+#: data/org.gnome.meld.gschema.xml:171 meld/resources/ui/preferences.ui:951
 msgid "Ignore symbolic links"
 msgstr "Szimbolikus linkek figyelmen kívül hagyása"
 
-#: data/org.gnome.meld.gschema.xml:165
+#: data/org.gnome.meld.gschema.xml:172
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
@@ -290,11 +302,11 @@ msgstr ""
 "Ha igaz, akkor a mappa-összehasonlítások nem követik a szimbolikus linkeket "
 "a mappafa bejárásakor."
 
-#: data/org.gnome.meld.gschema.xml:169
+#: data/org.gnome.meld.gschema.xml:176
 msgid "Use shallow comparison"
 msgstr "Sekély összehasonlítás használata"
 
-#: data/org.gnome.meld.gschema.xml:170
+#: data/org.gnome.meld.gschema.xml:177
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
@@ -304,11 +316,11 @@ msgstr ""
 "módosítási idő alapján hasonlítják össze, a fájlokat azonosnak tekintik a "
 "méret és módosítási idő egyezésekor, és eltérőnek egyébként."
 
-#: data/org.gnome.meld.gschema.xml:174
+#: data/org.gnome.meld.gschema.xml:181
 msgid "File timestamp resolution"
 msgstr "Fájlidőbélyeg felbontása"
 
-#: data/org.gnome.meld.gschema.xml:175
+#: data/org.gnome.meld.gschema.xml:182
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
 "between two files before they’re considered to have different mtimes. This "
@@ -320,11 +332,11 @@ msgstr ""
 "számítanának. Ez eltérő időbélyeg-felbontással rendelkező fájlrendszereken "
 "lévő fájlok összehasonlításakor hasznos."
 
-#: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
+#: data/org.gnome.meld.gschema.xml:186 meld/resources/ui/preferences.ui:852
 msgid "Apply text filters during folder comparisons"
 msgstr "Szövegszűrők alkalmazása mappa-összehasonlításkor"
 
-#: data/org.gnome.meld.gschema.xml:180
+#: data/org.gnome.meld.gschema.xml:187
 msgid ""
 "If true, folder comparisons that compare file contents also apply active "
 "text filters and the blank line trimming option, and ignore newline "
@@ -334,21 +346,21 @@ msgstr ""
 "szövegszűrőket is alkalmaznak, valamint levágják az üres sorokat, és "
 "mellőzik az üreshely-különbségeket."
 
-#: data/org.gnome.meld.gschema.xml:184
+#: data/org.gnome.meld.gschema.xml:191
 msgid "File status filters"
 msgstr "Fájlállapotszűrők"
 
-#: data/org.gnome.meld.gschema.xml:185
+#: data/org.gnome.meld.gschema.xml:192
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 "A mappa-összehasonlításban látható fájlok szűrésére használt állapotok "
 "listája."
 
-#: data/org.gnome.meld.gschema.xml:191
+#: data/org.gnome.meld.gschema.xml:198
 msgid "Show the version control console output"
 msgstr "A verziókövető konzolos kimenetének megjelenítése"
 
-#: data/org.gnome.meld.gschema.xml:192
+#: data/org.gnome.meld.gschema.xml:199
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
@@ -357,21 +369,21 @@ msgstr ""
 "szakasz, amely a verziókövetési műveletekhez használt parancsokat jeleníti "
 "meg."
 
-#: data/org.gnome.meld.gschema.xml:196
+#: data/org.gnome.meld.gschema.xml:203
 msgid "Version control pane position"
 msgstr "Verziókövetés ablaktábla pozíciója"
 
-#: data/org.gnome.meld.gschema.xml:197
+#: data/org.gnome.meld.gschema.xml:204
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
 msgstr "A fő verziókövetési fa magassága, amikor a konzol ablaktábla látható."
 
-#: data/org.gnome.meld.gschema.xml:201
+#: data/org.gnome.meld.gschema.xml:208
 msgid "Present version comparisons as left-local/right-remote"
 msgstr "Verzió-összehasonlítások megjelenítése mint bal-helyi / jobb-távoli"
 
-#: data/org.gnome.meld.gschema.xml:202
+#: data/org.gnome.meld.gschema.xml:209
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
@@ -381,13 +393,13 @@ msgstr ""
 "sémát használják-e a fájlok megjelenítéséhez az ablaktáblákon. Ha nincs "
 "bejelölve, a bal-övék, jobb-enyém séma kerül felhasználásra."
 
-#: data/org.gnome.meld.gschema.xml:206
+#: data/org.gnome.meld.gschema.xml:213
 msgid "Order for files in three-way version control merge comparisons"
 msgstr ""
 "Fájlok sorrendje a háromutas verziókövetési összefésülési "
 "összehasonlításokban"
 
-#: data/org.gnome.meld.gschema.xml:207
+#: data/org.gnome.meld.gschema.xml:214
 msgid ""
 "Choices for file order are remote/merged/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
@@ -398,11 +410,11 @@ msgstr ""
 "összehasonlításokat befolyásolja, így csak a Melden belüli összefésülésekhez/"
 "ütközésfeloldásokhoz kerül felhasználásra."
 
-#: data/org.gnome.meld.gschema.xml:211
+#: data/org.gnome.meld.gschema.xml:218
 msgid "Show margin in commit message editor"
 msgstr "Margó megjelenítése a véglegesítésüzenet-szerkesztőben"
 
-#: data/org.gnome.meld.gschema.xml:212
+#: data/org.gnome.meld.gschema.xml:219
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
@@ -410,11 +422,11 @@ msgstr ""
 "Ha igaz, akkor egy útmutató lesz megjelenítve azt jelezve, hogy a margó "
 "melyik oszlopban van a verziókövetési véglegesítésüzenet-szerkesztőben."
 
-#: data/org.gnome.meld.gschema.xml:216
+#: data/org.gnome.meld.gschema.xml:223
 msgid "Margin column in commit message editor"
 msgstr "Margó oszlop a véglegesítésüzenet-szerkesztőben"
 
-#: data/org.gnome.meld.gschema.xml:217
+#: data/org.gnome.meld.gschema.xml:224
 msgid ""
 "The column at which to show the margin in the version control commit message "
 "editor."
@@ -422,11 +434,11 @@ msgstr ""
 "A margó megjelenítése ebben az oszlopban a verziókövető véglegesítésüzenet-"
 "szerkesztőjében."
 
-#: data/org.gnome.meld.gschema.xml:221
+#: data/org.gnome.meld.gschema.xml:228
 msgid "Automatically hard-wrap commit messages"
 msgstr "Véglegesítésüzenetek automatikus törése"
 
-#: data/org.gnome.meld.gschema.xml:222
+#: data/org.gnome.meld.gschema.xml:229
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the commit margin before commit."
@@ -434,22 +446,22 @@ msgstr ""
 "Ha igaz, akkor a verziókövető véglegesítésüzenet-szerkesztője sortöréseket "
 "szúr be a véglegesítés margójánál a véglegesítés előtt."
 
-#: data/org.gnome.meld.gschema.xml:226
+#: data/org.gnome.meld.gschema.xml:233
 msgid "Version control status filters"
 msgstr "Verziókövetési állapotszűrők"
 
-#: data/org.gnome.meld.gschema.xml:227
+#: data/org.gnome.meld.gschema.xml:234
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 "A verziókövetési összehasonlításban látható fájlok szűrésére használt "
 "állapotok listája."
 
-#: data/org.gnome.meld.gschema.xml:241
+#: data/org.gnome.meld.gschema.xml:248
 msgid "Filename-based filters"
 msgstr "Fájlnév alapú szűrők"
 
-#: data/org.gnome.meld.gschema.xml:242
+#: data/org.gnome.meld.gschema.xml:249
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
@@ -457,11 +469,11 @@ msgstr ""
 "Előre megadott fájlnév alapú szűrők listája, amelyekre illeszkedő fájlok "
 "eltávolításra kerülnek a mappa-összehasonlításból."
 
-#: data/org.gnome.meld.gschema.xml:256
+#: data/org.gnome.meld.gschema.xml:263
 msgid "Text-based filters"
 msgstr "Szöveg alapú szűrők"
 
-#: data/org.gnome.meld.gschema.xml:257
+#: data/org.gnome.meld.gschema.xml:264
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
@@ -806,11 +818,11 @@ msgstr "Minden egyesítése jobbról"
 msgid "Merge All"
 msgstr "Minden egyesítése"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
 msgid "Add Synchronization Point"
 msgstr "Szinkronizálási pont hozzáadása"
 
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
 msgid "Clear Synchronization Points"
 msgstr "Szinkronizálási pontok törlése"
 
@@ -846,7 +858,7 @@ msgstr "Egyezik"
 msgid "New"
 msgstr "Új"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Módosítva"
@@ -855,29 +867,36 @@ msgstr "Módosítva"
 msgid "Ignore filename case"
 msgstr "Kis- és nagybetűk nem különböznek a fájlnévben"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr "Unicode útvonalak normalizálása"
+
+#: meld/resources/gtk/menus.ui:175
 msgid "Normal"
 msgstr "Normál"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Verziózatlan"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Mellőzve"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:190
 msgid "Flatten folders"
 msgstr "Könyvtárak simítása"
 
 #: meld/resources/ui/about-dialog.ui:8
+#| msgid ""
+#| "Copyright © 2002-2009 Stephen Kennedy\n"
+#| "Copyright © 2009-2019 Kai Willadsen"
 msgid ""
 "Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2019 Kai Willadsen"
+"Copyright © 2009-2021 Kai Willadsen"
 msgstr ""
 "Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2019 Kai Willadsen"
+"Copyright © 2009-2021 Kai Willadsen"
 
 #: meld/resources/ui/about-dialog.ui:14
 msgid "translator-credits"
@@ -887,39 +906,39 @@ msgstr ""
 "Meskó Balázs <mesko.balazs at fsf dot hu>\n"
 "Úr Balázs <ur.balazs at fsf dot hu>"
 
-#: meld/resources/ui/appwindow.ui:29
+#: meld/resources/ui/appwindow.ui:30
 msgid "Start a new comparison"
 msgstr "Új összehasonlítás indítása"
 
-#: meld/resources/ui/appwindow.ui:45
+#: meld/resources/ui/appwindow.ui:46
 msgid "Open a recent comparison"
 msgstr "Friss összehasonlítás megnyitása"
 
-#: meld/resources/ui/appwindow.ui:73
+#: meld/resources/ui/appwindow.ui:74
 msgid "Go to the previous change"
 msgstr "Ugrás az előző változásra"
 
-#: meld/resources/ui/appwindow.ui:93
+#: meld/resources/ui/appwindow.ui:94
 msgid "Go to the next change"
 msgstr "Ugrás a következő változásra"
 
-#: meld/resources/ui/appwindow.ui:123
+#: meld/resources/ui/appwindow.ui:124
 msgid "Go to the previous conflict"
 msgstr "Ugrás az előző ütközésre"
 
-#: meld/resources/ui/appwindow.ui:143
+#: meld/resources/ui/appwindow.ui:144
 msgid "Go to the next conflict"
 msgstr "Ugrás a következő ütközésre"
 
-#: meld/resources/ui/appwindow.ui:192
+#: meld/resources/ui/appwindow.ui:193
 msgid "Version Filters"
 msgstr "Verziószűrők"
 
-#: meld/resources/ui/appwindow.ui:207 meld/resources/ui/preferences.ui:1456
+#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472
 msgid "File Filters"
 msgstr "Fájlszűrők"
 
-#: meld/resources/ui/appwindow.ui:222 meld/resources/ui/preferences.ui:1641
+#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657
 msgid "Text Filters"
 msgstr "Szövegszűrők"
 
@@ -932,7 +951,7 @@ msgid "Column Name"
 msgstr "Oszlopnév"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
@@ -989,33 +1008,64 @@ msgid "_Compare selected files"
 msgstr "_Kijelölt fájlok összehasonlítása"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+#| msgid "_Compare selected files"
+msgid "_Mark selected file"
+msgstr "_Kijelölt fájl megjelölése"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+#| msgid "_Compare selected files"
+msgid "Compare _with marked file"
+msgstr "Össze_hasonlítás a kijelölt fájllal"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "Másolás a _balra"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "Másolás a _jobbra"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "Kijelölt _törlése"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "Összecsukás rekurzívan"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "Kinyitás rekurzívan"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "Megnyitás _külső alkalmazással"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "_Fájlútvonalak másolása"
 
+#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
+#: meld/resources/ui/dirdiff.ui:117
+#| msgid "Save file in this pane"
+msgid "Select folder to open in this pane"
+msgstr "Ebben az ablaktáblában megnyitandó mappa kijelölése"
+
+#: meld/resources/ui/dirdiff.ui:43
+#| msgid "Folder"
+msgid "Folder 1"
+msgstr "1. mappa"
+
+#: meld/resources/ui/dirdiff.ui:84
+#| msgid "Folder"
+msgid "Folder 2"
+msgstr "2. mappa"
+
+#: meld/resources/ui/dirdiff.ui:125
+#| msgid "Folder"
+msgid "Folder 3"
+msgstr "3. mappa"
+
 #: meld/resources/ui/encoding-selector.ui:31
 msgid "Search text encoding…"
 msgstr "Szövegkódolás keresése…"
@@ -1072,8 +1122,17 @@ msgstr "_Másolás"
 msgid "_Paste"
 msgstr "_Beillesztés"
 
-#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
-#: meld/resources/ui/filediff.ui:171
+#: meld/resources/ui/filediff-menus.ui:54
+msgid "Open Containing Folder"
+msgstr "Tartalmazó mappa megnyitása"
+
+#: meld/resources/ui/filediff-menus.ui:58
+#| msgid "_Copy File Paths"
+msgid "Copy Full Path"
+msgstr "Teljes útvonal másolása"
+
+#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
+#: meld/resources/ui/filediff.ui:169
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -1081,31 +1140,31 @@ msgstr ""
 "Ebbe a fájlba nem lehet írni. Ide kattintva feloldhatja a fájlt és "
 "módosításokat végezhet, de ezeket a módosításokat új fájlba kell mentenie."
 
-#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
-#: meld/resources/ui/filediff.ui:185
-msgid "Open file in this pane"
-msgstr "Fájl megnyitása ebben az ablaktáblában"
-
-#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
-#: meld/resources/ui/filediff.ui:194
+#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
+#: meld/resources/ui/filediff.ui:183
 msgid "Save file in this pane"
 msgstr "Fájl mentése ebben az ablaktáblában"
 
-#: meld/resources/ui/filediff.ui:73
+#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
+#: meld/resources/ui/filediff.ui:209
+msgid "Open file in this pane"
+msgstr "Fájl megnyitása ebben az ablaktáblában"
+
+#: meld/resources/ui/filediff.ui:79
 msgid "File 3"
 msgstr "3. fájl"
 
-#: meld/resources/ui/filediff.ui:142
+#: meld/resources/ui/filediff.ui:148
 msgid "File 2"
 msgstr "2. fájl"
 
-#: meld/resources/ui/filediff.ui:207
+#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148
 msgid "File 1"
 msgstr "1. fájl"
 
 #. Create icon and filename CellRenderer
-#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
-#: meld/dirdiff.py:517
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
+#: meld/dirdiff.py:602
 msgid "Name"
 msgstr "Név"
 
@@ -1117,7 +1176,7 @@ msgstr "Minta"
 msgid "Add new filter"
 msgstr "Új szűrő hozzáadása"
 
-#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18
 msgid "_Add"
 msgstr "Hozzá_adás"
 
@@ -1145,7 +1204,7 @@ msgstr "Körbeért"
 msgid "Replace _All"
 msgstr "Öss_zes cseréje"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1067 meld/iohelpers.py:113
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "_Csere"
 
@@ -1157,7 +1216,7 @@ msgstr "Váltás a Keresés és a Keresés és csere között"
 msgid "Search highlight mode…"
 msgstr "Kiemelési mód keresése…"
 
-#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:349
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342
 #: meld/newdifftab.py:49
 msgid "New comparison"
 msgstr "Új összehasonlítás"
@@ -1174,43 +1233,43 @@ msgstr "Mappa"
 msgid "Version control"
 msgstr "Verziókövetés"
 
-#: meld/resources/ui/new-diff-tab.ui:235 meld/resources/ui/new-diff-tab.ui:352
+#: meld/resources/ui/new-diff-tab.ui:236 meld/resources/ui/new-diff-tab.ui:357
 msgid "_3-way comparison"
 msgstr "_3 utas összehasonlítás"
 
-#: meld/resources/ui/new-diff-tab.ui:254
+#: meld/resources/ui/new-diff-tab.ui:256
 msgid "Select First File"
 msgstr "Válasszon első fájlt"
 
-#: meld/resources/ui/new-diff-tab.ui:267
+#: meld/resources/ui/new-diff-tab.ui:270
 msgid "Select Second File"
 msgstr "Válasszon második fájlt"
 
-#: meld/resources/ui/new-diff-tab.ui:281
+#: meld/resources/ui/new-diff-tab.ui:285
 msgid "Select Third File"
 msgstr "Válasszon harmadik fájlt"
 
-#: meld/resources/ui/new-diff-tab.ui:316
+#: meld/resources/ui/new-diff-tab.ui:321
 msgid "Select First Folder"
 msgstr "Válasszon első mappát"
 
-#: meld/resources/ui/new-diff-tab.ui:329
+#: meld/resources/ui/new-diff-tab.ui:334
 msgid "Select Second Folder"
 msgstr "Válasszon második mappát"
 
-#: meld/resources/ui/new-diff-tab.ui:343
+#: meld/resources/ui/new-diff-tab.ui:348
 msgid "Select Third Folder"
 msgstr "Válasszon harmadik mappát"
 
-#: meld/resources/ui/new-diff-tab.ui:393
+#: meld/resources/ui/new-diff-tab.ui:399
 msgid "Select A Version-Controlled Folder"
 msgstr "Válasszon egy verziókövetés alatti mappát"
 
-#: meld/resources/ui/new-diff-tab.ui:442
+#: meld/resources/ui/new-diff-tab.ui:448
 msgid "_Blank comparison"
 msgstr "Ü_res összehasonlítás"
 
-#: meld/resources/ui/new-diff-tab.ui:459
+#: meld/resources/ui/new-diff-tab.ui:466
 msgid "C_ompare"
 msgstr "Össze_hasonlítás"
 
@@ -1246,6 +1305,20 @@ msgstr "Középső és jobb ablaktáblák"
 msgid "_Reverse patch direction"
 msgstr "F_olt irányának megfordítása"
 
+#: meld/resources/ui/path-label.ui:23
+msgid "Path"
+msgstr "Útvonal"
+
+#: meld/resources/ui/path-label.ui:62
+#| msgid "_Copy File Paths"
+msgid "Copy Path"
+msgstr "Útvonal másolása"
+
+#: meld/resources/ui/path-label.ui:78
+#| msgid "Open File"
+msgid "Open Folder"
+msgstr "Mappa megnyitása"
+
 #: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
 msgid "Preferences"
 msgstr "Beállítások"
@@ -1297,104 +1370,109 @@ msgid "Show w_hitespace"
 msgstr "Ü_res helyek megjelenítése"
 
 #: meld/resources/ui/preferences.ui:381
+#| msgid "Meld dark scheme"
+msgid "Prefer dark theme"
+msgstr "Sötét téma előnyben részesítése"
+
+#: meld/resources/ui/preferences.ui:397
 msgid "Use s_yntax highlighting"
 msgstr "S_zintaxiskiemelés használata"
 
-#: meld/resources/ui/preferences.ui:404
+#: meld/resources/ui/preferences.ui:420
 msgid "Syntax highlighting color scheme:"
 msgstr "Szintaxiskiemelés színsémája:"
 
-#: meld/resources/ui/preferences.ui:469
+#: meld/resources/ui/preferences.ui:485
 msgid "Code Overview"
 msgstr "Kódáttekintés"
 
-#: meld/resources/ui/preferences.ui:506
+#: meld/resources/ui/preferences.ui:522
 msgid "Show overview map"
 msgstr "Áttekintő térkép megjelenítése"
 
-#: meld/resources/ui/preferences.ui:529
+#: meld/resources/ui/preferences.ui:545
 msgid "Overview map style:"
 msgstr "Áttekintő térkép stílusa:"
 
-#: meld/resources/ui/preferences.ui:596
+#: meld/resources/ui/preferences.ui:612
 msgid "External Editor"
 msgstr "Külső szerkesztő"
 
-#: meld/resources/ui/preferences.ui:632
+#: meld/resources/ui/preferences.ui:648
 msgid "Use _default system editor"
 msgstr "Alapértelmezett _rendszerszerkesztő használata"
 
-#: meld/resources/ui/preferences.ui:655
+#: meld/resources/ui/preferences.ui:671
 msgid "Edito_r command:"
 msgstr "Szerkesztő_parancs:"
 
-#: meld/resources/ui/preferences.ui:711
+#: meld/resources/ui/preferences.ui:727
 msgid "Editor"
 msgstr "Szerkesztő"
 
-#: meld/resources/ui/preferences.ui:732
+#: meld/resources/ui/preferences.ui:748
 msgid "Shallow Comparison"
 msgstr "Sekély összehasonlítás"
 
-#: meld/resources/ui/preferences.ui:768
+#: meld/resources/ui/preferences.ui:784
 msgid "C_ompare files based only on size and timestamp"
 msgstr "_Fájlok összehasonlítása csak méret és időbélyeg alapján"
 
-#: meld/resources/ui/preferences.ui:791
+#: meld/resources/ui/preferences.ui:807
 msgid "_Timestamp resolution:"
 msgstr "_Időbélyeg felbontása:"
 
-#: meld/resources/ui/preferences.ui:855
+#: meld/resources/ui/preferences.ui:871
 msgid "Note: enabling text filters may make comparing large files much slower"
 msgstr ""
 "Megjegyzés: a szövegszűrők engedélyezése sokkal lassabbá teszi a nagy fájlok "
 "összehasonlítását"
 
-#: meld/resources/ui/preferences.ui:904
+#: meld/resources/ui/preferences.ui:920
 msgid "Symbolic Links"
 msgstr "Szimbolikus linkek"
 
-#: meld/resources/ui/preferences.ui:972
+#: meld/resources/ui/preferences.ui:988
 msgid "Visible Columns"
 msgstr "Látható oszlopok"
 
-#: meld/resources/ui/preferences.ui:1039
+#: meld/resources/ui/preferences.ui:1055
 msgid "Folder Comparisons"
 msgstr "Mappa-összehasonlítás"
 
-#: meld/resources/ui/preferences.ui:1061
+#: meld/resources/ui/preferences.ui:1077
 msgid "Version Comparisons"
 msgstr "Verzió-összehasonlítás"
 
-#: meld/resources/ui/preferences.ui:1104
+#: meld/resources/ui/preferences.ui:1120
 msgid "_Order when comparing file revisions:"
 msgstr "So_rrend fájlrevíziók összehasonlításakor:"
 
-#: meld/resources/ui/preferences.ui:1151
+#: meld/resources/ui/preferences.ui:1167
 msgid "Order when _merging files:"
 msgstr "Sorrend _fájlok összefésülésekor:"
 
-#: meld/resources/ui/preferences.ui:1219
+#: meld/resources/ui/preferences.ui:1235
 msgid "Commit Messages"
 msgstr "Véglegesítés-üzenetek"
 
-#: meld/resources/ui/preferences.ui:1260
+#: meld/resources/ui/preferences.ui:1276
 msgid "Show _right margin at:"
 msgstr "_Jobb margó megjelenítése:"
 
-#: meld/resources/ui/preferences.ui:1301
+#: meld/resources/ui/preferences.ui:1317
 msgid "Automatically _break lines at right margin on commit"
 msgstr "Sorok a_utomatikus tördelése a jobb margónál véglegesítéskor"
 
-#: meld/resources/ui/preferences.ui:1351
+#: meld/resources/ui/preferences.ui:1367
 msgid "Version Control"
 msgstr "Verziókövetés"
 
-#: meld/resources/ui/preferences.ui:1373
+#: meld/resources/ui/preferences.ui:1389
 msgid "Filename filters"
 msgstr "Fájlnévszűrők"
 
-#: meld/resources/ui/preferences.ui:1411
+#: meld/resources/ui/preferences.ui:1427
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -1404,19 +1482,19 @@ msgstr ""
 "alapján. Minden minta egy shell-stílusú helyettesítőkarakter-lista "
 "szóközökkel elválasztva."
 
-#: meld/resources/ui/preferences.ui:1478
+#: meld/resources/ui/preferences.ui:1494
 msgid "Change trimming"
 msgstr "Módosítások nyírása"
 
-#: meld/resources/ui/preferences.ui:1514
+#: meld/resources/ui/preferences.ui:1530
 msgid "Trim blank line differences from the start and end of changes"
 msgstr "Üres sorokból álló eltérés lenyírása a módosítások elejéről és végéről"
 
-#: meld/resources/ui/preferences.ui:1558
+#: meld/resources/ui/preferences.ui:1574
 msgid "Text filters"
 msgstr "Szövegszűrők"
 
-#: meld/resources/ui/preferences.ui:1596
+#: meld/resources/ui/preferences.ui:1612
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -1430,47 +1508,47 @@ msgstr ""
 "csoportokat tartalmaz, csak a csoportok lesznek kicserélve. További "
 "részletekért lásd a felhasználói kézikönyvet."
 
-#: meld/resources/ui/preferences.ui:1687
+#: meld/resources/ui/preferences.ui:1703
 msgid "Left is remote, right is local"
 msgstr "Bal a távoli, jobb a helyi"
 
-#: meld/resources/ui/preferences.ui:1691
+#: meld/resources/ui/preferences.ui:1707
 msgid "Left is local, right is remote"
 msgstr "Bal a helyi, jobb a távoli"
 
-#: meld/resources/ui/preferences.ui:1705
+#: meld/resources/ui/preferences.ui:1721
 msgid "Simple change map"
 msgstr "Egyszerű változástérkép"
 
-#: meld/resources/ui/preferences.ui:1709
+#: meld/resources/ui/preferences.ui:1725
 msgid "Compact source map"
 msgstr "Kompakt forrástérkép"
 
-#: meld/resources/ui/preferences.ui:1713
+#: meld/resources/ui/preferences.ui:1729
 msgid "Full source map"
 msgstr "Teljes forrástérkép"
 
-#: meld/resources/ui/preferences.ui:1727
+#: meld/resources/ui/preferences.ui:1743
 msgid "Remote, merge, local"
 msgstr "Távoli, összefésült, helyi"
 
-#: meld/resources/ui/preferences.ui:1731
+#: meld/resources/ui/preferences.ui:1747
 msgid "Local, merge, remote"
 msgstr "Helyi, összefésült, távoli"
 
-#: meld/resources/ui/preferences.ui:1753
+#: meld/resources/ui/preferences.ui:1769
 msgid "1ns (ext4)"
 msgstr "1ns (ext4)"
 
-#: meld/resources/ui/preferences.ui:1757
+#: meld/resources/ui/preferences.ui:1773
 msgid "100ns (NTFS)"
 msgstr "100ns (NTFS)"
 
-#: meld/resources/ui/preferences.ui:1761
+#: meld/resources/ui/preferences.ui:1777
 msgid "1s (ext2/ext3)"
 msgstr "1s (ext2/ext3)"
 
-#: meld/resources/ui/preferences.ui:1765
+#: meld/resources/ui/preferences.ui:1781
 msgid "2s (VFAT)"
 msgstr "2s (VFAT)"
 
@@ -1514,12 +1592,12 @@ msgstr "Ha nem ment, akkor a változtatások véglegesen elvesznek."
 msgid "Close _without Saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1066
-#: meld/iohelpers.py:55 meld/iohelpers.py:112
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "Mé_gse"
 
-#: meld/resources/ui/save-confirm-dialog.ui:52
+#: meld/resources/ui/save-confirm-dialog.ui:55
 msgid "_Save"
 msgstr "M_entés"
 
@@ -1539,95 +1617,70 @@ msgstr "Össze_hasonlítás"
 msgid "Co_mmit…"
 msgstr "_Véglegesítés…"
 
-#: meld/resources/ui/vcview-menus.ui:15
-msgid "_Update"
-msgstr "_Frissítés"
-
-#: meld/resources/ui/vcview-menus.ui:30
+#: meld/resources/ui/vcview-menus.ui:26
 msgid "Re_vert"
 msgstr "Vissz_aállítás"
 
-#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+#: meld/resources/ui/vcview-menus.ui:30
 msgid "Delete"
 msgstr "Törlés"
 
-#: meld/resources/ui/vcview-menus.ui:41
-msgid "Mar_k as Resolved"
-msgstr "Megjelölés _feloldottként"
+#: meld/resources/ui/vcview-menus.ui:37
+#| msgid "Conflict"
+msgid "Resolve Conflict"
+msgstr "Ütközés feloldása"
 
-#: meld/resources/ui/vcview.ui:73
-msgid "Commit…"
-msgstr "Véglegesítés…"
-
-#: meld/resources/ui/vcview.ui:74
+#: meld/resources/ui/vcview.ui:16
 msgid "Commit changes to version control"
 msgstr "Változtatások véglegesítése a verziókövetőbe"
 
-#: meld/resources/ui/vcview.ui:86
-msgid "Update"
-msgstr "Frissítés"
-
-#: meld/resources/ui/vcview.ui:87
-msgid "Update working copy from version control"
-msgstr "Munkapéldány frissítése a verziókövetőből"
+#: meld/resources/ui/vcview.ui:21
+msgid "Commit…"
+msgstr "Véglegesítés…"
 
-#: meld/resources/ui/vcview.ui:99
-msgid "Push"
-msgstr "Elküldés"
+#: meld/resources/ui/vcview.ui:38
+#| msgid "Push current change to the left"
+msgid "Pull remote changes to the local repository"
+msgstr "Távoli változtatások letöltése a helyi tárolóba"
 
-#: meld/resources/ui/vcview.ui:100
+#: meld/resources/ui/vcview.ui:51
 msgid "Push local changes to remote"
 msgstr "Helyi változások elküldése a távoli tárolóba"
 
-#: meld/resources/ui/vcview.ui:112
-msgid "Add"
-msgstr "Hozzáadás"
-
-#: meld/resources/ui/vcview.ui:113
+#: meld/resources/ui/vcview.ui:74
 msgid "Add to version control"
 msgstr "Hozzáadás verziókövetéshez"
 
-#: meld/resources/ui/vcview.ui:125
-msgid "Remove"
-msgstr "Eltávolítás"
-
-#: meld/resources/ui/vcview.ui:126
+#: meld/resources/ui/vcview.ui:87
 msgid "Remove from version control"
 msgstr "Eltávolítás a verziókövetőből"
 
-#: meld/resources/ui/vcview.ui:138
-msgid "Mark as Resolved"
-msgstr "Megjelölés feloldottként"
+#: meld/resources/ui/vcview.ui:100
+msgid "Revert working copy to original state"
+msgstr "Munkapéldány visszaállítása az eredeti állapotba"
 
-#: meld/resources/ui/vcview.ui:139
+#: meld/resources/ui/vcview.ui:113
 msgid "Mark as resolved in version control"
 msgstr "Megjelölés feloldottként a verziókövetőben"
 
-#: meld/resources/ui/vcview.ui:151
-msgid "Revert"
-msgstr "Visszaállítás"
-
-#: meld/resources/ui/vcview.ui:152
-msgid "Revert working copy to original state"
-msgstr "Munkapéldány visszaállítása az eredeti állapotba"
+#: meld/resources/ui/vcview.ui:140
+#| msgid "No valid version control system found in this folder"
+msgid "Open version controlled folder in this pane"
+msgstr "Verziókövetés alatti mappa megnyitása ebben az ablaktáblában"
 
-#: meld/resources/ui/vcview.ui:165
-msgid "Delete from working copy"
-msgstr "Törlés a munkapéldányból"
-
-#: meld/resources/ui/vcview.ui:220
+#: meld/resources/ui/vcview.ui:229
 msgid "Location"
 msgstr "Hely"
 
-#: meld/resources/ui/vcview.ui:229
+#: meld/resources/ui/vcview.ui:238
 msgid "Status"
 msgstr "Állapot"
 
-#: meld/resources/ui/vcview.ui:238
+#: meld/resources/ui/vcview.ui:247
 msgid "Extra"
 msgstr "Extra"
 
-#: meld/resources/ui/vcview.ui:270
+#: meld/resources/ui/vcview.ui:279
 msgid "Console output"
 msgstr "Konzolkimenet"
 
@@ -1652,45 +1705,54 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:538 meld/preferences.py:132
+#: meld/dirdiff.py:623 meld/preferences.py:132
 msgid "Size"
 msgstr "Méret"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:546 meld/preferences.py:133
+#: meld/dirdiff.py:631 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Módosítási idő"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:639 meld/preferences.py:134
+#| msgid "Modification time"
+msgid "Modification time (ISO)"
+msgstr "Módosítási idő (ISO)"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:554 meld/preferences.py:134
+#: meld/dirdiff.py:647 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Jogosultságok"
 
-#: meld/dirdiff.py:778 meld/dirdiff.py:802
+#: meld/dirdiff.py:900
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (átvizsgálás…)"
+
+#: meld/dirdiff.py:932 meld/dirdiff.py:964
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] {folder} vizsgálata"
 
-#: meld/dirdiff.py:942
+#: meld/dirdiff.py:1100
 #, python-brace-format
-#| msgid "[%s] Done"
 msgid "[{label}] Done"
 msgstr "[{label}] Kész"
 
-#: meld/dirdiff.py:951
-#| msgid "Folder {duplicate_directory} is being compared to itself"
+#: meld/dirdiff.py:1113
 msgid "Folder {} is being compared to itself"
 msgstr "A(z) {} mappa saját magával lesz összehasonlítva"
 
-#: meld/dirdiff.py:957
+#: meld/dirdiff.py:1119
 msgid "Folders have no differences"
 msgstr "A mappák közt nincs eltérés"
 
-#: meld/dirdiff.py:959
+#: meld/dirdiff.py:1121
 msgid "Contents of scanned files in folders are identical."
 msgstr "A mappákban vizsgált fájlok tartalma azonos."
 
-#: meld/dirdiff.py:961
+#: meld/dirdiff.py:1123
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1698,46 +1760,46 @@ msgstr ""
 "A mappákban vizsgált fájlok azonosnak tűnnek, de a tartalom nem lett "
 "vizsgálva."
 
-#: meld/dirdiff.py:964
+#: meld/dirdiff.py:1126
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "A fájlszűrők használata miatt nem lett megvizsgálva minden fájl."
 
-#: meld/dirdiff.py:966
+#: meld/dirdiff.py:1128
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Szöveges szűrők vannak használatban, és elfedhetik a fájlok közti "
 "különbségeket."
 
-#: meld/dirdiff.py:982 meld/filediff.py:1874
+#: meld/dirdiff.py:1144 meld/filediff.py:1919
 msgid "Hide"
 msgstr "Elrejtés"
 
-#: meld/dirdiff.py:984 meld/filediff.py:1876 meld/filediff.py:1906
-#: meld/filediff.py:1908 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1146 meld/filediff.py:1921 meld/filediff.py:1951
+#: meld/filediff.py:1953 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Elrejtés"
 
-#: meld/dirdiff.py:993
+#: meld/dirdiff.py:1155
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Több hiba történt a mappa vizsgálatakor"
 
-#: meld/dirdiff.py:994
+#: meld/dirdiff.py:1156
 msgid "Files with invalid encodings found"
 msgstr "Érvénytelen kódolású fájlok találhatók"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:996
+#: meld/dirdiff.py:1158
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Egyes fájlok kódolása érvénytelen. A nevek a következők:"
 
-#: meld/dirdiff.py:998
+#: meld/dirdiff.py:1160
 msgid "Files hidden by case insensitive comparison"
 msgstr ""
 "Kis- és nagybetűket meg nem különböztető összehasonlítás által elrejtett "
 "fájlok"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1000
+#: meld/dirdiff.py:1162
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1745,18 +1807,17 @@ msgstr ""
 "Kis- és nagybetűkre nem érzékeny összehasonlítást futtat nagybetűérzékeny "
 "fájlrendszeren. A mappa alábbi fájljai el lettek rejtve:"
 
-#: meld/dirdiff.py:1011
+#: meld/dirdiff.py:1173
 #, python-brace-format
-#| msgid "“%s” hidden by “%s”"
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "„{first_file}” rejtve „{second_file}” által"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1235
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Cseréli ezt a mappát: „%s”?"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1237
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1765,17 +1826,12 @@ msgstr ""
 "Már létezik ugyanilyen nevű mappa itt: „%s”.\n"
 "Ha cseréli a meglévő mappát, akkor minden benne lévő fájl elvész."
 
-#: meld/dirdiff.py:1085
+#: meld/dirdiff.py:1250
 msgid "Error copying file"
 msgstr "Hiba a fájl másolásakor"
 
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1251
 #, python-brace-format
-#| msgid ""
-#| "Couldn’t copy %s\n"
-#| "to %s.\n"
-#| "\n"
-#| "%s"
 msgid ""
 "Couldn’t copy {source}\n"
 "to {dest}.\n"
@@ -1787,19 +1843,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1111 meld/vcview.py:759
+#: meld/dirdiff.py:1276 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Hiba a(z) {} törlésekor"
 
-#: meld/dirdiff.py:1604
+#: meld/dirdiff.py:1819
 msgid "No folder"
 msgstr "Nincs mappa"
 
-#: meld/filediff.py:1144
+#: meld/filediff.py:1149
 msgid "Comparison results will be inaccurate"
 msgstr "Az összehasonlítás eredményei pontatlanok lesznek"
 
-#: meld/filediff.py:1146
+#: meld/filediff.py:1151
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1807,75 +1863,74 @@ msgstr ""
 "Egy szűrő megváltoztatta a fájl sorainak számát, ami nem támogatott. Az "
 "összehasonlítás pontatlan lesz."
 
-#: meld/filediff.py:1218
+#: meld/filediff.py:1223
 msgid "Mark conflict as resolved?"
 msgstr "Megjelöli az ütközést feloldottként?"
 
-#: meld/filediff.py:1220
+#: meld/filediff.py:1225
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Ha az ütközést sikeresen feloldotta, akkor most megjelölheti feloldottként."
 
-#: meld/filediff.py:1222
+#: meld/filediff.py:1228
 msgid "Cancel"
 msgstr "Mégse"
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1229
 msgid "Mark _Resolved"
 msgstr "Megjelölés _feloldottként"
 
-#: meld/filediff.py:1556
+#: meld/filediff.py:1593
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Hiba történt a fájl („%s”) megnyitásakor."
 
-#: meld/filediff.py:1564
+#: meld/filediff.py:1602
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "%s bináris fájlnak tűnik."
 
-#: meld/filediff.py:1566
+#: meld/filediff.py:1604
 msgid "Do you want to open the file using the default application?"
 msgstr "Meg szeretné nyitni a fájlt az alapértelmezett alkalmazással?"
 
-#: meld/filediff.py:1568
+#: meld/filediff.py:1606
 msgid "Open"
 msgstr "Megnyitás"
 
-#: meld/filediff.py:1582
+#: meld/filediff.py:1628
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Fájlok összefésülése"
 
-#: meld/filediff.py:1596
+#: meld/filediff.py:1642
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Eltérések számítása"
 
-#: meld/filediff.py:1657
+#: meld/filediff.py:1702
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "%s fájl megváltozott a lemezen"
 
-#: meld/filediff.py:1658
+#: meld/filediff.py:1703
 msgid "Do you want to reload the file?"
 msgstr "Újratölti a fájlt?"
 
-#: meld/filediff.py:1660
+#: meld/filediff.py:1705
 msgid "_Reload"
 msgstr "Új_ratöltés"
 
-#: meld/filediff.py:1830
-#| msgid "File {duplicate_files[0]} is being compared to itself"
+#: meld/filediff.py:1875
 msgid "File {} is being compared to itself"
 msgstr "A(z) {} fájl saját magával lesz összehasonlítva"
 
-#: meld/filediff.py:1839
+#: meld/filediff.py:1884
 msgid "Files are identical"
 msgstr "A fájlok azonosak"
 
-#: meld/filediff.py:1852
+#: meld/filediff.py:1897
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1883,11 +1938,11 @@ msgstr ""
 "Szöveges szűrők vannak használatban, és elfedhetik a fájlok közti "
 "különbségeket. Szeretné a szűretlen fájlokat összehasonlítani?"
 
-#: meld/filediff.py:1857
+#: meld/filediff.py:1902
 msgid "Files differ in line endings only"
 msgstr "A fájlok csak a sorvégekben térnek el"
 
-#: meld/filediff.py:1859
+#: meld/filediff.py:1904
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1896,15 +1951,15 @@ msgstr ""
 "A fájlok azonosak a sorvégjelektől eltekintve:\n"
 "%s"
 
-#: meld/filediff.py:1879
+#: meld/filediff.py:1924
 msgid "Show without filters"
 msgstr "Megjelenítés szűrők nélkül"
 
-#: meld/filediff.py:1901
+#: meld/filediff.py:1946
 msgid "Change highlighting incomplete"
 msgstr "Részleges kiemelés módosítása"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1947
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1912,19 +1967,19 @@ msgstr ""
 "Egyes változtatások nincsenek kiemelve, mert túl nagyok. A Meld kiemelheti "
 "ezeket a nagyobb változtatásokat, de lassú lehet."
 
-#: meld/filediff.py:1910
+#: meld/filediff.py:1955
 msgid "Keep highlighting"
 msgstr "Kiemelés továbbra is"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1957
 msgid "_Keep highlighting"
 msgstr "_Kiemelés továbbra is"
 
-#: meld/filediff.py:1925
+#: meld/filediff.py:1970
 msgid "Saving failed"
 msgstr "A mentés sikertelen"
 
-#: meld/filediff.py:1926
+#: meld/filediff.py:1971
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1932,36 +1987,36 @@ msgstr ""
 "Fontolja meg a kritikus változtatások átmásolását egy másik programba vagy "
 "fájlba az adatvesztés elkerülése érdekében."
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1980
 msgid "Save Left Pane As"
 msgstr "Bal ablaktábla mentése másként"
 
-#: meld/filediff.py:1937
+#: meld/filediff.py:1982
 msgid "Save Middle Pane As"
 msgstr "Középső ablaktábla mentése másként"
 
-#: meld/filediff.py:1939
+#: meld/filediff.py:1984
 msgid "Save Right Pane As"
 msgstr "Jobb ablaktábla mentése másként"
 
-#: meld/filediff.py:1950
+#: meld/filediff.py:1995
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "A(z) %s fájl megváltozott a lemezen a megnyitása óta"
 
-#: meld/filediff.py:1952
+#: meld/filediff.py:1997
 msgid "If you save it, any external changes will be lost."
 msgstr "Ha menti, minden külső változtatás elvész."
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:2000
 msgid "Save Anyway"
 msgstr "Mentés mindenképp"
 
-#: meld/filediff.py:1956
+#: meld/filediff.py:2001
 msgid "Don’t Save"
 msgstr "Ne mentse"
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2043
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1969,7 +2024,7 @@ msgstr ""
 "A(z) „{}” fájl olyan karaktereket tartalmaz, amelyek nem kódolhatók a "
 "jelenlegi „{}” kódolás használatával."
 
-#: meld/filediff.py:2002 meld/patchdialog.py:138
+#: meld/filediff.py:2047 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1978,20 +2033,16 @@ msgstr ""
 "A fájl nem menthető. Ok:\n"
 "%s"
 
-#: meld/filediff.py:2006 meld/patchdialog.py:137
+#: meld/filediff.py:2051 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "A fájl (%s) nem menthető."
 
-#: meld/filediff.py:2067
-msgid "Open File"
-msgstr "Fájl megnyitása"
-
-#: meld/filediff.py:2420
+#: meld/filediff.py:2452
 msgid "Live comparison updating disabled"
 msgstr "Az élő összehasonlítás-frissítés kikapcsolva"
 
-#: meld/filediff.py:2421
+#: meld/filediff.py:2453
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2001,32 +2052,32 @@ msgstr ""
 "pontok aktívak. Saját kezűleg továbbra is frissítheti az összehasonlítást, "
 "és az élő frissítések folytatódnak a szinkronizálási pontok törlésekor."
 
-#: meld/iohelpers.py:40
+#: meld/iohelpers.py:41
 msgid "Deleting remote folders is not supported"
 msgstr "A távoli mappák törlése nem támogatott"
 
-#: meld/iohelpers.py:42
+#: meld/iohelpers.py:43
 msgid "Not a file or directory"
 msgstr "Nem fájl vagy könyvtár"
 
-#: meld/iohelpers.py:46
+#: meld/iohelpers.py:47
 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
 msgstr "A(z) „{}” nem tehető a Kukába. Szeretné azonnal törölni?"
 
-#: meld/iohelpers.py:51
+#: meld/iohelpers.py:52
 msgid "This remote location does not support sending items to the trash."
 msgstr "Ez a távoli hely nem támogatja az elemek Kukába küldését."
 
-#: meld/iohelpers.py:56
+#: meld/iohelpers.py:58
 msgid "_Delete Permanently"
 msgstr "_Végleges törlés"
 
-#: meld/iohelpers.py:106
+#: meld/iohelpers.py:110
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Cseréli a fájlt: „%s”?"
 
-#: meld/iohelpers.py:108
+#: meld/iohelpers.py:112
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2035,124 +2086,124 @@ msgstr ""
 "Már létezik ilyen nevű fájl itt: „%s”.\n"
 "Ha lecseréli a meglévő fájlt, akkor a tartalma elvész."
 
-#: meld/meldapp.py:183
+#: meld/meldapp.py:188
 msgid "wrong number of arguments supplied to --diff"
 msgstr "hibás számú argumentum a --diff kapcsolóhoz"
 
-#: meld/meldapp.py:188
+#: meld/meldapp.py:193
 msgid "Start with an empty window"
 msgstr "Indítás üres ablakkal"
 
-#: meld/meldapp.py:189 meld/meldapp.py:191
+#: meld/meldapp.py:194 meld/meldapp.py:196
 msgid "file"
 msgstr "fájl"
 
-#: meld/meldapp.py:189 meld/meldapp.py:193
+#: meld/meldapp.py:194 meld/meldapp.py:198
 msgid "folder"
 msgstr "mappa"
 
-#: meld/meldapp.py:190
+#: meld/meldapp.py:195
 msgid "Start a version control comparison"
 msgstr "Verziókövető-összehasonlítás indítása"
 
-#: meld/meldapp.py:192
+#: meld/meldapp.py:197
 msgid "Start a 2- or 3-way file comparison"
 msgstr "2 vagy 3 utas fájl-összehasonlítás indítása"
 
-#: meld/meldapp.py:194
+#: meld/meldapp.py:199
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "2 vagy 3 utas mappa-összehasonlítás indítása"
 
-#: meld/meldapp.py:237
+#: meld/meldapp.py:242
 #, python-format
 msgid "Error: %s\n"
 msgstr "Hiba: %s\n"
 
-#: meld/meldapp.py:244
+#: meld/meldapp.py:249
 msgid "Meld is a file and directory comparison tool."
 msgstr "A Meld egy fájl- és könyvtár-összehasonlító eszköz."
 
-#: meld/meldapp.py:248
+#: meld/meldapp.py:253
 msgid "Set label to use instead of file name"
 msgstr "A fájlnevek helyett használandó címke beállítása"
 
-#: meld/meldapp.py:251
+#: meld/meldapp.py:256
 msgid "Open a new tab in an already running instance"
 msgstr "Új lap megnyitása már futó példányban"
 
-#: meld/meldapp.py:254
+#: meld/meldapp.py:259
 msgid "Automatically compare all differing files on startup"
 msgstr "Minden eltérő fájl automatikus összehasonlítása indításkor"
 
-#: meld/meldapp.py:257
+#: meld/meldapp.py:262
 msgid "Ignored for compatibility"
 msgstr "Mellőzve a kompatibilitás érdekében"
 
-#: meld/meldapp.py:261
+#: meld/meldapp.py:266
 msgid "Set the target file for saving a merge result"
 msgstr "Célfájl beállítása összefésülés eredményének mentéséhez"
 
-#: meld/meldapp.py:264
+#: meld/meldapp.py:269
 msgid "Automatically merge files"
 msgstr "Fájlok automatikus összefésülése"
 
-#: meld/meldapp.py:268
+#: meld/meldapp.py:273
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Mentett összehasonlítás betöltése Meld összehasonlítás-fájlból"
 
-#: meld/meldapp.py:272
+#: meld/meldapp.py:277
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Különbséglap létrehozása a megadott fájlokhoz vagy mappákhoz"
 
-#: meld/meldapp.py:292
+#: meld/meldapp.py:297
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "túl sok argumentum (0-3 helyett %d)"
 
-#: meld/meldapp.py:295
+#: meld/meldapp.py:300
 msgid "can’t auto-merge less than 3 files"
 msgstr "nem lehet 3-nál kevesebb fájlt automatikusan összefésülni"
 
-#: meld/meldapp.py:297
+#: meld/meldapp.py:302
 msgid "can’t auto-merge directories"
 msgstr "könyvtárak nem fésülhetők össze automatikusan"
 
-#: meld/meldapp.py:312
+#: meld/meldapp.py:317
 msgid "Error reading saved comparison file"
 msgstr "Hiba az elmentett összehasonlítás-fájl olvasása közben"
 
-#: meld/meldapp.py:329
+#: meld/meldapp.py:334
 #, python-format
 msgid "invalid path or URI “%s”"
 msgstr "érvénytelen útvonal vagy URI: „%s”"
 
-#: meld/meldapp.py:336
+#: meld/meldapp.py:341
 msgid "remote folder “{}” not supported"
 msgstr "a „{}” távoli mappa nem támogatott"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: meld/meldbuffer.py:114
+#: meld/meldbuffer.py:115
 msgid "<unnamed>"
 msgstr "<névtelen>"
 
-#: meld/melddoc.py:61
+#: meld/melddoc.py:124
 msgid "untitled"
 msgstr "névtelen"
 
-#: meld/meldwindow.py:155
+#: meld/meldwindow.py:158
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: meld/meldwindow.py:384
+#: meld/meldwindow.py:381
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Az automatikus összefésüléshez három fájl kell, érkezett: %r"
 
-#: meld/meldwindow.py:406
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Fájlok és könyvtárak keveréke nem hasonlítható össze"
 
-#: meld/misc.py:150
+#: meld/misc.py:154
 msgid ""
 "{}\n"
 "\n"
@@ -2164,7 +2215,7 @@ msgstr ""
 "A Meld kritikus hibát észlelt futás közben:\n"
 "<tt>{}</tt>"
 
-#: meld/misc.py:201
+#: meld/misc.py:205
 msgid "[None]"
 msgstr "[Semmi]"
 
@@ -2176,12 +2227,11 @@ msgstr "címke"
 msgid "pattern"
 msgstr "minta"
 
-#: meld/recent.py:104
+#: meld/recent.py:111
 msgid "Version control:"
 msgstr "Verziókövetés:"
 
 #: meld/style.py:91
-#| msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
 msgid "Couldn’t find colour scheme details for {}; this is a bad install"
 msgstr "Nem találhatók a színséma részletei ehhez: {}, ez telepítési hiba"
 
@@ -2194,6 +2244,11 @@ msgstr "{name} ({charset})"
 msgid "Plain Text"
 msgstr "Egyszerű szöveg"
 
+#: meld/ui/pathlabel.py:36
+#| msgid "Filename filters"
+msgid "Unnamed file"
+msgstr "Névtelen fájl"
+
 #. Abbreviation for line, column so that it will fit in the status bar
 #: meld/ui/statusbar.py:125
 #, python-brace-format
@@ -2216,9 +2271,7 @@ msgstr "Nem lesznek fájlok véglegesítve"
 msgid "{unpushed_commits} in {unpushed_branches}"
 msgstr "{unpushed_commits} {unpushed_branches}"
 
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: meld/vc/git.py:94 meld/vc/git.py:103
+#: meld/vc/git.py:94 meld/vc/git.py:104
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -2232,17 +2285,16 @@ msgid_plural "%d branches"
 msgstr[0] "%d ágban"
 msgstr[1] "%d ágban"
 
-#: meld/vc/git.py:344
+#: meld/vc/git.py:345
 #, python-brace-format
-#| msgid "Mode changed from %s to %s"
 msgid "Mode changed from {old_mode} to {new_mode}"
 msgstr "Mód megváltoztatva: {old_mode} -> {new_mode}"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Partially staged"
 msgstr "Részben sorba állítva"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Staged"
 msgstr "Sorba állítva"
 
@@ -2301,97 +2353,101 @@ msgstr "Hiányzó"
 msgid "Not present"
 msgstr "Nincs jelen"
 
+#: meld/vc/_vc.py:82
+#| msgid "Scanning %s"
+msgid "Scanning…"
+msgstr "Átvizsgálás…"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
-#: meld/vcview.py:333
+#: meld/vcview.py:334
 #, python-format
 msgid "%(name)s (not found)"
 msgstr "%(name)s (nem található)"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: meld/vcview.py:337
+#: meld/vcview.py:338
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s nincs telepítve)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: meld/vcview.py:341
+#: meld/vcview.py:342
 #, python-format
 msgid "%(name)s (invalid repository)"
 msgstr "%(name)s (érvénytelen tároló)"
 
-#: meld/vcview.py:355
+#: meld/vcview.py:356
 msgid "No valid version control system found in this folder"
 msgstr "Nem található használható verziókövető rendszer ebben a mappában"
 
-#: meld/vcview.py:357
+#: meld/vcview.py:358
 msgid "Choose which version control system to use"
 msgstr "Válassza ki a használandó verziókövető rendszert"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:411
+#: meld/vcview.py:412
 #, python-brace-format
-#| msgid "Location"
 msgid "Location: {path}"
 msgstr "Hely: {path}"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:418
+#: meld/vcview.py:419
 msgid "Scanning repository"
 msgstr "Tároló vizsgálata"
 
-#: meld/vcview.py:447
+#: meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "%s vizsgálata"
 
-#: meld/vcview.py:486
+#: meld/vcview.py:487
 msgid "(Empty)"
 msgstr "(Üres)"
 
-#: meld/vcview.py:533
+#: meld/vcview.py:535
 #, python-format
 msgid "%s — local"
 msgstr "%s – helyi"
 
-#: meld/vcview.py:534
+#: meld/vcview.py:536
 #, python-format
 msgid "%s — remote"
 msgstr "%s – távoli"
 
-#: meld/vcview.py:542
+#: meld/vcview.py:544
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (helyi, összefésült, távoli)"
 
-#: meld/vcview.py:547
+#: meld/vcview.py:549
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (távoli, összefésült, helyi)"
 
-#: meld/vcview.py:558
+#: meld/vcview.py:560
 #, python-format
 msgid "%s — repository"
 msgstr "%s – tároló"
 
-#: meld/vcview.py:564
+#: meld/vcview.py:566
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (munka, tároló)"
 
-#: meld/vcview.py:568
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (tároló, munka)"
 
-#: meld/vcview.py:730
+#: meld/vcview.py:735
 msgid "Remove folder and all its files?"
 msgstr "Eltávolítja a mappát és benne minden fájlt?"
 
-#: meld/vcview.py:732
+#: meld/vcview.py:737
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2399,6 +2455,6 @@ msgstr ""
 "Ez eltávolítja az összes kijelölt fájlt és mappát, valamint minden fájlt a "
 "kijelölt mappákon belül a verziókövetőből."
 
-#: meld/vcview.py:845
+#: meld/vcview.py:850
 msgid "Clear"
 msgstr "Törlés"

From 99d13e88cd18e1e43720c9602405f5d60839551f Mon Sep 17 00:00:00 2001
From: Milo Casagrande <milo@milo.name>
Date: Fri, 18 Mar 2022 09:02:06 +0000
Subject: [PATCH 074/116] Update Italian translation

---
 po/it.po | 834 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 444 insertions(+), 390 deletions(-)

diff --git a/po/it.po b/po/it.po
index 2448e9ef..5e5f940e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,14 +1,14 @@
 # Italian translation of meld
-# Copyright (C) 2013, 2014, 2017, 2018, 2019, 2020 Free Software Foundation, Inc.
+# Copyright (C) 2013, 2014, 2017, 2018, 2019, 2020, 2022 Free Software Foundation, Inc.
 # This file is distributed under the same license as the meld package.
-# Milo Casagrande <milo@milo.name>, 2013, 2014, 2017, 2018, 2019, 2020.
+# Milo Casagrande <milo@milo.name>, 2013, 2014, 2017, 2018, 2019, 2020, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2020-02-19 20:24+0000\n"
-"PO-Revision-Date: 2020-02-21 13:19+0100\n"
+"POT-Creation-Date: 2022-03-15 12:52+0000\n"
+"PO-Revision-Date: 2022-03-18 10:01+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -16,10 +16,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
-#: meld/resources/ui/appwindow.ui:9
+#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
 msgid "Meld"
 msgstr "Meld"
 
@@ -83,10 +83,22 @@ msgid "Default window fullscreen state"
 msgstr "Stato a schermo intero predefinito della finestra"
 
 #: data/org.gnome.meld.gschema.xml:58
+msgid "Prefer application-wide dark theme"
+msgstr "Preferisci il tema scuro a livello di applicazione"
+
+#: data/org.gnome.meld.gschema.xml:59
+msgid ""
+"If true, the GTK dark theme variant will be used, if available. Note that "
+"this is separate from the syntax highlighting scheme."
+msgstr ""
+"Se VERO, verrà utilizzata la variante del tema scuro GTK, se disponibile. Si "
+"noti che questo è separato dallo schema di evidenziazione della sintassi."
+
+#: data/org.gnome.meld.gschema.xml:65
 msgid "Additional automatically detected text encodings"
 msgstr "Codifiche testo aggiuntive rilevate automaticamente"
 
-#: data/org.gnome.meld.gschema.xml:59
+#: data/org.gnome.meld.gschema.xml:66
 msgid ""
 "Meld will use these text encodings to try to decode loaded text files before "
 "trying any other encodings. In addition to the encodings in this list, UTF-8 "
@@ -98,35 +110,35 @@ msgstr ""
 "sia UTF-8 sia la codifica basata sulla lingua attuale. Altre codifiche "
 "possono essere utilizzate in base alla lingua impostata dall'utente."
 
-#: data/org.gnome.meld.gschema.xml:66
+#: data/org.gnome.meld.gschema.xml:73
 msgid "Width of an indentation step"
 msgstr "Larghezza di un passo di rientro"
 
-#: data/org.gnome.meld.gschema.xml:67
+#: data/org.gnome.meld.gschema.xml:74
 msgid "The number of spaces to use for a single indent step"
 msgstr "Il numero di spazi da usare per un singolo passo d'indentazione"
 
-#: data/org.gnome.meld.gschema.xml:71
+#: data/org.gnome.meld.gschema.xml:78
 msgid "Whether to indent using spaces or tabs"
 msgstr "Indica se usare un rientro di spazi o tabulazioni"
 
-#: data/org.gnome.meld.gschema.xml:72
+#: data/org.gnome.meld.gschema.xml:79
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr "Se VERO, un nuovo rientro userà spazi invece di tabulazioni."
 
-#: data/org.gnome.meld.gschema.xml:76 meld/resources/ui/statusbar-menu.ui:5
+#: data/org.gnome.meld.gschema.xml:83 meld/resources/ui/statusbar-menu.ui:5
 msgid "Show line numbers"
 msgstr "Mostrare numeri di riga"
 
-#: data/org.gnome.meld.gschema.xml:77
+#: data/org.gnome.meld.gschema.xml:84
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr "Se VERO, verranno mostrati i numeri di riga nel confronto."
 
-#: data/org.gnome.meld.gschema.xml:81
+#: data/org.gnome.meld.gschema.xml:88
 msgid "Highlight syntax"
 msgstr "Evidenzia la sintassi"
 
-#: data/org.gnome.meld.gschema.xml:82
+#: data/org.gnome.meld.gschema.xml:89
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld’s own color "
 "highlighting, this is off by default."
@@ -134,21 +146,21 @@ msgstr ""
 "Indica se evidenziare la sintassi; dato il colore di evidenziazione di Meld, "
 "è disattivato per impostazione predefinita"
 
-#: data/org.gnome.meld.gschema.xml:86
+#: data/org.gnome.meld.gschema.xml:93
 msgid "Color scheme to use for syntax highlighting"
 msgstr "Schema di colori da utilizzare per l'evidenziazione della sintassi"
 
-#: data/org.gnome.meld.gschema.xml:87
+#: data/org.gnome.meld.gschema.xml:94
 msgid "Used by GtkSourceView to determine colors for syntax highlighting"
 msgstr ""
 "Utilizzato da GtkSourceView per determinare i colori per l'evidenziazione "
 "della sintassi"
 
-#: data/org.gnome.meld.gschema.xml:91
+#: data/org.gnome.meld.gschema.xml:98
 msgid "Draw whitespace"
 msgstr "Disegna spazi bianchi"
 
-#: data/org.gnome.meld.gschema.xml:92
+#: data/org.gnome.meld.gschema.xml:99
 msgid ""
 "If true, whitespace characters will be drawn in comparisons even if they are "
 "not in a changed area."
@@ -156,11 +168,11 @@ msgstr ""
 "Se VERO, gli spazi bianchi vengono disegnati nei confronti anche se non sono "
 "in un'area modificata."
 
-#: data/org.gnome.meld.gschema.xml:101
+#: data/org.gnome.meld.gschema.xml:108
 msgid "Wrap mode"
 msgstr "Modalità a capo"
 
-#: data/org.gnome.meld.gschema.xml:102
+#: data/org.gnome.meld.gschema.xml:109
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
@@ -170,32 +182,32 @@ msgstr ""
 "niente (\"none\"), a un qualsiasi carattere (\"char\") o solo alla fine di "
 "una parola (\"word\")."
 
-#: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
+#: data/org.gnome.meld.gschema.xml:116 meld/resources/ui/statusbar-menu.ui:13
 msgid "Highlight current line"
 msgstr "Evidenzia la riga corrente"
 
-#: data/org.gnome.meld.gschema.xml:110
+#: data/org.gnome.meld.gschema.xml:117
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr "Se VERO, la riga con il cursore viene evidenziata nel confronto."
 
-#: data/org.gnome.meld.gschema.xml:114
+#: data/org.gnome.meld.gschema.xml:121
 msgid "Use the system default monospace font"
 msgstr "Usa il carattere a spaziatura fissa di sistema"
 
-#: data/org.gnome.meld.gschema.xml:115
+#: data/org.gnome.meld.gschema.xml:122
 msgid ""
 "If false, custom-font will be used instead of the system monospace font."
 msgstr ""
 "Se FALSO, viene usato custom-font al posto di quello a spaziatura fissa di "
 "sistema."
 
-#: data/org.gnome.meld.gschema.xml:119
+#: data/org.gnome.meld.gschema.xml:126
 msgid "Custom font"
 msgstr "Carattere personalizzato"
 
-#: data/org.gnome.meld.gschema.xml:120
+#: data/org.gnome.meld.gschema.xml:127
 msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
@@ -203,39 +215,39 @@ msgstr ""
 "Il carattere personalizzato da usare, salvato come stringa e interpretato "
 "come una descrizione di carattere Pango."
 
-#: data/org.gnome.meld.gschema.xml:126
+#: data/org.gnome.meld.gschema.xml:133
 msgid "Show overview source map"
 msgstr "Mostra mappa panoramica"
 
-#: data/org.gnome.meld.gschema.xml:127
+#: data/org.gnome.meld.gschema.xml:134
 msgid ""
 "If true, file comparisons will have paired source maps for compared files."
 msgstr "Se VERO, i confronti tra file dispongono di panoramiche del codice."
 
-#: data/org.gnome.meld.gschema.xml:132
+#: data/org.gnome.meld.gschema.xml:139
 msgid "Style of overview map"
 msgstr "Stile della mappa panoramica"
 
-#: data/org.gnome.meld.gschema.xml:133
+#: data/org.gnome.meld.gschema.xml:140
 msgid "Style options for how the overview map is displayed."
 msgstr "Opzioni di visualizzazione della mappa panoramica."
 
-#: data/org.gnome.meld.gschema.xml:139
+#: data/org.gnome.meld.gschema.xml:146
 msgid "Ignore blank lines when comparing files"
 msgstr "Ignora le righe vuote nei confronti"
 
-#: data/org.gnome.meld.gschema.xml:140
+#: data/org.gnome.meld.gschema.xml:147
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
 "Se VERO, le righe vuote non verranno considerate nell'evidenziare le "
 "modifiche tra i file."
 
-#: data/org.gnome.meld.gschema.xml:147
+#: data/org.gnome.meld.gschema.xml:154
 msgid "Use the system default editor"
 msgstr "Usa l'editor predefinito di sistema"
 
-#: data/org.gnome.meld.gschema.xml:148
+#: data/org.gnome.meld.gschema.xml:155
 msgid ""
 "If false, custom-editor-command will be used instead of the system editor "
 "when opening files externally."
@@ -243,11 +255,11 @@ msgstr ""
 "Se FALSO, viene usato custom-editor-command al posto di quello di sistema "
 "per aprire i file esternamente."
 
-#: data/org.gnome.meld.gschema.xml:152
+#: data/org.gnome.meld.gschema.xml:159
 msgid "The custom editor launch command"
 msgstr "Il comando per lanciare l'editor personalizzato"
 
-#: data/org.gnome.meld.gschema.xml:153
+#: data/org.gnome.meld.gschema.xml:160
 msgid ""
 "The command used to launch a custom editor. Some limited templating is "
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
@@ -255,11 +267,11 @@ msgstr ""
 "Il comando usato per lanciare l'editor personalizzato. È supportata una "
 "forma basilare di modelli: \"{file}\" e \"{line}\" sono token riconosciuti."
 
-#: data/org.gnome.meld.gschema.xml:159
+#: data/org.gnome.meld.gschema.xml:166
 msgid "Columns to display"
 msgstr "Colonne da visualizzare"
 
-#: data/org.gnome.meld.gschema.xml:160
+#: data/org.gnome.meld.gschema.xml:167
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
@@ -267,22 +279,22 @@ msgstr ""
 "Elenco di nomi di colonne nel confronto tra directory e se debbano essere "
 "visualizzate."
 
-#: data/org.gnome.meld.gschema.xml:164 meld/resources/ui/preferences.ui:935
+#: data/org.gnome.meld.gschema.xml:171 meld/resources/ui/preferences.ui:951
 msgid "Ignore symbolic links"
 msgstr "Ignorare collegamenti simbolici"
 
-#: data/org.gnome.meld.gschema.xml:165
+#: data/org.gnome.meld.gschema.xml:172
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
 msgstr ""
 "Se VERO, il confronto tra directory non segue i collegamenti simbolici."
 
-#: data/org.gnome.meld.gschema.xml:169
+#: data/org.gnome.meld.gschema.xml:176
 msgid "Use shallow comparison"
 msgstr "Usa confronto superficiale"
 
-#: data/org.gnome.meld.gschema.xml:170
+#: data/org.gnome.meld.gschema.xml:177
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
@@ -291,11 +303,11 @@ msgstr ""
 "Se VERO, il confronto tra directory confronta i file solamente su dimensione "
 "e mtime, considerando solo i file con stessa dimensione e mtime come uguali."
 
-#: data/org.gnome.meld.gschema.xml:174
+#: data/org.gnome.meld.gschema.xml:181
 msgid "File timestamp resolution"
 msgstr "Risoluzione marcatura temporale del file"
 
-#: data/org.gnome.meld.gschema.xml:175
+#: data/org.gnome.meld.gschema.xml:182
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
 "between two files before they’re considered to have different mtimes. This "
@@ -307,11 +319,11 @@ msgstr ""
 "confronto di file provenienti da file system con risoluzioni temporali "
 "differenti."
 
-#: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
+#: data/org.gnome.meld.gschema.xml:186 meld/resources/ui/preferences.ui:852
 msgid "Apply text filters during folder comparisons"
 msgstr "Applicare filtri di testo durante i confronti sulla cartella"
 
-#: data/org.gnome.meld.gschema.xml:180
+#: data/org.gnome.meld.gschema.xml:187
 msgid ""
 "If true, folder comparisons that compare file contents also apply active "
 "text filters and the blank line trimming option, and ignore newline "
@@ -321,19 +333,19 @@ msgstr ""
 "file applicano anche i filtri di testo attivi, l'opzione di esclusione delle "
 "righe vuote e ignorano le differenze sugli a capo."
 
-#: data/org.gnome.meld.gschema.xml:184
+#: data/org.gnome.meld.gschema.xml:191
 msgid "File status filters"
 msgstr "Filtri sullo stato dei file"
 
-#: data/org.gnome.meld.gschema.xml:185
+#: data/org.gnome.meld.gschema.xml:192
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr "Elenco di stati usati per filtrare i file nel confronto tra directory."
 
-#: data/org.gnome.meld.gschema.xml:191
+#: data/org.gnome.meld.gschema.xml:198
 msgid "Show the version control console output"
 msgstr "Mostra l'output del sistema di controllo della versione"
 
-#: data/org.gnome.meld.gschema.xml:192
+#: data/org.gnome.meld.gschema.xml:199
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
@@ -341,11 +353,11 @@ msgstr ""
 "Se VERO, viene mostrato l'output della console nella vista del controllo "
 "della versione, con i comandi eseguiti."
 
-#: data/org.gnome.meld.gschema.xml:196
+#: data/org.gnome.meld.gschema.xml:203
 msgid "Version control pane position"
 msgstr "Posizione riquadro controllo versione"
 
-#: data/org.gnome.meld.gschema.xml:197
+#: data/org.gnome.meld.gschema.xml:204
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
@@ -353,11 +365,11 @@ msgstr ""
 "Questa è l'altezza dell'albero principale del controllo versione quando il "
 "riquadro della console è mostrato."
 
-#: data/org.gnome.meld.gschema.xml:201
+#: data/org.gnome.meld.gschema.xml:208
 msgid "Present version comparisons as left-local/right-remote"
 msgstr "Confronto come sinistra-locale/destra-remoto"
 
-#: data/org.gnome.meld.gschema.xml:202
+#: data/org.gnome.meld.gschema.xml:209
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
@@ -367,12 +379,12 @@ msgstr ""
 "sinistra-locale destra-remoto per determinare l'ordine con cui mostrare i "
 "file. Altrimenti viene usato lo schema sinistra-altri destra-personale."
 
-#: data/org.gnome.meld.gschema.xml:206
+#: data/org.gnome.meld.gschema.xml:213
 msgid "Order for files in three-way version control merge comparisons"
 msgstr ""
 "Ordine dei file nel confronto a tre vie su unione da controllo della versione"
 
-#: data/org.gnome.meld.gschema.xml:207
+#: data/org.gnome.meld.gschema.xml:214
 msgid ""
 "Choices for file order are remote/merged/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
@@ -383,11 +395,11 @@ msgstr ""
 "dalla visualizzazione del controllo versione: viene quindi utilizzata "
 "solamente nella risoluzione di unioni/conflitti."
 
-#: data/org.gnome.meld.gschema.xml:211
+#: data/org.gnome.meld.gschema.xml:218
 msgid "Show margin in commit message editor"
 msgstr "Mostra i margini nell'editor del messaggio di commit"
 
-#: data/org.gnome.meld.gschema.xml:212
+#: data/org.gnome.meld.gschema.xml:219
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
@@ -395,11 +407,11 @@ msgstr ""
 "Se VERO, viene visualizzata una guida per mostrare il margine nell'editor "
 "del messaggio di commit."
 
-#: data/org.gnome.meld.gschema.xml:216
+#: data/org.gnome.meld.gschema.xml:223
 msgid "Margin column in commit message editor"
 msgstr "Colonna nell'editor del messaggio di commit"
 
-#: data/org.gnome.meld.gschema.xml:217
+#: data/org.gnome.meld.gschema.xml:224
 msgid ""
 "The column at which to show the margin in the version control commit message "
 "editor."
@@ -407,11 +419,11 @@ msgstr ""
 "La colonna in cui visualizzare il margine dell'editor per il messaggio di "
 "commit del controllo versione."
 
-#: data/org.gnome.meld.gschema.xml:221
+#: data/org.gnome.meld.gschema.xml:228
 msgid "Automatically hard-wrap commit messages"
 msgstr "A capo automatico nei messaggi di commit"
 
-#: data/org.gnome.meld.gschema.xml:222
+#: data/org.gnome.meld.gschema.xml:229
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the commit margin before commit."
@@ -419,22 +431,22 @@ msgstr ""
 "Se VERO, l'editor del messaggio di commit andrà a capo automaticamente al "
 "margine predefinito (inserirà a capo) prima di eseguire il commit."
 
-#: data/org.gnome.meld.gschema.xml:226
+#: data/org.gnome.meld.gschema.xml:233
 msgid "Version control status filters"
 msgstr "Filtri sullo stato del sistema di controllo della versione"
 
-#: data/org.gnome.meld.gschema.xml:227
+#: data/org.gnome.meld.gschema.xml:234
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 "Elenco di stati usati per filtrare i file visualizzati nel confronto per i "
 "sistemi di controllo della versione."
 
-#: data/org.gnome.meld.gschema.xml:241
+#: data/org.gnome.meld.gschema.xml:248
 msgid "Filename-based filters"
 msgstr "Filtri sui nomi dei file"
 
-#: data/org.gnome.meld.gschema.xml:242
+#: data/org.gnome.meld.gschema.xml:249
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
@@ -442,11 +454,11 @@ msgstr ""
 "Elenco di filtri basati sui nomi dei file che, se attivi, rimuovono i file "
 "dal confronto in un confronto tra directory."
 
-#: data/org.gnome.meld.gschema.xml:256
+#: data/org.gnome.meld.gschema.xml:263
 msgid "Text-based filters"
 msgstr "Filtri di testo"
 
-#: data/org.gnome.meld.gschema.xml:257
+#: data/org.gnome.meld.gschema.xml:264
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
@@ -791,11 +803,11 @@ msgstr "Unisci tutte da destra"
 msgid "Merge All"
 msgstr "Unisci tutte"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
 msgid "Add Synchronization Point"
 msgstr "Aggiungi punto sincronizzazione"
 
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
 msgid "Clear Synchronization Points"
 msgstr "Pulisci punti sincronizzazione"
 
@@ -831,7 +843,7 @@ msgstr "Identici"
 msgid "New"
 msgstr "Nuovi"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Modificati"
@@ -840,67 +852,74 @@ msgstr "Modificati"
 msgid "Ignore filename case"
 msgstr "Ignora maiuscole/minuscole nel nome del file"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr "Normalizza i percorsi Unicode"
+
+#: meld/resources/gtk/menus.ui:175
 msgid "Normal"
 msgstr "Normale"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Non monitorato"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Ignorati"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:190
 msgid "Flatten folders"
 msgstr "Appiattisce le cartelle"
 
 #: meld/resources/ui/about-dialog.ui:8
+#| msgid ""
+#| "Copyright © 2002-2009 Stephen Kennedy\n"
+#| "Copyright © 2009-2019 Kai Willadsen"
 msgid ""
 "Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2019 Kai Willadsen"
+"Copyright © 2009-2021 Kai Willadsen"
 msgstr ""
 "Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2019 Kai Willadsen"
+"Copyright © 2009-2021 Kai Willadsen"
 
 #: meld/resources/ui/about-dialog.ui:14
 msgid "translator-credits"
 msgstr "Milo Casagrande <milo@milo.name>"
 
-#: meld/resources/ui/appwindow.ui:29
+#: meld/resources/ui/appwindow.ui:30
 msgid "Start a new comparison"
 msgstr "Avvia un nuovo confronto"
 
-#: meld/resources/ui/appwindow.ui:45
+#: meld/resources/ui/appwindow.ui:46
 msgid "Open a recent comparison"
 msgstr "Apre un confronto recente"
 
-#: meld/resources/ui/appwindow.ui:73
+#: meld/resources/ui/appwindow.ui:74
 msgid "Go to the previous change"
 msgstr "Va alla modifica precedente"
 
-#: meld/resources/ui/appwindow.ui:93
+#: meld/resources/ui/appwindow.ui:94
 msgid "Go to the next change"
 msgstr "Va alla modifica successiva"
 
-#: meld/resources/ui/appwindow.ui:123
+#: meld/resources/ui/appwindow.ui:124
 msgid "Go to the previous conflict"
 msgstr "Va al conflitto precedente"
 
-#: meld/resources/ui/appwindow.ui:143
+#: meld/resources/ui/appwindow.ui:144
 msgid "Go to the next conflict"
 msgstr "Va al conflitto successivo"
 
-#: meld/resources/ui/appwindow.ui:191
+#: meld/resources/ui/appwindow.ui:193
 msgid "Version Filters"
 msgstr "Filtri versione"
 
-#: meld/resources/ui/appwindow.ui:206 meld/resources/ui/preferences.ui:1456
+#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472
 msgid "File Filters"
 msgstr "Filtri dei file"
 
-#: meld/resources/ui/appwindow.ui:221 meld/resources/ui/preferences.ui:1641
+#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657
 msgid "Text Filters"
 msgstr "Filtri di testo"
 
@@ -913,7 +932,7 @@ msgid "Column Name"
 msgstr "Nome colonna"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:735
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
 msgid "_Remove"
 msgstr "_Rimuovi"
 
@@ -970,33 +989,58 @@ msgid "_Compare selected files"
 msgstr "_Confronta i file selezionati"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+msgid "_Mark selected file"
+msgstr "_Marca file selezionato"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Compare _with marked file"
+msgstr "_Confronta con file marcato"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "Copia a _sinistra"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "Copia a _destra"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "_Elimina selezione"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "Contrai ricorsivamente"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "Espandi ricorsivamente"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "_Apri esternamente"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "Copia _percorsi file"
 
+#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
+#: meld/resources/ui/dirdiff.ui:117
+msgid "Select folder to open in this pane"
+msgstr "Seleziona la cartella da aprire in questo riquadro"
+
+#: meld/resources/ui/dirdiff.ui:43
+msgid "Folder 1"
+msgstr "Cartella 1"
+
+#: meld/resources/ui/dirdiff.ui:84
+msgid "Folder 2"
+msgstr "Cartella 2"
+
+#: meld/resources/ui/dirdiff.ui:125
+msgid "Folder 3"
+msgstr "Cartella 3"
+
 #: meld/resources/ui/encoding-selector.ui:31
 msgid "Search text encoding…"
 msgstr "Codifica testo di ricerca…"
@@ -1053,8 +1097,16 @@ msgstr "_Copia"
 msgid "_Paste"
 msgstr "_Incolla"
 
-#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
-#: meld/resources/ui/filediff.ui:171
+#: meld/resources/ui/filediff-menus.ui:54
+msgid "Open Containing Folder"
+msgstr "Apri cartella contenente"
+
+#: meld/resources/ui/filediff-menus.ui:58
+msgid "Copy Full Path"
+msgstr "Copia percorso completo"
+
+#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
+#: meld/resources/ui/filediff.ui:169
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -1063,31 +1115,31 @@ msgstr ""
 "sbloccarlo e apportare le modifiche: tali modifiche devono però essere "
 "salvata su un nuovo file."
 
-#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
-#: meld/resources/ui/filediff.ui:185
-msgid "Open file in this pane"
-msgstr "Apre il file in questo riquadro"
-
-#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
-#: meld/resources/ui/filediff.ui:194
+#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
+#: meld/resources/ui/filediff.ui:183
 msgid "Save file in this pane"
 msgstr "Salva il file in questo riquadro"
 
-#: meld/resources/ui/filediff.ui:73
+#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
+#: meld/resources/ui/filediff.ui:209
+msgid "Open file in this pane"
+msgstr "Apre il file in questo riquadro"
+
+#: meld/resources/ui/filediff.ui:79
 msgid "File 3"
 msgstr "File 3"
 
-#: meld/resources/ui/filediff.ui:142
+#: meld/resources/ui/filediff.ui:148
 msgid "File 2"
 msgstr "File 2"
 
-#: meld/resources/ui/filediff.ui:207
+#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148
 msgid "File 1"
 msgstr "File 1"
 
 #. Create icon and filename CellRenderer
-#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
-#: meld/dirdiff.py:508
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
+#: meld/dirdiff.py:602
 msgid "Name"
 msgstr "Nome"
 
@@ -1099,7 +1151,7 @@ msgstr "Modello"
 msgid "Add new filter"
 msgstr "Aggiungi nuovo filtro"
 
-#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18
 msgid "_Add"
 msgstr "A_ggiungi"
 
@@ -1127,7 +1179,7 @@ msgstr "A capo"
 msgid "Replace _All"
 msgstr "Sostituisci _tutti"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1041 meld/iohelpers.py:115
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "Sostit_uisci"
 
@@ -1139,7 +1191,7 @@ msgstr "Passa tra «Cerca» e «Cerca e sostituisci»"
 msgid "Search highlight mode…"
 msgstr "Modalità evidenziazione ricerca…"
 
-#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:345
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342
 #: meld/newdifftab.py:49
 msgid "New comparison"
 msgstr "Nuovo confronto"
@@ -1156,43 +1208,43 @@ msgstr "Cartella"
 msgid "Version control"
 msgstr "Controllo della versione"
 
-#: meld/resources/ui/new-diff-tab.ui:235 meld/resources/ui/new-diff-tab.ui:352
+#: meld/resources/ui/new-diff-tab.ui:236 meld/resources/ui/new-diff-tab.ui:357
 msgid "_3-way comparison"
 msgstr "Confronto a 3-_vie"
 
-#: meld/resources/ui/new-diff-tab.ui:254
+#: meld/resources/ui/new-diff-tab.ui:256
 msgid "Select First File"
 msgstr "Seleziona primo file"
 
-#: meld/resources/ui/new-diff-tab.ui:267
+#: meld/resources/ui/new-diff-tab.ui:270
 msgid "Select Second File"
 msgstr "Seleziona secondo file"
 
-#: meld/resources/ui/new-diff-tab.ui:281
+#: meld/resources/ui/new-diff-tab.ui:285
 msgid "Select Third File"
 msgstr "Seleziona terzo file"
 
-#: meld/resources/ui/new-diff-tab.ui:316
+#: meld/resources/ui/new-diff-tab.ui:321
 msgid "Select First Folder"
 msgstr "Seleziona prima cartella"
 
-#: meld/resources/ui/new-diff-tab.ui:329
+#: meld/resources/ui/new-diff-tab.ui:334
 msgid "Select Second Folder"
 msgstr "Seleziona seconda cartella"
 
-#: meld/resources/ui/new-diff-tab.ui:343
+#: meld/resources/ui/new-diff-tab.ui:348
 msgid "Select Third Folder"
 msgstr "Seleziona terza cartella"
 
-#: meld/resources/ui/new-diff-tab.ui:393
+#: meld/resources/ui/new-diff-tab.ui:399
 msgid "Select A Version-Controlled Folder"
 msgstr "Seleziona cartella con controllo versione"
 
-#: meld/resources/ui/new-diff-tab.ui:442
+#: meld/resources/ui/new-diff-tab.ui:448
 msgid "_Blank comparison"
 msgstr "Confronta spazi _bianchi"
 
-#: meld/resources/ui/new-diff-tab.ui:459
+#: meld/resources/ui/new-diff-tab.ui:466
 msgid "C_ompare"
 msgstr "C_onfronta"
 
@@ -1228,6 +1280,18 @@ msgstr "Riquadri centrale e destro"
 msgid "_Reverse patch direction"
 msgstr "Inve_rti direzione patch"
 
+#: meld/resources/ui/path-label.ui:23
+msgid "Path"
+msgstr "Percorso"
+
+#: meld/resources/ui/path-label.ui:62
+msgid "Copy Path"
+msgstr "Copia percorso"
+
+#: meld/resources/ui/path-label.ui:78
+msgid "Open Folder"
+msgstr "Apri cartella"
+
 #: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
 msgid "Preferences"
 msgstr "Preferenze"
@@ -1246,7 +1310,7 @@ msgstr "_Carattere dell'editor:"
 
 #. TRANSLATORS: This is the status bar label for a group of settings,
 #. such as text wrapping, show line numbers, whitespace, etc.
-#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:288
+#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:291
 msgid "Display"
 msgstr "Visualizzazione"
 
@@ -1279,104 +1343,108 @@ msgid "Show w_hitespace"
 msgstr "Mostrare gli spazi _bianchi"
 
 #: meld/resources/ui/preferences.ui:381
+msgid "Prefer dark theme"
+msgstr "Preferisci tema scuro"
+
+#: meld/resources/ui/preferences.ui:397
 msgid "Use s_yntax highlighting"
 msgstr "Usare _evidenziazione sintassi"
 
-#: meld/resources/ui/preferences.ui:404
+#: meld/resources/ui/preferences.ui:420
 msgid "Syntax highlighting color scheme:"
 msgstr "Schema colore per evidenziazione sintassi:"
 
-#: meld/resources/ui/preferences.ui:469
+#: meld/resources/ui/preferences.ui:485
 msgid "Code Overview"
 msgstr "Panoramica codice"
 
-#: meld/resources/ui/preferences.ui:506
+#: meld/resources/ui/preferences.ui:522
 msgid "Show overview map"
 msgstr "Mostra mappa panoramica"
 
-#: meld/resources/ui/preferences.ui:529
+#: meld/resources/ui/preferences.ui:545
 msgid "Overview map style:"
 msgstr "Stile della mappa panoramica:"
 
-#: meld/resources/ui/preferences.ui:596
+#: meld/resources/ui/preferences.ui:612
 msgid "External Editor"
 msgstr "Editor esterno"
 
-#: meld/resources/ui/preferences.ui:632
+#: meld/resources/ui/preferences.ui:648
 msgid "Use _default system editor"
 msgstr "Usare editor _predefinito di sistema"
 
-#: meld/resources/ui/preferences.ui:655
+#: meld/resources/ui/preferences.ui:671
 msgid "Edito_r command:"
 msgstr "Comando dell'edito_r:"
 
-#: meld/resources/ui/preferences.ui:711
+#: meld/resources/ui/preferences.ui:727
 msgid "Editor"
 msgstr "Editor"
 
-#: meld/resources/ui/preferences.ui:732
+#: meld/resources/ui/preferences.ui:748
 msgid "Shallow Comparison"
 msgstr "Confronto superficiale"
 
-#: meld/resources/ui/preferences.ui:768
+#: meld/resources/ui/preferences.ui:784
 msgid "C_ompare files based only on size and timestamp"
 msgstr "Confrontare i file solo su _dimensione e marcatura temporale"
 
-#: meld/resources/ui/preferences.ui:791
+#: meld/resources/ui/preferences.ui:807
 msgid "_Timestamp resolution:"
 msgstr "Risoluzione marcatura _temporale:"
 
-#: meld/resources/ui/preferences.ui:855
+#: meld/resources/ui/preferences.ui:871
 msgid "Note: enabling text filters may make comparing large files much slower"
 msgstr ""
 "Nota: abilitare i filtri sul testo può rendere il confronto di file grandi "
 "molto più lento"
 
-#: meld/resources/ui/preferences.ui:904
+#: meld/resources/ui/preferences.ui:920
 msgid "Symbolic Links"
 msgstr "Collegamenti simbolici"
 
-#: meld/resources/ui/preferences.ui:972
+#: meld/resources/ui/preferences.ui:988
 msgid "Visible Columns"
 msgstr "Colonne visibili"
 
-#: meld/resources/ui/preferences.ui:1039
+#: meld/resources/ui/preferences.ui:1055
 msgid "Folder Comparisons"
 msgstr "Confronto cartelle"
 
-#: meld/resources/ui/preferences.ui:1061
+#: meld/resources/ui/preferences.ui:1077
 msgid "Version Comparisons"
 msgstr "Confronto versione"
 
-#: meld/resources/ui/preferences.ui:1104
+#: meld/resources/ui/preferences.ui:1120
 msgid "_Order when comparing file revisions:"
 msgstr "_Ordine nel confrontare revisioni di file:"
 
-#: meld/resources/ui/preferences.ui:1151
+#: meld/resources/ui/preferences.ui:1167
 msgid "Order when _merging files:"
 msgstr "Ordine nell'_unione dei file:"
 
-#: meld/resources/ui/preferences.ui:1219
+#: meld/resources/ui/preferences.ui:1235
 msgid "Commit Messages"
 msgstr "Messaggio di commit"
 
-#: meld/resources/ui/preferences.ui:1260
+#: meld/resources/ui/preferences.ui:1276
 msgid "Show _right margin at:"
 msgstr "Mostrare _il margine destro a:"
 
-#: meld/resources/ui/preferences.ui:1301
+#: meld/resources/ui/preferences.ui:1317
 msgid "Automatically _break lines at right margin on commit"
 msgstr "Spe_zzare le righe sul margine destro nel commit"
 
-#: meld/resources/ui/preferences.ui:1351
+#: meld/resources/ui/preferences.ui:1367
 msgid "Version Control"
 msgstr "Controllo della versione"
 
-#: meld/resources/ui/preferences.ui:1373
+#: meld/resources/ui/preferences.ui:1389
 msgid "Filename filters"
 msgstr "Filtri sui nomi dei file"
 
-#: meld/resources/ui/preferences.ui:1411
+#: meld/resources/ui/preferences.ui:1427
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -1386,21 +1454,21 @@ msgstr ""
 "directory per nome. Ogni modello è una lista di nomi che possono contenere "
 "caratteri jolly, analogamente alla shell, separati da spazi."
 
-#: meld/resources/ui/preferences.ui:1478
+#: meld/resources/ui/preferences.ui:1494
 msgid "Change trimming"
 msgstr "Modifica eliminazioni"
 
-#: meld/resources/ui/preferences.ui:1514
+#: meld/resources/ui/preferences.ui:1530
 msgid "Trim blank line differences from the start and end of changes"
 msgstr ""
 "Elimina le differenze sulle righe vuote all'inizio e alla fine delle "
 "modifiche"
 
-#: meld/resources/ui/preferences.ui:1558
+#: meld/resources/ui/preferences.ui:1574
 msgid "Text filters"
 msgstr "Filtri di testo"
 
-#: meld/resources/ui/preferences.ui:1596
+#: meld/resources/ui/preferences.ui:1612
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -1414,47 +1482,47 @@ msgstr ""
 "confronto. Se l'espressione contiene gruppi, solamente i gruppi saranno "
 "sostituiti. Vedere il manuale utente per maggiori dettagli."
 
-#: meld/resources/ui/preferences.ui:1687
+#: meld/resources/ui/preferences.ui:1703
 msgid "Left is remote, right is local"
 msgstr "Sinistra è remoto, destra è locale"
 
-#: meld/resources/ui/preferences.ui:1691
+#: meld/resources/ui/preferences.ui:1707
 msgid "Left is local, right is remote"
 msgstr "Sinistra è locale, destra è remoto"
 
-#: meld/resources/ui/preferences.ui:1705
+#: meld/resources/ui/preferences.ui:1721
 msgid "Simple change map"
 msgstr "Mappa delle modifiche"
 
-#: meld/resources/ui/preferences.ui:1709
+#: meld/resources/ui/preferences.ui:1725
 msgid "Compact source map"
 msgstr "Mappa sorgente compatta"
 
-#: meld/resources/ui/preferences.ui:1713
+#: meld/resources/ui/preferences.ui:1729
 msgid "Full source map"
 msgstr "Mappa sorgente completa"
 
-#: meld/resources/ui/preferences.ui:1727
+#: meld/resources/ui/preferences.ui:1743
 msgid "Remote, merge, local"
 msgstr "Remoto, unione, locale"
 
-#: meld/resources/ui/preferences.ui:1731
+#: meld/resources/ui/preferences.ui:1747
 msgid "Local, merge, remote"
 msgstr "Locale, unione, remoto"
 
-#: meld/resources/ui/preferences.ui:1753
+#: meld/resources/ui/preferences.ui:1769
 msgid "1ns (ext4)"
 msgstr "1ns (ext4)"
 
-#: meld/resources/ui/preferences.ui:1757
+#: meld/resources/ui/preferences.ui:1773
 msgid "100ns (NTFS)"
 msgstr "100ns (NTFS)"
 
-#: meld/resources/ui/preferences.ui:1761
+#: meld/resources/ui/preferences.ui:1777
 msgid "1s (ext2/ext3)"
 msgstr "1s (ext2/ext3)"
 
-#: meld/resources/ui/preferences.ui:1765
+#: meld/resources/ui/preferences.ui:1781
 msgid "2s (VFAT)"
 msgstr "2s (VFAT)"
 
@@ -1501,12 +1569,12 @@ msgstr "Se non si salva, le modifiche andranno perse per sempre."
 msgid "Close _without Saving"
 msgstr "Chiudi senza sal_vare"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1040
-#: meld/iohelpers.py:56 meld/iohelpers.py:114
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "A_nnulla"
 
-#: meld/resources/ui/save-confirm-dialog.ui:52
+#: meld/resources/ui/save-confirm-dialog.ui:55
 msgid "_Save"
 msgstr "_Salva"
 
@@ -1526,95 +1594,67 @@ msgstr "C_onfronta"
 msgid "Co_mmit…"
 msgstr "Co_mmit…"
 
-#: meld/resources/ui/vcview-menus.ui:15
-msgid "_Update"
-msgstr "A_ggiorna"
-
-#: meld/resources/ui/vcview-menus.ui:30
+#: meld/resources/ui/vcview-menus.ui:26
 msgid "Re_vert"
 msgstr "_Ripristina"
 
-#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+#: meld/resources/ui/vcview-menus.ui:30
 msgid "Delete"
 msgstr "Elimina"
 
-#: meld/resources/ui/vcview-menus.ui:41
-msgid "Mar_k as Resolved"
-msgstr "Marca _risolto"
-
-#: meld/resources/ui/vcview.ui:73
-msgid "Commit…"
-msgstr "Commit…"
+#: meld/resources/ui/vcview-menus.ui:37
+msgid "Resolve Conflict"
+msgstr "Risolvi conflitto"
 
-#: meld/resources/ui/vcview.ui:74
+#: meld/resources/ui/vcview.ui:16
 msgid "Commit changes to version control"
 msgstr "Esegue il commit delle modifiche"
 
-#: meld/resources/ui/vcview.ui:86
-msgid "Update"
-msgstr "Aggiorna"
-
-#: meld/resources/ui/vcview.ui:87
-msgid "Update working copy from version control"
-msgstr "Aggiorna la copia di lavoro dal sistema di controllo della versione"
+#: meld/resources/ui/vcview.ui:21
+msgid "Commit…"
+msgstr "Commit…"
 
-#: meld/resources/ui/vcview.ui:99
-msgid "Push"
-msgstr "Push"
+#: meld/resources/ui/vcview.ui:38
+msgid "Pull remote changes to the local repository"
+msgstr "Recupera le modifiche remote nel repository locale"
 
-#: meld/resources/ui/vcview.ui:100
+#: meld/resources/ui/vcview.ui:51
 msgid "Push local changes to remote"
 msgstr "Invia le modifiche locali in remoto"
 
-#: meld/resources/ui/vcview.ui:112
-msgid "Add"
-msgstr "Aggiungi"
-
-#: meld/resources/ui/vcview.ui:113
+#: meld/resources/ui/vcview.ui:74
 msgid "Add to version control"
 msgstr "Aggiunge al controllo di versione"
 
-#: meld/resources/ui/vcview.ui:125
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: meld/resources/ui/vcview.ui:126
+#: meld/resources/ui/vcview.ui:87
 msgid "Remove from version control"
 msgstr "Rimuove dal controllo di versione"
 
-#: meld/resources/ui/vcview.ui:138
-msgid "Mark as Resolved"
-msgstr "Marca risolto"
+#: meld/resources/ui/vcview.ui:100
+msgid "Revert working copy to original state"
+msgstr "Riporta la copia di lavoro allo stato originale"
 
-#: meld/resources/ui/vcview.ui:139
+#: meld/resources/ui/vcview.ui:113
 msgid "Mark as resolved in version control"
 msgstr "Marca come risolto nel controllo di versione"
 
-#: meld/resources/ui/vcview.ui:151
-msgid "Revert"
-msgstr "Ripristina"
+#: meld/resources/ui/vcview.ui:140
+msgid "Open version controlled folder in this pane"
+msgstr "Apri la cartella con controllo della versione in questo riquadro"
 
-#: meld/resources/ui/vcview.ui:152
-msgid "Revert working copy to original state"
-msgstr "Riporta la copia di lavoro allo stato originale"
-
-#: meld/resources/ui/vcview.ui:165
-msgid "Delete from working copy"
-msgstr "Elimina dalla copia di lavoro"
-
-#: meld/resources/ui/vcview.ui:220 meld/vcview.py:410
+#: meld/resources/ui/vcview.ui:229
 msgid "Location"
 msgstr "Posizione"
 
-#: meld/resources/ui/vcview.ui:229
+#: meld/resources/ui/vcview.ui:238
 msgid "Status"
 msgstr "Stato"
 
-#: meld/resources/ui/vcview.ui:238
+#: meld/resources/ui/vcview.ui:247
 msgid "Extra"
 msgstr "Extra"
 
-#: meld/resources/ui/vcview.ui:270
+#: meld/resources/ui/vcview.ui:279
 msgid "Console output"
 msgstr "Output della console"
 
@@ -1639,39 +1679,54 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:529 meld/preferences.py:132
+#: meld/dirdiff.py:623 meld/preferences.py:132
 msgid "Size"
 msgstr "Dimensione"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:537 meld/preferences.py:133
+#: meld/dirdiff.py:631 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Data e ora di modifica"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:639 meld/preferences.py:134
+msgid "Modification time (ISO)"
+msgstr "Data e ora di modifica (ISO)"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:545 meld/preferences.py:134
+#: meld/dirdiff.py:647 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Permessi"
 
-#: meld/dirdiff.py:768 meld/dirdiff.py:791
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr "[%s] Analisi di %s"
+#: meld/dirdiff.py:900
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (analisi…)"
 
-#: meld/dirdiff.py:927
-#, python-format
-msgid "[%s] Done"
-msgstr "[%s] Fatto"
+#: meld/dirdiff.py:932 meld/dirdiff.py:964
+#, python-brace-format
+msgid "[{label}] Scanning {folder}"
+msgstr "[{label}] Analisi di {folder}"
+
+#: meld/dirdiff.py:1100
+#, python-brace-format
+#| msgid "[%s] Done"
+msgid "[{label}] Done"
+msgstr "[{label}] Fatto"
+
+#: meld/dirdiff.py:1113
+msgid "Folder {} is being compared to itself"
+msgstr "La cartella {} viene confrontata con se stessa"
 
-#: meld/dirdiff.py:934
+#: meld/dirdiff.py:1119
 msgid "Folders have no differences"
 msgstr "Le cartelle non presentano alcuna differenza"
 
-#: meld/dirdiff.py:936
+#: meld/dirdiff.py:1121
 msgid "Contents of scanned files in folders are identical."
 msgstr "Il contenuto dei file analizzati nelle cartelle è identico."
 
-#: meld/dirdiff.py:938
+#: meld/dirdiff.py:1123
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1679,45 +1734,45 @@ msgstr ""
 "I file analizzati nelle cartelle sembrerebbero identici, ma il loro "
 "contenuto non è stato analizzato."
 
-#: meld/dirdiff.py:941
+#: meld/dirdiff.py:1126
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Sono in uso dei filtri sui file: non tutti i file sono stati analizzati."
 
-#: meld/dirdiff.py:943
+#: meld/dirdiff.py:1128
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Sono in uso filtri sul testo e potrebbero nascondere differenze tra i file."
 
-#: meld/dirdiff.py:959 meld/filediff.py:1824
+#: meld/dirdiff.py:1144 meld/filediff.py:1919
 msgid "Hide"
 msgstr "Nascondi"
 
-#: meld/dirdiff.py:961 meld/filediff.py:1826 meld/filediff.py:1856
-#: meld/filediff.py:1858 meld/ui/msgarea.py:106 meld/ui/msgarea.py:119
+#: meld/dirdiff.py:1146 meld/filediff.py:1921 meld/filediff.py:1951
+#: meld/filediff.py:1953 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "Nascon_di"
 
-#: meld/dirdiff.py:970
+#: meld/dirdiff.py:1155
 msgid "Multiple errors occurred while scanning this folder"
 msgstr ""
 "Si sono verificati molteplici errore durante l'analisi di questa cartella"
 
-#: meld/dirdiff.py:971
+#: meld/dirdiff.py:1156
 msgid "Files with invalid encodings found"
 msgstr "Trovati file con codifiche non valide"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:973
+#: meld/dirdiff.py:1158
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Alcuni file presentano delle codifiche non corrette. I nomi sono:"
 
-#: meld/dirdiff.py:975
+#: meld/dirdiff.py:1160
 msgid "Files hidden by case insensitive comparison"
 msgstr "File nascosti dal confronto senza distinzione maiuscole/minuscole"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:977
+#: meld/dirdiff.py:1162
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1725,17 +1780,18 @@ msgstr ""
 "Confronto eseguito senza distinzione tra maiuscole/minuscole su un file "
 "system che applica tale distinzione. Alcuni file sono nascosti:"
 
-#: meld/dirdiff.py:988
-#, python-format
-msgid "“%s” hidden by “%s”"
-msgstr "«%s» è nascosto da «%s»"
+#: meld/dirdiff.py:1173
+#, python-brace-format
+#| msgid "“%s” hidden by “%s”"
+msgid "“{first_file}” hidden by “{second_file}”"
+msgstr "«{first_file}» è nascosto da «{second_file}»"
 
-#: meld/dirdiff.py:1044
+#: meld/dirdiff.py:1235
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Sostituire la cartella «%s»?"
 
-#: meld/dirdiff.py:1046
+#: meld/dirdiff.py:1237
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1745,36 +1801,36 @@ msgstr ""
 "Sostituendo la cartella esistente, tutti i file in essa contenuti saranno "
 "persi."
 
-#: meld/dirdiff.py:1059
+#: meld/dirdiff.py:1250
 msgid "Error copying file"
 msgstr "Errore nel copiare il file"
 
-#: meld/dirdiff.py:1060
-#, python-format
+#: meld/dirdiff.py:1251
+#, python-brace-format
 msgid ""
-"Couldn’t copy %s\n"
-"to %s.\n"
+"Couldn’t copy {source}\n"
+"to {dest}.\n"
 "\n"
-"%s"
+"{error}"
 msgstr ""
-"Impossibile copiare %s\n"
-"su %s.\n"
+"Impossibile copiare {source}\n"
+"su {dest}.\n"
 "\n"
-"%s"
+"{error}"
 
-#: meld/dirdiff.py:1085 meld/vcview.py:758
+#: meld/dirdiff.py:1276 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Errore nell'eliminare {}"
 
-#: meld/dirdiff.py:1578
+#: meld/dirdiff.py:1819
 msgid "No folder"
 msgstr "Nessuna cartella"
 
-#: meld/filediff.py:1116
+#: meld/filediff.py:1149
 msgid "Comparison results will be inaccurate"
 msgstr "I risultati del confronto non saranno precisi"
 
-#: meld/filediff.py:1118
+#: meld/filediff.py:1151
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1782,70 +1838,74 @@ msgstr ""
 "Un filtro ha modificato il numero di righe nel file: ciò non è supportato. "
 "Il confronto non sarà corretto."
 
-#: meld/filediff.py:1190
+#: meld/filediff.py:1223
 msgid "Mark conflict as resolved?"
 msgstr "Marcare il conflitto come risolto?"
 
-#: meld/filediff.py:1192
+#: meld/filediff.py:1225
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Se il conflitto è stato risolto con successo, è possibile indicarlo ora."
 
-#: meld/filediff.py:1194
+#: meld/filediff.py:1228
 msgid "Cancel"
 msgstr "Annulla"
 
-#: meld/filediff.py:1195
+#: meld/filediff.py:1229
 msgid "Mark _Resolved"
 msgstr "Marca _risolto"
 
-#: meld/filediff.py:1520
+#: meld/filediff.py:1593
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Si è verificato un problema nell'aprire il file «%s»."
 
-#: meld/filediff.py:1528
+#: meld/filediff.py:1602
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Il file «%s» sembra essere un file binario."
 
-#: meld/filediff.py:1530
+#: meld/filediff.py:1604
 msgid "Do you want to open the file using the default application?"
 msgstr "Aprire il file utilizzando l'applicazione predefinita?"
 
-#: meld/filediff.py:1532
+#: meld/filediff.py:1606
 msgid "Open"
 msgstr "Apri"
 
-#: meld/filediff.py:1546
+#: meld/filediff.py:1628
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Unione dei file"
 
-#: meld/filediff.py:1560
+#: meld/filediff.py:1642
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calcolo delle differenze"
 
-#: meld/filediff.py:1619
+#: meld/filediff.py:1702
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Il file «%s» è stato modificato"
 
-#: meld/filediff.py:1620
+#: meld/filediff.py:1703
 msgid "Do you want to reload the file?"
 msgstr "Ricaricare il file?"
 
-#: meld/filediff.py:1622
+#: meld/filediff.py:1705
 msgid "_Reload"
 msgstr "_Ricarica"
 
-#: meld/filediff.py:1789
+#: meld/filediff.py:1875
+msgid "File {} is being compared to itself"
+msgstr "Il file {} viene confrontato con se stesso"
+
+#: meld/filediff.py:1884
 msgid "Files are identical"
 msgstr "I file sono identici"
 
-#: meld/filediff.py:1802
+#: meld/filediff.py:1897
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1853,11 +1913,11 @@ msgstr ""
 "Sono in uso filtri sul testo e potrebbero nascondere differenze tra i file. "
 "Confrontare i file senza i filtri?"
 
-#: meld/filediff.py:1807
+#: meld/filediff.py:1902
 msgid "Files differ in line endings only"
 msgstr "I file differiscono solo nelle terminazioni di riga"
 
-#: meld/filediff.py:1809
+#: meld/filediff.py:1904
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1866,16 +1926,16 @@ msgstr ""
 "I file sono identici, ma differiscono sono nelle terminazioni di riga:\n"
 "%s"
 
-#: meld/filediff.py:1829
+#: meld/filediff.py:1924
 msgid "Show without filters"
 msgstr "Mostra senza filtri"
 
-#: meld/filediff.py:1851
+#: meld/filediff.py:1946
 msgid "Change highlighting incomplete"
 msgstr "Evidenziazione modifica incompleta"
 
 # (ndt) un po’ libera…
-#: meld/filediff.py:1852
+#: meld/filediff.py:1947
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1884,19 +1944,19 @@ msgstr ""
 "possibile fare in modo che anche le modifiche di grandi dimensioni vengano "
 "evidenziate, ma potrebbe rallentare il programma."
 
-#: meld/filediff.py:1860
+#: meld/filediff.py:1955
 msgid "Keep highlighting"
 msgstr "Continua a evidenziare"
 
-#: meld/filediff.py:1862
+#: meld/filediff.py:1957
 msgid "_Keep highlighting"
 msgstr "Continua _evidenziazione"
 
-#: meld/filediff.py:1875
+#: meld/filediff.py:1970
 msgid "Saving failed"
 msgstr "Salvataggio non riuscito"
 
-#: meld/filediff.py:1876
+#: meld/filediff.py:1971
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1904,43 +1964,43 @@ msgstr ""
 "Copiare qualsiasi modifica in un altro programma o file per evitare la "
 "perdita di dati."
 
-#: meld/filediff.py:1885
+#: meld/filediff.py:1980
 msgid "Save Left Pane As"
 msgstr "Salva riquadro sinistro come"
 
-#: meld/filediff.py:1887
+#: meld/filediff.py:1982
 msgid "Save Middle Pane As"
 msgstr "Salva riquadro centrale come"
 
-#: meld/filediff.py:1889
+#: meld/filediff.py:1984
 msgid "Save Right Pane As"
 msgstr "Salva riquadro destro come"
 
-#: meld/filediff.py:1900
+#: meld/filediff.py:1995
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Il file «%s» è stato modificato"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1997
 msgid "If you save it, any external changes will be lost."
 msgstr "Salvare il file comporterà la perdita delle modifiche esterne."
 
-#: meld/filediff.py:1905
+#: meld/filediff.py:2000
 msgid "Save Anyway"
 msgstr "Salva comunque"
 
-#: meld/filediff.py:1906
+#: meld/filediff.py:2001
 msgid "Don’t Save"
 msgstr "Non salvare"
 
-#: meld/filediff.py:1948
+#: meld/filediff.py:2043
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
 msgstr ""
 "Il file «{}» contiene caratteri che non possono essere codificati con «{}»."
 
-#: meld/filediff.py:1952 meld/patchdialog.py:138
+#: meld/filediff.py:2047 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1949,20 +2009,16 @@ msgstr ""
 "Impossibile salvare il file a causa di:\n"
 "%s"
 
-#: meld/filediff.py:1956 meld/patchdialog.py:137
+#: meld/filediff.py:2051 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Impossibile salvare il file %s."
 
-#: meld/filediff.py:2017
-msgid "Open File"
-msgstr "Apri file"
-
-#: meld/filediff.py:2371
+#: meld/filediff.py:2452
 msgid "Live comparison updating disabled"
 msgstr "Aggiornamento automatico dei confronti disabilitato"
 
-#: meld/filediff.py:2372
+#: meld/filediff.py:2453
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1991,16 +2047,16 @@ msgstr ""
 "Questa posizione remota non supporta lo spostamento degli elementi nel "
 "cestino."
 
-#: meld/iohelpers.py:57
+#: meld/iohelpers.py:58
 msgid "_Delete Permanently"
 msgstr "Elimina _definitivamente"
 
-#: meld/iohelpers.py:108
+#: meld/iohelpers.py:110
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Sostituire il file «%s»?"
 
-#: meld/iohelpers.py:110
+#: meld/iohelpers.py:112
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2009,124 +2065,124 @@ msgstr ""
 "Un file con lo stesso nome esiste già in «%s».\n"
 "Sostituendo il file esistente, tutto il suo contenuto sarà perso."
 
-#: meld/meldapp.py:179
+#: meld/meldapp.py:188
 msgid "wrong number of arguments supplied to --diff"
 msgstr "numero errato di argomenti forniti per --diff"
 
-#: meld/meldapp.py:184
+#: meld/meldapp.py:193
 msgid "Start with an empty window"
 msgstr "Parte con una finestra vuota"
 
-#: meld/meldapp.py:185 meld/meldapp.py:187
+#: meld/meldapp.py:194 meld/meldapp.py:196
 msgid "file"
 msgstr "file"
 
-#: meld/meldapp.py:185 meld/meldapp.py:189
+#: meld/meldapp.py:194 meld/meldapp.py:198
 msgid "folder"
 msgstr "cartella"
 
-#: meld/meldapp.py:186
+#: meld/meldapp.py:195
 msgid "Start a version control comparison"
 msgstr "Inizia un confronto da controllo di versione"
 
-#: meld/meldapp.py:188
+#: meld/meldapp.py:197
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Inizia un confronto file a 2 o 3 vie"
 
-#: meld/meldapp.py:190
+#: meld/meldapp.py:199
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Inizia un confronto cartella a 2 o 3 vie"
 
-#: meld/meldapp.py:233
+#: meld/meldapp.py:242
 #, python-format
 msgid "Error: %s\n"
 msgstr "Errore: %s\n"
 
-#: meld/meldapp.py:240
+#: meld/meldapp.py:249
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld è uno strumento per confrontare file e directory."
 
-#: meld/meldapp.py:244
+#: meld/meldapp.py:253
 msgid "Set label to use instead of file name"
 msgstr "Imposta l'etichetta da utilizzare al posto del nome del file"
 
-#: meld/meldapp.py:247
+#: meld/meldapp.py:256
 msgid "Open a new tab in an already running instance"
 msgstr "Apre una nuova scheda in un'istanza già in esecuzione"
 
-#: meld/meldapp.py:250
+#: meld/meldapp.py:259
 msgid "Automatically compare all differing files on startup"
 msgstr "Confronta automaticamente all'avvio tutti i file diversi"
 
-#: meld/meldapp.py:253
+#: meld/meldapp.py:262
 msgid "Ignored for compatibility"
 msgstr "Ignorato per compatibilità"
 
-#: meld/meldapp.py:257
+#: meld/meldapp.py:266
 msgid "Set the target file for saving a merge result"
 msgstr "Imposta il file destinazione per salvare il risultato dell'unione"
 
-#: meld/meldapp.py:260
+#: meld/meldapp.py:269
 msgid "Automatically merge files"
 msgstr "Unisce automaticamente i file"
 
-#: meld/meldapp.py:264
+#: meld/meldapp.py:273
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Carica un confronto salvato da un file Meld"
 
-#: meld/meldapp.py:268
+#: meld/meldapp.py:277
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Crea una scheda con le differenze per i file o le cartelle forniti"
 
-#: meld/meldapp.py:288
+#: meld/meldapp.py:297
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "troppi argomenti (ne servono da 0 a 3, forniti %d)"
 
-#: meld/meldapp.py:291
+#: meld/meldapp.py:300
 msgid "can’t auto-merge less than 3 files"
 msgstr "impossibile eseguire l'unione automatica con meno di 3 file"
 
-#: meld/meldapp.py:293
+#: meld/meldapp.py:302
 msgid "can’t auto-merge directories"
 msgstr "impossibile eseguire l'unione automatica di directory"
 
-#: meld/meldapp.py:308
+#: meld/meldapp.py:317
 msgid "Error reading saved comparison file"
 msgstr "Errore nel leggere il file di confronto salvato"
 
-#: meld/meldapp.py:325
+#: meld/meldapp.py:334
 #, python-format
 msgid "invalid path or URI “%s”"
 msgstr "percorso o URI «%s» non valido"
 
-#: meld/meldapp.py:331
+#: meld/meldapp.py:341
 msgid "remote folder “{}” not supported"
 msgstr "cartella remota «{}» non supportata"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: meld/meldbuffer.py:114
+#: meld/meldbuffer.py:115
 msgid "<unnamed>"
 msgstr "<senza nome>"
 
-#: meld/melddoc.py:60
+#: meld/melddoc.py:124
 msgid "untitled"
 msgstr "senza nome"
 
-#: meld/meldwindow.py:151
+#: meld/meldwindow.py:158
 msgid "Filename"
 msgstr "Nome file"
 
-#: meld/meldwindow.py:380
+#: meld/meldwindow.py:381
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Sono necessari tre file per un'unione automatica, ottenuti: %r"
 
-#: meld/meldwindow.py:402
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Non è possibile confrontare sia file che directory"
 
-#: meld/misc.py:150
+#: meld/misc.py:154
 msgid ""
 "{}\n"
 "\n"
@@ -2138,7 +2194,7 @@ msgstr ""
 "Riscontrato un errore critico durante l'esecuzione:\n"
 "<tt>{}</tt>"
 
-#: meld/misc.py:201
+#: meld/misc.py:205
 msgid "[None]"
 msgstr "[Nessuno]"
 
@@ -2150,15 +2206,14 @@ msgstr "etichetta"
 msgid "pattern"
 msgstr "modello"
 
-#: meld/recent.py:104
+#: meld/recent.py:111
 msgid "Version control:"
 msgstr "Controllo della versione:"
 
-#: meld/style.py:90
-#, python-format
-msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
+#: meld/style.py:91
+msgid "Couldn’t find colour scheme details for {}; this is a bad install"
 msgstr ""
-"Impossibile trovare i dettagli dello schema colori per %s-%s: installazione "
+"Impossibile trovare i dettagli dello schema colori per {}: installazione "
 "danneggiata"
 
 #: meld/ui/bufferselectors.py:110
@@ -2170,21 +2225,17 @@ msgstr "{name} ({charset})"
 msgid "Plain Text"
 msgstr "Testo semplice"
 
-#: meld/ui/filechooser.py:68
-msgid "Autodetect Encoding"
-msgstr "Rilevamento automatico codifica"
-
-#: meld/ui/filechooser.py:71
-msgid "Current Locale ({})"
-msgstr "Codifica attuale ({})"
+#: meld/ui/pathlabel.py:36
+msgid "Unnamed file"
+msgstr "File senza nome"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: meld/ui/statusbar.py:123
-#, python-format
-msgid "Ln %i, Col %i"
-msgstr "Rg %i, Col %d"
+#: meld/ui/statusbar.py:125
+#, python-brace-format
+msgid "Ln {line}, Col {column}"
+msgstr "Rg {line}, Col {column}"
 
-#: meld/ui/statusbar.py:183
+#: meld/ui/statusbar.py:185
 msgid "Line you want to move the cursor to"
 msgstr "Riga su cui spostare il cursore"
 
@@ -2192,45 +2243,44 @@ msgstr "Riga su cui spostare il cursore"
 msgid "No files will be committed"
 msgstr "Non verrà eseguito il commit di alcun file"
 
-#. Translators: First %s is replaced by translated "%d unpushed
-#. commits", second %s is replaced by translated "%d branches"
-#: meld/vc/git.py:91
-#, python-format
-msgid "%s in %s"
-msgstr "%s su %s"
+#. Translators: First element is replaced by translated "%d
+#. unpushed commits", second element is replaced by translated
+#. "%d branches"
+#: meld/vc/git.py:92
+#, python-brace-format
+msgid "{unpushed_commits} in {unpushed_branches}"
+msgstr "{unpushed_commits} in {unpushed_branches}"
 
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: meld/vc/git.py:92 meld/vc/git.py:99
+#: meld/vc/git.py:94 meld/vc/git.py:104
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
 msgstr[0] "%d commit non inviato"
 msgstr[1] "%d commit non inviati"
 
-#: meld/vc/git.py:94
+#: meld/vc/git.py:97
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "%d ramo"
 msgstr[1] "%d rami"
 
-#: meld/vc/git.py:333
-#, python-format
-msgid "Mode changed from %s to %s"
-msgstr "Modalità cambiata da %s a %s"
+#: meld/vc/git.py:345
+#, python-brace-format
+msgid "Mode changed from {old_mode} to {new_mode}"
+msgstr "Modalità cambiata da {old_mode} a {new_mode}"
 
-#: meld/vc/git.py:341
+#: meld/vc/git.py:353
 msgid "Partially staged"
 msgstr "Indicizzato parzialmente"
 
-#: meld/vc/git.py:341
+#: meld/vc/git.py:353
 msgid "Staged"
 msgstr "Indicizzato"
 
 #. Translators: This is the displayed name of a version control system
 #. when no version control system is actually found.
-#: meld/vc/_null.py:37
+#: meld/vc/_null.py:38
 msgid "None"
 msgstr "Nessuno"
 
@@ -2283,97 +2333,101 @@ msgstr "Mancante"
 msgid "Not present"
 msgstr "Non presente"
 
+#: meld/vc/_vc.py:82
+msgid "Scanning…"
+msgstr "Analisi…"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
-#: meld/vcview.py:332
+#: meld/vcview.py:334
 #, python-format
 msgid "%(name)s (not found)"
 msgstr "%(name)s (non trovato)"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: meld/vcview.py:336
+#: meld/vcview.py:338
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s non installato)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: meld/vcview.py:340
+#: meld/vcview.py:342
 #, python-format
 msgid "%(name)s (invalid repository)"
 msgstr "%(name)s (repository non valido)"
 
-#: meld/vcview.py:354
+#: meld/vcview.py:356
 msgid "No valid version control system found in this folder"
 msgstr ""
 "Nessun sistema di controllo della versione valido trovato in questa cartella"
 
-#: meld/vcview.py:356
+#: meld/vcview.py:358
 msgid "Choose which version control system to use"
 msgstr "Scegliere il sistema di controllo della versione da usare"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:410
-#, python-format
-msgid "%s: %s"
-msgstr "%s: %s"
+#: meld/vcview.py:412
+#, python-brace-format
+msgid "Location: {path}"
+msgstr "Posizione: {path}"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:417
+#: meld/vcview.py:419
 msgid "Scanning repository"
 msgstr "Analisi repository"
 
-#: meld/vcview.py:446
+#: meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "Analisi di %s"
 
-#: meld/vcview.py:485
+#: meld/vcview.py:487
 msgid "(Empty)"
 msgstr "(vuoto)"
 
-#: meld/vcview.py:532
+#: meld/vcview.py:535
 #, python-format
 msgid "%s — local"
 msgstr "%s — locale"
 
-#: meld/vcview.py:533
+#: meld/vcview.py:536
 #, python-format
 msgid "%s — remote"
 msgstr "%s — remoto"
 
-#: meld/vcview.py:541
+#: meld/vcview.py:544
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (locale, unione, remoto)"
 
-#: meld/vcview.py:546
+#: meld/vcview.py:549
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (remoto, unione, locale)"
 
-#: meld/vcview.py:557
+#: meld/vcview.py:560
 #, python-format
 msgid "%s — repository"
 msgstr "%s — repository"
 
-#: meld/vcview.py:563
+#: meld/vcview.py:566
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (corrente, repository)"
 
-#: meld/vcview.py:567
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (repository, corrente)"
 
-#: meld/vcview.py:729
+#: meld/vcview.py:735
 msgid "Remove folder and all its files?"
 msgstr "Rimuovere la cartella e tutti i suoi file?"
 
-#: meld/vcview.py:731
+#: meld/vcview.py:737
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2381,6 +2435,6 @@ msgstr ""
 "Verranno rimossi dal controllo di versione tutti i file selezionati, le "
 "cartelle selezionate e tutti i file al loro interno."
 
-#: meld/vcview.py:844
+#: meld/vcview.py:850
 msgid "Clear"
 msgstr "Pulisci"

From 90f2273dbd34c9ab8e303aba36940c0b70abd56e Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 19 Mar 2022 09:10:28 +1000
Subject: [PATCH 075/116] filediff: Update syncpoint dynamic menu population

---
 meld/filediff.py                    | 77 +++++++++++++++--------------
 meld/resources/ui/filediff-menus.ui |  8 ---
 2 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/meld/filediff.py b/meld/filediff.py
index 8b79d9dd..14f95d6f 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -44,6 +44,7 @@
     BufferLines,
 )
 from meld.melddoc import ComparisonState, MeldDoc, open_files_external
+from meld.menuhelpers import replace_menu_section
 from meld.misc import user_critical, with_focused_pane
 from meld.patchdialog import PatchDialog
 from meld.recent import RecentType
@@ -222,8 +223,6 @@ class FileDiff(Gtk.VBox, MeldDoc):
         default=False,
     )
 
-    ADD_SYNCPOINT_OFFSET = 10
-
     def __init__(
         self,
         num_panes,
@@ -367,22 +366,10 @@ def get_mark_line(pane, mark):
 
         builder = Gtk.Builder.new_from_resource(
             '/org/gnome/meld/ui/filediff-menus.ui')
-        context_menu = builder.get_object('filediff-context-menu')
-        self.popup_menu = Gtk.Menu.new_from_model(context_menu)
+        self.popup_menu_model = builder.get_object('filediff-context-menu')
+        self.popup_menu = Gtk.Menu.new_from_model(self.popup_menu_model)
         self.popup_menu.attach_to_widget(self)
 
-        popup_options = self.popup_menu.get_children()
-
-        offset = FileDiff.ADD_SYNCPOINT_OFFSET
-        self.add_sync_point_opt = popup_options[offset]
-        self.move_sync_point_opt = popup_options[offset + 1]
-        self.match_sync_point_opt = popup_options[offset + 2]
-        self.remove_sync_point_opt = popup_options[offset + 3]
-
-        self.popup_menu.remove(self.move_sync_point_opt)
-        self.popup_menu.remove(self.match_sync_point_opt)
-        self.popup_menu.remove(self.remove_sync_point_opt)
-
         builder = Gtk.Builder.new_from_resource(
             '/org/gnome/meld/ui/filediff-actions.ui')
         self.toolbar_actions = builder.get_object('view-toolbar')
@@ -1437,34 +1424,50 @@ def syncpoint_action(self):
             return self._syncpoint_action(self.textview.index(self.focus_pane))
 
     def set_syncpoint_menuitem(self, pane):
-        action = self._syncpoint_action(pane)
+        menu_actions = {
+            SyncpointState.CAN_ADD: [
+                _("Add Synchronization Point"),
+                "view.add-sync-point"
+            ],
+            SyncpointState.CAN_DELETE: [
+                _("Remove Synchronization Point"),
+                "view.remove-sync-point"
+            ],
+            SyncpointState.CAN_MOVE: [
+                _("Move Synchronization Point"),
+                "view.add-sync-point"
+            ],
+            SyncpointState.CAN_MATCH: [
+                _("Match Synchronization Point"),
+                "view.add-sync-point"
+            ],
+            SyncpointState.DISABLED: [
+                _("Add Synchronization Point"),
+                "view.add-sync-point"
+            ],
+        }
 
-        popup_options = self.popup_menu.get_children()
-        current_option = popup_options[FileDiff.ADD_SYNCPOINT_OFFSET]
-        next_option = None
-
-        if action == SyncpointState.CAN_ADD:
-            next_option = self.add_sync_point_opt
-        elif action == SyncpointState.CAN_MATCH:
-            next_option = self.match_sync_point_opt
-        elif action == SyncpointState.CAN_DELETE:
-            next_option = self.remove_sync_point_opt
-        elif action == SyncpointState.CAN_MOVE:
-            next_option = self.move_sync_point_opt
-        elif action is SyncpointState.DISABLED:
-            next_option = self.move_sync_point_opt
+        action = self._syncpoint_action(pane)
 
         self.set_action_enabled(
             "add-sync-point",
             action != SyncpointState.DISABLED
         )
 
-        if next_option is not current_option:
-            self.popup_menu.insert(
-                next_option,
-                FileDiff.ADD_SYNCPOINT_OFFSET + 1
-            )
-            self.popup_menu.remove(current_option)
+        label, action_id = menu_actions[action]
+
+        syncpoint_menu = Gio.Menu()
+        syncpoint_menu.append(label=label, detailed_action=action_id)
+        syncpoint_menu.append(
+            label=_("Clear Synchronization Points"),
+            detailed_action='view.clear-sync-point',
+        )
+        section = Gio.MenuItem.new_section(None, syncpoint_menu)
+        section.set_attribute([("id", "s", "syncpoint-section")])
+        replace_menu_section(self.popup_menu_model, section)
+
+        self.popup_menu = Gtk.Menu.new_from_model(self.popup_menu_model)
+        self.popup_menu.attach_to_widget(self)
 
     def _syncpoint_action(self, pane):
         def get_mark():
diff --git a/meld/resources/ui/filediff-menus.ui b/meld/resources/ui/filediff-menus.ui
index bc1fb3cc..00693ed0 100644
--- a/meld/resources/ui/filediff-menus.ui
+++ b/meld/resources/ui/filediff-menus.ui
@@ -65,14 +65,6 @@
         <attribute name="label" translatable="yes">Add Synchronization Point</attribute>
         <attribute name="action">view.add-sync-point</attribute>
       </item>
-      <item>
-        <attribute name="label" translatable="yes">Move Synchronization Point</attribute>
-        <attribute name="action">view.add-sync-point</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Match Synchronization Point</attribute>
-        <attribute name="action">view.add-sync-point</attribute>
-      </item>
       <item>
         <attribute name="label" translatable="yes">Remove Synchronization Point</attribute>
         <attribute name="action">view.remove-sync-point</attribute>

From 6af21aea1a6144d91b6759d12f7132364cf3c622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emin=20Tufan=20=C3=87etin?= <etcetin@gmail.com>
Date: Sun, 20 Mar 2022 19:29:32 +0000
Subject: [PATCH 076/116] Update Turkish translation

---
 po/tr.po | 217 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 116 insertions(+), 101 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index 76530bcc..997c66ac 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,16 +12,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-10-08 21:01+0000\n"
-"PO-Revision-Date: 2021-12-17 18:09+0300\n"
+"POT-Creation-Date: 2022-03-15 12:52+0000\n"
+"PO-Revision-Date: 2022-03-20 22:28+0300\n"
 "Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: Gtranslator 41.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.4.3\n"
 "X-POOTLE-MTIME: 1428188634.000000\n"
 "X-DL-Team: tr\n"
 "X-DL-Module: meld\n"
@@ -865,7 +865,7 @@ msgstr "Aynı"
 msgid "New"
 msgstr "Yeni"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Değiştirilmiş"
@@ -874,19 +874,23 @@ msgstr "Değiştirilmiş"
 msgid "Ignore filename case"
 msgstr "Dosya adı büyük küçük harf durumunu yoksay"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr "Unicode yollarını normalleştir"
+
+#: meld/resources/gtk/menus.ui:175
 msgid "Normal"
 msgstr "Normal"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Sürümlendirilmemiş"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Yoksayılmış"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:190
 msgid "Flatten folders"
 msgstr "Klasörleri düzleştir"
 
@@ -902,11 +906,11 @@ msgstr ""
 #: meld/resources/ui/about-dialog.ui:14
 msgid "translator-credits"
 msgstr ""
-"Özgür Sarıer <ozgursarier1011601115@gmail.com>\n"
-"Simge Sezgin <simgesezgin88@gmail.com>\n"
 "Muhammet Kara <muhammetk@gmail.com>\n"
 "Emin Tufan Çetin <etcetin@gmail.com>\n"
-"Sabri Ünal <libreajans@gmail.com>"
+"Sabri Ünal <libreajans@gmail.com>\n"
+"Özgür Sarıer <ozgursarier1011601115@gmail.com>\n"
+"Simge Sezgin <simgesezgin88@gmail.com>"
 
 #: meld/resources/ui/appwindow.ui:30
 msgid "Start a new comparison"
@@ -1010,51 +1014,55 @@ msgid "_Compare selected files"
 msgstr "_Seçilen dosyaları karşılaştır"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+msgid "_Mark selected file"
+msgstr "Seçili dosyayı _imle"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Compare _with marked file"
+msgstr "İmli dosya_yla karşılaştır"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "_Sola kopyala"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "Sağa _kopyala"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "_Seçileni sil"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "Özyinelemeli Daralt"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "Özyinelemeli Genişlet"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "_Dışarda Aç"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "Dosya Yollarını _Kopyala"
 
 #: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
 #: meld/resources/ui/dirdiff.ui:117
-#| msgid "Save file in this pane"
 msgid "Select folder to open in this pane"
 msgstr "Bu bölmede açılacak klasörü seç"
 
 #: meld/resources/ui/dirdiff.ui:43
-#| msgid "Folder"
 msgid "Folder 1"
 msgstr "Klasör 1"
 
 #: meld/resources/ui/dirdiff.ui:84
-#| msgid "Folder"
 msgid "Folder 2"
 msgstr "Klasör 2"
 
 #: meld/resources/ui/dirdiff.ui:125
-#| msgid "Folder"
 msgid "Folder 3"
 msgstr "Klasör 3"
 
@@ -1119,7 +1127,6 @@ msgid "Open Containing Folder"
 msgstr "İçeren Klasörü Aç"
 
 #: meld/resources/ui/filediff-menus.ui:58
-#| msgid "_Copy File Paths"
 msgid "Copy Full Path"
 msgstr "Tam Yolu Kopyala"
 
@@ -1157,7 +1164,7 @@ msgstr "Dosya 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:530
+#: meld/dirdiff.py:602
 msgid "Name"
 msgstr "Ad"
 
@@ -1197,7 +1204,7 @@ msgstr "Kaydırılmış"
 msgid "Replace _All"
 msgstr "_Tümünü Değiştir"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1092 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "_Değiştir"
 
@@ -1303,12 +1310,10 @@ msgid "Path"
 msgstr "Yol"
 
 #: meld/resources/ui/path-label.ui:62
-#| msgid "_Copy File Paths"
 msgid "Copy Path"
 msgstr "Yolu Kopyala"
 
 #: meld/resources/ui/path-label.ui:78
-#| msgid "Open File"
 msgid "Open Folder"
 msgstr "Klasör Aç"
 
@@ -1585,12 +1590,12 @@ msgstr "Eğer kaydetmezseniz, değişiklikler kalıcı olarak yitecektir."
 msgid "Close _without Saving"
 msgstr "Kaydet_meden Kapat"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1091
-#: meld/iohelpers.py:56 meld/iohelpers.py:113
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "_İptal"
 
-#: meld/resources/ui/save-confirm-dialog.ui:52
+#: meld/resources/ui/save-confirm-dialog.ui:55
 msgid "_Save"
 msgstr "_Kaydet"
 
@@ -1619,7 +1624,6 @@ msgid "Delete"
 msgstr "Sil"
 
 #: meld/resources/ui/vcview-menus.ui:37
-#| msgid "Next Conflict"
 msgid "Resolve Conflict"
 msgstr "Çakışma Çöz"
 
@@ -1632,7 +1636,6 @@ msgid "Commit…"
 msgstr "Gönder…"
 
 #: meld/resources/ui/vcview.ui:38
-#| msgid "Push current change to the left"
 msgid "Pull remote changes to the local repository"
 msgstr "Uzak değişiklikleri yerel depoya iste"
 
@@ -1657,7 +1660,6 @@ msgid "Mark as resolved in version control"
 msgstr "Sürüm denetiminde çözüldü olarak işaretle"
 
 #: meld/resources/ui/vcview.ui:140
-#| msgid "Only one version control system found in this folder"
 msgid "Open version controlled folder in this pane"
 msgstr "Bu klasörde sürüm denetimli klasör aç"
 
@@ -1698,85 +1700,95 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:551 meld/preferences.py:132
+#: meld/dirdiff.py:623 meld/preferences.py:132
 msgid "Size"
 msgstr "Boyut"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:559 meld/preferences.py:133
+#: meld/dirdiff.py:631 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Değiştirilme zamanı"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:639 meld/preferences.py:134
+msgid "Modification time (ISO)"
+msgstr "Değiştirilme zamanı (ISO)"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:567 meld/preferences.py:134
+#: meld/dirdiff.py:647 meld/preferences.py:135
 msgid "Permissions"
 msgstr "İzinler"
 
-#: meld/dirdiff.py:803 meld/dirdiff.py:827
+#: meld/dirdiff.py:900
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (taranıyor…)"
+
+#: meld/dirdiff.py:932 meld/dirdiff.py:964
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] {folder} taranıyor"
 
-#: meld/dirdiff.py:967
+#: meld/dirdiff.py:1100
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Tamamlandı"
 
-#: meld/dirdiff.py:976
+#: meld/dirdiff.py:1113
 msgid "Folder {} is being compared to itself"
 msgstr "{} klasörü kendiyle karşılaştırılıyor"
 
-#: meld/dirdiff.py:982
+#: meld/dirdiff.py:1119
 msgid "Folders have no differences"
 msgstr "Klasörlerde fark yok"
 
-#: meld/dirdiff.py:984
+#: meld/dirdiff.py:1121
 msgid "Contents of scanned files in folders are identical."
 msgstr "Klasörlerdeki taranan dosyaların içerikleri özdeş."
 
-#: meld/dirdiff.py:986
+#: meld/dirdiff.py:1123
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 "Klasördeki taranan dosyalar özdeş gözüküyor fakat içerikleri taranmadı."
 
-#: meld/dirdiff.py:989
+#: meld/dirdiff.py:1126
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Dosya süzgeçleri kullanımda, bu yüzden tüm dosyalar taranamamış."
 
-#: meld/dirdiff.py:991
+#: meld/dirdiff.py:1128
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Metin süzgeçleri kullanımda ve içerik farklılıklarını maskeleyebilir."
 
-#: meld/dirdiff.py:1007 meld/filediff.py:1907
+#: meld/dirdiff.py:1144 meld/filediff.py:1919
 msgid "Hide"
 msgstr "Gizle"
 
-#: meld/dirdiff.py:1009 meld/filediff.py:1909 meld/filediff.py:1939
-#: meld/filediff.py:1941 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1146 meld/filediff.py:1921 meld/filediff.py:1951
+#: meld/filediff.py:1953 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "Gi_zle"
 
-#: meld/dirdiff.py:1018
+#: meld/dirdiff.py:1155
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Bu klasör taranırken birçok hata oluştu"
 
-#: meld/dirdiff.py:1019
+#: meld/dirdiff.py:1156
 msgid "Files with invalid encodings found"
 msgstr "Geçersiz kodlamalı dosyalar bulundu"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1021
+#: meld/dirdiff.py:1158
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Bazı dosyalar yanlış kodlamadaydı. Adları şu biçimdedir:"
 
-#: meld/dirdiff.py:1023
+#: meld/dirdiff.py:1160
 msgid "Files hidden by case insensitive comparison"
 msgstr "Büyük küçük harf duyarsız karşılaştırmaya göre gizli dosyalar"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1025
+#: meld/dirdiff.py:1162
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1784,17 +1796,17 @@ msgstr ""
 "Büyük/küçük harf duyarlı dosya sisteminde büyük/küçük harf duyarsız "
 "karşılaştırma yapmaktasınız. Bu klasördeki bazı dosyalar gizlidir:"
 
-#: meld/dirdiff.py:1036
+#: meld/dirdiff.py:1173
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}”, “{second_file}” tarafından gizlendi"
 
-#: meld/dirdiff.py:1095
+#: meld/dirdiff.py:1235
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "“%s” klasörü değiştirilsin mi?"
 
-#: meld/dirdiff.py:1097
+#: meld/dirdiff.py:1237
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1803,11 +1815,11 @@ msgstr ""
 "“%s” içinde aynı ad ile başka klasör zaten var.\n"
 "Eğer var olan klasörü değiştirirseniz, içindeki tüm dosyalar yitecektir."
 
-#: meld/dirdiff.py:1110
+#: meld/dirdiff.py:1250
 msgid "Error copying file"
 msgstr "Dosya kopyalamada hata"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1251
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1820,11 +1832,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1136 meld/vcview.py:764
+#: meld/dirdiff.py:1276 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "{} silinirken hata"
 
-#: meld/dirdiff.py:1626
+#: meld/dirdiff.py:1819
 msgid "No folder"
 msgstr "Klasör yok"
 
@@ -1851,64 +1863,64 @@ msgstr ""
 "Eğer çakışma başarıyla çözüldüyse, o zaman çözüldü olarak "
 "işaretleyebilirsiniz."
 
-#: meld/filediff.py:1227
+#: meld/filediff.py:1228
 msgid "Cancel"
 msgstr "İptal Et"
 
-#: meld/filediff.py:1228
+#: meld/filediff.py:1229
 msgid "Mark _Resolved"
 msgstr "_Çözümlendi olarak işaretle"
 
-#: meld/filediff.py:1589
+#: meld/filediff.py:1593
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "“%s” dosyası açılırken sorun var."
 
-#: meld/filediff.py:1598
+#: meld/filediff.py:1602
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "%s dosyası ikili dosya olarak görünüyor."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1604
 msgid "Do you want to open the file using the default application?"
 msgstr "Dosyayı öntanımlı uygulamayı kullanarak açmak istiyor musunuz?"
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1606
 msgid "Open"
 msgstr "Aç"
 
-#: meld/filediff.py:1616
+#: meld/filediff.py:1628
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Dosyalar birleştiriliyor"
 
-#: meld/filediff.py:1630
+#: meld/filediff.py:1642
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Farklılıklar hesaplanıyor"
 
-#: meld/filediff.py:1690
+#: meld/filediff.py:1702
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Disk üzerindeki %s dosyası değiştirildi"
 
-#: meld/filediff.py:1691
+#: meld/filediff.py:1703
 msgid "Do you want to reload the file?"
 msgstr "Dosyayı yeniden yüklemek istiyor musunuz?"
 
-#: meld/filediff.py:1693
+#: meld/filediff.py:1705
 msgid "_Reload"
 msgstr "_Yeniden yükle"
 
-#: meld/filediff.py:1863
+#: meld/filediff.py:1875
 msgid "File {} is being compared to itself"
 msgstr "{} dosyası kendiyle karşılaştırılıyor"
 
-#: meld/filediff.py:1872
+#: meld/filediff.py:1884
 msgid "Files are identical"
 msgstr "Dosyalar özdeş"
 
-#: meld/filediff.py:1885
+#: meld/filediff.py:1897
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1916,11 +1928,11 @@ msgstr ""
 "Metin süzgeçleri kullanılmakta ve dosyalar arasındaki farklılıkları "
 "maskeliyor olabilir. Süzülmemiş dosyaları karşılaştırmak ister misiniz?"
 
-#: meld/filediff.py:1890
+#: meld/filediff.py:1902
 msgid "Files differ in line endings only"
 msgstr "Dosyalar yalnızca satır sonlarında farklılaşıyor"
 
-#: meld/filediff.py:1892
+#: meld/filediff.py:1904
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1929,15 +1941,15 @@ msgstr ""
 "Dosyalar satır sonları dışında özdeş:\n"
 "%s"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:1924
 msgid "Show without filters"
 msgstr "Süzgeçsiz göster"
 
-#: meld/filediff.py:1934
+#: meld/filediff.py:1946
 msgid "Change highlighting incomplete"
 msgstr "Vurgulama değişikliği tamamlanamadı"
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:1947
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1946,19 +1958,19 @@ msgstr ""
 "daha büyük değişiklikleri daha uzun sürede ve daha yavaş olmasına rağmen "
 "vurgulaması için zorlayabilirsiniz."
 
-#: meld/filediff.py:1943
+#: meld/filediff.py:1955
 msgid "Keep highlighting"
 msgstr "Vurgulamayı koru"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1957
 msgid "_Keep highlighting"
 msgstr "Vurgulamayı _koru"
 
-#: meld/filediff.py:1958
+#: meld/filediff.py:1970
 msgid "Saving failed"
 msgstr "Kaydetme başarısız"
 
-#: meld/filediff.py:1959
+#: meld/filediff.py:1971
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1966,36 +1978,36 @@ msgstr ""
 "Veri yitimini önlemek için lütfen önemli değişiklikleri başka programa veya "
 "dosyaya kopyalayın."
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:1980
 msgid "Save Left Pane As"
 msgstr "Sol Bölme Olarak Kaydet"
 
-#: meld/filediff.py:1970
+#: meld/filediff.py:1982
 msgid "Save Middle Pane As"
 msgstr "Orta Bölme Olarak Kaydet"
 
-#: meld/filediff.py:1972
+#: meld/filediff.py:1984
 msgid "Save Right Pane As"
 msgstr "Sağ Bölme Olarak Kaydet"
 
-#: meld/filediff.py:1983
+#: meld/filediff.py:1995
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "%s dosyası açıldığından beri diskte değişti"
 
-#: meld/filediff.py:1985
+#: meld/filediff.py:1997
 msgid "If you save it, any external changes will be lost."
 msgstr "Eğer kaydederseniz, dış değişiklikler yitecektir."
 
-#: meld/filediff.py:1988
+#: meld/filediff.py:2000
 msgid "Save Anyway"
 msgstr "Yine De Kaydet"
 
-#: meld/filediff.py:1989
+#: meld/filediff.py:2001
 msgid "Don’t Save"
 msgstr "Kaydetme"
 
-#: meld/filediff.py:2031
+#: meld/filediff.py:2043
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2003,7 +2015,7 @@ msgstr ""
 "“{}” dosyası, kendisinin şu anki “{}” kodlaması kullanılarak kodlanamayacak "
 "karakterler içeriyor."
 
-#: meld/filediff.py:2035 meld/patchdialog.py:138
+#: meld/filediff.py:2047 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2012,16 +2024,16 @@ msgstr ""
 "Şu nedenle dosya kaydedilemedi:\n"
 "%s"
 
-#: meld/filediff.py:2039 meld/patchdialog.py:137
+#: meld/filediff.py:2051 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "%s dosyası kaydedilemedi."
 
-#: meld/filediff.py:2440
+#: meld/filediff.py:2452
 msgid "Live comparison updating disabled"
 msgstr "Canlı karşılaştırma güncellemesi devre dışı bırakıldı"
 
-#: meld/filediff.py:2441
+#: meld/filediff.py:2453
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2048,16 +2060,16 @@ msgstr "“{}” çöpe konulamaz. Hemen silmek ister misiniz?"
 msgid "This remote location does not support sending items to the trash."
 msgstr "Bu uzak konum ögelerin çöpe gönderilmesini desteklemiyor."
 
-#: meld/iohelpers.py:57
+#: meld/iohelpers.py:58
 msgid "_Delete Permanently"
 msgstr "Kalıcı Olarak _Sil"
 
-#: meld/iohelpers.py:107
+#: meld/iohelpers.py:110
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "“%s” dosyası değiştirilsin mi?"
 
-#: meld/iohelpers.py:109
+#: meld/iohelpers.py:112
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2179,11 +2191,11 @@ msgstr "Dosya adı"
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Kendiliğinden birleştirme için üç dosya gerekiyor, var olan: %r"
 
-#: meld/meldwindow.py:403
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Dosya ve dizinlerin karışımı karşılaştırılamıyor"
 
-#: meld/misc.py:150
+#: meld/misc.py:154
 msgid ""
 "{}\n"
 "\n"
@@ -2195,7 +2207,7 @@ msgstr ""
 "Meld şunu çalıştırırken ciddi hatayla karşılaştı:\n"
 "<tt>{}</tt>"
 
-#: meld/misc.py:201
+#: meld/misc.py:205
 msgid "[None]"
 msgstr "[Hiçbiri]"
 
@@ -2225,7 +2237,6 @@ msgid "Plain Text"
 msgstr "Düz Metin"
 
 #: meld/ui/pathlabel.py:36
-#| msgid "Filename filters"
 msgid "Unnamed file"
 msgstr "Adsız dosya"
 
@@ -2331,6 +2342,10 @@ msgstr "Eksik"
 msgid "Not present"
 msgstr "Mevcut değil"
 
+#: meld/vc/_vc.py:82
+msgid "Scanning…"
+msgstr "Taranıyor…"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
 #: meld/vcview.py:334

From 4cc699b74428fec87e2f818dbfd39e0cc3341ed3 Mon Sep 17 00:00:00 2001
From: Helly Guo <buffoonguo@gmail.com>
Date: Tue, 22 Mar 2022 21:20:49 +0800
Subject: [PATCH 077/116] [feat]add a new feature: switch the panes - only
 supports in the two panes mode - the left pane to right and the right one to
 left

---
 meld/dirdiff.py                       |  8 ++++++++
 meld/filediff.py                      |  7 +++++++
 meld/resources/ui/dirdiff-actions.ui  | 22 ++++++++++++++++++++++
 meld/resources/ui/filediff-actions.ui | 22 ++++++++++++++++++++++
 4 files changed, 59 insertions(+)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 34dffc07..125c9810 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -497,6 +497,7 @@ def __init__(self, num_panes):
             ('folder-compare-marked', self.action_diff_marked),
             ('folder-copy-left', self.action_copy_left),
             ('folder-copy-right', self.action_copy_right),
+            ('folder-switch', self.action_switch),
             ('folder-delete', self.action_delete),
             ('folder-expand', self.action_folder_expand),
             ('next-change', self.action_next_change),
@@ -1327,6 +1328,7 @@ def update_action_sensitivity(self):
             self.set_action_enabled(
                 'folder-compare-marked',
                 self.marked is not None and self.marked.pane != pane)
+            self.set_action_enabled('folder-switch', self.num_panes == 2)
             self.set_action_enabled('folder-delete', is_valid)
             self.set_action_enabled('folder-copy-left', is_valid and pane > 0)
             self.set_action_enabled(
@@ -1579,6 +1581,12 @@ def action_copy_left(self, *args):
     def action_copy_right(self, *args):
         self.copy_selected(1)
 
+    def action_switch(self, *args):
+        folder_x = self.folders[0]
+        self.folders[0] = self.folders[1]
+        self.folders[1] = folder_x
+        self.refresh()
+
     def action_delete(self, *args):
         self.delete_selected()
 
diff --git a/meld/filediff.py b/meld/filediff.py
index 108a68b8..c6a04f46 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -351,6 +351,7 @@ def __init__(
             ('save-all', self.action_save_all),
             ('save-as', self.action_save_as),
             ('undo', self.action_undo),
+            ('file-switch', self.action_switch),
         )
         for name, callback in actions:
             action = Gio.SimpleAction.new(name, None)
@@ -725,6 +726,7 @@ def on_current_diff_changed(self, *args):
         self.set_action_enabled('file-copy-right-down', copy_right)
         self.set_action_enabled('previous-pane', pane > 0)
         self.set_action_enabled('next-pane', pane < self.num_panes - 1)
+        self.set_action_enabled('file-switch', self.num_panes == 2)
         # FIXME: don't queue_draw() on everything... just on what changed
         self.queue_draw()
 
@@ -2469,5 +2471,10 @@ def clear_sync_points(self, *args):
                 mgr.clear()
         self.refresh_comparison()
 
+    def action_switch(self, *args):
+        buffer0 = self.textbuffer[0]
+        buffer1 = self.textbuffer[1]
+        self.set_files([buffer1.data.gfile, buffer0.data.gfile])
+
 
 FileDiff.set_css_name('meld-file-diff')
diff --git a/meld/resources/ui/dirdiff-actions.ui b/meld/resources/ui/dirdiff-actions.ui
index 42028fb8..9f42ceec 100644
--- a/meld/resources/ui/dirdiff-actions.ui
+++ b/meld/resources/ui/dirdiff-actions.ui
@@ -58,6 +58,28 @@
         </child>
       </object>
     </child>
+    <child>
+      <object class="GtkButton">
+        <property name="visible">True</property>
+        <property name="action-name">view.folder-switch</property>
+        <property name="use-action-appearance">True</property>
+        <property name="tooltip-text" translatable="yes">Switch the two panes</property>
+        <property name="focus_on_click">False</property>
+        <style>
+          <class name="image-button"/>
+        </style>
+        <child>
+          <object class="GtkImage">
+            <property name="visible">True</property>
+            <property name="icon-name">system-switch-user-symbolic</property>
+            <property name="icon-size">1</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="pack-type">start</property>
+      </packing>
+    </child>
     <child>
       <object class="GtkButton">
         <property name="visible">True</property>
diff --git a/meld/resources/ui/filediff-actions.ui b/meld/resources/ui/filediff-actions.ui
index 375a1173..ce7086dd 100644
--- a/meld/resources/ui/filediff-actions.ui
+++ b/meld/resources/ui/filediff-actions.ui
@@ -58,6 +58,28 @@
         </child>
       </object>
     </child>
+    <child>
+      <object class="GtkButton">
+        <property name="visible">True</property>
+        <property name="action-name">view.file-switch</property>
+        <property name="use-action-appearance">True</property>
+        <property name="tooltip-text" translatable="yes">Switch the two panes</property>
+        <property name="focus_on_click">False</property>
+        <style>
+          <class name="image-button"/>
+        </style>
+        <child>
+          <object class="GtkImage">
+            <property name="visible">True</property>
+            <property name="icon-name">system-switch-user-symbolic</property>
+            <property name="icon-size">1</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="pack-type">start</property>
+      </packing>
+    </child>
     <child>
       <object class="GtkMenuButton" id="copy_action_button">
         <property name="visible">true</property>

From 62b932b6d00ec087ea6f1c623d098736a36ea7f5 Mon Sep 17 00:00:00 2001
From: Roberto Vidal <vidal.roberto.j@gmail.com>
Date: Tue, 22 Mar 2022 11:56:48 +0100
Subject: [PATCH 078/116] final cleanup and minor refactor

---
 help/C/syncpoints.page              |  8 +---
 meld/filediff.py                    | 62 +++++++++++++----------------
 meld/meldwindow.py                  | 18 ---------
 meld/resources/gtk/menus.ui         | 11 -----
 meld/resources/ui/appwindow.ui      |  1 -
 meld/resources/ui/filediff-menus.ui | 12 ------
 6 files changed, 29 insertions(+), 83 deletions(-)

diff --git a/help/C/syncpoints.page b/help/C/syncpoints.page
index cddf5591..34c1e4ef 100644
--- a/help/C/syncpoints.page
+++ b/help/C/syncpoints.page
@@ -20,15 +20,9 @@ Synchronization points help <app>Meld</app> perform a more fine-grained comparis
 </p>
 
 <p>
-To add a synchronization point, click on a line and then right-click and select <gui style="menu">Add Synchronization Point</gui>. Repeat this with each file in your comparison and the synchronization points will match each other and TODO
+To add a synchronization point, click on a line and then right-click and select <gui style="menu">Add Synchronization Point</gui>. Repeat this with each file in your comparison: click on a line and then right-click and select <gui style="menu">Match Synchronization Point</gui>. Once every file has a synchronization point, they will match each other and the comparison will be updated to take them into account.
 </p>
 
-<note>
-  <p>
-    All actions related to synchronization points are also accessible from <gui style="menu">Comparison</gui>.
-  </p>
-</note>
-
 <p>
 You can add successive synchronization points and subdivide your files even further by repeating the steps above. Note that synchronization points are matched to each other in the order they appear in the text, which might not correspond to the order they were created.
 </p>
diff --git a/meld/filediff.py b/meld/filediff.py
index 14f95d6f..f6df519b 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1419,39 +1419,38 @@ def on_textview_button_press_event(self, textview, event):
             return True
         return False
 
-    def syncpoint_action(self):
-        if self.focus_pane:
-            return self._syncpoint_action(self.textview.index(self.focus_pane))
-
     def set_syncpoint_menuitem(self, pane):
         menu_actions = {
-            SyncpointState.CAN_ADD: [
+            SyncpointAction.ADD: [
                 _("Add Synchronization Point"),
                 "view.add-sync-point"
             ],
-            SyncpointState.CAN_DELETE: [
+            SyncpointAction.DELETE: [
                 _("Remove Synchronization Point"),
                 "view.remove-sync-point"
             ],
-            SyncpointState.CAN_MOVE: [
+            SyncpointAction.MOVE: [
                 _("Move Synchronization Point"),
                 "view.add-sync-point"
             ],
-            SyncpointState.CAN_MATCH: [
+            SyncpointAction.MATCH: [
                 _("Match Synchronization Point"),
                 "view.add-sync-point"
             ],
-            SyncpointState.DISABLED: [
+            SyncpointAction.DISABLED: [
                 _("Add Synchronization Point"),
                 "view.add-sync-point"
             ],
         }
 
-        action = self._syncpoint_action(pane)
+        def get_mark():
+            return self.textbuffer[pane].get_insert()
+
+        action = self.syncpoints.action(pane, get_mark)
 
         self.set_action_enabled(
             "add-sync-point",
-            action != SyncpointState.DISABLED
+            action != SyncpointAction.DISABLED
         )
 
         label, action_id = menu_actions[action]
@@ -1469,12 +1468,6 @@ def set_syncpoint_menuitem(self, pane):
         self.popup_menu = Gtk.Menu.new_from_model(self.popup_menu_model)
         self.popup_menu.attach_to_widget(self)
 
-    def _syncpoint_action(self, pane):
-        def get_mark():
-            return self.textbuffer[pane].get_insert()
-
-        return self.syncpoints.state(pane, get_mark)
-
     def set_labels(self, labels):
         labels = labels[:self.num_panes]
         for label, buf in zip(labels, self.textbuffer):
@@ -2548,16 +2541,17 @@ def clear_sync_points(self, *args):
 FileDiff.set_css_name('meld-file-diff')
 
 
-class SyncpointState(Enum):
-    # The state of a line when a dangling syncpoint can be moved to it
-    CAN_MOVE = "can_move"
-    # The state of a line where a dangling syncpoint sits
-    CAN_DELETE = "can_delete"
-    # The state of a line when a syncpoint can be added to match existing ones
-    CAN_MATCH = "can_match"
-    # The state of a line when a new, dangling syncpoint can be added to it
-    CAN_ADD = "can_add"
-    # The state of a line when no syncpoint action can be taken
+class SyncpointAction(Enum):
+    # A dangling syncpoint can be moved to the line
+    MOVE = "move"
+    # A dangling syncpoint sits can be remove from this line
+    DELETE = "delete"
+    # A syncpoint can be added to this line to match existing ones
+    # in other panes
+    MATCH = "match"
+    # A new, dangling syncpoint can be added to this line
+    ADD = "add"
+    # No syncpoint-related action can be taken on this line
     DISABLED = "disabled"
 
 
@@ -2633,11 +2627,11 @@ def _pane_state(self, pane_idx: int):
         else:
             return self.PaneState.DANGLING
 
-    def state(self, pane_idx: int, get_mark):
+    def action(self, pane_idx: int, get_mark):
         state = self._pane_state(pane_idx)
 
         if state == self.PaneState.SHORT:
-            return SyncpointState.CAN_MATCH
+            return SyncpointAction.MATCH
 
         target = self._comparator(pane_idx, get_mark())
 
@@ -2650,13 +2644,13 @@ def state(self, pane_idx: int, get_mark):
             )
 
             if is_syncpoint:
-                return SyncpointState.CAN_DELETE
+                return SyncpointAction.DELETE
             else:
-                return SyncpointState.CAN_ADD
+                return SyncpointAction.ADD
 
         # state == DANGLING
         if target == self._comparator(pane_idx, points[-1]):
-            return SyncpointState.CAN_DELETE
+            return SyncpointAction.DELETE
 
         is_syncpoint = any(
             self._comparator(pane_idx, point) == target
@@ -2664,9 +2658,9 @@ def state(self, pane_idx: int, get_mark):
         )
 
         if is_syncpoint:
-            return SyncpointState.DISABLED
+            return SyncpointAction.DISABLED
         else:
-            return SyncpointState.CAN_MOVE
+            return SyncpointAction.MOVE
 
     class PaneState(Enum):
         # The state of a pane with all its syncpoints matched
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index e9d30dd1..49c04ee3 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -363,24 +363,6 @@ def append_dirdiff(
             doc.scheduler.add_task(doc.auto_compare)
         return doc
 
-    @Gtk.Template.Callback()
-    def on_gear_popup_menu(self, menubutton):
-        if not menubutton.get_active():
-            return
-
-        current_page_idx = self.notebook.get_current_page()
-
-        if current_page_idx == -1:
-            return
-
-        page = self.notebook.get_nth_page(current_page_idx)
-
-        if not isinstance(page, FileDiff):
-            return
-
-        # TODO: recompute menu items
-        # action = page.syncpoint_action()
-
     def append_filediff(
             self, gfiles, *, encodings=None, merge_output=None, meta=None):
         assert len(gfiles) in (1, 2, 3)
diff --git a/meld/resources/gtk/menus.ui b/meld/resources/gtk/menus.ui
index 992f67c1..75dacf95 100644
--- a/meld/resources/gtk/menus.ui
+++ b/meld/resources/gtk/menus.ui
@@ -86,17 +86,6 @@
             <attribute name="action">view.merge-all</attribute>
           </item>
         </section>
-        <section>
-          <attribute name="id">synchronisation-section</attribute>
-          <item>
-            <attribute name="label" translatable="yes">Add Synchronization Point</attribute>
-            <attribute name="action">view.add-sync-point</attribute>
-          </item>
-          <item>
-            <attribute name="label" translatable="yes">Clear Synchronization Points</attribute>
-            <attribute name="action">view.clear-sync-point</attribute>
-          </item>
-        </section>
         <section>
           <attribute name="id">tool-section</attribute>
           <item>
diff --git a/meld/resources/ui/appwindow.ui b/meld/resources/ui/appwindow.ui
index 7b952f54..6717a3ff 100644
--- a/meld/resources/ui/appwindow.ui
+++ b/meld/resources/ui/appwindow.ui
@@ -172,7 +172,6 @@
             <property name="action-name">win.gear-menu</property>
             <property name="visible">true</property>
             <property name="can_focus">False</property>
-            <signal name="toggled" handler="on_gear_popup_menu"></signal>
             <child>
               <object class="GtkImage">
                 <property name="icon-name">open-menu-symbolic</property>
diff --git a/meld/resources/ui/filediff-menus.ui b/meld/resources/ui/filediff-menus.ui
index 00693ed0..ec1500bf 100644
--- a/meld/resources/ui/filediff-menus.ui
+++ b/meld/resources/ui/filediff-menus.ui
@@ -61,18 +61,6 @@
     </section>
     <section>
       <attribute name="id">syncpoint-section</attribute>
-      <item>
-        <attribute name="label" translatable="yes">Add Synchronization Point</attribute>
-        <attribute name="action">view.add-sync-point</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Remove Synchronization Point</attribute>
-        <attribute name="action">view.remove-sync-point</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Clear Synchronization Points</attribute>
-        <attribute name="action">view.clear-sync-point</attribute>
-      </item>
     </section>
   </menu>
 </interface>

From d087e579ba07e782486f39906f9b1d686b6df708 Mon Sep 17 00:00:00 2001
From: Kjell Cato Heskjestad <cato@heskjestad.xyz>
Date: Wed, 23 Mar 2022 14:39:29 +0000
Subject: [PATCH 079/116] =?UTF-8?q?Update=20Norwegian=20Bokm=C3=A5l=20tran?=
 =?UTF-8?q?slation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 po/nb.po | 2587 +++++++++++++++++++++++++-----------------------------
 1 file changed, 1190 insertions(+), 1397 deletions(-)

diff --git a/po/nb.po b/po/nb.po
index 3b2d9ac8..43b3c0a0 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2019-09-24 19:00+0000\n"
-"PO-Revision-Date: 2019-10-15 16:57+0200\n"
+"POT-Creation-Date: 2019-10-12 06:50+0000\n"
+"PO-Revision-Date: 2019-10-13 11:59+0200\n"
 "Last-Translator: Kjell Cato Heskjestad <cato@heskjestad.xyz>\n"
 "Language-Team: Norwegian/Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
@@ -17,16 +17,16 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2.1\n"
 
-#: ../bin/meld:194
+#: bin/meld:194
 msgid "Cannot import: "
 msgstr "Kan ikke importere: "
 
-#: ../bin/meld:197
+#: bin/meld:197
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld krever %s eller høyere."
 
-#: ../bin/meld:243
+#: bin/meld:276
 #, c-format
 msgid ""
 "Couldn’t load Meld-specific CSS (%s)\n"
@@ -35,30 +35,25 @@ msgstr ""
 "Klarte ikke laste Meld-spesifikk CSS (%s)\n"
 "%s"
 
-#: ../data/org.gnome.meld.desktop.in.h:1
-#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1
+#: data/org.gnome.meld.desktop.in:3 data/org.gnome.meld.appdata.xml.in:8
+#: meld/resources/ui/appwindow.ui:9
 msgid "Meld"
 msgstr "Meld"
 
-#: ../data/org.gnome.meld.desktop.in.h:2
+#: data/org.gnome.meld.desktop.in:4
 msgid "Diff Viewer"
 msgstr "Vis forskjeller"
 
-#: ../data/org.gnome.meld.desktop.in.h:3
-msgid "Meld Diff Viewer"
-msgstr "Meld: visning av forskjeller"
-
-#: ../data/org.gnome.meld.desktop.in.h:4
-#: ../data/org.gnome.meld.appdata.xml.in.h:2
+#: data/org.gnome.meld.desktop.in:5 data/org.gnome.meld.appdata.xml.in:9
 msgid "Compare and merge your files"
 msgstr "Sammenligne og flett sammen dine filer"
 
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: ../data/org.gnome.meld.desktop.in.h:6
+#: data/org.gnome.meld.desktop.in:7
 msgid "diff;merge;"
 msgstr "forskjell;flett;"
 
-#: ../data/org.gnome.meld.appdata.xml.in.h:3
+#: data/org.gnome.meld.appdata.xml.in:11
 msgid ""
 "Meld is a visual diff and merge tool targeted at developers. Meld helps you "
 "compare files, directories, and version controlled projects. It provides "
@@ -70,7 +65,7 @@ msgstr ""
 "tilbyr to- og treveissammenligninger av både filer og mapper, og støtter "
 "mange versjonskontrollsystemer, bl.a. Git, Mercurial, Bazaar og Subversion."
 
-#: ../data/org.gnome.meld.appdata.xml.in.h:4
+#: data/org.gnome.meld.appdata.xml.in:18
 msgid ""
 "Meld helps you review code changes, understand patches, and makes enormous "
 "merge conflicts slightly less painful."
@@ -78,51 +73,35 @@ msgstr ""
 "Meld lar deg gjennomgå kodeforandringer, oppdateringsfiler («patcher») og "
 "gjør svære flettekonflikter litt lettere."
 
-#: ../data/org.gnome.meld.appdata.xml.in.h:5
+#: data/org.gnome.meld.appdata.xml.in:48
 msgid "The GNOME Project"
 msgstr "GNOME-prosjektet"
 
-#: ../data/mime/org.gnome.meld.xml.in.h:1
+#: data/mime/org.gnome.meld.xml.in:4
 msgid "Meld comparison description"
 msgstr "Meld sammenligningsbeskrivelse"
 
-#: ../data/org.gnome.meld.gschema.xml.h:1
+#: data/org.gnome.meld.gschema.xml:37
 msgid "Default window width"
 msgstr "Vinduets standardbredde"
 
-#: ../data/org.gnome.meld.gschema.xml.h:2
+#: data/org.gnome.meld.gschema.xml:41
 msgid "Default window height"
 msgstr "Vinduets standardhøyde"
 
-#: ../data/org.gnome.meld.gschema.xml.h:3
+#: data/org.gnome.meld.gschema.xml:45
 msgid "Default window maximised state"
 msgstr "Er vinduet maksimert som standard"
 
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: data/org.gnome.meld.gschema.xml:49
 msgid "Default window fullscreen state"
 msgstr "Er vinduet i fullskjermmodus som standard"
 
-#: ../data/org.gnome.meld.gschema.xml.h:5
-msgid "Show toolbar"
-msgstr "Vis verktøylinja"
-
-#: ../data/org.gnome.meld.gschema.xml.h:6
-msgid "If true, the window toolbar is visible."
-msgstr "Hvis sann så vil verktøyslinja være synlig."
-
-#: ../data/org.gnome.meld.gschema.xml.h:7
-msgid "Show statusbar"
-msgstr "Vis statuslinje"
-
-#: ../data/org.gnome.meld.gschema.xml.h:8
-msgid "If true, the window statusbar is visible."
-msgstr "Hvis sann så vil vinduets statuslinje være synlig."
-
-#: ../data/org.gnome.meld.gschema.xml.h:9
+#: data/org.gnome.meld.gschema.xml:58
 msgid "Additional automatically detected text encodings"
 msgstr "Flere automatisk gjenkjente tegnkodinger"
 
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: data/org.gnome.meld.gschema.xml:59
 msgid ""
 "Meld will use these text encodings to try to decode loaded text files before "
 "trying any other encodings. In addition to the encodings in this list, UTF-8 "
@@ -134,35 +113,35 @@ msgstr ""
 "så vil alltid UTF-8 og tegnkodingen til gjeldende regionaltilpasning kunne "
 "brukes. Andre tegnkodinger vil kunne forsøkes avhengig av brukerens region."
 
-#: ../data/org.gnome.meld.gschema.xml.h:11
+#: data/org.gnome.meld.gschema.xml:66
 msgid "Width of an indentation step"
 msgstr "Innrykksbredde"
 
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: data/org.gnome.meld.gschema.xml:67
 msgid "The number of spaces to use for a single indent step"
 msgstr "Antall mellomrom i et enkelt innrykk"
 
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: data/org.gnome.meld.gschema.xml:71
 msgid "Whether to indent using spaces or tabs"
 msgstr "Om innrykket består av mellomrom eller tabulatortegn"
 
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: data/org.gnome.meld.gschema.xml:72
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr "Hvis sann så vil nye innrykk bruke mellomrom istedenfor tabulatortegn."
 
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: data/org.gnome.meld.gschema.xml:76 meld/resources/ui/statusbar-menu.ui:5
 msgid "Show line numbers"
 msgstr "Vis linjenummer"
 
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: data/org.gnome.meld.gschema.xml:77
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr "Velg for å vise linjenummer i filsammenligninger."
 
-#: ../data/org.gnome.meld.gschema.xml.h:17
+#: data/org.gnome.meld.gschema.xml:81
 msgid "Highlight syntax"
 msgstr "Syntaksmerking"
 
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: data/org.gnome.meld.gschema.xml:82
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld’s own color "
 "highlighting, this is off by default."
@@ -170,31 +149,31 @@ msgstr ""
 "Velg for å bruke fargekodet syntaksmerking i sammenligninger. Dette er slått "
 "av som standard fordi Meld bruker sin egen utheving med farger."
 
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: data/org.gnome.meld.gschema.xml:86
 msgid "Color scheme to use for syntax highlighting"
 msgstr "Fargeskjema for syntaksmerking"
 
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: data/org.gnome.meld.gschema.xml:87
 msgid "Used by GtkSourceView to determine colors for syntax highlighting"
 msgstr "Brukes av GtkSourceView til å bestemme farger for syntaksmerking"
 
-#: ../data/org.gnome.meld.gschema.xml.h:21
-msgid "Displayed whitespace"
-msgstr "Blanktegn som vises"
+#: data/org.gnome.meld.gschema.xml:91
+msgid "Draw whitespace"
+msgstr "Tegn blanktegn"
 
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: data/org.gnome.meld.gschema.xml:92
 msgid ""
-"Selector for individual whitespace character types to be shown. Possible "
-"values are 'space', 'tab', 'newline' and 'nbsp'."
+"If true, whitespace characters will be drawn in comparisons even if they are "
+"not in a changed area."
 msgstr ""
-"Utvalg av typer blanktegn som vises. Mulige verdier er «space», «tab», "
-"«newline» og «nbsp»."
+"Velg for å tegne blanktegn i sammenligninger selv om de ikke er i et område "
+"som er endret."
 
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: data/org.gnome.meld.gschema.xml:101
 msgid "Wrap mode"
 msgstr "Type linjebryting"
 
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: data/org.gnome.meld.gschema.xml:102
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
@@ -203,32 +182,32 @@ msgstr ""
 "Linjer i filsammenligninger vil brytes i henhold til denne innstillingen. "
 "Enten ikke i det hele tatt, i et vilkårlig tegn, eller kun i slutten av ord."
 
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
 msgid "Highlight current line"
 msgstr "Uthev gjeldende linje"
 
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: data/org.gnome.meld.gschema.xml:110
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr "Velg for å utheve linja med skrivemerket i filsammenligninger."
 
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: data/org.gnome.meld.gschema.xml:114
 msgid "Use the system default monospace font"
 msgstr "Bruk systemets skrift med fast bredde"
 
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: data/org.gnome.meld.gschema.xml:115
 msgid ""
 "If false, custom-font will be used instead of the system monospace font."
 msgstr ""
 "Fravelg for å bruke en selvvalgt skrift istedenfor systemets skrift med fast "
 "bredde."
 
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: data/org.gnome.meld.gschema.xml:119
 msgid "Custom font"
 msgstr "Tilpasset skrift"
 
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: data/org.gnome.meld.gschema.xml:120
 msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
@@ -236,20 +215,39 @@ msgstr ""
 "Den selvvalgte skriften som skal brukes. Lagres og tolkes som en tekststreng "
 "i Pango-format."
 
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: data/org.gnome.meld.gschema.xml:126
+msgid "Show overview source map"
+msgstr "Vis oversiktsstolpe"
+
+#: data/org.gnome.meld.gschema.xml:127
+msgid ""
+"If true, file comparisons will have paired source maps for compared files."
+msgstr ""
+"Hvis sann så vil filsammenligninger vise to fargekodede stolper som "
+"illustrerer forskjeller og likheter mellom filene."
+
+#: data/org.gnome.meld.gschema.xml:132
+msgid "Style of overview map"
+msgstr "Oversiktsstolpens stil"
+
+#: data/org.gnome.meld.gschema.xml:133
+msgid "Style options for how the overview map is displayed."
+msgstr "Velg hvordan oversiktsstolpen skal vises."
+
+#: data/org.gnome.meld.gschema.xml:139
 msgid "Ignore blank lines when comparing files"
 msgstr "Hopp over tomme linjer når filer sammenlignes"
 
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: data/org.gnome.meld.gschema.xml:140
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr "Velg for å fjerne tomme linjer når endringer mellom filene utheves."
 
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: data/org.gnome.meld.gschema.xml:147
 msgid "Use the system default editor"
 msgstr "Bruk systemets forvalgte redigeringsprogram"
 
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: data/org.gnome.meld.gschema.xml:148
 msgid ""
 "If false, custom-editor-command will be used instead of the system editor "
 "when opening files externally."
@@ -257,11 +255,11 @@ msgstr ""
 "Fravelg for å bruke en tilpasset redigeringskommando istedenfor systemets "
 "forvalgte redigeringsprogram når filer åpnes eksternt."
 
-#: ../data/org.gnome.meld.gschema.xml.h:35
+#: data/org.gnome.meld.gschema.xml:152
 msgid "The custom editor launch command"
 msgstr "Kommando som starter det selvvalgte redigeringsprogrammet"
 
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: data/org.gnome.meld.gschema.xml:153
 msgid ""
 "The command used to launch a custom editor. Some limited templating is "
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
@@ -269,22 +267,22 @@ msgstr ""
 "Kommandoen som starter det selvvalgte redigeringsprogrammet. Symbolene "
 "«{file}» og «{line}» vil erstattes med riktig verdi."
 
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: data/org.gnome.meld.gschema.xml:159
 msgid "Columns to display"
 msgstr "Vis disse kolonnene"
 
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: data/org.gnome.meld.gschema.xml:160
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
 msgstr ""
 "Liste med kolonnenavn i mappesammenligninger og hvorvidt de skal vises."
 
-#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25
+#: data/org.gnome.meld.gschema.xml:164 meld/resources/ui/preferences.ui:935
 msgid "Ignore symbolic links"
 msgstr "Ignorer symbolske lenker"
 
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: data/org.gnome.meld.gschema.xml:165
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
@@ -292,11 +290,11 @@ msgstr ""
 "Velg for å ikke følge symbolske lenker når mappetreet gjennomsøkes i "
 "mappesammenligninger."
 
-#: ../data/org.gnome.meld.gschema.xml.h:41
+#: data/org.gnome.meld.gschema.xml:169
 msgid "Use shallow comparison"
 msgstr "Bruk grunn sammenligning"
 
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: data/org.gnome.meld.gschema.xml:170
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
@@ -305,11 +303,11 @@ msgstr ""
 "Velg for å sjekke kun størrelse og «mtime» når mapper sammenlignes. Filer er "
 "like hvis størrelse og «mtime» er like, ellers er de forskjellige."
 
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: data/org.gnome.meld.gschema.xml:174
 msgid "File timestamp resolution"
 msgstr "Oppløsning til filenes tidsstempler"
 
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: data/org.gnome.meld.gschema.xml:175
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
 "between two files before they’re considered to have different mtimes. This "
@@ -321,11 +319,11 @@ msgstr ""
 "Dette er nyttig når en sammenligner filer mellom filsystemer som har ulik "
 "oppløsning for tidsstempel."
 
-#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22
+#: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
 msgid "Apply text filters during folder comparisons"
 msgstr "Bruk tekstfiltre når mapper sammenlignes"
 
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: data/org.gnome.meld.gschema.xml:180
 msgid ""
 "If true, folder comparisons that compare file contents also apply active "
 "text filters and the blank line trimming option, and ignore newline "
@@ -335,21 +333,21 @@ msgstr ""
 "aktive tekstfiltre, b) fjerne tomme linjer og c) se bort fra forskjell i "
 "linjeavslutninger."
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: data/org.gnome.meld.gschema.xml:184
 msgid "File status filters"
 msgstr "Filtre for filstatus"
 
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: data/org.gnome.meld.gschema.xml:185
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 "Liste med statuser som brukes til å filtrere synlige filer når mapper "
 "sammenlignes."
 
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: data/org.gnome.meld.gschema.xml:191
 msgid "Show the version control console output"
 msgstr "Vis versjonskontrollens konsollutdata"
 
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: data/org.gnome.meld.gschema.xml:192
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
@@ -357,11 +355,11 @@ msgstr ""
 "Hvis sann så vil konsollutdata vises i versjonskontrollmodus. Her vil "
 "kommandoene som kjøres for versjonskontrollering vises."
 
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: data/org.gnome.meld.gschema.xml:196
 msgid "Version control pane position"
 msgstr "Posisjonen til versjonskontrollruta"
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: data/org.gnome.meld.gschema.xml:197
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
@@ -369,11 +367,11 @@ msgstr ""
 "Dette er høyden til hovedtreet for versjonskontrollering når konsollruta "
 "vises."
 
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: data/org.gnome.meld.gschema.xml:201
 msgid "Present version comparisons as left-local/right-remote"
 msgstr "Vis versjonssammenligninger som venstre-lokal/høyre-ekstern"
 
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: data/org.gnome.meld.gschema.xml:202
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
@@ -383,11 +381,11 @@ msgstr ""
 "er-lokal og høyre-er-ekstern. Ellers vil rekkefølgen være venstre-er deres, "
 "høyre-er-mitt."
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: data/org.gnome.meld.gschema.xml:206
 msgid "Order for files in three-way version control merge comparisons"
 msgstr "Filrekkefølge i flettesammenligninger i treveis-versjonskontrollering"
 
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: data/org.gnome.meld.gschema.xml:207
 msgid ""
 "Choices for file order are remote/merged/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
@@ -398,11 +396,11 @@ msgstr ""
 "fra versjonskontrollvisningen, så den brukes kun til sammenfletting/"
 "konfliktløsing i Meld."
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: data/org.gnome.meld.gschema.xml:211
 msgid "Show margin in commit message editor"
 msgstr "Vis margen i redigeringsboksen for innleggingsmeldinger"
 
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: data/org.gnome.meld.gschema.xml:212
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
@@ -410,11 +408,11 @@ msgstr ""
 "Hvis sann så vil en hjelpelinje vise i hvilken kolonne margen er i "
 "redigeringsboksen for innleggingsmeldinger til versjonskontrollen."
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: data/org.gnome.meld.gschema.xml:216
 msgid "Margin column in commit message editor"
 msgstr "Margkolonne i redigeringsboks for innleggingsmeldinger"
 
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: data/org.gnome.meld.gschema.xml:217
 msgid ""
 "The column at which to show the margin in the version control commit message "
 "editor."
@@ -422,11 +420,11 @@ msgstr ""
 "Den kolonnen som margen skal vises i redigeringsboksen til "
 "innleggingsmeldinger."
 
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: data/org.gnome.meld.gschema.xml:221
 msgid "Automatically hard-wrap commit messages"
 msgstr "Bryt automatisk tekst i innleggingsmeldinger"
 
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: data/org.gnome.meld.gschema.xml:222
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the commit margin before commit."
@@ -434,22 +432,22 @@ msgstr ""
 "Hvis sann så vil redigeringsboksen til innleggingsmeldinger sette inn "
 "linjeskift i margen før innlegging."
 
-#: ../data/org.gnome.meld.gschema.xml.h:63
+#: data/org.gnome.meld.gschema.xml:226
 msgid "Version control status filters"
 msgstr "Statusfiltre til versjonskontroll"
 
-#: ../data/org.gnome.meld.gschema.xml.h:64
+#: data/org.gnome.meld.gschema.xml:227
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 "En liste med statuser som brukes til å filtrere synlige filer i "
 "versjonskontrollsammenligninger."
 
-#: ../data/org.gnome.meld.gschema.xml.h:65
+#: data/org.gnome.meld.gschema.xml:241
 msgid "Filename-based filters"
 msgstr "Filnavnbaserte filtre"
 
-#: ../data/org.gnome.meld.gschema.xml.h:66
+#: data/org.gnome.meld.gschema.xml:242
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
@@ -457,11 +455,11 @@ msgstr ""
 "En liste med forhåndsvalgte filnavnbaserte filtre. Hvis de slås på så vil de "
 "fjerne samsvarende filer fra en mappesammenligning."
 
-#: ../data/org.gnome.meld.gschema.xml.h:67
+#: data/org.gnome.meld.gschema.xml:256
 msgid "Text-based filters"
 msgstr "Tekstbaserte filtre"
 
-#: ../data/org.gnome.meld.gschema.xml.h:68
+#: data/org.gnome.meld.gschema.xml:257
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
@@ -471,413 +469,611 @@ msgstr ""
 "vil de utelate tekst fra filsammenligninger. Teksten vil fortsatt vises, men "
 "vil ikke bidra til selve sammenligningen."
 
-#: ../data/styles/meld-base.xml.h:1
-msgid "Meld base scheme"
-msgstr "Meld grunnleggende skjema"
+#: data/styles/meld-base.style-scheme.xml.in:1
+msgid "Classic (Meld)"
+msgstr "Klassisk (Meld)"
 
-#: ../data/styles/meld-base.xml.h:2
+#: data/styles/meld-base.style-scheme.xml.in:3
 msgid "Base color scheme for Meld highlighting"
 msgstr "Grunnleggende fargeskjema for Melds uthevinger"
 
-#: ../data/styles/meld-dark.xml.h:1
+#: data/styles/meld-dark.style-scheme.xml.in:1
 msgid "Meld dark scheme"
 msgstr "Meld mørkt skjema"
 
-#: ../data/styles/meld-dark.xml.h:2
+#: data/styles/meld-dark.style-scheme.xml.in:3
 msgid "Dark color scheme for Meld highlighting"
 msgstr "Mørkt fargeskjema for Melds uthevinger"
 
-#: ../data/ui/application.ui.h:1
-msgid "About Meld"
-msgstr "Om Meld"
+#: meld/resources/gtk/help-overlay.ui:14
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Generelt"
 
-#: ../data/ui/application.ui.h:2
-msgid ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
-msgstr ""
-"Opphavsrett © 2002-2009 Stephen Kennedy\n"
-"Opphavsrett © 2009-2017 Kai Willadsen"
+#: meld/resources/gtk/help-overlay.ui:19
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr "Ny sammenligning"
 
-#: ../data/ui/application.ui.h:4
-msgid "Website"
-msgstr "Nettside"
+#: meld/resources/gtk/help-overlay.ui:26
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "Lukk en sammenligning"
 
-#: ../data/ui/application.ui.h:5
-msgid "translator-credits"
-msgstr ""
-"Kjartan Maraas <kmaraas@gnome.org> 2001-2012\n"
-"Kjell Cato Heskjestad <cato@heskjestad.xyz> 2019"
+#: meld/resources/gtk/help-overlay.ui:33
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Avslutt Meld"
 
-#: ../data/ui/application.ui.h:6
-msgid "_Preferences"
-msgstr "_Innstillinger"
+#: meld/resources/gtk/help-overlay.ui:40
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "Stopp gjeldende handling"
 
-#: ../data/ui/application.ui.h:7
-msgid "_Help"
-msgstr "_Hjelp"
+#: meld/resources/gtk/help-overlay.ui:47
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr "Oppdater sammenligningen"
 
-#: ../data/ui/application.ui.h:8
-msgid "Keyboard Shortcuts"
-msgstr "Hurtigtaster"
+#: meld/resources/gtk/help-overlay.ui:54
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "Fullskjerm"
 
-#: ../data/ui/application.ui.h:9
-msgid "_About"
-msgstr "_Om"
+#: meld/resources/gtk/help-overlay.ui:63
+msgctxt "shortcut window"
+msgid "Panes"
+msgstr "Ruter"
 
-#: ../data/ui/application.ui.h:10
-msgid "_Quit"
-msgstr "_Avslutt"
+#: meld/resources/gtk/help-overlay.ui:68
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "Forrige sammenligningsrute"
 
-#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
-msgid "_Compare"
-msgstr "_Sammenlign"
+#: meld/resources/gtk/help-overlay.ui:75
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "Neste sammenligningsrute"
 
-#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
-msgid "Compare selected files"
-msgstr "Sammenlign valgte filer"
+#: meld/resources/gtk/help-overlay.ui:84
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Endringer"
 
-#: ../data/ui/dirdiff.ui.h:3
-msgid "Collapse Recursively"
-msgstr "Fold sammen rekursivt"
+#: meld/resources/gtk/help-overlay.ui:89
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Gå til forrige endring"
 
-#: ../data/ui/dirdiff.ui.h:4
-msgid "Collapse selected folder and all subfolders"
-msgstr "Fold sammen valgt mappe og alle undermapper"
+#: meld/resources/gtk/help-overlay.ui:96
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Gå til neste endring"
 
-#: ../data/ui/dirdiff.ui.h:5
-msgid "Expand Recursively"
-msgstr "Fold ut rekursivt"
+#: meld/resources/gtk/help-overlay.ui:105
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "Faner"
 
-#: ../data/ui/dirdiff.ui.h:6
-msgid "Expand selected folder and all subfolders"
-msgstr "Fold ut valgt mappe og alle undermapper"
+#: meld/resources/gtk/help-overlay.ui:110
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr "Gå til forrige fane"
 
-#: ../data/ui/dirdiff.ui.h:7
-msgid "Copy to _Left"
-msgstr "Kopier til _venstre"
+#: meld/resources/gtk/help-overlay.ui:117
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr "Gå til neste fane"
 
-#: ../data/ui/dirdiff.ui.h:8
-msgid "Copy to left"
-msgstr "Kopier til venstre"
+#: meld/resources/gtk/help-overlay.ui:124
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "Bytt til fane"
 
-#: ../data/ui/dirdiff.ui.h:9
-msgid "Copy to _Right"
-msgstr "Kopier til _høyre"
+#: meld/resources/gtk/help-overlay.ui:131
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "Flytt fane til venstre"
 
-#: ../data/ui/dirdiff.ui.h:10
-msgid "Copy to right"
-msgstr "Kopier til høyre"
+#: meld/resources/gtk/help-overlay.ui:138
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "Flytt fane til høyre"
 
-#: ../data/ui/dirdiff.ui.h:11
-msgid "Delete selected"
-msgstr "Slett valgte"
+#: meld/resources/gtk/help-overlay.ui:147
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Redigering"
 
-#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:912 ../meld/filediff.py:1499
-msgid "Hide"
-msgstr "Skjul"
+#: meld/resources/gtk/help-overlay.ui:152
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "Angre"
 
-#: ../data/ui/dirdiff.ui.h:13
-msgid "Hide selected"
-msgstr "Skjul valgte"
+#: meld/resources/gtk/help-overlay.ui:159
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "Gjør om"
 
-#: ../data/ui/dirdiff.ui.h:14
-msgid "Ignore Filename Case"
-msgstr "Ikke skill store/små bokstaver i filnavn"
+#: meld/resources/gtk/help-overlay.ui:166
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr "Klipp ut"
 
-#: ../data/ui/dirdiff.ui.h:15
-msgid ""
-"Consider differently-cased filenames that are otherwise-identical to be the "
-"same"
-msgstr ""
-"Betrakt filnavn med ulik bokstavstørrelse som ellers er identiske som samme "
-"fil"
+#: meld/resources/gtk/help-overlay.ui:173
+msgctxt "shortcut window"
+msgid "Copy"
+msgstr "Kopier"
 
-#: ../data/ui/dirdiff.ui.h:16
-msgid "Same"
-msgstr "Samme"
+#: meld/resources/gtk/help-overlay.ui:180
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr "Lim inn"
 
-#: ../data/ui/dirdiff.ui.h:17
-msgid "Show identical"
-msgstr "Vis identiske"
+#: meld/resources/gtk/help-overlay.ui:187
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "Søk"
 
-#: ../data/ui/dirdiff.ui.h:18
-msgid "New"
-msgstr "Ny"
+#: meld/resources/gtk/help-overlay.ui:194
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "Finn neste"
 
-#: ../data/ui/dirdiff.ui.h:19
-msgid "Show new"
-msgstr "Vis ny"
+#: meld/resources/gtk/help-overlay.ui:201
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "Finn forrige"
 
-#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76
-msgid "Modified"
-msgstr "Endret"
+#: meld/resources/gtk/help-overlay.ui:208
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "Erstatt"
 
-#: ../data/ui/dirdiff.ui.h:21
-msgid "Show modified"
-msgstr "Vis endret"
+#: meld/resources/gtk/help-overlay.ui:217
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr "Sammenligning av filer"
 
-#: ../data/ui/dirdiff.ui.h:22
-msgid "Filters"
-msgstr "Filtre"
+#: meld/resources/gtk/help-overlay.ui:222
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "Lagre gjeldende fil"
 
-#: ../data/ui/dirdiff.ui.h:23
-msgid "Set active filters"
-msgstr "Sett aktive filtre"
+#: meld/resources/gtk/help-overlay.ui:229
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr "Lagre gjeldende fil til ny sti"
 
-#: ../data/ui/EditableList.ui.h:1
-msgid "Editable List"
-msgstr "Redigerbar liste"
+#: meld/resources/gtk/help-overlay.ui:236
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr "Lagre alle filer i sammenligning"
 
-#: ../data/ui/EditableList.ui.h:2
-msgid "Active"
-msgstr "Aktiv"
+#: meld/resources/gtk/help-overlay.ui:243
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "Forrige konflikt"
 
-#: ../data/ui/EditableList.ui.h:3
-msgid "Column Name"
-msgstr "Kolonnenavn"
+#: meld/resources/gtk/help-overlay.ui:250
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr "Neste konflikt"
 
-#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9
-msgid "_Add"
-msgstr "_Legg til"
+#: meld/resources/gtk/help-overlay.ui:257
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr "Dytt endringen til venstre"
 
-#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:680
-msgid "_Remove"
-msgstr "Fje_rn"
+#: meld/resources/gtk/help-overlay.ui:264
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr "Dytt endringen til høyre"
 
-#: ../data/ui/EditableList.ui.h:6
-msgid "Move item up"
-msgstr "Flytt oppføring opp"
+#: meld/resources/gtk/help-overlay.ui:271
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr "Dra endring fra venstre"
 
-#: ../data/ui/EditableList.ui.h:7
-msgid "Move _Up"
-msgstr "Flytt _opp"
+#: meld/resources/gtk/help-overlay.ui:278
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr "Dra endring fra høyre"
 
-#: ../data/ui/EditableList.ui.h:8
-msgid "Move item down"
-msgstr "Flytt oppføring ned"
+#: meld/resources/gtk/help-overlay.ui:285
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "Kopier endringen ovenfor til venstre"
 
-#: ../data/ui/EditableList.ui.h:9
-msgid "Move _Down"
-msgstr "Flytt ne_d"
+#: meld/resources/gtk/help-overlay.ui:292
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "Kopier endringen nedenfor til venstre"
 
-#. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:412
-msgid "Name"
-msgstr "Navn"
+#: meld/resources/gtk/help-overlay.ui:299
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr "Kopier endringen ovenfor til høyre"
 
-#: ../data/ui/EditableList.ui.h:11
-msgid "Pattern"
-msgstr "Mønster"
+#: meld/resources/gtk/help-overlay.ui:306
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr "Kopier endringen nedenfor til høyre"
 
-#: ../data/ui/EditableList.ui.h:12
-msgid "Add new filter"
-msgstr "Legg til nytt filter"
+#: meld/resources/gtk/help-overlay.ui:313
+#: meld/resources/gtk/help-overlay.ui:341
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "Slett endring"
 
-#: ../data/ui/EditableList.ui.h:13
-msgid "Remove selected filter"
-msgstr "Fjern valgt filter"
+#: meld/resources/gtk/help-overlay.ui:322
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "Sammenligning av mapper"
 
-#: ../data/ui/encoding-selector.ui.h:1
-msgid "Search text encoding…"
-msgstr "Søk etter tegnkoding …"
+#: meld/resources/gtk/help-overlay.ui:327
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "Kopier til venstre"
 
-#: ../data/ui/filediff.ui.h:1
-msgid "Format as Patch…"
-msgstr "Formater som endringsfil …"
+#: meld/resources/gtk/help-overlay.ui:334
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr "Kopier til høyre"
 
-#: ../data/ui/filediff.ui.h:2
-msgid "Create a patch using differences between files"
-msgstr "Lag en endringsfil ut fra forskjellene mellom filene"
+#: meld/resources/gtk/help-overlay.ui:350
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr "Sammenligning av versjoner"
 
-#: ../data/ui/filediff.ui.h:3
-msgid "Save A_ll"
-msgstr "Lagre _alle"
+#: meld/resources/gtk/help-overlay.ui:355
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr "Legg inn til versjonskontroll"
 
-#: ../data/ui/filediff.ui.h:4
-msgid "Save all files in the current comparison"
-msgstr "Lagre alle filer i gjeldende sammenligning"
+#: meld/resources/gtk/help-overlay.ui:362
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr "Vis/skjul konsollutdata"
 
-#: ../data/ui/filediff.ui.h:5
-msgid "Revert files to their saved versions"
-msgstr "Tilbakestill filer til lagret versjon"
+#: meld/resources/gtk/menus.ui:7
+msgid "Refresh"
+msgstr "Oppdater"
 
-#: ../data/ui/filediff.ui.h:6
-msgid "Add Synchronization Point"
-msgstr "Legg til synkroniseringspunkt"
+#: meld/resources/gtk/menus.ui:12
+msgid "Stop"
+msgstr "Stopp"
 
-#: ../data/ui/filediff.ui.h:7
-msgid "Add a synchronization point for changes between files"
-msgstr "Legg til et synkroniseringspunkt for endringer mellom filer"
+#: meld/resources/gtk/menus.ui:17
+msgid "Fullscreen"
+msgstr "Fullskjerm"
 
-#: ../data/ui/filediff.ui.h:8
-msgid "Clear Synchronization Points"
-msgstr "Tøm synkroniseringspunkt"
+#: meld/resources/gtk/menus.ui:26
+msgid "Save As…"
+msgstr "Lagre som …"
 
-#: ../data/ui/filediff.ui.h:9
-msgid "Clear sychronization points for changes between files"
-msgstr "Tøm synkroniseringspunkt for endringer mellom filer"
+#: meld/resources/gtk/menus.ui:30
+msgid "Save A_ll"
+msgstr "Lagre _alle"
 
-#: ../data/ui/filediff.ui.h:10
-msgid "Previous Conflict"
-msgstr "Forrige konflikt"
+#: meld/resources/gtk/menus.ui:34
+msgid "Revert files…"
+msgstr "Gjenopprett filer …"
 
-#: ../data/ui/filediff.ui.h:11
-msgid "Go to the previous conflict"
-msgstr "Gå til forrige konflikt"
+#: meld/resources/gtk/menus.ui:38
+msgid "Open Externally"
+msgstr "Åpne eksternt"
 
-#: ../data/ui/filediff.ui.h:12
-msgid "Next Conflict"
-msgstr "Neste konflikt"
+#: meld/resources/gtk/menus.ui:45
+msgid "_Find…"
+msgstr "_Søk …"
 
-#: ../data/ui/filediff.ui.h:13
-msgid "Go to the next conflict"
-msgstr "Gå til neste konflikt"
+#: meld/resources/gtk/menus.ui:49
+msgid "_Replace…"
+msgstr "_Erstatt …"
 
-#: ../data/ui/filediff.ui.h:14
-msgid "Push to Left"
-msgstr "Dytt til venstre"
+#: meld/resources/gtk/menus.ui:55
+msgid "View"
+msgstr "Vis"
 
-#: ../data/ui/filediff.ui.h:15
-msgid "Push current change to the left"
-msgstr "Dytt gjeldende endring til venstre"
+#: meld/resources/gtk/menus.ui:59
+msgid "Overview Map"
+msgstr "Oversiktsstolpe"
 
-#: ../data/ui/filediff.ui.h:16
-msgid "Push to Right"
-msgstr "Dytt til høyre"
+#: meld/resources/gtk/menus.ui:63
+msgid "Version control console"
+msgstr "Versjonskontroll-konsoll"
 
-#: ../data/ui/filediff.ui.h:17
-msgid "Push current change to the right"
-msgstr "Dytt gjeldende endring til høyre"
+#: meld/resources/gtk/menus.ui:67
+msgid "Lock scrolling"
+msgstr "Lås rulling"
 
-#: ../data/ui/filediff.ui.h:18
-msgid "Pull from Left"
-msgstr "Dra fra venstre"
+#: meld/resources/gtk/menus.ui:73
+msgid "Comparison"
+msgstr "Sammenligning"
 
-#: ../data/ui/filediff.ui.h:19
-msgid "Pull change from the left"
-msgstr "Dra endring fra venstre"
+#: meld/resources/gtk/menus.ui:77
+msgid "Merge All from Left"
+msgstr "Flett alle fra venstre"
 
-#: ../data/ui/filediff.ui.h:20
-msgid "Pull from Right"
-msgstr "Dra fra høyre"
+#: meld/resources/gtk/menus.ui:81
+msgid "Merge All from Right"
+msgstr "Flett alle fra høyre"
 
-#: ../data/ui/filediff.ui.h:21
-msgid "Pull change from the right"
-msgstr "Dra endring fra høyre"
+#: meld/resources/gtk/menus.ui:85
+msgid "Merge All"
+msgstr "Flett alle"
 
-#: ../data/ui/filediff.ui.h:22
-msgid "Copy Above Left"
-msgstr "Kopier over til venstre"
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+msgid "Add Synchronization Point"
+msgstr "Legg til synkroniseringspunkt"
 
-#: ../data/ui/filediff.ui.h:23
-msgid "Copy change above the left chunk"
-msgstr "Kopier endring over det venstre stykket"
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+msgid "Clear Synchronization Points"
+msgstr "Tøm synkroniseringspunkt"
 
-#: ../data/ui/filediff.ui.h:24
-msgid "Copy Below Left"
-msgstr "Kopier under til venstre"
+#: meld/resources/gtk/menus.ui:103
+msgid "Format as Patch…"
+msgstr "Formater som endringsfil …"
 
-#: ../data/ui/filediff.ui.h:25
-msgid "Copy change below the left chunk"
-msgstr "Kopier endring under det venstre stykket"
+#: meld/resources/gtk/menus.ui:112
+msgid "_Preferences"
+msgstr "_Innstillinger"
 
-#: ../data/ui/filediff.ui.h:26
-msgid "Copy Above Right"
-msgstr "Kopier over til høyre"
+#: meld/resources/gtk/menus.ui:116
+msgid "Keyboard Shortcuts"
+msgstr "Hurtigtaster"
 
-#: ../data/ui/filediff.ui.h:27
-msgid "Copy change above the right chunk"
-msgstr "Kopier endring over det høyre stykket"
+#: meld/resources/gtk/menus.ui:120
+msgid "_Help"
+msgstr "_Hjelp"
 
-#: ../data/ui/filediff.ui.h:28
-msgid "Copy Below Right"
-msgstr "Kopier under til høyre"
+#: meld/resources/gtk/menus.ui:125
+msgid "_About Meld"
+msgstr "_Om Meld"
 
-#: ../data/ui/filediff.ui.h:29
-msgid "Copy change below the right chunk"
-msgstr "Kopier endring under det høyre stykket"
+#: meld/resources/gtk/menus.ui:138
+msgid "File status"
+msgstr "Filstatus"
 
-#: ../data/ui/filediff.ui.h:30
-msgid "Delete"
-msgstr "Slett"
+#: meld/resources/gtk/menus.ui:140
+msgid "Same"
+msgstr "Samme"
 
-#: ../data/ui/filediff.ui.h:31
-msgid "Delete change"
-msgstr "Slett endring"
+#: meld/resources/gtk/menus.ui:144
+msgid "New"
+msgstr "Ny"
 
-#: ../data/ui/filediff.ui.h:32
-msgid "Merge All from Left"
-msgstr "Flett alle fra venstre"
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/vc/_vc.py:76
+msgid "Modified"
+msgstr "Endret"
 
-#: ../data/ui/filediff.ui.h:33
-msgid "Merge all non-conflicting changes from the left"
-msgstr "Flett alle endringer uten konflikter fra venstre"
+#: meld/resources/gtk/menus.ui:158
+msgid "Ignore filename case"
+msgstr "Ikke skill store/små bokstaver i filnavn"
 
-#: ../data/ui/filediff.ui.h:34
-msgid "Merge All from Right"
-msgstr "Flett alle fra høyre"
+#: meld/resources/gtk/menus.ui:171
+msgid "Normal"
+msgstr "Normal"
 
-#: ../data/ui/filediff.ui.h:35
-msgid "Merge all non-conflicting changes from the right"
-msgstr "Flett alle endringer uten konflikter fra høyre"
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+msgid "Unversioned"
+msgstr "Ikke versjonert"
 
-#: ../data/ui/filediff.ui.h:36
-msgid "Merge All"
-msgstr "Flett alle"
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+msgid "Ignored"
+msgstr "Ignorert"
+
+#: meld/resources/gtk/menus.ui:186
+msgid "Flatten folders"
+msgstr "Forflat mapper"
+
+#: meld/resources/ui/about-dialog.ui:8
+msgid "About Meld"
+msgstr "Om Meld"
+
+#: meld/resources/ui/about-dialog.ui:12
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2017 Kai Willadsen"
+msgstr ""
+"Opphavsrett © 2002-2009 Stephen Kennedy\n"
+"Opphavsrett © 2009-2017 Kai Willadsen"
 
-#: ../data/ui/filediff.ui.h:37
-msgid "Merge all non-conflicting changes from left and right panes"
-msgstr "Flett alle endringer uten konflikter fra venstre og høyre paneler"
+#: meld/resources/ui/about-dialog.ui:15
+msgid "Website"
+msgstr "Nettside"
 
-#: ../data/ui/filediff.ui.h:38
-msgid "Previous Pane"
-msgstr "Forrige rute"
+#: meld/resources/ui/about-dialog.ui:19
+msgid "translator-credits"
+msgstr ""
+"Kjartan Maraas <kmaraas@gnome.org> 2001-2012\n"
+"Kjell Cato Heskjestad <cato@heskjestad.xyz> 2019"
 
-#: ../data/ui/filediff.ui.h:39
-msgid "Move keyboard focus to the previous document in this comparison"
-msgstr "Flytt tastaturfokus til forrige dokument i denne sammenligningen"
+#: meld/resources/ui/appwindow.ui:30
+msgid "Start a new comparison"
+msgstr "Start en ny sammenligning"
 
-#: ../data/ui/filediff.ui.h:40
-msgid "Next Pane"
-msgstr "Neste rute"
+#: meld/resources/ui/appwindow.ui:46
+msgid "Open a recent comparison"
+msgstr "Åpne en nylig sammenligning"
 
-#: ../data/ui/filediff.ui.h:41
-msgid "Move keyboard focus to the next document in this comparison"
-msgstr "Flytt tastaturfokus til neste dokument i denne sammenligningen"
+#: meld/resources/ui/appwindow.ui:74
+msgid "Go to the previous change"
+msgstr "Gå til forrige endring"
 
-#: ../data/ui/filediff.ui.h:42
-msgid "Lock Scrolling"
-msgstr "Lås rulling"
+#: meld/resources/ui/appwindow.ui:94
+msgid "Go to the next change"
+msgstr "Gå til neste endring"
 
-#: ../data/ui/filediff.ui.h:43
-msgid "Lock scrolling of all panes"
-msgstr "Lås rulling av alle panelene"
+#: meld/resources/ui/appwindow.ui:124
+msgid "Go to the previous conflict"
+msgstr "Gå til forrige konflikt"
 
-#: ../data/ui/filediff.ui.h:44
-msgid "Save changes to documents before closing?"
-msgstr "Lagre endringer i dokumentene før avslutning?"
+#: meld/resources/ui/appwindow.ui:144
+msgid "Go to the next conflict"
+msgstr "Gå til neste konflikt"
 
-#: ../data/ui/filediff.ui.h:45
-msgid "If you don’t save, changes will be permanently lost."
-msgstr "Hvis du ikke lagrer så vil endringene gå tapt."
+#: meld/resources/ui/appwindow.ui:192
+msgid "Version Filters"
+msgstr "Versjonsfiltre"
 
-#: ../data/ui/filediff.ui.h:46
-msgid "Close _without Saving"
-msgstr "Lukk _uten å lagre"
+#: meld/resources/ui/appwindow.ui:207 meld/resources/ui/preferences.ui:1456
+msgid "File Filters"
+msgstr "Filfiltre"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:993 ../meld/iohelpers.py:56
-#: ../meld/iohelpers.py:106
-msgid "_Cancel"
-msgstr "_Avbryt"
+#: meld/resources/ui/appwindow.ui:222 meld/resources/ui/preferences.ui:1641
+msgid "Text Filters"
+msgstr "Tekstfiltre"
 
-#: ../data/ui/filediff.ui.h:48
-msgid "_Save"
-msgstr "_Lagre"
+#: meld/resources/ui/column-list.ui:37 meld/resources/ui/filter-list.ui:40
+msgid "Active"
+msgstr "Aktiv"
+
+#: meld/resources/ui/column-list.ui:50
+msgid "Column Name"
+msgstr "Kolonnenavn"
+
+#: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
+#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:735
+msgid "_Remove"
+msgstr "Fje_rn"
+
+#: meld/resources/ui/column-list.ui:96 meld/resources/ui/filter-list.ui:152
+msgid "Move item up"
+msgstr "Flytt oppføring opp"
+
+#: meld/resources/ui/column-list.ui:98 meld/resources/ui/filter-list.ui:154
+msgid "Move _Up"
+msgstr "Flytt _opp"
+
+#: meld/resources/ui/column-list.ui:112 meld/resources/ui/filter-list.ui:168
+msgid "Move item down"
+msgstr "Flytt oppføring ned"
+
+#: meld/resources/ui/column-list.ui:114 meld/resources/ui/filter-list.ui:170
+msgid "Move _Down"
+msgstr "Flytt ne_d"
+
+#: meld/resources/ui/commit-dialog.ui:8
+msgid "Commit"
+msgstr "Legg inn"
+
+#: meld/resources/ui/commit-dialog.ui:36
+msgid "Commit Files"
+msgstr "Legg inn filer"
+
+#: meld/resources/ui/commit-dialog.ui:117
+msgid "Log Message"
+msgstr "Loggmelding"
 
-#: ../data/ui/filediff.ui.h:49
+#: meld/resources/ui/commit-dialog.ui:181
+msgid "Previous logs:"
+msgstr "Forrige logger:"
+
+#: meld/resources/ui/commit-dialog.ui:259
+msgid "Co_mmit"
+msgstr "_Legg inn"
+
+#: meld/resources/ui/dirdiff-actions.ui:20
+msgid "Copy to left"
+msgstr "Kopier til venstre"
+
+#: meld/resources/ui/dirdiff-actions.ui:42
+msgid "Copy to right"
+msgstr "Kopier til høyre"
+
+#: meld/resources/ui/dirdiff-actions.ui:66
+msgid "Delete selected"
+msgstr "Slett valgte"
+
+#: meld/resources/ui/dirdiff-menus.ui:7
+msgid "_Compare selected files"
+msgstr "_Sammenlign valgte filer"
+
+#: meld/resources/ui/dirdiff-menus.ui:14
+msgid "Copy to _left"
+msgstr "Kopier til _venstre"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Copy to _right"
+msgstr "Kopier til _høyre"
+
+#: meld/resources/ui/dirdiff-menus.ui:22
+msgid "_Delete selected"
+msgstr "_Slett valgte"
+
+#: meld/resources/ui/dirdiff-menus.ui:29
+msgid "Collapse Recursively"
+msgstr "Fold sammen rekursivt"
+
+#: meld/resources/ui/dirdiff-menus.ui:33
+msgid "Expand Recursively"
+msgstr "Fold ut rekursivt"
+
+#: meld/resources/ui/dirdiff-menus.ui:40
+msgid "_Open Externally"
+msgstr "Åpne e_ksternt"
+
+#: meld/resources/ui/encoding-selector.ui:31
+msgid "Search text encoding…"
+msgstr "Søk etter tegnkoding …"
+
+#: meld/resources/ui/filediff-actions.ui:20
+msgid "Push current change to the left"
+msgstr "Dytt gjeldende endring til venstre"
+
+#: meld/resources/ui/filediff-actions.ui:42
+msgid "Push current change to the right"
+msgstr "Dytt gjeldende endring til høyre"
+
+#: meld/resources/ui/filediff-actions.ui:65
+msgid "Copy chunks"
+msgstr "Kopier stykker"
+
+#: meld/resources/ui/filediff-actions.ui:87
+msgid "Delete change"
+msgstr "Slett endring"
+
+#: meld/resources/ui/filediff-menus.ui:7
+msgid "Copy change above the left chunk"
+msgstr "Kopier endring over det venstre stykket"
+
+#: meld/resources/ui/filediff-menus.ui:11
+msgid "Copy change below the left chunk"
+msgstr "Kopier endring under det venstre stykket"
+
+#: meld/resources/ui/filediff-menus.ui:15
+msgid "Copy change above the right chunk"
+msgstr "Kopier endring over det høyre stykket"
+
+#: meld/resources/ui/filediff-menus.ui:19
+msgid "Copy change below the right chunk"
+msgstr "Kopier endring under det høyre stykket"
+
+#: meld/resources/ui/filediff-menus.ui:28
+msgid "_Undo"
+msgstr "_Angre"
+
+#: meld/resources/ui/filediff-menus.ui:32
+msgid "_Redo"
+msgstr "_Gjør om"
+
+#: meld/resources/ui/filediff-menus.ui:39
+msgid "Cu_t"
+msgstr "Klipp _ut"
+
+#: meld/resources/ui/filediff-menus.ui:43
+msgid "_Copy"
+msgstr "_Kopier"
+
+#: meld/resources/ui/filediff-menus.ui:47
+msgid "_Paste"
+msgstr "_Lim inn"
+
+#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:99
+#: meld/resources/ui/filediff.ui:165
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -885,237 +1081,310 @@ msgstr ""
 "Kan ikke skrive til fila. Du kan klikke her for å låse opp fila og endre den "
 "likevel, men disse endringene må lagres til en ny fil."
 
-#: ../data/ui/filediff.ui.h:50
+#: meld/resources/ui/filediff.ui:71
 msgid "File 3"
 msgstr "Fil 3"
 
-#: ../data/ui/filediff.ui.h:51
+#: meld/resources/ui/filediff.ui:137
 msgid "File 2"
 msgstr "Fil 2"
 
-#: ../data/ui/filediff.ui.h:52
+#: meld/resources/ui/filediff.ui:199
 msgid "File 1"
 msgstr "Fil 1"
 
-#: ../data/ui/filediff.ui.h:53
-msgid "Discard unsaved changes to documents?"
-msgstr "Forkast endringer i dokumentene som ikke er lagret?"
-
-#: ../data/ui/filediff.ui.h:54
-msgid "Changes made to the following documents will be permanently lost:"
-msgstr "Endringer i følgende dokumenter vil gå tapt:"
-
-#: ../data/ui/filediff.ui.h:55
-msgid "_Discard"
-msgstr "_Forkast"
-
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:994 ../meld/iohelpers.py:107
-msgid "_Replace"
-msgstr "_Erstatt"
-
-#: ../data/ui/findbar.ui.h:2
-msgid "Replace _All"
-msgstr "Erstatt _alle"
+#. Create icon and filename CellRenderer
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
+#: meld/dirdiff.py:507
+msgid "Name"
+msgstr "Navn"
 
-#: ../data/ui/findbar.ui.h:3
-msgid "_Previous"
-msgstr "Forri_ge"
+#: meld/resources/ui/filter-list.ui:68
+msgid "Pattern"
+msgstr "Mønster"
 
-#: ../data/ui/findbar.ui.h:4
-msgid "_Next"
-msgstr "_Neste"
+#: meld/resources/ui/filter-list.ui:110
+msgid "Add new filter"
+msgstr "Legg til nytt filter"
 
-#: ../data/ui/findbar.ui.h:5
-msgid "Find:"
-msgstr "Søk:"
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
+msgid "_Add"
+msgstr "_Legg til"
 
-#: ../data/ui/findbar.ui.h:6
-msgid "Replace _with:"
-msgstr "Erstatt _med:"
+#: meld/resources/ui/filter-list.ui:126
+msgid "Remove selected filter"
+msgstr "Fjern valgt filter"
 
-#: ../data/ui/findbar.ui.h:7
+#: meld/resources/ui/findbar.ui:103
 msgid "_Match case"
 msgstr "Skill store og sm_å bokstaver"
 
-#: ../data/ui/findbar.ui.h:8
+#: meld/resources/ui/findbar.ui:119
 msgid "Who_le word"
 msgstr "_Hele ord"
 
-#: ../data/ui/findbar.ui.h:9
+#: meld/resources/ui/findbar.ui:135
 msgid "Regular e_xpression"
 msgstr "Regul_ært uttrykk"
 
-#: ../data/ui/findbar.ui.h:10
+#: meld/resources/ui/findbar.ui:175
 msgid "Wrapped"
 msgstr "Søk rundt"
 
-#: ../data/ui/language-selector.ui.h:1
+#: meld/resources/ui/findbar.ui:193
+msgid "Replace _All"
+msgstr "Erstatt _alle"
+
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1040 meld/iohelpers.py:115
+msgid "_Replace"
+msgstr "_Erstatt"
+
+#: meld/resources/ui/findbar.ui:226
+msgid "Switch between Find and Find-and-Replace"
+msgstr "Bytt mellom «søk» og «søk og erstatt»"
+
+#: meld/resources/ui/language-selector.ui:31
 msgid "Search highlight mode…"
 msgstr "Modus for søkeutheving …"
 
-#: ../data/ui/patch-dialog.ui.h:1
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:338
+#: meld/newdifftab.py:49
+msgid "New comparison"
+msgstr "Ny sammenligning"
+
+#: meld/resources/ui/new-diff-tab.ui:72
+msgid "File"
+msgstr "Fil"
+
+#: meld/resources/ui/new-diff-tab.ui:121
+msgid "Folder"
+msgstr "Mappe"
+
+#: meld/resources/ui/new-diff-tab.ui:170
+msgid "Version control"
+msgstr "Versjonskontroll"
+
+#: meld/resources/ui/new-diff-tab.ui:235 meld/resources/ui/new-diff-tab.ui:352
+msgid "_3-way comparison"
+msgstr "_3-veis sammenligning"
+
+#: meld/resources/ui/new-diff-tab.ui:254
+msgid "Select First File"
+msgstr "Velg første fil"
+
+#: meld/resources/ui/new-diff-tab.ui:267
+msgid "Select Second File"
+msgstr "Velg andre fil"
+
+#: meld/resources/ui/new-diff-tab.ui:281
+msgid "Select Third File"
+msgstr "Velg tredje fil"
+
+#: meld/resources/ui/new-diff-tab.ui:316
+msgid "Select First Folder"
+msgstr "Velg første mappe"
+
+#: meld/resources/ui/new-diff-tab.ui:329
+msgid "Select Second Folder"
+msgstr "Velg andre mappe"
+
+#: meld/resources/ui/new-diff-tab.ui:343
+msgid "Select Third Folder"
+msgstr "Velg tredje mappe"
+
+#: meld/resources/ui/new-diff-tab.ui:393
+msgid "Select A Version-Controlled Folder"
+msgstr "Velg en versjonskontrollert mappe"
+
+#: meld/resources/ui/new-diff-tab.ui:442
+msgid "_Blank comparison"
+msgstr "_Blank sammenligning"
+
+#: meld/resources/ui/new-diff-tab.ui:459
+msgid "C_ompare"
+msgstr "_Sammenlign"
+
+#: meld/resources/ui/notebook-label.ui:24
+msgid "Close Tab"
+msgstr "Lukk fane"
+
+#: meld/resources/ui/patch-dialog.ui:9
 msgid "Format as Patch"
 msgstr "Formater som endringsfil"
 
-#: ../data/ui/patch-dialog.ui.h:2
+#: meld/resources/ui/patch-dialog.ui:26
 msgid "Copy to Clipboard"
 msgstr "Kopier til utklippstavlen"
 
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152
+#: meld/resources/ui/patch-dialog.ui:57 meld/patchdialog.py:159
 msgid "Save Patch"
 msgstr "Lagre endringsfil"
 
-#: ../data/ui/patch-dialog.ui.h:4
+#: meld/resources/ui/patch-dialog.ui:88
 msgid "Use differences between:"
 msgstr "Bruk forskjeller mellom:"
 
-#: ../data/ui/patch-dialog.ui.h:5
+#: meld/resources/ui/patch-dialog.ui:105
 msgid "Left and middle panes"
 msgstr "Venstre og midtre rute"
 
-#: ../data/ui/patch-dialog.ui.h:6
+#: meld/resources/ui/patch-dialog.ui:123
 msgid "Middle and right panes"
 msgstr "Midtre og høyre rute"
 
-#: ../data/ui/patch-dialog.ui.h:7
+#: meld/resources/ui/patch-dialog.ui:149
 msgid "_Reverse patch direction"
 msgstr "_Motsatt endringsretning"
 
-#: ../data/ui/preferences.ui.h:1
-msgid "Meld Preferences"
-msgstr "Brukervalg for Meld"
+#: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
+msgid "Preferences"
+msgstr "Innstillinger"
 
-#: ../data/ui/preferences.ui.h:2
+#: meld/resources/ui/preferences.ui:75
 msgid "Font"
 msgstr "Skrift"
 
-#: ../data/ui/preferences.ui.h:3
+#: meld/resources/ui/preferences.ui:112
 msgid "_Use the system fixed width font"
 msgstr "Br_uk systemets skrift med fast bredde"
 
-#: ../data/ui/preferences.ui.h:4
+#: meld/resources/ui/preferences.ui:136
 msgid "_Editor font:"
 msgstr "Skrift for r_edigering:"
 
-#: ../data/ui/preferences.ui.h:5
+#. TRANSLATORS: This is the status bar label for a group of settings,
+#. such as text wrapping, show line numbers, whitespace, etc.
+#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:288
 msgid "Display"
 msgstr "Visning"
 
-#: ../data/ui/preferences.ui.h:6
+#: meld/resources/ui/preferences.ui:241
 msgid "_Tab width:"
 msgstr "_Tabulatorbredde:"
 
-#: ../data/ui/preferences.ui.h:7
+#: meld/resources/ui/preferences.ui:274
 msgid "_Insert spaces instead of tabs"
 msgstr "Sett _inn mellomrom i stedet for tabulator"
 
-#: ../data/ui/preferences.ui.h:8
+#: meld/resources/ui/preferences.ui:290
 msgid "Enable text _wrapping"
 msgstr "Slå på tekst_bryting"
 
-#: ../data/ui/preferences.ui.h:9
+#: meld/resources/ui/preferences.ui:312
 msgid "Do not _split words over two lines"
 msgstr "Ikke _del ord over to linjer"
 
-#: ../data/ui/preferences.ui.h:10
+#: meld/resources/ui/preferences.ui:333
 msgid "Highlight _current line"
 msgstr "_Uthev gjeldende linje"
 
-#: ../data/ui/preferences.ui.h:11
+#: meld/resources/ui/preferences.ui:349
 msgid "Show _line numbers"
 msgstr "Vis _linjenummer"
 
-#: ../data/ui/preferences.ui.h:12
+#: meld/resources/ui/preferences.ui:365
 msgid "Show w_hitespace"
 msgstr "Vis bla_nktegn"
 
-#: ../data/ui/preferences.ui.h:13
+#: meld/resources/ui/preferences.ui:381
 msgid "Use s_yntax highlighting"
 msgstr "Slå på utheving av s_yntaks"
 
-#: ../data/ui/preferences.ui.h:14
+#: meld/resources/ui/preferences.ui:404
 msgid "Syntax highlighting color scheme:"
 msgstr "Fargeskjema for syntaksmerking:"
 
-#: ../data/ui/preferences.ui.h:15
+#: meld/resources/ui/preferences.ui:469
+msgid "Code Overview"
+msgstr "Kodeoversikt"
+
+#: meld/resources/ui/preferences.ui:506
+msgid "Show overview map"
+msgstr "Vis oversiktsstolpe"
+
+#: meld/resources/ui/preferences.ui:529
+msgid "Overview map style:"
+msgstr "Oversiktsstolpens stil:"
+
+#: meld/resources/ui/preferences.ui:596
 msgid "External Editor"
 msgstr "Eksternt redigeringsprogram"
 
-#: ../data/ui/preferences.ui.h:16
+#: meld/resources/ui/preferences.ui:632
 msgid "Use _default system editor"
 msgstr "Bruk systemets _forvalgte redigeringsprogram"
 
-#: ../data/ui/preferences.ui.h:17
+#: meld/resources/ui/preferences.ui:655
 msgid "Edito_r command:"
 msgstr "_Redigeringskommando:"
 
-#: ../data/ui/preferences.ui.h:18
+#: meld/resources/ui/preferences.ui:711
 msgid "Editor"
 msgstr "Redigeringsprogram"
 
-#: ../data/ui/preferences.ui.h:19
+#: meld/resources/ui/preferences.ui:732
 msgid "Shallow Comparison"
 msgstr "Grunn sammenligning"
 
-#: ../data/ui/preferences.ui.h:20
+#: meld/resources/ui/preferences.ui:768
 msgid "C_ompare files based only on size and timestamp"
 msgstr "_Sammenlign filer ut fra størrelse og tidsstempel"
 
-#: ../data/ui/preferences.ui.h:21
+#: meld/resources/ui/preferences.ui:791
 msgid "_Timestamp resolution:"
 msgstr "Oppløsning til _tidsstempel:"
 
-#: ../data/ui/preferences.ui.h:23
+#: meld/resources/ui/preferences.ui:855
 msgid "Note: enabling text filters may make comparing large files much slower"
 msgstr ""
 "Legg merke til at tekstfiltre kan gjøre sammenligning av store filer mye "
 "treigere"
 
-#: ../data/ui/preferences.ui.h:24
+#: meld/resources/ui/preferences.ui:904
 msgid "Symbolic Links"
 msgstr "Symbolske lenker"
 
-#: ../data/ui/preferences.ui.h:26
+#: meld/resources/ui/preferences.ui:972
 msgid "Visible Columns"
 msgstr "Synlige kolonner"
 
-#: ../data/ui/preferences.ui.h:27
+#: meld/resources/ui/preferences.ui:1039
 msgid "Folder Comparisons"
 msgstr "Sammenlign mapper"
 
-#: ../data/ui/preferences.ui.h:28
+#: meld/resources/ui/preferences.ui:1061
 msgid "Version Comparisons"
 msgstr "Sammenlign versjoner"
 
-#: ../data/ui/preferences.ui.h:29
+#: meld/resources/ui/preferences.ui:1104
 msgid "_Order when comparing file revisions:"
 msgstr "_Rekkefølge når filrevisjoner sammenlignes:"
 
-#: ../data/ui/preferences.ui.h:30
+#: meld/resources/ui/preferences.ui:1151
 msgid "Order when _merging files:"
 msgstr "Rekkefølge når filer _flettes:"
 
-#: ../data/ui/preferences.ui.h:31
+#: meld/resources/ui/preferences.ui:1219
 msgid "Commit Messages"
 msgstr "Innleggingsmeldinger"
 
-#: ../data/ui/preferences.ui.h:32
+#: meld/resources/ui/preferences.ui:1260
 msgid "Show _right margin at:"
 msgstr "Vis høyre _marg i:"
 
-#: ../data/ui/preferences.ui.h:33
+#: meld/resources/ui/preferences.ui:1301
 msgid "Automatically _break lines at right margin on commit"
 msgstr "_Bryt automatisk linjer i høyre marg ved innlegging"
 
-#: ../data/ui/preferences.ui.h:34
+#: meld/resources/ui/preferences.ui:1351
 msgid "Version Control"
 msgstr "Versjonskontroll"
 
-#: ../data/ui/preferences.ui.h:35
+#: meld/resources/ui/preferences.ui:1373
 msgid "Filename filters"
 msgstr "Filnavnfiltre"
 
-#: ../data/ui/preferences.ui.h:36
+#: meld/resources/ui/preferences.ui:1411
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -1125,23 +1394,19 @@ msgstr ""
 "Hvert mønster er en liste med jokertegn på skallskriptformat som skilles med "
 "mellomrom."
 
-#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105
-msgid "File Filters"
-msgstr "Filfiltre"
-
-#: ../data/ui/preferences.ui.h:38
+#: meld/resources/ui/preferences.ui:1478
 msgid "Change trimming"
 msgstr "Endre beskjæring"
 
-#: ../data/ui/preferences.ui.h:39
+#: meld/resources/ui/preferences.ui:1514
 msgid "Trim blank line differences from the start and end of changes"
 msgstr "Beskjær tomme linjeforskjeller fra starten og slutten av endringer"
 
-#: ../data/ui/preferences.ui.h:40
+#: meld/resources/ui/preferences.ui:1558
 msgid "Text filters"
 msgstr "Tekstfiltre"
 
-#: ../data/ui/preferences.ui.h:41
+#: meld/resources/ui/preferences.ui:1596
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -1154,544 +1419,262 @@ msgstr ""
 "en tom streng før sammenligningen utføres. Hvis uttrykket inneholder grupper "
 "så vil kun gruppene erstattes. Se brukerhåndboka for flere detaljer."
 
-#: ../data/ui/preferences.ui.h:42
-msgid "Text Filters"
-msgstr "Tekstfiltre"
-
-#: ../data/ui/preferences.ui.h:43
+#: meld/resources/ui/preferences.ui:1687
 msgid "Left is remote, right is local"
 msgstr "Venstre er ekstern, høyre er lokal"
 
-#: ../data/ui/preferences.ui.h:44
+#: meld/resources/ui/preferences.ui:1691
 msgid "Left is local, right is remote"
 msgstr "Venstre er lokal, høyre er ekstern"
 
-#: ../data/ui/preferences.ui.h:45
+#: meld/resources/ui/preferences.ui:1705
+msgid "Simple change map"
+msgstr "Enkelt endringskart"
+
+#: meld/resources/ui/preferences.ui:1709
+msgid "Compact source map"
+msgstr "Lite kildekart"
+
+#: meld/resources/ui/preferences.ui:1713
+msgid "Full source map"
+msgstr "Stort kildekart"
+
+#: meld/resources/ui/preferences.ui:1727
 msgid "Remote, merge, local"
 msgstr "Ekstern, flett, lokal"
 
-#: ../data/ui/preferences.ui.h:46
+#: meld/resources/ui/preferences.ui:1731
 msgid "Local, merge, remote"
 msgstr "Lokal, flett, ekstern"
 
-#: ../data/ui/preferences.ui.h:47
+#: meld/resources/ui/preferences.ui:1753
 msgid "1ns (ext4)"
 msgstr "1 ns (ext4)"
 
-#: ../data/ui/preferences.ui.h:48
+#: meld/resources/ui/preferences.ui:1757
 msgid "100ns (NTFS)"
 msgstr "100 ns (NTFS)"
 
-#: ../data/ui/preferences.ui.h:49
+#: meld/resources/ui/preferences.ui:1761
 msgid "1s (ext2/ext3)"
 msgstr "1 s (ext2/ext3)"
 
-#: ../data/ui/preferences.ui.h:50
+#: meld/resources/ui/preferences.ui:1765
 msgid "2s (VFAT)"
 msgstr "2 s (VFAT)"
 
-#: ../data/ui/shortcuts.ui.h:1
-msgctxt "shortcut window"
-msgid "General"
-msgstr "Generelt"
-
-#: ../data/ui/shortcuts.ui.h:2
-msgctxt "shortcut window"
-msgid "New comparison"
-msgstr "Ny sammenligning"
-
-#: ../data/ui/shortcuts.ui.h:3
-msgctxt "shortcut window"
-msgid "Close a comparison"
-msgstr "Lukk en sammenligning"
-
-#: ../data/ui/shortcuts.ui.h:4
-msgctxt "shortcut window"
-msgid "Quit Meld"
-msgstr "Avslutt Meld"
-
-#: ../data/ui/shortcuts.ui.h:5
-msgctxt "shortcut window"
-msgid "Stop the current action"
-msgstr "Stopp gjeldende handling"
-
-#: ../data/ui/shortcuts.ui.h:6
-msgctxt "shortcut window"
-msgid "Refresh comparison"
-msgstr "Oppdater sammenligningen"
-
-#: ../data/ui/shortcuts.ui.h:7
-msgctxt "shortcut window"
-msgid "Fullscreen"
-msgstr "Fullskjerm"
-
-#: ../data/ui/shortcuts.ui.h:8
-msgctxt "shortcut window"
-msgid "Tabs"
-msgstr "Faner"
-
-#: ../data/ui/shortcuts.ui.h:9
-msgctxt "shortcut window"
-msgid "Go to previous tab"
-msgstr "Gå til forrige fane"
-
-#: ../data/ui/shortcuts.ui.h:10
-msgctxt "shortcut window"
-msgid "Go to next tab"
-msgstr "Gå til neste fane"
-
-#: ../data/ui/shortcuts.ui.h:11
-msgctxt "shortcut window"
-msgid "Switch to tab"
-msgstr "Bytt til fane"
-
-#: ../data/ui/shortcuts.ui.h:12
-msgctxt "shortcut window"
-msgid "Move tab left"
-msgstr "Flytt fane til venstre"
-
-#: ../data/ui/shortcuts.ui.h:13
-msgctxt "shortcut window"
-msgid "Move tab right"
-msgstr "Flytt fane til høyre"
-
-#: ../data/ui/shortcuts.ui.h:14
-msgctxt "shortcut window"
-msgid "Changes"
-msgstr "Endringer"
-
-#: ../data/ui/shortcuts.ui.h:15
-msgctxt "shortcut window"
-msgid "Go to previous change"
-msgstr "Gå til forrige endring"
-
-#: ../data/ui/shortcuts.ui.h:16
-msgctxt "shortcut window"
-msgid "Go to next change"
-msgstr "Gå til neste endring"
-
-#: ../data/ui/shortcuts.ui.h:17
-msgctxt "shortcut window"
-msgid "Editing"
-msgstr "Redigering"
-
-#: ../data/ui/shortcuts.ui.h:18
-msgctxt "shortcut window"
-msgid "Undo"
-msgstr "Angre"
-
-#: ../data/ui/shortcuts.ui.h:19
-msgctxt "shortcut window"
-msgid "Redo"
-msgstr "Gjør om"
-
-#: ../data/ui/shortcuts.ui.h:20
-msgctxt "shortcut window"
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: ../data/ui/shortcuts.ui.h:21
-msgctxt "shortcut window"
-msgid "Copy"
-msgstr "Kopier"
-
-#: ../data/ui/shortcuts.ui.h:22
-msgctxt "shortcut window"
-msgid "Paste"
-msgstr "Lim inn"
-
-#: ../data/ui/shortcuts.ui.h:23
-msgctxt "shortcut window"
-msgid "Find"
-msgstr "Søk"
-
-#: ../data/ui/shortcuts.ui.h:24
-msgctxt "shortcut window"
-msgid "Find Next"
-msgstr "Finn neste"
-
-#: ../data/ui/shortcuts.ui.h:25
-msgctxt "shortcut window"
-msgid "Find Previous"
-msgstr "Finn forrige"
-
-#: ../data/ui/shortcuts.ui.h:26
-msgctxt "shortcut window"
-msgid "Replace"
-msgstr "Erstatt"
-
-#: ../data/ui/shortcuts.ui.h:27
-msgctxt "shortcut window"
-msgid "File comparison"
-msgstr "Sammenligning av filer"
-
-#: ../data/ui/shortcuts.ui.h:28
-msgctxt "shortcut window"
-msgid "Save current file"
-msgstr "Lagre gjeldende fil"
-
-#: ../data/ui/shortcuts.ui.h:29
-msgctxt "shortcut window"
-msgid "Save current file to new path"
-msgstr "Lagre gjeldende fil til ny sti"
-
-#: ../data/ui/shortcuts.ui.h:30
-msgctxt "shortcut window"
-msgid "Save all files in comparison"
-msgstr "Lagre alle filer i sammenligning"
-
-#: ../data/ui/shortcuts.ui.h:31
-msgctxt "shortcut window"
-msgid "Previous conflict"
-msgstr "Forrige konflikt"
-
-#: ../data/ui/shortcuts.ui.h:32
-msgctxt "shortcut window"
-msgid "Next conflict"
-msgstr "Neste konflikt"
-
-#: ../data/ui/shortcuts.ui.h:33
-msgctxt "shortcut window"
-msgid "Push change to left"
-msgstr "Dytt endringen til venstre"
-
-#: ../data/ui/shortcuts.ui.h:34
-msgctxt "shortcut window"
-msgid "Push change to right"
-msgstr "Dytt endringen til høyre"
-
-#: ../data/ui/shortcuts.ui.h:35
-msgctxt "shortcut window"
-msgid "Pull change from left"
-msgstr "Dra endring fra venstre"
-
-#: ../data/ui/shortcuts.ui.h:36
-msgctxt "shortcut window"
-msgid "Pull change from right"
-msgstr "Dra endring fra høyre"
-
-#: ../data/ui/shortcuts.ui.h:37
-msgctxt "shortcut window"
-msgid "Copy change above left"
-msgstr "Kopier endringen ovenfor til venstre"
-
-#: ../data/ui/shortcuts.ui.h:38
-msgctxt "shortcut window"
-msgid "Copy change below left"
-msgstr "Kopier endringen nedenfor til venstre"
-
-#: ../data/ui/shortcuts.ui.h:39
-msgctxt "shortcut window"
-msgid "Copy change above right"
-msgstr "Kopier endringen ovenfor til høyre"
-
-#: ../data/ui/shortcuts.ui.h:40
-msgctxt "shortcut window"
-msgid "Copy change below right"
-msgstr "Kopier endringen nedenfor til høyre"
-
-#: ../data/ui/shortcuts.ui.h:41
-msgctxt "shortcut window"
-msgid "Delete change"
-msgstr "Slett endring"
-
-#: ../data/ui/shortcuts.ui.h:42
-msgctxt "shortcut window"
-msgid "Previous comparison pane"
-msgstr "Forrige sammenligningsrute"
-
-#: ../data/ui/shortcuts.ui.h:43
-msgctxt "shortcut window"
-msgid "Next comparison pane"
-msgstr "Neste sammenligningsrute"
-
-#: ../data/ui/shortcuts.ui.h:44
-msgctxt "shortcut window"
-msgid "Folder comparison"
-msgstr "Sammenligning av mapper"
-
-#: ../data/ui/shortcuts.ui.h:45
-msgctxt "shortcut window"
-msgid "Copy to left"
-msgstr "Kopier til venstre"
-
-#: ../data/ui/shortcuts.ui.h:46
-msgctxt "shortcut window"
-msgid "Copy to right"
-msgstr "Kopier til høyre"
-
-#: ../data/ui/shortcuts.ui.h:47
-msgctxt "shortcut window"
-msgid "Version control comparison"
-msgstr "Sammenligning av versjoner"
-
-#: ../data/ui/shortcuts.ui.h:48
-msgctxt "shortcut window"
-msgid "Commit to version control"
-msgstr "Legg inn til versjonskontroll"
-
-#: ../data/ui/shortcuts.ui.h:49
-msgctxt "shortcut window"
-msgid "Show/hide console output"
-msgstr "Vis/skjul konsollutdata"
-
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567
-#: ../meld/newdifftab.py:49
-msgid "New comparison"
-msgstr "Ny sammenligning"
+#: meld/resources/ui/push-dialog.ui:9
+msgid "Push local commits to remote?"
+msgstr "Dytt lokale innlegginger eksternt?"
 
-#: ../data/ui/tab-placeholder.ui.h:2
-msgid "File comparison"
-msgstr "Sammenligning av filer"
+#: meld/resources/ui/push-dialog.ui:10
+msgid "The commits to be pushed are determined by your version control system."
+msgstr ""
+"Versjonskontrollsystemet bestemmer hvilke innlegginger som skal dyttes."
 
-#: ../data/ui/tab-placeholder.ui.h:3
-msgid "Directory comparison"
-msgstr "Sammenligning av mapper"
+#: meld/resources/ui/push-dialog.ui:38
+msgid "_Push commits"
+msgstr "_Dytt innlegginger"
 
-#: ../data/ui/tab-placeholder.ui.h:4
-msgid "Version control view"
-msgstr "Versjonskontroll-visning"
+#: meld/resources/ui/recent-selector.ui:16
+msgid "Search recent comparisons…"
+msgstr "Søk nylige sammenligninger …"
 
-#: ../data/ui/tab-placeholder.ui.h:5
-msgid "_3-way comparison"
-msgstr "_3-veis sammenligning"
+#: meld/resources/ui/revert-dialog.ui:9
+msgid "Discard unsaved changes to documents?"
+msgstr "Forkast endringer i dokumentene som ikke er lagret?"
 
-#: ../data/ui/tab-placeholder.ui.h:6
-msgid "Select Third File"
-msgstr "Velg tredje fil"
+#: meld/resources/ui/revert-dialog.ui:10
+msgid "Changes made to the following documents will be permanently lost:"
+msgstr "Endringer i følgende dokumenter vil gå tapt:"
 
-#: ../data/ui/tab-placeholder.ui.h:7
-msgid "Select Second File"
-msgstr "Velg andre fil"
+#: meld/resources/ui/revert-dialog.ui:39
+msgid "_Discard"
+msgstr "_Forkast"
 
-#: ../data/ui/tab-placeholder.ui.h:8
-msgid "Select First File"
-msgstr "Velg første fil"
+#: meld/resources/ui/save-confirm-dialog.ui:9
+msgid "Save changes to documents before closing?"
+msgstr "Lagre endringer i dokumentene før avslutning?"
 
-#: ../data/ui/tab-placeholder.ui.h:9
-msgid "Select First Folder"
-msgstr "Velg første mappe"
+#: meld/resources/ui/save-confirm-dialog.ui:10
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Hvis du ikke lagrer så vil endringene gå tapt."
 
-#: ../data/ui/tab-placeholder.ui.h:10
-msgid "Select Second Folder"
-msgstr "Velg andre mappe"
+#: meld/resources/ui/save-confirm-dialog.ui:24
+msgid "Close _without Saving"
+msgstr "Lukk _uten å lagre"
 
-#: ../data/ui/tab-placeholder.ui.h:11
-msgid "Select Third Folder"
-msgstr "Velg tredje mappe"
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1039
+#: meld/iohelpers.py:56 meld/iohelpers.py:114
+msgid "_Cancel"
+msgstr "_Avbryt"
 
-#: ../data/ui/tab-placeholder.ui.h:12
-msgid "Select A Version-Controlled Folder"
-msgstr "Velg en versjonskontrollert mappe"
+#: meld/resources/ui/save-confirm-dialog.ui:52
+msgid "_Save"
+msgstr "_Lagre"
 
-#: ../data/ui/tab-placeholder.ui.h:13
-msgid "_Blank comparison"
-msgstr "_Blank sammenligning"
+#: meld/resources/ui/statusbar-menu.ui:9
+msgid "Show whitespace"
+msgstr "Vis blanktegn"
 
-#: ../data/ui/tab-placeholder.ui.h:14
-msgid "C_ompare"
-msgstr "_Sammenlign"
+#: meld/resources/ui/statusbar-menu.ui:17
+msgid "Text wrapping"
+msgstr "Tekstbryting"
 
-#: ../data/ui/vcview.ui.h:3
+#: meld/resources/ui/vcview-menus.ui:7
+msgid "_Compare"
+msgstr "_Sammenligne"
+
+#: meld/resources/ui/vcview-menus.ui:11
 msgid "Co_mmit…"
 msgstr "_Legg inn …"
 
-#: ../data/ui/vcview.ui.h:4
+#: meld/resources/ui/vcview-menus.ui:15
+msgid "_Update"
+msgstr "_Oppdater"
+
+#: meld/resources/ui/vcview-menus.ui:30
+msgid "Re_vert"
+msgstr "_Tilbakestill"
+
+#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+msgid "Delete"
+msgstr "Slett"
+
+#: meld/resources/ui/vcview-menus.ui:41
+msgid "Mar_k as Resolved"
+msgstr "_Merk som løst"
+
+#: meld/resources/ui/vcview.ui:73
+msgid "Commit…"
+msgstr "Legg inn …"
+
+#: meld/resources/ui/vcview.ui:74
 msgid "Commit changes to version control"
 msgstr "Legg inn endringer til versjonskontroll"
 
-#: ../data/ui/vcview.ui.h:5
-msgid "_Update"
-msgstr "_Oppdater"
+#: meld/resources/ui/vcview.ui:86
+msgid "Update"
+msgstr "Oppdater"
 
-#: ../data/ui/vcview.ui.h:6
+#: meld/resources/ui/vcview.ui:87
 msgid "Update working copy from version control"
 msgstr "Oppdater arbeidskopi fra versjonskontroll"
 
-#: ../data/ui/vcview.ui.h:7
-msgid "_Push"
-msgstr "_Dytt"
+#: meld/resources/ui/vcview.ui:99
+msgid "Push"
+msgstr "Dytt"
 
-#: ../data/ui/vcview.ui.h:8
+#: meld/resources/ui/vcview.ui:100
 msgid "Push local changes to remote"
 msgstr "Dytt lokale endringer til ekstern"
 
-#: ../data/ui/vcview.ui.h:10
+#: meld/resources/ui/vcview.ui:112
+msgid "Add"
+msgstr "Legg til"
+
+#: meld/resources/ui/vcview.ui:113
 msgid "Add to version control"
 msgstr "Legg til versjonskontroll"
 
-#: ../data/ui/vcview.ui.h:12
+#: meld/resources/ui/vcview.ui:125
+msgid "Remove"
+msgstr "Fjern"
+
+#: meld/resources/ui/vcview.ui:126
 msgid "Remove from version control"
 msgstr "Fjern fra versjonskontroll"
 
-#: ../data/ui/vcview.ui.h:13
-msgid "Mar_k as Resolved"
-msgstr "_Merk som løst"
+#: meld/resources/ui/vcview.ui:138
+msgid "Mark as Resolved"
+msgstr "Merk som løst"
 
-#: ../data/ui/vcview.ui.h:14
+#: meld/resources/ui/vcview.ui:139
 msgid "Mark as resolved in version control"
 msgstr "Merk som løst i versjonskontroll"
 
-#: ../data/ui/vcview.ui.h:15
-msgid "Re_vert"
-msgstr "_Tilbakestill"
+#: meld/resources/ui/vcview.ui:151
+msgid "Revert"
+msgstr "Tilbakestill"
 
-#: ../data/ui/vcview.ui.h:16
+#: meld/resources/ui/vcview.ui:152
 msgid "Revert working copy to original state"
 msgstr "Tilbakestill arbeidskopien til opprinnelig tilstand"
 
-#: ../data/ui/vcview.ui.h:17
+#: meld/resources/ui/vcview.ui:165
 msgid "Delete from working copy"
 msgstr "Slett fra arbeidskopi"
 
-#: ../data/ui/vcview.ui.h:18
-msgid "Console"
-msgstr "Konsoll"
-
-#: ../data/ui/vcview.ui.h:19
-msgid "Show or hide the version control console output pane"
-msgstr "Vis eller skjul rute med versjonskontrollens konsollutdata"
-
-#: ../data/ui/vcview.ui.h:20
-msgid "_Flatten"
-msgstr "_Forflat"
-
-#: ../data/ui/vcview.ui.h:21
-msgid "Flatten directories"
-msgstr "Forflat mapper"
-
-#: ../data/ui/vcview.ui.h:22
-msgid "_Modified"
-msgstr "_Endret"
-
-#: ../data/ui/vcview.ui.h:23
-msgid "Show modified files"
-msgstr "Vis endrede filer"
-
-#: ../data/ui/vcview.ui.h:24
-msgid "_Normal"
-msgstr "_Normal"
-
-#: ../data/ui/vcview.ui.h:25
-msgid "Show normal files"
-msgstr "Vis normale filer"
-
-#: ../data/ui/vcview.ui.h:26
-msgid "Un_versioned"
-msgstr "_Ikke versjonert"
-
-#: ../data/ui/vcview.ui.h:27
-msgid "Show unversioned files"
-msgstr "Vis filer som ikke er versjonerte"
-
-#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69
-msgid "Ignored"
-msgstr "Ignorert"
-
-#: ../data/ui/vcview.ui.h:29
-msgid "Show ignored files"
-msgstr "Vis ignorerte filer"
-
-#: ../data/ui/vcview.ui.h:30
-msgid "Commit"
-msgstr "Legg inn"
-
-#: ../data/ui/vcview.ui.h:31
-msgid "Commit Files"
-msgstr "Legg inn filer"
-
-#: ../data/ui/vcview.ui.h:32
-msgid "Log Message"
-msgstr "Loggmelding"
-
-#: ../data/ui/vcview.ui.h:33
-msgid "Previous logs:"
-msgstr "Forrige logger:"
-
-#: ../data/ui/vcview.ui.h:34
-msgid "Co_mmit"
-msgstr "_Legg inn"
-
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331
+#: meld/resources/ui/vcview.ui:220 meld/vcview.py:410
 msgid "Location"
 msgstr "Plassering"
 
-#: ../data/ui/vcview.ui.h:37
+#: meld/resources/ui/vcview.ui:229
 msgid "Status"
 msgstr "Status"
 
-#: ../data/ui/vcview.ui.h:38
+#: meld/resources/ui/vcview.ui:238
 msgid "Extra"
 msgstr "Ekstra"
 
-#: ../data/ui/vcview.ui.h:39
+#: meld/resources/ui/vcview.ui:270
 msgid "Console output"
 msgstr "Konsollutdata"
 
-#: ../data/ui/vcview.ui.h:40
-msgid "Push local commits to remote?"
-msgstr "Dytt lokale innlegginger eksternt?"
-
-#: ../data/ui/vcview.ui.h:41
-msgid "The commits to be pushed are determined by your version control system."
-msgstr ""
-"Versjonskontrollsystemet bestemmer hvilke innlegginger som skal dyttes."
+#: meld/actiongutter.py:247
+msgid "Copy _up"
+msgstr "Kopier _opp"
 
-#: ../data/ui/vcview.ui.h:42
-msgid "_Push commits"
-msgstr "_Dytt innlegginger"
+#: meld/actiongutter.py:248
+msgid "Copy _down"
+msgstr "Kopier _ned"
 
-#: ../meld/const.py:12
+#: meld/const.py:25
 msgid "UNIX (LF)"
 msgstr "UNIX (LF)"
 
-#: ../meld/const.py:13
+#: meld/const.py:26
 msgid "DOS/Windows (CR-LF)"
 msgstr "DOS/Windows (CR-LF)"
 
-#: ../meld/const.py:14
+#: meld/const.py:27
 msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:433 ../meld/preferences.py:81
+#: meld/dirdiff.py:528 meld/preferences.py:132
 msgid "Size"
 msgstr "Størrelse"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:441 ../meld/preferences.py:82
+#: meld/dirdiff.py:536 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Endringstid"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:449 ../meld/preferences.py:83
+#: meld/dirdiff.py:544 meld/preferences.py:134
 msgid "Permissions"
 msgstr "Rettigheter"
 
-#: ../meld/dirdiff.py:580
-#, python-format
-msgid "Hide %s"
-msgstr "Skjul %s"
-
-#: ../meld/dirdiff.py:721 ../meld/dirdiff.py:744
+#: meld/dirdiff.py:767 meld/dirdiff.py:790
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Leter gjennom %s"
 
-#: ../meld/dirdiff.py:879
+#: meld/dirdiff.py:926
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Ferdig"
 
-#: ../meld/dirdiff.py:887
+#: meld/dirdiff.py:933
 msgid "Folders have no differences"
 msgstr "Mappene er ikke forskjellige"
 
-#: ../meld/dirdiff.py:889
+#: meld/dirdiff.py:935
 msgid "Contents of scanned files in folders are identical."
 msgstr "Innholdet i de gjennomsøkte filene i mappene er likt."
 
-#: ../meld/dirdiff.py:891
+#: meld/dirdiff.py:937
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1699,39 +1682,43 @@ msgstr ""
 "De gjennomsøkte filene i mappene fremstår som identiske, men selve innholdet "
 "er ikke gjennomsøkt."
 
-#: ../meld/dirdiff.py:894
+#: meld/dirdiff.py:940
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Filfiltre er i bruk, så ikke alle filer er gjennomsøkte."
 
-#: ../meld/dirdiff.py:896
+#: meld/dirdiff.py:942
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Tekstfiltre er i bruk og kan skjule forskjeller i innholdet."
 
-#: ../meld/dirdiff.py:914 ../meld/filediff.py:1501 ../meld/filediff.py:1531
-#: ../meld/filediff.py:1533 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
+#: meld/dirdiff.py:958 meld/filediff.py:1758
+msgid "Hide"
+msgstr "Skjul"
+
+#: meld/dirdiff.py:960 meld/filediff.py:1760 meld/filediff.py:1790
+#: meld/filediff.py:1792 meld/ui/msgarea.py:106 meld/ui/msgarea.py:119
 msgid "Hi_de"
 msgstr "_Skjul"
 
-#: ../meld/dirdiff.py:923
+#: meld/dirdiff.py:969
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Det oppstod flere feil mens mappen ble gjennomsøkt"
 
-#: ../meld/dirdiff.py:924
+#: meld/dirdiff.py:970
 msgid "Files with invalid encodings found"
 msgstr "Fant filer med ugyldig tegnkoding"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:926
+#: meld/dirdiff.py:972
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Noen filer har ugyldig tegnkoding. Filnavnene er noe sånt som:"
 
-#: ../meld/dirdiff.py:928
+#: meld/dirdiff.py:974
 msgid "Files hidden by case insensitive comparison"
 msgstr ""
 "Filer som skjules av sammenligning som ikke skiller store/små bokstaver"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:930
+#: meld/dirdiff.py:976
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1739,17 +1726,17 @@ msgstr ""
 "Du kjører en sammenligning som ikke skiller store/små bokstaver på et "
 "filsystem som gjør det. De følgende filene i mappa er skjult:"
 
-#: ../meld/dirdiff.py:941
+#: meld/dirdiff.py:987
 #, python-format
 msgid "“%s” hidden by “%s”"
 msgstr "«%s» skjules av «%s»"
 
-#: ../meld/dirdiff.py:997
+#: meld/dirdiff.py:1043
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Erstatt mappen «%s»?"
 
-#: ../meld/dirdiff.py:999
+#: meld/dirdiff.py:1045
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1758,11 +1745,11 @@ msgstr ""
 "Det finnes allerede en mappe med dette navnet i «%s».\n"
 "Hvis du erstatter denne mappen så vil alle filene i den slettes."
 
-#: ../meld/dirdiff.py:1012
+#: meld/dirdiff.py:1058
 msgid "Error copying file"
 msgstr "Klarte ikke kopiere fil"
 
-#: ../meld/dirdiff.py:1013
+#: meld/dirdiff.py:1059
 #, python-format
 msgid ""
 "Couldn’t copy %s\n"
@@ -1775,19 +1762,19 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:1038 ../meld/vcview.py:703
+#: meld/dirdiff.py:1084 meld/vcview.py:758
 msgid "Error deleting {}"
 msgstr "Klarte ikke slette {}"
 
-#: ../meld/dirdiff.py:1549
+#: meld/dirdiff.py:1563
 msgid "No folder"
 msgstr "Ingen mappe"
 
-#: ../meld/filediff.py:836
+#: meld/filediff.py:1068
 msgid "Comparison results will be inaccurate"
 msgstr "Sammenligningsresultatene vil være unøyaktige"
 
-#: ../meld/filediff.py:838
+#: meld/filediff.py:1070
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1795,64 +1782,64 @@ msgstr ""
 "Et filter endret antall linjer i fila, dette støttes ikke. Sammenligningen "
 "vil være unøyaktig."
 
-#: ../meld/filediff.py:907
+#: meld/filediff.py:1142
 msgid "Mark conflict as resolved?"
 msgstr "Merk konflikten som løst?"
 
-#: ../meld/filediff.py:909
+#: meld/filediff.py:1144
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "Du kan nå merke konflikten som løst dersom den er ordnet."
 
-#: ../meld/filediff.py:911
+#: meld/filediff.py:1146
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../meld/filediff.py:912
+#: meld/filediff.py:1147
 msgid "Mark _Resolved"
 msgstr "Merk som l_øst"
 
-#: ../meld/filediff.py:1216
+#: meld/filediff.py:1466
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Klarte ikke åpne fila «%s»."
 
-#: ../meld/filediff.py:1224
+#: meld/filediff.py:1474
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Fila %s er tilsynelatende en binær fil."
 
-#: ../meld/filediff.py:1226
+#: meld/filediff.py:1476
 msgid "Do you want to open the file using the default application?"
 msgstr "Vil du åpne fila med standardprogrammet?"
 
-#: ../meld/filediff.py:1228
+#: meld/filediff.py:1478
 msgid "Open"
 msgstr "Åpne"
 
-#: ../meld/filediff.py:1244
+#: meld/filediff.py:1494
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Beregner forskjeller"
 
-#: ../meld/filediff.py:1305
+#: meld/filediff.py:1553
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Fila %s er endret på disken"
 
-#: ../meld/filediff.py:1306
+#: meld/filediff.py:1554
 msgid "Do you want to reload the file?"
 msgstr "Vil du laste fila på nytt?"
 
-#: ../meld/filediff.py:1308
+#: meld/filediff.py:1556
 msgid "_Reload"
 msgstr "_Last på nytt"
 
-#: ../meld/filediff.py:1464
+#: meld/filediff.py:1723
 msgid "Files are identical"
 msgstr "Filene er identiske"
 
-#: ../meld/filediff.py:1477
+#: meld/filediff.py:1736
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1860,11 +1847,11 @@ msgstr ""
 "Tekstfiltre er i bruk og kan skjule forskjeller mellom filene. Vil du "
 "sammenligne de ufiltrerte filene?"
 
-#: ../meld/filediff.py:1482
+#: meld/filediff.py:1741
 msgid "Files differ in line endings only"
 msgstr "Filene har kun forskjellige linjeavslutninger"
 
-#: ../meld/filediff.py:1484
+#: meld/filediff.py:1743
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1873,15 +1860,15 @@ msgstr ""
 "Filene er identiske, bortsett fra ulike linjeavslutninger:\n"
 "%s"
 
-#: ../meld/filediff.py:1504
+#: meld/filediff.py:1763
 msgid "Show without filters"
 msgstr "Vis uten filtre"
 
-#: ../meld/filediff.py:1526
+#: meld/filediff.py:1785
 msgid "Change highlighting incomplete"
 msgstr "Fullførte ikke utheving av endringer"
 
-#: ../meld/filediff.py:1527
+#: meld/filediff.py:1786
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1889,19 +1876,19 @@ msgstr ""
 "Noen endringer er ikke uthevet fordi de er for store. Du kan tvinge Meld til "
 "å bruke mer tid til å utheve dem, men dette kan gå treigt."
 
-#: ../meld/filediff.py:1535
+#: meld/filediff.py:1794
 msgid "Keep highlighting"
 msgstr "Fortsett utheving"
 
-#: ../meld/filediff.py:1537
+#: meld/filediff.py:1796
 msgid "_Keep highlighting"
 msgstr "_Fortsett utheving"
 
-#: ../meld/filediff.py:1550
+#: meld/filediff.py:1809
 msgid "Saving failed"
 msgstr "Klarte ikke lagre"
 
-#: ../meld/filediff.py:1551
+#: meld/filediff.py:1810
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1909,36 +1896,36 @@ msgstr ""
 "Vurder å kopiere viktige endringer til et annet program eller fil for å "
 "unngå datatap."
 
-#: ../meld/filediff.py:1560
+#: meld/filediff.py:1819
 msgid "Save Left Pane As"
 msgstr "Lagre venstre rute som"
 
-#: ../meld/filediff.py:1562
+#: meld/filediff.py:1821
 msgid "Save Middle Pane As"
 msgstr "Lagre midtre rute som"
 
-#: ../meld/filediff.py:1564
+#: meld/filediff.py:1823
 msgid "Save Right Pane As"
 msgstr "Lagre høyre rute som"
 
-#: ../meld/filediff.py:1577
+#: meld/filediff.py:1834
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Fila %s er blitt endret på disk etter at den ble åpnet"
 
-#: ../meld/filediff.py:1579
+#: meld/filediff.py:1836
 msgid "If you save it, any external changes will be lost."
 msgstr "Hvis du lagrer den så vil eksterne endringer gå tapt."
 
-#: ../meld/filediff.py:1582
+#: meld/filediff.py:1839
 msgid "Save Anyway"
 msgstr "Lagre likevel"
 
-#: ../meld/filediff.py:1583
+#: meld/filediff.py:1840
 msgid "Don’t Save"
 msgstr "Ikke lagre"
 
-#: ../meld/filediff.py:1625
+#: meld/filediff.py:1882
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1946,7 +1933,7 @@ msgstr ""
 "Fila «{}» inneholder tegn som ikke kan kodes med dens gjeldende tegnkoding "
 "«{}»."
 
-#: ../meld/filediff.py:1629 ../meld/patchdialog.py:131
+#: meld/filediff.py:1886 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1955,16 +1942,20 @@ msgstr ""
 "Klarte ikke lagre fila fordi:\n"
 "%s"
 
-#: ../meld/filediff.py:1633 ../meld/patchdialog.py:130
+#: meld/filediff.py:1890 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Klarte ikke lagre fila %s."
 
-#: ../meld/filediff.py:2016
+#: meld/filediff.py:1951
+msgid "Open File"
+msgstr "Åpne fil"
+
+#: meld/filediff.py:2295
 msgid "Live comparison updating disabled"
 msgstr "Sanntidsoppdatering av endringer er slått av"
 
-#: ../meld/filediff.py:2017
+#: meld/filediff.py:2296
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1975,45 +1966,37 @@ msgstr ""
 "manuelt, og sanntidsoppdateringen vil fortsette når synkroniseringspunktene "
 "er blitt tømt."
 
-#: ../meld/filemerge.py:37
+#: meld/filemerge.py:37
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Fletter filer"
 
-#: ../meld/gutterrendererchunk.py:216
-msgid "Copy _up"
-msgstr "Kopier _opp"
-
-#: ../meld/gutterrendererchunk.py:217
-msgid "Copy _down"
-msgstr "Kopier _ned"
-
-#: ../meld/iohelpers.py:41
+#: meld/iohelpers.py:41
 msgid "Deleting remote folders is not supported"
 msgstr "Eksterne mapper kan ikke slettes"
 
-#: ../meld/iohelpers.py:43
+#: meld/iohelpers.py:43
 msgid "Not a file or directory"
 msgstr "Ikke en fil eller mappe"
 
-#: ../meld/iohelpers.py:47
+#: meld/iohelpers.py:47
 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
 msgstr "Kan ikke legge «{}» i papirkurven. Vil du slette den nå?"
 
-#: ../meld/iohelpers.py:52
+#: meld/iohelpers.py:52
 msgid "This remote location does not support sending items to the trash."
 msgstr "Denne eksterne plasseringen kan ikke legge elementer i papirkurven."
 
-#: ../meld/iohelpers.py:57
+#: meld/iohelpers.py:57
 msgid "_Delete Permanently"
 msgstr "Slett _permanent"
 
-#: ../meld/iohelpers.py:100
+#: meld/iohelpers.py:108
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Erstatt fila «%s»?"
 
-#: ../meld/iohelpers.py:102
+#: meld/iohelpers.py:110
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2022,312 +2005,124 @@ msgstr ""
 "Det finnes allerede en fil med dette navnet i «%s».\n"
 "Hvis du erstatter denne fila så vil innholdet gå tapt."
 
-#: ../meld/meldapp.py:181
+#: meld/meldapp.py:168
 msgid "wrong number of arguments supplied to --diff"
 msgstr "feil antall argumenter gitt til --diff"
 
-#: ../meld/meldapp.py:186
+#: meld/meldapp.py:173
 msgid "Start with an empty window"
 msgstr "Start med tomt vindu"
 
-#: ../meld/meldapp.py:187 ../meld/meldapp.py:189
+#: meld/meldapp.py:174 meld/meldapp.py:176
 msgid "file"
 msgstr "fil"
 
-#: ../meld/meldapp.py:187 ../meld/meldapp.py:191
+#: meld/meldapp.py:174 meld/meldapp.py:178
 msgid "folder"
 msgstr "mappe"
 
-#: ../meld/meldapp.py:188
+#: meld/meldapp.py:175
 msgid "Start a version control comparison"
 msgstr "Start en sammenligning av versjoner"
 
-#: ../meld/meldapp.py:190
+#: meld/meldapp.py:177
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Start en 2- eller 3-veis filsammenligning"
 
-#: ../meld/meldapp.py:192
+#: meld/meldapp.py:179
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Start en 2- eller 3-veis mappesammenligning"
 
-#: ../meld/meldapp.py:235
+#: meld/meldapp.py:222
 #, python-format
 msgid "Error: %s\n"
 msgstr "Feil: %s\n"
 
-#: ../meld/meldapp.py:242
+#: meld/meldapp.py:229
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld er et verktøy for sammenligning av filer og mapper."
 
-#: ../meld/meldapp.py:246
+#: meld/meldapp.py:233
 msgid "Set label to use instead of file name"
 msgstr "Angi en etikett som skal brukes istedenfor filnavn"
 
-#: ../meld/meldapp.py:249
+#: meld/meldapp.py:236
 msgid "Open a new tab in an already running instance"
 msgstr "Åpne en ny fane i en Meld som allerede kjører"
 
-#: ../meld/meldapp.py:252
+#: meld/meldapp.py:239
 msgid "Automatically compare all differing files on startup"
 msgstr "Sammenlign automatisk alle ulike filer ved oppstart"
 
-#: ../meld/meldapp.py:255
+#: meld/meldapp.py:242
 msgid "Ignored for compatibility"
 msgstr "Ignorert pga. kompatibilitet"
 
-#: ../meld/meldapp.py:259
+#: meld/meldapp.py:246
 msgid "Set the target file for saving a merge result"
 msgstr "Velg målfilen der fletteresultatet skal lagres"
 
-#: ../meld/meldapp.py:262
+#: meld/meldapp.py:249
 msgid "Automatically merge files"
 msgstr "Automatisk flett filer"
 
-#: ../meld/meldapp.py:266
+#: meld/meldapp.py:253
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Last en lagret sammenligning fra en Meld-sammenligningsfil"
 
-#: ../meld/meldapp.py:270
+#: meld/meldapp.py:257
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Lager en fane med forskjeller for angitte filer eller mapper"
 
-#: ../meld/meldapp.py:290
+#: meld/meldapp.py:277
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "for mange argumenter (ønsket 0-3, fikk %d)"
 
-#: ../meld/meldapp.py:293
+#: meld/meldapp.py:280
 msgid "can’t auto-merge less than 3 files"
 msgstr "kan ikke autoflette mindre enn 3 filer"
 
-#: ../meld/meldapp.py:295
+#: meld/meldapp.py:282
 msgid "can’t auto-merge directories"
 msgstr "kan ikke autoflette mapper"
 
-#: ../meld/meldapp.py:309
+#: meld/meldapp.py:297
 msgid "Error reading saved comparison file"
 msgstr "Klarte ikke lese lagret sammenligningsfil"
 
-#: ../meld/meldapp.py:326
+#: meld/meldapp.py:314
 #, python-format
 msgid "invalid path or URI “%s”"
 msgstr "ugyldig sti eller adresse «%s»"
 
-#: ../meld/meldapp.py:332
+#: meld/meldapp.py:320
 msgid "remote folder “{}” not supported"
 msgstr "ekstern mappe «{}» støttes ikke"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:124
+#: meld/meldbuffer.py:114
 msgid "<unnamed>"
 msgstr "<uten navn>"
 
-#: ../meld/melddoc.py:68
+#: meld/melddoc.py:60
 msgid "untitled"
 msgstr "uten navn"
 
-#: ../meld/meldwindow.py:47
-msgid "_File"
-msgstr "_Fil"
-
-#: ../meld/meldwindow.py:48
-msgid "_New Comparison…"
-msgstr "Ny sammenligning …"
-
-#: ../meld/meldwindow.py:49
-msgid "Start a new comparison"
-msgstr "Start en ny sammenligning"
-
-#: ../meld/meldwindow.py:52
-msgid "Save the current file"
-msgstr "Lagre gjeldende fil"
-
-#: ../meld/meldwindow.py:54
-msgid "Save As…"
-msgstr "Lagre som …"
-
-#: ../meld/meldwindow.py:55
-msgid "Save the current file with a different name"
-msgstr "Lagre gjeldende fil med nytt navn"
-
-#: ../meld/meldwindow.py:58
-msgid "Close the current file"
-msgstr "Lukk gjeldende fil"
-
-#: ../meld/meldwindow.py:61
-msgid "_Edit"
-msgstr "_Rediger"
-
-#: ../meld/meldwindow.py:63
-msgid "Undo the last action"
-msgstr "Angre forrige handling"
-
-#: ../meld/meldwindow.py:66
-msgid "Redo the last undone action"
-msgstr "Gjør om sist angrede handling"
-
-#: ../meld/meldwindow.py:68
-msgid "Cut the selection"
-msgstr "Klipp ut utvalg"
-
-#: ../meld/meldwindow.py:70
-msgid "Copy the selection"
-msgstr "Kopier utvalg"
-
-#: ../meld/meldwindow.py:72
-msgid "Paste the clipboard"
-msgstr "Lim inn fra utklippstavla"
-
-#: ../meld/meldwindow.py:74
-msgid "Find…"
-msgstr "Søk …"
-
-#: ../meld/meldwindow.py:74
-msgid "Search for text"
-msgstr "Søk etter tekst"
-
-#: ../meld/meldwindow.py:76
-msgid "Find Ne_xt"
-msgstr "Finn _neste"
-
-#: ../meld/meldwindow.py:77
-msgid "Search forwards for the same text"
-msgstr "Let framover etter samme tekst"
-
-#: ../meld/meldwindow.py:79
-msgid "Find _Previous"
-msgstr "Finn _forrige"
-
-#: ../meld/meldwindow.py:80
-msgid "Search backwards for the same text"
-msgstr "Let bakover etter samme tekst"
-
-#: ../meld/meldwindow.py:83
-msgid "_Replace…"
-msgstr "_Erstatt …"
-
-#: ../meld/meldwindow.py:84
-msgid "Find and replace text"
-msgstr "Søk og erstatt tekst"
-
-#: ../meld/meldwindow.py:86
-msgid "Go to _Line"
-msgstr "Gå til _linje"
-
-#: ../meld/meldwindow.py:87
-msgid "Go to a specific line"
-msgstr "Gå til en bestemt linje"
-
-#: ../meld/meldwindow.py:90
-msgid "_Changes"
-msgstr "End_ringer"
-
-#: ../meld/meldwindow.py:91
-msgid "Next Change"
-msgstr "Neste endring"
-
-#: ../meld/meldwindow.py:92
-msgid "Go to the next change"
-msgstr "Gå til neste endring"
-
-#: ../meld/meldwindow.py:94
-msgid "Previous Change"
-msgstr "Gå til forrige endring"
-
-#: ../meld/meldwindow.py:95
-msgid "Go to the previous change"
-msgstr "Gå til forrige endring"
-
-#: ../meld/meldwindow.py:97
-msgid "Open Externally"
-msgstr "Åpne eksternt"
-
-#: ../meld/meldwindow.py:98
-msgid "Open selected file or directory in the default external application"
-msgstr "Åpne valgt fil eller mappe i forvalgt eksternt program"
+#: meld/meldwindow.py:144
+msgid "Filename"
+msgstr "Filnavn"
 
-#: ../meld/meldwindow.py:102
-msgid "_View"
-msgstr "_Vis"
-
-#: ../meld/meldwindow.py:103
-msgid "File Status"
-msgstr "Filstatus"
-
-#: ../meld/meldwindow.py:104
-msgid "Version Status"
-msgstr "Versjonsstatus"
-
-#: ../meld/meldwindow.py:107
-msgid "Stop the current action"
-msgstr "Stopp gjeldende handling"
-
-#: ../meld/meldwindow.py:110
-msgid "Refresh the view"
-msgstr "Oppdater visning"
-
-#: ../meld/meldwindow.py:114
-msgid "Fullscreen"
-msgstr "Fullskjerm"
-
-#: ../meld/meldwindow.py:115
-msgid "View the comparison in fullscreen"
-msgstr "Vis sammenligningen i fullskjerm"
-
-#: ../meld/meldwindow.py:117
-msgid "_Toolbar"
-msgstr "Verkt_øylinje"
-
-#: ../meld/meldwindow.py:118
-msgid "Show or hide the toolbar"
-msgstr "Vis eller skjul verktøylinja"
-
-#: ../meld/meldwindow.py:127
-msgid "Open Recent"
-msgstr "Åpne nylig"
-
-#: ../meld/meldwindow.py:128
-msgid "Open recent files"
-msgstr "Åpne nylige filer"
-
-#: ../meld/meldwindow.py:150
-msgid "_Meld"
-msgstr "_Meld"
-
-#: ../meld/meldwindow.py:151
-msgid "Quit the program"
-msgstr "Avslutt programmet"
-
-#: ../meld/meldwindow.py:153
-msgid "Prefere_nces"
-msgstr "_Innstillinger"
-
-#: ../meld/meldwindow.py:154
-msgid "Configure the application"
-msgstr "Sett opp programmet"
-
-#: ../meld/meldwindow.py:156
-msgid "_Contents"
-msgstr "_Innhold"
-
-#: ../meld/meldwindow.py:157
-msgid "Open the Meld manual"
-msgstr "Åpne Meld-håndboka"
-
-#: ../meld/meldwindow.py:159
-msgid "About this application"
-msgstr "Om dette programmet"
-
-#: ../meld/meldwindow.py:602
+#: meld/meldwindow.py:373
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Trenger tre filer for å autoflette, fikk: %r"
 
-#: ../meld/meldwindow.py:623
+#: meld/meldwindow.py:394
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Kan ikke sammenligne en blanding av filer og mapper"
 
-#: ../meld/misc.py:135
+#: meld/misc.py:151
 msgid ""
 "{}\n"
 "\n"
@@ -2339,244 +2134,239 @@ msgstr ""
 "Det oppstod en kritisk feil i Meld under kjøring av:\n"
 "<tt>{}</tt>"
 
-#: ../meld/misc.py:254
-#, python-format
-msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
-msgstr "Fant ikke fargeskjemadetaljer for %s-%s. Forsøk å installere på nytt."
-
-#: ../meld/misc.py:325
+#: meld/misc.py:202
 msgid "[None]"
 msgstr "[Ingen]"
 
-#: ../meld/preferences.py:33
+#: meld/preferences.py:37 meld/preferences.py:129
 msgid "label"
 msgstr "etikett"
 
-#: ../meld/preferences.py:33
+#: meld/preferences.py:37 meld/preferences.py:129
 msgid "pattern"
 msgstr "mønster"
 
-#: ../meld/recent.py:105
+#: meld/recent.py:104
 msgid "Version control:"
 msgstr "Versjonskontroll:"
 
-#: ../meld/ui/bufferselectors.py:32
+#: meld/style.py:90
+#, python-format
+msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
+msgstr "Fant ikke fargeskjemadetaljer for %s-%s. Forsøk å installere på nytt."
+
+#: meld/ui/bufferselectors.py:110
 #, python-brace-format
 msgid "{name} ({charset})"
 msgstr "{name} ({charset})"
 
-#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73
+#: meld/ui/bufferselectors.py:140 meld/ui/bufferselectors.py:148
 msgid "Plain Text"
 msgstr "Ren tekst"
 
-#: ../meld/ui/filechooser.py:69
+#: meld/ui/filechooser.py:68
 msgid "Autodetect Encoding"
 msgstr "Gjenkjenn tegnkoding"
 
-#: ../meld/ui/filechooser.py:72
+#: meld/ui/filechooser.py:71
 msgid "Current Locale ({})"
 msgstr "Gjeldende lokaltilpassing ({})"
 
-#: ../meld/ui/notebooklabel.py:63
-msgid "Close tab"
-msgstr "Lukk fane"
-
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/ui/statusbar.py:124
+#: meld/ui/statusbar.py:123
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Ln %i, kol %i"
 
-#: ../meld/ui/statusbar.py:177
+#: meld/ui/statusbar.py:183
 msgid "Line you want to move the cursor to"
 msgstr "Linje som du vil flytte skrivemerket til"
 
-#: ../meld/ui/vcdialogs.py:48
+#: meld/ui/vcdialogs.py:50
 msgid "No files will be committed"
 msgstr "Ingen filer vil legges inn"
 
 #. Translators: First %s is replaced by translated "%d unpushed
 #. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:92
+#: meld/vc/git.py:91
 #, python-format
 msgid "%s in %s"
 msgstr "%s i %s"
 
 #. Translators: These messages cover the case where there is
 #. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:93 ../meld/vc/git.py:100
+#: meld/vc/git.py:92 meld/vc/git.py:99
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
 msgstr[0] "%d udyttet innlegging"
 msgstr[1] "%d udyttede innlegginger"
 
-#: ../meld/vc/git.py:95
+#: meld/vc/git.py:94
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "%d grein"
 msgstr[1] "%d greiner"
 
-#: ../meld/vc/git.py:334
+#: meld/vc/git.py:333
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Endret modus fra %s til %s"
 
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:341
 msgid "Partially staged"
 msgstr "Delvis køet"
 
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:341
 msgid "Staged"
 msgstr "Køet"
 
 #. Translators: This is the displayed name of a version control system
 #. when no version control system is actually found.
-#: ../meld/vc/_null.py:37
+#: meld/vc/_null.py:37
 msgid "None"
 msgstr "Ingen"
 
-#: ../meld/vc/svn.py:203
+#: meld/vc/svn.py:203
 #, python-format
 msgid "Rev %s"
 msgstr "Rev. %s"
 
-#: ../meld/vc/_vc.py:54
+#: meld/vc/_vc.py:54
 msgid "Merged"
 msgstr "Flettet"
 
-#: ../meld/vc/_vc.py:54
+#: meld/vc/_vc.py:54
 msgid "Base"
 msgstr "Base"
 
-#: ../meld/vc/_vc.py:54
+#: meld/vc/_vc.py:54
 msgid "Local"
 msgstr "Lokal"
 
-#: ../meld/vc/_vc.py:54
+#: meld/vc/_vc.py:54
 msgid "Remote"
 msgstr "Ekstern"
 
-#: ../meld/vc/_vc.py:70
-msgid "Unversioned"
-msgstr "Ikke versjonert"
-
-#: ../meld/vc/_vc.py:73
+#: meld/vc/_vc.py:73
 msgid "Error"
 msgstr "Feil"
 
-#: ../meld/vc/_vc.py:75
+#: meld/vc/_vc.py:75
 msgid "Newly added"
 msgstr "Nylig lagt til"
 
-#: ../meld/vc/_vc.py:77
+#: meld/vc/_vc.py:77
 msgid "Renamed"
 msgstr "Har fått nytt navn"
 
-#: ../meld/vc/_vc.py:78
+#: meld/vc/_vc.py:78
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../meld/vc/_vc.py:79
+#: meld/vc/_vc.py:79
 msgid "Removed"
 msgstr "Fjernet"
 
-#: ../meld/vc/_vc.py:80
+#: meld/vc/_vc.py:80
 msgid "Missing"
 msgstr "Mangler"
 
-#: ../meld/vc/_vc.py:81
+#: meld/vc/_vc.py:81
 msgid "Not present"
 msgstr "Ikke til stede"
 
+#. Translators: This error message is shown when no
+#. repository of this type is found.
+#: meld/vcview.py:332
+#, python-format
+msgid "%(name)s (not found)"
+msgstr "%(name)s (fant ikke)"
+
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:248
+#: meld/vcview.py:336
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s er ikke installert)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: ../meld/vcview.py:252
+#: meld/vcview.py:340
 #, python-format
-msgid "%(name)s (Invalid repository)"
+msgid "%(name)s (invalid repository)"
 msgstr "%(name)s (ugyldig depot)"
 
-#: ../meld/vcview.py:273
+#: meld/vcview.py:354
 msgid "No valid version control system found in this folder"
 msgstr "Fant ikke et gyldig versjonskontrollsystem i denne mappa"
 
-#: ../meld/vcview.py:275
-msgid "Only one version control system found in this folder"
-msgstr "Fant kun ett versjonskontrollsystem i denne mappa"
-
-#: ../meld/vcview.py:277
+#: meld/vcview.py:356
 msgid "Choose which version control system to use"
 msgstr "Velg hvilket versjonskontrollsystem som skal brukes"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:331
+#: meld/vcview.py:410
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: ../meld/vcview.py:338
+#: meld/vcview.py:417
 msgid "Scanning repository"
 msgstr "Gjennomsøker depot"
 
-#: ../meld/vcview.py:367
+#: meld/vcview.py:446
 #, python-format
 msgid "Scanning %s"
 msgstr "Gjennomsøker %s"
 
-#: ../meld/vcview.py:406
+#: meld/vcview.py:485
 msgid "(Empty)"
 msgstr "(Tom)"
 
-#: ../meld/vcview.py:450
+#: meld/vcview.py:532
 #, python-format
 msgid "%s — local"
 msgstr "%s – lokal"
 
-#: ../meld/vcview.py:451
+#: meld/vcview.py:533
 #, python-format
 msgid "%s — remote"
 msgstr "%s – ekstern"
 
-#: ../meld/vcview.py:459
+#: meld/vcview.py:541
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (lokal, flett, ekstern)"
 
-#: ../meld/vcview.py:464
+#: meld/vcview.py:546
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (ekstern, flett, lokal)"
 
-#: ../meld/vcview.py:475
+#: meld/vcview.py:557
 #, python-format
 msgid "%s — repository"
 msgstr "%s – depot"
 
-#: ../meld/vcview.py:481
+#: meld/vcview.py:563
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (arbeidskopi, depot)"
 
-#: ../meld/vcview.py:485
+#: meld/vcview.py:567
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (depot, arbeidskopi)"
 
-#: ../meld/vcview.py:674
+#: meld/vcview.py:729
 msgid "Remove folder and all its files?"
 msgstr "Fjern mappe og alle filene i den?"
 
-#: ../meld/vcview.py:676
+#: meld/vcview.py:731
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2584,135 +2374,10 @@ msgstr ""
 "Dette vil fjerne alle valgte filer og mapper, og alle filer inni valgte "
 "mapper fra versjonskontrollsystemet."
 
-#: ../meld/vcview.py:785
+#: meld/vcview.py:844
 msgid "Clear"
 msgstr "Tøm"
 
-#~ msgid ""
-#~ "If true, whitespace characters will be drawn in comparisons even if they "
-#~ "are not in a changed area."
-#~ msgstr ""
-#~ "Velg for å tegne blanktegn i sammenligninger selv om de ikke er i et "
-#~ "område som er endret."
-
-#~ msgid "Show overview source map"
-#~ msgstr "Vis oversiktsstolpe"
-
-#~ msgid ""
-#~ "If true, file comparisons will have paired source maps for compared files."
-#~ msgstr ""
-#~ "Hvis sann så vil filsammenligninger vise to fargekodede stolper som "
-#~ "illustrerer forskjeller og likheter mellom filene."
-
-#~ msgid "Style of overview map"
-#~ msgstr "Oversiktsstolpens stil"
-
-#~ msgid "Style options for how the overview map is displayed."
-#~ msgstr "Velg hvordan oversiktsstolpen skal vises."
-
-#~ msgid "Classic (Meld)"
-#~ msgstr "Klassisk (Meld)"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Panes"
-#~ msgstr "Ruter"
-
-#~ msgid "Stop"
-#~ msgstr "Stopp"
-
-#~ msgid "Revert files…"
-#~ msgstr "Gjenopprett filer …"
-
-#~ msgid "Overview Map"
-#~ msgstr "Oversiktsstolpe"
-
-#~ msgid "Version control console"
-#~ msgstr "Versjonskontroll-konsoll"
-
-#~ msgid "Comparison"
-#~ msgstr "Sammenligning"
-
-#~ msgid "_Delete selected"
-#~ msgstr "_Slett valgte"
-
-#~ msgid "_Open Externally"
-#~ msgstr "Åpne e_ksternt"
-
-#~ msgid "Copy chunks"
-#~ msgstr "Kopier stykker"
-
-#~ msgid "_Undo"
-#~ msgstr "_Angre"
-
-#~ msgid "_Redo"
-#~ msgstr "_Gjør om"
-
-#~ msgid "Cu_t"
-#~ msgstr "Klipp _ut"
-
-#~ msgid "_Copy"
-#~ msgstr "_Kopier"
-
-#~ msgid "_Paste"
-#~ msgstr "_Lim inn"
-
-#~ msgid "Switch between Find and Find-and-Replace"
-#~ msgstr "Bytt mellom «søk» og «søk og erstatt»"
-
-#~ msgid "Folder"
-#~ msgstr "Mappe"
-
-#~ msgid "Code Overview"
-#~ msgstr "Kodeoversikt"
-
-#~ msgid "Show overview map"
-#~ msgstr "Vis oversiktsstolpe"
-
-#~ msgid "Overview map style:"
-#~ msgstr "Oversiktsstolpens stil:"
-
-#~ msgid "Simple change map"
-#~ msgstr "Enkelt endringskart"
-
-#~ msgid "Compact source map"
-#~ msgstr "Lite kildekart"
-
-#~ msgid "Full source map"
-#~ msgstr "Stort kildekart"
-
-#~ msgid "Search recent comparisons…"
-#~ msgstr "Søk nylige sammenligninger …"
-
-#~ msgid "Show whitespace"
-#~ msgstr "Vis blanktegn"
-
-#~ msgid "Text wrapping"
-#~ msgstr "Tekstbryting"
-
-#~ msgid "Commit…"
-#~ msgstr "Legg inn …"
-
-#~ msgid "Update"
-#~ msgstr "Oppdater"
-
-#~ msgid "Add"
-#~ msgstr "Legg til"
-
-#~ msgid "Remove"
-#~ msgstr "Fjern"
-
-#~ msgid "Mark as Resolved"
-#~ msgstr "Merk som løst"
-
-#~ msgid "Revert"
-#~ msgstr "Tilbakestill"
-
-#~ msgid "Filename"
-#~ msgstr "Filnavn"
-
-#~ msgid "%(name)s (not found)"
-#~ msgstr "%(name)s (fant ikke)"
-
 #~ msgid "org.gnome.meld"
 #~ msgstr "org.gnome.meld"
 
@@ -2750,6 +2415,15 @@ msgstr "Tøm"
 #~ msgid "Updated translations"
 #~ msgstr "Oppdaterte oversettelser"
 
+#~ msgid "Meld Diff Viewer"
+#~ msgstr "Meld: visning av forskjeller"
+
+#~ msgid "Editable List"
+#~ msgstr "Redigerbar liste"
+
+#~ msgid "Save modified files?"
+#~ msgstr "Lagre endrede filer?"
+
 #~ msgid ""
 #~ "Some files have been modified.\n"
 #~ "Which ones would you like to save?"
@@ -2760,9 +2434,18 @@ msgstr "Tøm"
 #~ msgid "_Save Selected"
 #~ msgstr "_Lagre valgt"
 
+#~ msgid "_Previous"
+#~ msgstr "Forri_ge"
+
+#~ msgid "_Next"
+#~ msgstr "_Neste"
+
 #~ msgid "_Search for"
 #~ msgstr "_Søk etter"
 
+#~ msgid "Replace _With"
+#~ msgstr "Erstatt _med"
+
 #~ msgid "Choose Files"
 #~ msgstr "Velg filer"
 
@@ -2778,6 +2461,9 @@ msgstr "Tøm"
 #~ msgid "Other"
 #~ msgstr "Andre"
 
+#~ msgid "_Directory Comparison"
+#~ msgstr "Sammenlign _mapper"
+
 #~ msgid "Select VC Directory"
 #~ msgstr "Velg katalog under versjonskontroll"
 
@@ -2790,6 +2476,9 @@ msgstr "Tøm"
 #~ msgid "Create a patch"
 #~ msgstr "Lag en endringsfil («patch»)"
 
+#~ msgid "Meld Preferences"
+#~ msgstr "Brukervalg for Meld"
+
 #~ msgid "Ignore changes which insert or delete blank lines"
 #~ msgstr "Se bort fra endringer som setter inn eller sletter tomme linjer"
 
@@ -2807,6 +2496,9 @@ msgstr "Tøm"
 #~ msgid "VC Log"
 #~ msgstr "Vis logg"
 
+#~ msgid "Hide selected"
+#~ msgstr "Skjul valgte"
+
 #, fuzzy
 #~ msgid "Case"
 #~ msgstr "Lukk"
@@ -2815,6 +2507,24 @@ msgstr "Tøm"
 #~ msgid "Ignore case of entries"
 #~ msgstr "Ignorer kataloger:"
 
+#~ msgid "Show identical"
+#~ msgstr "Vis identiske"
+
+#~ msgid "Show new"
+#~ msgstr "Vis ny"
+
+#~ msgid "Show modified"
+#~ msgstr "Vis endret"
+
+#~ msgid "Filters"
+#~ msgstr "Filtre"
+
+#~ msgid "Set active filters"
+#~ msgstr "Sett aktive filtre"
+
+#~ msgid "Hide %s"
+#~ msgstr "Skjul %s"
+
 #~ msgid ""
 #~ "'%s' exists.\n"
 #~ "Overwrite?"
@@ -2873,9 +2583,24 @@ msgstr "Tøm"
 #~ msgstr[0] "%i år"
 #~ msgstr[1] "%i år"
 
+#~ msgid "Create a patch using differences between files"
+#~ msgstr "Lag en endringsfil ut fra forskjellene mellom filene"
+
+#~ msgid "Merge all non-conflicting changes from the left"
+#~ msgstr "Flett alle endringer uten konflikter fra venstre"
+
+#~ msgid "Merge all non-conflicting changes from the right"
+#~ msgstr "Flett alle endringer uten konflikter fra høyre"
+
 #~ msgid "Merge all non-conflicting"
 #~ msgstr "Flett alle uten konflikter"
 
+#~ msgid "Merge all non-conflicting changes from left and right panes"
+#~ msgstr "Flett alle endringer uten konflikter fra venstre og høyre paneler"
+
+#~ msgid "Lock scrolling of all panes"
+#~ msgstr "Lås rulling av alle panelene"
+
 #~ msgid "INS"
 #~ msgstr "INS"
 
@@ -2955,6 +2680,45 @@ msgstr "Tøm"
 #~ msgid "_New..."
 #~ msgstr "_Ny …"
 
+#~ msgid "Close the current file"
+#~ msgstr "Lukk gjeldende fil"
+
+#~ msgid "Quit the program"
+#~ msgstr "Avslutt programmet"
+
+#~ msgid "Redo the last undone action"
+#~ msgstr "Gjør om sist angrede handling"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Klipp ut utvalg"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Kopier utvalg"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "Lim inn fra utklippstavla"
+
+#~ msgid "Search for text"
+#~ msgstr "Søk etter tekst"
+
+#~ msgid "Search forwards for the same text"
+#~ msgstr "Let framover etter samme tekst"
+
+#~ msgid "Search backwards for the same text"
+#~ msgstr "Let bakover etter samme tekst"
+
+#~ msgid "Find and replace text"
+#~ msgstr "Søk og erstatt tekst"
+
+#~ msgid "Configure the application"
+#~ msgstr "Sett opp programmet"
+
+#~ msgid "Next change"
+#~ msgstr "Neste endring"
+
+#~ msgid "_Previous Tab"
+#~ msgstr "_Forrige fane"
+
 #~ msgid "Activate previous tab"
 #~ msgstr "Aktiver forrige fane"
 
@@ -2970,6 +2734,12 @@ msgstr "Tøm"
 #~ msgid "Move current tab to right"
 #~ msgstr "Flytt gjeldende fane til høyre"
 
+#~ msgid "_Contents"
+#~ msgstr "_Innhold"
+
+#~ msgid "Open the Meld manual"
+#~ msgstr "Åpne Meld-håndboka"
+
 #~ msgid "Report _Bug"
 #~ msgstr "Rapporter _feil"
 
@@ -2979,6 +2749,18 @@ msgstr "Tøm"
 #~ msgid "About this program"
 #~ msgstr "Om programmet"
 
+#~ msgid "View the comparison in full screen"
+#~ msgstr "Vis sammenligningen i fullskjerm"
+
+#~ msgid "_Toolbar"
+#~ msgstr "Verkt_øylinje"
+
+#~ msgid "Show or hide the toolbar"
+#~ msgstr "Vis eller skjul verktøylinja"
+
+#~ msgid "_Statusbar"
+#~ msgstr "_Statuslinje"
+
 #~ msgid "Show or hide the statusbar"
 #~ msgstr "Vis eller skjul statuslinja"
 
@@ -3038,6 +2820,17 @@ msgstr "Tøm"
 #~ msgid "Delete locally"
 #~ msgstr "Slett lokalt"
 
+#, fuzzy
+#~ msgid "_Flatten"
+#~ msgstr "_Fil"
+
+#, fuzzy
+#~ msgid "_Modified"
+#~ msgstr "Endret"
+
+#~ msgid "Show ignored files"
+#~ msgstr "Vis ignorerte filer"
+
 #, fuzzy
 #~ msgid "Rev"
 #~ msgstr "Fjern"

From 1e50820a96de77d5004fd7d9e792b031f0d42293 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Sun, 27 Mar 2022 05:53:22 +0000
Subject: [PATCH 080/116] Update Ukrainian translation

---
 po/uk.po | 224 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 119 insertions(+), 105 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index 87463410..ea8c151e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,15 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-02-28 21:56+0000\n"
-"PO-Revision-Date: 2022-03-01 09:57+0200\n"
+"POT-Creation-Date: 2022-03-27 00:52+0000\n"
+"PO-Revision-Date: 2022-03-27 08:50+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Lokalize 20.12.0\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
@@ -829,72 +830,64 @@ msgstr "Об'єднати все з правої панелі"
 msgid "Merge All"
 msgstr "Об'єднати усе"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
-msgid "Add Synchronization Point"
-msgstr "Додати точку синхронізації"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
-msgid "Clear Synchronization Points"
-msgstr "Вилучити точки синхронізації"
-
-#: meld/resources/gtk/menus.ui:103
+#: meld/resources/gtk/menus.ui:92
 msgid "Format as Patch…"
 msgstr "Форматувати як латку…"
 
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:101
 msgid "_Preferences"
 msgstr "_Налаштування"
 
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:105
 msgid "Keyboard Shortcuts"
 msgstr "Клавіатурні скорочення"
 
-#: meld/resources/gtk/menus.ui:120
+#: meld/resources/gtk/menus.ui:109
 msgid "_Help"
 msgstr "_Довідка"
 
-#: meld/resources/gtk/menus.ui:125
+#: meld/resources/gtk/menus.ui:114
 msgid "_About Meld"
 msgstr "_Про Meld"
 
-#: meld/resources/gtk/menus.ui:138
+#: meld/resources/gtk/menus.ui:127
 msgid "File status"
 msgstr "Стан файла"
 
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:129
 msgid "Same"
 msgstr "Однакові"
 
-#: meld/resources/gtk/menus.ui:144
+#: meld/resources/gtk/menus.ui:133
 msgid "New"
 msgstr "Новий"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:137 meld/resources/gtk/menus.ui:160
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Змінено"
 
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:147
 msgid "Ignore filename case"
 msgstr "Ігнорувати регістр літер у назвах файлів"
 
-#: meld/resources/gtk/menus.ui:162
+#: meld/resources/gtk/menus.ui:151
 msgid "Normalize Unicode paths"
 msgstr "Нормалізувати шляхи у Unicode"
 
-#: meld/resources/gtk/menus.ui:175
+#: meld/resources/gtk/menus.ui:164
 msgid "Normal"
 msgstr "Звичайний"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:168 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Поза керуванням версіями"
 
-#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Проігноровано"
 
-#: meld/resources/gtk/menus.ui:190
+#: meld/resources/gtk/menus.ui:179
 msgid "Flatten folders"
 msgstr "Сплощувати теки"
 
@@ -1012,12 +1005,10 @@ msgid "_Compare selected files"
 msgstr "По_рівняти позначені файли"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
-#| msgid "_Compare selected files"
 msgid "_Mark selected file"
 msgstr "Поз_начити вибраний файл"
 
 #: meld/resources/ui/dirdiff-menus.ui:18
-#| msgid "_Compare selected files"
 msgid "Compare _with marked file"
 msgstr "Порівняти _із позначеним файлом"
 
@@ -1164,7 +1155,7 @@ msgstr "Файл 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:558
+#: meld/dirdiff.py:602
 msgid "Name"
 msgstr "Назва"
 
@@ -1204,7 +1195,7 @@ msgstr "Циклічний пошук"
 msgid "Replace _All"
 msgstr "Замінити _все"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1184 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "За_мінити"
 
@@ -1591,12 +1582,12 @@ msgstr "Якщо ви не збережете внесені зміни, їх б
 msgid "Close _without Saving"
 msgstr "Закрити _без збереження"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1183
-#: meld/iohelpers.py:56 meld/iohelpers.py:113
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: meld/resources/ui/save-confirm-dialog.ui:52
+#: meld/resources/ui/save-confirm-dialog.ui:55
 msgid "_Save"
 msgstr "_Зберегти"
 
@@ -1701,53 +1692,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:579 meld/preferences.py:132
+#: meld/dirdiff.py:623 meld/preferences.py:132
 msgid "Size"
 msgstr "Розмір"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:587 meld/preferences.py:133
+#: meld/dirdiff.py:631 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Час внесення змін"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:595 meld/preferences.py:134
+#: meld/dirdiff.py:639 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Час внесення змін (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:603 meld/preferences.py:135
+#: meld/dirdiff.py:647 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Права доступу"
 
-#: meld/dirdiff.py:855
+#: meld/dirdiff.py:900
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (сканування…)"
 
-#: meld/dirdiff.py:887 meld/dirdiff.py:919
+#: meld/dirdiff.py:932 meld/dirdiff.py:964
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Скануємо {folder}"
 
-#: meld/dirdiff.py:1055
+#: meld/dirdiff.py:1100
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Виконано"
 
-#: meld/dirdiff.py:1068
+#: meld/dirdiff.py:1113
 msgid "Folder {} is being compared to itself"
 msgstr "Виконуємо порівняння теки {} із самою собою"
 
-#: meld/dirdiff.py:1074
+#: meld/dirdiff.py:1119
 msgid "Folders have no differences"
 msgstr "Між теками немає відмінностей"
 
-#: meld/dirdiff.py:1076
+#: meld/dirdiff.py:1121
 msgid "Contents of scanned files in folders are identical."
 msgstr "Вміст сканованих файлів у теках є тотожним."
 
-#: meld/dirdiff.py:1078
+#: meld/dirdiff.py:1123
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1755,45 +1746,45 @@ msgstr ""
 "Здається, скановані файли у теках є тотожними, але програма не перевіряла "
 "їхній вміст."
 
-#: meld/dirdiff.py:1081
+#: meld/dirdiff.py:1126
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Використано фільтри файлів, тому сканування виконувалося не для усіх файлів."
 
-#: meld/dirdiff.py:1083
+#: meld/dirdiff.py:1128
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Використано текстові фільтри, що могли замаскувати відмінності у вмісті "
 "файлів."
 
-#: meld/dirdiff.py:1099 meld/filediff.py:1917
+#: meld/dirdiff.py:1144 meld/filediff.py:1980
 msgid "Hide"
 msgstr "Приховати"
 
-#: meld/dirdiff.py:1101 meld/filediff.py:1919 meld/filediff.py:1949
-#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1146 meld/filediff.py:1982 meld/filediff.py:2012
+#: meld/filediff.py:2014 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Сховати"
 
-#: meld/dirdiff.py:1110
+#: meld/dirdiff.py:1155
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Під час сканування цієї теки було виявлено декілька помилок"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1156
 msgid "Files with invalid encodings found"
 msgstr "Знайдено файли із некоректним кодуванням"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1158
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Кодування деяких файлів є помилковим. Назви десь такі:"
 
-#: meld/dirdiff.py:1115
+#: meld/dirdiff.py:1160
 msgid "Files hidden by case insensitive comparison"
 msgstr "Файли приховано нечутливим до регістру порівнянням"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1117
+#: meld/dirdiff.py:1162
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1801,17 +1792,17 @@ msgstr ""
 "Ви виконуєте нечутливе до регістру порівняння в чутливій до регістру "
 "файловій системі. Вказані нижче рядки у цій теці приховано:"
 
-#: meld/dirdiff.py:1128
+#: meld/dirdiff.py:1173
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "«{first_file}» приховано «{second_file}»"
 
-#: meld/dirdiff.py:1187
+#: meld/dirdiff.py:1235
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Замінити теку «%s»?"
 
-#: meld/dirdiff.py:1189
+#: meld/dirdiff.py:1237
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1820,11 +1811,11 @@ msgstr ""
 "У «%s» вже існує інша тека з такою ж назвою.\n"
 "Якщо ви замістите наявну теку, усі файли у ній буде втрачено."
 
-#: meld/dirdiff.py:1202
+#: meld/dirdiff.py:1250
 msgid "Error copying file"
 msgstr "Помилка під час копіювання файла"
 
-#: meld/dirdiff.py:1203
+#: meld/dirdiff.py:1251
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1837,19 +1828,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1228 meld/vcview.py:764
+#: meld/dirdiff.py:1276 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Помилка під час спроби вилучити {}"
 
-#: meld/dirdiff.py:1756
+#: meld/dirdiff.py:1819
 msgid "No folder"
 msgstr "Немає теки"
 
-#: meld/filediff.py:1149
+#: meld/filediff.py:1156
 msgid "Comparison results will be inaccurate"
 msgstr "Результати порівняння не будуть точними"
 
-#: meld/filediff.py:1151
+#: meld/filediff.py:1158
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1857,74 +1848,97 @@ msgstr ""
 "Фільтром змінено кількість рядків у файлі. Підтримку обробки таких змін не "
 "реалізовано. Порівняння може бути неточним."
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1230
 msgid "Mark conflict as resolved?"
 msgstr "Позначити конфлікт як розв'язаний?"
 
-#: meld/filediff.py:1225
+#: meld/filediff.py:1232
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Якщо конфлікт успішно розв'язано, ви можете позначити його як розв'язаний."
 
-#: meld/filediff.py:1227
+#: meld/filediff.py:1235
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: meld/filediff.py:1228
+#: meld/filediff.py:1236
 msgid "Mark _Resolved"
 msgstr "Позначити як _розв'язаний"
 
-#: meld/filediff.py:1591
+#: meld/filediff.py:1427 meld/filediff.py:1443
+msgid "Add Synchronization Point"
+msgstr "Додати точку синхронізації"
+
+#: meld/filediff.py:1431
+#| msgid "Add Synchronization Point"
+msgid "Remove Synchronization Point"
+msgstr "Вилучити точку синхронізації"
+
+#: meld/filediff.py:1435
+#| msgid "Add Synchronization Point"
+msgid "Move Synchronization Point"
+msgstr "Пересунути точку синхронізації"
+
+#: meld/filediff.py:1439
+#| msgid "Add Synchronization Point"
+msgid "Match Synchronization Point"
+msgstr "Встановити відповідність точки синхронізації"
+
+#: meld/filediff.py:1463
+msgid "Clear Synchronization Points"
+msgstr "Вилучити точки синхронізації"
+
+#: meld/filediff.py:1654
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Помилка відкриття файла «%s»."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1663
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Здається, файл %s є файлом двійкових даних."
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1665
 msgid "Do you want to open the file using the default application?"
 msgstr "Хочете відкрити файл за допомогою типової програми?"
 
-#: meld/filediff.py:1604
+#: meld/filediff.py:1667
 msgid "Open"
 msgstr "Відкрити"
 
-#: meld/filediff.py:1626
+#: meld/filediff.py:1689
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Об'єднання файлів"
 
-#: meld/filediff.py:1640
+#: meld/filediff.py:1703
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Обчислення відмінностей"
 
-#: meld/filediff.py:1700
+#: meld/filediff.py:1763
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "До файла %s було внесено зміни на диску"
 
-#: meld/filediff.py:1701
+#: meld/filediff.py:1764
 msgid "Do you want to reload the file?"
 msgstr "Хочете перезавантажити файл?"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1766
 msgid "_Reload"
 msgstr "Перезаванта_жити"
 
-#: meld/filediff.py:1873
+#: meld/filediff.py:1936
 msgid "File {} is being compared to itself"
 msgstr "Виконуємо порівняння файла {} із самим собою"
 
-#: meld/filediff.py:1882
+#: meld/filediff.py:1945
 msgid "Files are identical"
 msgstr "Файли є однаковими"
 
-#: meld/filediff.py:1895
+#: meld/filediff.py:1958
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1932,11 +1946,11 @@ msgstr ""
 "Використано текстові фільтри, які могли замаскувати відмінності між файлами. "
 "Хочете виконати порівняння файлів без фільтрування?"
 
-#: meld/filediff.py:1900
+#: meld/filediff.py:1963
 msgid "Files differ in line endings only"
 msgstr "Файли відрізняються лише символами завершення рядків"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1965
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1945,15 +1959,15 @@ msgstr ""
 "Файли є однаковими, окрім різних символів завершення рядків:\n"
 "%s"
 
-#: meld/filediff.py:1922
+#: meld/filediff.py:1985
 msgid "Show without filters"
 msgstr "Показати без фільтрів"
 
-#: meld/filediff.py:1944
+#: meld/filediff.py:2007
 msgid "Change highlighting incomplete"
 msgstr "Неповна зміна підсвічування"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:2008
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1962,19 +1976,19 @@ msgstr ""
 "наказати Meld підсвітити більші зміни, але вам доведеться почекати, доки "
 "програма виконає ваш наказ."
 
-#: meld/filediff.py:1953
+#: meld/filediff.py:2016
 msgid "Keep highlighting"
 msgstr "Зберігати підсвічування"
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:2018
 msgid "_Keep highlighting"
 msgstr "З_берігати підсвічування"
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:2031
 msgid "Saving failed"
 msgstr "Не вдалося зберегти"
 
-#: meld/filediff.py:1969
+#: meld/filediff.py:2032
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1982,37 +1996,37 @@ msgstr ""
 "Вам варто скопіювати критичні зміни до вікна іншої програми або файла, щоб "
 "уникнути втрати даних."
 
-#: meld/filediff.py:1978
+#: meld/filediff.py:2041
 msgid "Save Left Pane As"
 msgstr "Зберегти ліву панель як"
 
-#: meld/filediff.py:1980
+#: meld/filediff.py:2043
 msgid "Save Middle Pane As"
 msgstr "Зберегти середню панель як"
 
-#: meld/filediff.py:1982
+#: meld/filediff.py:2045
 msgid "Save Right Pane As"
 msgstr "Зберегти праву панель як"
 
-#: meld/filediff.py:1993
+#: meld/filediff.py:2056
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "З часу відкриття до файла %s було внесено зміни на диску"
 
-#: meld/filediff.py:1995
+#: meld/filediff.py:2058
 msgid "If you save it, any external changes will be lost."
 msgstr ""
 "Якщо ви збережете файл, внесені сторонніми програмами зміни буде втрачено."
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2061
 msgid "Save Anyway"
 msgstr "Зберегти попри це"
 
-#: meld/filediff.py:1999
+#: meld/filediff.py:2062
 msgid "Don’t Save"
 msgstr "Не зберігати"
 
-#: meld/filediff.py:2041
+#: meld/filediff.py:2104
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2020,7 +2034,7 @@ msgstr ""
 "У файлі «{}» містяться символи, які не входять до його поточного кодування "
 "«{}»."
 
-#: meld/filediff.py:2045 meld/patchdialog.py:138
+#: meld/filediff.py:2108 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2029,16 +2043,16 @@ msgstr ""
 "Не вдалося зберегти файл. Причина:\n"
 "%s"
 
-#: meld/filediff.py:2049 meld/patchdialog.py:137
+#: meld/filediff.py:2112 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Не вдалося зберегти файл %s."
 
-#: meld/filediff.py:2450
+#: meld/filediff.py:2522
 msgid "Live comparison updating disabled"
 msgstr "Інтерактивне оновлення порівняння вимкнено"
 
-#: meld/filediff.py:2451
+#: meld/filediff.py:2523
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2064,16 +2078,16 @@ msgstr "Не вдалося перемістити «{}» у смітник. О
 msgid "This remote location does not support sending items to the trash."
 msgstr "Ця віддалена адреса не підтримує надсилання об'єктів у смітник."
 
-#: meld/iohelpers.py:57
+#: meld/iohelpers.py:58
 msgid "_Delete Permanently"
 msgstr "В_илучити остаточно"
 
-#: meld/iohelpers.py:107
+#: meld/iohelpers.py:110
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Замінити файл «%s»?"
 
-#: meld/iohelpers.py:109
+#: meld/iohelpers.py:112
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2199,7 +2213,7 @@ msgstr "Для автоматичного об'єднання потрібно 3
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Неможливо порівняти суміш файлів і тек"
 
-#: meld/misc.py:150
+#: meld/misc.py:154
 msgid ""
 "{}\n"
 "\n"
@@ -2211,7 +2225,7 @@ msgstr ""
 "У Meld виникли критичні помилки під час роботи:\n"
 "<tt>{}</tt>"
 
-#: meld/misc.py:201
+#: meld/misc.py:205
 msgid "[None]"
 msgstr "[Немає]"
 

From 7ef58591270aabdaa1d1213218274a92fbec303c Mon Sep 17 00:00:00 2001
From: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date: Sun, 27 Mar 2022 09:46:23 +0000
Subject: [PATCH 081/116] Update Swedish translation

---
 po/sv.po | 216 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 114 insertions(+), 102 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index 44ae3bdb..7c6f2a8e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-02-28 21:56+0000\n"
-"PO-Revision-Date: 2022-03-10 23:40+0100\n"
+"POT-Creation-Date: 2022-03-27 00:52+0000\n"
+"PO-Revision-Date: 2022-03-27 11:44+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -810,72 +810,64 @@ msgstr "Sammanfoga allt från höger"
 msgid "Merge All"
 msgstr "Sammanfoga alla"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
-msgid "Add Synchronization Point"
-msgstr "Lägg till synkroniseringspunkt"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
-msgid "Clear Synchronization Points"
-msgstr "Rensa synkroniseringspunkter"
-
-#: meld/resources/gtk/menus.ui:103
+#: meld/resources/gtk/menus.ui:92
 msgid "Format as Patch…"
 msgstr "Formatera som programfix…"
 
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:101
 msgid "_Preferences"
 msgstr "Inställ_ningar"
 
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:105
 msgid "Keyboard Shortcuts"
 msgstr "Tangentbordsgenvägar"
 
-#: meld/resources/gtk/menus.ui:120
+#: meld/resources/gtk/menus.ui:109
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: meld/resources/gtk/menus.ui:125
+#: meld/resources/gtk/menus.ui:114
 msgid "_About Meld"
 msgstr "_Om Meld"
 
-#: meld/resources/gtk/menus.ui:138
+#: meld/resources/gtk/menus.ui:127
 msgid "File status"
 msgstr "Filstatus"
 
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:129
 msgid "Same"
 msgstr "Samma"
 
-#: meld/resources/gtk/menus.ui:144
+#: meld/resources/gtk/menus.ui:133
 msgid "New"
 msgstr "Nya"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:137 meld/resources/gtk/menus.ui:160
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Ändrade"
 
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:147
 msgid "Ignore filename case"
 msgstr "Ignorera skiftlägeskänslighet för filnamn"
 
-#: meld/resources/gtk/menus.ui:162
+#: meld/resources/gtk/menus.ui:151
 msgid "Normalize Unicode paths"
 msgstr "Normalisera Unicode-sökvägar"
 
-#: meld/resources/gtk/menus.ui:175
+#: meld/resources/gtk/menus.ui:164
 msgid "Normal"
 msgstr "Normala"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:168 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Oversionerade"
 
-#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Ignorerade"
 
-#: meld/resources/gtk/menus.ui:190
+#: meld/resources/gtk/menus.ui:179
 msgid "Flatten folders"
 msgstr "Platta till mappar"
 
@@ -1150,7 +1142,7 @@ msgstr "Fil ett"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:558
+#: meld/dirdiff.py:602
 msgid "Name"
 msgstr "Namn"
 
@@ -1190,7 +1182,7 @@ msgstr "Radbruten"
 msgid "Replace _All"
 msgstr "Ersätt _alla"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1184 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "_Ersätt"
 
@@ -1576,12 +1568,12 @@ msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid."
 msgid "Close _without Saving"
 msgstr "Stäng _utan att spara"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1183
-#: meld/iohelpers.py:56 meld/iohelpers.py:113
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: meld/resources/ui/save-confirm-dialog.ui:52
+#: meld/resources/ui/save-confirm-dialog.ui:55
 msgid "_Save"
 msgstr "_Spara"
 
@@ -1686,95 +1678,95 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:579 meld/preferences.py:132
+#: meld/dirdiff.py:623 meld/preferences.py:132
 msgid "Size"
 msgstr "Storlek"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:587 meld/preferences.py:133
+#: meld/dirdiff.py:631 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Ändringstid"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:595 meld/preferences.py:134
+#: meld/dirdiff.py:639 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Ändringstid (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:603 meld/preferences.py:135
+#: meld/dirdiff.py:647 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Rättigheter"
 
-#: meld/dirdiff.py:855
+#: meld/dirdiff.py:900
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (söker igenom…)"
 
-#: meld/dirdiff.py:887 meld/dirdiff.py:919
+#: meld/dirdiff.py:932 meld/dirdiff.py:964
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Söker igenom {folder}"
 
-#: meld/dirdiff.py:1055
+#: meld/dirdiff.py:1100
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Klar"
 
-#: meld/dirdiff.py:1068
+#: meld/dirdiff.py:1113
 msgid "Folder {} is being compared to itself"
 msgstr "Mappen {} jämförs med sig själv"
 
-#: meld/dirdiff.py:1074
+#: meld/dirdiff.py:1119
 msgid "Folders have no differences"
 msgstr "Mapparna skiljer sig inte åt"
 
-#: meld/dirdiff.py:1076
+#: meld/dirdiff.py:1121
 msgid "Contents of scanned files in folders are identical."
 msgstr "Innehållet i mapparnas avsökta filer är identiskt."
 
-#: meld/dirdiff.py:1078
+#: meld/dirdiff.py:1123
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 "Mapparnas avsökta filer verkar identiska, men innehållet har inte genomsökts."
 
-#: meld/dirdiff.py:1081
+#: meld/dirdiff.py:1126
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Filfilter används, och därför har inte alla filer genomsökts."
 
-#: meld/dirdiff.py:1083
+#: meld/dirdiff.py:1128
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Textfilter används och kan dölja skillnader i innehåll."
 
-#: meld/dirdiff.py:1099 meld/filediff.py:1917
+#: meld/dirdiff.py:1144 meld/filediff.py:1980
 msgid "Hide"
 msgstr "Dölj"
 
-#: meld/dirdiff.py:1101 meld/filediff.py:1919 meld/filediff.py:1949
-#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1146 meld/filediff.py:1982 meld/filediff.py:2012
+#: meld/filediff.py:2014 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Dölj"
 
-#: meld/dirdiff.py:1110
+#: meld/dirdiff.py:1155
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Flera fel inträffade vid avsökning av denna mapp"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1156
 msgid "Files with invalid encodings found"
 msgstr "Filer med ogiltiga teckenkodningar hittades"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1158
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "En del filer hade en felaktig kodning. Namnen är ungefär:"
 
-#: meld/dirdiff.py:1115
+#: meld/dirdiff.py:1160
 msgid "Files hidden by case insensitive comparison"
 msgstr "Filer dolda av skiftlägeskänslig jämförelse"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1117
+#: meld/dirdiff.py:1162
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1782,17 +1774,17 @@ msgstr ""
 "Du gör en skiftlägesokänslig jämförelse på ett skiftlägeskänsligt filsystem. "
 "En del filer syns inte:"
 
-#: meld/dirdiff.py:1128
+#: meld/dirdiff.py:1173
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "”{first_file}” dold av ”{second_file}”"
 
-#: meld/dirdiff.py:1187
+#: meld/dirdiff.py:1235
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ersätt mappen ”%s”?"
 
-#: meld/dirdiff.py:1189
+#: meld/dirdiff.py:1237
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1801,11 +1793,11 @@ msgstr ""
 "En annan mapp med samma namn existerar redan i ”%s”.\n"
 "Om du ersätter befintlig mapp kommer alla filer att förloras."
 
-#: meld/dirdiff.py:1202
+#: meld/dirdiff.py:1250
 msgid "Error copying file"
 msgstr "Fel vid filkopiering"
 
-#: meld/dirdiff.py:1203
+#: meld/dirdiff.py:1251
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1818,19 +1810,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1228 meld/vcview.py:764
+#: meld/dirdiff.py:1276 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Fel vid borttagning av {}"
 
-#: meld/dirdiff.py:1756
+#: meld/dirdiff.py:1819
 msgid "No folder"
 msgstr "Ingen mapp"
 
-#: meld/filediff.py:1149
+#: meld/filediff.py:1156
 msgid "Comparison results will be inaccurate"
 msgstr "Jämförelseresultat kommer att bli osäkra"
 
-#: meld/filediff.py:1151
+#: meld/filediff.py:1158
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1838,73 +1830,93 @@ msgstr ""
 "Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen "
 "kommer att vara osäker."
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1230
 msgid "Mark conflict as resolved?"
 msgstr "Markera konflikten som löst?"
 
-#: meld/filediff.py:1225
+#: meld/filediff.py:1232
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "Om konflikten gick att lösa kan du markera den som löst nu."
 
-#: meld/filediff.py:1227
+#: meld/filediff.py:1235
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: meld/filediff.py:1228
+#: meld/filediff.py:1236
 msgid "Mark _Resolved"
 msgstr "Markera som _löst"
 
-#: meld/filediff.py:1591
+#: meld/filediff.py:1427 meld/filediff.py:1443
+msgid "Add Synchronization Point"
+msgstr "Lägg till synkroniseringspunkt"
+
+#: meld/filediff.py:1431
+msgid "Remove Synchronization Point"
+msgstr "Ta bort synkroniseringspunkt"
+
+#: meld/filediff.py:1435
+msgid "Move Synchronization Point"
+msgstr "Flytta synkroniseringspunkt"
+
+#: meld/filediff.py:1439
+msgid "Match Synchronization Point"
+msgstr "Matcha synkroniseringspunkt"
+
+#: meld/filediff.py:1463
+msgid "Clear Synchronization Points"
+msgstr "Rensa synkroniseringspunkter"
+
+#: meld/filediff.py:1654
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1663
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Filen %s verkar vara en binärfil."
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1665
 msgid "Do you want to open the file using the default application?"
 msgstr "Vill du öppna filen med standardprogrammet?"
 
-#: meld/filediff.py:1604
+#: meld/filediff.py:1667
 msgid "Open"
 msgstr "Öppna"
 
-#: meld/filediff.py:1626
+#: meld/filediff.py:1689
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Sammanfogar filer"
 
-#: meld/filediff.py:1640
+#: meld/filediff.py:1703
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Beräknar skillnader"
 
-#: meld/filediff.py:1700
+#: meld/filediff.py:1763
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Filen %s har ändrats på disk"
 
-#: meld/filediff.py:1701
+#: meld/filediff.py:1764
 msgid "Do you want to reload the file?"
 msgstr "Vill du läsa om filen?"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1766
 msgid "_Reload"
 msgstr "_Läs om"
 
-#: meld/filediff.py:1873
+#: meld/filediff.py:1936
 msgid "File {} is being compared to itself"
 msgstr "Filen {} jämförs med sig själv"
 
-#: meld/filediff.py:1882
+#: meld/filediff.py:1945
 msgid "Files are identical"
 msgstr "Filerna är identiska"
 
-#: meld/filediff.py:1895
+#: meld/filediff.py:1958
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1912,11 +1924,11 @@ msgstr ""
 "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
 "ofiltrerade filerna?"
 
-#: meld/filediff.py:1900
+#: meld/filediff.py:1963
 msgid "Files differ in line endings only"
 msgstr "Filer skiljer sig endast vad gäller radslut"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1965
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1925,15 +1937,15 @@ msgstr ""
 "Filerna är identiska förutom radavsluten:\n"
 "%s"
 
-#: meld/filediff.py:1922
+#: meld/filediff.py:1985
 msgid "Show without filters"
 msgstr "Visa utan filer"
 
-#: meld/filediff.py:1944
+#: meld/filediff.py:2007
 msgid "Change highlighting incomplete"
 msgstr "Ändra markering av ofärdiga"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:2008
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1942,19 +1954,19 @@ msgstr ""
 "Meld till att längre tid på sig att markera större ändringar, men det kan "
 "bli långsamt."
 
-#: meld/filediff.py:1953
+#: meld/filediff.py:2016
 msgid "Keep highlighting"
 msgstr "Använd markering"
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:2018
 msgid "_Keep highlighting"
 msgstr "_Använd markering"
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:2031
 msgid "Saving failed"
 msgstr "Misslyckades med att spara"
 
-#: meld/filediff.py:1969
+#: meld/filediff.py:2032
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1962,36 +1974,36 @@ msgstr ""
 "Överväg att kopiera kritiska ändringar till ett annat program eller en annan "
 "fil för att undvika förlust av data."
 
-#: meld/filediff.py:1978
+#: meld/filediff.py:2041
 msgid "Save Left Pane As"
 msgstr "Spara vänsterpanel som"
 
-#: meld/filediff.py:1980
+#: meld/filediff.py:2043
 msgid "Save Middle Pane As"
 msgstr "Spara mittenpanel som"
 
-#: meld/filediff.py:1982
+#: meld/filediff.py:2045
 msgid "Save Right Pane As"
 msgstr "Spara högerpanel som"
 
-#: meld/filediff.py:1993
+#: meld/filediff.py:2056
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Filen %s har ändrats på disk sedan den öppnades"
 
-#: meld/filediff.py:1995
+#: meld/filediff.py:2058
 msgid "If you save it, any external changes will be lost."
 msgstr "Om du sparar den kommer alla externa ändringar att gå förlorade."
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2061
 msgid "Save Anyway"
 msgstr "Spara ändå"
 
-#: meld/filediff.py:1999
+#: meld/filediff.py:2062
 msgid "Don’t Save"
 msgstr "Spara inte"
 
-#: meld/filediff.py:2041
+#: meld/filediff.py:2104
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1999,7 +2011,7 @@ msgstr ""
 "Filen ”{}” innehåller tecken som inte kan kodas med dess aktuella kodning "
 "”{}”."
 
-#: meld/filediff.py:2045 meld/patchdialog.py:138
+#: meld/filediff.py:2108 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2008,16 +2020,16 @@ msgstr ""
 "Kunde in spara fil beroende på:\n"
 "%s"
 
-#: meld/filediff.py:2049 meld/patchdialog.py:137
+#: meld/filediff.py:2112 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Kunde inte spara filen %s."
 
-#: meld/filediff.py:2450
+#: meld/filediff.py:2522
 msgid "Live comparison updating disabled"
 msgstr "Inaktivera realtidsuppdateringar av jämförelser"
 
-#: meld/filediff.py:2451
+#: meld/filediff.py:2523
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2045,16 +2057,16 @@ msgstr ""
 msgid "This remote location does not support sending items to the trash."
 msgstr "Denna fjärrplats stöder inte att lägga objekt i papperskorgen."
 
-#: meld/iohelpers.py:57
+#: meld/iohelpers.py:58
 msgid "_Delete Permanently"
 msgstr "_Ta bort permanent"
 
-#: meld/iohelpers.py:107
+#: meld/iohelpers.py:110
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Ersätt filen ”%s”?"
 
-#: meld/iohelpers.py:109
+#: meld/iohelpers.py:112
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2180,7 +2192,7 @@ msgstr "Behöver tre filer för att sammanfoga automatiskt, fick: %r"
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Kan inte jämföra en blandning av filer och kataloger"
 
-#: meld/misc.py:150
+#: meld/misc.py:154
 msgid ""
 "{}\n"
 "\n"
@@ -2192,7 +2204,7 @@ msgstr ""
 "Meld stötte på ett kritiskt fel under körning:\n"
 "<tt>{}</tt>"
 
-#: meld/misc.py:201
+#: meld/misc.py:205
 msgid "[None]"
 msgstr "[Ingen]"
 

From 02260e5885eb8d7de9e6b4861434c05b150b6f09 Mon Sep 17 00:00:00 2001
From: Sergej A <sw@atrus.ru>
Date: Sun, 27 Mar 2022 12:07:10 +0000
Subject: [PATCH 082/116] Update Russian translation

---
 po/ru.po | 177 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 89 insertions(+), 88 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index b4cc1c87..2a61a608 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Meld 1.4.0\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-01-30 21:55+0000\n"
-"PO-Revision-Date: 2022-02-20 20:20+1000\n"
+"POT-Creation-Date: 2022-03-15 12:52+0000\n"
+"PO-Revision-Date: 2022-03-19 08:23+1000\n"
 "Last-Translator: Ser82-png <sw@atrus.ru>\n"
 "Language-Team: Русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
@@ -1011,30 +1011,38 @@ msgid "_Compare selected files"
 msgstr "Сравнить выбранные файлы"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+msgid "_Mark selected file"
+msgstr "_Отметить выбранные файлы"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Compare _with marked file"
+msgstr "Сравнить _выбранные файлы"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "Копировать в левую панель"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "Копировать в правую панель"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "Удалить выделенное"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "Свернуть рекурсивно"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "Развернуть рекурсивно"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "Открыть внешним приложением"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "Копировать пути файлов"
 
@@ -1153,7 +1161,7 @@ msgstr "Файл 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:556
+#: meld/dirdiff.py:602
 msgid "Name"
 msgstr "Имя"
 
@@ -1193,7 +1201,7 @@ msgstr "Перенесённый"
 msgid "Replace _All"
 msgstr "Заменить _все"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1180 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "_Заменить"
 
@@ -1578,12 +1586,12 @@ msgstr "Если вы не сохраните изменения они буду
 msgid "Close _without Saving"
 msgstr "Закрыть _без сохранения"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1179
-#: meld/iohelpers.py:56 meld/iohelpers.py:113
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "_Отменить"
 
-#: meld/resources/ui/save-confirm-dialog.ui:52
+#: meld/resources/ui/save-confirm-dialog.ui:55
 msgid "_Save"
 msgstr "С_охранить"
 
@@ -1688,98 +1696,97 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:577 meld/preferences.py:132
+#: meld/dirdiff.py:623 meld/preferences.py:132
 msgid "Size"
 msgstr "Размер"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:585 meld/preferences.py:133
+#: meld/dirdiff.py:631 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Время изменения"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:593 meld/preferences.py:134
+#: meld/dirdiff.py:639 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Время изменения (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:601 meld/preferences.py:135
+#: meld/dirdiff.py:647 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Права доступа"
 
-#: meld/dirdiff.py:851
+#: meld/dirdiff.py:900
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (сканирование…)"
 
-#: meld/dirdiff.py:883 meld/dirdiff.py:915
+#: meld/dirdiff.py:932 meld/dirdiff.py:964
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Сканирование {folder}"
 
-#: meld/dirdiff.py:1051
+#: meld/dirdiff.py:1100
 #, python-brace-format
-#| msgid "[%s] Done"
 msgid "[{label}] Done"
 msgstr "[{label}] Готово"
 
-#: meld/dirdiff.py:1064
+#: meld/dirdiff.py:1113
 msgid "Folder {} is being compared to itself"
 msgstr "Выполняется сравнение папки {} с самой собой"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1119
 msgid "Folders have no differences"
 msgstr "Папки не имеют различий"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1121
 msgid "Contents of scanned files in folders are identical."
 msgstr "Содержание сканированных файлов в папках идентично."
 
-#: meld/dirdiff.py:1074
+#: meld/dirdiff.py:1123
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 "Структура папок идентична, но содержание файлов не было просканированно."
 
-#: meld/dirdiff.py:1077
+#: meld/dirdiff.py:1126
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Включены фильтры файлов, поэтому часть файлов не учтена."
 
-#: meld/dirdiff.py:1079
+#: meld/dirdiff.py:1128
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Используются текстовые фильтры, которые могут маскировать различия между "
 "файлами."
 
-#: meld/dirdiff.py:1095 meld/filediff.py:1917
+#: meld/dirdiff.py:1144 meld/filediff.py:1919
 msgid "Hide"
 msgstr "Скрыть"
 
-#: meld/dirdiff.py:1097 meld/filediff.py:1919 meld/filediff.py:1949
-#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1146 meld/filediff.py:1921 meld/filediff.py:1951
+#: meld/filediff.py:1953 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "С_крыть"
 
-#: meld/dirdiff.py:1106
+#: meld/dirdiff.py:1155
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "При сканировании этой папки произошло несколько ошибок"
 
-#: meld/dirdiff.py:1107
+#: meld/dirdiff.py:1156
 msgid "Files with invalid encodings found"
 msgstr "Найдены файлы с неверными кодировками"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1109
+#: meld/dirdiff.py:1158
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Некоторые файлы имеют неправильную кодировку. Названия что-то вроде:"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1160
 msgid "Files hidden by case insensitive comparison"
 msgstr "Файлы, исключённые из сравнения из-за разного регистра"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1162
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1787,18 +1794,17 @@ msgstr ""
 "Вы запускаете сравнение без учёта регистра в файловой системе, "
 "чувствительной к регистру. Следующие файлы в этой папке скрыты:"
 
-#: meld/dirdiff.py:1124
+#: meld/dirdiff.py:1173
 #, python-brace-format
-#| msgid "“%s” hidden by “%s”"
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}” скрыто “{second_file}”"
 
-#: meld/dirdiff.py:1183
+#: meld/dirdiff.py:1235
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Заменить папку “%s”?"
 
-#: meld/dirdiff.py:1185
+#: meld/dirdiff.py:1237
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1807,17 +1813,12 @@ msgstr ""
 "Другая папка с таким же именем уже существует в “%s”.\n"
 "При замене существующей папки всё содержимое будет утеряно."
 
-#: meld/dirdiff.py:1198
+#: meld/dirdiff.py:1250
 msgid "Error copying file"
 msgstr "Ошибка при копировании файла"
 
-#: meld/dirdiff.py:1199
+#: meld/dirdiff.py:1251
 #, python-brace-format
-#| msgid ""
-#| "Couldn’t copy %s\n"
-#| "to %s.\n"
-#| "\n"
-#| "%s"
 msgid ""
 "Couldn’t copy {source}\n"
 "to {dest}.\n"
@@ -1829,11 +1830,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1224 meld/vcview.py:764
+#: meld/dirdiff.py:1276 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Ошибка при удалении {}"
 
-#: meld/dirdiff.py:1715
+#: meld/dirdiff.py:1819
 msgid "No folder"
 msgstr "Нет папки"
 
@@ -1857,64 +1858,64 @@ msgid ""
 msgstr ""
 "Если конфликт был успешно разрешён, вы можете отметить его как решённый."
 
-#: meld/filediff.py:1227
+#: meld/filediff.py:1228
 msgid "Cancel"
 msgstr "Отменить"
 
-#: meld/filediff.py:1228
+#: meld/filediff.py:1229
 msgid "Mark _Resolved"
 msgstr "Отметить как _разрешённый"
 
-#: meld/filediff.py:1591
+#: meld/filediff.py:1593
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Возникла проблема при открытии файла “%s”."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1602
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Файл %s выглядит как двоичный файл."
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1604
 msgid "Do you want to open the file using the default application?"
 msgstr "Открыть выбранный файл в приложении по умолчанию?"
 
-#: meld/filediff.py:1604
+#: meld/filediff.py:1606
 msgid "Open"
 msgstr "Открыть"
 
-#: meld/filediff.py:1626
+#: meld/filediff.py:1628
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Объединение файлов"
 
-#: meld/filediff.py:1640
+#: meld/filediff.py:1642
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Вычисление различий"
 
-#: meld/filediff.py:1700
+#: meld/filediff.py:1702
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Файл %s изменился на диске"
 
-#: meld/filediff.py:1701
+#: meld/filediff.py:1703
 msgid "Do you want to reload the file?"
 msgstr "Хотите перезагрузить файл?"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1705
 msgid "_Reload"
 msgstr "_Перезагрузить"
 
-#: meld/filediff.py:1873
+#: meld/filediff.py:1875
 msgid "File {} is being compared to itself"
 msgstr "Выполняется сравнение файла {} с самим собой"
 
-#: meld/filediff.py:1882
+#: meld/filediff.py:1884
 msgid "Files are identical"
 msgstr "Файлы идентичны"
 
-#: meld/filediff.py:1895
+#: meld/filediff.py:1897
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1922,11 +1923,11 @@ msgstr ""
 "Используются текстовые фильтры, которые могут маскировать различия между "
 "файлами. Хотите сравнить файлы без использования фильтров?"
 
-#: meld/filediff.py:1900
+#: meld/filediff.py:1902
 msgid "Files differ in line endings only"
 msgstr "Файлы различаются только окончаниями строк"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1904
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1935,15 +1936,15 @@ msgstr ""
 "Файлы идентичны, но различаются окончаниями строк:\n"
 "%s"
 
-#: meld/filediff.py:1922
+#: meld/filediff.py:1924
 msgid "Show without filters"
 msgstr "Показать без фильтров"
 
-#: meld/filediff.py:1944
+#: meld/filediff.py:1946
 msgid "Change highlighting incomplete"
 msgstr "Выделение изменений неполное"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1947
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1952,19 +1953,19 @@ msgstr ""
 "можете дать Meld больше времени, чтобы их выделить, возможно это будет "
 "медленно."
 
-#: meld/filediff.py:1953
+#: meld/filediff.py:1955
 msgid "Keep highlighting"
 msgstr "Сохранить выделение"
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:1957
 msgid "_Keep highlighting"
 msgstr "Сохранить в_ыделение"
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:1970
 msgid "Saving failed"
 msgstr "Сохранение не удалось"
 
-#: meld/filediff.py:1969
+#: meld/filediff.py:1971
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1972,42 +1973,42 @@ msgstr ""
 "Рекомендуется скопировать критичные изменения в другую программу или файл "
 "для избежания потери данных."
 
-#: meld/filediff.py:1978
+#: meld/filediff.py:1980
 msgid "Save Left Pane As"
 msgstr "Сохранить левую панель как"
 
-#: meld/filediff.py:1980
+#: meld/filediff.py:1982
 msgid "Save Middle Pane As"
 msgstr "Сохранить среднюю панель как"
 
-#: meld/filediff.py:1982
+#: meld/filediff.py:1984
 msgid "Save Right Pane As"
 msgstr "Сохранить правую панель как"
 
-#: meld/filediff.py:1993
+#: meld/filediff.py:1995
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Файл %s изменился на диске, так как он был открыт"
 
-#: meld/filediff.py:1995
+#: meld/filediff.py:1997
 msgid "If you save it, any external changes will be lost."
 msgstr "Если вы сохраните его, любые внешние изменения будут потеряны."
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2000
 msgid "Save Anyway"
 msgstr "Всё равно сохранить"
 
-#: meld/filediff.py:1999
+#: meld/filediff.py:2001
 msgid "Don’t Save"
 msgstr "Не сохранять"
 
-#: meld/filediff.py:2041
+#: meld/filediff.py:2043
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
 msgstr "Файл “{}” содержит символы, недопустимые для текущей кодировки “{}”."
 
-#: meld/filediff.py:2045 meld/patchdialog.py:138
+#: meld/filediff.py:2047 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2016,16 +2017,16 @@ msgstr ""
 "Нельзя сохранить файл по следующей причине:\n"
 "%s"
 
-#: meld/filediff.py:2049 meld/patchdialog.py:137
+#: meld/filediff.py:2051 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Не удалось сохранить файл %s."
 
-#: meld/filediff.py:2450
+#: meld/filediff.py:2452
 msgid "Live comparison updating disabled"
 msgstr "Обновление Онлайн сравнения отключено"
 
-#: meld/filediff.py:2451
+#: meld/filediff.py:2453
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2052,16 +2053,16 @@ msgstr ""
 msgid "This remote location does not support sending items to the trash."
 msgstr "Этот сетевой адрес не поддерживает удаление элементов в корзину."
 
-#: meld/iohelpers.py:57
+#: meld/iohelpers.py:58
 msgid "_Delete Permanently"
 msgstr "Удалить изменения навсегда"
 
-#: meld/iohelpers.py:107
+#: meld/iohelpers.py:110
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Заменить файл “%s”?"
 
-#: meld/iohelpers.py:109
+#: meld/iohelpers.py:112
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2187,7 +2188,7 @@ msgstr "Необходимо три файла для автоматическо
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Можно сравнивать только файлы или только каталоги"
 
-#: meld/misc.py:150
+#: meld/misc.py:154
 msgid ""
 "{}\n"
 "\n"
@@ -2199,7 +2200,7 @@ msgstr ""
 "Meld столкнулся с критической ошибкой во время запуска:\n"
 "<tt>{}</tt>"
 
-#: meld/misc.py:201
+#: meld/misc.py:205
 msgid "[None]"
 msgstr "[Нет]"
 

From 9e8d441ba30153c9bf4f7d9259098f5396123b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Sun, 27 Mar 2022 14:52:17 +0200
Subject: [PATCH 083/116] Update Polish translation

---
 po/pl.po | 216 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 114 insertions(+), 102 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 7720633a..7699ca2d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-02-28 21:56+0000\n"
-"PO-Revision-Date: 2022-03-06 12:30+0100\n"
+"POT-Creation-Date: 2022-03-27 00:52+0000\n"
+"PO-Revision-Date: 2022-03-27 14:50+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -826,72 +826,64 @@ msgstr "Scal wszystkie z prawej"
 msgid "Merge All"
 msgstr "Scal wszystkie"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
-msgid "Add Synchronization Point"
-msgstr "Dodaj punkt synchronizacji"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
-msgid "Clear Synchronization Points"
-msgstr "Wyczyść punkty synchronizacji"
-
-#: meld/resources/gtk/menus.ui:103
+#: meld/resources/gtk/menus.ui:92
 msgid "Format as Patch…"
 msgstr "Utwórz poprawkę…"
 
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:101
 msgid "_Preferences"
 msgstr "P_referencje"
 
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:105
 msgid "Keyboard Shortcuts"
 msgstr "Skróty klawiszowe"
 
-#: meld/resources/gtk/menus.ui:120
+#: meld/resources/gtk/menus.ui:109
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: meld/resources/gtk/menus.ui:125
+#: meld/resources/gtk/menus.ui:114
 msgid "_About Meld"
 msgstr "_O programie"
 
-#: meld/resources/gtk/menus.ui:138
+#: meld/resources/gtk/menus.ui:127
 msgid "File status"
 msgstr "Stan pliku"
 
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:129
 msgid "Same"
 msgstr "Takie same"
 
-#: meld/resources/gtk/menus.ui:144
+#: meld/resources/gtk/menus.ui:133
 msgid "New"
 msgstr "Nowe"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:137 meld/resources/gtk/menus.ui:160
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Zmodyfikowane"
 
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:147
 msgid "Ignore filename case"
 msgstr "Ignorowanie wielkości liter w nazwach plików"
 
-#: meld/resources/gtk/menus.ui:162
+#: meld/resources/gtk/menus.ui:151
 msgid "Normalize Unicode paths"
 msgstr "Normalizowanie ścieżek Unicode"
 
-#: meld/resources/gtk/menus.ui:175
+#: meld/resources/gtk/menus.ui:164
 msgid "Normal"
 msgstr "Zwykłe"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:168 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Poza systemem kontroli wersji"
 
-#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Zignorowane"
 
-#: meld/resources/gtk/menus.ui:190
+#: meld/resources/gtk/menus.ui:179
 msgid "Flatten folders"
 msgstr "Uprość wyświetlaną strukturę katalogów"
 
@@ -1161,7 +1153,7 @@ msgstr "1. plik"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:558
+#: meld/dirdiff.py:602
 msgid "Name"
 msgstr "Nazwa"
 
@@ -1201,7 +1193,7 @@ msgstr "Automatyczny powrót do początku"
 msgid "Replace _All"
 msgstr "Zamień _wszystkie"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1184 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "Z_amień"
 
@@ -1589,12 +1581,12 @@ msgstr ""
 msgid "Close _without Saving"
 msgstr "Zamknij _bez zapisywania"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1183
-#: meld/iohelpers.py:56 meld/iohelpers.py:113
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: meld/resources/ui/save-confirm-dialog.ui:52
+#: meld/resources/ui/save-confirm-dialog.ui:55
 msgid "_Save"
 msgstr "_Zapisz"
 
@@ -1699,53 +1691,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:579 meld/preferences.py:132
+#: meld/dirdiff.py:623 meld/preferences.py:132
 msgid "Size"
 msgstr "Rozmiar"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:587 meld/preferences.py:133
+#: meld/dirdiff.py:631 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Czas modyfikacji"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:595 meld/preferences.py:134
+#: meld/dirdiff.py:639 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Czas modyfikacji (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:603 meld/preferences.py:135
+#: meld/dirdiff.py:647 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: meld/dirdiff.py:855
+#: meld/dirdiff.py:900
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (skanowanie…)"
 
-#: meld/dirdiff.py:887 meld/dirdiff.py:919
+#: meld/dirdiff.py:932 meld/dirdiff.py:964
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Skanowanie {folder}"
 
-#: meld/dirdiff.py:1055
+#: meld/dirdiff.py:1100
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Ukończono"
 
-#: meld/dirdiff.py:1068
+#: meld/dirdiff.py:1113
 msgid "Folder {} is being compared to itself"
 msgstr "Katalog {} jest porównywany z samym sobą"
 
-#: meld/dirdiff.py:1074
+#: meld/dirdiff.py:1119
 msgid "Folders have no differences"
 msgstr "Katalogi się nie różnią"
 
-#: meld/dirdiff.py:1076
+#: meld/dirdiff.py:1121
 msgid "Contents of scanned files in folders are identical."
 msgstr "Treść zeskanowanych plików w katalogach jest identyczna."
 
-#: meld/dirdiff.py:1078
+#: meld/dirdiff.py:1123
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1753,44 +1745,44 @@ msgstr ""
 "Zeskanowane pliki wydają się identyczne, ale treść mogła nie zostać "
 "zeskanowana."
 
-#: meld/dirdiff.py:1081
+#: meld/dirdiff.py:1126
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Filtry plików są używane, więc nie wszystkie pliki zostały zeskanowane."
 
-#: meld/dirdiff.py:1083
+#: meld/dirdiff.py:1128
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Filtry tekstowe są używane i mogą ukrywać różnice między plikami."
 
-#: meld/dirdiff.py:1099 meld/filediff.py:1917
+#: meld/dirdiff.py:1144 meld/filediff.py:1980
 msgid "Hide"
 msgstr "Ukryj"
 
-#: meld/dirdiff.py:1101 meld/filediff.py:1919 meld/filediff.py:1949
-#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1146 meld/filediff.py:1982 meld/filediff.py:2012
+#: meld/filediff.py:2014 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Ukryj"
 
-#: meld/dirdiff.py:1110
+#: meld/dirdiff.py:1155
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Wystąpiło wiele błędów podczas skanowania tego katalogu"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1156
 msgid "Files with invalid encodings found"
 msgstr "Odnaleziono pliki z nieprawidłowym kodowaniem znaków"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1158
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Niektóre pliki mają nieprawidłowe kodowanie znaków. Nazwy tych plików to:"
 
-#: meld/dirdiff.py:1115
+#: meld/dirdiff.py:1160
 msgid "Files hidden by case insensitive comparison"
 msgstr "Pliku ukryte przez porównywanie bez uwzględniania wielkości liter"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1117
+#: meld/dirdiff.py:1162
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1799,17 +1791,17 @@ msgstr ""
 "w systemie plików, który rozróżnia wielkość liter. Następujące pliki w tym "
 "katalogu zostały ukryte:"
 
-#: meld/dirdiff.py:1128
+#: meld/dirdiff.py:1173
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "„{first_file}” ukryty przez „{second_file}”"
 
-#: meld/dirdiff.py:1187
+#: meld/dirdiff.py:1235
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Zastąpić katalog „%s”?"
 
-#: meld/dirdiff.py:1189
+#: meld/dirdiff.py:1237
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1819,11 +1811,11 @@ msgstr ""
 "Zastąpienie istniejącego katalogu spowoduje utratę wszystkich plików w nim "
 "zawartych."
 
-#: meld/dirdiff.py:1202
+#: meld/dirdiff.py:1250
 msgid "Error copying file"
 msgstr "Błąd podczas kopiowania pliku"
 
-#: meld/dirdiff.py:1203
+#: meld/dirdiff.py:1251
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1836,19 +1828,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1228 meld/vcview.py:764
+#: meld/dirdiff.py:1276 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Błąd podczas usuwania {}"
 
-#: meld/dirdiff.py:1756
+#: meld/dirdiff.py:1819
 msgid "No folder"
 msgstr "Brak katalogu"
 
-#: meld/filediff.py:1149
+#: meld/filediff.py:1156
 msgid "Comparison results will be inaccurate"
 msgstr "Wyniki porównania będą niepoprawne"
 
-#: meld/filediff.py:1151
+#: meld/filediff.py:1158
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1856,75 +1848,95 @@ msgstr ""
 "Filtr zmienił liczbę wierszy w pliku, co nie jest obsługiwane. Porównanie "
 "będzie niepoprawne."
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1230
 msgid "Mark conflict as resolved?"
 msgstr "Oznaczyć konflikt jako rozwiązany?"
 
-#: meld/filediff.py:1225
+#: meld/filediff.py:1232
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Jeśli konflikt został pomyślnie rozwiązany, to można go teraz jako taki "
 "oznaczyć."
 
-#: meld/filediff.py:1227
+#: meld/filediff.py:1235
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: meld/filediff.py:1228
+#: meld/filediff.py:1236
 msgid "Mark _Resolved"
 msgstr "Oznacz jako _rozwiązane"
 
-#: meld/filediff.py:1591
+#: meld/filediff.py:1427 meld/filediff.py:1443
+msgid "Add Synchronization Point"
+msgstr "Dodaj punkt synchronizacji"
+
+#: meld/filediff.py:143
+msgid "Remove Synchronization Point"
+msgstr "Usuń punkt synchronizacji"
+
+#: meld/filediff.py:1435
+msgid "Move Synchronization Point"
+msgstr "Przenieś punkt synchronizacji"
+
+#: meld/filediff.py:1439
+msgid "Match Synchronization Point"
+msgstr "Dopasuj punkt synchronizacji"
+
+#: meld/filediff.py:1463
+msgid "Clear Synchronization Points"
+msgstr "Wyczyść punkty synchronizacji"
+
+#: meld/filediff.py:1654
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Wystąpił problem podczas otwierania pliku „%s”."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1663
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Plik %s wygląda na plik binarny."
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1665
 msgid "Do you want to open the file using the default application?"
 msgstr "Otworzyć go w domyślnym programie?"
 
-#: meld/filediff.py:1604
+#: meld/filediff.py:1667
 msgid "Open"
 msgstr "Otwórz"
 
-#: meld/filediff.py:1626
+#: meld/filediff.py:1689
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Scalanie plików"
 
-#: meld/filediff.py:1640
+#: meld/filediff.py:1703
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Analizowanie różnic"
 
-#: meld/filediff.py:1700
+#: meld/filediff.py:1763
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Plik %s został zmieniony na dysku"
 
-#: meld/filediff.py:1701
+#: meld/filediff.py:1764
 msgid "Do you want to reload the file?"
 msgstr "Ponownie wczytać plik?"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1766
 msgid "_Reload"
 msgstr "_Wczytaj ponownie"
 
-#: meld/filediff.py:1873
+#: meld/filediff.py:1936
 msgid "File {} is being compared to itself"
 msgstr "Plik {} jest porównywany z samym sobą"
 
-#: meld/filediff.py:1882
+#: meld/filediff.py:1945
 msgid "Files are identical"
 msgstr "Pliki są identyczne"
 
-#: meld/filediff.py:1895
+#: meld/filediff.py:1958
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1932,11 +1944,11 @@ msgstr ""
 "Filtry tekstowe są używane i mogą ukrywać różnice między plikami. Porównać "
 "pliki bez uwzględniania filtrów?"
 
-#: meld/filediff.py:1900
+#: meld/filediff.py:1963
 msgid "Files differ in line endings only"
 msgstr "Pliki różnią się tylko znacznikami końca wierszy"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1965
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1945,15 +1957,15 @@ msgstr ""
 "Pliki są identyczne, z wyjątkiem różnych znaczników końca wierszy:\n"
 "%s"
 
-#: meld/filediff.py:1922
+#: meld/filediff.py:1985
 msgid "Show without filters"
 msgstr "Wyświetl bez filtrów"
 
-#: meld/filediff.py:1944
+#: meld/filediff.py:2007
 msgid "Change highlighting incomplete"
 msgstr "Wyróżnianie zmian jest niepełne"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:2008
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1961,19 +1973,19 @@ msgstr ""
 "Niektóre zmiany nie zostały wyróżnione, ponieważ były za duże. Można "
 "wymusić, aby program Meld wyróżnił większe zmiany, ale może to być wolne."
 
-#: meld/filediff.py:1953
+#: meld/filediff.py:2016
 msgid "Keep highlighting"
 msgstr "Wyróżniaj dalej"
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:2018
 msgid "_Keep highlighting"
 msgstr "_Wyróżniaj dalej"
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:2031
 msgid "Saving failed"
 msgstr "Zapisanie się nie powiodło"
 
-#: meld/filediff.py:1969
+#: meld/filediff.py:2032
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1981,38 +1993,38 @@ msgstr ""
 "Proszę rozważyć skopiowanie wszelkich ważnych zmian w innym programie lub "
 "pliku, aby uniknąć utraty danych."
 
-#: meld/filediff.py:1978
+#: meld/filediff.py:2041
 msgid "Save Left Pane As"
 msgstr "Zapis lewego panelu jako"
 
-#: meld/filediff.py:1980
+#: meld/filediff.py:2043
 msgid "Save Middle Pane As"
 msgstr "Zapis środkowego panelu jako"
 
-#: meld/filediff.py:1982
+#: meld/filediff.py:2045
 msgid "Save Right Pane As"
 msgstr "Zapis prawego panelu jako"
 
-#: meld/filediff.py:1993
+#: meld/filediff.py:2056
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Plik %s został zmieniony na dysku od czasu jego otwarcia"
 
-#: meld/filediff.py:1995
+#: meld/filediff.py:2058
 msgid "If you save it, any external changes will be lost."
 msgstr ""
 "Jeżeli plik zostanie zapisany, to wszystkie zewnętrzne zmiany zostaną "
 "utracone."
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2061
 msgid "Save Anyway"
 msgstr "Zapisz mimo to"
 
-#: meld/filediff.py:1999
+#: meld/filediff.py:2062
 msgid "Don’t Save"
 msgstr "Nie zapisuj"
 
-#: meld/filediff.py:2041
+#: meld/filediff.py:2104
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2020,7 +2032,7 @@ msgstr ""
 "Plik „{}” zawiera znaki, których nie można zakodować za pomocą jego obecnego "
 "kodowania, „{}”."
 
-#: meld/filediff.py:2045 meld/patchdialog.py:138
+#: meld/filediff.py:2108 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2029,16 +2041,16 @@ msgstr ""
 "Nie można zapisać pliku z powodu:\n"
 "%s"
 
-#: meld/filediff.py:2049 meld/patchdialog.py:137
+#: meld/filediff.py:2112 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Nie można zapisać pliku %s."
 
-#: meld/filediff.py:2450
+#: meld/filediff.py:2522
 msgid "Live comparison updating disabled"
 msgstr "Wyłączono aktualizowanie porównań na żywo"
 
-#: meld/filediff.py:2451
+#: meld/filediff.py:2523
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2064,16 +2076,16 @@ msgstr "Nie można przenieść pliku „{}” do kosza. Usunąć go trwale?"
 msgid "This remote location does not support sending items to the trash."
 msgstr "To zdalne położenie nie obsługuje przenoszenia elementów do kosza."
 
-#: meld/iohelpers.py:57
+#: meld/iohelpers.py:58
 msgid "_Delete Permanently"
 msgstr "_Usuń trwale"
 
-#: meld/iohelpers.py:107
+#: meld/iohelpers.py:110
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Zastąpić plik „%s”?"
 
-#: meld/iohelpers.py:109
+#: meld/iohelpers.py:112
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2200,7 +2212,7 @@ msgstr "Automatyczne scalenie wymaga trzech plików, otrzymano: %r"
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Jednoczesne porównanie plików i katalogów nie jest możliwe"
 
-#: meld/misc.py:150
+#: meld/misc.py:154
 msgid ""
 "{}\n"
 "\n"
@@ -2212,7 +2224,7 @@ msgstr ""
 "Wystąpił krytyczny błąd podczas działania programu:\n"
 "<tt>{}</tt>"
 
-#: meld/misc.py:201
+#: meld/misc.py:205
 msgid "[None]"
 msgstr "[Brak]"
 

From 5e374c0e534fde6ae63030426dcc1a7a4f7852a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= <balazs@urbalazs.hu>
Date: Mon, 28 Mar 2022 22:58:12 +0000
Subject: [PATCH 084/116] Update Hungarian translation

---
 po/hu.po | 172 +++++++++++++++++++++++++++----------------------------
 1 file changed, 84 insertions(+), 88 deletions(-)

diff --git a/po/hu.po b/po/hu.po
index d5f4cd82..b48ca2e6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-03-15 12:52+0000\n"
-"PO-Revision-Date: 2022-03-18 01:39+0100\n"
+"POT-Creation-Date: 2022-03-27 00:52+0000\n"
+"PO-Revision-Date: 2022-03-29 00:57+0200\n"
 "Last-Translator: Balázs Úr <ur.balazs at fsf dot hu>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: hu\n"
@@ -93,8 +93,8 @@ msgid ""
 "If true, the GTK dark theme variant will be used, if available. Note that "
 "this is separate from the syntax highlighting scheme."
 msgstr ""
-"Ha igaz, akkor a GTK sötét téma változata lesz használva, ha elérhető. Ne"
-" feledje, hogy ez független a szintaxiskiemelő sémától."
+"Ha igaz, akkor a GTK sötét téma változata lesz használva, ha elérhető. Ne "
+"feledje, hogy ez független a szintaxiskiemelő sémától."
 
 #: data/org.gnome.meld.gschema.xml:65
 msgid "Additional automatically detected text encodings"
@@ -818,79 +818,68 @@ msgstr "Minden egyesítése jobbról"
 msgid "Merge All"
 msgstr "Minden egyesítése"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
-msgid "Add Synchronization Point"
-msgstr "Szinkronizálási pont hozzáadása"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
-msgid "Clear Synchronization Points"
-msgstr "Szinkronizálási pontok törlése"
-
-#: meld/resources/gtk/menus.ui:103
+#: meld/resources/gtk/menus.ui:92
 msgid "Format as Patch…"
 msgstr "Formázás foltként…"
 
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:101
 msgid "_Preferences"
 msgstr "_Beállítások"
 
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:105
 msgid "Keyboard Shortcuts"
 msgstr "Gyorsbillentyűk"
 
-#: meld/resources/gtk/menus.ui:120
+#: meld/resources/gtk/menus.ui:109
 msgid "_Help"
 msgstr "_Súgó"
 
-#: meld/resources/gtk/menus.ui:125
+#: meld/resources/gtk/menus.ui:114
 msgid "_About Meld"
 msgstr "A Meld _névjegye"
 
-#: meld/resources/gtk/menus.ui:138
+#: meld/resources/gtk/menus.ui:127
 msgid "File status"
 msgstr "Fájlállapot"
 
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:129
 msgid "Same"
 msgstr "Egyezik"
 
-#: meld/resources/gtk/menus.ui:144
+#: meld/resources/gtk/menus.ui:133
 msgid "New"
 msgstr "Új"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:137 meld/resources/gtk/menus.ui:160
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Módosítva"
 
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:147
 msgid "Ignore filename case"
 msgstr "Kis- és nagybetűk nem különböznek a fájlnévben"
 
-#: meld/resources/gtk/menus.ui:162
+#: meld/resources/gtk/menus.ui:151
 msgid "Normalize Unicode paths"
 msgstr "Unicode útvonalak normalizálása"
 
-#: meld/resources/gtk/menus.ui:175
+#: meld/resources/gtk/menus.ui:164
 msgid "Normal"
 msgstr "Normál"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:168 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Verziózatlan"
 
-#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Mellőzve"
 
-#: meld/resources/gtk/menus.ui:190
+#: meld/resources/gtk/menus.ui:179
 msgid "Flatten folders"
 msgstr "Könyvtárak simítása"
 
 #: meld/resources/ui/about-dialog.ui:8
-#| msgid ""
-#| "Copyright © 2002-2009 Stephen Kennedy\n"
-#| "Copyright © 2009-2019 Kai Willadsen"
 msgid ""
 "Copyright © 2002-2009 Stephen Kennedy\n"
 "Copyright © 2009-2021 Kai Willadsen"
@@ -1008,12 +997,10 @@ msgid "_Compare selected files"
 msgstr "_Kijelölt fájlok összehasonlítása"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
-#| msgid "_Compare selected files"
 msgid "_Mark selected file"
 msgstr "_Kijelölt fájl megjelölése"
 
 #: meld/resources/ui/dirdiff-menus.ui:18
-#| msgid "_Compare selected files"
 msgid "Compare _with marked file"
 msgstr "Össze_hasonlítás a kijelölt fájllal"
 
@@ -1047,22 +1034,18 @@ msgstr "_Fájlútvonalak másolása"
 
 #: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
 #: meld/resources/ui/dirdiff.ui:117
-#| msgid "Save file in this pane"
 msgid "Select folder to open in this pane"
 msgstr "Ebben az ablaktáblában megnyitandó mappa kijelölése"
 
 #: meld/resources/ui/dirdiff.ui:43
-#| msgid "Folder"
 msgid "Folder 1"
 msgstr "1. mappa"
 
 #: meld/resources/ui/dirdiff.ui:84
-#| msgid "Folder"
 msgid "Folder 2"
 msgstr "2. mappa"
 
 #: meld/resources/ui/dirdiff.ui:125
-#| msgid "Folder"
 msgid "Folder 3"
 msgstr "3. mappa"
 
@@ -1127,7 +1110,6 @@ msgid "Open Containing Folder"
 msgstr "Tartalmazó mappa megnyitása"
 
 #: meld/resources/ui/filediff-menus.ui:58
-#| msgid "_Copy File Paths"
 msgid "Copy Full Path"
 msgstr "Teljes útvonal másolása"
 
@@ -1310,12 +1292,10 @@ msgid "Path"
 msgstr "Útvonal"
 
 #: meld/resources/ui/path-label.ui:62
-#| msgid "_Copy File Paths"
 msgid "Copy Path"
 msgstr "Útvonal másolása"
 
 #: meld/resources/ui/path-label.ui:78
-#| msgid "Open File"
 msgid "Open Folder"
 msgstr "Mappa megnyitása"
 
@@ -1370,7 +1350,6 @@ msgid "Show w_hitespace"
 msgstr "Ü_res helyek megjelenítése"
 
 #: meld/resources/ui/preferences.ui:381
-#| msgid "Meld dark scheme"
 msgid "Prefer dark theme"
 msgstr "Sötét téma előnyben részesítése"
 
@@ -1626,7 +1605,6 @@ msgid "Delete"
 msgstr "Törlés"
 
 #: meld/resources/ui/vcview-menus.ui:37
-#| msgid "Conflict"
 msgid "Resolve Conflict"
 msgstr "Ütközés feloldása"
 
@@ -1639,7 +1617,6 @@ msgid "Commit…"
 msgstr "Véglegesítés…"
 
 #: meld/resources/ui/vcview.ui:38
-#| msgid "Push current change to the left"
 msgid "Pull remote changes to the local repository"
 msgstr "Távoli változtatások letöltése a helyi tárolóba"
 
@@ -1664,7 +1641,6 @@ msgid "Mark as resolved in version control"
 msgstr "Megjelölés feloldottként a verziókövetőben"
 
 #: meld/resources/ui/vcview.ui:140
-#| msgid "No valid version control system found in this folder"
 msgid "Open version controlled folder in this pane"
 msgstr "Verziókövetés alatti mappa megnyitása ebben az ablaktáblában"
 
@@ -1716,7 +1692,6 @@ msgstr "Módosítási idő"
 
 #. Create ISO-format date-time CellRenderer
 #: meld/dirdiff.py:639 meld/preferences.py:134
-#| msgid "Modification time"
 msgid "Modification time (ISO)"
 msgstr "Módosítási idő (ISO)"
 
@@ -1770,12 +1745,12 @@ msgstr ""
 "Szöveges szűrők vannak használatban, és elfedhetik a fájlok közti "
 "különbségeket."
 
-#: meld/dirdiff.py:1144 meld/filediff.py:1919
+#: meld/dirdiff.py:1144 meld/filediff.py:1980
 msgid "Hide"
 msgstr "Elrejtés"
 
-#: meld/dirdiff.py:1146 meld/filediff.py:1921 meld/filediff.py:1951
-#: meld/filediff.py:1953 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1146 meld/filediff.py:1982 meld/filediff.py:2012
+#: meld/filediff.py:2014 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Elrejtés"
 
@@ -1851,11 +1826,11 @@ msgstr "Hiba a(z) {} törlésekor"
 msgid "No folder"
 msgstr "Nincs mappa"
 
-#: meld/filediff.py:1149
+#: meld/filediff.py:1156
 msgid "Comparison results will be inaccurate"
 msgstr "Az összehasonlítás eredményei pontatlanok lesznek"
 
-#: meld/filediff.py:1151
+#: meld/filediff.py:1158
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1863,74 +1838,97 @@ msgstr ""
 "Egy szűrő megváltoztatta a fájl sorainak számát, ami nem támogatott. Az "
 "összehasonlítás pontatlan lesz."
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1230
 msgid "Mark conflict as resolved?"
 msgstr "Megjelöli az ütközést feloldottként?"
 
-#: meld/filediff.py:1225
+#: meld/filediff.py:1232
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Ha az ütközést sikeresen feloldotta, akkor most megjelölheti feloldottként."
 
-#: meld/filediff.py:1228
+#: meld/filediff.py:1235
 msgid "Cancel"
 msgstr "Mégse"
 
-#: meld/filediff.py:1229
+#: meld/filediff.py:1236
 msgid "Mark _Resolved"
 msgstr "Megjelölés _feloldottként"
 
-#: meld/filediff.py:1593
+#: meld/filediff.py:1427 meld/filediff.py:1443
+msgid "Add Synchronization Point"
+msgstr "Szinkronizálási pont hozzáadása"
+
+#: meld/filediff.py:1431
+#| msgid "Add Synchronization Point"
+msgid "Remove Synchronization Point"
+msgstr "Szinkronizálási pont eltávolítása"
+
+#: meld/filediff.py:1435
+#| msgid "Add Synchronization Point"
+msgid "Move Synchronization Point"
+msgstr "Szinkronizálási pont áthelyezése"
+
+#: meld/filediff.py:1439
+#| msgid "Add Synchronization Point"
+msgid "Match Synchronization Point"
+msgstr "Szinkronizálási pont illesztése"
+
+#: meld/filediff.py:1463
+msgid "Clear Synchronization Points"
+msgstr "Szinkronizálási pontok törlése"
+
+#: meld/filediff.py:1654
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Hiba történt a fájl („%s”) megnyitásakor."
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1663
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "%s bináris fájlnak tűnik."
 
-#: meld/filediff.py:1604
+#: meld/filediff.py:1665
 msgid "Do you want to open the file using the default application?"
 msgstr "Meg szeretné nyitni a fájlt az alapértelmezett alkalmazással?"
 
-#: meld/filediff.py:1606
+#: meld/filediff.py:1667
 msgid "Open"
 msgstr "Megnyitás"
 
-#: meld/filediff.py:1628
+#: meld/filediff.py:1689
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Fájlok összefésülése"
 
-#: meld/filediff.py:1642
+#: meld/filediff.py:1703
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Eltérések számítása"
 
-#: meld/filediff.py:1702
+#: meld/filediff.py:1763
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "%s fájl megváltozott a lemezen"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1764
 msgid "Do you want to reload the file?"
 msgstr "Újratölti a fájlt?"
 
-#: meld/filediff.py:1705
+#: meld/filediff.py:1766
 msgid "_Reload"
 msgstr "Új_ratöltés"
 
-#: meld/filediff.py:1875
+#: meld/filediff.py:1936
 msgid "File {} is being compared to itself"
 msgstr "A(z) {} fájl saját magával lesz összehasonlítva"
 
-#: meld/filediff.py:1884
+#: meld/filediff.py:1945
 msgid "Files are identical"
 msgstr "A fájlok azonosak"
 
-#: meld/filediff.py:1897
+#: meld/filediff.py:1958
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1938,11 +1936,11 @@ msgstr ""
 "Szöveges szűrők vannak használatban, és elfedhetik a fájlok közti "
 "különbségeket. Szeretné a szűretlen fájlokat összehasonlítani?"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1963
 msgid "Files differ in line endings only"
 msgstr "A fájlok csak a sorvégekben térnek el"
 
-#: meld/filediff.py:1904
+#: meld/filediff.py:1965
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1951,15 +1949,15 @@ msgstr ""
 "A fájlok azonosak a sorvégjelektől eltekintve:\n"
 "%s"
 
-#: meld/filediff.py:1924
+#: meld/filediff.py:1985
 msgid "Show without filters"
 msgstr "Megjelenítés szűrők nélkül"
 
-#: meld/filediff.py:1946
+#: meld/filediff.py:2007
 msgid "Change highlighting incomplete"
 msgstr "Részleges kiemelés módosítása"
 
-#: meld/filediff.py:1947
+#: meld/filediff.py:2008
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1967,19 +1965,19 @@ msgstr ""
 "Egyes változtatások nincsenek kiemelve, mert túl nagyok. A Meld kiemelheti "
 "ezeket a nagyobb változtatásokat, de lassú lehet."
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:2016
 msgid "Keep highlighting"
 msgstr "Kiemelés továbbra is"
 
-#: meld/filediff.py:1957
+#: meld/filediff.py:2018
 msgid "_Keep highlighting"
 msgstr "_Kiemelés továbbra is"
 
-#: meld/filediff.py:1970
+#: meld/filediff.py:2031
 msgid "Saving failed"
 msgstr "A mentés sikertelen"
 
-#: meld/filediff.py:1971
+#: meld/filediff.py:2032
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1987,36 +1985,36 @@ msgstr ""
 "Fontolja meg a kritikus változtatások átmásolását egy másik programba vagy "
 "fájlba az adatvesztés elkerülése érdekében."
 
-#: meld/filediff.py:1980
+#: meld/filediff.py:2041
 msgid "Save Left Pane As"
 msgstr "Bal ablaktábla mentése másként"
 
-#: meld/filediff.py:1982
+#: meld/filediff.py:2043
 msgid "Save Middle Pane As"
 msgstr "Középső ablaktábla mentése másként"
 
-#: meld/filediff.py:1984
+#: meld/filediff.py:2045
 msgid "Save Right Pane As"
 msgstr "Jobb ablaktábla mentése másként"
 
-#: meld/filediff.py:1995
+#: meld/filediff.py:2056
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "A(z) %s fájl megváltozott a lemezen a megnyitása óta"
 
-#: meld/filediff.py:1997
+#: meld/filediff.py:2058
 msgid "If you save it, any external changes will be lost."
 msgstr "Ha menti, minden külső változtatás elvész."
 
-#: meld/filediff.py:2000
+#: meld/filediff.py:2061
 msgid "Save Anyway"
 msgstr "Mentés mindenképp"
 
-#: meld/filediff.py:2001
+#: meld/filediff.py:2062
 msgid "Don’t Save"
 msgstr "Ne mentse"
 
-#: meld/filediff.py:2043
+#: meld/filediff.py:2104
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2024,7 +2022,7 @@ msgstr ""
 "A(z) „{}” fájl olyan karaktereket tartalmaz, amelyek nem kódolhatók a "
 "jelenlegi „{}” kódolás használatával."
 
-#: meld/filediff.py:2047 meld/patchdialog.py:138
+#: meld/filediff.py:2108 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2033,16 +2031,16 @@ msgstr ""
 "A fájl nem menthető. Ok:\n"
 "%s"
 
-#: meld/filediff.py:2051 meld/patchdialog.py:137
+#: meld/filediff.py:2112 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "A fájl (%s) nem menthető."
 
-#: meld/filediff.py:2452
+#: meld/filediff.py:2522
 msgid "Live comparison updating disabled"
 msgstr "Az élő összehasonlítás-frissítés kikapcsolva"
 
-#: meld/filediff.py:2453
+#: meld/filediff.py:2523
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2245,7 +2243,6 @@ msgid "Plain Text"
 msgstr "Egyszerű szöveg"
 
 #: meld/ui/pathlabel.py:36
-#| msgid "Filename filters"
 msgid "Unnamed file"
 msgstr "Névtelen fájl"
 
@@ -2354,7 +2351,6 @@ msgid "Not present"
 msgstr "Nincs jelen"
 
 #: meld/vc/_vc.py:82
-#| msgid "Scanning %s"
 msgid "Scanning…"
 msgstr "Átvizsgálás…"
 

From c147a16c45a42ccb5dd2774f32f09bda7b15bb34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20=C4=8Cernock=C3=BD?= <marek@manet.cz>
Date: Sun, 3 Apr 2022 11:42:59 +0200
Subject: [PATCH 085/116] Updated Czech translation

---
 po/cs.po | 216 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 114 insertions(+), 102 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 58fc01ea..713df99d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-03-10 22:43+0000\n"
-"PO-Revision-Date: 2022-03-11 10:19+0100\n"
+"POT-Creation-Date: 2022-03-27 00:52+0000\n"
+"PO-Revision-Date: 2022-04-03 11:41+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -813,72 +813,64 @@ msgstr "Sloučit vše zprava"
 msgid "Merge All"
 msgstr "Sloučit vše"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
-msgid "Add Synchronization Point"
-msgstr "Přidat synchronizační bod"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
-msgid "Clear Synchronization Points"
-msgstr "Vymazat synchronizační body"
-
-#: meld/resources/gtk/menus.ui:103
+#: meld/resources/gtk/menus.ui:92
 msgid "Format as Patch…"
 msgstr "Formátovat jako záplatu…"
 
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:101
 msgid "_Preferences"
 msgstr "_Předvolby"
 
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:105
 msgid "Keyboard Shortcuts"
 msgstr "Klávesové zkratky"
 
-#: meld/resources/gtk/menus.ui:120
+#: meld/resources/gtk/menus.ui:109
 msgid "_Help"
 msgstr "Nápo_věda"
 
-#: meld/resources/gtk/menus.ui:125
+#: meld/resources/gtk/menus.ui:114
 msgid "_About Meld"
 msgstr "O _aplikaci Meld"
 
-#: meld/resources/gtk/menus.ui:138
+#: meld/resources/gtk/menus.ui:127
 msgid "File status"
 msgstr "Stav souboru"
 
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:129
 msgid "Same"
 msgstr "Stejné"
 
-#: meld/resources/gtk/menus.ui:144
+#: meld/resources/gtk/menus.ui:133
 msgid "New"
 msgstr "Nové"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:137 meld/resources/gtk/menus.ui:160
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Změněné"
 
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:147
 msgid "Ignore filename case"
 msgstr "Ignorovat velikost písmen v názvu souboru"
 
-#: meld/resources/gtk/menus.ui:162
+#: meld/resources/gtk/menus.ui:151
 msgid "Normalize Unicode paths"
 msgstr "Normalizovat cesty v Unikódu"
 
-#: meld/resources/gtk/menus.ui:175
+#: meld/resources/gtk/menus.ui:164
 msgid "Normal"
 msgstr "Normální"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:168 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Neverzováno"
 
-#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Ignorované"
 
-#: meld/resources/gtk/menus.ui:190
+#: meld/resources/gtk/menus.ui:179
 msgid "Flatten folders"
 msgstr "Zploštit složky"
 
@@ -1149,7 +1141,7 @@ msgstr "Soubor 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:558
+#: meld/dirdiff.py:602
 msgid "Name"
 msgstr "Název"
 
@@ -1189,7 +1181,7 @@ msgstr "Prošlo přes okraj"
 msgid "Replace _All"
 msgstr "Nahradit _vše"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1184 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "Nahradi_t"
 
@@ -1575,12 +1567,12 @@ msgstr "Pokud se změny neuloží, budou trvale ztraceny."
 msgid "Close _without Saving"
 msgstr "Zavřít _bez uložení"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1183
-#: meld/iohelpers.py:56 meld/iohelpers.py:113
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: meld/resources/ui/save-confirm-dialog.ui:52
+#: meld/resources/ui/save-confirm-dialog.ui:55
 msgid "_Save"
 msgstr "_Uložit"
 
@@ -1685,53 +1677,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:579 meld/preferences.py:132
+#: meld/dirdiff.py:623 meld/preferences.py:132
 msgid "Size"
 msgstr "Velikost"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:587 meld/preferences.py:133
+#: meld/dirdiff.py:631 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Čas změny"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:595 meld/preferences.py:134
+#: meld/dirdiff.py:639 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Čas změny (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:603 meld/preferences.py:135
+#: meld/dirdiff.py:647 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Oprávnění"
 
-#: meld/dirdiff.py:855
+#: meld/dirdiff.py:900
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (kontroluje se…)"
 
-#: meld/dirdiff.py:887 meld/dirdiff.py:919
+#: meld/dirdiff.py:932 meld/dirdiff.py:964
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Kontroluje se {folder}"
 
-#: meld/dirdiff.py:1055
+#: meld/dirdiff.py:1100
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Hotovo"
 
-#: meld/dirdiff.py:1068
+#: meld/dirdiff.py:1113
 msgid "Folder {} is being compared to itself"
 msgstr "Složka {} je porovnávána sama se sebou"
 
-#: meld/dirdiff.py:1074
+#: meld/dirdiff.py:1119
 msgid "Folders have no differences"
 msgstr "Mezi složkami není žádný rozdíl"
 
-#: meld/dirdiff.py:1076
+#: meld/dirdiff.py:1121
 msgid "Contents of scanned files in folders are identical."
 msgstr "Obsah kontrolovaných souborů ve složkách je stejný."
 
-#: meld/dirdiff.py:1078
+#: meld/dirdiff.py:1123
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1739,46 +1731,46 @@ msgstr ""
 "Kontrolované soubory ve složkách vypadají stejně, ale nebyl kontrolován "
 "jejich obsah."
 
-#: meld/dirdiff.py:1081
+#: meld/dirdiff.py:1126
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Jsou používány filtry souborů, takže ne všechny soubory byly kontrolovány."
 
-#: meld/dirdiff.py:1083
+#: meld/dirdiff.py:1128
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Jsou používány textové filtry a může dojít k zamaskování rozdílů mezi "
 "soubory."
 
-#: meld/dirdiff.py:1099 meld/filediff.py:1917
+#: meld/dirdiff.py:1144 meld/filediff.py:1980
 msgid "Hide"
 msgstr "Skrýt"
 
-#: meld/dirdiff.py:1101 meld/filediff.py:1919 meld/filediff.py:1949
-#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1146 meld/filediff.py:1982 meld/filediff.py:2012
+#: meld/filediff.py:2014 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Skrýt"
 
-#: meld/dirdiff.py:1110
+#: meld/dirdiff.py:1155
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Při skenování této složky došlo k několika chybám"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1156
 msgid "Files with invalid encodings found"
 msgstr "Nalezeny soubory s neplatným kódováním"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1158
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Některé soubory měly neplatné kódování. Názvy jsou přibližně následující:"
 
-#: meld/dirdiff.py:1115
+#: meld/dirdiff.py:1160
 msgid "Files hidden by case insensitive comparison"
 msgstr "Soubory skryty porovnáním nerozlišujícím velikost písmen"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1117
+#: meld/dirdiff.py:1162
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1786,17 +1778,17 @@ msgstr ""
 "Provádí se porovnání nerozlišující velikost písmen na systému souborů "
 "rozlišujícím velikost písmen. Některé soubory v této složce jsou skryté:"
 
-#: meld/dirdiff.py:1128
+#: meld/dirdiff.py:1173
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "„{first_file}“ skryto v „{second_file}“"
 
-#: meld/dirdiff.py:1187
+#: meld/dirdiff.py:1235
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Nahradit složku „%s“?"
 
-#: meld/dirdiff.py:1189
+#: meld/dirdiff.py:1237
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1805,11 +1797,11 @@ msgstr ""
 "V „%s“ již existuje jiná složka se stejným názvem.\n"
 "Pokud stávající složku nahradíte, budou všechny soubory v ní ztraceny."
 
-#: meld/dirdiff.py:1202
+#: meld/dirdiff.py:1250
 msgid "Error copying file"
 msgstr "Chyba při kopírování souboru"
 
-#: meld/dirdiff.py:1203
+#: meld/dirdiff.py:1251
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1822,19 +1814,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1228 meld/vcview.py:764
+#: meld/dirdiff.py:1276 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Chyba při mazání {}"
 
-#: meld/dirdiff.py:1756
+#: meld/dirdiff.py:1819
 msgid "No folder"
 msgstr "Žádná složka"
 
-#: meld/filediff.py:1149
+#: meld/filediff.py:1156
 msgid "Comparison results will be inaccurate"
 msgstr "Výsledky porovnávání budou nepřesné"
 
-#: meld/filediff.py:1151
+#: meld/filediff.py:1158
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1842,73 +1834,93 @@ msgstr ""
 "Filtr změnil počet řádků v souboru, což není podporováno. Porovnání nebude "
 "správné."
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1230
 msgid "Mark conflict as resolved?"
 msgstr "Označit konflikt jako vyřešený?"
 
-#: meld/filediff.py:1225
+#: meld/filediff.py:1232
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "Pokud byl konflikt vyřešen úspěšně, můžete jej označit za vyřešený."
 
-#: meld/filediff.py:1227
+#: meld/filediff.py:1235
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: meld/filediff.py:1228
+#: meld/filediff.py:1236
 msgid "Mark _Resolved"
 msgstr "Označi_t za vyřešené"
 
-#: meld/filediff.py:1591
+#: meld/filediff.py:1427 meld/filediff.py:1443
+msgid "Add Synchronization Point"
+msgstr "Přidat synchronizační bod"
+
+#: meld/filediff.py:1431
+msgid "Remove Synchronization Point"
+msgstr "Odebrat synchronizační bod"
+
+#: meld/filediff.py:1435
+msgid "Move Synchronization Point"
+msgstr "Přesunout synchronizační bod"
+
+#: meld/filediff.py:1439
+msgid "Match Synchronization Point"
+msgstr "Porovnat synchronizační bod"
+
+#: meld/filediff.py:1463
+msgid "Clear Synchronization Points"
+msgstr "Vymazat synchronizační body"
+
+#: meld/filediff.py:1654
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Vyskytl se problém při otevírání souboru „%s“."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1663
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Soubor %s je zřejmě binární."
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1665
 msgid "Do you want to open the file using the default application?"
 msgstr "Chcete soubor otevřít pomocí výchozí aplikace?"
 
-#: meld/filediff.py:1604
+#: meld/filediff.py:1667
 msgid "Open"
 msgstr "Otevřít"
 
-#: meld/filediff.py:1626
+#: meld/filediff.py:1689
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Slučují se soubory"
 
-#: meld/filediff.py:1640
+#: meld/filediff.py:1703
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Počítají se rozdíly"
 
-#: meld/filediff.py:1700
+#: meld/filediff.py:1763
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Soubor „%s“ byl změněn na disku."
 
-#: meld/filediff.py:1701
+#: meld/filediff.py:1764
 msgid "Do you want to reload the file?"
 msgstr "Chcete soubor znovu načíst?"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1766
 msgid "_Reload"
 msgstr "Zno_vu načíst"
 
-#: meld/filediff.py:1873
+#: meld/filediff.py:1936
 msgid "File {} is being compared to itself"
 msgstr "Soubor {} je porovnáván sám se sebou"
 
-#: meld/filediff.py:1882
+#: meld/filediff.py:1945
 msgid "Files are identical"
 msgstr "Soubory jsou stejné"
 
-#: meld/filediff.py:1895
+#: meld/filediff.py:1958
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1916,11 +1928,11 @@ msgstr ""
 "Jsou používány textové filtry a může dojít k zamaskování rozdílů mezi "
 "soubory. Chcete porovnat nefiltrované soubory?"
 
-#: meld/filediff.py:1900
+#: meld/filediff.py:1963
 msgid "Files differ in line endings only"
 msgstr "Soubory se liší pouze zakončením řádků"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1965
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1929,15 +1941,15 @@ msgstr ""
 "Soubory jsou shodné, vyjma rozdílného zakončení řádků:\n"
 "%s"
 
-#: meld/filediff.py:1922
+#: meld/filediff.py:1985
 msgid "Show without filters"
 msgstr "Zobrazit bez filtrů"
 
-#: meld/filediff.py:1944
+#: meld/filediff.py:2007
 msgid "Change highlighting incomplete"
 msgstr "Změnit zvýraznění neúplných"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:2008
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1946,19 +1958,19 @@ msgstr ""
 "přimět k používání větší délky, aby se zvýraznily i rozsáhlé změny, ale může "
 "to pak být pomalé."
 
-#: meld/filediff.py:1953
+#: meld/filediff.py:2016
 msgid "Keep highlighting"
 msgstr "Zachovat zvýrazňování"
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:2018
 msgid "_Keep highlighting"
 msgstr "Z_achovat zvýrazňování"
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:2031
 msgid "Saving failed"
 msgstr "Ukládání selhalo"
 
-#: meld/filediff.py:1969
+#: meld/filediff.py:2032
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1966,36 +1978,36 @@ msgstr ""
 "Jestli jste provedli nějaký důležité změny, zvažte jejich zkopírování do "
 "jiné aplikace nebo souboru, abyste o ně nepřišli."
 
-#: meld/filediff.py:1978
+#: meld/filediff.py:2041
 msgid "Save Left Pane As"
 msgstr "Uložení levého panelu jako"
 
-#: meld/filediff.py:1980
+#: meld/filediff.py:2043
 msgid "Save Middle Pane As"
 msgstr "Uložení prostředního panelu jako"
 
-#: meld/filediff.py:1982
+#: meld/filediff.py:2045
 msgid "Save Right Pane As"
 msgstr "Uložení pravého panelu jako"
 
-#: meld/filediff.py:1993
+#: meld/filediff.py:2056
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Soubor „%s“ byl od doby, co jste jej otevřeli, změněn."
 
-#: meld/filediff.py:1995
+#: meld/filediff.py:2058
 msgid "If you save it, any external changes will be lost."
 msgstr "Pokud jej uložíte, budou vnější změny ztraceny."
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2061
 msgid "Save Anyway"
 msgstr "Přesto uložit"
 
-#: meld/filediff.py:1999
+#: meld/filediff.py:2062
 msgid "Don’t Save"
 msgstr "Neukládat"
 
-#: meld/filediff.py:2041
+#: meld/filediff.py:2104
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2003,7 +2015,7 @@ msgstr ""
 "Soubor {} obsahuje znaky, které nelze zakódovat pomocí jeho akuálního "
 "kódování „{}“."
 
-#: meld/filediff.py:2045 meld/patchdialog.py:138
+#: meld/filediff.py:2108 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2012,16 +2024,16 @@ msgstr ""
 "Nezdařilo se uložit soubor z důvodu:\n"
 "%s"
 
-#: meld/filediff.py:2049 meld/patchdialog.py:137
+#: meld/filediff.py:2112 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Nezdařilo se uložit soubor %s."
 
-#: meld/filediff.py:2450
+#: meld/filediff.py:2522
 msgid "Live comparison updating disabled"
 msgstr "Živá aktualizace porovnání zakázána"
 
-#: meld/filediff.py:2451
+#: meld/filediff.py:2523
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2047,16 +2059,16 @@ msgstr "„{}“ nelze umístit do koše. Chcete smazat trvale?"
 msgid "This remote location does not support sending items to the trash."
 msgstr "Vzdálené umístění nepodporuje přesouvání položek do koše."
 
-#: meld/iohelpers.py:57
+#: meld/iohelpers.py:58
 msgid "_Delete Permanently"
 msgstr "_Smazat trvale"
 
-#: meld/iohelpers.py:107
+#: meld/iohelpers.py:110
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Nahradit soubor „%s“?"
 
-#: meld/iohelpers.py:109
+#: meld/iohelpers.py:112
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2182,7 +2194,7 @@ msgstr "Pro automatické sloučení jsou zapotřebí tři soubory, obdržen: %r"
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Nelze porovnávat směs souborů a složek"
 
-#: meld/misc.py:150
+#: meld/misc.py:154
 msgid ""
 "{}\n"
 "\n"
@@ -2194,7 +2206,7 @@ msgstr ""
 "Meld při běhu narazil na kritickou chybu:\n"
 "<tt>{}</tt>"
 
-#: meld/misc.py:201
+#: meld/misc.py:205
 msgid "[None]"
 msgstr "[Žádný]"
 

From a87b17c4c35c0b587333f95a6a35054210dc2239 Mon Sep 17 00:00:00 2001
From: Sergej A <sw@atrus.ru>
Date: Mon, 4 Apr 2022 10:53:38 +0000
Subject: [PATCH 086/116] Update Russian translation

---
 po/ru.po | 146 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 79 insertions(+), 67 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 2a61a608..7d45068c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Meld 1.4.0\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-03-15 12:52+0000\n"
-"PO-Revision-Date: 2022-03-19 08:23+1000\n"
+"POT-Creation-Date: 2022-03-27 12:07+0000\n"
+"PO-Revision-Date: 2022-03-30 17:13+1000\n"
 "Last-Translator: Ser82-png <sw@atrus.ru>\n"
 "Language-Team: Русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
@@ -822,72 +822,64 @@ msgstr "Объединить все с правой панели"
 msgid "Merge All"
 msgstr "Объединить все"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
-msgid "Add Synchronization Point"
-msgstr "Добавить точку синхронизации"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
-msgid "Clear Synchronization Points"
-msgstr "Удалить точки синхронизации"
-
-#: meld/resources/gtk/menus.ui:103
+#: meld/resources/gtk/menus.ui:92
 msgid "Format as Patch…"
 msgstr "Сформировать патч…"
 
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:101
 msgid "_Preferences"
 msgstr "_Параметры"
 
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:105
 msgid "Keyboard Shortcuts"
 msgstr "Клавиатурные сочетания"
 
-#: meld/resources/gtk/menus.ui:120
+#: meld/resources/gtk/menus.ui:109
 msgid "_Help"
 msgstr "_Справка"
 
-#: meld/resources/gtk/menus.ui:125
+#: meld/resources/gtk/menus.ui:114
 msgid "_About Meld"
 msgstr "О приложении Meld"
 
-#: meld/resources/gtk/menus.ui:138
+#: meld/resources/gtk/menus.ui:127
 msgid "File status"
 msgstr "Статус файла"
 
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:129
 msgid "Same"
 msgstr "Одинаковые"
 
-#: meld/resources/gtk/menus.ui:144
+#: meld/resources/gtk/menus.ui:133
 msgid "New"
 msgstr "Новые"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:137 meld/resources/gtk/menus.ui:160
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Изменён"
 
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:147
 msgid "Ignore filename case"
 msgstr "Игнорировать регистр имени файла"
 
-#: meld/resources/gtk/menus.ui:162
+#: meld/resources/gtk/menus.ui:151
 msgid "Normalize Unicode paths"
 msgstr "Нормализовать пути в Unicode"
 
-#: meld/resources/gtk/menus.ui:175
+#: meld/resources/gtk/menus.ui:164
 msgid "Normal"
 msgstr "Стандартные"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:168 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Без версии"
 
-#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Игнорируемые"
 
-#: meld/resources/gtk/menus.ui:190
+#: meld/resources/gtk/menus.ui:179
 msgid "Flatten folders"
 msgstr "Выровнять каталоги"
 
@@ -1759,12 +1751,12 @@ msgstr ""
 "Используются текстовые фильтры, которые могут маскировать различия между "
 "файлами."
 
-#: meld/dirdiff.py:1144 meld/filediff.py:1919
+#: meld/dirdiff.py:1144 meld/filediff.py:1980
 msgid "Hide"
 msgstr "Скрыть"
 
-#: meld/dirdiff.py:1146 meld/filediff.py:1921 meld/filediff.py:1951
-#: meld/filediff.py:1953 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1146 meld/filediff.py:1982 meld/filediff.py:2012
+#: meld/filediff.py:2014 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "С_крыть"
 
@@ -1838,84 +1830,104 @@ msgstr "Ошибка при удалении {}"
 msgid "No folder"
 msgstr "Нет папки"
 
-#: meld/filediff.py:1149
+#: meld/filediff.py:1156
 msgid "Comparison results will be inaccurate"
 msgstr "Результаты сравнения будут некорректными"
 
-#: meld/filediff.py:1151
+#: meld/filediff.py:1158
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
 msgstr "Фильтр изменил количество строк в файле. Сравнение будет не точным."
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1230
 msgid "Mark conflict as resolved?"
 msgstr "Отметить конфликт как разрешённый?"
 
-#: meld/filediff.py:1225
+#: meld/filediff.py:1232
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Если конфликт был успешно разрешён, вы можете отметить его как решённый."
 
-#: meld/filediff.py:1228
+#: meld/filediff.py:1235
 msgid "Cancel"
 msgstr "Отменить"
 
-#: meld/filediff.py:1229
+#: meld/filediff.py:1236
 msgid "Mark _Resolved"
 msgstr "Отметить как _разрешённый"
 
-#: meld/filediff.py:1593
+#: meld/filediff.py:1427 meld/filediff.py:1443
+msgid "Add Synchronization Point"
+msgstr "Добавить точку синхронизации"
+
+#: meld/filediff.py:1431
+msgid "Remove Synchronization Point"
+msgstr "Удалить точку синхронизации"
+
+#: meld/filediff.py:1435
+msgid "Move Synchronization Point"
+msgstr "Переместить точку синхронизации"
+
+#: meld/filediff.py:1439
+msgid "Match Synchronization Point"
+msgstr "Установить соответствие точки синхронизации"
+
+#: meld/filediff.py:1463
+msgid "Clear Synchronization Points"
+msgstr "Удалить точки синхронизации"
+
+#: meld/filediff.py:1654
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Возникла проблема при открытии файла “%s”."
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1663
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Файл %s выглядит как двоичный файл."
 
-#: meld/filediff.py:1604
+#: meld/filediff.py:1665
 msgid "Do you want to open the file using the default application?"
 msgstr "Открыть выбранный файл в приложении по умолчанию?"
 
-#: meld/filediff.py:1606
+#: meld/filediff.py:1667
 msgid "Open"
 msgstr "Открыть"
 
-#: meld/filediff.py:1628
+#: meld/filediff.py:1689
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Объединение файлов"
 
-#: meld/filediff.py:1642
+#: meld/filediff.py:1703
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Вычисление различий"
 
-#: meld/filediff.py:1702
+#: meld/filediff.py:1763
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Файл %s изменился на диске"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1764
 msgid "Do you want to reload the file?"
 msgstr "Хотите перезагрузить файл?"
 
-#: meld/filediff.py:1705
+#: meld/filediff.py:1766
 msgid "_Reload"
 msgstr "_Перезагрузить"
 
-#: meld/filediff.py:1875
+#: meld/filediff.py:1936
 msgid "File {} is being compared to itself"
 msgstr "Выполняется сравнение файла {} с самим собой"
 
-#: meld/filediff.py:1884
+#: meld/filediff.py:1945
 msgid "Files are identical"
 msgstr "Файлы идентичны"
 
-#: meld/filediff.py:1897
+#: meld/filediff.py:1958
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1923,11 +1935,11 @@ msgstr ""
 "Используются текстовые фильтры, которые могут маскировать различия между "
 "файлами. Хотите сравнить файлы без использования фильтров?"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1963
 msgid "Files differ in line endings only"
 msgstr "Файлы различаются только окончаниями строк"
 
-#: meld/filediff.py:1904
+#: meld/filediff.py:1965
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1936,15 +1948,15 @@ msgstr ""
 "Файлы идентичны, но различаются окончаниями строк:\n"
 "%s"
 
-#: meld/filediff.py:1924
+#: meld/filediff.py:1985
 msgid "Show without filters"
 msgstr "Показать без фильтров"
 
-#: meld/filediff.py:1946
+#: meld/filediff.py:2007
 msgid "Change highlighting incomplete"
 msgstr "Выделение изменений неполное"
 
-#: meld/filediff.py:1947
+#: meld/filediff.py:2008
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1953,19 +1965,19 @@ msgstr ""
 "можете дать Meld больше времени, чтобы их выделить, возможно это будет "
 "медленно."
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:2016
 msgid "Keep highlighting"
 msgstr "Сохранить выделение"
 
-#: meld/filediff.py:1957
+#: meld/filediff.py:2018
 msgid "_Keep highlighting"
 msgstr "Сохранить в_ыделение"
 
-#: meld/filediff.py:1970
+#: meld/filediff.py:2031
 msgid "Saving failed"
 msgstr "Сохранение не удалось"
 
-#: meld/filediff.py:1971
+#: meld/filediff.py:2032
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1973,42 +1985,42 @@ msgstr ""
 "Рекомендуется скопировать критичные изменения в другую программу или файл "
 "для избежания потери данных."
 
-#: meld/filediff.py:1980
+#: meld/filediff.py:2041
 msgid "Save Left Pane As"
 msgstr "Сохранить левую панель как"
 
-#: meld/filediff.py:1982
+#: meld/filediff.py:2043
 msgid "Save Middle Pane As"
 msgstr "Сохранить среднюю панель как"
 
-#: meld/filediff.py:1984
+#: meld/filediff.py:2045
 msgid "Save Right Pane As"
 msgstr "Сохранить правую панель как"
 
-#: meld/filediff.py:1995
+#: meld/filediff.py:2056
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Файл %s изменился на диске, так как он был открыт"
 
-#: meld/filediff.py:1997
+#: meld/filediff.py:2058
 msgid "If you save it, any external changes will be lost."
 msgstr "Если вы сохраните его, любые внешние изменения будут потеряны."
 
-#: meld/filediff.py:2000
+#: meld/filediff.py:2061
 msgid "Save Anyway"
 msgstr "Всё равно сохранить"
 
-#: meld/filediff.py:2001
+#: meld/filediff.py:2062
 msgid "Don’t Save"
 msgstr "Не сохранять"
 
-#: meld/filediff.py:2043
+#: meld/filediff.py:2104
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
 msgstr "Файл “{}” содержит символы, недопустимые для текущей кодировки “{}”."
 
-#: meld/filediff.py:2047 meld/patchdialog.py:138
+#: meld/filediff.py:2108 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2017,16 +2029,16 @@ msgstr ""
 "Нельзя сохранить файл по следующей причине:\n"
 "%s"
 
-#: meld/filediff.py:2051 meld/patchdialog.py:137
+#: meld/filediff.py:2112 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Не удалось сохранить файл %s."
 
-#: meld/filediff.py:2452
+#: meld/filediff.py:2522
 msgid "Live comparison updating disabled"
 msgstr "Обновление Онлайн сравнения отключено"
 
-#: meld/filediff.py:2453
+#: meld/filediff.py:2523
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "

From d7ae51d8485cc54ce8f2fe02b7b2c32e7d254ccd Mon Sep 17 00:00:00 2001
From: Helly Guo <buffoonguo@gmail.com>
Date: Wed, 6 Apr 2022 17:56:58 +0800
Subject: [PATCH 087/116] [feat]add a new feature: switch the panes

- remove the button in toolbar
- add a menu entry in the global menu
- add a shortcut "alt + backslash" to fire the swap action
---
 meld/accelerators.py                  |  2 ++
 meld/dirdiff.py                       |  6 +++---
 meld/filediff.py                      |  6 +++---
 meld/resources/gtk/help-overlay.ui    |  7 +++++++
 meld/resources/gtk/menus.ui           |  7 +++++++
 meld/resources/ui/dirdiff-actions.ui  | 22 ----------------------
 meld/resources/ui/filediff-actions.ui | 22 ----------------------
 7 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/meld/accelerators.py b/meld/accelerators.py
index ccf2ea7e..1d2b9fe2 100644
--- a/meld/accelerators.py
+++ b/meld/accelerators.py
@@ -47,6 +47,8 @@
     # Version control actions
     'view.vc-commit': '<Primary>M',
     'view.vc-console-visible': 'F9',
+    # Swap the two panes
+    'view.swap-2-panes': '<Alt>backslash',
 }
 
 
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 125c9810..88aef33b 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -497,7 +497,7 @@ def __init__(self, num_panes):
             ('folder-compare-marked', self.action_diff_marked),
             ('folder-copy-left', self.action_copy_left),
             ('folder-copy-right', self.action_copy_right),
-            ('folder-switch', self.action_switch),
+            ('swap-2-panes', self.action_swap),
             ('folder-delete', self.action_delete),
             ('folder-expand', self.action_folder_expand),
             ('next-change', self.action_next_change),
@@ -1328,7 +1328,7 @@ def update_action_sensitivity(self):
             self.set_action_enabled(
                 'folder-compare-marked',
                 self.marked is not None and self.marked.pane != pane)
-            self.set_action_enabled('folder-switch', self.num_panes == 2)
+            self.set_action_enabled('swap-2-panes', self.num_panes == 2)
             self.set_action_enabled('folder-delete', is_valid)
             self.set_action_enabled('folder-copy-left', is_valid and pane > 0)
             self.set_action_enabled(
@@ -1581,7 +1581,7 @@ def action_copy_left(self, *args):
     def action_copy_right(self, *args):
         self.copy_selected(1)
 
-    def action_switch(self, *args):
+    def action_swap(self, *args):
         folder_x = self.folders[0]
         self.folders[0] = self.folders[1]
         self.folders[1] = folder_x
diff --git a/meld/filediff.py b/meld/filediff.py
index c6a04f46..651d8c0a 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -351,7 +351,7 @@ def __init__(
             ('save-all', self.action_save_all),
             ('save-as', self.action_save_as),
             ('undo', self.action_undo),
-            ('file-switch', self.action_switch),
+            ('swap-2-panes', self.action_swap),
         )
         for name, callback in actions:
             action = Gio.SimpleAction.new(name, None)
@@ -726,7 +726,7 @@ def on_current_diff_changed(self, *args):
         self.set_action_enabled('file-copy-right-down', copy_right)
         self.set_action_enabled('previous-pane', pane > 0)
         self.set_action_enabled('next-pane', pane < self.num_panes - 1)
-        self.set_action_enabled('file-switch', self.num_panes == 2)
+        self.set_action_enabled('swap-2-panes', self.num_panes == 2)
         # FIXME: don't queue_draw() on everything... just on what changed
         self.queue_draw()
 
@@ -2471,7 +2471,7 @@ def clear_sync_points(self, *args):
                 mgr.clear()
         self.refresh_comparison()
 
-    def action_switch(self, *args):
+    def action_swap(self, *args):
         buffer0 = self.textbuffer[0]
         buffer1 = self.textbuffer[1]
         self.set_files([buffer1.data.gfile, buffer0.data.gfile])
diff --git a/meld/resources/gtk/help-overlay.ui b/meld/resources/gtk/help-overlay.ui
index 2f7cd9c8..ea84acf3 100644
--- a/meld/resources/gtk/help-overlay.ui
+++ b/meld/resources/gtk/help-overlay.ui
@@ -54,6 +54,13 @@
                 <property name="title" translatable="yes" context="shortcut window">Fullscreen</property>
               </object>
             </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">True</property>
+                <property name="accelerator">&lt;alt&gt;backslash</property>
+                <property name="title" translatable="yes" context="shortcut window">Swap the two panes</property>
+              </object>
+            </child>
           </object>
         </child>
         <child>
diff --git a/meld/resources/gtk/menus.ui b/meld/resources/gtk/menus.ui
index 992f67c1..c01980ff 100644
--- a/meld/resources/gtk/menus.ui
+++ b/meld/resources/gtk/menus.ui
@@ -50,6 +50,13 @@
         <attribute name="action">view.find-replace</attribute>
       </item>
     </section>
+    <section>
+      <attribute name="id">swap-section</attribute>
+      <item>
+        <attribute name="label" translatable="yes">Swap two panes</attribute>
+        <attribute name="action">view.swap-2-panes</attribute>
+      </item>
+    </section>
     <section>
       <submenu>
         <attribute name="label" translatable="yes">View</attribute>
diff --git a/meld/resources/ui/dirdiff-actions.ui b/meld/resources/ui/dirdiff-actions.ui
index 9f42ceec..42028fb8 100644
--- a/meld/resources/ui/dirdiff-actions.ui
+++ b/meld/resources/ui/dirdiff-actions.ui
@@ -58,28 +58,6 @@
         </child>
       </object>
     </child>
-    <child>
-      <object class="GtkButton">
-        <property name="visible">True</property>
-        <property name="action-name">view.folder-switch</property>
-        <property name="use-action-appearance">True</property>
-        <property name="tooltip-text" translatable="yes">Switch the two panes</property>
-        <property name="focus_on_click">False</property>
-        <style>
-          <class name="image-button"/>
-        </style>
-        <child>
-          <object class="GtkImage">
-            <property name="visible">True</property>
-            <property name="icon-name">system-switch-user-symbolic</property>
-            <property name="icon-size">1</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="pack-type">start</property>
-      </packing>
-    </child>
     <child>
       <object class="GtkButton">
         <property name="visible">True</property>
diff --git a/meld/resources/ui/filediff-actions.ui b/meld/resources/ui/filediff-actions.ui
index ce7086dd..375a1173 100644
--- a/meld/resources/ui/filediff-actions.ui
+++ b/meld/resources/ui/filediff-actions.ui
@@ -58,28 +58,6 @@
         </child>
       </object>
     </child>
-    <child>
-      <object class="GtkButton">
-        <property name="visible">True</property>
-        <property name="action-name">view.file-switch</property>
-        <property name="use-action-appearance">True</property>
-        <property name="tooltip-text" translatable="yes">Switch the two panes</property>
-        <property name="focus_on_click">False</property>
-        <style>
-          <class name="image-button"/>
-        </style>
-        <child>
-          <object class="GtkImage">
-            <property name="visible">True</property>
-            <property name="icon-name">system-switch-user-symbolic</property>
-            <property name="icon-size">1</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="pack-type">start</property>
-      </packing>
-    </child>
     <child>
       <object class="GtkMenuButton" id="copy_action_button">
         <property name="visible">true</property>

From 897f500e0985ec8feaca0209df6eb389a8387e69 Mon Sep 17 00:00:00 2001
From: Alan Mortensen <alanmortensen.am@gmail.com>
Date: Thu, 7 Apr 2022 17:40:25 +0000
Subject: [PATCH 088/116] Update Danish translation

---
 po/da.po | 4906 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 2500 insertions(+), 2406 deletions(-)

diff --git a/po/da.po b/po/da.po
index 98562118..b9ba75c5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,2406 +1,2500 @@
-# Danish translation for meld.
-# Copyright (C) 2018 meld & nedenstående oversættere.
-# This file is distributed under the same license as the meld package.
-# Joe Hansen <joedalton2@yahoo.dk>, 2010, 2011, 2018.
-# Alan Mortensen <alanmortensen.am@gmail.com>, 2016, 2018-19.
-# scootergrisen, 2019-2020.
-#
-# merge -> flet (sammenføj er til versionstyringskommandoer)
-# pane -> rude
-# reverse -> modsat (omvend, reverter)
-# vc -> versionsstyring
-# version control -> versionsstyring
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: meld master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2020-10-18 00:50+0000\n"
-"PO-Revision-Date: 2020-11-30 00:00+0200\n"
-"Last-Translator: scootergrisen\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
-#: meld/resources/ui/appwindow.ui:9
-msgid "Meld"
-msgstr "Meld"
-
-#: data/org.gnome.meld.desktop.in.in:4
-msgid "Diff Viewer"
-msgstr "Diff-fremviser"
-
-#: data/org.gnome.meld.desktop.in.in:5 data/org.gnome.meld.appdata.xml.in.in:12
-msgid "Compare and merge your files"
-msgstr "Sammenlign og flet dine filer"
-
-#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: data/org.gnome.meld.desktop.in.in:7
-msgid "diff;merge;"
-msgstr "diff;flet;"
-
-#: data/org.gnome.meld.appdata.xml.in.in:14
-msgid ""
-"Meld is a visual diff and merge tool targeted at developers. Meld helps you "
-"compare files, directories, and version controlled projects. It provides "
-"two- and three-way comparison of both files and directories, and supports "
-"many version control systems including Git, Mercurial, Bazaar and Subversion."
-msgstr ""
-"Meld er et visuelt værktøj til diff og flet, som er rettet mod udviklere. "
-"Meld hjælper dig med at sammenligne filer, mapper og versionsstyrede "
-"projekter. Der er to- og trevejssammenligning af både filer og mapper, og "
-"mange versionsstyringssystemer, bl.a. Git, Mercurial, Bazaar og Subversion, "
-"er understøttede."
-
-#: data/org.gnome.meld.appdata.xml.in.in:21
-msgid ""
-"Meld helps you review code changes, understand patches, and makes enormous "
-"merge conflicts slightly less painful."
-msgstr ""
-"Meld hjælper dig med at gennemgå kodeændringer, forstå rettelser (patches) "
-"og gør enorme flettekonflikter mindre besværlige."
-
-#: data/org.gnome.meld.appdata.xml.in.in:51
-msgid "The GNOME Project"
-msgstr "GNOME-projektet"
-
-#: data/mime/org.gnome.meld.xml.in:4
-msgid "Meld comparison description"
-msgstr "Meld-sammenligningsbeskrivelse"
-
-#: data/org.gnome.meld.gschema.xml:37
-msgid "Default window width"
-msgstr "Vinduets standardbredde"
-
-#: data/org.gnome.meld.gschema.xml:41
-msgid "Default window height"
-msgstr "Vinduets standardhøjde"
-
-#: data/org.gnome.meld.gschema.xml:45
-msgid "Default window maximised state"
-msgstr "Maksimeret-tilstand for standardvinduet"
-
-#: data/org.gnome.meld.gschema.xml:49
-msgid "Default window fullscreen state"
-msgstr "Fuldskærmstilstand for standardvinduet"
-
-#: data/org.gnome.meld.gschema.xml:58
-msgid "Additional automatically detected text encodings"
-msgstr "Yderligere automatisk fundne tekstkodninger"
-
-#: data/org.gnome.meld.gschema.xml:59
-msgid ""
-"Meld will use these text encodings to try to decode loaded text files before "
-"trying any other encodings. In addition to the encodings in this list, UTF-8 "
-"and the current locale-default encoding will always be used; other encodings "
-"may also be tried, depending on the user’s locale."
-msgstr ""
-"Meld bruger disse tekstkodninger til at prøve at afkode indlæste tekstfiler, "
-"før andre kodninger prøves. Ud over kodningerne på denne liste vil UTF-8 og "
-"de aktuelle standardkodninger for regionen altid blive brugt; afhængig af "
-"brugerens region vil andre kodninger også blive prøvet."
-
-#: data/org.gnome.meld.gschema.xml:66
-msgid "Width of an indentation step"
-msgstr "Indrykningsbredde"
-
-#: data/org.gnome.meld.gschema.xml:67
-msgid "The number of spaces to use for a single indent step"
-msgstr "Antallet af mellemrum der skal bruges på en enkelt indrykning"
-
-#: data/org.gnome.meld.gschema.xml:71
-msgid "Whether to indent using spaces or tabs"
-msgstr "Om indrykning sker med mellemrum eller tabulator"
-
-#: data/org.gnome.meld.gschema.xml:72
-msgid "If true, any new indentation will use spaces instead of tabs."
-msgstr ""
-"Hvis sand vil nye indrykninger bruge mellemrum i stedet for tabulatorer."
-
-#: data/org.gnome.meld.gschema.xml:76 meld/resources/ui/statusbar-menu.ui:5
-msgid "Show line numbers"
-msgstr "Vis linjenumre"
-
-#: data/org.gnome.meld.gschema.xml:77
-msgid "If true, line numbers will be shown in the gutter of file comparisons."
-msgstr ""
-"Hvis sand vil linjenumre blive vist i filsammenligningers indvendige "
-"margener."
-
-#: data/org.gnome.meld.gschema.xml:81
-msgid "Highlight syntax"
-msgstr "Syntaksfremhævning"
-
-#: data/org.gnome.meld.gschema.xml:82
-msgid ""
-"Whether to highlight syntax in comparisons. Because of Meld’s own color "
-"highlighting, this is off by default."
-msgstr ""
-"Om syntaks skal fremhæves i sammenligninger. Pga. Melds egen "
-"farvefremhævning er dette som standard slået fra."
-
-#: data/org.gnome.meld.gschema.xml:86
-msgid "Color scheme to use for syntax highlighting"
-msgstr "Farveskema til brug for syntaksfremhævning"
-
-#: data/org.gnome.meld.gschema.xml:87
-msgid "Used by GtkSourceView to determine colors for syntax highlighting"
-msgstr ""
-"Bruges af GtkSourceView til at bestemme farver til fremhævning af syntaks"
-
-#: data/org.gnome.meld.gschema.xml:91
-msgid "Draw whitespace"
-msgstr "Tegn blanktegn"
-
-#: data/org.gnome.meld.gschema.xml:92
-msgid ""
-"If true, whitespace characters will be drawn in comparisons even if they are "
-"not in a changed area."
-msgstr ""
-"Hvis sand tegnes blanktegn i sammenligninger, selv hvis de ikke er i et "
-"område, som er blevet ændret."
-
-#: data/org.gnome.meld.gschema.xml:101
-msgid "Wrap mode"
-msgstr "Ombrydningstilstand"
-
-#: data/org.gnome.meld.gschema.xml:102
-msgid ""
-"Lines in file comparisons will be wrapped according to this setting, either "
-"not at all ('none'), at any character ('char') or only at the end of words "
-"('word')."
-msgstr ""
-"Linjer i filsammenligninger vil blive ombrudt i henhold til denne "
-"indstilling: overhovedet ikke (“none”), ved ethvert tegn (“char”) eller kun "
-"efter et ord (“word”)."
-
-#: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
-msgid "Highlight current line"
-msgstr "Fremhæv aktuelle linje"
-
-#: data/org.gnome.meld.gschema.xml:110
-msgid ""
-"If true, the line containing the cursor will be highlighted in file "
-"comparisons."
-msgstr ""
-"Hvis sand vil linjen med markøren blive fremhævet i filsammenligninger."
-
-#: data/org.gnome.meld.gschema.xml:114
-msgid "Use the system default monospace font"
-msgstr "Brug systemets standardskrifttype med fast bredde"
-
-#: data/org.gnome.meld.gschema.xml:115
-msgid ""
-"If false, custom-font will be used instead of the system monospace font."
-msgstr ""
-"Hvis falsk vil en tilpasset skrifttype blive brugt i stedet for systemets "
-"standardskrifttype med fast bredde."
-
-#: data/org.gnome.meld.gschema.xml:119
-msgid "Custom font"
-msgstr "Tilpasset skrifttype"
-
-#: data/org.gnome.meld.gschema.xml:120
-msgid ""
-"The custom font to use, stored as a string and parsed as a Pango font "
-"description."
-msgstr ""
-"Den tilpassede skrifttype som skal bruges. Gemmes som en streng og fortolkes "
-"som en Pango-skrifttypebeskrivelse."
-
-#: data/org.gnome.meld.gschema.xml:126
-msgid "Show overview source map"
-msgstr "Vis oversigtskildekort"
-
-#: data/org.gnome.meld.gschema.xml:127
-msgid ""
-"If true, file comparisons will have paired source maps for compared files."
-msgstr ""
-"Hvis sand vil filsammenligninger have parrede kildekort for filer, som "
-"sammenlignes."
-
-#: data/org.gnome.meld.gschema.xml:132
-msgid "Style of overview map"
-msgstr "Oversigtskortets stil"
-
-#: data/org.gnome.meld.gschema.xml:133
-msgid "Style options for how the overview map is displayed."
-msgstr "Stilindstilling til visning af oversigtskortet."
-
-#: data/org.gnome.meld.gschema.xml:139
-msgid "Ignore blank lines when comparing files"
-msgstr "Ignorér tomme linjer, når filer sammenlignes"
-
-#: data/org.gnome.meld.gschema.xml:140
-msgid ""
-"If true, blank lines will be trimmed when highlighting changes between files."
-msgstr ""
-"Hvis sand vil tomme linjer blive beskåret, når ændringer mellem filer "
-"fremhæves."
-
-#: data/org.gnome.meld.gschema.xml:147
-msgid "Use the system default editor"
-msgstr "Brug systemets standardredigeringsprogram"
-
-#: data/org.gnome.meld.gschema.xml:148
-msgid ""
-"If false, custom-editor-command will be used instead of the system editor "
-"when opening files externally."
-msgstr ""
-"Hvis falsk vil “custom-editor-command” blive brugt i stedet for systemets "
-"redigeringsprogram, når filer åbnes eksternt."
-
-#: data/org.gnome.meld.gschema.xml:152
-msgid "The custom editor launch command"
-msgstr "Kommando til at starte brugerdefineret redigeringsprogram"
-
-#: data/org.gnome.meld.gschema.xml:153
-msgid ""
-"The command used to launch a custom editor. Some limited templating is "
-"supported here; at the moment '{file}' and '{line}' are recognised tokens."
-msgstr ""
-"Kommandoen til at starte et brugerdefineret redigeringsprogram. Begrænset "
-"brug af skabeloner understøttes; for øjeblikket kan “{file}” og “{line}” "
-"bruges."
-
-#: data/org.gnome.meld.gschema.xml:159
-msgid "Columns to display"
-msgstr "Kolonner der skal vises"
-
-#: data/org.gnome.meld.gschema.xml:160
-msgid ""
-"List of column names in folder comparison and whether they should be "
-"displayed."
-msgstr "Liste over kolonnenavne i mappesammenligning og om de skal vises."
-
-#: data/org.gnome.meld.gschema.xml:164 meld/resources/ui/preferences.ui:935
-msgid "Ignore symbolic links"
-msgstr "Ignorér symbolske henvisninger"
-
-#: data/org.gnome.meld.gschema.xml:165
-msgid ""
-"If true, folder comparisons do not follow symbolic links when traversing the "
-"folder tree."
-msgstr ""
-"Hvis sand vil mappesammenligninger ikke følge symbolske henvisninger, når "
-"mappetræet gennemkrydses."
-
-#: data/org.gnome.meld.gschema.xml:169
-msgid "Use shallow comparison"
-msgstr "Brug overfladisk sammenligningen"
-
-#: data/org.gnome.meld.gschema.xml:170
-msgid ""
-"If true, folder comparisons compare files based solely on size and mtime, "
-"considering files to be identical if their size and mtime match, and "
-"different otherwise."
-msgstr ""
-"Hvis sand vil mappesammenligninger kun sammenligne filer baseret på "
-"størrelse og mtime. Filer anses for at være identiske, hvis deres størrelse "
-"og mtime matcher og ellers forskellige."
-
-#: data/org.gnome.meld.gschema.xml:174
-msgid "File timestamp resolution"
-msgstr "Filers tidsstempelopløsning"
-
-#: data/org.gnome.meld.gschema.xml:175
-msgid ""
-"When comparing based on mtime, this is the minimum difference in nanoseconds "
-"between two files before they’re considered to have different mtimes. This "
-"is useful when comparing files between filesystems with different timestamp "
-"resolution."
-msgstr ""
-"Når sammenligninger er baseret på mtime, er dette den mindste forskel i "
-"nanosekunder mellem to filer, før de anses for at have forskellige mtimes. "
-"Dette er nyttigt, når der sammenlignes filer på tværs af filsystemer med "
-"forskellig tidsstempelopløsning."
-
-#: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
-msgid "Apply text filters during folder comparisons"
-msgstr "Anvend tekstfiltre under mappesammenligninger"
-
-#: data/org.gnome.meld.gschema.xml:180
-msgid ""
-"If true, folder comparisons that compare file contents also apply active "
-"text filters and the blank line trimming option, and ignore newline "
-"differences."
-msgstr ""
-"Hvis sand vil mappesammenligninger, som sammenligner filindhold, også "
-"anvende aktive tekstfiltre og beskære tomme linjer samt ignorere newline-"
-"forskelle."
-
-#: data/org.gnome.meld.gschema.xml:184
-msgid "File status filters"
-msgstr "Filtre for filstatus"
-
-#: data/org.gnome.meld.gschema.xml:185
-msgid "List of statuses used to filter visible files in folder comparison."
-msgstr ""
-"Oversigt over statusser brugt til at filtrere synlige filer i "
-"mappesammenligninger."
-
-#: data/org.gnome.meld.gschema.xml:191
-msgid "Show the version control console output"
-msgstr "Vis konsoloutputtet for versionsstyring"
-
-#: data/org.gnome.meld.gschema.xml:192
-msgid ""
-"If true, a console output section will be shown in version control views, "
-"showing the commands run for version control operations."
-msgstr ""
-"Hvis sand vil et konsoloutputafsnit blive vist i visninger af "
-"versionsstyring, som viser de kommandoer, der køres for "
-"versionsstyringshandlinger."
-
-#: data/org.gnome.meld.gschema.xml:196
-msgid "Version control pane position"
-msgstr "Rudeplacering af versionsstyring"
-
-#: data/org.gnome.meld.gschema.xml:197
-msgid ""
-"This is the height of the main version control tree when the console pane is "
-"shown."
-msgstr "Dette er højden på versionsstyringens hovedtræ, når konsolruden vises."
-
-#: data/org.gnome.meld.gschema.xml:201
-msgid "Present version comparisons as left-local/right-remote"
-msgstr "Nuværende versionssammenligninger som venstre-lokal/højre-fjern"
-
-#: data/org.gnome.meld.gschema.xml:202
-msgid ""
-"If true, version control comparisons will use a left-is-local, right-is-"
-"remote scheme to determine what order to present files in panes. Otherwise, "
-"a left-is-theirs, right-is-mine scheme is used."
-msgstr ""
-"Hvis sand vil sammenligning af versionsstyringer bruge et venstre-er-lokal/"
-"højre-er-fjern-skema til at bestemme, i hvilken rækkefølge filer vises i "
-"ruder. Ellers vil et venstre-er-deres/højre-er-min-skema blive anvendt."
-
-#: data/org.gnome.meld.gschema.xml:206
-msgid "Order for files in three-way version control merge comparisons"
-msgstr "Filrækkefølge i fletssammenligninger i trevejsversionsstyring"
-
-#: data/org.gnome.meld.gschema.xml:207
-msgid ""
-"Choices for file order are remote/merged/local and local/merged/remote. This "
-"preference only affects three-way comparisons launched from the version "
-"control view, so is used solely for merges/conflict resolution within Meld."
-msgstr ""
-"Muligheder for filrækkefølge er fjern/flettet/lokal og lokal/flettet/fjern. "
-"Denne indstilling påvirker kun trevejssammenligninger, der startes fra "
-"versionsstyringsvisningen, så den bruges kun til at løse sammenfletninger/"
-"konflikter i Meld."
-
-#: data/org.gnome.meld.gschema.xml:211
-msgid "Show margin in commit message editor"
-msgstr "Vis margen i redigeringsprogram til commit-beskeder"
-
-#: data/org.gnome.meld.gschema.xml:212
-msgid ""
-"If true, a guide will be displayed to show what column the margin is at in "
-"the version control commit message editor."
-msgstr ""
-"Hvis sand vil en hjælpelinje blive vist, som viser, hvilken kolonne margenen "
-"er ved i redigeringsprogrammet til versionsstyringens commit-beskeder."
-
-#: data/org.gnome.meld.gschema.xml:216
-msgid "Margin column in commit message editor"
-msgstr "Margenkolonne i redigeringsprogram til commit-beskeder"
-
-#: data/org.gnome.meld.gschema.xml:217
-msgid ""
-"The column at which to show the margin in the version control commit message "
-"editor."
-msgstr ""
-"Den kolonne hvor margenen skal vises i redigeringsprogrammet til "
-"versionsstyring af commit-beskeder."
-
-#: data/org.gnome.meld.gschema.xml:221
-msgid "Automatically hard-wrap commit messages"
-msgstr "Automatisk tvungen linjeskift i commit-beskeder"
-
-#: data/org.gnome.meld.gschema.xml:222
-msgid ""
-"If true, the version control commit message editor will hard-wrap (i.e., "
-"insert line breaks) at the commit margin before commit."
-msgstr ""
-"Hvis sand vil redigeringsprogrammet til versionsstyring af commit-beskeder "
-"indføre tvungen linjeskift ved commit-margen før commit."
-
-#: data/org.gnome.meld.gschema.xml:226
-msgid "Version control status filters"
-msgstr "Statusfiltre til versionsstyring"
-
-#: data/org.gnome.meld.gschema.xml:227
-msgid ""
-"List of statuses used to filter visible files in version control comparison."
-msgstr ""
-"Oversigt over statusser anvendt til at filtrere synlige filer i "
-"versionsstyringssammenligninger."
-
-#: data/org.gnome.meld.gschema.xml:241
-msgid "Filename-based filters"
-msgstr "Filnavne-baserede filtre"
-
-#: data/org.gnome.meld.gschema.xml:242
-msgid ""
-"List of predefined filename-based filters that, if active, will remove "
-"matching files from a folder comparison."
-msgstr ""
-"Oversigt over foruddefinerede filnavne-baserede filtre, som, hvis aktive, "
-"vil fjerne matchende filer i en mappesammenligning."
-
-#: data/org.gnome.meld.gschema.xml:256
-msgid "Text-based filters"
-msgstr "Tekst-baserede filtre"
-
-#: data/org.gnome.meld.gschema.xml:257
-msgid ""
-"List of predefined text-based regex filters that, if active, will remove "
-"text from being used in a file comparison. The text will still be displayed, "
-"but won’t contribute to the comparison itself."
-msgstr ""
-"Oversigt over foruddefinerede tekst-baserede regex-filtre, som, hvis aktive, "
-"vil forhindre at tekst bruges i en filsammenligning. Teksten vil stadig "
-"blive vist, men vil ikke bidrage til selve sammenligningen."
-
-#: data/styles/meld-base.style-scheme.xml.in:1
-msgid "Classic (Meld)"
-msgstr "Klassisk (Meld)"
-
-#: data/styles/meld-base.style-scheme.xml.in:3
-msgid "Base color scheme for Meld highlighting"
-msgstr "Basisfarveskema for fremhævning i Meld"
-
-#: data/styles/meld-dark.style-scheme.xml.in:1
-msgid "Meld dark scheme"
-msgstr "Melds mørke skema"
-
-#: data/styles/meld-dark.style-scheme.xml.in:3
-msgid "Dark color scheme for Meld highlighting"
-msgstr "Mørkt farveskema for fremhævning i Meld"
-
-#: meld/resources/gtk/help-overlay.ui:14
-msgctxt "shortcut window"
-msgid "General"
-msgstr "Generelt"
-
-#: meld/resources/gtk/help-overlay.ui:19
-msgctxt "shortcut window"
-msgid "New comparison"
-msgstr "Ny sammenligning"
-
-#: meld/resources/gtk/help-overlay.ui:26
-msgctxt "shortcut window"
-msgid "Close a comparison"
-msgstr "Luk en sammenligning"
-
-#: meld/resources/gtk/help-overlay.ui:33
-msgctxt "shortcut window"
-msgid "Quit Meld"
-msgstr "Afslut Meld"
-
-#: meld/resources/gtk/help-overlay.ui:40
-msgctxt "shortcut window"
-msgid "Stop the current action"
-msgstr "Stop den aktuelle handling"
-
-#: meld/resources/gtk/help-overlay.ui:47
-msgctxt "shortcut window"
-msgid "Refresh comparison"
-msgstr "Opdatér sammenligningen"
-
-#: meld/resources/gtk/help-overlay.ui:54
-msgctxt "shortcut window"
-msgid "Fullscreen"
-msgstr "Fuldskærm"
-
-#: meld/resources/gtk/help-overlay.ui:63
-msgctxt "shortcut window"
-msgid "Panes"
-msgstr "Ruder"
-
-#: meld/resources/gtk/help-overlay.ui:68
-msgctxt "shortcut window"
-msgid "Previous comparison pane"
-msgstr "Forrige sammenligningsrude"
-
-#: meld/resources/gtk/help-overlay.ui:75
-msgctxt "shortcut window"
-msgid "Next comparison pane"
-msgstr "Næste sammenligningsrude"
-
-#: meld/resources/gtk/help-overlay.ui:84
-msgctxt "shortcut window"
-msgid "Changes"
-msgstr "Ændringer"
-
-#: meld/resources/gtk/help-overlay.ui:89
-msgctxt "shortcut window"
-msgid "Go to previous change"
-msgstr "Gå til den forrige ændring"
-
-#: meld/resources/gtk/help-overlay.ui:96
-msgctxt "shortcut window"
-msgid "Go to next change"
-msgstr "Gå til den næste ændring"
-
-#: meld/resources/gtk/help-overlay.ui:105
-msgctxt "shortcut window"
-msgid "Tabs"
-msgstr "Faneblade"
-
-#: meld/resources/gtk/help-overlay.ui:110
-msgctxt "shortcut window"
-msgid "Go to previous tab"
-msgstr "Gå til det forrige faneblad"
-
-#: meld/resources/gtk/help-overlay.ui:117
-msgctxt "shortcut window"
-msgid "Go to next tab"
-msgstr "Gå til det næste faneblad"
-
-#: meld/resources/gtk/help-overlay.ui:124
-msgctxt "shortcut window"
-msgid "Switch to tab"
-msgstr "Skift til faneblad"
-
-#: meld/resources/gtk/help-overlay.ui:131
-msgctxt "shortcut window"
-msgid "Move tab left"
-msgstr "Flyt fanebladet til venstre"
-
-#: meld/resources/gtk/help-overlay.ui:138
-msgctxt "shortcut window"
-msgid "Move tab right"
-msgstr "Flyt fanebladet til højre"
-
-#: meld/resources/gtk/help-overlay.ui:147
-msgctxt "shortcut window"
-msgid "Editing"
-msgstr "Redigering"
-
-#: meld/resources/gtk/help-overlay.ui:152
-msgctxt "shortcut window"
-msgid "Undo"
-msgstr "Fortryd"
-
-#: meld/resources/gtk/help-overlay.ui:159
-msgctxt "shortcut window"
-msgid "Redo"
-msgstr "Gentag"
-
-#: meld/resources/gtk/help-overlay.ui:166
-msgctxt "shortcut window"
-msgid "Cut"
-msgstr "Klip"
-
-#: meld/resources/gtk/help-overlay.ui:173
-msgctxt "shortcut window"
-msgid "Copy"
-msgstr "Kopiér"
-
-#: meld/resources/gtk/help-overlay.ui:180
-msgctxt "shortcut window"
-msgid "Paste"
-msgstr "Indsæt"
-
-#: meld/resources/gtk/help-overlay.ui:187
-msgctxt "shortcut window"
-msgid "Find"
-msgstr "Find"
-
-#: meld/resources/gtk/help-overlay.ui:194
-msgctxt "shortcut window"
-msgid "Find Next"
-msgstr "Find næste"
-
-#: meld/resources/gtk/help-overlay.ui:201
-msgctxt "shortcut window"
-msgid "Find Previous"
-msgstr "Find forrige"
-
-#: meld/resources/gtk/help-overlay.ui:208
-msgctxt "shortcut window"
-msgid "Replace"
-msgstr "Erstat"
-
-#: meld/resources/gtk/help-overlay.ui:217
-msgctxt "shortcut window"
-msgid "File comparison"
-msgstr "Filsammenligning"
-
-#: meld/resources/gtk/help-overlay.ui:222
-msgctxt "shortcut window"
-msgid "Save current file"
-msgstr "Gem den aktuelle fil"
-
-#: meld/resources/gtk/help-overlay.ui:229
-msgctxt "shortcut window"
-msgid "Save current file to new path"
-msgstr "Gem den aktuelle fil et andet sted"
-
-#: meld/resources/gtk/help-overlay.ui:236
-msgctxt "shortcut window"
-msgid "Save all files in comparison"
-msgstr "Gem alle filer i sammenligningen"
-
-#: meld/resources/gtk/help-overlay.ui:243
-msgctxt "shortcut window"
-msgid "Previous conflict"
-msgstr "Forrige konflikt"
-
-#: meld/resources/gtk/help-overlay.ui:250
-msgctxt "shortcut window"
-msgid "Next conflict"
-msgstr "Næste konflikt"
-
-#: meld/resources/gtk/help-overlay.ui:257
-msgctxt "shortcut window"
-msgid "Push change to left"
-msgstr "Skub ændringen til venstre"
-
-#: meld/resources/gtk/help-overlay.ui:264
-msgctxt "shortcut window"
-msgid "Push change to right"
-msgstr "Skub ændringen til højre"
-
-#: meld/resources/gtk/help-overlay.ui:271
-msgctxt "shortcut window"
-msgid "Pull change from left"
-msgstr "Træk ændringen fra venstre"
-
-#: meld/resources/gtk/help-overlay.ui:278
-msgctxt "shortcut window"
-msgid "Pull change from right"
-msgstr "Træk ændringen fra højre"
-
-#: meld/resources/gtk/help-overlay.ui:285
-msgctxt "shortcut window"
-msgid "Copy change above left"
-msgstr "Kopiér ændringen ovenfor til venstre"
-
-#: meld/resources/gtk/help-overlay.ui:292
-msgctxt "shortcut window"
-msgid "Copy change below left"
-msgstr "Kopiér ændringen nedenfor til venstre"
-
-#: meld/resources/gtk/help-overlay.ui:299
-msgctxt "shortcut window"
-msgid "Copy change above right"
-msgstr "Kopiér ændringen ovenfor til højre"
-
-#: meld/resources/gtk/help-overlay.ui:306
-msgctxt "shortcut window"
-msgid "Copy change below right"
-msgstr "Kopiér ændringen nedenfor til højre"
-
-#: meld/resources/gtk/help-overlay.ui:313
-#: meld/resources/gtk/help-overlay.ui:341
-msgctxt "shortcut window"
-msgid "Delete change"
-msgstr "Slet ændring"
-
-#: meld/resources/gtk/help-overlay.ui:322
-msgctxt "shortcut window"
-msgid "Folder comparison"
-msgstr "Mappesammenligning"
-
-#: meld/resources/gtk/help-overlay.ui:327
-msgctxt "shortcut window"
-msgid "Copy to left"
-msgstr "Kopiér til venstre"
-
-#: meld/resources/gtk/help-overlay.ui:334
-msgctxt "shortcut window"
-msgid "Copy to right"
-msgstr "Kopiér til højre"
-
-#: meld/resources/gtk/help-overlay.ui:350
-msgctxt "shortcut window"
-msgid "Version control comparison"
-msgstr "Versionsstyringssammenligning"
-
-#: meld/resources/gtk/help-overlay.ui:355
-msgctxt "shortcut window"
-msgid "Commit to version control"
-msgstr "Commit til versionsstyring"
-
-#: meld/resources/gtk/help-overlay.ui:362
-msgctxt "shortcut window"
-msgid "Show/hide console output"
-msgstr "Vis/skjul konsoloutput"
-
-#: meld/resources/gtk/menus.ui:7
-msgid "Refresh"
-msgstr "Opdatér"
-
-#: meld/resources/gtk/menus.ui:12
-msgid "Stop"
-msgstr "Stop"
-
-#: meld/resources/gtk/menus.ui:17
-msgid "Fullscreen"
-msgstr "Fuldskærm"
-
-#: meld/resources/gtk/menus.ui:26
-msgid "Save As…"
-msgstr "Gem som …"
-
-#: meld/resources/gtk/menus.ui:30
-msgid "Save A_ll"
-msgstr "Gem a_lle"
-
-#: meld/resources/gtk/menus.ui:34
-msgid "Revert files…"
-msgstr "Tilbagefør filer …"
-
-#: meld/resources/gtk/menus.ui:38
-msgid "Open Externally"
-msgstr "Åbn eksternt"
-
-#: meld/resources/gtk/menus.ui:45
-msgid "_Find…"
-msgstr "_Find …"
-
-#: meld/resources/gtk/menus.ui:49
-msgid "_Replace…"
-msgstr "_Erstat …"
-
-#: meld/resources/gtk/menus.ui:55
-msgid "View"
-msgstr "Vis"
-
-#: meld/resources/gtk/menus.ui:59
-msgid "Overview Map"
-msgstr "Oversigtskort"
-
-#: meld/resources/gtk/menus.ui:63
-msgid "Version control console"
-msgstr "Versionsstyringskonsol"
-
-#: meld/resources/gtk/menus.ui:67
-msgid "Lock scrolling"
-msgstr "Lås rulning"
-
-#: meld/resources/gtk/menus.ui:73
-msgid "Comparison"
-msgstr "Sammenligning"
-
-#: meld/resources/gtk/menus.ui:77
-msgid "Merge All from Left"
-msgstr "Flet alle fra venstre"
-
-#: meld/resources/gtk/menus.ui:81
-msgid "Merge All from Right"
-msgstr "Flet alle fra højre"
-
-#: meld/resources/gtk/menus.ui:85
-msgid "Merge All"
-msgstr "Flet alle"
-
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
-msgid "Add Synchronization Point"
-msgstr "Tilføj synkroniseringspunkt"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
-msgid "Clear Synchronization Points"
-msgstr "Ryd synkroniseringspunkter"
-
-#: meld/resources/gtk/menus.ui:103
-msgid "Format as Patch…"
-msgstr "Formatér som rettelse (patch) …"
-
-#: meld/resources/gtk/menus.ui:112
-msgid "_Preferences"
-msgstr "_Indstillinger"
-
-#: meld/resources/gtk/menus.ui:116
-msgid "Keyboard Shortcuts"
-msgstr "Tastaturgenveje"
-
-#: meld/resources/gtk/menus.ui:120
-msgid "_Help"
-msgstr "_Hjælp"
-
-#: meld/resources/gtk/menus.ui:125
-msgid "_About Meld"
-msgstr "_Om Meld"
-
-#: meld/resources/gtk/menus.ui:138
-msgid "File status"
-msgstr "Filstatus"
-
-#: meld/resources/gtk/menus.ui:140
-msgid "Same"
-msgstr "Ens"
-
-#: meld/resources/gtk/menus.ui:144
-msgid "New"
-msgstr "Ny"
-
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
-#: meld/vc/_vc.py:76
-msgid "Modified"
-msgstr "Ændret"
-
-#: meld/resources/gtk/menus.ui:158
-msgid "Ignore filename case"
-msgstr "Ignorér forskelle på store/små bogstaver i filnavne"
-
-#: meld/resources/gtk/menus.ui:171
-msgid "Normal"
-msgstr "Normal"
-
-# "Vis ikke-versionsstyrede filer"
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
-msgid "Unversioned"
-msgstr "Uden versionering"
-
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
-msgid "Ignored"
-msgstr "Ignoreret"
-
-#: meld/resources/gtk/menus.ui:186
-msgid "Flatten folders"
-msgstr "Fladgør mapper"
-
-#: meld/resources/ui/about-dialog.ui:8
-msgid ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2019 Kai Willadsen"
-msgstr ""
-"Ophavsret © 2002-2009 Stephen Kennedy\n"
-"Ophavsret © 2009-2019 Kai Willadsen"
-
-#: meld/resources/ui/about-dialog.ui:14
-msgid "translator-credits"
-msgstr ""
-"Joe Hansen, 2010, 2011\n"
-"Alan Mortensen, 2016, 2017\n"
-"\n"
-"Dansk-gruppen\n"
-"Websted http://dansk-gruppen.dk\n"
-"E-mail <dansk@dansk-gruppen.dk>"
-
-#: meld/resources/ui/appwindow.ui:29
-msgid "Start a new comparison"
-msgstr "Start en ny sammenligning"
-
-#: meld/resources/ui/appwindow.ui:45
-msgid "Open a recent comparison"
-msgstr "Åbn en seneste sammenligning"
-
-#: meld/resources/ui/appwindow.ui:73
-msgid "Go to the previous change"
-msgstr "Gå til den forrige ændring"
-
-#: meld/resources/ui/appwindow.ui:93
-msgid "Go to the next change"
-msgstr "Gå til den næste ændring"
-
-#: meld/resources/ui/appwindow.ui:123
-msgid "Go to the previous conflict"
-msgstr "Gå til den forrige konflikt"
-
-#: meld/resources/ui/appwindow.ui:143
-msgid "Go to the next conflict"
-msgstr "Gå til den næste konflikt"
-
-#: meld/resources/ui/appwindow.ui:191
-msgid "Version Filters"
-msgstr "Versionsfiltre"
-
-#: meld/resources/ui/appwindow.ui:206 meld/resources/ui/preferences.ui:1456
-msgid "File Filters"
-msgstr "Filfiltre"
-
-#: meld/resources/ui/appwindow.ui:221 meld/resources/ui/preferences.ui:1641
-msgid "Text Filters"
-msgstr "Tekstfiltre"
-
-#: meld/resources/ui/column-list.ui:37 meld/resources/ui/filter-list.ui:40
-msgid "Active"
-msgstr "Aktiv"
-
-#: meld/resources/ui/column-list.ui:50
-msgid "Column Name"
-msgstr "Kolonnenavn"
-
-#: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736
-msgid "_Remove"
-msgstr "_Fjern"
-
-#: meld/resources/ui/column-list.ui:96 meld/resources/ui/filter-list.ui:152
-msgid "Move item up"
-msgstr "Flyt element op"
-
-#: meld/resources/ui/column-list.ui:98 meld/resources/ui/filter-list.ui:154
-msgid "Move _Up"
-msgstr "Flyt _op"
-
-#: meld/resources/ui/column-list.ui:112 meld/resources/ui/filter-list.ui:168
-msgid "Move item down"
-msgstr "Flyt element ned"
-
-#: meld/resources/ui/column-list.ui:114 meld/resources/ui/filter-list.ui:170
-msgid "Move _Down"
-msgstr "Flyt _ned"
-
-#: meld/resources/ui/commit-dialog.ui:8
-msgid "Commit"
-msgstr "Commit"
-
-#: meld/resources/ui/commit-dialog.ui:36
-msgid "Commit Files"
-msgstr "Commit filer"
-
-#: meld/resources/ui/commit-dialog.ui:117
-msgid "Log Message"
-msgstr "Logbesked"
-
-#: meld/resources/ui/commit-dialog.ui:181
-msgid "Previous logs:"
-msgstr "Forrige logge:"
-
-#: meld/resources/ui/commit-dialog.ui:259
-msgid "Co_mmit"
-msgstr "Co_mmit"
-
-#: meld/resources/ui/dirdiff-actions.ui:20
-msgid "Copy to left"
-msgstr "Kopiér til venstre"
-
-#: meld/resources/ui/dirdiff-actions.ui:42
-msgid "Copy to right"
-msgstr "Kopiér til højre"
-
-#: meld/resources/ui/dirdiff-actions.ui:66
-msgid "Delete selected"
-msgstr "Slet det valgte"
-
-#: meld/resources/ui/dirdiff-menus.ui:7
-msgid "_Compare selected files"
-msgstr "_Sammenlign de valgte filer"
-
-#: meld/resources/ui/dirdiff-menus.ui:14
-msgid "Copy to _left"
-msgstr "Kopiér til _venstre"
-
-#: meld/resources/ui/dirdiff-menus.ui:18
-msgid "Copy to _right"
-msgstr "Kopiér til _højre"
-
-#: meld/resources/ui/dirdiff-menus.ui:22
-msgid "_Delete selected"
-msgstr "Sle_t det valgte"
-
-#: meld/resources/ui/dirdiff-menus.ui:29
-msgid "Collapse Recursively"
-msgstr "Sammenfold rekursivt"
-
-#: meld/resources/ui/dirdiff-menus.ui:33
-msgid "Expand Recursively"
-msgstr "Udfold rekursivt"
-
-#: meld/resources/ui/dirdiff-menus.ui:40
-msgid "_Open Externally"
-msgstr "_Åbn eksternt"
-
-#: meld/resources/ui/dirdiff-menus.ui:44
-msgid "_Copy File Paths"
-msgstr "_Kopiér filstier"
-
-#: meld/resources/ui/encoding-selector.ui:31
-msgid "Search text encoding…"
-msgstr "Søg tekstkodning …"
-
-#: meld/resources/ui/filediff-actions.ui:20
-msgid "Push current change to the left"
-msgstr "Skub aktuel ændring til venstre"
-
-#: meld/resources/ui/filediff-actions.ui:42
-msgid "Push current change to the right"
-msgstr "Skub aktuel ændring til højre"
-
-#: meld/resources/ui/filediff-actions.ui:65
-msgid "Copy chunks"
-msgstr "Kopiér stykker"
-
-#: meld/resources/ui/filediff-actions.ui:87
-msgid "Delete change"
-msgstr "Slet ændring"
-
-#: meld/resources/ui/filediff-menus.ui:7
-msgid "Copy change above the left chunk"
-msgstr "Kopiér ændring over det store venstre stykke"
-
-#: meld/resources/ui/filediff-menus.ui:11
-msgid "Copy change below the left chunk"
-msgstr "Kopiér ændring nedenunder det store venstre stykke"
-
-#: meld/resources/ui/filediff-menus.ui:15
-msgid "Copy change above the right chunk"
-msgstr "Kopiér ændring over det store højre stykke"
-
-#: meld/resources/ui/filediff-menus.ui:19
-msgid "Copy change below the right chunk"
-msgstr "Kopiér ændring nedenunder det store højre stykke"
-
-#: meld/resources/ui/filediff-menus.ui:28
-msgid "_Undo"
-msgstr "_Fortryd"
-
-#: meld/resources/ui/filediff-menus.ui:32
-msgid "_Redo"
-msgstr "_Gentag"
-
-#: meld/resources/ui/filediff-menus.ui:39
-msgid "Cu_t"
-msgstr "K_lip"
-
-#: meld/resources/ui/filediff-menus.ui:43
-msgid "_Copy"
-msgstr "_Kopiér"
-
-#: meld/resources/ui/filediff-menus.ui:47
-msgid "_Paste"
-msgstr "_Indsæt"
-
-#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
-#: meld/resources/ui/filediff.ui:171
-msgid ""
-"This file can not be written to. You may click here to unlock this file and "
-"make changes anyway, but these changes must be saved to a new file."
-msgstr ""
-"Der kan ikke skrives til denne fil. Du kan klikke her for at låse filen op "
-"og alligevel foretage ændringer, men ændringerne skal gemmes til en ny fil."
-
-#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
-#: meld/resources/ui/filediff.ui:185
-msgid "Open file in this pane"
-msgstr "Åbn filen i denne rude"
-
-#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
-#: meld/resources/ui/filediff.ui:194
-#| msgctxt "shortcut window"
-#| msgid "Save all files in comparison"
-msgid "Save file in this pane"
-msgstr "Gem filen i denne rude"
-
-#: meld/resources/ui/filediff.ui:73
-msgid "File 3"
-msgstr "Fil 3"
-
-#: meld/resources/ui/filediff.ui:142
-msgid "File 2"
-msgstr "Fil 2"
-
-#: meld/resources/ui/filediff.ui:207
-msgid "File 1"
-msgstr "Fil 1"
-
-#. Create icon and filename CellRenderer
-#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
-#: meld/dirdiff.py:509
-msgid "Name"
-msgstr "Navn"
-
-#: meld/resources/ui/filter-list.ui:68
-msgid "Pattern"
-msgstr "Mønster"
-
-#: meld/resources/ui/filter-list.ui:110
-msgid "Add new filter"
-msgstr "Tilføj nyt filter"
-
-#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
-msgid "_Add"
-msgstr "_Tilføj"
-
-#: meld/resources/ui/filter-list.ui:126
-msgid "Remove selected filter"
-msgstr "Fjern det valgte filter"
-
-#: meld/resources/ui/findbar.ui:103
-msgid "_Match case"
-msgstr "_Forskel på store/små bogstaver"
-
-#: meld/resources/ui/findbar.ui:119
-msgid "Who_le word"
-msgstr "_Hele ord"
-
-#: meld/resources/ui/findbar.ui:135
-msgid "Regular e_xpression"
-msgstr "Regulært _udtryk"
-
-#: meld/resources/ui/findbar.ui:175
-msgid "Wrapped"
-msgstr "Ombrudt"
-
-#: meld/resources/ui/findbar.ui:193
-msgid "Replace _All"
-msgstr "Erstat _alle"
-
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1043 meld/iohelpers.py:115
-msgid "_Replace"
-msgstr "_Erstat"
-
-#: meld/resources/ui/findbar.ui:226
-msgid "Switch between Find and Find-and-Replace"
-msgstr "Skift mellem find og find-og-erstat"
-
-#: meld/resources/ui/language-selector.ui:31
-msgid "Search highlight mode…"
-msgstr "Søg efter fremhævningstilstand …"
-
-#: meld/resources/ui/new-diff-tab.ui:119 meld/meldwindow.py:345
-#: meld/newdifftab.py:49
-msgid "New comparison"
-msgstr "Ny sammenligning"
-
-#: meld/resources/ui/new-diff-tab.ui:171
-msgid "File"
-msgstr "Fil"
-
-#: meld/resources/ui/new-diff-tab.ui:220
-msgid "Folder"
-msgstr "Mappe"
-
-#: meld/resources/ui/new-diff-tab.ui:269
-msgid "Version control"
-msgstr "Versionsstyring"
-
-#: meld/resources/ui/new-diff-tab.ui:334 meld/resources/ui/new-diff-tab.ui:454
-msgid "_3-way comparison"
-msgstr "_Trevejssammenligning"
-
-#: meld/resources/ui/new-diff-tab.ui:353
-msgid "Select First File"
-msgstr "Vælg den 1. fil"
-
-#: meld/resources/ui/new-diff-tab.ui:367
-msgid "Select Second File"
-msgstr "Vælg den 2. fil"
-
-#: meld/resources/ui/new-diff-tab.ui:383
-msgid "Select Third File"
-msgstr "Vælg den 3. fil"
-
-#: meld/resources/ui/new-diff-tab.ui:418
-msgid "Select First Folder"
-msgstr "Vælg den 1. mappe"
-
-#: meld/resources/ui/new-diff-tab.ui:431
-msgid "Select Second Folder"
-msgstr "Vælg den 2. mappe"
-
-#: meld/resources/ui/new-diff-tab.ui:445
-msgid "Select Third Folder"
-msgstr "Vælg den 3. mappe"
-
-#: meld/resources/ui/new-diff-tab.ui:495
-msgid "Select A Version-Controlled Folder"
-msgstr "Vælg en versionsstyret mappe"
-
-#: meld/resources/ui/new-diff-tab.ui:544
-msgid "_Blank comparison"
-msgstr "_Tom sammenligning"
-
-#: meld/resources/ui/new-diff-tab.ui:561
-msgid "C_ompare"
-msgstr "_Sammenlign"
-
-#: meld/resources/ui/notebook-label.ui:24
-msgid "Close Tab"
-msgstr "Luk faneblad"
-
-#: meld/resources/ui/patch-dialog.ui:9
-msgid "Format as Patch"
-msgstr "Formatér som rettelse (patch)"
-
-#: meld/resources/ui/patch-dialog.ui:26
-msgid "Copy to Clipboard"
-msgstr "Kopiér til udklipsholderen"
-
-#: meld/resources/ui/patch-dialog.ui:57 meld/patchdialog.py:159
-msgid "Save Patch"
-msgstr "Gem rettelse (patch)"
-
-#: meld/resources/ui/patch-dialog.ui:88
-msgid "Use differences between:"
-msgstr "Brug forskelle mellem:"
-
-#: meld/resources/ui/patch-dialog.ui:105
-msgid "Left and middle panes"
-msgstr "Ruder til venstre og i midten"
-
-#: meld/resources/ui/patch-dialog.ui:123
-msgid "Middle and right panes"
-msgstr "Ruder i midten og til højre"
-
-#: meld/resources/ui/patch-dialog.ui:149
-msgid "_Reverse patch direction"
-msgstr "_Modsat rettelsesretning"
-
-#: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
-msgid "Preferences"
-msgstr "Indstillinger"
-
-#: meld/resources/ui/preferences.ui:75
-msgid "Font"
-msgstr "Skrifttype"
-
-#: meld/resources/ui/preferences.ui:112
-msgid "_Use the system fixed width font"
-msgstr "_Brug systemets standardskrifttype med fast bredde"
-
-# Det er ikke det eksterne redigeringsprogram, men internt i Meld.
-#: meld/resources/ui/preferences.ui:136
-msgid "_Editor font:"
-msgstr "_Skrifttype for redigering:"
-
-#. TRANSLATORS: This is the status bar label for a group of settings,
-#. such as text wrapping, show line numbers, whitespace, etc.
-#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:288
-msgid "Display"
-msgstr "Skærm"
-
-#: meld/resources/ui/preferences.ui:241
-msgid "_Tab width:"
-msgstr "_Bredde på tabulator:"
-
-#: meld/resources/ui/preferences.ui:274
-msgid "_Insert spaces instead of tabs"
-msgstr "_Indsæt mellemrum i stedet for tabulatorer"
-
-#: meld/resources/ui/preferences.ui:290
-msgid "Enable text _wrapping"
-msgstr "Aktivér _tekstombrydning"
-
-#: meld/resources/ui/preferences.ui:312
-msgid "Do not _split words over two lines"
-msgstr "_Opdel ikke ord over to linjer"
-
-#: meld/resources/ui/preferences.ui:333
-msgid "Highlight _current line"
-msgstr "Fremhæv _aktuelle linje"
-
-#: meld/resources/ui/preferences.ui:349
-msgid "Show _line numbers"
-msgstr "Vis _linjenumre"
-
-#: meld/resources/ui/preferences.ui:365
-msgid "Show w_hitespace"
-msgstr "Vis _blanktegn"
-
-#: meld/resources/ui/preferences.ui:381
-msgid "Use s_yntax highlighting"
-msgstr "Brug _syntaksfremhævning"
-
-#: meld/resources/ui/preferences.ui:404
-msgid "Syntax highlighting color scheme:"
-msgstr "Farveskema for syntaksfremhævning:"
-
-#: meld/resources/ui/preferences.ui:469
-msgid "Code Overview"
-msgstr "Kodeoversigt"
-
-#: meld/resources/ui/preferences.ui:506
-msgid "Show overview map"
-msgstr "Vis oversigtskort"
-
-#: meld/resources/ui/preferences.ui:529
-msgid "Overview map style:"
-msgstr "Stil for oversigtskort:"
-
-#: meld/resources/ui/preferences.ui:596
-msgid "External Editor"
-msgstr "Eksternt redigeringsprogram"
-
-# Brug det _normale systemredigeringsprogram
-# Brug systemets _standardredigeringsprogram
-#: meld/resources/ui/preferences.ui:632
-msgid "Use _default system editor"
-msgstr "Brug det _normale systemredigeringsprogram"
-
-#: meld/resources/ui/preferences.ui:655
-msgid "Edito_r command:"
-msgstr "_Kommando for redigeringsprogram:"
-
-#: meld/resources/ui/preferences.ui:711
-msgid "Editor"
-msgstr "Redigeringsprogram"
-
-#: meld/resources/ui/preferences.ui:732
-msgid "Shallow Comparison"
-msgstr "Overfladisk sammenligning"
-
-#: meld/resources/ui/preferences.ui:768
-msgid "C_ompare files based only on size and timestamp"
-msgstr "_Sammenlign kun filer baseret på størrelse og tidsstempel"
-
-#: meld/resources/ui/preferences.ui:791
-msgid "_Timestamp resolution:"
-msgstr "_Tidsstempelopløsning:"
-
-#: meld/resources/ui/preferences.ui:855
-msgid "Note: enabling text filters may make comparing large files much slower"
-msgstr ""
-"Bemærk: Aktivering af tekstfiltre kan gøre sammenligning af store filer "
-"meget langsommere"
-
-#: meld/resources/ui/preferences.ui:904
-msgid "Symbolic Links"
-msgstr "Symbolske henvisninger"
-
-#: meld/resources/ui/preferences.ui:972
-msgid "Visible Columns"
-msgstr "Synlige kolonner"
-
-#: meld/resources/ui/preferences.ui:1039
-msgid "Folder Comparisons"
-msgstr "Mappesammenligninger"
-
-#: meld/resources/ui/preferences.ui:1061
-msgid "Version Comparisons"
-msgstr "Versionssammenligninger"
-
-#: meld/resources/ui/preferences.ui:1104
-msgid "_Order when comparing file revisions:"
-msgstr "_Rækkefølge ved sammenligning af filrevisioner:"
-
-#: meld/resources/ui/preferences.ui:1151
-msgid "Order when _merging files:"
-msgstr "R_ækkefølge når filer flettes:"
-
-#: meld/resources/ui/preferences.ui:1219
-msgid "Commit Messages"
-msgstr "Commit-beskeder"
-
-#: meld/resources/ui/preferences.ui:1260
-msgid "Show _right margin at:"
-msgstr "Vis _højre margen ved:"
-
-#: meld/resources/ui/preferences.ui:1301
-msgid "Automatically _break lines at right margin on commit"
-msgstr "Bryd automatisk linjer ved højre margen ved commit"
-
-#: meld/resources/ui/preferences.ui:1351
-msgid "Version Control"
-msgstr "Versionsstyring"
-
-#: meld/resources/ui/preferences.ui:1373
-msgid "Filename filters"
-msgstr "Filnavnefiltre"
-
-#: meld/resources/ui/preferences.ui:1411
-msgid ""
-"When performing directory comparisons, you may filter out files and "
-"directories by name. Each pattern is a list of shell style wildcards "
-"separated by spaces."
-msgstr ""
-"Når der udføres mappesammenligninger, kan du filtrere filer og mapper fra "
-"efter navn. Hvert mønster er en liste af skallignende jokertegn adskilt af "
-"mellemrum."
-
-#: meld/resources/ui/preferences.ui:1478
-msgid "Change trimming"
-msgstr "Ændr beskæring"
-
-#: meld/resources/ui/preferences.ui:1514
-msgid "Trim blank line differences from the start and end of changes"
-msgstr ""
-"Beskær tomme linjer-forskelle fra begyndelsen og slutningen af ændringer"
-
-#: meld/resources/ui/preferences.ui:1558
-msgid "Text filters"
-msgstr "Tekstfiltre"
-
-# vert mønster er et regulært udtryk i python, der erstatter
-# tilsvarende tekst med den tomme streng før sammenligningen udføres.
-#: meld/resources/ui/preferences.ui:1596
-msgid ""
-"When performing file comparisons, you may ignore certain types of changes. "
-"Each pattern here is a python regular expression which replaces matching "
-"text with the empty string before comparison is performed. If the expression "
-"contains groups, only the groups are replaced. See the user manual for more "
-"details."
-msgstr ""
-"Når der udføres filsammenligninger, kan du ignorere visse ændringer. Hvert "
-"mønster her er et regulært udtryk i python, som erstatter tilsvarende tekst "
-"med den tomme streng før sammenligning udføres. Hvis udtrykket indeholder "
-"grupper, bliver kun grupperne erstattet. Se brugermanualen for yderligere "
-"detaljer."
-
-#: meld/resources/ui/preferences.ui:1687
-msgid "Left is remote, right is local"
-msgstr "Venstre er fjern, højre er lokal"
-
-#: meld/resources/ui/preferences.ui:1691
-msgid "Left is local, right is remote"
-msgstr "Venstre er lokal, højre er fjern"
-
-#: meld/resources/ui/preferences.ui:1705
-msgid "Simple change map"
-msgstr "Simpelt ændringskort"
-
-#: meld/resources/ui/preferences.ui:1709
-msgid "Compact source map"
-msgstr "Kompakt kildekort"
-
-#: meld/resources/ui/preferences.ui:1713
-msgid "Full source map"
-msgstr "Fuldt kildekort"
-
-#: meld/resources/ui/preferences.ui:1727
-msgid "Remote, merge, local"
-msgstr "Fjern, flet, lokal"
-
-#: meld/resources/ui/preferences.ui:1731
-msgid "Local, merge, remote"
-msgstr "Lokal, flet, fjern"
-
-#: meld/resources/ui/preferences.ui:1753
-msgid "1ns (ext4)"
-msgstr "1ns (ext4)"
-
-#: meld/resources/ui/preferences.ui:1757
-msgid "100ns (NTFS)"
-msgstr "100ns (NTFS)"
-
-#: meld/resources/ui/preferences.ui:1761
-msgid "1s (ext2/ext3)"
-msgstr "1s (ext2/ext3)"
-
-#: meld/resources/ui/preferences.ui:1765
-msgid "2s (VFAT)"
-msgstr "2s (VFAT)"
-
-#: meld/resources/ui/push-dialog.ui:9
-msgid "Push local commits to remote?"
-msgstr "Skub lokale commit'er til fjern?"
-
-#: meld/resources/ui/push-dialog.ui:10
-msgid "The commits to be pushed are determined by your version control system."
-msgstr ""
-"Hvilke commit'er, der skubbes, bestemmes af dit versionsstyringssystem."
-
-#: meld/resources/ui/push-dialog.ui:38
-msgid "_Push commits"
-msgstr "_Skub commit'er"
-
-#: meld/resources/ui/recent-selector.ui:16
-msgid "Search recent comparisons…"
-msgstr "Søg efter seneste sammenligninger …"
-
-#: meld/resources/ui/revert-dialog.ui:9
-msgid "Discard unsaved changes to documents?"
-msgstr "Kassér ikke gemte ændringer i dokumentet?"
-
-#: meld/resources/ui/revert-dialog.ui:10
-msgid "Changes made to the following documents will be permanently lost:"
-msgstr "Ændringer foretaget i følgende dokumenter vil gå tabt for altid:"
-
-#: meld/resources/ui/revert-dialog.ui:39
-msgid "_Discard"
-msgstr "_Kassér"
-
-#: meld/resources/ui/save-confirm-dialog.ui:9
-msgid "Save changes to documents before closing?"
-msgstr "Gem ændringer i dokumenter, før der lukkes?"
-
-#: meld/resources/ui/save-confirm-dialog.ui:10
-msgid "If you don’t save, changes will be permanently lost."
-msgstr "Ændringerne går tabt permanent, hvis ikke du gemmer."
-
-#: meld/resources/ui/save-confirm-dialog.ui:24
-msgid "Close _without Saving"
-msgstr "Luk _uden at gemme"
-
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1042
-#: meld/iohelpers.py:56 meld/iohelpers.py:114
-msgid "_Cancel"
-msgstr "_Annullér"
-
-#: meld/resources/ui/save-confirm-dialog.ui:52
-msgid "_Save"
-msgstr "_Gem"
-
-#: meld/resources/ui/statusbar-menu.ui:9
-msgid "Show whitespace"
-msgstr "Vis blanktegn"
-
-#: meld/resources/ui/statusbar-menu.ui:17
-msgid "Text wrapping"
-msgstr "Tekstombrydning"
-
-#: meld/resources/ui/vcview-menus.ui:7
-msgid "_Compare"
-msgstr "_Sammenlign"
-
-#: meld/resources/ui/vcview-menus.ui:11
-msgid "Co_mmit…"
-msgstr "Co_mmit …"
-
-#: meld/resources/ui/vcview-menus.ui:15
-msgid "_Update"
-msgstr "_Opdatér"
-
-#: meld/resources/ui/vcview-menus.ui:30
-msgid "Re_vert"
-msgstr "_Gendan"
-
-#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
-msgid "Delete"
-msgstr "Slet"
-
-#: meld/resources/ui/vcview-menus.ui:41
-msgid "Mar_k as Resolved"
-msgstr "Markér som l_øst"
-
-#: meld/resources/ui/vcview.ui:73
-msgid "Commit…"
-msgstr "Commit …"
-
-#: meld/resources/ui/vcview.ui:74
-msgid "Commit changes to version control"
-msgstr "Commit ændringer til versionsstyring"
-
-#: meld/resources/ui/vcview.ui:86
-msgid "Update"
-msgstr "Opdatér"
-
-#: meld/resources/ui/vcview.ui:87
-msgid "Update working copy from version control"
-msgstr "Opdatér arbejdskopi fra versionsstyring"
-
-#: meld/resources/ui/vcview.ui:99
-msgid "Push"
-msgstr "Skub"
-
-#: meld/resources/ui/vcview.ui:100
-msgid "Push local changes to remote"
-msgstr "Skub lokale ændringer til fjern"
-
-#: meld/resources/ui/vcview.ui:112
-msgid "Add"
-msgstr "Tilføj"
-
-#: meld/resources/ui/vcview.ui:113
-msgid "Add to version control"
-msgstr "Tilføj til versionsstyring"
-
-#: meld/resources/ui/vcview.ui:125
-msgid "Remove"
-msgstr "Fjern"
-
-#: meld/resources/ui/vcview.ui:126
-msgid "Remove from version control"
-msgstr "Fjern fra versionsstyring"
-
-#: meld/resources/ui/vcview.ui:138
-msgid "Mark as Resolved"
-msgstr "Markér som løst"
-
-#: meld/resources/ui/vcview.ui:139
-msgid "Mark as resolved in version control"
-msgstr "Markér som løst i versionsstyring"
-
-#: meld/resources/ui/vcview.ui:151
-msgid "Revert"
-msgstr "Tilbagefør"
-
-#: meld/resources/ui/vcview.ui:152
-msgid "Revert working copy to original state"
-msgstr "Tilbagefør arbejdskopi til oprindelig tilstand"
-
-#: meld/resources/ui/vcview.ui:165
-msgid "Delete from working copy"
-msgstr "Slet fra arbejdskopi"
-
-#: meld/resources/ui/vcview.ui:220 meld/vcview.py:411
-msgid "Location"
-msgstr "Sted"
-
-#: meld/resources/ui/vcview.ui:229
-msgid "Status"
-msgstr "Status"
-
-#: meld/resources/ui/vcview.ui:238
-msgid "Extra"
-msgstr "Ekstra"
-
-#: meld/resources/ui/vcview.ui:270
-msgid "Console output"
-msgstr "Konsoloutput"
-
-#: meld/actiongutter.py:247
-msgid "Copy _up"
-msgstr "Kopiér _op"
-
-#: meld/actiongutter.py:248
-msgid "Copy _down"
-msgstr "Kopiér _ned"
-
-#: meld/const.py:30
-msgid "UNIX (LF)"
-msgstr "UNIX (LF)"
-
-#: meld/const.py:31
-msgid "DOS/Windows (CR-LF)"
-msgstr "DOS/Windows (CR-LF)"
-
-#: meld/const.py:32
-msgid "Mac OS (CR)"
-msgstr "Mac OS (CR)"
-
-#. Create file size CellRenderer
-#: meld/dirdiff.py:530 meld/preferences.py:132
-msgid "Size"
-msgstr "Størrelse"
-
-#. Create date-time CellRenderer
-#: meld/dirdiff.py:538 meld/preferences.py:133
-msgid "Modification time"
-msgstr "Ændringstidspunkt"
-
-#. Create permissions CellRenderer
-#: meld/dirdiff.py:546 meld/preferences.py:134
-msgid "Permissions"
-msgstr "Rettigheder"
-
-#: meld/dirdiff.py:770 meld/dirdiff.py:793
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr "[%s] Skanner %s"
-
-#: meld/dirdiff.py:929
-#, python-format
-msgid "[%s] Done"
-msgstr "[%s] Færdig"
-
-#: meld/dirdiff.py:936
-msgid "Folders have no differences"
-msgstr "Der er ingen forskelle på mapperne"
-
-#: meld/dirdiff.py:938
-msgid "Contents of scanned files in folders are identical."
-msgstr "Indholdet af de skannede filer i mapperne er ens."
-
-#: meld/dirdiff.py:940
-msgid ""
-"Scanned files in folders appear identical, but contents have not been "
-"scanned."
-msgstr ""
-"De skannede filer i mapperne ser ud til at være ens, men indholdet er ikke "
-"blevet skannet."
-
-#: meld/dirdiff.py:943
-msgid "File filters are in use, so not all files have been scanned."
-msgstr "Ikke alle filer er blevet skannet, da filfiltre er i brug."
-
-#: meld/dirdiff.py:945
-msgid "Text filters are in use and may be masking content differences."
-msgstr "Tekstfiltre er i brug og kan maskere forskelle i indhold."
-
-#: meld/dirdiff.py:961 meld/filediff.py:1853
-msgid "Hide"
-msgstr "Skjul"
-
-#: meld/dirdiff.py:963 meld/filediff.py:1855 meld/filediff.py:1885
-#: meld/filediff.py:1887 meld/ui/msgarea.py:108 meld/ui/msgarea.py:121
-msgid "Hi_de"
-msgstr "_Skjul"
-
-#: meld/dirdiff.py:972
-msgid "Multiple errors occurred while scanning this folder"
-msgstr "Der opstod flere fejl, under skanning af mappen"
-
-#: meld/dirdiff.py:973
-msgid "Files with invalid encodings found"
-msgstr "Fandt filer med ugyldige kodninger"
-
-#. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:975
-msgid "Some files were in an incorrect encoding. The names are something like:"
-msgstr "Nogle filer var ikke kodet korrekt. Navnene er noget lignende dette:"
-
-#: meld/dirdiff.py:977
-msgid "Files hidden by case insensitive comparison"
-msgstr "Filer skjult af søgning, som ikke tager højde for store/små bogstaver"
-
-# Du udfører en sammenligning uden forskel på store og små bogstaver på
-# et filsystem, hvor der er forskel på store og små bogstaver.
-#. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:979
-msgid ""
-"You are running a case insensitive comparison on a case sensitive "
-"filesystem. The following files in this folder are hidden:"
-msgstr ""
-"Du udfører en sammenligning, der ikke tager højde for store/små bogstaver, "
-"på et filsystem, som tager højde for store/små bogstaver. Følgende filer i "
-"denne mappe er skjulte:"
-
-#: meld/dirdiff.py:990
-#, python-format
-msgid "“%s” hidden by “%s”"
-msgstr "“%s” skjult af “%s”"
-
-#: meld/dirdiff.py:1046
-#, python-format
-msgid "Replace folder “%s”?"
-msgstr "Erstat mappen “%s”?"
-
-#: meld/dirdiff.py:1048
-#, python-format
-msgid ""
-"Another folder with the same name already exists in “%s”.\n"
-"If you replace the existing folder, all files in it will be lost."
-msgstr ""
-"En mappe med det samme navn findes allerede i “%s”.\n"
-"Hvis du erstatter den eksisterende mappe, vil alle filer i den gå tabt."
-
-#: meld/dirdiff.py:1061
-msgid "Error copying file"
-msgstr "Fejl ved kopiering af fil"
-
-#: meld/dirdiff.py:1062
-#, python-format
-msgid ""
-"Couldn’t copy %s\n"
-"to %s.\n"
-"\n"
-"%s"
-msgstr ""
-"Kunne ikke kopiere %s\n"
-"til %s.\n"
-"\n"
-"%s"
-
-#: meld/dirdiff.py:1087 meld/vcview.py:759
-msgid "Error deleting {}"
-msgstr "Fejl ved sletning af {}"
-
-#: meld/dirdiff.py:1580
-msgid "No folder"
-msgstr "Ingen mappe"
-
-#: meld/filediff.py:1135
-msgid "Comparison results will be inaccurate"
-msgstr "Resultatet af sammenligningen vil være unøjagtigt"
-
-#: meld/filediff.py:1137
-msgid ""
-"A filter changed the number of lines in the file, which is unsupported. The "
-"comparison will not be accurate."
-msgstr ""
-"Et filter ændrede antallet af linjer i filen, hvilket ikke understøttes. "
-"Sammenligningen vil ikke være nøjagtig."
-
-#: meld/filediff.py:1209
-msgid "Mark conflict as resolved?"
-msgstr "Markér konflikt som løst?"
-
-#: meld/filediff.py:1211
-msgid ""
-"If the conflict was resolved successfully, you may mark it as resolved now."
-msgstr "Hvis konflikten blev løst, kan du nu markere den som løst."
-
-#: meld/filediff.py:1213
-msgid "Cancel"
-msgstr "Annullér"
-
-#: meld/filediff.py:1214
-msgid "Mark _Resolved"
-msgstr "Markér som _løst"
-
-#: meld/filediff.py:1547
-#, python-format
-msgid "There was a problem opening the file “%s”."
-msgstr "Der var et problem med at åbne filen “%s”."
-
-#: meld/filediff.py:1555
-#, python-format
-msgid "File %s appears to be a binary file."
-msgstr "Filen %s ser ud til at være en binær fil."
-
-#: meld/filediff.py:1557
-msgid "Do you want to open the file using the default application?"
-msgstr "Vil du åbne filen med standardprogrammet?"
-
-#: meld/filediff.py:1559
-msgid "Open"
-msgstr "Åbn"
-
-#: meld/filediff.py:1573
-#, python-format
-msgid "[%s] Merging files"
-msgstr "[%s] Fletter filer"
-
-#: meld/filediff.py:1587
-#, python-format
-msgid "[%s] Computing differences"
-msgstr "[%s] Beregner forskelle"
-
-#: meld/filediff.py:1648
-#, python-format
-msgid "File %s has changed on disk"
-msgstr "Filen %s er blevet ændret på disken"
-
-#: meld/filediff.py:1649
-msgid "Do you want to reload the file?"
-msgstr "Vil du genindlæse filen?"
-
-#: meld/filediff.py:1651
-msgid "_Reload"
-msgstr "_Genindlæs"
-
-#: meld/filediff.py:1818
-msgid "Files are identical"
-msgstr "Filer er identiske"
-
-#: meld/filediff.py:1831
-msgid ""
-"Text filters are being used, and may be masking differences between files. "
-"Would you like to compare the unfiltered files?"
-msgstr ""
-"Tekstfiltre er i brug og kan maskere forskelle mellem filer. Vil du "
-"sammenligne de ikke-filtrerede filer?"
-
-#: meld/filediff.py:1836
-msgid "Files differ in line endings only"
-msgstr "Filer er kun forskellige i slutningen af linjerne"
-
-#: meld/filediff.py:1838
-#, python-format
-msgid ""
-"Files are identical except for differing line endings:\n"
-"%s"
-msgstr ""
-"Filerne er ens bortset fra forskelle i slutningen af linjerne:\n"
-"%s"
-
-#: meld/filediff.py:1858
-msgid "Show without filters"
-msgstr "Vis uden filtre"
-
-#: meld/filediff.py:1880
-msgid "Change highlighting incomplete"
-msgstr "Fremhævning af ændringer ufuldstændig"
-
-#: meld/filediff.py:1881
-msgid ""
-"Some changes were not highlighted because they were too large. You can force "
-"Meld to take longer to highlight larger changes, though this may be slow."
-msgstr ""
-"Nogle ændringer blev ikke fremhævet, fordi de var for store. Du kan tvinge "
-"Meld til at bruge længere tid på at fremhæve større ændringer, selvom det "
-"kan være langsomt."
-
-#: meld/filediff.py:1889
-msgid "Keep highlighting"
-msgstr "Bliv ved med at fremhæve"
-
-#: meld/filediff.py:1891
-msgid "_Keep highlighting"
-msgstr "_Bliv ved med at fremhæve"
-
-#: meld/filediff.py:1904
-msgid "Saving failed"
-msgstr "Kunne ikke gemme"
-
-#: meld/filediff.py:1905
-msgid ""
-"Please consider copying any critical changes to another program or file to "
-"avoid data loss."
-msgstr ""
-"Overvej at kopiere kritiske ændringer til et andet program eller en anden "
-"fil for at undgå tab af data."
-
-#: meld/filediff.py:1914
-msgid "Save Left Pane As"
-msgstr "Gem venstre rude som"
-
-#: meld/filediff.py:1916
-msgid "Save Middle Pane As"
-msgstr "Gem midterste rude som"
-
-#: meld/filediff.py:1918
-msgid "Save Right Pane As"
-msgstr "Gem højre rude som"
-
-#: meld/filediff.py:1929
-#, python-format
-msgid "File %s has changed on disk since it was opened"
-msgstr "Filen %s er blevet ændret på disken, siden den blev åbnet"
-
-#: meld/filediff.py:1931
-msgid "If you save it, any external changes will be lost."
-msgstr ""
-"Hvis du gemmer den, vil alle ændringer, som er foretaget eksternt, gå tabt."
-
-#: meld/filediff.py:1934
-msgid "Save Anyway"
-msgstr "Gem alligevel"
-
-#: meld/filediff.py:1935
-msgid "Don’t Save"
-msgstr "Gem ikke"
-
-#: meld/filediff.py:1977
-msgid ""
-"File “{}” contains characters that can’t be encoded using its current "
-"encoding “{}”."
-msgstr ""
-"Filen “{}” indeholder tegn, som ikke kan kodes med filens aktuelle kodning "
-"“{}”."
-
-#: meld/filediff.py:1981 meld/patchdialog.py:138
-#, python-format
-msgid ""
-"Couldn’t save file due to:\n"
-"%s"
-msgstr ""
-"Kunne ikke gemme filen pga.:\n"
-"%s"
-
-#: meld/filediff.py:1985 meld/patchdialog.py:137
-#, python-format
-msgid "Could not save file %s."
-msgstr "Kunne ikke gemme filen %s."
-
-#: meld/filediff.py:2046
-msgid "Open File"
-msgstr "Åbn fil"
-
-#: meld/filediff.py:2400
-msgid "Live comparison updating disabled"
-msgstr "Liveopdatering af sammenligninger deaktiveret"
-
-#: meld/filediff.py:2401
-msgid ""
-"Live updating of comparisons is disabled when synchronization points are "
-"active. You can still manually refresh the comparison, and live updates will "
-"resume when synchronization points are cleared."
-msgstr ""
-"Liveopdatering af sammenligninger er deaktiveret, når synkroniseringspunkter "
-"er aktive. Du kan stadig opdatere sammenligningen manuelt, og liveopdatering "
-"vil fortsætte, når synkroniseringspunkterne er blevet ryddet."
-
-#: meld/iohelpers.py:41
-msgid "Deleting remote folders is not supported"
-msgstr "Sletning af eksterne mapper understøttes ikke"
-
-#: meld/iohelpers.py:43
-msgid "Not a file or directory"
-msgstr "Ikke en fil eller mappe"
-
-#: meld/iohelpers.py:47
-msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
-msgstr "“{}” kan ikke puttes i papirkurven. Vil du slette den helt?"
-
-#: meld/iohelpers.py:52
-msgid "This remote location does not support sending items to the trash."
-msgstr "Denne eksterne placering understøtter ikke papirkurv."
-
-#: meld/iohelpers.py:57
-msgid "_Delete Permanently"
-msgstr "_Slet for evigt"
-
-#: meld/iohelpers.py:108
-#, python-format
-msgid "Replace file “%s”?"
-msgstr "Erstat filen “%s”?"
-
-#: meld/iohelpers.py:110
-#, python-format
-msgid ""
-"A file with this name already exists in “%s”.\n"
-"If you replace the existing file, its contents will be lost."
-msgstr ""
-"Der er allerede en fil med dette navn i “%s”.\n"
-"Hvis du erstatter den eksisterende fil, vil dens indhold gå tabt."
-
-#: meld/meldapp.py:183
-msgid "wrong number of arguments supplied to --diff"
-msgstr "forkert antal argumenter angivet til --diff"
-
-#: meld/meldapp.py:188
-msgid "Start with an empty window"
-msgstr "Start med et tomt vindue"
-
-#: meld/meldapp.py:189 meld/meldapp.py:191
-msgid "file"
-msgstr "fil"
-
-#: meld/meldapp.py:189 meld/meldapp.py:193
-msgid "folder"
-msgstr "mappe"
-
-#: meld/meldapp.py:190
-msgid "Start a version control comparison"
-msgstr "Start en sammenligning af versioner"
-
-#: meld/meldapp.py:192
-msgid "Start a 2- or 3-way file comparison"
-msgstr "Sammenlign to eller tre filer"
-
-#: meld/meldapp.py:194
-msgid "Start a 2- or 3-way folder comparison"
-msgstr "Sammenlign to eller tre mapper"
-
-#: meld/meldapp.py:237
-#, python-format
-msgid "Error: %s\n"
-msgstr "Fejl: %s\n"
-
-#: meld/meldapp.py:244
-msgid "Meld is a file and directory comparison tool."
-msgstr "Meld er et værktøj til at sammenligne filer og mapper."
-
-#: meld/meldapp.py:248
-msgid "Set label to use instead of file name"
-msgstr "Angiv etiket, der skal bruges i stedet for filnavn"
-
-#: meld/meldapp.py:251
-msgid "Open a new tab in an already running instance"
-msgstr "Åbn et nyt faneblad i en instans som allerede kører"
-
-#: meld/meldapp.py:254
-msgid "Automatically compare all differing files on startup"
-msgstr "Sammenlign automatisk alle filer der har forskelle ved opstart"
-
-#: meld/meldapp.py:257
-msgid "Ignored for compatibility"
-msgstr "Ignoreres pga. kompatibilitet"
-
-#: meld/meldapp.py:261
-msgid "Set the target file for saving a merge result"
-msgstr "Angiv målfilen hvor resultatet af en fletning skal gemmes"
-
-#: meld/meldapp.py:264
-msgid "Automatically merge files"
-msgstr "Flet filer automatisk"
-
-#: meld/meldapp.py:268
-msgid "Load a saved comparison from a Meld comparison file"
-msgstr "Indlæs en gemt sammenligning fra en Meld-sammenligningsfil"
-
-#: meld/meldapp.py:272
-msgid "Create a diff tab for the supplied files or folders"
-msgstr ""
-"Opret et faneblad med forskellene mellem de angivne filer eller mapper."
-
-#: meld/meldapp.py:292
-#, python-format
-msgid "too many arguments (wanted 0-3, got %d)"
-msgstr "for mange argumenter (ønskede 0-3, fik %d)"
-
-#: meld/meldapp.py:295
-msgid "can’t auto-merge less than 3 files"
-msgstr "kan ikke auto-flette mindre end tre filer"
-
-#: meld/meldapp.py:297
-msgid "can’t auto-merge directories"
-msgstr "kan ikke auto-flette mapper"
-
-#: meld/meldapp.py:312
-msgid "Error reading saved comparison file"
-msgstr "Fejl ved læsning af gemt sammenligningsfil"
-
-#: meld/meldapp.py:329
-#, python-format
-msgid "invalid path or URI “%s”"
-msgstr "ugyldig sti eller URI “%s”"
-
-#: meld/meldapp.py:335
-msgid "remote folder “{}” not supported"
-msgstr "ekstern mappe “{}” er ikke understøttet"
-
-#. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: meld/meldbuffer.py:114
-msgid "<unnamed>"
-msgstr "<unavngivet>"
-
-#: meld/melddoc.py:61
-msgid "untitled"
-msgstr "uden titel"
-
-#: meld/meldwindow.py:151
-msgid "Filename"
-msgstr "Filnavn"
-
-#: meld/meldwindow.py:380
-#, python-format
-msgid "Need three files to auto-merge, got: %r"
-msgstr "Behøver tre filer for at auto-flette, fik: %r"
-
-#: meld/meldwindow.py:402
-msgid "Cannot compare a mixture of files and directories"
-msgstr "Kan ikke sammenligne en blanding af filer og mapper"
-
-#: meld/misc.py:150
-msgid ""
-"{}\n"
-"\n"
-"Meld encountered a critical error while running:\n"
-"<tt>{}</tt>"
-msgstr ""
-"{}\n"
-"\n"
-"Meld stødte på en kritisk fejl under kørslen af:\n"
-"<tt>{}</tt>"
-
-#: meld/misc.py:201
-msgid "[None]"
-msgstr "[Ingen]"
-
-#: meld/preferences.py:37 meld/preferences.py:129
-msgid "label"
-msgstr "etiket"
-
-#: meld/preferences.py:37 meld/preferences.py:129
-msgid "pattern"
-msgstr "mønster"
-
-#: meld/recent.py:104
-msgid "Version control:"
-msgstr "Versionsstyring:"
-
-#: meld/style.py:90
-#, python-format
-msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
-msgstr ""
-"Kunne ikke finde farveskemadetaljer for %s-%s; dette er en dårlig "
-"installation"
-
-#: meld/ui/bufferselectors.py:110
-#, python-brace-format
-msgid "{name} ({charset})"
-msgstr "{name} ({charset})"
-
-#: meld/ui/bufferselectors.py:140 meld/ui/bufferselectors.py:148
-msgid "Plain Text"
-msgstr "Klartekst"
-
-#: meld/ui/filechooser.py:68
-msgid "Autodetect Encoding"
-msgstr "Automatisk registrering af kodning"
-
-#: meld/ui/filechooser.py:71
-msgid "Current Locale ({})"
-msgstr "Nuværende lokalitet ({})"
-
-#. Abbreviation for line, column so that it will fit in the status bar
-#: meld/ui/statusbar.py:123
-#, python-format
-msgid "Ln %i, Col %i"
-msgstr "Lin. %i, kol. %i"
-
-#: meld/ui/statusbar.py:183
-msgid "Line you want to move the cursor to"
-msgstr "Linje du ønsker at flytte markøren til"
-
-#: meld/ui/vcdialogs.py:50
-msgid "No files will be committed"
-msgstr "Ingen filer vil blive commit'et"
-
-#. Translators: First %s is replaced by translated "%d unpushed
-#. commits", second %s is replaced by translated "%d branches"
-#: meld/vc/git.py:91
-#, python-format
-msgid "%s in %s"
-msgstr "%s i %s"
-
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: meld/vc/git.py:92 meld/vc/git.py:99
-#, python-format
-msgid "%d unpushed commit"
-msgid_plural "%d unpushed commits"
-msgstr[0] "%d ikke skubbet commit"
-msgstr[1] "%d ikke skubbet commit'er"
-
-#: meld/vc/git.py:94
-#, python-format
-msgid "%d branch"
-msgid_plural "%d branches"
-msgstr[0] "%d gren"
-msgstr[1] "%d grene"
-
-#: meld/vc/git.py:339
-#, python-format
-msgid "Mode changed from %s to %s"
-msgstr "Tilstand skiftede fra %s til %s"
-
-#: meld/vc/git.py:347
-msgid "Partially staged"
-msgstr "Delvist staged"
-
-#: meld/vc/git.py:347
-msgid "Staged"
-msgstr "Staged"
-
-#. Translators: This is the displayed name of a version control system
-#. when no version control system is actually found.
-#: meld/vc/_null.py:38
-msgid "None"
-msgstr "Ingen"
-
-#: meld/vc/svn.py:204
-#, python-format
-msgid "Rev %s"
-msgstr "Rev. %s"
-
-#: meld/vc/_vc.py:54
-msgid "Merged"
-msgstr "Flettet"
-
-#: meld/vc/_vc.py:54
-msgid "Base"
-msgstr "Base"
-
-#: meld/vc/_vc.py:54
-msgid "Local"
-msgstr "Lokal"
-
-#: meld/vc/_vc.py:54
-msgid "Remote"
-msgstr "Fjern"
-
-#: meld/vc/_vc.py:73
-msgid "Error"
-msgstr "Fejl"
-
-#: meld/vc/_vc.py:75
-msgid "Newly added"
-msgstr "Nyligt tilføjet"
-
-#: meld/vc/_vc.py:77
-msgid "Renamed"
-msgstr "Omdøbt"
-
-#: meld/vc/_vc.py:78
-msgid "Conflict"
-msgstr "Konflikt"
-
-#: meld/vc/_vc.py:79
-msgid "Removed"
-msgstr "Fjernet"
-
-# Manglende?
-#: meld/vc/_vc.py:80
-msgid "Missing"
-msgstr "Mangler"
-
-#: meld/vc/_vc.py:81
-msgid "Not present"
-msgstr "Ikke tilstedeværende"
-
-#. Translators: This error message is shown when no
-#. repository of this type is found.
-#: meld/vcview.py:333
-#, python-format
-msgid "%(name)s (not found)"
-msgstr "%(name)s (ikke fundet)"
-
-#. Translators: This error message is shown when a version
-#. control binary isn't installed.
-#: meld/vcview.py:337
-#, python-format
-msgid "%(name)s (%(cmd)s not installed)"
-msgstr "%(name)s (%(cmd)s ikke installeret)"
-
-#. Translators: This error message is shown when a version
-#. controlled repository is invalid.
-#: meld/vcview.py:341
-#, python-format
-msgid "%(name)s (invalid repository)"
-msgstr "%(name)s (ugyldigt arkiv)"
-
-#: meld/vcview.py:355
-msgid "No valid version control system found in this folder"
-msgstr "Fandt ikke et gyldigt versionsstyringssystem i denne mappe"
-
-#: meld/vcview.py:357
-msgid "Choose which version control system to use"
-msgstr "Vælg hvilket versionsstyringssystem, der skal anvendes"
-
-#. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:411
-#, python-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#. Initial yield so when we add this to our tasks, we don't
-#. create iterators that may be invalidated.
-#: meld/vcview.py:418
-msgid "Scanning repository"
-msgstr "Skanner arkiv"
-
-#: meld/vcview.py:447
-#, python-format
-msgid "Scanning %s"
-msgstr "Skanner %s"
-
-#: meld/vcview.py:486
-msgid "(Empty)"
-msgstr "(tom)"
-
-#: meld/vcview.py:533
-#, python-format
-msgid "%s — local"
-msgstr "%s — lokal"
-
-#: meld/vcview.py:534
-#, python-format
-msgid "%s — remote"
-msgstr "%s — fjern"
-
-#: meld/vcview.py:542
-#, python-format
-msgid "%s (local, merge, remote)"
-msgstr "%s (lokal, flet, fjern)"
-
-#: meld/vcview.py:547
-#, python-format
-msgid "%s (remote, merge, local)"
-msgstr "%s (fjern, flet, lokal)"
-
-#: meld/vcview.py:558
-#, python-format
-msgid "%s — repository"
-msgstr "%s — arkiv"
-
-# arbejdskopi?
-#: meld/vcview.py:564
-#, python-format
-msgid "%s (working, repository)"
-msgstr "%s (arbejdskopi, arkiv)"
-
-#: meld/vcview.py:568
-#, python-format
-msgid "%s (repository, working)"
-msgstr "%s (arkiv, arbejdskopi)"
-
-#: meld/vcview.py:730
-msgid "Remove folder and all its files?"
-msgstr "Fjern mappen og alle dens filer?"
-
-#: meld/vcview.py:732
-msgid ""
-"This will remove all selected files and folders, and all files within any "
-"selected folders, from version control."
-msgstr ""
-"Dette vil fjerne alle valgte filer og mapper, samt alle filer i de valgte "
-"mapper, fra versionsstyring."
-
-#: meld/vcview.py:845
-msgid "Clear"
-msgstr "Ryd"
+# Danish translation for meld.
+# Copyright (C) 2018 meld & nedenstående oversættere.
+# This file is distributed under the same license as the meld package.
+# Joe Hansen <joedalton2@yahoo.dk>, 2010, 2011, 2018.
+# Alan Mortensen <alanmortensen.am@gmail.com>, 2016, 2018-19, 2022.
+# scootergrisen, 2019-2020.
+#
+# merge -> flet (sammenføj er til versionstyringskommandoer)
+# pane -> rude
+# reverse -> modsat (omvend, reverter)
+# vc -> versionsstyring
+# version control -> versionsstyring
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: meld master\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
+"POT-Creation-Date: 2022-03-15 12:52+0000\n"
+"PO-Revision-Date: 2022-03-23 20:01+0100\n"
+"Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.3\n"
+
+#: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
+#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
+msgid "Meld"
+msgstr "Meld"
+
+#: data/org.gnome.meld.desktop.in.in:4
+msgid "Diff Viewer"
+msgstr "Diff-fremviser"
+
+#: data/org.gnome.meld.desktop.in.in:5 data/org.gnome.meld.appdata.xml.in.in:12
+msgid "Compare and merge your files"
+msgstr "Sammenlign og flet dine filer"
+
+#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/org.gnome.meld.desktop.in.in:7
+msgid "diff;merge;"
+msgstr "diff;flet;"
+
+#: data/org.gnome.meld.appdata.xml.in.in:14
+msgid ""
+"Meld is a visual diff and merge tool targeted at developers. Meld helps you "
+"compare files, directories, and version controlled projects. It provides "
+"two- and three-way comparison of both files and directories, and supports "
+"many version control systems including Git, Mercurial, Bazaar and Subversion."
+msgstr ""
+"Meld er et visuelt værktøj til diff og flet, som er rettet mod udviklere. "
+"Meld hjælper dig med at sammenligne filer, mapper og versionsstyrede "
+"projekter. Der er to- og trevejssammenligning af både filer og mapper, og "
+"mange versionsstyringssystemer, bl.a. Git, Mercurial, Bazaar og Subversion, "
+"er understøttede."
+
+#: data/org.gnome.meld.appdata.xml.in.in:21
+msgid ""
+"Meld helps you review code changes, understand patches, and makes enormous "
+"merge conflicts slightly less painful."
+msgstr ""
+"Meld hjælper dig med at gennemgå kodeændringer, forstå rettelser (patches) "
+"og gør enorme flettekonflikter mindre besværlige."
+
+#: data/org.gnome.meld.appdata.xml.in.in:51
+msgid "The GNOME Project"
+msgstr "GNOME-projektet"
+
+#: data/mime/org.gnome.meld.xml.in:4
+msgid "Meld comparison description"
+msgstr "Meld-sammenligningsbeskrivelse"
+
+#: data/org.gnome.meld.gschema.xml:37
+msgid "Default window width"
+msgstr "Vinduets standardbredde"
+
+#: data/org.gnome.meld.gschema.xml:41
+msgid "Default window height"
+msgstr "Vinduets standardhøjde"
+
+#: data/org.gnome.meld.gschema.xml:45
+msgid "Default window maximised state"
+msgstr "Maksimeret-tilstand for standardvinduet"
+
+#: data/org.gnome.meld.gschema.xml:49
+msgid "Default window fullscreen state"
+msgstr "Fuldskærmstilstand for standardvinduet"
+
+#: data/org.gnome.meld.gschema.xml:58
+msgid "Prefer application-wide dark theme"
+msgstr "Foretræk mørkt tema i hele programmet"
+
+#: data/org.gnome.meld.gschema.xml:59
+msgid ""
+"If true, the GTK dark theme variant will be used, if available. Note that "
+"this is separate from the syntax highlighting scheme."
+msgstr ""
+"Hvis sand vil GTK's mørke skema blive brugt, hvis det er tilgængeligt. "
+"Bemærk, at dette er adskilt fra skemaet for syntaksfremhævning."
+
+#: data/org.gnome.meld.gschema.xml:65
+msgid "Additional automatically detected text encodings"
+msgstr "Yderligere automatisk fundne tekstkodninger"
+
+#: data/org.gnome.meld.gschema.xml:66
+msgid ""
+"Meld will use these text encodings to try to decode loaded text files before "
+"trying any other encodings. In addition to the encodings in this list, UTF-8 "
+"and the current locale-default encoding will always be used; other encodings "
+"may also be tried, depending on the user’s locale."
+msgstr ""
+"Meld bruger disse tekstkodninger til at prøve at afkode indlæste tekstfiler, "
+"før andre kodninger prøves. Ud over kodningerne på denne liste vil UTF-8 og "
+"de aktuelle standardkodninger for regionen altid blive brugt; afhængig af "
+"brugerens region vil andre kodninger også blive prøvet."
+
+#: data/org.gnome.meld.gschema.xml:73
+msgid "Width of an indentation step"
+msgstr "Indrykningsbredde"
+
+#: data/org.gnome.meld.gschema.xml:74
+msgid "The number of spaces to use for a single indent step"
+msgstr "Antallet af mellemrum der skal bruges på en enkelt indrykning"
+
+#: data/org.gnome.meld.gschema.xml:78
+msgid "Whether to indent using spaces or tabs"
+msgstr "Om indrykning sker med mellemrum eller tabulator"
+
+#: data/org.gnome.meld.gschema.xml:79
+msgid "If true, any new indentation will use spaces instead of tabs."
+msgstr ""
+"Hvis sand vil nye indrykninger bruge mellemrum i stedet for tabulatorer."
+
+#: data/org.gnome.meld.gschema.xml:83 meld/resources/ui/statusbar-menu.ui:5
+msgid "Show line numbers"
+msgstr "Vis linjenumre"
+
+#: data/org.gnome.meld.gschema.xml:84
+msgid "If true, line numbers will be shown in the gutter of file comparisons."
+msgstr ""
+"Hvis sand vil linjenumre blive vist i filsammenligningers indvendige "
+"margener."
+
+#: data/org.gnome.meld.gschema.xml:88
+msgid "Highlight syntax"
+msgstr "Syntaksfremhævning"
+
+#: data/org.gnome.meld.gschema.xml:89
+msgid ""
+"Whether to highlight syntax in comparisons. Because of Meld’s own color "
+"highlighting, this is off by default."
+msgstr ""
+"Om syntaks skal fremhæves i sammenligninger. Pga. Melds egen "
+"farvefremhævning er dette som standard slået fra."
+
+#: data/org.gnome.meld.gschema.xml:93
+msgid "Color scheme to use for syntax highlighting"
+msgstr "Farveskema til brug for syntaksfremhævning"
+
+#: data/org.gnome.meld.gschema.xml:94
+msgid "Used by GtkSourceView to determine colors for syntax highlighting"
+msgstr ""
+"Bruges af GtkSourceView til at bestemme farver til fremhævning af syntaks"
+
+#: data/org.gnome.meld.gschema.xml:98
+msgid "Draw whitespace"
+msgstr "Tegn blanktegn"
+
+#: data/org.gnome.meld.gschema.xml:99
+msgid ""
+"If true, whitespace characters will be drawn in comparisons even if they are "
+"not in a changed area."
+msgstr ""
+"Hvis sand tegnes blanktegn i sammenligninger, selv hvis de ikke er i et "
+"område, som er blevet ændret."
+
+#: data/org.gnome.meld.gschema.xml:108
+msgid "Wrap mode"
+msgstr "Ombrydningstilstand"
+
+#: data/org.gnome.meld.gschema.xml:109
+msgid ""
+"Lines in file comparisons will be wrapped according to this setting, either "
+"not at all ('none'), at any character ('char') or only at the end of words "
+"('word')."
+msgstr ""
+"Linjer i filsammenligninger vil blive ombrudt i henhold til denne "
+"indstilling: overhovedet ikke (“none”), ved ethvert tegn (“char”) eller kun "
+"efter et ord (“word”)."
+
+#: data/org.gnome.meld.gschema.xml:116 meld/resources/ui/statusbar-menu.ui:13
+msgid "Highlight current line"
+msgstr "Fremhæv aktuelle linje"
+
+#: data/org.gnome.meld.gschema.xml:117
+msgid ""
+"If true, the line containing the cursor will be highlighted in file "
+"comparisons."
+msgstr ""
+"Hvis sand vil linjen med markøren blive fremhævet i filsammenligninger."
+
+#: data/org.gnome.meld.gschema.xml:121
+msgid "Use the system default monospace font"
+msgstr "Brug systemets standardskrifttype med fast bredde"
+
+#: data/org.gnome.meld.gschema.xml:122
+msgid ""
+"If false, custom-font will be used instead of the system monospace font."
+msgstr ""
+"Hvis falsk vil en tilpasset skrifttype blive brugt i stedet for systemets "
+"standardskrifttype med fast bredde."
+
+#: data/org.gnome.meld.gschema.xml:126
+msgid "Custom font"
+msgstr "Tilpasset skrifttype"
+
+#: data/org.gnome.meld.gschema.xml:127
+msgid ""
+"The custom font to use, stored as a string and parsed as a Pango font "
+"description."
+msgstr ""
+"Den tilpassede skrifttype som skal bruges. Gemmes som en streng og fortolkes "
+"som en Pango-skrifttypebeskrivelse."
+
+#: data/org.gnome.meld.gschema.xml:133
+msgid "Show overview source map"
+msgstr "Vis oversigtskildekort"
+
+#: data/org.gnome.meld.gschema.xml:134
+msgid ""
+"If true, file comparisons will have paired source maps for compared files."
+msgstr ""
+"Hvis sand vil filsammenligninger have parrede kildekort for filer, som "
+"sammenlignes."
+
+#: data/org.gnome.meld.gschema.xml:139
+msgid "Style of overview map"
+msgstr "Oversigtskortets stil"
+
+#: data/org.gnome.meld.gschema.xml:140
+msgid "Style options for how the overview map is displayed."
+msgstr "Stilindstilling til visning af oversigtskortet."
+
+#: data/org.gnome.meld.gschema.xml:146
+msgid "Ignore blank lines when comparing files"
+msgstr "Ignorér tomme linjer, når filer sammenlignes"
+
+#: data/org.gnome.meld.gschema.xml:147
+msgid ""
+"If true, blank lines will be trimmed when highlighting changes between files."
+msgstr ""
+"Hvis sand vil tomme linjer blive beskåret, når ændringer mellem filer "
+"fremhæves."
+
+#: data/org.gnome.meld.gschema.xml:154
+msgid "Use the system default editor"
+msgstr "Brug systemets standardredigeringsprogram"
+
+#: data/org.gnome.meld.gschema.xml:155
+msgid ""
+"If false, custom-editor-command will be used instead of the system editor "
+"when opening files externally."
+msgstr ""
+"Hvis falsk vil “custom-editor-command” blive brugt i stedet for systemets "
+"redigeringsprogram, når filer åbnes eksternt."
+
+#: data/org.gnome.meld.gschema.xml:159
+msgid "The custom editor launch command"
+msgstr "Kommando til at starte brugerdefineret redigeringsprogram"
+
+#: data/org.gnome.meld.gschema.xml:160
+msgid ""
+"The command used to launch a custom editor. Some limited templating is "
+"supported here; at the moment '{file}' and '{line}' are recognised tokens."
+msgstr ""
+"Kommandoen til at starte et brugerdefineret redigeringsprogram. Begrænset "
+"brug af skabeloner understøttes; for øjeblikket kan “{file}” og “{line}” "
+"bruges."
+
+#: data/org.gnome.meld.gschema.xml:166
+msgid "Columns to display"
+msgstr "Kolonner der skal vises"
+
+#: data/org.gnome.meld.gschema.xml:167
+msgid ""
+"List of column names in folder comparison and whether they should be "
+"displayed."
+msgstr "Liste over kolonnenavne i mappesammenligning og om de skal vises."
+
+#: data/org.gnome.meld.gschema.xml:171 meld/resources/ui/preferences.ui:951
+msgid "Ignore symbolic links"
+msgstr "Ignorér symbolske henvisninger"
+
+#: data/org.gnome.meld.gschema.xml:172
+msgid ""
+"If true, folder comparisons do not follow symbolic links when traversing the "
+"folder tree."
+msgstr ""
+"Hvis sand vil mappesammenligninger ikke følge symbolske henvisninger, når "
+"mappetræet gennemkrydses."
+
+#: data/org.gnome.meld.gschema.xml:176
+msgid "Use shallow comparison"
+msgstr "Brug overfladisk sammenligningen"
+
+#: data/org.gnome.meld.gschema.xml:177
+msgid ""
+"If true, folder comparisons compare files based solely on size and mtime, "
+"considering files to be identical if their size and mtime match, and "
+"different otherwise."
+msgstr ""
+"Hvis sand vil mappesammenligninger kun sammenligne filer baseret på "
+"størrelse og mtime. Filer anses for at være identiske, hvis deres størrelse "
+"og mtime matcher og ellers forskellige."
+
+#: data/org.gnome.meld.gschema.xml:181
+msgid "File timestamp resolution"
+msgstr "Filers tidsstempelopløsning"
+
+#: data/org.gnome.meld.gschema.xml:182
+msgid ""
+"When comparing based on mtime, this is the minimum difference in nanoseconds "
+"between two files before they’re considered to have different mtimes. This "
+"is useful when comparing files between filesystems with different timestamp "
+"resolution."
+msgstr ""
+"Når sammenligninger er baseret på mtime, er dette den mindste forskel i "
+"nanosekunder mellem to filer, før de anses for at have forskellige mtimes. "
+"Dette er nyttigt, når der sammenlignes filer på tværs af filsystemer med "
+"forskellig tidsstempelopløsning."
+
+#: data/org.gnome.meld.gschema.xml:186 meld/resources/ui/preferences.ui:852
+msgid "Apply text filters during folder comparisons"
+msgstr "Anvend tekstfiltre under mappesammenligninger"
+
+#: data/org.gnome.meld.gschema.xml:187
+msgid ""
+"If true, folder comparisons that compare file contents also apply active "
+"text filters and the blank line trimming option, and ignore newline "
+"differences."
+msgstr ""
+"Hvis sand vil mappesammenligninger, som sammenligner filindhold, også "
+"anvende aktive tekstfiltre og beskære tomme linjer samt ignorere newline-"
+"forskelle."
+
+#: data/org.gnome.meld.gschema.xml:191
+msgid "File status filters"
+msgstr "Filtre for filstatus"
+
+#: data/org.gnome.meld.gschema.xml:192
+msgid "List of statuses used to filter visible files in folder comparison."
+msgstr ""
+"Oversigt over statusser brugt til at filtrere synlige filer i "
+"mappesammenligninger."
+
+#: data/org.gnome.meld.gschema.xml:198
+msgid "Show the version control console output"
+msgstr "Vis konsoloutputtet for versionsstyring"
+
+#: data/org.gnome.meld.gschema.xml:199
+msgid ""
+"If true, a console output section will be shown in version control views, "
+"showing the commands run for version control operations."
+msgstr ""
+"Hvis sand vil et konsoloutputafsnit blive vist i visninger af "
+"versionsstyring, som viser de kommandoer, der køres for "
+"versionsstyringshandlinger."
+
+#: data/org.gnome.meld.gschema.xml:203
+msgid "Version control pane position"
+msgstr "Rudeplacering af versionsstyring"
+
+#: data/org.gnome.meld.gschema.xml:204
+msgid ""
+"This is the height of the main version control tree when the console pane is "
+"shown."
+msgstr "Dette er højden på versionsstyringens hovedtræ, når konsolruden vises."
+
+#: data/org.gnome.meld.gschema.xml:208
+msgid "Present version comparisons as left-local/right-remote"
+msgstr "Nuværende versionssammenligninger som venstre-lokal/højre-fjern"
+
+#: data/org.gnome.meld.gschema.xml:209
+msgid ""
+"If true, version control comparisons will use a left-is-local, right-is-"
+"remote scheme to determine what order to present files in panes. Otherwise, "
+"a left-is-theirs, right-is-mine scheme is used."
+msgstr ""
+"Hvis sand vil sammenligning af versionsstyringer bruge et venstre-er-lokal/"
+"højre-er-fjern-skema til at bestemme, i hvilken rækkefølge filer vises i "
+"ruder. Ellers vil et venstre-er-deres/højre-er-min-skema blive anvendt."
+
+#: data/org.gnome.meld.gschema.xml:213
+msgid "Order for files in three-way version control merge comparisons"
+msgstr "Filrækkefølge i fletssammenligninger i trevejsversionsstyring"
+
+#: data/org.gnome.meld.gschema.xml:214
+msgid ""
+"Choices for file order are remote/merged/local and local/merged/remote. This "
+"preference only affects three-way comparisons launched from the version "
+"control view, so is used solely for merges/conflict resolution within Meld."
+msgstr ""
+"Muligheder for filrækkefølge er fjern/flettet/lokal og lokal/flettet/fjern. "
+"Denne indstilling påvirker kun trevejssammenligninger, der startes fra "
+"versionsstyringsvisningen, så den bruges kun til at løse sammenfletninger/"
+"konflikter i Meld."
+
+#: data/org.gnome.meld.gschema.xml:218
+msgid "Show margin in commit message editor"
+msgstr "Vis margen i redigeringsprogram til commit-beskeder"
+
+#: data/org.gnome.meld.gschema.xml:219
+msgid ""
+"If true, a guide will be displayed to show what column the margin is at in "
+"the version control commit message editor."
+msgstr ""
+"Hvis sand vil en hjælpelinje blive vist, som viser, hvilken kolonne margenen "
+"er ved i redigeringsprogrammet til versionsstyringens commit-beskeder."
+
+#: data/org.gnome.meld.gschema.xml:223
+msgid "Margin column in commit message editor"
+msgstr "Margenkolonne i redigeringsprogram til commit-beskeder"
+
+#: data/org.gnome.meld.gschema.xml:224
+msgid ""
+"The column at which to show the margin in the version control commit message "
+"editor."
+msgstr ""
+"Den kolonne hvor margenen skal vises i redigeringsprogrammet til "
+"versionsstyring af commit-beskeder."
+
+#: data/org.gnome.meld.gschema.xml:228
+msgid "Automatically hard-wrap commit messages"
+msgstr "Automatisk tvungen linjeskift i commit-beskeder"
+
+#: data/org.gnome.meld.gschema.xml:229
+msgid ""
+"If true, the version control commit message editor will hard-wrap (i.e., "
+"insert line breaks) at the commit margin before commit."
+msgstr ""
+"Hvis sand vil redigeringsprogrammet til versionsstyring af commit-beskeder "
+"indføre tvungen linjeskift ved commit-margen før commit."
+
+#: data/org.gnome.meld.gschema.xml:233
+msgid "Version control status filters"
+msgstr "Statusfiltre til versionsstyring"
+
+#: data/org.gnome.meld.gschema.xml:234
+msgid ""
+"List of statuses used to filter visible files in version control comparison."
+msgstr ""
+"Oversigt over statusser anvendt til at filtrere synlige filer i "
+"versionsstyringssammenligninger."
+
+#: data/org.gnome.meld.gschema.xml:248
+msgid "Filename-based filters"
+msgstr "Filnavne-baserede filtre"
+
+#: data/org.gnome.meld.gschema.xml:249
+msgid ""
+"List of predefined filename-based filters that, if active, will remove "
+"matching files from a folder comparison."
+msgstr ""
+"Oversigt over foruddefinerede filnavne-baserede filtre, som, hvis aktive, "
+"vil fjerne matchende filer i en mappesammenligning."
+
+#: data/org.gnome.meld.gschema.xml:263
+msgid "Text-based filters"
+msgstr "Tekst-baserede filtre"
+
+#: data/org.gnome.meld.gschema.xml:264
+msgid ""
+"List of predefined text-based regex filters that, if active, will remove "
+"text from being used in a file comparison. The text will still be displayed, "
+"but won’t contribute to the comparison itself."
+msgstr ""
+"Oversigt over foruddefinerede tekst-baserede regex-filtre, som, hvis aktive, "
+"vil forhindre at tekst bruges i en filsammenligning. Teksten vil stadig "
+"blive vist, men vil ikke bidrage til selve sammenligningen."
+
+#: data/styles/meld-base.style-scheme.xml.in:1
+msgid "Classic (Meld)"
+msgstr "Klassisk (Meld)"
+
+#: data/styles/meld-base.style-scheme.xml.in:3
+msgid "Base color scheme for Meld highlighting"
+msgstr "Basisfarveskema for fremhævning i Meld"
+
+#: data/styles/meld-dark.style-scheme.xml.in:1
+msgid "Meld dark scheme"
+msgstr "Melds mørke skema"
+
+#: data/styles/meld-dark.style-scheme.xml.in:3
+msgid "Dark color scheme for Meld highlighting"
+msgstr "Mørkt farveskema for fremhævning i Meld"
+
+#: meld/resources/gtk/help-overlay.ui:14
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Generelt"
+
+#: meld/resources/gtk/help-overlay.ui:19
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr "Ny sammenligning"
+
+#: meld/resources/gtk/help-overlay.ui:26
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "Luk en sammenligning"
+
+#: meld/resources/gtk/help-overlay.ui:33
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Afslut Meld"
+
+#: meld/resources/gtk/help-overlay.ui:40
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "Stop den aktuelle handling"
+
+#: meld/resources/gtk/help-overlay.ui:47
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr "Opdatér sammenligningen"
+
+#: meld/resources/gtk/help-overlay.ui:54
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "Fuldskærm"
+
+#: meld/resources/gtk/help-overlay.ui:63
+msgctxt "shortcut window"
+msgid "Panes"
+msgstr "Ruder"
+
+#: meld/resources/gtk/help-overlay.ui:68
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "Forrige sammenligningsrude"
+
+#: meld/resources/gtk/help-overlay.ui:75
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "Næste sammenligningsrude"
+
+#: meld/resources/gtk/help-overlay.ui:84
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Ændringer"
+
+#: meld/resources/gtk/help-overlay.ui:89
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Gå til den forrige ændring"
+
+#: meld/resources/gtk/help-overlay.ui:96
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Gå til den næste ændring"
+
+#: meld/resources/gtk/help-overlay.ui:105
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "Faneblade"
+
+#: meld/resources/gtk/help-overlay.ui:110
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr "Gå til det forrige faneblad"
+
+#: meld/resources/gtk/help-overlay.ui:117
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr "Gå til det næste faneblad"
+
+#: meld/resources/gtk/help-overlay.ui:124
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "Skift til faneblad"
+
+#: meld/resources/gtk/help-overlay.ui:131
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "Flyt fanebladet til venstre"
+
+#: meld/resources/gtk/help-overlay.ui:138
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "Flyt fanebladet til højre"
+
+#: meld/resources/gtk/help-overlay.ui:147
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Redigering"
+
+#: meld/resources/gtk/help-overlay.ui:152
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "Fortryd"
+
+#: meld/resources/gtk/help-overlay.ui:159
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "Gentag"
+
+#: meld/resources/gtk/help-overlay.ui:166
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr "Klip"
+
+#: meld/resources/gtk/help-overlay.ui:173
+msgctxt "shortcut window"
+msgid "Copy"
+msgstr "Kopiér"
+
+#: meld/resources/gtk/help-overlay.ui:180
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr "Indsæt"
+
+#: meld/resources/gtk/help-overlay.ui:187
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "Find"
+
+#: meld/resources/gtk/help-overlay.ui:194
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "Find næste"
+
+#: meld/resources/gtk/help-overlay.ui:201
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "Find forrige"
+
+#: meld/resources/gtk/help-overlay.ui:208
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "Erstat"
+
+#: meld/resources/gtk/help-overlay.ui:217
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr "Filsammenligning"
+
+#: meld/resources/gtk/help-overlay.ui:222
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "Gem den aktuelle fil"
+
+#: meld/resources/gtk/help-overlay.ui:229
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr "Gem den aktuelle fil et andet sted"
+
+#: meld/resources/gtk/help-overlay.ui:236
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr "Gem alle filer i sammenligningen"
+
+#: meld/resources/gtk/help-overlay.ui:243
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "Forrige konflikt"
+
+#: meld/resources/gtk/help-overlay.ui:250
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr "Næste konflikt"
+
+#: meld/resources/gtk/help-overlay.ui:257
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr "Skub ændringen til venstre"
+
+#: meld/resources/gtk/help-overlay.ui:264
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr "Skub ændringen til højre"
+
+#: meld/resources/gtk/help-overlay.ui:271
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr "Træk ændringen fra venstre"
+
+#: meld/resources/gtk/help-overlay.ui:278
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr "Træk ændringen fra højre"
+
+#: meld/resources/gtk/help-overlay.ui:285
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "Kopiér ændringen ovenfor til venstre"
+
+#: meld/resources/gtk/help-overlay.ui:292
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "Kopiér ændringen nedenfor til venstre"
+
+#: meld/resources/gtk/help-overlay.ui:299
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr "Kopiér ændringen ovenfor til højre"
+
+#: meld/resources/gtk/help-overlay.ui:306
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr "Kopiér ændringen nedenfor til højre"
+
+#: meld/resources/gtk/help-overlay.ui:313
+#: meld/resources/gtk/help-overlay.ui:341
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "Slet ændring"
+
+#: meld/resources/gtk/help-overlay.ui:322
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "Mappesammenligning"
+
+#: meld/resources/gtk/help-overlay.ui:327
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "Kopiér til venstre"
+
+#: meld/resources/gtk/help-overlay.ui:334
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr "Kopiér til højre"
+
+#: meld/resources/gtk/help-overlay.ui:350
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr "Versionsstyringssammenligning"
+
+#: meld/resources/gtk/help-overlay.ui:355
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr "Commit til versionsstyring"
+
+#: meld/resources/gtk/help-overlay.ui:362
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr "Vis/skjul konsoloutput"
+
+#: meld/resources/gtk/menus.ui:7
+msgid "Refresh"
+msgstr "Opdatér"
+
+#: meld/resources/gtk/menus.ui:12
+msgid "Stop"
+msgstr "Stop"
+
+#: meld/resources/gtk/menus.ui:17
+msgid "Fullscreen"
+msgstr "Fuldskærm"
+
+#: meld/resources/gtk/menus.ui:26
+msgid "Save As…"
+msgstr "Gem som …"
+
+#: meld/resources/gtk/menus.ui:30
+msgid "Save A_ll"
+msgstr "Gem a_lle"
+
+#: meld/resources/gtk/menus.ui:34
+msgid "Revert files…"
+msgstr "Tilbagefør filer …"
+
+#: meld/resources/gtk/menus.ui:38
+msgid "Open Externally"
+msgstr "Åbn eksternt"
+
+#: meld/resources/gtk/menus.ui:45
+msgid "_Find…"
+msgstr "_Find …"
+
+#: meld/resources/gtk/menus.ui:49
+msgid "_Replace…"
+msgstr "_Erstat …"
+
+#: meld/resources/gtk/menus.ui:55
+msgid "View"
+msgstr "Vis"
+
+#: meld/resources/gtk/menus.ui:59
+msgid "Overview Map"
+msgstr "Oversigtskort"
+
+#: meld/resources/gtk/menus.ui:63
+msgid "Version control console"
+msgstr "Versionsstyringskonsol"
+
+#: meld/resources/gtk/menus.ui:67
+msgid "Lock scrolling"
+msgstr "Lås rulning"
+
+#: meld/resources/gtk/menus.ui:73
+msgid "Comparison"
+msgstr "Sammenligning"
+
+#: meld/resources/gtk/menus.ui:77
+msgid "Merge All from Left"
+msgstr "Flet alle fra venstre"
+
+#: meld/resources/gtk/menus.ui:81
+msgid "Merge All from Right"
+msgstr "Flet alle fra højre"
+
+#: meld/resources/gtk/menus.ui:85
+msgid "Merge All"
+msgstr "Flet alle"
+
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
+msgid "Add Synchronization Point"
+msgstr "Tilføj synkroniseringspunkt"
+
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
+msgid "Clear Synchronization Points"
+msgstr "Ryd synkroniseringspunkter"
+
+#: meld/resources/gtk/menus.ui:103
+msgid "Format as Patch…"
+msgstr "Formatér som rettelse (patch) …"
+
+#: meld/resources/gtk/menus.ui:112
+msgid "_Preferences"
+msgstr "_Indstillinger"
+
+#: meld/resources/gtk/menus.ui:116
+msgid "Keyboard Shortcuts"
+msgstr "Tastaturgenveje"
+
+#: meld/resources/gtk/menus.ui:120
+msgid "_Help"
+msgstr "_Hjælp"
+
+#: meld/resources/gtk/menus.ui:125
+msgid "_About Meld"
+msgstr "_Om Meld"
+
+#: meld/resources/gtk/menus.ui:138
+msgid "File status"
+msgstr "Filstatus"
+
+#: meld/resources/gtk/menus.ui:140
+msgid "Same"
+msgstr "Ens"
+
+#: meld/resources/gtk/menus.ui:144
+msgid "New"
+msgstr "Ny"
+
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
+#: meld/vc/_vc.py:76
+msgid "Modified"
+msgstr "Ændret"
+
+#: meld/resources/gtk/menus.ui:158
+msgid "Ignore filename case"
+msgstr "Ignorér forskelle på store/små bogstaver i filnavne"
+
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr "Normalisér Unicode-stier"
+
+#: meld/resources/gtk/menus.ui:175
+msgid "Normal"
+msgstr "Normal"
+
+# "Vis ikke-versionsstyrede filer"
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
+msgid "Unversioned"
+msgstr "Uden versionering"
+
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
+msgid "Ignored"
+msgstr "Ignoreret"
+
+#: meld/resources/gtk/menus.ui:190
+msgid "Flatten folders"
+msgstr "Fladgør mapper"
+
+#: meld/resources/ui/about-dialog.ui:8
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2021 Kai Willadsen"
+msgstr ""
+"Ophavsret © 2002-2009 Stephen Kennedy\n"
+"Ophavsret © 2009-2021 Kai Willadsen"
+
+#: meld/resources/ui/about-dialog.ui:14
+msgid "translator-credits"
+msgstr ""
+"Joe Hansen, 2010, 2011\n"
+"Alan Mortensen, 2016, 2017, 2022\n"
+"\n"
+"Dansk-gruppen\n"
+"Websted http://dansk-gruppen.dk\n"
+"E-mail <dansk@dansk-gruppen.dk>"
+
+#: meld/resources/ui/appwindow.ui:30
+msgid "Start a new comparison"
+msgstr "Start en ny sammenligning"
+
+#: meld/resources/ui/appwindow.ui:46
+msgid "Open a recent comparison"
+msgstr "Åbn en seneste sammenligning"
+
+#: meld/resources/ui/appwindow.ui:74
+msgid "Go to the previous change"
+msgstr "Gå til den forrige ændring"
+
+#: meld/resources/ui/appwindow.ui:94
+msgid "Go to the next change"
+msgstr "Gå til den næste ændring"
+
+#: meld/resources/ui/appwindow.ui:124
+msgid "Go to the previous conflict"
+msgstr "Gå til den forrige konflikt"
+
+#: meld/resources/ui/appwindow.ui:144
+msgid "Go to the next conflict"
+msgstr "Gå til den næste konflikt"
+
+#: meld/resources/ui/appwindow.ui:193
+msgid "Version Filters"
+msgstr "Versionsfiltre"
+
+#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472
+msgid "File Filters"
+msgstr "Filfiltre"
+
+#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657
+msgid "Text Filters"
+msgstr "Tekstfiltre"
+
+#: meld/resources/ui/column-list.ui:37 meld/resources/ui/filter-list.ui:40
+msgid "Active"
+msgstr "Aktiv"
+
+#: meld/resources/ui/column-list.ui:50
+msgid "Column Name"
+msgstr "Kolonnenavn"
+
+#: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
+msgid "_Remove"
+msgstr "_Fjern"
+
+#: meld/resources/ui/column-list.ui:96 meld/resources/ui/filter-list.ui:152
+msgid "Move item up"
+msgstr "Flyt element op"
+
+#: meld/resources/ui/column-list.ui:98 meld/resources/ui/filter-list.ui:154
+msgid "Move _Up"
+msgstr "Flyt _op"
+
+#: meld/resources/ui/column-list.ui:112 meld/resources/ui/filter-list.ui:168
+msgid "Move item down"
+msgstr "Flyt element ned"
+
+#: meld/resources/ui/column-list.ui:114 meld/resources/ui/filter-list.ui:170
+msgid "Move _Down"
+msgstr "Flyt _ned"
+
+#: meld/resources/ui/commit-dialog.ui:8
+msgid "Commit"
+msgstr "Commit"
+
+#: meld/resources/ui/commit-dialog.ui:36
+msgid "Commit Files"
+msgstr "Commit filer"
+
+#: meld/resources/ui/commit-dialog.ui:117
+msgid "Log Message"
+msgstr "Logbesked"
+
+#: meld/resources/ui/commit-dialog.ui:181
+msgid "Previous logs:"
+msgstr "Forrige logge:"
+
+#: meld/resources/ui/commit-dialog.ui:259
+msgid "Co_mmit"
+msgstr "Co_mmit"
+
+#: meld/resources/ui/dirdiff-actions.ui:20
+msgid "Copy to left"
+msgstr "Kopiér til venstre"
+
+#: meld/resources/ui/dirdiff-actions.ui:42
+msgid "Copy to right"
+msgstr "Kopiér til højre"
+
+#: meld/resources/ui/dirdiff-actions.ui:66
+msgid "Delete selected"
+msgstr "Slet det valgte"
+
+#: meld/resources/ui/dirdiff-menus.ui:7
+msgid "_Compare selected files"
+msgstr "_Sammenlign de valgte filer"
+
+#: meld/resources/ui/dirdiff-menus.ui:14
+msgid "_Mark selected file"
+msgstr "_Markér valgte fil"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Compare _with marked file"
+msgstr "_Sammenlign med markeret fil"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
+msgid "Copy to _left"
+msgstr "Kopiér til _venstre"
+
+#: meld/resources/ui/dirdiff-menus.ui:29
+msgid "Copy to _right"
+msgstr "Kopiér til _højre"
+
+#: meld/resources/ui/dirdiff-menus.ui:33
+msgid "_Delete selected"
+msgstr "Sle_t det valgte"
+
+#: meld/resources/ui/dirdiff-menus.ui:40
+msgid "Collapse Recursively"
+msgstr "Sammenfold rekursivt"
+
+#: meld/resources/ui/dirdiff-menus.ui:44
+msgid "Expand Recursively"
+msgstr "Udfold rekursivt"
+
+#: meld/resources/ui/dirdiff-menus.ui:51
+msgid "_Open Externally"
+msgstr "_Åbn eksternt"
+
+#: meld/resources/ui/dirdiff-menus.ui:55
+msgid "_Copy File Paths"
+msgstr "_Kopiér filstier"
+
+#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
+#: meld/resources/ui/dirdiff.ui:117
+msgid "Select folder to open in this pane"
+msgstr "Vælg mappe, der skal åbnes i denne rude"
+
+#: meld/resources/ui/dirdiff.ui:43
+msgid "Folder 1"
+msgstr "Mappe 1"
+
+#: meld/resources/ui/dirdiff.ui:84
+msgid "Folder 2"
+msgstr "Mappe 2"
+
+#: meld/resources/ui/dirdiff.ui:125
+msgid "Folder 3"
+msgstr "Mappe 3"
+
+#: meld/resources/ui/encoding-selector.ui:31
+msgid "Search text encoding…"
+msgstr "Søg tekstkodning …"
+
+#: meld/resources/ui/filediff-actions.ui:20
+msgid "Push current change to the left"
+msgstr "Skub aktuel ændring til venstre"
+
+#: meld/resources/ui/filediff-actions.ui:42
+msgid "Push current change to the right"
+msgstr "Skub aktuel ændring til højre"
+
+#: meld/resources/ui/filediff-actions.ui:65
+msgid "Copy chunks"
+msgstr "Kopiér stykker"
+
+#: meld/resources/ui/filediff-actions.ui:87
+msgid "Delete change"
+msgstr "Slet ændring"
+
+#: meld/resources/ui/filediff-menus.ui:7
+msgid "Copy change above the left chunk"
+msgstr "Kopiér ændring over det store venstre stykke"
+
+#: meld/resources/ui/filediff-menus.ui:11
+msgid "Copy change below the left chunk"
+msgstr "Kopiér ændring nedenunder det store venstre stykke"
+
+#: meld/resources/ui/filediff-menus.ui:15
+msgid "Copy change above the right chunk"
+msgstr "Kopiér ændring over det store højre stykke"
+
+#: meld/resources/ui/filediff-menus.ui:19
+msgid "Copy change below the right chunk"
+msgstr "Kopiér ændring nedenunder det store højre stykke"
+
+#: meld/resources/ui/filediff-menus.ui:28
+msgid "_Undo"
+msgstr "_Fortryd"
+
+#: meld/resources/ui/filediff-menus.ui:32
+msgid "_Redo"
+msgstr "_Gentag"
+
+#: meld/resources/ui/filediff-menus.ui:39
+msgid "Cu_t"
+msgstr "K_lip"
+
+#: meld/resources/ui/filediff-menus.ui:43
+msgid "_Copy"
+msgstr "_Kopiér"
+
+#: meld/resources/ui/filediff-menus.ui:47
+msgid "_Paste"
+msgstr "_Indsæt"
+
+#: meld/resources/ui/filediff-menus.ui:54
+msgid "Open Containing Folder"
+msgstr "Åbn ophavsmappe"
+
+#: meld/resources/ui/filediff-menus.ui:58
+msgid "Copy Full Path"
+msgstr "Kopiér hele stien"
+
+#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
+#: meld/resources/ui/filediff.ui:169
+msgid ""
+"This file can not be written to. You may click here to unlock this file and "
+"make changes anyway, but these changes must be saved to a new file."
+msgstr ""
+"Der kan ikke skrives til denne fil. Du kan klikke her for at låse filen op "
+"og alligevel foretage ændringer, men ændringerne skal gemmes til en ny fil."
+
+#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
+#: meld/resources/ui/filediff.ui:183
+msgid "Save file in this pane"
+msgstr "Gem filen i denne rude"
+
+#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
+#: meld/resources/ui/filediff.ui:209
+msgid "Open file in this pane"
+msgstr "Åbn filen i denne rude"
+
+#: meld/resources/ui/filediff.ui:79
+msgid "File 3"
+msgstr "Fil 3"
+
+#: meld/resources/ui/filediff.ui:148
+msgid "File 2"
+msgstr "Fil 2"
+
+#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148
+msgid "File 1"
+msgstr "Fil 1"
+
+#. Create icon and filename CellRenderer
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
+#: meld/dirdiff.py:602
+msgid "Name"
+msgstr "Navn"
+
+#: meld/resources/ui/filter-list.ui:68
+msgid "Pattern"
+msgstr "Mønster"
+
+#: meld/resources/ui/filter-list.ui:110
+msgid "Add new filter"
+msgstr "Tilføj nyt filter"
+
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18
+msgid "_Add"
+msgstr "_Tilføj"
+
+#: meld/resources/ui/filter-list.ui:126
+msgid "Remove selected filter"
+msgstr "Fjern det valgte filter"
+
+#: meld/resources/ui/findbar.ui:103
+msgid "_Match case"
+msgstr "_Forskel på store/små bogstaver"
+
+#: meld/resources/ui/findbar.ui:119
+msgid "Who_le word"
+msgstr "_Hele ord"
+
+#: meld/resources/ui/findbar.ui:135
+msgid "Regular e_xpression"
+msgstr "Regulært _udtryk"
+
+#: meld/resources/ui/findbar.ui:175
+msgid "Wrapped"
+msgstr "Ombrudt"
+
+#: meld/resources/ui/findbar.ui:193
+msgid "Replace _All"
+msgstr "Erstat _alle"
+
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
+msgid "_Replace"
+msgstr "_Erstat"
+
+#: meld/resources/ui/findbar.ui:226
+msgid "Switch between Find and Find-and-Replace"
+msgstr "Skift mellem find og find-og-erstat"
+
+#: meld/resources/ui/language-selector.ui:31
+msgid "Search highlight mode…"
+msgstr "Søg efter fremhævningstilstand …"
+
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342
+#: meld/newdifftab.py:49
+msgid "New comparison"
+msgstr "Ny sammenligning"
+
+#: meld/resources/ui/new-diff-tab.ui:72
+msgid "File"
+msgstr "Fil"
+
+#: meld/resources/ui/new-diff-tab.ui:121
+msgid "Folder"
+msgstr "Mappe"
+
+#: meld/resources/ui/new-diff-tab.ui:170
+msgid "Version control"
+msgstr "Versionsstyring"
+
+#: meld/resources/ui/new-diff-tab.ui:236 meld/resources/ui/new-diff-tab.ui:357
+msgid "_3-way comparison"
+msgstr "_Trevejssammenligning"
+
+#: meld/resources/ui/new-diff-tab.ui:256
+msgid "Select First File"
+msgstr "Vælg den 1. fil"
+
+#: meld/resources/ui/new-diff-tab.ui:270
+msgid "Select Second File"
+msgstr "Vælg den 2. fil"
+
+#: meld/resources/ui/new-diff-tab.ui:285
+msgid "Select Third File"
+msgstr "Vælg den 3. fil"
+
+#: meld/resources/ui/new-diff-tab.ui:321
+msgid "Select First Folder"
+msgstr "Vælg den 1. mappe"
+
+#: meld/resources/ui/new-diff-tab.ui:334
+msgid "Select Second Folder"
+msgstr "Vælg den 2. mappe"
+
+#: meld/resources/ui/new-diff-tab.ui:348
+msgid "Select Third Folder"
+msgstr "Vælg den 3. mappe"
+
+#: meld/resources/ui/new-diff-tab.ui:399
+msgid "Select A Version-Controlled Folder"
+msgstr "Vælg en versionsstyret mappe"
+
+#: meld/resources/ui/new-diff-tab.ui:448
+msgid "_Blank comparison"
+msgstr "_Tom sammenligning"
+
+#: meld/resources/ui/new-diff-tab.ui:466
+msgid "C_ompare"
+msgstr "_Sammenlign"
+
+#: meld/resources/ui/notebook-label.ui:24
+msgid "Close Tab"
+msgstr "Luk faneblad"
+
+#: meld/resources/ui/patch-dialog.ui:9
+msgid "Format as Patch"
+msgstr "Formatér som rettelse (patch)"
+
+#: meld/resources/ui/patch-dialog.ui:26
+msgid "Copy to Clipboard"
+msgstr "Kopiér til udklipsholderen"
+
+#: meld/resources/ui/patch-dialog.ui:57 meld/patchdialog.py:159
+msgid "Save Patch"
+msgstr "Gem rettelse (patch)"
+
+#: meld/resources/ui/patch-dialog.ui:88
+msgid "Use differences between:"
+msgstr "Brug forskelle mellem:"
+
+#: meld/resources/ui/patch-dialog.ui:105
+msgid "Left and middle panes"
+msgstr "Ruder til venstre og i midten"
+
+#: meld/resources/ui/patch-dialog.ui:123
+msgid "Middle and right panes"
+msgstr "Ruder i midten og til højre"
+
+#: meld/resources/ui/patch-dialog.ui:149
+msgid "_Reverse patch direction"
+msgstr "_Modsat rettelsesretning"
+
+#: meld/resources/ui/path-label.ui:23
+msgid "Path"
+msgstr "Sti"
+
+#: meld/resources/ui/path-label.ui:62
+msgid "Copy Path"
+msgstr "Kopiér sti"
+
+#: meld/resources/ui/path-label.ui:78
+msgid "Open Folder"
+msgstr "Åbn mappe"
+
+#: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
+msgid "Preferences"
+msgstr "Indstillinger"
+
+#: meld/resources/ui/preferences.ui:75
+msgid "Font"
+msgstr "Skrifttype"
+
+#: meld/resources/ui/preferences.ui:112
+msgid "_Use the system fixed width font"
+msgstr "_Brug systemets standardskrifttype med fast bredde"
+
+# Det er ikke det eksterne redigeringsprogram, men internt i Meld.
+#: meld/resources/ui/preferences.ui:136
+msgid "_Editor font:"
+msgstr "_Skrifttype for redigering:"
+
+#. TRANSLATORS: This is the status bar label for a group of settings,
+#. such as text wrapping, show line numbers, whitespace, etc.
+#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:291
+msgid "Display"
+msgstr "Skærm"
+
+#: meld/resources/ui/preferences.ui:241
+msgid "_Tab width:"
+msgstr "_Bredde på tabulator:"
+
+#: meld/resources/ui/preferences.ui:274
+msgid "_Insert spaces instead of tabs"
+msgstr "_Indsæt mellemrum i stedet for tabulatorer"
+
+#: meld/resources/ui/preferences.ui:290
+msgid "Enable text _wrapping"
+msgstr "Aktivér _tekstombrydning"
+
+#: meld/resources/ui/preferences.ui:312
+msgid "Do not _split words over two lines"
+msgstr "_Opdel ikke ord over to linjer"
+
+#: meld/resources/ui/preferences.ui:333
+msgid "Highlight _current line"
+msgstr "Fremhæv _aktuelle linje"
+
+#: meld/resources/ui/preferences.ui:349
+msgid "Show _line numbers"
+msgstr "Vis _linjenumre"
+
+#: meld/resources/ui/preferences.ui:365
+msgid "Show w_hitespace"
+msgstr "Vis _blanktegn"
+
+#: meld/resources/ui/preferences.ui:381
+msgid "Prefer dark theme"
+msgstr "Foretræk mørkt skema"
+
+#: meld/resources/ui/preferences.ui:397
+msgid "Use s_yntax highlighting"
+msgstr "Brug _syntaksfremhævning"
+
+#: meld/resources/ui/preferences.ui:420
+msgid "Syntax highlighting color scheme:"
+msgstr "Farveskema for syntaksfremhævning:"
+
+#: meld/resources/ui/preferences.ui:485
+msgid "Code Overview"
+msgstr "Kodeoversigt"
+
+#: meld/resources/ui/preferences.ui:522
+msgid "Show overview map"
+msgstr "Vis oversigtskort"
+
+#: meld/resources/ui/preferences.ui:545
+msgid "Overview map style:"
+msgstr "Stil for oversigtskort:"
+
+#: meld/resources/ui/preferences.ui:612
+msgid "External Editor"
+msgstr "Eksternt redigeringsprogram"
+
+# Brug det _normale systemredigeringsprogram
+# Brug systemets _standardredigeringsprogram
+#: meld/resources/ui/preferences.ui:648
+msgid "Use _default system editor"
+msgstr "Brug det _normale systemredigeringsprogram"
+
+#: meld/resources/ui/preferences.ui:671
+msgid "Edito_r command:"
+msgstr "_Kommando for redigeringsprogram:"
+
+#: meld/resources/ui/preferences.ui:727
+msgid "Editor"
+msgstr "Redigeringsprogram"
+
+#: meld/resources/ui/preferences.ui:748
+msgid "Shallow Comparison"
+msgstr "Overfladisk sammenligning"
+
+#: meld/resources/ui/preferences.ui:784
+msgid "C_ompare files based only on size and timestamp"
+msgstr "_Sammenlign kun filer baseret på størrelse og tidsstempel"
+
+#: meld/resources/ui/preferences.ui:807
+msgid "_Timestamp resolution:"
+msgstr "_Tidsstempelopløsning:"
+
+#: meld/resources/ui/preferences.ui:871
+msgid "Note: enabling text filters may make comparing large files much slower"
+msgstr ""
+"Bemærk: Aktivering af tekstfiltre kan gøre sammenligning af store filer "
+"meget langsommere"
+
+#: meld/resources/ui/preferences.ui:920
+msgid "Symbolic Links"
+msgstr "Symbolske henvisninger"
+
+#: meld/resources/ui/preferences.ui:988
+msgid "Visible Columns"
+msgstr "Synlige kolonner"
+
+#: meld/resources/ui/preferences.ui:1055
+msgid "Folder Comparisons"
+msgstr "Mappesammenligninger"
+
+#: meld/resources/ui/preferences.ui:1077
+msgid "Version Comparisons"
+msgstr "Versionssammenligninger"
+
+#: meld/resources/ui/preferences.ui:1120
+msgid "_Order when comparing file revisions:"
+msgstr "_Rækkefølge ved sammenligning af filrevisioner:"
+
+#: meld/resources/ui/preferences.ui:1167
+msgid "Order when _merging files:"
+msgstr "R_ækkefølge når filer flettes:"
+
+#: meld/resources/ui/preferences.ui:1235
+msgid "Commit Messages"
+msgstr "Commit-beskeder"
+
+#: meld/resources/ui/preferences.ui:1276
+msgid "Show _right margin at:"
+msgstr "Vis _højre margen ved:"
+
+#: meld/resources/ui/preferences.ui:1317
+msgid "Automatically _break lines at right margin on commit"
+msgstr "Bryd automatisk linjer ved højre margen ved commit"
+
+#: meld/resources/ui/preferences.ui:1367
+msgid "Version Control"
+msgstr "Versionsstyring"
+
+#: meld/resources/ui/preferences.ui:1389
+msgid "Filename filters"
+msgstr "Filnavnefiltre"
+
+#: meld/resources/ui/preferences.ui:1427
+msgid ""
+"When performing directory comparisons, you may filter out files and "
+"directories by name. Each pattern is a list of shell style wildcards "
+"separated by spaces."
+msgstr ""
+"Når der udføres mappesammenligninger, kan du filtrere filer og mapper fra "
+"efter navn. Hvert mønster er en liste af skallignende jokertegn adskilt af "
+"mellemrum."
+
+#: meld/resources/ui/preferences.ui:1494
+msgid "Change trimming"
+msgstr "Ændr beskæring"
+
+#: meld/resources/ui/preferences.ui:1530
+msgid "Trim blank line differences from the start and end of changes"
+msgstr ""
+"Beskær tomme linjer-forskelle fra begyndelsen og slutningen af ændringer"
+
+#: meld/resources/ui/preferences.ui:1574
+msgid "Text filters"
+msgstr "Tekstfiltre"
+
+# vert mønster er et regulært udtryk i python, der erstatter
+# tilsvarende tekst med den tomme streng før sammenligningen udføres.
+#: meld/resources/ui/preferences.ui:1612
+msgid ""
+"When performing file comparisons, you may ignore certain types of changes. "
+"Each pattern here is a python regular expression which replaces matching "
+"text with the empty string before comparison is performed. If the expression "
+"contains groups, only the groups are replaced. See the user manual for more "
+"details."
+msgstr ""
+"Når der udføres filsammenligninger, kan du ignorere visse ændringer. Hvert "
+"mønster her er et regulært udtryk i python, som erstatter tilsvarende tekst "
+"med den tomme streng før sammenligning udføres. Hvis udtrykket indeholder "
+"grupper, bliver kun grupperne erstattet. Se brugermanualen for yderligere "
+"detaljer."
+
+#: meld/resources/ui/preferences.ui:1703
+msgid "Left is remote, right is local"
+msgstr "Venstre er fjern, højre er lokal"
+
+#: meld/resources/ui/preferences.ui:1707
+msgid "Left is local, right is remote"
+msgstr "Venstre er lokal, højre er fjern"
+
+#: meld/resources/ui/preferences.ui:1721
+msgid "Simple change map"
+msgstr "Simpelt ændringskort"
+
+#: meld/resources/ui/preferences.ui:1725
+msgid "Compact source map"
+msgstr "Kompakt kildekort"
+
+#: meld/resources/ui/preferences.ui:1729
+msgid "Full source map"
+msgstr "Fuldt kildekort"
+
+#: meld/resources/ui/preferences.ui:1743
+msgid "Remote, merge, local"
+msgstr "Fjern, flet, lokal"
+
+#: meld/resources/ui/preferences.ui:1747
+msgid "Local, merge, remote"
+msgstr "Lokal, flet, fjern"
+
+#: meld/resources/ui/preferences.ui:1769
+msgid "1ns (ext4)"
+msgstr "1ns (ext4)"
+
+#: meld/resources/ui/preferences.ui:1773
+msgid "100ns (NTFS)"
+msgstr "100ns (NTFS)"
+
+#: meld/resources/ui/preferences.ui:1777
+msgid "1s (ext2/ext3)"
+msgstr "1s (ext2/ext3)"
+
+#: meld/resources/ui/preferences.ui:1781
+msgid "2s (VFAT)"
+msgstr "2s (VFAT)"
+
+#: meld/resources/ui/push-dialog.ui:9
+msgid "Push local commits to remote?"
+msgstr "Skub lokale commit'er til fjern?"
+
+#: meld/resources/ui/push-dialog.ui:10
+msgid "The commits to be pushed are determined by your version control system."
+msgstr ""
+"Hvilke commit'er, der skubbes, bestemmes af dit versionsstyringssystem."
+
+#: meld/resources/ui/push-dialog.ui:38
+msgid "_Push commits"
+msgstr "_Skub commit'er"
+
+#: meld/resources/ui/recent-selector.ui:16
+msgid "Search recent comparisons…"
+msgstr "Søg efter seneste sammenligninger …"
+
+#: meld/resources/ui/revert-dialog.ui:9
+msgid "Discard unsaved changes to documents?"
+msgstr "Kassér ikke gemte ændringer i dokumentet?"
+
+#: meld/resources/ui/revert-dialog.ui:10
+msgid "Changes made to the following documents will be permanently lost:"
+msgstr "Ændringer foretaget i følgende dokumenter vil gå tabt for altid:"
+
+#: meld/resources/ui/revert-dialog.ui:39
+msgid "_Discard"
+msgstr "_Kassér"
+
+#: meld/resources/ui/save-confirm-dialog.ui:9
+msgid "Save changes to documents before closing?"
+msgstr "Gem ændringer i dokumenter, før der lukkes?"
+
+#: meld/resources/ui/save-confirm-dialog.ui:10
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Ændringerne går tabt permanent, hvis ikke du gemmer."
+
+#: meld/resources/ui/save-confirm-dialog.ui:24
+msgid "Close _without Saving"
+msgstr "Luk _uden at gemme"
+
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: meld/resources/ui/save-confirm-dialog.ui:55
+msgid "_Save"
+msgstr "_Gem"
+
+#: meld/resources/ui/statusbar-menu.ui:9
+msgid "Show whitespace"
+msgstr "Vis blanktegn"
+
+#: meld/resources/ui/statusbar-menu.ui:17
+msgid "Text wrapping"
+msgstr "Tekstombrydning"
+
+#: meld/resources/ui/vcview-menus.ui:7
+msgid "_Compare"
+msgstr "_Sammenlign"
+
+#: meld/resources/ui/vcview-menus.ui:11
+msgid "Co_mmit…"
+msgstr "Co_mmit …"
+
+#: meld/resources/ui/vcview-menus.ui:26
+msgid "Re_vert"
+msgstr "_Gendan"
+
+#: meld/resources/ui/vcview-menus.ui:30
+msgid "Delete"
+msgstr "Slet"
+
+#: meld/resources/ui/vcview-menus.ui:37
+msgid "Resolve Conflict"
+msgstr "Løs konflikt"
+
+#: meld/resources/ui/vcview.ui:16
+msgid "Commit changes to version control"
+msgstr "Commit ændringer til versionsstyring"
+
+#: meld/resources/ui/vcview.ui:21
+msgid "Commit…"
+msgstr "Commit …"
+
+#: meld/resources/ui/vcview.ui:38
+msgid "Pull remote changes to the local repository"
+msgstr "Træk fjernændringer til det lokale arkiv"
+
+#: meld/resources/ui/vcview.ui:51
+msgid "Push local changes to remote"
+msgstr "Skub lokale ændringer til fjern"
+
+#: meld/resources/ui/vcview.ui:74
+msgid "Add to version control"
+msgstr "Tilføj til versionsstyring"
+
+#: meld/resources/ui/vcview.ui:87
+msgid "Remove from version control"
+msgstr "Fjern fra versionsstyring"
+
+#: meld/resources/ui/vcview.ui:100
+msgid "Revert working copy to original state"
+msgstr "Tilbagefør arbejdskopi til oprindelig tilstand"
+
+#: meld/resources/ui/vcview.ui:113
+msgid "Mark as resolved in version control"
+msgstr "Markér som løst i versionsstyring"
+
+#: meld/resources/ui/vcview.ui:140
+msgid "Open version controlled folder in this pane"
+msgstr "Åbn versionsstyret mappe i denne rude"
+
+#: meld/resources/ui/vcview.ui:229
+msgid "Location"
+msgstr "Sted"
+
+#: meld/resources/ui/vcview.ui:238
+msgid "Status"
+msgstr "Status"
+
+#: meld/resources/ui/vcview.ui:247
+msgid "Extra"
+msgstr "Ekstra"
+
+#: meld/resources/ui/vcview.ui:279
+msgid "Console output"
+msgstr "Konsoloutput"
+
+#: meld/actiongutter.py:247
+msgid "Copy _up"
+msgstr "Kopiér _op"
+
+#: meld/actiongutter.py:248
+msgid "Copy _down"
+msgstr "Kopiér _ned"
+
+#: meld/const.py:30
+msgid "UNIX (LF)"
+msgstr "UNIX (LF)"
+
+#: meld/const.py:31
+msgid "DOS/Windows (CR-LF)"
+msgstr "DOS/Windows (CR-LF)"
+
+#: meld/const.py:32
+msgid "Mac OS (CR)"
+msgstr "Mac OS (CR)"
+
+#. Create file size CellRenderer
+#: meld/dirdiff.py:623 meld/preferences.py:132
+msgid "Size"
+msgstr "Størrelse"
+
+#. Create date-time CellRenderer
+#: meld/dirdiff.py:631 meld/preferences.py:133
+msgid "Modification time"
+msgstr "Ændringstidspunkt"
+
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:639 meld/preferences.py:134
+msgid "Modification time (ISO)"
+msgstr "Ændringstidspunkt (ISO)"
+
+#. Create permissions CellRenderer
+#: meld/dirdiff.py:647 meld/preferences.py:135
+msgid "Permissions"
+msgstr "Rettigheder"
+
+#: meld/dirdiff.py:900
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (skanner …)"
+
+#: meld/dirdiff.py:932 meld/dirdiff.py:964
+#, python-brace-format
+msgid "[{label}] Scanning {folder}"
+msgstr "[{label}] Skanner {folder}"
+
+#: meld/dirdiff.py:1100
+#, python-brace-format
+msgid "[{label}] Done"
+msgstr "[{label}] Færdig"
+
+#: meld/dirdiff.py:1113
+msgid "Folder {} is being compared to itself"
+msgstr "Mappen {} sammenlignes med sig selv"
+
+#: meld/dirdiff.py:1119
+msgid "Folders have no differences"
+msgstr "Der er ingen forskelle på mapperne"
+
+#: meld/dirdiff.py:1121
+msgid "Contents of scanned files in folders are identical."
+msgstr "Indholdet af de skannede filer i mapperne er ens."
+
+#: meld/dirdiff.py:1123
+msgid ""
+"Scanned files in folders appear identical, but contents have not been "
+"scanned."
+msgstr ""
+"De skannede filer i mapperne ser ud til at være ens, men indholdet er ikke "
+"blevet skannet."
+
+#: meld/dirdiff.py:1126
+msgid "File filters are in use, so not all files have been scanned."
+msgstr "Ikke alle filer er blevet skannet, da filfiltre er i brug."
+
+#: meld/dirdiff.py:1128
+msgid "Text filters are in use and may be masking content differences."
+msgstr "Tekstfiltre er i brug og kan maskere forskelle i indhold."
+
+#: meld/dirdiff.py:1144 meld/filediff.py:1919
+msgid "Hide"
+msgstr "Skjul"
+
+#: meld/dirdiff.py:1146 meld/filediff.py:1921 meld/filediff.py:1951
+#: meld/filediff.py:1953 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+msgid "Hi_de"
+msgstr "_Skjul"
+
+#: meld/dirdiff.py:1155
+msgid "Multiple errors occurred while scanning this folder"
+msgstr "Der opstod flere fejl, under skanning af mappen"
+
+#: meld/dirdiff.py:1156
+msgid "Files with invalid encodings found"
+msgstr "Fandt filer med ugyldige kodninger"
+
+#. TRANSLATORS: This is followed by a list of files
+#: meld/dirdiff.py:1158
+msgid "Some files were in an incorrect encoding. The names are something like:"
+msgstr "Nogle filer var ikke kodet korrekt. Navnene er noget lignende dette:"
+
+#: meld/dirdiff.py:1160
+msgid "Files hidden by case insensitive comparison"
+msgstr "Filer skjult af søgning, som ikke tager højde for store/små bogstaver"
+
+# Du udfører en sammenligning uden forskel på store og små bogstaver på
+# et filsystem, hvor der er forskel på store og små bogstaver.
+#. TRANSLATORS: This is followed by a list of files
+#: meld/dirdiff.py:1162
+msgid ""
+"You are running a case insensitive comparison on a case sensitive "
+"filesystem. The following files in this folder are hidden:"
+msgstr ""
+"Du udfører en sammenligning, der ikke tager højde for store/små bogstaver, "
+"på et filsystem, som tager højde for store/små bogstaver. Følgende filer i "
+"denne mappe er skjulte:"
+
+#: meld/dirdiff.py:1173
+#, python-brace-format
+msgid "“{first_file}” hidden by “{second_file}”"
+msgstr "“{first_file}” skjult af “{second_file}”"
+
+#: meld/dirdiff.py:1235
+#, python-format
+msgid "Replace folder “%s”?"
+msgstr "Erstat mappen “%s”?"
+
+#: meld/dirdiff.py:1237
+#, python-format
+msgid ""
+"Another folder with the same name already exists in “%s”.\n"
+"If you replace the existing folder, all files in it will be lost."
+msgstr ""
+"En mappe med det samme navn findes allerede i “%s”.\n"
+"Hvis du erstatter den eksisterende mappe, vil alle filer i den gå tabt."
+
+#: meld/dirdiff.py:1250
+msgid "Error copying file"
+msgstr "Fejl ved kopiering af fil"
+
+#: meld/dirdiff.py:1251
+#, python-brace-format
+msgid ""
+"Couldn’t copy {source}\n"
+"to {dest}.\n"
+"\n"
+"{error}"
+msgstr ""
+"Kunne ikke kopiere {source}\n"
+"til {dest}.\n"
+"\n"
+"{error}"
+
+#: meld/dirdiff.py:1276 meld/vcview.py:764
+msgid "Error deleting {}"
+msgstr "Fejl ved sletning af {}"
+
+#: meld/dirdiff.py:1819
+msgid "No folder"
+msgstr "Ingen mappe"
+
+#: meld/filediff.py:1149
+msgid "Comparison results will be inaccurate"
+msgstr "Resultatet af sammenligningen vil være unøjagtigt"
+
+#: meld/filediff.py:1151
+msgid ""
+"A filter changed the number of lines in the file, which is unsupported. The "
+"comparison will not be accurate."
+msgstr ""
+"Et filter ændrede antallet af linjer i filen, hvilket ikke understøttes. "
+"Sammenligningen vil ikke være nøjagtig."
+
+#: meld/filediff.py:1223
+msgid "Mark conflict as resolved?"
+msgstr "Markér konflikt som løst?"
+
+#: meld/filediff.py:1225
+msgid ""
+"If the conflict was resolved successfully, you may mark it as resolved now."
+msgstr "Hvis konflikten blev løst, kan du nu markere den som løst."
+
+#: meld/filediff.py:1228
+msgid "Cancel"
+msgstr "Annullér"
+
+#: meld/filediff.py:1229
+msgid "Mark _Resolved"
+msgstr "Markér som _løst"
+
+#: meld/filediff.py:1593
+#, python-format
+msgid "There was a problem opening the file “%s”."
+msgstr "Der var et problem med at åbne filen “%s”."
+
+#: meld/filediff.py:1602
+#, python-format
+msgid "File %s appears to be a binary file."
+msgstr "Filen %s ser ud til at være en binær fil."
+
+#: meld/filediff.py:1604
+msgid "Do you want to open the file using the default application?"
+msgstr "Vil du åbne filen med standardprogrammet?"
+
+#: meld/filediff.py:1606
+msgid "Open"
+msgstr "Åbn"
+
+#: meld/filediff.py:1628
+#, python-format
+msgid "[%s] Merging files"
+msgstr "[%s] Fletter filer"
+
+#: meld/filediff.py:1642
+#, python-format
+msgid "[%s] Computing differences"
+msgstr "[%s] Beregner forskelle"
+
+#: meld/filediff.py:1702
+#, python-format
+msgid "File %s has changed on disk"
+msgstr "Filen %s er blevet ændret på disken"
+
+#: meld/filediff.py:1703
+msgid "Do you want to reload the file?"
+msgstr "Vil du genindlæse filen?"
+
+#: meld/filediff.py:1705
+msgid "_Reload"
+msgstr "_Genindlæs"
+
+#: meld/filediff.py:1875
+msgid "File {} is being compared to itself"
+msgstr "Filen {} sammenlignes med sig selv"
+
+#: meld/filediff.py:1884
+msgid "Files are identical"
+msgstr "Filer er identiske"
+
+#: meld/filediff.py:1897
+msgid ""
+"Text filters are being used, and may be masking differences between files. "
+"Would you like to compare the unfiltered files?"
+msgstr ""
+"Tekstfiltre er i brug og kan maskere forskelle mellem filer. Vil du "
+"sammenligne de ikke-filtrerede filer?"
+
+#: meld/filediff.py:1902
+msgid "Files differ in line endings only"
+msgstr "Filer er kun forskellige i slutningen af linjerne"
+
+#: meld/filediff.py:1904
+#, python-format
+msgid ""
+"Files are identical except for differing line endings:\n"
+"%s"
+msgstr ""
+"Filerne er ens bortset fra forskelle i slutningen af linjerne:\n"
+"%s"
+
+#: meld/filediff.py:1924
+msgid "Show without filters"
+msgstr "Vis uden filtre"
+
+#: meld/filediff.py:1946
+msgid "Change highlighting incomplete"
+msgstr "Fremhævning af ændringer ufuldstændig"
+
+#: meld/filediff.py:1947
+msgid ""
+"Some changes were not highlighted because they were too large. You can force "
+"Meld to take longer to highlight larger changes, though this may be slow."
+msgstr ""
+"Nogle ændringer blev ikke fremhævet, fordi de var for store. Du kan tvinge "
+"Meld til at bruge længere tid på at fremhæve større ændringer, selvom det "
+"kan være langsomt."
+
+#: meld/filediff.py:1955
+msgid "Keep highlighting"
+msgstr "Bliv ved med at fremhæve"
+
+#: meld/filediff.py:1957
+msgid "_Keep highlighting"
+msgstr "_Bliv ved med at fremhæve"
+
+#: meld/filediff.py:1970
+msgid "Saving failed"
+msgstr "Kunne ikke gemme"
+
+#: meld/filediff.py:1971
+msgid ""
+"Please consider copying any critical changes to another program or file to "
+"avoid data loss."
+msgstr ""
+"Overvej at kopiere kritiske ændringer til et andet program eller en anden "
+"fil for at undgå tab af data."
+
+#: meld/filediff.py:1980
+msgid "Save Left Pane As"
+msgstr "Gem venstre rude som"
+
+#: meld/filediff.py:1982
+msgid "Save Middle Pane As"
+msgstr "Gem midterste rude som"
+
+#: meld/filediff.py:1984
+msgid "Save Right Pane As"
+msgstr "Gem højre rude som"
+
+#: meld/filediff.py:1995
+#, python-format
+msgid "File %s has changed on disk since it was opened"
+msgstr "Filen %s er blevet ændret på disken, siden den blev åbnet"
+
+#: meld/filediff.py:1997
+msgid "If you save it, any external changes will be lost."
+msgstr ""
+"Hvis du gemmer den, vil alle ændringer, som er foretaget eksternt, gå tabt."
+
+#: meld/filediff.py:2000
+msgid "Save Anyway"
+msgstr "Gem alligevel"
+
+#: meld/filediff.py:2001
+msgid "Don’t Save"
+msgstr "Gem ikke"
+
+#: meld/filediff.py:2043
+msgid ""
+"File “{}” contains characters that can’t be encoded using its current "
+"encoding “{}”."
+msgstr ""
+"Filen “{}” indeholder tegn, som ikke kan kodes med filens aktuelle kodning "
+"“{}”."
+
+#: meld/filediff.py:2047 meld/patchdialog.py:138
+#, python-format
+msgid ""
+"Couldn’t save file due to:\n"
+"%s"
+msgstr ""
+"Kunne ikke gemme filen pga.:\n"
+"%s"
+
+#: meld/filediff.py:2051 meld/patchdialog.py:137
+#, python-format
+msgid "Could not save file %s."
+msgstr "Kunne ikke gemme filen %s."
+
+#: meld/filediff.py:2452
+msgid "Live comparison updating disabled"
+msgstr "Liveopdatering af sammenligninger deaktiveret"
+
+#: meld/filediff.py:2453
+msgid ""
+"Live updating of comparisons is disabled when synchronization points are "
+"active. You can still manually refresh the comparison, and live updates will "
+"resume when synchronization points are cleared."
+msgstr ""
+"Liveopdatering af sammenligninger er deaktiveret, når synkroniseringspunkter "
+"er aktive. Du kan stadig opdatere sammenligningen manuelt, og liveopdatering "
+"vil fortsætte, når synkroniseringspunkterne er blevet ryddet."
+
+#: meld/iohelpers.py:41
+msgid "Deleting remote folders is not supported"
+msgstr "Sletning af eksterne mapper understøttes ikke"
+
+#: meld/iohelpers.py:43
+msgid "Not a file or directory"
+msgstr "Ikke en fil eller mappe"
+
+#: meld/iohelpers.py:47
+msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
+msgstr "“{}” kan ikke puttes i papirkurven. Vil du slette den helt?"
+
+#: meld/iohelpers.py:52
+msgid "This remote location does not support sending items to the trash."
+msgstr "Denne eksterne placering understøtter ikke papirkurv."
+
+#: meld/iohelpers.py:58
+msgid "_Delete Permanently"
+msgstr "_Slet for evigt"
+
+#: meld/iohelpers.py:110
+#, python-format
+msgid "Replace file “%s”?"
+msgstr "Erstat filen “%s”?"
+
+#: meld/iohelpers.py:112
+#, python-format
+msgid ""
+"A file with this name already exists in “%s”.\n"
+"If you replace the existing file, its contents will be lost."
+msgstr ""
+"Der er allerede en fil med dette navn i “%s”.\n"
+"Hvis du erstatter den eksisterende fil, vil dens indhold gå tabt."
+
+#: meld/meldapp.py:188
+msgid "wrong number of arguments supplied to --diff"
+msgstr "forkert antal argumenter angivet til --diff"
+
+#: meld/meldapp.py:193
+msgid "Start with an empty window"
+msgstr "Start med et tomt vindue"
+
+#: meld/meldapp.py:194 meld/meldapp.py:196
+msgid "file"
+msgstr "fil"
+
+#: meld/meldapp.py:194 meld/meldapp.py:198
+msgid "folder"
+msgstr "mappe"
+
+#: meld/meldapp.py:195
+msgid "Start a version control comparison"
+msgstr "Start en sammenligning af versioner"
+
+#: meld/meldapp.py:197
+msgid "Start a 2- or 3-way file comparison"
+msgstr "Sammenlign to eller tre filer"
+
+#: meld/meldapp.py:199
+msgid "Start a 2- or 3-way folder comparison"
+msgstr "Sammenlign to eller tre mapper"
+
+#: meld/meldapp.py:242
+#, python-format
+msgid "Error: %s\n"
+msgstr "Fejl: %s\n"
+
+#: meld/meldapp.py:249
+msgid "Meld is a file and directory comparison tool."
+msgstr "Meld er et værktøj til at sammenligne filer og mapper."
+
+#: meld/meldapp.py:253
+msgid "Set label to use instead of file name"
+msgstr "Angiv etiket, der skal bruges i stedet for filnavn"
+
+#: meld/meldapp.py:256
+msgid "Open a new tab in an already running instance"
+msgstr "Åbn et nyt faneblad i en instans som allerede kører"
+
+#: meld/meldapp.py:259
+msgid "Automatically compare all differing files on startup"
+msgstr "Sammenlign automatisk alle filer der har forskelle ved opstart"
+
+#: meld/meldapp.py:262
+msgid "Ignored for compatibility"
+msgstr "Ignoreres pga. kompatibilitet"
+
+#: meld/meldapp.py:266
+msgid "Set the target file for saving a merge result"
+msgstr "Angiv målfilen hvor resultatet af en fletning skal gemmes"
+
+#: meld/meldapp.py:269
+msgid "Automatically merge files"
+msgstr "Flet filer automatisk"
+
+#: meld/meldapp.py:273
+msgid "Load a saved comparison from a Meld comparison file"
+msgstr "Indlæs en gemt sammenligning fra en Meld-sammenligningsfil"
+
+#: meld/meldapp.py:277
+msgid "Create a diff tab for the supplied files or folders"
+msgstr "Opret et faneblad med forskellene mellem de angivne filer eller mapper"
+
+#: meld/meldapp.py:297
+#, python-format
+msgid "too many arguments (wanted 0-3, got %d)"
+msgstr "for mange argumenter (ønskede 0-3, fik %d)"
+
+#: meld/meldapp.py:300
+msgid "can’t auto-merge less than 3 files"
+msgstr "kan ikke auto-flette mindre end tre filer"
+
+#: meld/meldapp.py:302
+msgid "can’t auto-merge directories"
+msgstr "kan ikke auto-flette mapper"
+
+#: meld/meldapp.py:317
+msgid "Error reading saved comparison file"
+msgstr "Fejl ved læsning af gemt sammenligningsfil"
+
+#: meld/meldapp.py:334
+#, python-format
+msgid "invalid path or URI “%s”"
+msgstr "ugyldig sti eller URI “%s”"
+
+#: meld/meldapp.py:341
+msgid "remote folder “{}” not supported"
+msgstr "ekstern mappe “{}” er ikke understøttet"
+
+#. TRANSLATORS: This is the label of a new, currently-unnamed file.
+#: meld/meldbuffer.py:115
+msgid "<unnamed>"
+msgstr "<unavngivet>"
+
+#: meld/melddoc.py:124
+msgid "untitled"
+msgstr "uden titel"
+
+#: meld/meldwindow.py:158
+msgid "Filename"
+msgstr "Filnavn"
+
+#: meld/meldwindow.py:381
+#, python-format
+msgid "Need three files to auto-merge, got: %r"
+msgstr "Behøver tre filer for at auto-flette, fik: %r"
+
+#: meld/meldwindow.py:411
+msgid "Cannot compare a mixture of files and directories"
+msgstr "Kan ikke sammenligne en blanding af filer og mapper"
+
+#: meld/misc.py:154
+msgid ""
+"{}\n"
+"\n"
+"Meld encountered a critical error while running:\n"
+"<tt>{}</tt>"
+msgstr ""
+"{}\n"
+"\n"
+"Meld stødte på en kritisk fejl under kørslen af:\n"
+"<tt>{}</tt>"
+
+#: meld/misc.py:205
+msgid "[None]"
+msgstr "[Ingen]"
+
+#: meld/preferences.py:37 meld/preferences.py:129
+msgid "label"
+msgstr "etiket"
+
+#: meld/preferences.py:37 meld/preferences.py:129
+msgid "pattern"
+msgstr "mønster"
+
+#: meld/recent.py:111
+msgid "Version control:"
+msgstr "Versionsstyring:"
+
+#: meld/style.py:91
+msgid "Couldn’t find colour scheme details for {}; this is a bad install"
+msgstr ""
+"Kunne ikke finde farveskemadetaljer for {}; der er problemer med denne installation"
+
+#: meld/ui/bufferselectors.py:110
+#, python-brace-format
+msgid "{name} ({charset})"
+msgstr "{name} ({charset})"
+
+#: meld/ui/bufferselectors.py:140 meld/ui/bufferselectors.py:148
+msgid "Plain Text"
+msgstr "Klartekst"
+
+#: meld/ui/pathlabel.py:36
+msgid "Unnamed file"
+msgstr "Unavngivet fil"
+
+#. Abbreviation for line, column so that it will fit in the status bar
+#: meld/ui/statusbar.py:125
+#, python-brace-format
+msgid "Ln {line}, Col {column}"
+msgstr "Ln {line}, Kol {column}"
+
+#: meld/ui/statusbar.py:185
+msgid "Line you want to move the cursor to"
+msgstr "Linje du ønsker at flytte markøren til"
+
+#: meld/ui/vcdialogs.py:50
+msgid "No files will be committed"
+msgstr "Ingen filer vil blive commit'et"
+
+#. Translators: First element is replaced by translated "%d
+#. unpushed commits", second element is replaced by translated
+#. "%d branches"
+#: meld/vc/git.py:92
+#, python-brace-format
+msgid "{unpushed_commits} in {unpushed_branches}"
+msgstr "{unpushed_commits} i {unpushed_branches}"
+
+#: meld/vc/git.py:94 meld/vc/git.py:104
+#, python-format
+msgid "%d unpushed commit"
+msgid_plural "%d unpushed commits"
+msgstr[0] "%d ikke skubbet commit"
+msgstr[1] "%d ikke skubbet commit'er"
+
+#: meld/vc/git.py:97
+#, python-format
+msgid "%d branch"
+msgid_plural "%d branches"
+msgstr[0] "%d gren"
+msgstr[1] "%d grene"
+
+#: meld/vc/git.py:345
+#, python-brace-format
+msgid "Mode changed from {old_mode} to {new_mode}"
+msgstr "Tilstand skiftede fra {old_mode} til {new_mode}"
+
+#: meld/vc/git.py:353
+msgid "Partially staged"
+msgstr "Delvist staged"
+
+#: meld/vc/git.py:353
+msgid "Staged"
+msgstr "Staged"
+
+#. Translators: This is the displayed name of a version control system
+#. when no version control system is actually found.
+#: meld/vc/_null.py:38
+msgid "None"
+msgstr "Ingen"
+
+#: meld/vc/svn.py:203
+#, python-format
+msgid "Rev %s"
+msgstr "Rev. %s"
+
+#: meld/vc/_vc.py:54
+msgid "Merged"
+msgstr "Flettet"
+
+#: meld/vc/_vc.py:54
+msgid "Base"
+msgstr "Base"
+
+#: meld/vc/_vc.py:54
+msgid "Local"
+msgstr "Lokal"
+
+#: meld/vc/_vc.py:54
+msgid "Remote"
+msgstr "Fjern"
+
+#: meld/vc/_vc.py:73
+msgid "Error"
+msgstr "Fejl"
+
+#: meld/vc/_vc.py:75
+msgid "Newly added"
+msgstr "Nyligt tilføjet"
+
+#: meld/vc/_vc.py:77
+msgid "Renamed"
+msgstr "Omdøbt"
+
+#: meld/vc/_vc.py:78
+msgid "Conflict"
+msgstr "Konflikt"
+
+#: meld/vc/_vc.py:79
+msgid "Removed"
+msgstr "Fjernet"
+
+# Manglende?
+#: meld/vc/_vc.py:80
+msgid "Missing"
+msgstr "Mangler"
+
+#: meld/vc/_vc.py:81
+msgid "Not present"
+msgstr "Ikke tilstedeværende"
+
+#: meld/vc/_vc.py:82
+msgid "Scanning…"
+msgstr "Skanner …"
+
+#. Translators: This error message is shown when no
+#. repository of this type is found.
+#: meld/vcview.py:334
+#, python-format
+msgid "%(name)s (not found)"
+msgstr "%(name)s (ikke fundet)"
+
+#. Translators: This error message is shown when a version
+#. control binary isn't installed.
+#: meld/vcview.py:338
+#, python-format
+msgid "%(name)s (%(cmd)s not installed)"
+msgstr "%(name)s (%(cmd)s ikke installeret)"
+
+#. Translators: This error message is shown when a version
+#. controlled repository is invalid.
+#: meld/vcview.py:342
+#, python-format
+msgid "%(name)s (invalid repository)"
+msgstr "%(name)s (ugyldigt arkiv)"
+
+#: meld/vcview.py:356
+msgid "No valid version control system found in this folder"
+msgstr "Fandt ikke et gyldigt versionsstyringssystem i denne mappe"
+
+#: meld/vcview.py:358
+msgid "Choose which version control system to use"
+msgstr "Vælg hvilket versionsstyringssystem, der skal anvendes"
+
+#. TRANSLATORS: This is the location of the directory being viewed
+#: meld/vcview.py:412
+#, python-brace-format
+msgid "Location: {path}"
+msgstr "Sted: {path}"
+
+#. Initial yield so when we add this to our tasks, we don't
+#. create iterators that may be invalidated.
+#: meld/vcview.py:419
+msgid "Scanning repository"
+msgstr "Skanner arkiv"
+
+#: meld/vcview.py:448
+#, python-format
+msgid "Scanning %s"
+msgstr "Skanner %s"
+
+#: meld/vcview.py:487
+msgid "(Empty)"
+msgstr "(tom)"
+
+#: meld/vcview.py:535
+#, python-format
+msgid "%s — local"
+msgstr "%s — lokal"
+
+#: meld/vcview.py:536
+#, python-format
+msgid "%s — remote"
+msgstr "%s — fjern"
+
+#: meld/vcview.py:544
+#, python-format
+msgid "%s (local, merge, remote)"
+msgstr "%s (lokal, flet, fjern)"
+
+#: meld/vcview.py:549
+#, python-format
+msgid "%s (remote, merge, local)"
+msgstr "%s (fjern, flet, lokal)"
+
+#: meld/vcview.py:560
+#, python-format
+msgid "%s — repository"
+msgstr "%s — arkiv"
+
+# arbejdskopi?
+#: meld/vcview.py:566
+#, python-format
+msgid "%s (working, repository)"
+msgstr "%s (arbejdskopi, arkiv)"
+
+#: meld/vcview.py:570
+#, python-format
+msgid "%s (repository, working)"
+msgstr "%s (arkiv, arbejdskopi)"
+
+#: meld/vcview.py:735
+msgid "Remove folder and all its files?"
+msgstr "Fjern mappen og alle dens filer?"
+
+#: meld/vcview.py:737
+msgid ""
+"This will remove all selected files and folders, and all files within any "
+"selected folders, from version control."
+msgstr ""
+"Dette vil fjerne alle valgte filer og mapper, samt alle filer i de valgte "
+"mapper, fra versionsstyring."
+
+#: meld/vcview.py:850
+msgid "Clear"
+msgstr "Ryd"
+
+#~ msgid "_Update"
+#~ msgstr "_Opdatér"
+
+#~ msgid "Mar_k as Resolved"
+#~ msgstr "Markér som l_øst"
+
+#~ msgid "Update"
+#~ msgstr "Opdatér"
+
+#~ msgid "Update working copy from version control"
+#~ msgstr "Opdatér arbejdskopi fra versionsstyring"
+
+#~ msgid "Push"
+#~ msgstr "Skub"
+
+#~ msgid "Add"
+#~ msgstr "Tilføj"
+
+#~ msgid "Remove"
+#~ msgstr "Fjern"
+
+#~ msgid "Mark as Resolved"
+#~ msgstr "Markér som løst"
+
+#~ msgid "Revert"
+#~ msgstr "Tilbagefør"
+
+#~ msgid "Delete from working copy"
+#~ msgstr "Slet fra arbejdskopi"
+
+#~ msgid "[%s] Scanning %s"
+#~ msgstr "[%s] Skanner %s"
+
+#~ msgid "Autodetect Encoding"
+#~ msgstr "Automatisk registrering af kodning"
+
+#~ msgid "Current Locale ({})"
+#~ msgstr "Nuværende lokalitet ({})"
+
+#~ msgid "Ln %i, Col %i"
+#~ msgstr "Lin. %i, kol. %i"
+
+#~ msgid "%s in %s"
+#~ msgstr "%s i %s"
+
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"

From edfcce910790df56e29edbc3e6c54a1aefc52487 Mon Sep 17 00:00:00 2001
From: Asier Sarasua Garmendia <asiersarasua@ni.eus>
Date: Fri, 8 Apr 2022 19:55:24 +0000
Subject: [PATCH 089/116] Update Basque translation

---
 po/eu.po | 821 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 452 insertions(+), 369 deletions(-)

diff --git a/po/eu.po b/po/eu.po
index 7841cfe5..19ec5e74 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -16,13 +16,13 @@
 # Larraitz Uriarte Erkoreka <larraitz.uriarte@gmail.com>, 2013.
 # Josune Zuzuarregui Lizarazu <josunezl@gmail.com>, 2013.
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2014.
-# Asier Sarasua Garmendia <asiersarasua@ni.eus>, 2019, 2021.
+# Asier Sarasua Garmendia <asiersarasua@ni.eus>, 2019, 2021, 2022.
 #
 msgid ""
 msgstr "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-02-13 05:47+0000\n"
-"PO-Revision-Date: 2021-04-05 10:00+0100\n"
+"POT-Creation-Date: 2022-04-03 09:43+0000\n"
+"PO-Revision-Date: 2022-04-08 10:00+0100\n"
 "Last-Translator: Asier Sarasua Garmendia <asiersarasua@ni.eus>\n"
 "Language-Team: Basque <librezale@librezale.eus>\n"
 "Language: eu\n"
@@ -32,7 +32,7 @@ msgstr "Project-Id-Version: meld master\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
-#: meld/resources/ui/appwindow.ui:9
+#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
 msgid "Meld"
 msgstr "Meld"
 
@@ -88,10 +88,20 @@ msgid "Default window fullscreen state"
 msgstr "Pantaila osoko leihoaren egoera lehenetsia"
 
 #: data/org.gnome.meld.gschema.xml:58
+msgid "Prefer application-wide dark theme"
+msgstr "Hobetsi aplikazio guztietarako gai iluna"
+
+#: data/org.gnome.meld.gschema.xml:59
+msgid ""
+"If true, the GTK dark theme variant will be used, if available. Note that "
+"this is separate from the syntax highlighting scheme."
+msgstr "Egia bada, GTK gaiaren aldaera iluna erabiliko da, erabilgarri badago. Kontuan izan hori eta sintaxia nabarmentzeko eskema bi gauza desberdin direla."
+
+#: data/org.gnome.meld.gschema.xml:65
 msgid "Additional automatically detected text encodings"
 msgstr "Automatikoki detektatutako testu-kodeketa gehigarriak"
 
-#: data/org.gnome.meld.gschema.xml:59
+#: data/org.gnome.meld.gschema.xml:66
 msgid ""
 "Meld will use these text encodings to try to decode loaded text files before "
 "trying any other encodings. In addition to the encodings in this list, UTF-8 "
@@ -99,180 +109,180 @@ msgid ""
 "may also be tried, depending on the user’s locale."
 msgstr "Meld-ek testu-kodeketa horiek erabiliko ditu kargatutako testuak deskodetzeko, beste edozein kodeketa probatu baino lehen. Zerrenda honetako kodeketez gain, UTF-8 eta uneko hizkuntza lehenetsiaren kodeketa ere erabiliko dira beti; beste kodeketa batzuk ere probatuak izan daitezke, erabiltzailearen hizkuntzaren arabera."
 
-#: data/org.gnome.meld.gschema.xml:66
+#: data/org.gnome.meld.gschema.xml:73
 msgid "Width of an indentation step"
 msgstr "Koskatzearen urratsaren zabalera"
 
-#: data/org.gnome.meld.gschema.xml:67
+#: data/org.gnome.meld.gschema.xml:74
 msgid "The number of spaces to use for a single indent step"
 msgstr "Koskatze bakar batean erabiliko den zuriuneen kopurua"
 
-#: data/org.gnome.meld.gschema.xml:71
+#: data/org.gnome.meld.gschema.xml:78
 msgid "Whether to indent using spaces or tabs"
 msgstr "Zuriuneak edo tabulazioak erabiliko diren koskatzean"
 
-#: data/org.gnome.meld.gschema.xml:72
+#: data/org.gnome.meld.gschema.xml:79
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr "TRUE (egia) bada, koskatze berri bakoitzean zuriuneak erabiliko dira tabulazioen ordez."
 
-#: data/org.gnome.meld.gschema.xml:76 meld/resources/ui/statusbar-menu.ui:5
+#: data/org.gnome.meld.gschema.xml:83 meld/resources/ui/statusbar-menu.ui:5
 msgid "Show line numbers"
 msgstr "Erakutsi lerro-zenbakiak"
 
-#: data/org.gnome.meld.gschema.xml:77
+#: data/org.gnome.meld.gschema.xml:84
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr "TRUE (egia) bada, lerroen zenbakiak erakutsiko dira fitxategien konparazioan."
 
-#: data/org.gnome.meld.gschema.xml:81
+#: data/org.gnome.meld.gschema.xml:88
 msgid "Highlight syntax"
 msgstr "Nabarmendu sintaxia"
 
-#: data/org.gnome.meld.gschema.xml:82
+#: data/org.gnome.meld.gschema.xml:89
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld’s own color "
 "highlighting, this is off by default."
 msgstr "Konparazioetan sintaxia nabarmenduko den edo ez. Meld-ek berezko kolorea duenez, modu lehenetsian aukera hau desgaituta dago."
 
-#: data/org.gnome.meld.gschema.xml:86
+#: data/org.gnome.meld.gschema.xml:93
 msgid "Color scheme to use for syntax highlighting"
 msgstr "Sintaxia nabarmentzeko erabilitako kolore-eskema"
 
-#: data/org.gnome.meld.gschema.xml:87
+#: data/org.gnome.meld.gschema.xml:94
 msgid "Used by GtkSourceView to determine colors for syntax highlighting"
 msgstr "GtkSourceView funtzioak erabilitakoa sintaxia nabarmentzeko koloreak zehazteko"
 
-#: data/org.gnome.meld.gschema.xml:91
+#: data/org.gnome.meld.gschema.xml:98
 msgid "Draw whitespace"
 msgstr "Marraztu zuriunea"
 
-#: data/org.gnome.meld.gschema.xml:92
+#: data/org.gnome.meld.gschema.xml:99
 msgid ""
 "If true, whitespace characters will be drawn in comparisons even if they are "
 "not in a changed area."
 msgstr "Egia bada, konparazioetan zuriuneak marraztuko dira, baita aldatu gabeko area batean daudenean ere."
 
-#: data/org.gnome.meld.gschema.xml:101
+#: data/org.gnome.meld.gschema.xml:108
 msgid "Wrap mode"
 msgstr "Itzulbiratze-modua"
 
-#: data/org.gnome.meld.gschema.xml:102
+#: data/org.gnome.meld.gschema.xml:109
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
 "('word')."
 msgstr "Fitxategien konparazioko lerroak itzulbiratu egingo dira ezarpen honen arabera: 'none' (bat ere ez), 'char' (edozer karaktere) edo 'word' (hitzen amaieran soilik)."
 
-#: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
+#: data/org.gnome.meld.gschema.xml:116 meld/resources/ui/statusbar-menu.ui:13
 msgid "Highlight current line"
 msgstr "Nabarmendu uneko lerroa"
 
-#: data/org.gnome.meld.gschema.xml:110
+#: data/org.gnome.meld.gschema.xml:117
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr "TRUE (egia) bada, kurtsorea kokatuta dagoen lerroa nabarmenduko da fitxategien konparazioan."
 
-#: data/org.gnome.meld.gschema.xml:114
+#: data/org.gnome.meld.gschema.xml:121
 msgid "Use the system default monospace font"
 msgstr "Erabili sistemaren zabalera finkoko letra-tipo lehenetsia"
 
-#: data/org.gnome.meld.gschema.xml:115
+#: data/org.gnome.meld.gschema.xml:122
 msgid ""
 "If false, custom-font will be used instead of the system monospace font."
 msgstr "Faltsua bada, letra-tipo pertsonalizatua erabiliko da sistemaren zabalera finkoko letra-tipoaren ordez."
 
-#: data/org.gnome.meld.gschema.xml:119
+#: data/org.gnome.meld.gschema.xml:126
 msgid "Custom font"
 msgstr "Letra-tipo pertsonalizatua"
 
-#: data/org.gnome.meld.gschema.xml:120
+#: data/org.gnome.meld.gschema.xml:127
 msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
 msgstr "Letra-tipo pertsonalizatua, kate bat bezala gordeta eta Pango letra-tipoaren azalpen gisa analizatuta."
 
-#: data/org.gnome.meld.gschema.xml:126
+#: data/org.gnome.meld.gschema.xml:133
 msgid "Show overview source map"
 msgstr "Erakutsi ikuspegi orokorraren iturburuaren mapa"
 
-#: data/org.gnome.meld.gschema.xml:127
+#: data/org.gnome.meld.gschema.xml:134
 msgid ""
 "If true, file comparisons will have paired source maps for compared files."
 msgstr "Egia bada, fitxategi-konparazioek parekatutako iturburu-mapak izango dituzte konparatutako fitxategietarako."
 
-#: data/org.gnome.meld.gschema.xml:132
+#: data/org.gnome.meld.gschema.xml:139
 msgid "Style of overview map"
 msgstr "Ikuspegi orokorraren maparen estiloa"
 
-#: data/org.gnome.meld.gschema.xml:133
+#: data/org.gnome.meld.gschema.xml:140
 msgid "Style options for how the overview map is displayed."
 msgstr "Ikuspegi orokorraren mapa bistaratzeko estilo-aukerak."
 
-#: data/org.gnome.meld.gschema.xml:139
+#: data/org.gnome.meld.gschema.xml:146
 msgid "Ignore blank lines when comparing files"
 msgstr "Ez ikusi egin lerro hutsei fitxategiak konparatzean"
 
-#: data/org.gnome.meld.gschema.xml:140
+#: data/org.gnome.meld.gschema.xml:147
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr "TRUE (egia) bada, lerro hutsak kendu egingo dira fitxategien arteko aldaketak nabarmentzean."
 
-#: data/org.gnome.meld.gschema.xml:147
+#: data/org.gnome.meld.gschema.xml:154
 msgid "Use the system default editor"
 msgstr "Erabili sistemaren editore lehenetsia"
 
-#: data/org.gnome.meld.gschema.xml:148
+#: data/org.gnome.meld.gschema.xml:155
 msgid ""
 "If false, custom-editor-command will be used instead of the system editor "
 "when opening files externally."
 msgstr "Faltsua bada, fitxategiak kanpoko editore pertsonalizatuarekin irekiko dira sistemaren editorea erabili ordez."
 
-#: data/org.gnome.meld.gschema.xml:152
+#: data/org.gnome.meld.gschema.xml:159
 msgid "The custom editor launch command"
 msgstr "Editore pertsonalizatua abiarazteko komandoa"
 
-#: data/org.gnome.meld.gschema.xml:153
+#: data/org.gnome.meld.gschema.xml:160
 msgid ""
 "The command used to launch a custom editor. Some limited templating is "
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
 msgstr "Editore pertsonalizatua abiaraztean erabiliko den komandoa. Txantiloi gutxi batzuk soilik daude onartuta: oraingoz '{file}' eta '{line}' tokenak bakarrik onartzen dira."
 
-#: data/org.gnome.meld.gschema.xml:159
+#: data/org.gnome.meld.gschema.xml:166
 msgid "Columns to display"
 msgstr "Zutabeak bistaratzeko"
 
-#: data/org.gnome.meld.gschema.xml:160
+#: data/org.gnome.meld.gschema.xml:167
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
 msgstr "Zutabeen izenen zerrenda karpetak konparatzean eta hauek bistaratu behar diren edo ez."
 
-#: data/org.gnome.meld.gschema.xml:164 meld/resources/ui/preferences.ui:935
+#: data/org.gnome.meld.gschema.xml:171 meld/resources/ui/preferences.ui:951
 msgid "Ignore symbolic links"
 msgstr "Ez ikusi egin esteka sinbolikoei"
 
-#: data/org.gnome.meld.gschema.xml:165
+#: data/org.gnome.meld.gschema.xml:172
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
 msgstr "TRUE (egia) bada, karpetak konparatzean ez jarraitu esteka sinbolikorik karpeten zuhaitza arakatzean."
 
-#: data/org.gnome.meld.gschema.xml:169
+#: data/org.gnome.meld.gschema.xml:176
 msgid "Use shallow comparison"
 msgstr "Erabili azaleko konparazioa"
 
-#: data/org.gnome.meld.gschema.xml:170
+#: data/org.gnome.meld.gschema.xml:177
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
 "different otherwise."
 msgstr "TRUE (egia) bada, karpeten konparazioak fitxategietan oinarritutako tamaina eta aldatze-datan bakarrik konparatuko dira, fitxategiak berdinak direla onartuko du haien tamaina eta aldatze-data bat datozenean, bestela desberdintzat joko ditu."
 
-#: data/org.gnome.meld.gschema.xml:174
+#: data/org.gnome.meld.gschema.xml:181
 msgid "File timestamp resolution"
 msgstr "Fitxategiaren data-zigiluaren bereizmena"
 
-#: data/org.gnome.meld.gschema.xml:175
+#: data/org.gnome.meld.gschema.xml:182
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
 "between two files before they’re considered to have different mtimes. This "
@@ -280,121 +290,121 @@ msgid ""
 "resolution."
 msgstr "Konparazioa aldatze-datan oinarritzean, aldatze-data desberdinak dituztela onartzeko bi fitxategien arteko gutxieneko desberdintasuna nanosegundotan neurtzen da hau. Erabilgarria da denbora-zigiluaren bereizmen desberdinak dituzten fitxategi-sistemetako fitxategiak konparatzeko."
 
-#: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
+#: data/org.gnome.meld.gschema.xml:186 meld/resources/ui/preferences.ui:852
 msgid "Apply text filters during folder comparisons"
 msgstr "Aplikatu testu-iragazkiak karpeten konparazioan zehar"
 
-#: data/org.gnome.meld.gschema.xml:180
+#: data/org.gnome.meld.gschema.xml:187
 msgid ""
 "If true, folder comparisons that compare file contents also apply active "
 "text filters and the blank line trimming option, and ignore newline "
 "differences."
 msgstr "Egia bada, fitxategi-edukiak konparatzen dituzten karpeten konparazioek testu-iragazki aktiboak eta lerro zurien moztea aplikatuko dituzte, eta lerro berrien diferentziak ezikusiko dituzte."
 
-#: data/org.gnome.meld.gschema.xml:184
+#: data/org.gnome.meld.gschema.xml:191
 msgid "File status filters"
 msgstr "Fitxategiaren egoeraren iragazkiak"
 
-#: data/org.gnome.meld.gschema.xml:185
+#: data/org.gnome.meld.gschema.xml:192
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr "Karpeten konparazioan fitxategi ikusgaiak iragazteko erabiliko den egoeren zerrenda."
 
-#: data/org.gnome.meld.gschema.xml:191
+#: data/org.gnome.meld.gschema.xml:198
 msgid "Show the version control console output"
 msgstr "Erakutsi bertsio-kontrolaren kontsolaren irteera"
 
-#: data/org.gnome.meld.gschema.xml:192
+#: data/org.gnome.meld.gschema.xml:199
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
 msgstr "TRUE (egia) bada, kontsolaren irteerako atala erakutsiko da bertsio-kontrolaren ikuspegian, bertsio-kontrolaren eragiketetan exekutatutako komandoak erakutsiz."
 
-#: data/org.gnome.meld.gschema.xml:196
+#: data/org.gnome.meld.gschema.xml:203
 msgid "Version control pane position"
 msgstr "Bertsio-kontrolaren panelaren posizioa"
 
-#: data/org.gnome.meld.gschema.xml:197
+#: data/org.gnome.meld.gschema.xml:204
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
 msgstr "Bertsio-kontrolaren zuhaitz nagusiaren altuera da, kontsolaren panela erakusten denean."
 
-#: data/org.gnome.meld.gschema.xml:201
+#: data/org.gnome.meld.gschema.xml:208
 msgid "Present version comparisons as left-local/right-remote"
 msgstr "Aurkeztu bertsioen konparazioa ezkerra-lokala/eskuina-urrunekoa gisa"
 
-#: data/org.gnome.meld.gschema.xml:202
+#: data/org.gnome.meld.gschema.xml:209
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
 "a left-is-theirs, right-is-mine scheme is used."
 msgstr "TRUE (egia) bada, bertsio-kontrolen konparazioak ezkerra-lokala, eskuina-urrunekoa eskema erabiliko du fitxategiak paneletan zer ordenarekin aurkeztuko diren zehazteko. Bestela, ezkerra-haiena, eskuina-nirea eskema erabiliko da."
 
-#: data/org.gnome.meld.gschema.xml:206
+#: data/org.gnome.meld.gschema.xml:213
 msgid "Order for files in three-way version control merge comparisons"
 msgstr "Fitxategien ordena hiruko bertsio-kontrolaren baturen konparazioan"
 
-#: data/org.gnome.meld.gschema.xml:207
+#: data/org.gnome.meld.gschema.xml:214
 msgid ""
 "Choices for file order are remote/merged/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
 "control view, so is used solely for merges/conflict resolution within Meld."
 msgstr "Fitxategiak ordenatzeko aukerak: 'remote/merged/local' eta 'local/merged/remote' dira. Hobespen honek soilik bertsio-kontrolaren ikuspegitik abiarazitako hiruko konparazioari eragiten dio, bakarrik batzean/gatazken ebazpenean erabiltzen da Meld-en."
 
-#: data/org.gnome.meld.gschema.xml:211
+#: data/org.gnome.meld.gschema.xml:218
 msgid "Show margin in commit message editor"
 msgstr "Erakutsi marjinak egikaritze-mezuen editorean"
 
-#: data/org.gnome.meld.gschema.xml:212
+#: data/org.gnome.meld.gschema.xml:219
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
 msgstr "TRUE (egia) bada, gida bat bistaratuko da bertsio-kontrolaren egikaritze-mezuaren editorean marjina zer zutabean dagoen erakusteko."
 
-#: data/org.gnome.meld.gschema.xml:216
+#: data/org.gnome.meld.gschema.xml:223
 msgid "Margin column in commit message editor"
 msgstr "Marjinaren zutabea egikaritze-mezuaren editorean"
 
-#: data/org.gnome.meld.gschema.xml:217
+#: data/org.gnome.meld.gschema.xml:224
 msgid ""
 "The column at which to show the margin in the version control commit message "
 "editor."
 msgstr "Bertsio-kontrolaren egikaritze-mezuaren editorean marjina zein zutabetan erakutsiko den."
 
-#: data/org.gnome.meld.gschema.xml:221
+#: data/org.gnome.meld.gschema.xml:228
 msgid "Automatically hard-wrap commit messages"
 msgstr "Itzulbiratze gogor automatikoa egikaritze-mezuetan"
 
-#: data/org.gnome.meld.gschema.xml:222
+#: data/org.gnome.meld.gschema.xml:229
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the commit margin before commit."
 msgstr "TRUE (egia) bada, bertsio-kontrolaren egikaritze-mezuen editoreak itzulbiratze gogorra (adib. lerro-jauzia txertatzea) landuko du egikaritzearen marjinan egikaritu aurretik."
 
-#: data/org.gnome.meld.gschema.xml:226
+#: data/org.gnome.meld.gschema.xml:233
 msgid "Version control status filters"
 msgstr "Bertsio-kontrolaren egoeraren iragazkiak"
 
-#: data/org.gnome.meld.gschema.xml:227
+#: data/org.gnome.meld.gschema.xml:234
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr "Bertsio-kontrolen konparazioan fitxategi ikusgaiak iragazteko erabiliko den egoeren zerrenda."
 
-#: data/org.gnome.meld.gschema.xml:241
+#: data/org.gnome.meld.gschema.xml:248
 msgid "Filename-based filters"
 msgstr "Fitxategi-izenean oinarritutako iragazkiak"
 
-#: data/org.gnome.meld.gschema.xml:242
+#: data/org.gnome.meld.gschema.xml:249
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
 msgstr "Aurredefinitutako fitxategi-izenetan oinarritutako iragazkien zerrenda. Aktibo dauden iragazkiek bat datozen fitxategiak kenduko dituzte karpeten konparaziotik."
 
-#: data/org.gnome.meld.gschema.xml:256
+#: data/org.gnome.meld.gschema.xml:263
 msgid "Text-based filters"
 msgstr "Testuan oinarritutako iragazkiak"
 
-#: data/org.gnome.meld.gschema.xml:257
+#: data/org.gnome.meld.gschema.xml:264
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
@@ -736,115 +746,111 @@ msgstr "Batu guztiak eskuinetik"
 msgid "Merge All"
 msgstr "Batu guztiak"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
-msgid "Add Synchronization Point"
-msgstr "Gehitu sinkronizazio-puntua"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
-msgid "Clear Synchronization Points"
-msgstr "Garbitu sinkronizazio-puntuak"
-
-#: meld/resources/gtk/menus.ui:103
+#: meld/resources/gtk/menus.ui:92
 msgid "Format as Patch…"
 msgstr "Formateatu adabaki gisa…"
 
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:101
 msgid "_Preferences"
 msgstr "_Hobespenak"
 
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:105
 msgid "Keyboard Shortcuts"
 msgstr "Laster-teklak"
 
-#: meld/resources/gtk/menus.ui:120
+#: meld/resources/gtk/menus.ui:109
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: meld/resources/gtk/menus.ui:125
+#: meld/resources/gtk/menus.ui:114
 msgid "_About Meld"
 msgstr "Meld aplikazioari _buruz"
 
-#: meld/resources/gtk/menus.ui:138
+#: meld/resources/gtk/menus.ui:127
 msgid "File status"
 msgstr "Fitxategiaren egoera"
 
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:129
 msgid "Same"
 msgstr "Berdinak"
 
-#: meld/resources/gtk/menus.ui:144
+#: meld/resources/gtk/menus.ui:133
 msgid "New"
 msgstr "Berria"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:137 meld/resources/gtk/menus.ui:160
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Aldatze-data"
 
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:147
 msgid "Ignore filename case"
 msgstr "Ez ikusi egin fitxategi-izeneko maiuskula/minuskulei"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:151
+msgid "Normalize Unicode paths"
+msgstr "Normalizatu Unicode bide-izenak"
+
+#: meld/resources/gtk/menus.ui:164
 msgid "Normal"
 msgstr "Arrunta"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:168 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Bertsiorik gabekoa"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Ez ikusi eginda"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:179
 msgid "Flatten folders"
 msgstr "Berdindu karpetak"
 
 #: meld/resources/ui/about-dialog.ui:8
 msgid ""
 "Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2019 Kai Willadsen"
+"Copyright © 2009-2021 Kai Willadsen"
 msgstr "Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2019 Kai Willadsen"
+"Copyright © 2009-2021 Kai Willadsen"
 
 #: meld/resources/ui/about-dialog.ui:14
 msgid "translator-credits"
-msgstr "Asier Sarasua Garmendia <asier.sarasua@gmail.com>"
+msgstr "translator-credits"
 
-#: meld/resources/ui/appwindow.ui:29
+#: meld/resources/ui/appwindow.ui:30
 msgid "Start a new comparison"
 msgstr "Konparazio berri bat hasten du"
 
-#: meld/resources/ui/appwindow.ui:45
+#: meld/resources/ui/appwindow.ui:46
 msgid "Open a recent comparison"
 msgstr "Ireki azken aldiko konparazio bat"
 
-#: meld/resources/ui/appwindow.ui:73
+#: meld/resources/ui/appwindow.ui:74
 msgid "Go to the previous change"
 msgstr "Aurreko aldaketara joaten da"
 
-#: meld/resources/ui/appwindow.ui:93
+#: meld/resources/ui/appwindow.ui:94
 msgid "Go to the next change"
 msgstr "Hurrengo aldaketara joaten da"
 
-#: meld/resources/ui/appwindow.ui:123
+#: meld/resources/ui/appwindow.ui:124
 msgid "Go to the previous conflict"
 msgstr "Aurreko gatazkara joaten da"
 
-#: meld/resources/ui/appwindow.ui:143
+#: meld/resources/ui/appwindow.ui:144
 msgid "Go to the next conflict"
 msgstr "Hurrengo gatazkara joaten da"
 
-#: meld/resources/ui/appwindow.ui:192
+#: meld/resources/ui/appwindow.ui:193
 msgid "Version Filters"
 msgstr "Bertsio-iragazkiak"
 
-#: meld/resources/ui/appwindow.ui:207 meld/resources/ui/preferences.ui:1456
+#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472
 msgid "File Filters"
 msgstr "Fitxategi-iragazkiak"
 
-#: meld/resources/ui/appwindow.ui:222 meld/resources/ui/preferences.ui:1641
+#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657
 msgid "Text Filters"
 msgstr "Testu-iragazkiak"
 
@@ -857,7 +863,7 @@ msgid "Column Name"
 msgstr "Zutabe-izena"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
 msgid "_Remove"
 msgstr "_Kendu"
 
@@ -914,33 +920,58 @@ msgid "_Compare selected files"
 msgstr "_Konparatu hautatutako fitxategiak"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+msgid "_Mark selected file"
+msgstr "_Markatu hautatutako fitxategia"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Compare _with marked file"
+msgstr "K_onparatu markatutako fitxategiarekin"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "Kopiatu e_zkerrean"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "Kopiatu e_skuinean"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "E_zabatu hautatutakoa"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "Tolestu errekurtsiboki"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "Zabaldu errekurtsiboki"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "_Ireki kanpotik"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "Kopiatu fitxategi-_adabakiak"
 
+#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
+#: meld/resources/ui/dirdiff.ui:117
+msgid "Select folder to open in this pane"
+msgstr "Hautatu panel honetan irekiko den karpeta"
+
+#: meld/resources/ui/dirdiff.ui:43
+msgid "Folder 1"
+msgstr "1. karpeta"
+
+#: meld/resources/ui/dirdiff.ui:84
+msgid "Folder 2"
+msgstr "2. karpeta"
+
+#: meld/resources/ui/dirdiff.ui:125
+msgid "Folder 3"
+msgstr "3. karpeta"
+
 #: meld/resources/ui/encoding-selector.ui:31
 msgid "Search text encoding…"
 msgstr "Bilaketa-testuaren kodeketa…"
@@ -997,38 +1028,46 @@ msgstr "_Kopiatu"
 msgid "_Paste"
 msgstr "_Itsatsi"
 
-#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
-#: meld/resources/ui/filediff.ui:171
+#: meld/resources/ui/filediff-menus.ui:54
+msgid "Open Containing Folder"
+msgstr "Ireki karpeta edukitzailea"
+
+#: meld/resources/ui/filediff-menus.ui:58
+msgid "Copy Full Path"
+msgstr "Kopiatu bide-izen osoa"
+
+#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
+#: meld/resources/ui/filediff.ui:169
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
 msgstr "Fitxategi honetan ezin da idatzi. Hala ere, hemen klik egin eta fitxategia desblokea dezakezu, aldaketak egiteko. Aldaketa horiek, ordea, beste fitxategi batean gorde behar dira."
 
-#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
-#: meld/resources/ui/filediff.ui:185
-msgid "Open file in this pane"
-msgstr "Ireki fitxategia panel honetan"
-
-#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
-#: meld/resources/ui/filediff.ui:194
+#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
+#: meld/resources/ui/filediff.ui:183
 msgid "Save file in this pane"
 msgstr "Gorde panel honetako fitxategia"
 
-#: meld/resources/ui/filediff.ui:73
+#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
+#: meld/resources/ui/filediff.ui:209
+msgid "Open file in this pane"
+msgstr "Ireki fitxategia panel honetan"
+
+#: meld/resources/ui/filediff.ui:79
 msgid "File 3"
 msgstr "3. fitxategia"
 
-#: meld/resources/ui/filediff.ui:142
+#: meld/resources/ui/filediff.ui:148
 msgid "File 2"
 msgstr "2. fitxategia"
 
-#: meld/resources/ui/filediff.ui:207
+#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148
 msgid "File 1"
 msgstr "1. fitxategia"
 
 #. Create icon and filename CellRenderer
-#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
-#: meld/dirdiff.py:517
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
+#: meld/dirdiff.py:602
 msgid "Name"
 msgstr "Izena"
 
@@ -1040,7 +1079,7 @@ msgstr "Eredua"
 msgid "Add new filter"
 msgstr "Gehitu iragazkia"
 
-#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18
 msgid "_Add"
 msgstr "_Gehitu"
 
@@ -1068,7 +1107,7 @@ msgstr "Itzulbiratuta"
 msgid "Replace _All"
 msgstr "Ordeztu _denak"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1067 meld/iohelpers.py:113
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "_Ordeztu"
 
@@ -1080,7 +1119,7 @@ msgstr "Txandakatu bilatzeko modua eta bilatu eta ordezteko modua"
 msgid "Search highlight mode…"
 msgstr "Bilaketaren nabarmentze modua…"
 
-#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:349
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342
 #: meld/newdifftab.py:49
 msgid "New comparison"
 msgstr "Beste konparazio bat"
@@ -1097,43 +1136,43 @@ msgstr "Karpeta"
 msgid "Version control"
 msgstr "Bertsio-kontrola"
 
-#: meld/resources/ui/new-diff-tab.ui:235 meld/resources/ui/new-diff-tab.ui:352
+#: meld/resources/ui/new-diff-tab.ui:236 meld/resources/ui/new-diff-tab.ui:357
 msgid "_3-way comparison"
 msgstr "_3 sarrerako konparazioa"
 
-#: meld/resources/ui/new-diff-tab.ui:254
+#: meld/resources/ui/new-diff-tab.ui:256
 msgid "Select First File"
 msgstr "Hautatu lehen fitxategia"
 
-#: meld/resources/ui/new-diff-tab.ui:267
+#: meld/resources/ui/new-diff-tab.ui:270
 msgid "Select Second File"
 msgstr "Hautatu bigarren fitxategia"
 
-#: meld/resources/ui/new-diff-tab.ui:281
+#: meld/resources/ui/new-diff-tab.ui:285
 msgid "Select Third File"
 msgstr "Hautatu hirugarren fitxategia"
 
-#: meld/resources/ui/new-diff-tab.ui:316
+#: meld/resources/ui/new-diff-tab.ui:321
 msgid "Select First Folder"
 msgstr "Hautatu lehen karpeta"
 
-#: meld/resources/ui/new-diff-tab.ui:329
+#: meld/resources/ui/new-diff-tab.ui:334
 msgid "Select Second Folder"
 msgstr "Hautatu bigarren karpeta"
 
-#: meld/resources/ui/new-diff-tab.ui:343
+#: meld/resources/ui/new-diff-tab.ui:348
 msgid "Select Third Folder"
 msgstr "Hautatu hirugarren karpeta"
 
-#: meld/resources/ui/new-diff-tab.ui:393
+#: meld/resources/ui/new-diff-tab.ui:399
 msgid "Select A Version-Controlled Folder"
 msgstr "Hautatu bertsio-kontrola duen karpeta bat"
 
-#: meld/resources/ui/new-diff-tab.ui:442
+#: meld/resources/ui/new-diff-tab.ui:448
 msgid "_Blank comparison"
 msgstr "_Garbitu konparazioa"
 
-#: meld/resources/ui/new-diff-tab.ui:459
+#: meld/resources/ui/new-diff-tab.ui:466
 msgid "C_ompare"
 msgstr "_Konparatu"
 
@@ -1169,6 +1208,18 @@ msgstr "Erdiko eta eskuineko panelak"
 msgid "_Reverse patch direction"
 msgstr "_Alderantzikatu adabakiaren norabidea"
 
+#: meld/resources/ui/path-label.ui:23
+msgid "Path"
+msgstr "Bide-izena"
+
+#: meld/resources/ui/path-label.ui:62
+msgid "Copy Path"
+msgstr "Kopiatu bide-izena"
+
+#: meld/resources/ui/path-label.ui:78
+msgid "Open Folder"
+msgstr "Ireki karpeta"
+
 #: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
 msgid "Preferences"
 msgstr "Hobespenak"
@@ -1220,121 +1271,125 @@ msgid "Show w_hitespace"
 msgstr "Erakutsi _zuriuneak"
 
 #: meld/resources/ui/preferences.ui:381
+msgid "Prefer dark theme"
+msgstr "Hobetsi gai iluna"
+
+#: meld/resources/ui/preferences.ui:397
 msgid "Use s_yntax highlighting"
 msgstr "Nabarmendu _sintaxia"
 
-#: meld/resources/ui/preferences.ui:404
+#: meld/resources/ui/preferences.ui:420
 msgid "Syntax highlighting color scheme:"
 msgstr "Sintaxia nabarmentzeko kolore-eskema:"
 
-#: meld/resources/ui/preferences.ui:469
+#: meld/resources/ui/preferences.ui:485
 msgid "Code Overview"
 msgstr "Kodearen ikuspegi orokorra"
 
-#: meld/resources/ui/preferences.ui:506
+#: meld/resources/ui/preferences.ui:522
 msgid "Show overview map"
 msgstr "Erakutsi ikuspegi orokorra"
 
-#: meld/resources/ui/preferences.ui:529
+#: meld/resources/ui/preferences.ui:545
 msgid "Overview map style:"
 msgstr "Ikuspegi orokorraren maparen estiloa:"
 
-#: meld/resources/ui/preferences.ui:596
+#: meld/resources/ui/preferences.ui:612
 msgid "External Editor"
 msgstr "Kanpoko editorea"
 
-#: meld/resources/ui/preferences.ui:632
+#: meld/resources/ui/preferences.ui:648
 msgid "Use _default system editor"
 msgstr "Erabili sistema-editore _lehenetsia"
 
-#: meld/resources/ui/preferences.ui:655
+#: meld/resources/ui/preferences.ui:671
 msgid "Edito_r command:"
 msgstr "Edito_rearen komandoa:"
 
-#: meld/resources/ui/preferences.ui:711
+#: meld/resources/ui/preferences.ui:727
 msgid "Editor"
 msgstr "Editorea"
 
-#: meld/resources/ui/preferences.ui:732
+#: meld/resources/ui/preferences.ui:748
 msgid "Shallow Comparison"
 msgstr "Azaleko konparazioa"
 
-#: meld/resources/ui/preferences.ui:768
+#: meld/resources/ui/preferences.ui:784
 msgid "C_ompare files based only on size and timestamp"
 msgstr "_Konparatu fitxategiak tamainan eta data-zigiluan soilik oinarrituta"
 
-#: meld/resources/ui/preferences.ui:791
+#: meld/resources/ui/preferences.ui:807
 msgid "_Timestamp resolution:"
 msgstr "_Data-zigiluaren bereizmena:"
 
-#: meld/resources/ui/preferences.ui:855
+#: meld/resources/ui/preferences.ui:871
 msgid "Note: enabling text filters may make comparing large files much slower"
 msgstr "Oharra: testu-iragazkiak gaitzen badira, fitxategi handien konparazioak motelagoak izango dira"
 
-#: meld/resources/ui/preferences.ui:904
+#: meld/resources/ui/preferences.ui:920
 msgid "Symbolic Links"
 msgstr "Esteka sinbolikoak"
 
-#: meld/resources/ui/preferences.ui:972
+#: meld/resources/ui/preferences.ui:988
 msgid "Visible Columns"
 msgstr "Zutabe ikusgaiak"
 
-#: meld/resources/ui/preferences.ui:1039
+#: meld/resources/ui/preferences.ui:1055
 msgid "Folder Comparisons"
 msgstr "Karpeten konparazioa"
 
-#: meld/resources/ui/preferences.ui:1061
+#: meld/resources/ui/preferences.ui:1077
 msgid "Version Comparisons"
 msgstr "Bertsioen konparazioa"
 
-#: meld/resources/ui/preferences.ui:1104
+#: meld/resources/ui/preferences.ui:1120
 msgid "_Order when comparing file revisions:"
 msgstr "_Ordenatu fitxategien gainbegiraketa konparatzean"
 
-#: meld/resources/ui/preferences.ui:1151
+#: meld/resources/ui/preferences.ui:1167
 msgid "Order when _merging files:"
 msgstr "Ordenatu fitxategiak _batzean:"
 
-#: meld/resources/ui/preferences.ui:1219
+#: meld/resources/ui/preferences.ui:1235
 msgid "Commit Messages"
 msgstr "Egikaritze-mezuak"
 
-#: meld/resources/ui/preferences.ui:1260
+#: meld/resources/ui/preferences.ui:1276
 msgid "Show _right margin at:"
 msgstr "Erakutsi e_skuineko marjina hemen:"
 
-#: meld/resources/ui/preferences.ui:1301
+#: meld/resources/ui/preferences.ui:1317
 msgid "Automatically _break lines at right margin on commit"
 msgstr "_Hautsi lerroak automatikoki eskuineko marjinan egikaritzean"
 
-#: meld/resources/ui/preferences.ui:1351
+#: meld/resources/ui/preferences.ui:1367
 msgid "Version Control"
 msgstr "Bertsio-kontrola"
 
-#: meld/resources/ui/preferences.ui:1373
+#: meld/resources/ui/preferences.ui:1389
 msgid "Filename filters"
 msgstr "Fitxategi-izenen iragazkiak"
 
-#: meld/resources/ui/preferences.ui:1411
+#: meld/resources/ui/preferences.ui:1427
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
 "separated by spaces."
 msgstr "Direktorioak konparatzean, izenaren arabera iragaz ditzakezu fitxategiak eta direktorioak. Zuriunez bereizia dagoen shell motako komodinen zerrenda bat da eredu bakoitza."
 
-#: meld/resources/ui/preferences.ui:1478
+#: meld/resources/ui/preferences.ui:1494
 msgid "Change trimming"
 msgstr "Aldatu moztea"
 
-#: meld/resources/ui/preferences.ui:1514
+#: meld/resources/ui/preferences.ui:1530
 msgid "Trim blank line differences from the start and end of changes"
 msgstr "Moztu lerro hutsen diferentziak aldaketen hasieran eta amaieran"
 
-#: meld/resources/ui/preferences.ui:1558
+#: meld/resources/ui/preferences.ui:1574
 msgid "Text filters"
 msgstr "Testu-iragazkiak"
 
-#: meld/resources/ui/preferences.ui:1596
+#: meld/resources/ui/preferences.ui:1612
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -1343,47 +1398,47 @@ msgid ""
 "details."
 msgstr "Fitxategiak konparatzean, aldaketa mota batzuei ez ikusi egin diezaiekezu. Eredu bakoitza python-eko adierazpen erregular bat da, eta bat datorren testua kate huts batekin ordezten du konparazioa egin aurretik. Adierazpenak taldeak badauzka, taldeak soilik ordezkatzen dira. Informazio gehiago behar izanez gero, ikusi erabiltzailearen eskuliburua."
 
-#: meld/resources/ui/preferences.ui:1687
+#: meld/resources/ui/preferences.ui:1703
 msgid "Left is remote, right is local"
 msgstr "Ezkerra urrunekoa da, eskuina lokalekoa"
 
-#: meld/resources/ui/preferences.ui:1691
+#: meld/resources/ui/preferences.ui:1707
 msgid "Left is local, right is remote"
 msgstr "Ezkerra lokalekoa da, eskuina urrunekoa"
 
-#: meld/resources/ui/preferences.ui:1705
+#: meld/resources/ui/preferences.ui:1721
 msgid "Simple change map"
 msgstr "Aldaketa sinpleen mapa"
 
-#: meld/resources/ui/preferences.ui:1709
+#: meld/resources/ui/preferences.ui:1725
 msgid "Compact source map"
 msgstr "Iturburu trinkoaren mapa"
 
-#: meld/resources/ui/preferences.ui:1713
+#: meld/resources/ui/preferences.ui:1729
 msgid "Full source map"
 msgstr "Iturburu osoaren mapa"
 
-#: meld/resources/ui/preferences.ui:1727
+#: meld/resources/ui/preferences.ui:1743
 msgid "Remote, merge, local"
 msgstr "Urrunekoa, batu, lokala"
 
-#: meld/resources/ui/preferences.ui:1731
+#: meld/resources/ui/preferences.ui:1747
 msgid "Local, merge, remote"
 msgstr "Lokala, batu, urrunekoa"
 
-#: meld/resources/ui/preferences.ui:1753
+#: meld/resources/ui/preferences.ui:1769
 msgid "1ns (ext4)"
 msgstr "1ns (ext4)"
 
-#: meld/resources/ui/preferences.ui:1757
+#: meld/resources/ui/preferences.ui:1773
 msgid "100ns (NTFS)"
 msgstr "100ns (NTFS)"
 
-#: meld/resources/ui/preferences.ui:1761
+#: meld/resources/ui/preferences.ui:1777
 msgid "1s (ext2/ext3)"
 msgstr "1s (ext2/ext3)"
 
-#: meld/resources/ui/preferences.ui:1765
+#: meld/resources/ui/preferences.ui:1781
 msgid "2s (VFAT)"
 msgstr "2s (VFAT)"
 
@@ -1427,12 +1482,12 @@ msgstr "Gordetzen ez baduzu, aldaketak betiko galduko dira."
 msgid "Close _without Saving"
 msgstr "Itxi gorde _gabe"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1066
-#: meld/iohelpers.py:55 meld/iohelpers.py:112
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "_Utzi"
 
-#: meld/resources/ui/save-confirm-dialog.ui:52
+#: meld/resources/ui/save-confirm-dialog.ui:55
 msgid "_Save"
 msgstr "_Gorde"
 
@@ -1452,95 +1507,67 @@ msgstr "_Konparatu"
 msgid "Co_mmit…"
 msgstr "Eg_ikaritu…"
 
-#: meld/resources/ui/vcview-menus.ui:15
-msgid "_Update"
-msgstr "_Eguneratu"
-
-#: meld/resources/ui/vcview-menus.ui:30
+#: meld/resources/ui/vcview-menus.ui:26
 msgid "Re_vert"
 msgstr "_Leheneratu"
 
-#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+#: meld/resources/ui/vcview-menus.ui:30
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: meld/resources/ui/vcview-menus.ui:41
-msgid "Mar_k as Resolved"
-msgstr "_Markatu ebatzi gisa"
+#: meld/resources/ui/vcview-menus.ui:37
+msgid "Resolve Conflict"
+msgstr "Ebatzi gatazka"
 
-#: meld/resources/ui/vcview.ui:73
-msgid "Commit…"
-msgstr "Egikaritu…"
-
-#: meld/resources/ui/vcview.ui:74
+#: meld/resources/ui/vcview.ui:16
 msgid "Commit changes to version control"
 msgstr "Egikaritu aldaketak bertsio-kontrolera"
 
-#: meld/resources/ui/vcview.ui:86
-msgid "Update"
-msgstr "Eguneratu"
-
-#: meld/resources/ui/vcview.ui:87
-msgid "Update working copy from version control"
-msgstr "Eguneratu laneko kopia bertsio-kontroletik"
+#: meld/resources/ui/vcview.ui:21
+msgid "Commit…"
+msgstr "Egikaritu…"
 
-#: meld/resources/ui/vcview.ui:99
-msgid "Push"
-msgstr "Bultzatu"
+#: meld/resources/ui/vcview.ui:38
+msgid "Pull remote changes to the local repository"
+msgstr "Deskargatu (pull) aldaketak biltegi lokal batera"
 
-#: meld/resources/ui/vcview.ui:100
+#: meld/resources/ui/vcview.ui:51
 msgid "Push local changes to remote"
 msgstr "Bidali lokaleko aldaketak urrunekora"
 
-#: meld/resources/ui/vcview.ui:112
-msgid "Add"
-msgstr "Gehitu"
-
-#: meld/resources/ui/vcview.ui:113
+#: meld/resources/ui/vcview.ui:74
 msgid "Add to version control"
 msgstr "Gehitu bertsio-kontrolari"
 
-#: meld/resources/ui/vcview.ui:125
-msgid "Remove"
-msgstr "Kendu"
-
-#: meld/resources/ui/vcview.ui:126
+#: meld/resources/ui/vcview.ui:87
 msgid "Remove from version control"
 msgstr "Kendu bertsio-kontroletik"
 
-#: meld/resources/ui/vcview.ui:138
-msgid "Mark as Resolved"
-msgstr "Markatu ebatzita bezala"
+#: meld/resources/ui/vcview.ui:100
+msgid "Revert working copy to original state"
+msgstr "Leheneratu laneko kopia jatorrizko egoerara"
 
-#: meld/resources/ui/vcview.ui:139
+#: meld/resources/ui/vcview.ui:113
 msgid "Mark as resolved in version control"
 msgstr "Markatu ebatzita bezala bertsio-kontrolean"
 
-#: meld/resources/ui/vcview.ui:151
-msgid "Revert"
-msgstr "Alderantzikatu"
+#: meld/resources/ui/vcview.ui:140
+msgid "Open version controlled folder in this pane"
+msgstr "Ireki bertsioen kontrola duen karpeta panel honetan"
 
-#: meld/resources/ui/vcview.ui:152
-msgid "Revert working copy to original state"
-msgstr "Leheneratu laneko kopia jatorrizko egoerara"
-
-#: meld/resources/ui/vcview.ui:165
-msgid "Delete from working copy"
-msgstr "Ezabatu laneko kopiatik"
-
-#: meld/resources/ui/vcview.ui:220
+#: meld/resources/ui/vcview.ui:229
 msgid "Location"
 msgstr "Kokalekua"
 
-#: meld/resources/ui/vcview.ui:229
+#: meld/resources/ui/vcview.ui:238
 msgid "Status"
 msgstr "Egoera"
 
-#: meld/resources/ui/vcview.ui:238
+#: meld/resources/ui/vcview.ui:247
 msgid "Extra"
 msgstr "Gehigarria"
 
-#: meld/resources/ui/vcview.ui:270
+#: meld/resources/ui/vcview.ui:279
 msgid "Console output"
 msgstr "Kontsolaren irteera"
 
@@ -1565,100 +1592,110 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:538 meld/preferences.py:132
+#: meld/dirdiff.py:623 meld/preferences.py:132
 msgid "Size"
 msgstr "Tamaina"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:546 meld/preferences.py:133
+#: meld/dirdiff.py:631 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Aldatze-ordua"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:639 meld/preferences.py:134
+msgid "Modification time (ISO)"
+msgstr "Aldaketa-ordua (ISO)"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:554 meld/preferences.py:134
+#: meld/dirdiff.py:647 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Baimenak"
 
-#: meld/dirdiff.py:778 meld/dirdiff.py:802
+#: meld/dirdiff.py:900
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (eskaneatzen…)"
+
+#: meld/dirdiff.py:932 meld/dirdiff.py:964
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Eskaneatzen {folder}"
 
-#: meld/dirdiff.py:942
+#: meld/dirdiff.py:1100
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Egina"
 
-#: meld/dirdiff.py:951
+#: meld/dirdiff.py:1113
 msgid "Folder {} is being compared to itself"
 msgstr "{} karpeta bere buruarekin konparatzen"
 
-#: meld/dirdiff.py:957
+#: meld/dirdiff.py:1119
 msgid "Folders have no differences"
 msgstr "Karpetek ez dute diferentziarik"
 
-#: meld/dirdiff.py:959
+#: meld/dirdiff.py:1121
 msgid "Contents of scanned files in folders are identical."
 msgstr "Karpetetan eskaneatutako fitxategien edukiak berdinak dira."
 
-#: meld/dirdiff.py:961
+#: meld/dirdiff.py:1123
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr "Karpetetan eskaneatutako fitxategiek berdinak dirudite, baina edukiak ez dira eskaneatu."
 
-#: meld/dirdiff.py:964
+#: meld/dirdiff.py:1126
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Fitxategi-iragazkiak indarrean daudenez, ez dira fitxategi guztiak eskaneatu."
 
-#: meld/dirdiff.py:966
+#: meld/dirdiff.py:1128
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Testu-fitxategiak indarrean daudenez, beharbada edukien diferentziak ezkutuan geratu dira."
 
-#: meld/dirdiff.py:982 meld/filediff.py:1874
+#: meld/dirdiff.py:1144 meld/filediff.py:1980
 msgid "Hide"
 msgstr "Ezkutatu"
 
-#: meld/dirdiff.py:984 meld/filediff.py:1876 meld/filediff.py:1906
-#: meld/filediff.py:1908 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1146 meld/filediff.py:1982 meld/filediff.py:2012
+#: meld/filediff.py:2014 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Ezkutatu"
 
-#: meld/dirdiff.py:993
+#: meld/dirdiff.py:1155
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Erroreak gertatu dira karpeta hau eskaneatzean"
 
-#: meld/dirdiff.py:994
+#: meld/dirdiff.py:1156
 msgid "Files with invalid encodings found"
 msgstr "Kodeketa baliogabea duten fitxategiak aurkitu dira"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:996
+#: meld/dirdiff.py:1158
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Fitxategi batzuen kodeketa okerra da. Hauek dira fitxategi-izenak:"
 
-#: meld/dirdiff.py:998
+#: meld/dirdiff.py:1160
 msgid "Files hidden by case insensitive comparison"
 msgstr "Fitxategiren bat ezkutatu da, konparazioan maiuskulak/minuskulak ez bereizteagatik"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1000
+#: meld/dirdiff.py:1162
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
 msgstr "Maiuskulak/minuskulak bereizten ez dituen konparazio bat egiten ari zara, maiuskulak/minuskulak bereizten dituen fitxategi-sistema batean. Karpeta honetako fitxategi hauek ezkutatu dira:"
 
-#: meld/dirdiff.py:1011
+#: meld/dirdiff.py:1173
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}” ezkutatu du “{second_file}” fitxategiak"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1235
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ordeztu “%s” karpeta?"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1237
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1666,11 +1703,11 @@ msgid ""
 msgstr "Badago izen bereko beste karpeta bat “%s”(e)n.\n"
 "Lehendik dagoen karpeta ordezten baduzu, bertako fitxategi guztiak galdu egingo dira."
 
-#: meld/dirdiff.py:1085
+#: meld/dirdiff.py:1250
 msgid "Error copying file"
 msgstr "Errorea fitxategia kopiatzean"
 
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1251
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1682,101 +1719,121 @@ msgstr "Ezin da {source} kopiatu\n"
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1111 meld/vcview.py:759
+#: meld/dirdiff.py:1276 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Errorea {} ezabatzean"
 
-#: meld/dirdiff.py:1604
+#: meld/dirdiff.py:1819
 msgid "No folder"
 msgstr "Karpetarik ez"
 
-#: meld/filediff.py:1144
+#: meld/filediff.py:1156
 msgid "Comparison results will be inaccurate"
 msgstr "Konparazioaren emaitzak ez dira zehatzak izango"
 
-#: meld/filediff.py:1146
+#: meld/filediff.py:1158
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
 msgstr "Iragazki batek fitxategiko lerro kopurua aldatu du, eta hori ez dago onartuta. Konparazioa ez da zehatza izango."
 
-#: meld/filediff.py:1218
+#: meld/filediff.py:1230
 msgid "Mark conflict as resolved?"
 msgstr "Markatu gatazka ebatzita bezala?"
 
-#: meld/filediff.py:1220
+#: meld/filediff.py:1232
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "Gatazka ongi ebatzi bada, ebatzita bezala marka dezakezu orain."
 
-#: meld/filediff.py:1222
+#: meld/filediff.py:1235
 msgid "Cancel"
 msgstr "Utzi"
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1236
 msgid "Mark _Resolved"
 msgstr "Markatu _ebatzita"
 
-#: meld/filediff.py:1556
+#: meld/filediff.py:1427 meld/filediff.py:1443
+msgid "Add Synchronization Point"
+msgstr "Gehitu sinkronizazio-puntua"
+
+#: meld/filediff.py:1431
+msgid "Remove Synchronization Point"
+msgstr "Kendu sinkronizazio-puntua"
+
+#: meld/filediff.py:1435
+msgid "Move Synchronization Point"
+msgstr "Aldatu lekuz sinkronizazio-puntua"
+
+#: meld/filediff.py:1439
+msgid "Match Synchronization Point"
+msgstr "Parekatu sinkronizazio-puntua"
+
+#: meld/filediff.py:1463
+msgid "Clear Synchronization Points"
+msgstr "Garbitu sinkronizazio-puntuak"
+
+#: meld/filediff.py:1654
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Arazo bat egon da '%s' fitxategia irekitzean."
 
-#: meld/filediff.py:1564
+#: meld/filediff.py:1663
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Badirudi %s fitxategia bitarra dela."
 
-#: meld/filediff.py:1566
+#: meld/filediff.py:1665
 msgid "Do you want to open the file using the default application?"
 msgstr "Fitxategia ireki nahi duzu aplikazio lehenetsia erabilita?"
 
-#: meld/filediff.py:1568
+#: meld/filediff.py:1667
 msgid "Open"
 msgstr "Ireki"
 
-#: meld/filediff.py:1582
+#: meld/filediff.py:1689
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Fitxategiak konbinatzen"
 
-#: meld/filediff.py:1596
+#: meld/filediff.py:1703
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Diferentziak kalkulatzen"
 
-#: meld/filediff.py:1657
+#: meld/filediff.py:1763
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "'%s' fitxategia diskoan aldatu da"
 
-#: meld/filediff.py:1658
+#: meld/filediff.py:1764
 msgid "Do you want to reload the file?"
 msgstr "Nahi duzu fitxategia berriro kargatzea?"
 
-#: meld/filediff.py:1660
+#: meld/filediff.py:1766
 msgid "_Reload"
 msgstr "Bir_kargatu"
 
-#: meld/filediff.py:1830
+#: meld/filediff.py:1936
 msgid "File {} is being compared to itself"
 msgstr "{} fitxategia bere buruarekin konparatzen"
 
-#: meld/filediff.py:1839
+#: meld/filediff.py:1945
 msgid "Files are identical"
 msgstr "Fitxategiak berdinak dira"
 
-#: meld/filediff.py:1852
+#: meld/filediff.py:1958
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
 msgstr "Testu-iragazkiak erabiltzen ari dira fitxategiak, eta baliteke iragazki horiek fitxategien arteko diferentziak ezkutatzea. Iragazi gabeko fitxategiak konparatu nahi dituzu?"
 
-#: meld/filediff.py:1857
+#: meld/filediff.py:1963
 msgid "Files differ in line endings only"
 msgstr "Fitxategien diferentziak lerro-amaieretan soilik daude"
 
-#: meld/filediff.py:1859
+#: meld/filediff.py:1965
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1784,74 +1841,74 @@ msgid ""
 msgstr "Fitxategiak berdinak dira, lerro-amaieretan salbu:\n"
 "%s"
 
-#: meld/filediff.py:1879
+#: meld/filediff.py:1985
 msgid "Show without filters"
 msgstr "Erakutsi iragazkirik gabe"
 
-#: meld/filediff.py:1901
+#: meld/filediff.py:2007
 msgid "Change highlighting incomplete"
 msgstr "Aldaketen nabarmentzea osatu gabe"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:2008
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
 msgstr "Aldaketa batzuk ez dira nabarmendu handiegiak direlako. Derrigor diezaiokezu Meld-i aldaketa handiak nabarmentzeko, nahiz eta halakoetan motelagoa izan."
 
-#: meld/filediff.py:1910
+#: meld/filediff.py:2016
 msgid "Keep highlighting"
 msgstr "Mantendu nabarmentzea"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:2018
 msgid "_Keep highlighting"
 msgstr "_Mantendu nabarmentzea"
 
-#: meld/filediff.py:1925
+#: meld/filediff.py:2031
 msgid "Saving failed"
 msgstr "Gordetzeak huts egin du"
 
-#: meld/filediff.py:1926
+#: meld/filediff.py:2032
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
 msgstr "Kopiatu edozein aldaketa kritiko beste programa edo fitxategi batean, datuak galtzea eragozteko."
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:2041
 msgid "Save Left Pane As"
 msgstr "Gorde ezkerreko panela honela"
 
-#: meld/filediff.py:1937
+#: meld/filediff.py:2043
 msgid "Save Middle Pane As"
 msgstr "Gorde erdiko panela honela"
 
-#: meld/filediff.py:1939
+#: meld/filediff.py:2045
 msgid "Save Right Pane As"
 msgstr "Gorde eskuineko panela honela"
 
-#: meld/filediff.py:1950
+#: meld/filediff.py:2056
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "'%s' fitxategia diskoan aldatu egin da (ireki zenetik)"
 
-#: meld/filediff.py:1952
+#: meld/filediff.py:2058
 msgid "If you save it, any external changes will be lost."
 msgstr "Gordetzen baduzu, kanpoko edozer aldaketa galdu egingo da."
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:2061
 msgid "Save Anyway"
 msgstr "Gorde dena den"
 
-#: meld/filediff.py:1956
+#: meld/filediff.py:2062
 msgid "Don’t Save"
 msgstr "Ez gorde"
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2104
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
 msgstr "“{}” fitxategiak dituen zenbait karaktere ezin dira kodetu “{}” kodeketa erabilita."
 
-#: meld/filediff.py:2002 meld/patchdialog.py:138
+#: meld/filediff.py:2108 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1859,52 +1916,48 @@ msgid ""
 msgstr "Ezin izan da fitxategia gorde honakoagatik:\n"
 "%s"
 
-#: meld/filediff.py:2006 meld/patchdialog.py:137
+#: meld/filediff.py:2112 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Ezin izan da %s fitxategia gorde."
 
-#: meld/filediff.py:2067
-msgid "Open File"
-msgstr "Ireki fitxategia"
-
-#: meld/filediff.py:2420
+#: meld/filediff.py:2522
 msgid "Live comparison updating disabled"
 msgstr "Konparazioaren zuzeneko eguneraketa desgaituta"
 
-#: meld/filediff.py:2421
+#: meld/filediff.py:2523
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
 "resume when synchronization points are cleared."
 msgstr "Konparazioen zuzeneko eguneraketa desgaitu egiten da sinkronizazio-puntuak aktibo daudenean. Hala ere, konparazioak eskuz freskatu ditzakezu, eta zuzeneko eguneraketak jarraitu egingo dute sinkronizazio-puntuak garbitzen direnean."
 
-#: meld/iohelpers.py:40
+#: meld/iohelpers.py:41
 msgid "Deleting remote folders is not supported"
 msgstr "Urruneko karpetak ezabatzea ez dago onartuta"
 
-#: meld/iohelpers.py:42
+#: meld/iohelpers.py:43
 msgid "Not a file or directory"
 msgstr "Ez da fitxategi bat edo direktorio bat"
 
-#: meld/iohelpers.py:46
+#: meld/iohelpers.py:47
 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
 msgstr "“{}” ezin da zakarrontzira bota. Berehala ezabatu nahi duzu?"
 
-#: meld/iohelpers.py:51
+#: meld/iohelpers.py:52
 msgid "This remote location does not support sending items to the trash."
 msgstr "Urruneko kokaleku horrek ez du elementuak zakarrontzira botatzea onartzen."
 
-#: meld/iohelpers.py:56
+#: meld/iohelpers.py:58
 msgid "_Delete Permanently"
 msgstr "_Ezabatu behin betiko"
 
-#: meld/iohelpers.py:106
+#: meld/iohelpers.py:110
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Ordeztu “%s” fitxategia?"
 
-#: meld/iohelpers.py:108
+#: meld/iohelpers.py:112
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1912,124 +1965,124 @@ msgid ""
 msgstr "“%s” kokalekuan badago izen hori duen fitxategia lehendik.\n"
 "Hori ordezten baduzu, bere eduki guztia galduko da."
 
-#: meld/meldapp.py:183
+#: meld/meldapp.py:188
 msgid "wrong number of arguments supplied to --diff"
 msgstr "--diff: emandako argumentu kopurua okerra da"
 
-#: meld/meldapp.py:188
+#: meld/meldapp.py:193
 msgid "Start with an empty window"
 msgstr "Hasi leiho huts batekin"
 
-#: meld/meldapp.py:189 meld/meldapp.py:191
+#: meld/meldapp.py:194 meld/meldapp.py:196
 msgid "file"
 msgstr "fitxategia"
 
-#: meld/meldapp.py:189 meld/meldapp.py:193
+#: meld/meldapp.py:194 meld/meldapp.py:198
 msgid "folder"
 msgstr "karpeta"
 
-#: meld/meldapp.py:190
+#: meld/meldapp.py:195
 msgid "Start a version control comparison"
 msgstr "Hasi bertsio-kontrolaren konparazioa"
 
-#: meld/meldapp.py:192
+#: meld/meldapp.py:197
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Hasi bi edo hiru sarrerako fitxategi-konparazioa"
 
-#: meld/meldapp.py:194
+#: meld/meldapp.py:199
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Hasi bi edo hiru sarrerako karpeten konparazioa"
 
-#: meld/meldapp.py:237
+#: meld/meldapp.py:242
 #, python-format
 msgid "Error: %s\n"
 msgstr "Errorea: %s\n"
 
-#: meld/meldapp.py:244
+#: meld/meldapp.py:249
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld fitxategiak eta direktorioak konparatzeko tresna bat da."
 
-#: meld/meldapp.py:248
+#: meld/meldapp.py:253
 msgid "Set label to use instead of file name"
 msgstr "Ezarri etiketa bat fitxategi-izenaren ordez erabiltzeko"
 
-#: meld/meldapp.py:251
+#: meld/meldapp.py:256
 msgid "Open a new tab in an already running instance"
 msgstr "Ireki beste fitxa bat dagoeneko martxan dagoen instantzia batean"
 
-#: meld/meldapp.py:254
+#: meld/meldapp.py:259
 msgid "Automatically compare all differing files on startup"
 msgstr "Automatikoki konparatu fitxategi desberdin guztiak abioan"
 
-#: meld/meldapp.py:257
+#: meld/meldapp.py:262
 msgid "Ignored for compatibility"
 msgstr "Ez ikusi egin zaio, bateragarritasuna dela eta"
 
-#: meld/meldapp.py:261
+#: meld/meldapp.py:266
 msgid "Set the target file for saving a merge result"
 msgstr "Ezarri helburuko fitxategia emaitza konbinatua gordetzeko"
 
-#: meld/meldapp.py:264
+#: meld/meldapp.py:269
 msgid "Automatically merge files"
 msgstr "Automatikoki konbinatu fitxategiak"
 
-#: meld/meldapp.py:268
+#: meld/meldapp.py:273
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Kargatu gordetako konparazioa Meld-en konparazio-fitxategi batetik"
 
-#: meld/meldapp.py:272
+#: meld/meldapp.py:277
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Sortu diferentzia-fitxa emandako fitxategi edo karpetentzako"
 
-#: meld/meldapp.py:292
+#: meld/meldapp.py:297
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "argumentu gehiegi (0-3 ordez, %d jasota)"
 
-#: meld/meldapp.py:295
+#: meld/meldapp.py:300
 msgid "can’t auto-merge less than 3 files"
 msgstr "ezin dira automatikoki konbinatu 3 fitxategi baino gehiago"
 
-#: meld/meldapp.py:297
+#: meld/meldapp.py:302
 msgid "can’t auto-merge directories"
 msgstr "ezin dira automatikoki konbinatu direktorioak"
 
-#: meld/meldapp.py:312
+#: meld/meldapp.py:317
 msgid "Error reading saved comparison file"
 msgstr "Errorea gertatu da gordetako konparazio-fitxategia irakurtzean"
 
-#: meld/meldapp.py:329
+#: meld/meldapp.py:334
 #, python-format
 msgid "invalid path or URI “%s”"
 msgstr "baliogabeko bide-izena edo URIa: “%s”"
 
-#: meld/meldapp.py:336
+#: meld/meldapp.py:341
 msgid "remote folder “{}” not supported"
 msgstr "“{}” urruneko karpeta ez dago onartuta"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: meld/meldbuffer.py:114
+#: meld/meldbuffer.py:115
 msgid "<unnamed>"
 msgstr "<izenik gabea>"
 
-#: meld/melddoc.py:61
+#: meld/melddoc.py:124
 msgid "untitled"
 msgstr "izengabea"
 
-#: meld/meldwindow.py:155
+#: meld/meldwindow.py:158
 msgid "Filename"
 msgstr "Fitxategia"
 
-#: meld/meldwindow.py:384
+#: meld/meldwindow.py:381
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Hiru fitxategi behar dira automatikoki konbinatzeko, honenbeste daude: %r"
 
-#: meld/meldwindow.py:406
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Ezin dira konparatu fitxategiak eta direktorioak nahasian"
 
-#: meld/misc.py:150
+#: meld/misc.py:154
 msgid ""
 "{}\n"
 "\n"
@@ -2040,7 +2093,7 @@ msgstr "{}\n"
 "Meld-ek errore kritikoa aurkitu du honakoa exekutatzean:\n"
 "<tt>{}</tt>"
 
-#: meld/misc.py:201
+#: meld/misc.py:205
 msgid "[None]"
 msgstr "[Bat ere ez]"
 
@@ -2052,7 +2105,7 @@ msgstr "etiketa"
 msgid "pattern"
 msgstr "eredua"
 
-#: meld/recent.py:104
+#: meld/recent.py:111
 msgid "Version control:"
 msgstr "Bertsio-kontrola:"
 
@@ -2069,6 +2122,10 @@ msgstr "{name} ({charset})"
 msgid "Plain Text"
 msgstr "Testu arrunta"
 
+#: meld/ui/pathlabel.py:36
+msgid "Unnamed file"
+msgstr "Izenik gabeko fitxategia"
+
 #. Abbreviation for line, column so that it will fit in the status bar
 #: meld/ui/statusbar.py:125
 #, python-brace-format
@@ -2091,9 +2148,7 @@ msgstr "Ez da fitxategirik egikarituko"
 msgid "{unpushed_commits} in {unpushed_branches}"
 msgstr "{unpushed_commits} hemen: {unpushed_branches}"
 
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: meld/vc/git.py:94 meld/vc/git.py:103
+#: meld/vc/git.py:94 meld/vc/git.py:104
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -2107,16 +2162,16 @@ msgid_plural "%d branches"
 msgstr[0] "adar %d"
 msgstr[1] "%d adar"
 
-#: meld/vc/git.py:344
+#: meld/vc/git.py:345
 #, python-brace-format
 msgid "Mode changed from {old_mode} to {new_mode}"
 msgstr "Modua aldatu da {old_mode} modutik {new_mode} modura"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Partially staged"
 msgstr "Partzialki gordailuan gordea"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Staged"
 msgstr "Gordailuan gordea"
 
@@ -2175,105 +2230,139 @@ msgstr "Falta da"
 msgid "Not present"
 msgstr "Ez dago"
 
+#: meld/vc/_vc.py:82
+msgid "Scanning…"
+msgstr "Eskaneatzen..."
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
-#: meld/vcview.py:333
+#: meld/vcview.py:334
 #, python-format
 msgid "%(name)s (not found)"
 msgstr "%(name)s (ez da aurkitu)"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: meld/vcview.py:337
+#: meld/vcview.py:338
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s ez daude instalatuta)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: meld/vcview.py:341
+#: meld/vcview.py:342
 #, python-format
 msgid "%(name)s (invalid repository)"
 msgstr "%(name)s (biltegi baliogabea)"
 
-#: meld/vcview.py:355
+#: meld/vcview.py:356
 msgid "No valid version control system found in this folder"
 msgstr "Ez da baliozko bertsio-kontrol sistemarik aurkitu karpeta honetan"
 
-#: meld/vcview.py:357
+#: meld/vcview.py:358
 msgid "Choose which version control system to use"
 msgstr "Aukeratu zer bertsio-kontrol sistema erabiliko den"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:411
+#: meld/vcview.py:412
 #, python-brace-format
 msgid "Location: {path}"
 msgstr "Kokalekua: {path}"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:418
+#: meld/vcview.py:419
 msgid "Scanning repository"
 msgstr "Biltegia eskaneatzen"
 
-#: meld/vcview.py:447
+#: meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "%s eskaneatzen"
 
-#: meld/vcview.py:486
+#: meld/vcview.py:487
 msgid "(Empty)"
 msgstr "(Hutsa)"
 
-#: meld/vcview.py:533
+#: meld/vcview.py:535
 #, python-format
 msgid "%s — local"
 msgstr "%s — lokala"
 
-#: meld/vcview.py:534
+#: meld/vcview.py:536
 #, python-format
 msgid "%s — remote"
 msgstr "%s — urrunekoa"
 
-#: meld/vcview.py:542
+#: meld/vcview.py:544
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (lokala, batu, urrunekoa)"
 
-#: meld/vcview.py:547
+#: meld/vcview.py:549
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (urrunekoa, batu, lokala)"
 
-#: meld/vcview.py:558
+#: meld/vcview.py:560
 #, python-format
 msgid "%s — repository"
 msgstr "%s — biltegia"
 
-#: meld/vcview.py:564
+#: meld/vcview.py:566
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (lanekoa, biltegia)"
 
-#: meld/vcview.py:568
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (biltegia, lanekoa)"
 
-#: meld/vcview.py:730
+#: meld/vcview.py:735
 msgid "Remove folder and all its files?"
 msgstr "Kendu karpeta eta bere fitxategi guztiak?"
 
-#: meld/vcview.py:732
+#: meld/vcview.py:737
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
 msgstr "Honek hautatutako fitxategi eta karpeta guztiak, baita hautatutako karpeten barruan dauden fitxategi guztiak ere, bertsio-kontroletik kenduko ditu."
 
-#: meld/vcview.py:845
+#: meld/vcview.py:850
 msgid "Clear"
 msgstr "Garbitu"
 
+#~ msgid "_Update"
+#~ msgstr "_Eguneratu"
+
+#~ msgid "Mar_k as Resolved"
+#~ msgstr "_Markatu ebatzi gisa"
+
+#~ msgid "Update"
+#~ msgstr "Eguneratu"
+
+#~ msgid "Update working copy from version control"
+#~ msgstr "Eguneratu laneko kopia bertsio-kontroletik"
+
+#~ msgid "Push"
+#~ msgstr "Bultzatu"
+
+#~ msgid "Add"
+#~ msgstr "Gehitu"
+
+#~ msgid "Remove"
+#~ msgstr "Kendu"
+
+#~ msgid "Mark as Resolved"
+#~ msgstr "Markatu ebatzita bezala"
+
+#~ msgid "Revert"
+#~ msgstr "Alderantzikatu"
+
+#~ msgid "Delete from working copy"
+#~ msgstr "Ezabatu laneko kopiatik"
+
 #~ msgid "Cannot import: "
 #~ msgstr "Ezin da inportatu: "
 
@@ -2645,9 +2734,6 @@ msgstr "Garbitu"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgid "Only one version control system found in this folder"
-#~ msgstr "Bertsio-kontrol bakar bat aurkituta karpeta honetan"
-
 #~ msgid "Error removing %s"
 #~ msgstr "Errorea %s kentzean"
 
@@ -2873,9 +2959,6 @@ msgstr "Garbitu"
 #~ msgid "_Browse..."
 #~ msgstr "_Arakatu..."
 
-#~ msgid "Path"
-#~ msgstr "Bide-izena"
-
 #~ msgid "Path to file"
 #~ msgstr "Fitxategiaren bide-izena"
 

From 94c2c54c77abe8ca21ddcc94368f5bb47ad89512 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 10 Apr 2022 09:06:14 +1000
Subject: [PATCH 090/116] dirdiff: Simplify folder reversing logic

---
 meld/dirdiff.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 88aef33b..14a43264 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -1582,9 +1582,7 @@ def action_copy_right(self, *args):
         self.copy_selected(1)
 
     def action_swap(self, *args):
-        folder_x = self.folders[0]
-        self.folders[0] = self.folders[1]
-        self.folders[1] = folder_x
+        self.folders.reverse()
         self.refresh()
 
     def action_delete(self, *args):

From 6137c625a0e463511b04a68e5f4d638f780a5287 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 10 Apr 2022 09:13:01 +1000
Subject: [PATCH 091/116] Move swap action to the View submenu

This is probably not going to be a commonly used item, and given that
we have assigned it a shortcut already, I think grouping it in with
somewhat-related menu items makes sense.
---
 meld/resources/gtk/help-overlay.ui |  2 +-
 meld/resources/gtk/menus.ui        | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/meld/resources/gtk/help-overlay.ui b/meld/resources/gtk/help-overlay.ui
index ea84acf3..36e2ea79 100644
--- a/meld/resources/gtk/help-overlay.ui
+++ b/meld/resources/gtk/help-overlay.ui
@@ -58,7 +58,7 @@
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
                 <property name="accelerator">&lt;alt&gt;backslash</property>
-                <property name="title" translatable="yes" context="shortcut window">Swap the two panes</property>
+                <property name="title" translatable="yes" context="shortcut window">Swap left and right panes</property>
               </object>
             </child>
           </object>
diff --git a/meld/resources/gtk/menus.ui b/meld/resources/gtk/menus.ui
index c01980ff..14140a2e 100644
--- a/meld/resources/gtk/menus.ui
+++ b/meld/resources/gtk/menus.ui
@@ -50,13 +50,6 @@
         <attribute name="action">view.find-replace</attribute>
       </item>
     </section>
-    <section>
-      <attribute name="id">swap-section</attribute>
-      <item>
-        <attribute name="label" translatable="yes">Swap two panes</attribute>
-        <attribute name="action">view.swap-2-panes</attribute>
-      </item>
-    </section>
     <section>
       <submenu>
         <attribute name="label" translatable="yes">View</attribute>
@@ -75,6 +68,13 @@
             <attribute name="action">view.lock-scrolling</attribute>
           </item>
         </section>
+        <section>
+          <attribute name="id">swap-section</attribute>
+          <item>
+            <attribute name="label" translatable="yes">Swap left and right panes</attribute>
+            <attribute name="action">view.swap-2-panes</attribute>
+          </item>
+        </section>
       </submenu>
       <submenu>
         <attribute name="label" translatable="yes">Comparison</attribute>

From a0e7a6a72cbf3c0835250e2f44d8b130c9dbd680 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 10 Apr 2022 11:00:09 +1000
Subject: [PATCH 092/116] filediff: Apply custom labels to new pathlabel
 widgets (#662)

This is a behaviour change from where we used to apply labels, in so far
as we used to have labels in the title bar and the tab label, and now
have them in the (sometimes hidden) tab label and the per-pane file
label. Arguably the per-pane location is much closer to the original
intention of the --label argument, but either way we need to have some
use of the provided labels in the relatively normal situation where a
single pane comparison has been opened from e.g., a VC difftool launch.
---
 meld/filediff.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meld/filediff.py b/meld/filediff.py
index b167449c..92101429 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1474,9 +1474,10 @@ def get_mark():
 
     def set_labels(self, labels):
         labels = labels[:self.num_panes]
-        for label, buf in zip(labels, self.textbuffer):
+        for label, buf, flabel in zip(labels, self.textbuffer, self.filelabel):
             if label:
                 buf.data.label = label
+                flabel.props.custom_label = label
 
     def set_merge_output_file(self, gfile):
         if self.num_panes < 2:

From 912eb6807ffe4ae2c64d37711494f3e2de95692a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Sun, 10 Apr 2022 13:03:42 +0200
Subject: [PATCH 093/116] Update Polish translation

---
 po/pl.po | 289 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 149 insertions(+), 140 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 7699ca2d..e404fea8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-03-27 00:52+0000\n"
-"PO-Revision-Date: 2022-03-27 14:50+0200\n"
+"POT-Creation-Date: 2022-04-09 23:19+0000\n"
+"PO-Revision-Date: 2022-04-10 13:03+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -542,218 +542,223 @@ msgctxt "shortcut window"
 msgid "Fullscreen"
 msgstr "Pełny ekran"
 
-#: meld/resources/gtk/help-overlay.ui:63
+#: meld/resources/gtk/help-overlay.ui:61
+msgctxt "shortcut window"
+msgid "Swap left and right panes"
+msgstr "Wymiana lewego i prawego panelu"
+
+#: meld/resources/gtk/help-overlay.ui:70
 msgctxt "shortcut window"
 msgid "Panes"
 msgstr "Panele"
 
-#: meld/resources/gtk/help-overlay.ui:68
+#: meld/resources/gtk/help-overlay.ui:75
 msgctxt "shortcut window"
 msgid "Previous comparison pane"
 msgstr "Poprzedni panel porównania"
 
-#: meld/resources/gtk/help-overlay.ui:75
+#: meld/resources/gtk/help-overlay.ui:82
 msgctxt "shortcut window"
 msgid "Next comparison pane"
 msgstr "Następny panel porównania"
 
-#: meld/resources/gtk/help-overlay.ui:84
+#: meld/resources/gtk/help-overlay.ui:91
 msgctxt "shortcut window"
 msgid "Changes"
 msgstr "Zmiany"
 
-#: meld/resources/gtk/help-overlay.ui:89
+#: meld/resources/gtk/help-overlay.ui:96
 msgctxt "shortcut window"
 msgid "Go to previous change"
 msgstr "Przejście do poprzedniej zmiany"
 
-#: meld/resources/gtk/help-overlay.ui:96
+#: meld/resources/gtk/help-overlay.ui:103
 msgctxt "shortcut window"
 msgid "Go to next change"
 msgstr "Przejście do następnej zmiany"
 
-#: meld/resources/gtk/help-overlay.ui:105
+#: meld/resources/gtk/help-overlay.ui:112
 msgctxt "shortcut window"
 msgid "Tabs"
 msgstr "Karty"
 
-#: meld/resources/gtk/help-overlay.ui:110
+#: meld/resources/gtk/help-overlay.ui:117
 msgctxt "shortcut window"
 msgid "Go to previous tab"
 msgstr "Przejście do poprzedniej karty"
 
-#: meld/resources/gtk/help-overlay.ui:117
+#: meld/resources/gtk/help-overlay.ui:124
 msgctxt "shortcut window"
 msgid "Go to next tab"
 msgstr "Przejście do następnej karty"
 
-#: meld/resources/gtk/help-overlay.ui:124
+#: meld/resources/gtk/help-overlay.ui:131
 msgctxt "shortcut window"
 msgid "Switch to tab"
 msgstr "Przełączenie na kartę"
 
-#: meld/resources/gtk/help-overlay.ui:131
+#: meld/resources/gtk/help-overlay.ui:138
 msgctxt "shortcut window"
 msgid "Move tab left"
 msgstr "Przesunięcie karty w lewo"
 
-#: meld/resources/gtk/help-overlay.ui:138
+#: meld/resources/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
 msgid "Move tab right"
 msgstr "Przesunięcie karty w prawo"
 
-#: meld/resources/gtk/help-overlay.ui:147
+#: meld/resources/gtk/help-overlay.ui:154
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Edycja"
 
-#: meld/resources/gtk/help-overlay.ui:152
+#: meld/resources/gtk/help-overlay.ui:159
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "Cofnięcie"
 
-#: meld/resources/gtk/help-overlay.ui:159
+#: meld/resources/gtk/help-overlay.ui:166
 msgctxt "shortcut window"
 msgid "Redo"
 msgstr "Ponowienie"
 
-#: meld/resources/gtk/help-overlay.ui:166
+#: meld/resources/gtk/help-overlay.ui:173
 msgctxt "shortcut window"
 msgid "Cut"
 msgstr "Wycięcie"
 
-#: meld/resources/gtk/help-overlay.ui:173
+#: meld/resources/gtk/help-overlay.ui:180
 msgctxt "shortcut window"
 msgid "Copy"
 msgstr "Skopiowanie"
 
-#: meld/resources/gtk/help-overlay.ui:180
+#: meld/resources/gtk/help-overlay.ui:187
 msgctxt "shortcut window"
 msgid "Paste"
 msgstr "Wklejenie"
 
-#: meld/resources/gtk/help-overlay.ui:187
+#: meld/resources/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Find"
 msgstr "Wyszukiwanie"
 
-#: meld/resources/gtk/help-overlay.ui:194
+#: meld/resources/gtk/help-overlay.ui:201
 msgctxt "shortcut window"
 msgid "Find Next"
 msgstr "Wyszukanie następnego"
 
-#: meld/resources/gtk/help-overlay.ui:201
+#: meld/resources/gtk/help-overlay.ui:208
 msgctxt "shortcut window"
 msgid "Find Previous"
 msgstr "Wyszukanie poprzedniego"
 
-#: meld/resources/gtk/help-overlay.ui:208
+#: meld/resources/gtk/help-overlay.ui:215
 msgctxt "shortcut window"
 msgid "Replace"
 msgstr "Zamiana"
 
-#: meld/resources/gtk/help-overlay.ui:217
+#: meld/resources/gtk/help-overlay.ui:224
 msgctxt "shortcut window"
 msgid "File comparison"
 msgstr "Porównanie plików"
 
-#: meld/resources/gtk/help-overlay.ui:222
+#: meld/resources/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Save current file"
 msgstr "Zapisanie bieżącego pliku"
 
-#: meld/resources/gtk/help-overlay.ui:229
+#: meld/resources/gtk/help-overlay.ui:236
 msgctxt "shortcut window"
 msgid "Save current file to new path"
 msgstr "Zapisanie bieżącego pliku w nowej ścieżce"
 
-#: meld/resources/gtk/help-overlay.ui:236
+#: meld/resources/gtk/help-overlay.ui:243
 msgctxt "shortcut window"
 msgid "Save all files in comparison"
 msgstr "Zapisanie wszystkich plików w porównaniu"
 
-#: meld/resources/gtk/help-overlay.ui:243
+#: meld/resources/gtk/help-overlay.ui:250
 msgctxt "shortcut window"
 msgid "Previous conflict"
 msgstr "Poprzedni konflikt"
 
-#: meld/resources/gtk/help-overlay.ui:250
+#: meld/resources/gtk/help-overlay.ui:257
 msgctxt "shortcut window"
 msgid "Next conflict"
 msgstr "Następny konflikt"
 
-#: meld/resources/gtk/help-overlay.ui:257
+#: meld/resources/gtk/help-overlay.ui:264
 msgctxt "shortcut window"
 msgid "Push change to left"
 msgstr "Przeniesienie zmiany na lewo"
 
-#: meld/resources/gtk/help-overlay.ui:264
+#: meld/resources/gtk/help-overlay.ui:271
 msgctxt "shortcut window"
 msgid "Push change to right"
 msgstr "Przeniesienie zmiany na prawo"
 
-#: meld/resources/gtk/help-overlay.ui:271
+#: meld/resources/gtk/help-overlay.ui:278
 msgctxt "shortcut window"
 msgid "Pull change from left"
 msgstr "Wprowadzenie zmiany z lewej"
 
-#: meld/resources/gtk/help-overlay.ui:278
+#: meld/resources/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Pull change from right"
 msgstr "Wprowadzenie zmiany z prawej"
 
-#: meld/resources/gtk/help-overlay.ui:285
+#: meld/resources/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Copy change above left"
 msgstr "Skopiowanie zmiany powyżej fragmentu po lewej"
 
-#: meld/resources/gtk/help-overlay.ui:292
+#: meld/resources/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Copy change below left"
 msgstr "Skopiowanie zmiany poniżej fragmentu po lewej"
 
-#: meld/resources/gtk/help-overlay.ui:299
+#: meld/resources/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Copy change above right"
 msgstr "Skopiowanie zmiany powyżej fragmentu po prawej"
 
-#: meld/resources/gtk/help-overlay.ui:306
+#: meld/resources/gtk/help-overlay.ui:313
 msgctxt "shortcut window"
 msgid "Copy change below right"
 msgstr "Skopiowanie zmiany poniżej fragmentu po prawej"
 
-#: meld/resources/gtk/help-overlay.ui:313
-#: meld/resources/gtk/help-overlay.ui:341
+#: meld/resources/gtk/help-overlay.ui:320
+#: meld/resources/gtk/help-overlay.ui:348
 msgctxt "shortcut window"
 msgid "Delete change"
 msgstr "Usunięcie zmiany"
 
-#: meld/resources/gtk/help-overlay.ui:322
+#: meld/resources/gtk/help-overlay.ui:329
 msgctxt "shortcut window"
 msgid "Folder comparison"
 msgstr "Porównywanie katalogów"
 
-#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
 msgid "Copy to left"
 msgstr "Skopiowanie na lewo"
 
-#: meld/resources/gtk/help-overlay.ui:334
+#: meld/resources/gtk/help-overlay.ui:341
 msgctxt "shortcut window"
 msgid "Copy to right"
 msgstr "Skopiowanie na prawo"
 
-#: meld/resources/gtk/help-overlay.ui:350
+#: meld/resources/gtk/help-overlay.ui:357
 msgctxt "shortcut window"
 msgid "Version control comparison"
 msgstr "Porównanie systemu kontroli wersji"
 
-#: meld/resources/gtk/help-overlay.ui:355
+#: meld/resources/gtk/help-overlay.ui:362
 msgctxt "shortcut window"
 msgid "Commit to version control"
 msgstr "Zatwierdzenie zmiany w systemie kontroli wersji"
 
-#: meld/resources/gtk/help-overlay.ui:362
+#: meld/resources/gtk/help-overlay.ui:369
 msgctxt "shortcut window"
 msgid "Show/hide console output"
 msgstr "Wyświetlenie/ukrycie wyjścia konsoli"
@@ -810,80 +815,84 @@ msgstr "Konsola systemu kontroli wersji"
 msgid "Lock scrolling"
 msgstr "Synchronizacja przewijania"
 
-#: meld/resources/gtk/menus.ui:73
+#: meld/resources/gtk/menus.ui:74
+msgid "Swap left and right panes"
+msgstr "Wymień lewy i prawy panel"
+
+#: meld/resources/gtk/menus.ui:80
 msgid "Comparison"
 msgstr "Porównanie"
 
-#: meld/resources/gtk/menus.ui:77
+#: meld/resources/gtk/menus.ui:84
 msgid "Merge All from Left"
 msgstr "Scal wszystkie z lewej"
 
-#: meld/resources/gtk/menus.ui:81
+#: meld/resources/gtk/menus.ui:88
 msgid "Merge All from Right"
 msgstr "Scal wszystkie z prawej"
 
-#: meld/resources/gtk/menus.ui:85
+#: meld/resources/gtk/menus.ui:92
 msgid "Merge All"
 msgstr "Scal wszystkie"
 
-#: meld/resources/gtk/menus.ui:92
+#: meld/resources/gtk/menus.ui:99
 msgid "Format as Patch…"
 msgstr "Utwórz poprawkę…"
 
-#: meld/resources/gtk/menus.ui:101
+#: meld/resources/gtk/menus.ui:108
 msgid "_Preferences"
 msgstr "P_referencje"
 
-#: meld/resources/gtk/menus.ui:105
+#: meld/resources/gtk/menus.ui:112
 msgid "Keyboard Shortcuts"
 msgstr "Skróty klawiszowe"
 
-#: meld/resources/gtk/menus.ui:109
+#: meld/resources/gtk/menus.ui:116
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: meld/resources/gtk/menus.ui:114
+#: meld/resources/gtk/menus.ui:121
 msgid "_About Meld"
 msgstr "_O programie"
 
-#: meld/resources/gtk/menus.ui:127
+#: meld/resources/gtk/menus.ui:134
 msgid "File status"
 msgstr "Stan pliku"
 
-#: meld/resources/gtk/menus.ui:129
+#: meld/resources/gtk/menus.ui:136
 msgid "Same"
 msgstr "Takie same"
 
-#: meld/resources/gtk/menus.ui:133
+#: meld/resources/gtk/menus.ui:140
 msgid "New"
 msgstr "Nowe"
 
-#: meld/resources/gtk/menus.ui:137 meld/resources/gtk/menus.ui:160
+#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Zmodyfikowane"
 
-#: meld/resources/gtk/menus.ui:147
+#: meld/resources/gtk/menus.ui:154
 msgid "Ignore filename case"
 msgstr "Ignorowanie wielkości liter w nazwach plików"
 
-#: meld/resources/gtk/menus.ui:151
+#: meld/resources/gtk/menus.ui:158
 msgid "Normalize Unicode paths"
 msgstr "Normalizowanie ścieżek Unicode"
 
-#: meld/resources/gtk/menus.ui:164
+#: meld/resources/gtk/menus.ui:171
 msgid "Normal"
 msgstr "Zwykłe"
 
-#: meld/resources/gtk/menus.ui:168 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Poza systemem kontroli wersji"
 
-#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Zignorowane"
 
-#: meld/resources/gtk/menus.ui:179
+#: meld/resources/gtk/menus.ui:186
 msgid "Flatten folders"
 msgstr "Uprość wyświetlaną strukturę katalogów"
 
@@ -1153,7 +1162,7 @@ msgstr "1. plik"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:602
+#: meld/dirdiff.py:603
 msgid "Name"
 msgstr "Nazwa"
 
@@ -1193,7 +1202,7 @@ msgstr "Automatyczny powrót do początku"
 msgid "Replace _All"
 msgstr "Zamień _wszystkie"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "Z_amień"
 
@@ -1581,7 +1590,7 @@ msgstr ""
 msgid "Close _without Saving"
 msgstr "Zamknij _bez zapisywania"
 
-#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229
 #: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "_Anuluj"
@@ -1691,53 +1700,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:623 meld/preferences.py:132
+#: meld/dirdiff.py:624 meld/preferences.py:132
 msgid "Size"
 msgstr "Rozmiar"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:631 meld/preferences.py:133
+#: meld/dirdiff.py:632 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Czas modyfikacji"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:639 meld/preferences.py:134
+#: meld/dirdiff.py:640 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Czas modyfikacji (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:647 meld/preferences.py:135
+#: meld/dirdiff.py:648 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: meld/dirdiff.py:900
+#: meld/dirdiff.py:901
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (skanowanie…)"
 
-#: meld/dirdiff.py:932 meld/dirdiff.py:964
+#: meld/dirdiff.py:933 meld/dirdiff.py:965
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Skanowanie {folder}"
 
-#: meld/dirdiff.py:1100
+#: meld/dirdiff.py:1101
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Ukończono"
 
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1114
 msgid "Folder {} is being compared to itself"
 msgstr "Katalog {} jest porównywany z samym sobą"
 
-#: meld/dirdiff.py:1119
+#: meld/dirdiff.py:1120
 msgid "Folders have no differences"
 msgstr "Katalogi się nie różnią"
 
-#: meld/dirdiff.py:1121
+#: meld/dirdiff.py:1122
 msgid "Contents of scanned files in folders are identical."
 msgstr "Treść zeskanowanych plików w katalogach jest identyczna."
 
-#: meld/dirdiff.py:1123
+#: meld/dirdiff.py:1124
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1745,44 +1754,44 @@ msgstr ""
 "Zeskanowane pliki wydają się identyczne, ale treść mogła nie zostać "
 "zeskanowana."
 
-#: meld/dirdiff.py:1126
+#: meld/dirdiff.py:1127
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Filtry plików są używane, więc nie wszystkie pliki zostały zeskanowane."
 
-#: meld/dirdiff.py:1128
+#: meld/dirdiff.py:1129
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Filtry tekstowe są używane i mogą ukrywać różnice między plikami."
 
-#: meld/dirdiff.py:1144 meld/filediff.py:1980
+#: meld/dirdiff.py:1145 meld/filediff.py:1982
 msgid "Hide"
 msgstr "Ukryj"
 
-#: meld/dirdiff.py:1146 meld/filediff.py:1982 meld/filediff.py:2012
-#: meld/filediff.py:2014 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1984 meld/filediff.py:2014
+#: meld/filediff.py:2016 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Ukryj"
 
-#: meld/dirdiff.py:1155
+#: meld/dirdiff.py:1156
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Wystąpiło wiele błędów podczas skanowania tego katalogu"
 
-#: meld/dirdiff.py:1156
+#: meld/dirdiff.py:1157
 msgid "Files with invalid encodings found"
 msgstr "Odnaleziono pliki z nieprawidłowym kodowaniem znaków"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1158
+#: meld/dirdiff.py:1159
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Niektóre pliki mają nieprawidłowe kodowanie znaków. Nazwy tych plików to:"
 
-#: meld/dirdiff.py:1160
+#: meld/dirdiff.py:1161
 msgid "Files hidden by case insensitive comparison"
 msgstr "Pliku ukryte przez porównywanie bez uwzględniania wielkości liter"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1162
+#: meld/dirdiff.py:1163
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1791,17 +1800,17 @@ msgstr ""
 "w systemie plików, który rozróżnia wielkość liter. Następujące pliki w tym "
 "katalogu zostały ukryte:"
 
-#: meld/dirdiff.py:1173
+#: meld/dirdiff.py:1174
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "„{first_file}” ukryty przez „{second_file}”"
 
-#: meld/dirdiff.py:1235
+#: meld/dirdiff.py:1236
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Zastąpić katalog „%s”?"
 
-#: meld/dirdiff.py:1237
+#: meld/dirdiff.py:1238
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1811,11 +1820,11 @@ msgstr ""
 "Zastąpienie istniejącego katalogu spowoduje utratę wszystkich plików w nim "
 "zawartych."
 
-#: meld/dirdiff.py:1250
+#: meld/dirdiff.py:1251
 msgid "Error copying file"
 msgstr "Błąd podczas kopiowania pliku"
 
-#: meld/dirdiff.py:1251
+#: meld/dirdiff.py:1252
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1828,19 +1837,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1276 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Błąd podczas usuwania {}"
 
-#: meld/dirdiff.py:1819
+#: meld/dirdiff.py:1825
 msgid "No folder"
 msgstr "Brak katalogu"
 
-#: meld/filediff.py:1156
+#: meld/filediff.py:1158
 msgid "Comparison results will be inaccurate"
 msgstr "Wyniki porównania będą niepoprawne"
 
-#: meld/filediff.py:1158
+#: meld/filediff.py:1160
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1848,95 +1857,95 @@ msgstr ""
 "Filtr zmienił liczbę wierszy w pliku, co nie jest obsługiwane. Porównanie "
 "będzie niepoprawne."
 
-#: meld/filediff.py:1230
+#: meld/filediff.py:1232
 msgid "Mark conflict as resolved?"
 msgstr "Oznaczyć konflikt jako rozwiązany?"
 
-#: meld/filediff.py:1232
+#: meld/filediff.py:1234
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Jeśli konflikt został pomyślnie rozwiązany, to można go teraz jako taki "
 "oznaczyć."
 
-#: meld/filediff.py:1235
+#: meld/filediff.py:1237
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: meld/filediff.py:1236
+#: meld/filediff.py:1238
 msgid "Mark _Resolved"
 msgstr "Oznacz jako _rozwiązane"
 
-#: meld/filediff.py:1427 meld/filediff.py:1443
+#: meld/filediff.py:1429 meld/filediff.py:1445
 msgid "Add Synchronization Point"
 msgstr "Dodaj punkt synchronizacji"
 
-#: meld/filediff.py:143
+#: meld/filediff.py:1433
 msgid "Remove Synchronization Point"
 msgstr "Usuń punkt synchronizacji"
 
-#: meld/filediff.py:1435
+#: meld/filediff.py:1437
 msgid "Move Synchronization Point"
 msgstr "Przenieś punkt synchronizacji"
 
-#: meld/filediff.py:1439
+#: meld/filediff.py:1441
 msgid "Match Synchronization Point"
 msgstr "Dopasuj punkt synchronizacji"
 
-#: meld/filediff.py:1463
+#: meld/filediff.py:1465
 msgid "Clear Synchronization Points"
 msgstr "Wyczyść punkty synchronizacji"
 
-#: meld/filediff.py:1654
+#: meld/filediff.py:1656
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Wystąpił problem podczas otwierania pliku „%s”."
 
-#: meld/filediff.py:1663
+#: meld/filediff.py:1665
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Plik %s wygląda na plik binarny."
 
-#: meld/filediff.py:1665
+#: meld/filediff.py:1667
 msgid "Do you want to open the file using the default application?"
 msgstr "Otworzyć go w domyślnym programie?"
 
-#: meld/filediff.py:1667
+#: meld/filediff.py:1669
 msgid "Open"
 msgstr "Otwórz"
 
-#: meld/filediff.py:1689
+#: meld/filediff.py:1691
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Scalanie plików"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1705
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Analizowanie różnic"
 
-#: meld/filediff.py:1763
+#: meld/filediff.py:1765
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Plik %s został zmieniony na dysku"
 
-#: meld/filediff.py:1764
+#: meld/filediff.py:1766
 msgid "Do you want to reload the file?"
 msgstr "Ponownie wczytać plik?"
 
-#: meld/filediff.py:1766
+#: meld/filediff.py:1768
 msgid "_Reload"
 msgstr "_Wczytaj ponownie"
 
-#: meld/filediff.py:1936
+#: meld/filediff.py:1938
 msgid "File {} is being compared to itself"
 msgstr "Plik {} jest porównywany z samym sobą"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1947
 msgid "Files are identical"
 msgstr "Pliki są identyczne"
 
-#: meld/filediff.py:1958
+#: meld/filediff.py:1960
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1944,11 +1953,11 @@ msgstr ""
 "Filtry tekstowe są używane i mogą ukrywać różnice między plikami. Porównać "
 "pliki bez uwzględniania filtrów?"
 
-#: meld/filediff.py:1963
+#: meld/filediff.py:1965
 msgid "Files differ in line endings only"
 msgstr "Pliki różnią się tylko znacznikami końca wierszy"
 
-#: meld/filediff.py:1965
+#: meld/filediff.py:1967
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1957,15 +1966,15 @@ msgstr ""
 "Pliki są identyczne, z wyjątkiem różnych znaczników końca wierszy:\n"
 "%s"
 
-#: meld/filediff.py:1985
+#: meld/filediff.py:1987
 msgid "Show without filters"
 msgstr "Wyświetl bez filtrów"
 
-#: meld/filediff.py:2007
+#: meld/filediff.py:2009
 msgid "Change highlighting incomplete"
 msgstr "Wyróżnianie zmian jest niepełne"
 
-#: meld/filediff.py:2008
+#: meld/filediff.py:2010
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1973,19 +1982,19 @@ msgstr ""
 "Niektóre zmiany nie zostały wyróżnione, ponieważ były za duże. Można "
 "wymusić, aby program Meld wyróżnił większe zmiany, ale może to być wolne."
 
-#: meld/filediff.py:2016
+#: meld/filediff.py:2018
 msgid "Keep highlighting"
 msgstr "Wyróżniaj dalej"
 
-#: meld/filediff.py:2018
+#: meld/filediff.py:2020
 msgid "_Keep highlighting"
 msgstr "_Wyróżniaj dalej"
 
-#: meld/filediff.py:2031
+#: meld/filediff.py:2033
 msgid "Saving failed"
 msgstr "Zapisanie się nie powiodło"
 
-#: meld/filediff.py:2032
+#: meld/filediff.py:2034
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1993,38 +2002,38 @@ msgstr ""
 "Proszę rozważyć skopiowanie wszelkich ważnych zmian w innym programie lub "
 "pliku, aby uniknąć utraty danych."
 
-#: meld/filediff.py:2041
+#: meld/filediff.py:2043
 msgid "Save Left Pane As"
 msgstr "Zapis lewego panelu jako"
 
-#: meld/filediff.py:2043
+#: meld/filediff.py:2045
 msgid "Save Middle Pane As"
 msgstr "Zapis środkowego panelu jako"
 
-#: meld/filediff.py:2045
+#: meld/filediff.py:2047
 msgid "Save Right Pane As"
 msgstr "Zapis prawego panelu jako"
 
-#: meld/filediff.py:2056
+#: meld/filediff.py:2058
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Plik %s został zmieniony na dysku od czasu jego otwarcia"
 
-#: meld/filediff.py:2058
+#: meld/filediff.py:2060
 msgid "If you save it, any external changes will be lost."
 msgstr ""
 "Jeżeli plik zostanie zapisany, to wszystkie zewnętrzne zmiany zostaną "
 "utracone."
 
-#: meld/filediff.py:2061
+#: meld/filediff.py:2063
 msgid "Save Anyway"
 msgstr "Zapisz mimo to"
 
-#: meld/filediff.py:2062
+#: meld/filediff.py:2064
 msgid "Don’t Save"
 msgstr "Nie zapisuj"
 
-#: meld/filediff.py:2104
+#: meld/filediff.py:2106
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2032,7 +2041,7 @@ msgstr ""
 "Plik „{}” zawiera znaki, których nie można zakodować za pomocą jego obecnego "
 "kodowania, „{}”."
 
-#: meld/filediff.py:2108 meld/patchdialog.py:138
+#: meld/filediff.py:2110 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2041,16 +2050,16 @@ msgstr ""
 "Nie można zapisać pliku z powodu:\n"
 "%s"
 
-#: meld/filediff.py:2112 meld/patchdialog.py:137
+#: meld/filediff.py:2114 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Nie można zapisać pliku %s."
 
-#: meld/filediff.py:2522
+#: meld/filediff.py:2524
 msgid "Live comparison updating disabled"
 msgstr "Wyłączono aktualizowanie porównań na żywo"
 
-#: meld/filediff.py:2523
+#: meld/filediff.py:2525
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "

From c1c399011259332d146d69eabb7217e3bf7fcd4a Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Sun, 10 Apr 2022 19:57:40 +0000
Subject: [PATCH 094/116] Update Ukrainian translation

---
 po/uk.po | 294 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 151 insertions(+), 143 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index ea8c151e..763385af 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-03-27 00:52+0000\n"
-"PO-Revision-Date: 2022-03-27 08:50+0300\n"
+"POT-Creation-Date: 2022-04-09 23:19+0000\n"
+"PO-Revision-Date: 2022-04-10 22:57+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\n"
@@ -546,218 +546,224 @@ msgctxt "shortcut window"
 msgid "Fullscreen"
 msgstr "На весь екран"
 
-#: meld/resources/gtk/help-overlay.ui:63
+#: meld/resources/gtk/help-overlay.ui:61
+#| msgid "Middle and right panes"
+msgctxt "shortcut window"
+msgid "Swap left and right panes"
+msgstr "Поміняти місцями ліву і праву панелі"
+
+#: meld/resources/gtk/help-overlay.ui:70
 msgctxt "shortcut window"
 msgid "Panes"
 msgstr "Панелі"
 
-#: meld/resources/gtk/help-overlay.ui:68
+#: meld/resources/gtk/help-overlay.ui:75
 msgctxt "shortcut window"
 msgid "Previous comparison pane"
 msgstr "Попередня панель порівняння"
 
-#: meld/resources/gtk/help-overlay.ui:75
+#: meld/resources/gtk/help-overlay.ui:82
 msgctxt "shortcut window"
 msgid "Next comparison pane"
 msgstr "Наступна панель порівняння"
 
-#: meld/resources/gtk/help-overlay.ui:84
+#: meld/resources/gtk/help-overlay.ui:91
 msgctxt "shortcut window"
 msgid "Changes"
 msgstr "Зміни"
 
-#: meld/resources/gtk/help-overlay.ui:89
+#: meld/resources/gtk/help-overlay.ui:96
 msgctxt "shortcut window"
 msgid "Go to previous change"
 msgstr "Перейти до попередньої зміни"
 
-#: meld/resources/gtk/help-overlay.ui:96
+#: meld/resources/gtk/help-overlay.ui:103
 msgctxt "shortcut window"
 msgid "Go to next change"
 msgstr "Перейти до наступної зміни"
 
-#: meld/resources/gtk/help-overlay.ui:105
+#: meld/resources/gtk/help-overlay.ui:112
 msgctxt "shortcut window"
 msgid "Tabs"
 msgstr "Вкладки"
 
-#: meld/resources/gtk/help-overlay.ui:110
+#: meld/resources/gtk/help-overlay.ui:117
 msgctxt "shortcut window"
 msgid "Go to previous tab"
 msgstr "Перейти до попередньої вкладки"
 
-#: meld/resources/gtk/help-overlay.ui:117
+#: meld/resources/gtk/help-overlay.ui:124
 msgctxt "shortcut window"
 msgid "Go to next tab"
 msgstr "Перейти до наступної вкладки"
 
-#: meld/resources/gtk/help-overlay.ui:124
+#: meld/resources/gtk/help-overlay.ui:131
 msgctxt "shortcut window"
 msgid "Switch to tab"
 msgstr "Перемкнутися на вкладку"
 
-#: meld/resources/gtk/help-overlay.ui:131
+#: meld/resources/gtk/help-overlay.ui:138
 msgctxt "shortcut window"
 msgid "Move tab left"
 msgstr "Пересунути вкладку ліворуч"
 
-#: meld/resources/gtk/help-overlay.ui:138
+#: meld/resources/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
 msgid "Move tab right"
 msgstr "Перемістити вкладку праворуч"
 
-#: meld/resources/gtk/help-overlay.ui:147
+#: meld/resources/gtk/help-overlay.ui:154
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Редагування"
 
-#: meld/resources/gtk/help-overlay.ui:152
+#: meld/resources/gtk/help-overlay.ui:159
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "Скасувати"
 
-#: meld/resources/gtk/help-overlay.ui:159
+#: meld/resources/gtk/help-overlay.ui:166
 msgctxt "shortcut window"
 msgid "Redo"
 msgstr "Повторити"
 
-#: meld/resources/gtk/help-overlay.ui:166
+#: meld/resources/gtk/help-overlay.ui:173
 msgctxt "shortcut window"
 msgid "Cut"
 msgstr "Вирізати"
 
-#: meld/resources/gtk/help-overlay.ui:173
+#: meld/resources/gtk/help-overlay.ui:180
 msgctxt "shortcut window"
 msgid "Copy"
 msgstr "Копіювати"
 
-#: meld/resources/gtk/help-overlay.ui:180
+#: meld/resources/gtk/help-overlay.ui:187
 msgctxt "shortcut window"
 msgid "Paste"
 msgstr "Вставити"
 
-#: meld/resources/gtk/help-overlay.ui:187
+#: meld/resources/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Find"
 msgstr "Знайти"
 
-#: meld/resources/gtk/help-overlay.ui:194
+#: meld/resources/gtk/help-overlay.ui:201
 msgctxt "shortcut window"
 msgid "Find Next"
 msgstr "Знайти далі"
 
-#: meld/resources/gtk/help-overlay.ui:201
+#: meld/resources/gtk/help-overlay.ui:208
 msgctxt "shortcut window"
 msgid "Find Previous"
 msgstr "Знайти позаду"
 
-#: meld/resources/gtk/help-overlay.ui:208
+#: meld/resources/gtk/help-overlay.ui:215
 msgctxt "shortcut window"
 msgid "Replace"
 msgstr "Замінити"
 
-#: meld/resources/gtk/help-overlay.ui:217
+#: meld/resources/gtk/help-overlay.ui:224
 msgctxt "shortcut window"
 msgid "File comparison"
 msgstr "Порівняння файлів"
 
-#: meld/resources/gtk/help-overlay.ui:222
+#: meld/resources/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Save current file"
 msgstr "Зберегти поточний файл"
 
-#: meld/resources/gtk/help-overlay.ui:229
+#: meld/resources/gtk/help-overlay.ui:236
 msgctxt "shortcut window"
 msgid "Save current file to new path"
 msgstr "Зберегти поточний файл до нового місця"
 
-#: meld/resources/gtk/help-overlay.ui:236
+#: meld/resources/gtk/help-overlay.ui:243
 msgctxt "shortcut window"
 msgid "Save all files in comparison"
 msgstr "Зберегти усі файли у порівнянні"
 
-#: meld/resources/gtk/help-overlay.ui:243
+#: meld/resources/gtk/help-overlay.ui:250
 msgctxt "shortcut window"
 msgid "Previous conflict"
 msgstr "Попередній конфлікт"
 
-#: meld/resources/gtk/help-overlay.ui:250
+#: meld/resources/gtk/help-overlay.ui:257
 msgctxt "shortcut window"
 msgid "Next conflict"
 msgstr "Наступний конфлікт"
 
-#: meld/resources/gtk/help-overlay.ui:257
+#: meld/resources/gtk/help-overlay.ui:264
 msgctxt "shortcut window"
 msgid "Push change to left"
 msgstr "Перенести зміну ліворуч"
 
-#: meld/resources/gtk/help-overlay.ui:264
+#: meld/resources/gtk/help-overlay.ui:271
 msgctxt "shortcut window"
 msgid "Push change to right"
 msgstr "Перенести зміну праворуч"
 
-#: meld/resources/gtk/help-overlay.ui:271
+#: meld/resources/gtk/help-overlay.ui:278
 msgctxt "shortcut window"
 msgid "Pull change from left"
 msgstr "Отримати зміну з лівої частини"
 
-#: meld/resources/gtk/help-overlay.ui:278
+#: meld/resources/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Pull change from right"
 msgstr "Отримати зміну з правої частини"
 
-#: meld/resources/gtk/help-overlay.ui:285
+#: meld/resources/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Copy change above left"
 msgstr "Копіювати зміну вище ліворуч"
 
-#: meld/resources/gtk/help-overlay.ui:292
+#: meld/resources/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Copy change below left"
 msgstr "Копіювати зміну нижче ліворуч"
 
-#: meld/resources/gtk/help-overlay.ui:299
+#: meld/resources/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Copy change above right"
 msgstr "Копіювати зміну вище праворуч"
 
-#: meld/resources/gtk/help-overlay.ui:306
+#: meld/resources/gtk/help-overlay.ui:313
 msgctxt "shortcut window"
 msgid "Copy change below right"
 msgstr "Копіювати зміну нижче праворуч"
 
-#: meld/resources/gtk/help-overlay.ui:313
-#: meld/resources/gtk/help-overlay.ui:341
+#: meld/resources/gtk/help-overlay.ui:320
+#: meld/resources/gtk/help-overlay.ui:348
 msgctxt "shortcut window"
 msgid "Delete change"
 msgstr "Вилучити зміну"
 
-#: meld/resources/gtk/help-overlay.ui:322
+#: meld/resources/gtk/help-overlay.ui:329
 msgctxt "shortcut window"
 msgid "Folder comparison"
 msgstr "Порівняння тек"
 
-#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
 msgid "Copy to left"
 msgstr "Копіювати з правого боку на лівий"
 
-#: meld/resources/gtk/help-overlay.ui:334
+#: meld/resources/gtk/help-overlay.ui:341
 msgctxt "shortcut window"
 msgid "Copy to right"
 msgstr "Копіювати з лівого боку на правий"
 
-#: meld/resources/gtk/help-overlay.ui:350
+#: meld/resources/gtk/help-overlay.ui:357
 msgctxt "shortcut window"
 msgid "Version control comparison"
 msgstr "Порівняння у системі керування версіями"
 
-#: meld/resources/gtk/help-overlay.ui:355
+#: meld/resources/gtk/help-overlay.ui:362
 msgctxt "shortcut window"
 msgid "Commit to version control"
 msgstr "Внести до системи керування версіями"
 
-#: meld/resources/gtk/help-overlay.ui:362
+#: meld/resources/gtk/help-overlay.ui:369
 msgctxt "shortcut window"
 msgid "Show/hide console output"
 msgstr "Показати або приховати виведення до консолі"
@@ -814,80 +820,85 @@ msgstr "Консоль системи керування версіями"
 msgid "Lock scrolling"
 msgstr "Блокувати гортання"
 
-#: meld/resources/gtk/menus.ui:73
+#: meld/resources/gtk/menus.ui:74
+#| msgid "Middle and right panes"
+msgid "Swap left and right panes"
+msgstr "Поміняти місцями ліву і праву панелі"
+
+#: meld/resources/gtk/menus.ui:80
 msgid "Comparison"
 msgstr "Порівняння"
 
-#: meld/resources/gtk/menus.ui:77
+#: meld/resources/gtk/menus.ui:84
 msgid "Merge All from Left"
 msgstr "Об'єднати все з лівої панелі"
 
-#: meld/resources/gtk/menus.ui:81
+#: meld/resources/gtk/menus.ui:88
 msgid "Merge All from Right"
 msgstr "Об'єднати все з правої панелі"
 
-#: meld/resources/gtk/menus.ui:85
+#: meld/resources/gtk/menus.ui:92
 msgid "Merge All"
 msgstr "Об'єднати усе"
 
-#: meld/resources/gtk/menus.ui:92
+#: meld/resources/gtk/menus.ui:99
 msgid "Format as Patch…"
 msgstr "Форматувати як латку…"
 
-#: meld/resources/gtk/menus.ui:101
+#: meld/resources/gtk/menus.ui:108
 msgid "_Preferences"
 msgstr "_Налаштування"
 
-#: meld/resources/gtk/menus.ui:105
+#: meld/resources/gtk/menus.ui:112
 msgid "Keyboard Shortcuts"
 msgstr "Клавіатурні скорочення"
 
-#: meld/resources/gtk/menus.ui:109
+#: meld/resources/gtk/menus.ui:116
 msgid "_Help"
 msgstr "_Довідка"
 
-#: meld/resources/gtk/menus.ui:114
+#: meld/resources/gtk/menus.ui:121
 msgid "_About Meld"
 msgstr "_Про Meld"
 
-#: meld/resources/gtk/menus.ui:127
+#: meld/resources/gtk/menus.ui:134
 msgid "File status"
 msgstr "Стан файла"
 
-#: meld/resources/gtk/menus.ui:129
+#: meld/resources/gtk/menus.ui:136
 msgid "Same"
 msgstr "Однакові"
 
-#: meld/resources/gtk/menus.ui:133
+#: meld/resources/gtk/menus.ui:140
 msgid "New"
 msgstr "Новий"
 
-#: meld/resources/gtk/menus.ui:137 meld/resources/gtk/menus.ui:160
+#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Змінено"
 
-#: meld/resources/gtk/menus.ui:147
+#: meld/resources/gtk/menus.ui:154
 msgid "Ignore filename case"
 msgstr "Ігнорувати регістр літер у назвах файлів"
 
-#: meld/resources/gtk/menus.ui:151
+#: meld/resources/gtk/menus.ui:158
 msgid "Normalize Unicode paths"
 msgstr "Нормалізувати шляхи у Unicode"
 
-#: meld/resources/gtk/menus.ui:164
+#: meld/resources/gtk/menus.ui:171
 msgid "Normal"
 msgstr "Звичайний"
 
-#: meld/resources/gtk/menus.ui:168 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Поза керуванням версіями"
 
-#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Проігноровано"
 
-#: meld/resources/gtk/menus.ui:179
+#: meld/resources/gtk/menus.ui:186
 msgid "Flatten folders"
 msgstr "Сплощувати теки"
 
@@ -1155,7 +1166,7 @@ msgstr "Файл 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:602
+#: meld/dirdiff.py:603
 msgid "Name"
 msgstr "Назва"
 
@@ -1195,7 +1206,7 @@ msgstr "Циклічний пошук"
 msgid "Replace _All"
 msgstr "Замінити _все"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "За_мінити"
 
@@ -1582,7 +1593,7 @@ msgstr "Якщо ви не збережете внесені зміни, їх б
 msgid "Close _without Saving"
 msgstr "Закрити _без збереження"
 
-#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229
 #: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "_Скасувати"
@@ -1692,53 +1703,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:623 meld/preferences.py:132
+#: meld/dirdiff.py:624 meld/preferences.py:132
 msgid "Size"
 msgstr "Розмір"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:631 meld/preferences.py:133
+#: meld/dirdiff.py:632 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Час внесення змін"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:639 meld/preferences.py:134
+#: meld/dirdiff.py:640 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Час внесення змін (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:647 meld/preferences.py:135
+#: meld/dirdiff.py:648 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Права доступу"
 
-#: meld/dirdiff.py:900
+#: meld/dirdiff.py:901
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (сканування…)"
 
-#: meld/dirdiff.py:932 meld/dirdiff.py:964
+#: meld/dirdiff.py:933 meld/dirdiff.py:965
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Скануємо {folder}"
 
-#: meld/dirdiff.py:1100
+#: meld/dirdiff.py:1101
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Виконано"
 
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1114
 msgid "Folder {} is being compared to itself"
 msgstr "Виконуємо порівняння теки {} із самою собою"
 
-#: meld/dirdiff.py:1119
+#: meld/dirdiff.py:1120
 msgid "Folders have no differences"
 msgstr "Між теками немає відмінностей"
 
-#: meld/dirdiff.py:1121
+#: meld/dirdiff.py:1122
 msgid "Contents of scanned files in folders are identical."
 msgstr "Вміст сканованих файлів у теках є тотожним."
 
-#: meld/dirdiff.py:1123
+#: meld/dirdiff.py:1124
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1746,45 +1757,45 @@ msgstr ""
 "Здається, скановані файли у теках є тотожними, але програма не перевіряла "
 "їхній вміст."
 
-#: meld/dirdiff.py:1126
+#: meld/dirdiff.py:1127
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Використано фільтри файлів, тому сканування виконувалося не для усіх файлів."
 
-#: meld/dirdiff.py:1128
+#: meld/dirdiff.py:1129
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Використано текстові фільтри, що могли замаскувати відмінності у вмісті "
 "файлів."
 
-#: meld/dirdiff.py:1144 meld/filediff.py:1980
+#: meld/dirdiff.py:1145 meld/filediff.py:1982
 msgid "Hide"
 msgstr "Приховати"
 
-#: meld/dirdiff.py:1146 meld/filediff.py:1982 meld/filediff.py:2012
-#: meld/filediff.py:2014 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1984 meld/filediff.py:2014
+#: meld/filediff.py:2016 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Сховати"
 
-#: meld/dirdiff.py:1155
+#: meld/dirdiff.py:1156
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Під час сканування цієї теки було виявлено декілька помилок"
 
-#: meld/dirdiff.py:1156
+#: meld/dirdiff.py:1157
 msgid "Files with invalid encodings found"
 msgstr "Знайдено файли із некоректним кодуванням"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1158
+#: meld/dirdiff.py:1159
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Кодування деяких файлів є помилковим. Назви десь такі:"
 
-#: meld/dirdiff.py:1160
+#: meld/dirdiff.py:1161
 msgid "Files hidden by case insensitive comparison"
 msgstr "Файли приховано нечутливим до регістру порівнянням"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1162
+#: meld/dirdiff.py:1163
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1792,17 +1803,17 @@ msgstr ""
 "Ви виконуєте нечутливе до регістру порівняння в чутливій до регістру "
 "файловій системі. Вказані нижче рядки у цій теці приховано:"
 
-#: meld/dirdiff.py:1173
+#: meld/dirdiff.py:1174
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "«{first_file}» приховано «{second_file}»"
 
-#: meld/dirdiff.py:1235
+#: meld/dirdiff.py:1236
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Замінити теку «%s»?"
 
-#: meld/dirdiff.py:1237
+#: meld/dirdiff.py:1238
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1811,11 +1822,11 @@ msgstr ""
 "У «%s» вже існує інша тека з такою ж назвою.\n"
 "Якщо ви замістите наявну теку, усі файли у ній буде втрачено."
 
-#: meld/dirdiff.py:1250
+#: meld/dirdiff.py:1251
 msgid "Error copying file"
 msgstr "Помилка під час копіювання файла"
 
-#: meld/dirdiff.py:1251
+#: meld/dirdiff.py:1252
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1828,19 +1839,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1276 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Помилка під час спроби вилучити {}"
 
-#: meld/dirdiff.py:1819
+#: meld/dirdiff.py:1825
 msgid "No folder"
 msgstr "Немає теки"
 
-#: meld/filediff.py:1156
+#: meld/filediff.py:1158
 msgid "Comparison results will be inaccurate"
 msgstr "Результати порівняння не будуть точними"
 
-#: meld/filediff.py:1158
+#: meld/filediff.py:1160
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1848,97 +1859,94 @@ msgstr ""
 "Фільтром змінено кількість рядків у файлі. Підтримку обробки таких змін не "
 "реалізовано. Порівняння може бути неточним."
 
-#: meld/filediff.py:1230
+#: meld/filediff.py:1232
 msgid "Mark conflict as resolved?"
 msgstr "Позначити конфлікт як розв'язаний?"
 
-#: meld/filediff.py:1232
+#: meld/filediff.py:1234
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Якщо конфлікт успішно розв'язано, ви можете позначити його як розв'язаний."
 
-#: meld/filediff.py:1235
+#: meld/filediff.py:1237
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: meld/filediff.py:1236
+#: meld/filediff.py:1238
 msgid "Mark _Resolved"
 msgstr "Позначити як _розв'язаний"
 
-#: meld/filediff.py:1427 meld/filediff.py:1443
+#: meld/filediff.py:1429 meld/filediff.py:1445
 msgid "Add Synchronization Point"
 msgstr "Додати точку синхронізації"
 
-#: meld/filediff.py:1431
-#| msgid "Add Synchronization Point"
+#: meld/filediff.py:1433
 msgid "Remove Synchronization Point"
 msgstr "Вилучити точку синхронізації"
 
-#: meld/filediff.py:1435
-#| msgid "Add Synchronization Point"
+#: meld/filediff.py:1437
 msgid "Move Synchronization Point"
 msgstr "Пересунути точку синхронізації"
 
-#: meld/filediff.py:1439
-#| msgid "Add Synchronization Point"
+#: meld/filediff.py:1441
 msgid "Match Synchronization Point"
 msgstr "Встановити відповідність точки синхронізації"
 
-#: meld/filediff.py:1463
+#: meld/filediff.py:1465
 msgid "Clear Synchronization Points"
 msgstr "Вилучити точки синхронізації"
 
-#: meld/filediff.py:1654
+#: meld/filediff.py:1656
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Помилка відкриття файла «%s»."
 
-#: meld/filediff.py:1663
+#: meld/filediff.py:1665
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Здається, файл %s є файлом двійкових даних."
 
-#: meld/filediff.py:1665
+#: meld/filediff.py:1667
 msgid "Do you want to open the file using the default application?"
 msgstr "Хочете відкрити файл за допомогою типової програми?"
 
-#: meld/filediff.py:1667
+#: meld/filediff.py:1669
 msgid "Open"
 msgstr "Відкрити"
 
-#: meld/filediff.py:1689
+#: meld/filediff.py:1691
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Об'єднання файлів"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1705
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Обчислення відмінностей"
 
-#: meld/filediff.py:1763
+#: meld/filediff.py:1765
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "До файла %s було внесено зміни на диску"
 
-#: meld/filediff.py:1764
+#: meld/filediff.py:1766
 msgid "Do you want to reload the file?"
 msgstr "Хочете перезавантажити файл?"
 
-#: meld/filediff.py:1766
+#: meld/filediff.py:1768
 msgid "_Reload"
 msgstr "Перезаванта_жити"
 
-#: meld/filediff.py:1936
+#: meld/filediff.py:1938
 msgid "File {} is being compared to itself"
 msgstr "Виконуємо порівняння файла {} із самим собою"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1947
 msgid "Files are identical"
 msgstr "Файли є однаковими"
 
-#: meld/filediff.py:1958
+#: meld/filediff.py:1960
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1946,11 +1954,11 @@ msgstr ""
 "Використано текстові фільтри, які могли замаскувати відмінності між файлами. "
 "Хочете виконати порівняння файлів без фільтрування?"
 
-#: meld/filediff.py:1963
+#: meld/filediff.py:1965
 msgid "Files differ in line endings only"
 msgstr "Файли відрізняються лише символами завершення рядків"
 
-#: meld/filediff.py:1965
+#: meld/filediff.py:1967
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1959,15 +1967,15 @@ msgstr ""
 "Файли є однаковими, окрім різних символів завершення рядків:\n"
 "%s"
 
-#: meld/filediff.py:1985
+#: meld/filediff.py:1987
 msgid "Show without filters"
 msgstr "Показати без фільтрів"
 
-#: meld/filediff.py:2007
+#: meld/filediff.py:2009
 msgid "Change highlighting incomplete"
 msgstr "Неповна зміна підсвічування"
 
-#: meld/filediff.py:2008
+#: meld/filediff.py:2010
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1976,19 +1984,19 @@ msgstr ""
 "наказати Meld підсвітити більші зміни, але вам доведеться почекати, доки "
 "програма виконає ваш наказ."
 
-#: meld/filediff.py:2016
+#: meld/filediff.py:2018
 msgid "Keep highlighting"
 msgstr "Зберігати підсвічування"
 
-#: meld/filediff.py:2018
+#: meld/filediff.py:2020
 msgid "_Keep highlighting"
 msgstr "З_берігати підсвічування"
 
-#: meld/filediff.py:2031
+#: meld/filediff.py:2033
 msgid "Saving failed"
 msgstr "Не вдалося зберегти"
 
-#: meld/filediff.py:2032
+#: meld/filediff.py:2034
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1996,37 +2004,37 @@ msgstr ""
 "Вам варто скопіювати критичні зміни до вікна іншої програми або файла, щоб "
 "уникнути втрати даних."
 
-#: meld/filediff.py:2041
+#: meld/filediff.py:2043
 msgid "Save Left Pane As"
 msgstr "Зберегти ліву панель як"
 
-#: meld/filediff.py:2043
+#: meld/filediff.py:2045
 msgid "Save Middle Pane As"
 msgstr "Зберегти середню панель як"
 
-#: meld/filediff.py:2045
+#: meld/filediff.py:2047
 msgid "Save Right Pane As"
 msgstr "Зберегти праву панель як"
 
-#: meld/filediff.py:2056
+#: meld/filediff.py:2058
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "З часу відкриття до файла %s було внесено зміни на диску"
 
-#: meld/filediff.py:2058
+#: meld/filediff.py:2060
 msgid "If you save it, any external changes will be lost."
 msgstr ""
 "Якщо ви збережете файл, внесені сторонніми програмами зміни буде втрачено."
 
-#: meld/filediff.py:2061
+#: meld/filediff.py:2063
 msgid "Save Anyway"
 msgstr "Зберегти попри це"
 
-#: meld/filediff.py:2062
+#: meld/filediff.py:2064
 msgid "Don’t Save"
 msgstr "Не зберігати"
 
-#: meld/filediff.py:2104
+#: meld/filediff.py:2106
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2034,7 +2042,7 @@ msgstr ""
 "У файлі «{}» містяться символи, які не входять до його поточного кодування "
 "«{}»."
 
-#: meld/filediff.py:2108 meld/patchdialog.py:138
+#: meld/filediff.py:2110 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2043,16 +2051,16 @@ msgstr ""
 "Не вдалося зберегти файл. Причина:\n"
 "%s"
 
-#: meld/filediff.py:2112 meld/patchdialog.py:137
+#: meld/filediff.py:2114 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Не вдалося зберегти файл %s."
 
-#: meld/filediff.py:2522
+#: meld/filediff.py:2524
 msgid "Live comparison updating disabled"
 msgstr "Інтерактивне оновлення порівняння вимкнено"
 
-#: meld/filediff.py:2523
+#: meld/filediff.py:2525
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "

From 05aee2814577749870526dd421367d12757ced4f Mon Sep 17 00:00:00 2001
From: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date: Mon, 11 Apr 2022 08:34:43 +0000
Subject: [PATCH 095/116] Update Swedish translation

---
 po/sv.po | 289 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 149 insertions(+), 140 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index 7c6f2a8e..2f51e8dc 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-03-27 00:52+0000\n"
-"PO-Revision-Date: 2022-03-27 11:44+0200\n"
+"POT-Creation-Date: 2022-04-09 23:19+0000\n"
+"PO-Revision-Date: 2022-04-11 10:34+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -526,218 +526,223 @@ msgctxt "shortcut window"
 msgid "Fullscreen"
 msgstr "Helskärm"
 
-#: meld/resources/gtk/help-overlay.ui:63
+#: meld/resources/gtk/help-overlay.ui:61
+msgctxt "shortcut window"
+msgid "Swap left and right panes"
+msgstr "Byt plats på vänster- och högerpanelen"
+
+#: meld/resources/gtk/help-overlay.ui:70
 msgctxt "shortcut window"
 msgid "Panes"
 msgstr "Paneler"
 
-#: meld/resources/gtk/help-overlay.ui:68
+#: meld/resources/gtk/help-overlay.ui:75
 msgctxt "shortcut window"
 msgid "Previous comparison pane"
 msgstr "Föregående jämförelsepanel"
 
-#: meld/resources/gtk/help-overlay.ui:75
+#: meld/resources/gtk/help-overlay.ui:82
 msgctxt "shortcut window"
 msgid "Next comparison pane"
 msgstr "Nästa jämförelsepanel"
 
-#: meld/resources/gtk/help-overlay.ui:84
+#: meld/resources/gtk/help-overlay.ui:91
 msgctxt "shortcut window"
 msgid "Changes"
 msgstr "Ändringar"
 
-#: meld/resources/gtk/help-overlay.ui:89
+#: meld/resources/gtk/help-overlay.ui:96
 msgctxt "shortcut window"
 msgid "Go to previous change"
 msgstr "Gå till föregående ändring"
 
-#: meld/resources/gtk/help-overlay.ui:96
+#: meld/resources/gtk/help-overlay.ui:103
 msgctxt "shortcut window"
 msgid "Go to next change"
 msgstr "Gå till nästa ändring"
 
-#: meld/resources/gtk/help-overlay.ui:105
+#: meld/resources/gtk/help-overlay.ui:112
 msgctxt "shortcut window"
 msgid "Tabs"
 msgstr "Flikar"
 
-#: meld/resources/gtk/help-overlay.ui:110
+#: meld/resources/gtk/help-overlay.ui:117
 msgctxt "shortcut window"
 msgid "Go to previous tab"
 msgstr "Gå till föregående flik"
 
-#: meld/resources/gtk/help-overlay.ui:117
+#: meld/resources/gtk/help-overlay.ui:124
 msgctxt "shortcut window"
 msgid "Go to next tab"
 msgstr "Gå till nästa flik"
 
-#: meld/resources/gtk/help-overlay.ui:124
+#: meld/resources/gtk/help-overlay.ui:131
 msgctxt "shortcut window"
 msgid "Switch to tab"
 msgstr "Växla till flik"
 
-#: meld/resources/gtk/help-overlay.ui:131
+#: meld/resources/gtk/help-overlay.ui:138
 msgctxt "shortcut window"
 msgid "Move tab left"
 msgstr "Flytta flik åt vänster"
 
-#: meld/resources/gtk/help-overlay.ui:138
+#: meld/resources/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
 msgid "Move tab right"
 msgstr "Flytta flik åt höger"
 
-#: meld/resources/gtk/help-overlay.ui:147
+#: meld/resources/gtk/help-overlay.ui:154
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Redigering"
 
-#: meld/resources/gtk/help-overlay.ui:152
+#: meld/resources/gtk/help-overlay.ui:159
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "Ångra"
 
-#: meld/resources/gtk/help-overlay.ui:159
+#: meld/resources/gtk/help-overlay.ui:166
 msgctxt "shortcut window"
 msgid "Redo"
 msgstr "Gör om"
 
-#: meld/resources/gtk/help-overlay.ui:166
+#: meld/resources/gtk/help-overlay.ui:173
 msgctxt "shortcut window"
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: meld/resources/gtk/help-overlay.ui:173
+#: meld/resources/gtk/help-overlay.ui:180
 msgctxt "shortcut window"
 msgid "Copy"
 msgstr "Kopiera"
 
-#: meld/resources/gtk/help-overlay.ui:180
+#: meld/resources/gtk/help-overlay.ui:187
 msgctxt "shortcut window"
 msgid "Paste"
 msgstr "Klistra in"
 
-#: meld/resources/gtk/help-overlay.ui:187
+#: meld/resources/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Find"
 msgstr "Sök"
 
-#: meld/resources/gtk/help-overlay.ui:194
+#: meld/resources/gtk/help-overlay.ui:201
 msgctxt "shortcut window"
 msgid "Find Next"
 msgstr "Sök nästa"
 
-#: meld/resources/gtk/help-overlay.ui:201
+#: meld/resources/gtk/help-overlay.ui:208
 msgctxt "shortcut window"
 msgid "Find Previous"
 msgstr "Sök föregående"
 
-#: meld/resources/gtk/help-overlay.ui:208
+#: meld/resources/gtk/help-overlay.ui:215
 msgctxt "shortcut window"
 msgid "Replace"
 msgstr "Ersätt"
 
-#: meld/resources/gtk/help-overlay.ui:217
+#: meld/resources/gtk/help-overlay.ui:224
 msgctxt "shortcut window"
 msgid "File comparison"
 msgstr "Filjämförelse"
 
-#: meld/resources/gtk/help-overlay.ui:222
+#: meld/resources/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Save current file"
 msgstr "Spara den aktuella filen"
 
-#: meld/resources/gtk/help-overlay.ui:229
+#: meld/resources/gtk/help-overlay.ui:236
 msgctxt "shortcut window"
 msgid "Save current file to new path"
 msgstr "Spara den aktuella filen till ny sökväg"
 
-#: meld/resources/gtk/help-overlay.ui:236
+#: meld/resources/gtk/help-overlay.ui:243
 msgctxt "shortcut window"
 msgid "Save all files in comparison"
 msgstr "Spara alla filer i jämförelse"
 
-#: meld/resources/gtk/help-overlay.ui:243
+#: meld/resources/gtk/help-overlay.ui:250
 msgctxt "shortcut window"
 msgid "Previous conflict"
 msgstr "Föregående konflikt"
 
-#: meld/resources/gtk/help-overlay.ui:250
+#: meld/resources/gtk/help-overlay.ui:257
 msgctxt "shortcut window"
 msgid "Next conflict"
 msgstr "Nästa konflikt"
 
-#: meld/resources/gtk/help-overlay.ui:257
+#: meld/resources/gtk/help-overlay.ui:264
 msgctxt "shortcut window"
 msgid "Push change to left"
 msgstr "Tryck över ändring till vänster"
 
-#: meld/resources/gtk/help-overlay.ui:264
+#: meld/resources/gtk/help-overlay.ui:271
 msgctxt "shortcut window"
 msgid "Push change to right"
 msgstr "Tryck över ändring till höger"
 
-#: meld/resources/gtk/help-overlay.ui:271
+#: meld/resources/gtk/help-overlay.ui:278
 msgctxt "shortcut window"
 msgid "Pull change from left"
 msgstr "Dra ändring från vänster"
 
-#: meld/resources/gtk/help-overlay.ui:278
+#: meld/resources/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Pull change from right"
 msgstr "Dra ändring från höger"
 
-#: meld/resources/gtk/help-overlay.ui:285
+#: meld/resources/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Copy change above left"
 msgstr "Kopiera ändringar ovanför vänster"
 
-#: meld/resources/gtk/help-overlay.ui:292
+#: meld/resources/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Copy change below left"
 msgstr "Kopiera ändringar under vänster"
 
-#: meld/resources/gtk/help-overlay.ui:299
+#: meld/resources/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Copy change above right"
 msgstr "Kopiera ändringar ovanför höger"
 
-#: meld/resources/gtk/help-overlay.ui:306
+#: meld/resources/gtk/help-overlay.ui:313
 msgctxt "shortcut window"
 msgid "Copy change below right"
 msgstr "Kopiera ändringar under höger"
 
-#: meld/resources/gtk/help-overlay.ui:313
-#: meld/resources/gtk/help-overlay.ui:341
+#: meld/resources/gtk/help-overlay.ui:320
+#: meld/resources/gtk/help-overlay.ui:348
 msgctxt "shortcut window"
 msgid "Delete change"
 msgstr "Ta bort ändring"
 
-#: meld/resources/gtk/help-overlay.ui:322
+#: meld/resources/gtk/help-overlay.ui:329
 msgctxt "shortcut window"
 msgid "Folder comparison"
 msgstr "Mappjämförelse"
 
-#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
 msgid "Copy to left"
 msgstr "Kopiera till vänster"
 
-#: meld/resources/gtk/help-overlay.ui:334
+#: meld/resources/gtk/help-overlay.ui:341
 msgctxt "shortcut window"
 msgid "Copy to right"
 msgstr "Kopiera till höger"
 
-#: meld/resources/gtk/help-overlay.ui:350
+#: meld/resources/gtk/help-overlay.ui:357
 msgctxt "shortcut window"
 msgid "Version control comparison"
 msgstr "Versionshanterad jämförelse"
 
-#: meld/resources/gtk/help-overlay.ui:355
+#: meld/resources/gtk/help-overlay.ui:362
 msgctxt "shortcut window"
 msgid "Commit to version control"
 msgstr "Checka in i versionshanteraren"
 
-#: meld/resources/gtk/help-overlay.ui:362
+#: meld/resources/gtk/help-overlay.ui:369
 msgctxt "shortcut window"
 msgid "Show/hide console output"
 msgstr "Visa/dölj konsolutskrift"
@@ -794,80 +799,84 @@ msgstr "Versionshanteringskonsol"
 msgid "Lock scrolling"
 msgstr "Lås rullning"
 
-#: meld/resources/gtk/menus.ui:73
+#: meld/resources/gtk/menus.ui:74
+msgid "Swap left and right panes"
+msgstr "Byt plats på vänster- och högerpanelen"
+
+#: meld/resources/gtk/menus.ui:80
 msgid "Comparison"
 msgstr "Jämförelse"
 
-#: meld/resources/gtk/menus.ui:77
+#: meld/resources/gtk/menus.ui:84
 msgid "Merge All from Left"
 msgstr "Sammanfoga allt från vänster"
 
-#: meld/resources/gtk/menus.ui:81
+#: meld/resources/gtk/menus.ui:88
 msgid "Merge All from Right"
 msgstr "Sammanfoga allt från höger"
 
-#: meld/resources/gtk/menus.ui:85
+#: meld/resources/gtk/menus.ui:92
 msgid "Merge All"
 msgstr "Sammanfoga alla"
 
-#: meld/resources/gtk/menus.ui:92
+#: meld/resources/gtk/menus.ui:99
 msgid "Format as Patch…"
 msgstr "Formatera som programfix…"
 
-#: meld/resources/gtk/menus.ui:101
+#: meld/resources/gtk/menus.ui:108
 msgid "_Preferences"
 msgstr "Inställ_ningar"
 
-#: meld/resources/gtk/menus.ui:105
+#: meld/resources/gtk/menus.ui:112
 msgid "Keyboard Shortcuts"
 msgstr "Tangentbordsgenvägar"
 
-#: meld/resources/gtk/menus.ui:109
+#: meld/resources/gtk/menus.ui:116
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: meld/resources/gtk/menus.ui:114
+#: meld/resources/gtk/menus.ui:121
 msgid "_About Meld"
 msgstr "_Om Meld"
 
-#: meld/resources/gtk/menus.ui:127
+#: meld/resources/gtk/menus.ui:134
 msgid "File status"
 msgstr "Filstatus"
 
-#: meld/resources/gtk/menus.ui:129
+#: meld/resources/gtk/menus.ui:136
 msgid "Same"
 msgstr "Samma"
 
-#: meld/resources/gtk/menus.ui:133
+#: meld/resources/gtk/menus.ui:140
 msgid "New"
 msgstr "Nya"
 
-#: meld/resources/gtk/menus.ui:137 meld/resources/gtk/menus.ui:160
+#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Ändrade"
 
-#: meld/resources/gtk/menus.ui:147
+#: meld/resources/gtk/menus.ui:154
 msgid "Ignore filename case"
 msgstr "Ignorera skiftlägeskänslighet för filnamn"
 
-#: meld/resources/gtk/menus.ui:151
+#: meld/resources/gtk/menus.ui:158
 msgid "Normalize Unicode paths"
 msgstr "Normalisera Unicode-sökvägar"
 
-#: meld/resources/gtk/menus.ui:164
+#: meld/resources/gtk/menus.ui:171
 msgid "Normal"
 msgstr "Normala"
 
-#: meld/resources/gtk/menus.ui:168 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Oversionerade"
 
-#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Ignorerade"
 
-#: meld/resources/gtk/menus.ui:179
+#: meld/resources/gtk/menus.ui:186
 msgid "Flatten folders"
 msgstr "Platta till mappar"
 
@@ -1142,7 +1151,7 @@ msgstr "Fil ett"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:602
+#: meld/dirdiff.py:603
 msgid "Name"
 msgstr "Namn"
 
@@ -1182,7 +1191,7 @@ msgstr "Radbruten"
 msgid "Replace _All"
 msgstr "Ersätt _alla"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "_Ersätt"
 
@@ -1568,7 +1577,7 @@ msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid."
 msgid "Close _without Saving"
 msgstr "Stäng _utan att spara"
 
-#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229
 #: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "_Avbryt"
@@ -1678,95 +1687,95 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:623 meld/preferences.py:132
+#: meld/dirdiff.py:624 meld/preferences.py:132
 msgid "Size"
 msgstr "Storlek"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:631 meld/preferences.py:133
+#: meld/dirdiff.py:632 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Ändringstid"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:639 meld/preferences.py:134
+#: meld/dirdiff.py:640 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Ändringstid (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:647 meld/preferences.py:135
+#: meld/dirdiff.py:648 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Rättigheter"
 
-#: meld/dirdiff.py:900
+#: meld/dirdiff.py:901
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (söker igenom…)"
 
-#: meld/dirdiff.py:932 meld/dirdiff.py:964
+#: meld/dirdiff.py:933 meld/dirdiff.py:965
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Söker igenom {folder}"
 
-#: meld/dirdiff.py:1100
+#: meld/dirdiff.py:1101
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Klar"
 
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1114
 msgid "Folder {} is being compared to itself"
 msgstr "Mappen {} jämförs med sig själv"
 
-#: meld/dirdiff.py:1119
+#: meld/dirdiff.py:1120
 msgid "Folders have no differences"
 msgstr "Mapparna skiljer sig inte åt"
 
-#: meld/dirdiff.py:1121
+#: meld/dirdiff.py:1122
 msgid "Contents of scanned files in folders are identical."
 msgstr "Innehållet i mapparnas avsökta filer är identiskt."
 
-#: meld/dirdiff.py:1123
+#: meld/dirdiff.py:1124
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 "Mapparnas avsökta filer verkar identiska, men innehållet har inte genomsökts."
 
-#: meld/dirdiff.py:1126
+#: meld/dirdiff.py:1127
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Filfilter används, och därför har inte alla filer genomsökts."
 
-#: meld/dirdiff.py:1128
+#: meld/dirdiff.py:1129
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Textfilter används och kan dölja skillnader i innehåll."
 
-#: meld/dirdiff.py:1144 meld/filediff.py:1980
+#: meld/dirdiff.py:1145 meld/filediff.py:1982
 msgid "Hide"
 msgstr "Dölj"
 
-#: meld/dirdiff.py:1146 meld/filediff.py:1982 meld/filediff.py:2012
-#: meld/filediff.py:2014 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1984 meld/filediff.py:2014
+#: meld/filediff.py:2016 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Dölj"
 
-#: meld/dirdiff.py:1155
+#: meld/dirdiff.py:1156
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Flera fel inträffade vid avsökning av denna mapp"
 
-#: meld/dirdiff.py:1156
+#: meld/dirdiff.py:1157
 msgid "Files with invalid encodings found"
 msgstr "Filer med ogiltiga teckenkodningar hittades"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1158
+#: meld/dirdiff.py:1159
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "En del filer hade en felaktig kodning. Namnen är ungefär:"
 
-#: meld/dirdiff.py:1160
+#: meld/dirdiff.py:1161
 msgid "Files hidden by case insensitive comparison"
 msgstr "Filer dolda av skiftlägeskänslig jämförelse"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1162
+#: meld/dirdiff.py:1163
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1774,17 +1783,17 @@ msgstr ""
 "Du gör en skiftlägesokänslig jämförelse på ett skiftlägeskänsligt filsystem. "
 "En del filer syns inte:"
 
-#: meld/dirdiff.py:1173
+#: meld/dirdiff.py:1174
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "”{first_file}” dold av ”{second_file}”"
 
-#: meld/dirdiff.py:1235
+#: meld/dirdiff.py:1236
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ersätt mappen ”%s”?"
 
-#: meld/dirdiff.py:1237
+#: meld/dirdiff.py:1238
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1793,11 +1802,11 @@ msgstr ""
 "En annan mapp med samma namn existerar redan i ”%s”.\n"
 "Om du ersätter befintlig mapp kommer alla filer att förloras."
 
-#: meld/dirdiff.py:1250
+#: meld/dirdiff.py:1251
 msgid "Error copying file"
 msgstr "Fel vid filkopiering"
 
-#: meld/dirdiff.py:1251
+#: meld/dirdiff.py:1252
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1810,19 +1819,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1276 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Fel vid borttagning av {}"
 
-#: meld/dirdiff.py:1819
+#: meld/dirdiff.py:1825
 msgid "No folder"
 msgstr "Ingen mapp"
 
-#: meld/filediff.py:1156
+#: meld/filediff.py:1158
 msgid "Comparison results will be inaccurate"
 msgstr "Jämförelseresultat kommer att bli osäkra"
 
-#: meld/filediff.py:1158
+#: meld/filediff.py:1160
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1830,93 +1839,93 @@ msgstr ""
 "Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen "
 "kommer att vara osäker."
 
-#: meld/filediff.py:1230
+#: meld/filediff.py:1232
 msgid "Mark conflict as resolved?"
 msgstr "Markera konflikten som löst?"
 
-#: meld/filediff.py:1232
+#: meld/filediff.py:1234
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "Om konflikten gick att lösa kan du markera den som löst nu."
 
-#: meld/filediff.py:1235
+#: meld/filediff.py:1237
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: meld/filediff.py:1236
+#: meld/filediff.py:1238
 msgid "Mark _Resolved"
 msgstr "Markera som _löst"
 
-#: meld/filediff.py:1427 meld/filediff.py:1443
+#: meld/filediff.py:1429 meld/filediff.py:1445
 msgid "Add Synchronization Point"
 msgstr "Lägg till synkroniseringspunkt"
 
-#: meld/filediff.py:1431
+#: meld/filediff.py:1433
 msgid "Remove Synchronization Point"
 msgstr "Ta bort synkroniseringspunkt"
 
-#: meld/filediff.py:1435
+#: meld/filediff.py:1437
 msgid "Move Synchronization Point"
 msgstr "Flytta synkroniseringspunkt"
 
-#: meld/filediff.py:1439
+#: meld/filediff.py:1441
 msgid "Match Synchronization Point"
 msgstr "Matcha synkroniseringspunkt"
 
-#: meld/filediff.py:1463
+#: meld/filediff.py:1465
 msgid "Clear Synchronization Points"
 msgstr "Rensa synkroniseringspunkter"
 
-#: meld/filediff.py:1654
+#: meld/filediff.py:1656
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”."
 
-#: meld/filediff.py:1663
+#: meld/filediff.py:1665
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Filen %s verkar vara en binärfil."
 
-#: meld/filediff.py:1665
+#: meld/filediff.py:1667
 msgid "Do you want to open the file using the default application?"
 msgstr "Vill du öppna filen med standardprogrammet?"
 
-#: meld/filediff.py:1667
+#: meld/filediff.py:1669
 msgid "Open"
 msgstr "Öppna"
 
-#: meld/filediff.py:1689
+#: meld/filediff.py:1691
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Sammanfogar filer"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1705
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Beräknar skillnader"
 
-#: meld/filediff.py:1763
+#: meld/filediff.py:1765
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Filen %s har ändrats på disk"
 
-#: meld/filediff.py:1764
+#: meld/filediff.py:1766
 msgid "Do you want to reload the file?"
 msgstr "Vill du läsa om filen?"
 
-#: meld/filediff.py:1766
+#: meld/filediff.py:1768
 msgid "_Reload"
 msgstr "_Läs om"
 
-#: meld/filediff.py:1936
+#: meld/filediff.py:1938
 msgid "File {} is being compared to itself"
 msgstr "Filen {} jämförs med sig själv"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1947
 msgid "Files are identical"
 msgstr "Filerna är identiska"
 
-#: meld/filediff.py:1958
+#: meld/filediff.py:1960
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1924,11 +1933,11 @@ msgstr ""
 "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
 "ofiltrerade filerna?"
 
-#: meld/filediff.py:1963
+#: meld/filediff.py:1965
 msgid "Files differ in line endings only"
 msgstr "Filer skiljer sig endast vad gäller radslut"
 
-#: meld/filediff.py:1965
+#: meld/filediff.py:1967
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1937,15 +1946,15 @@ msgstr ""
 "Filerna är identiska förutom radavsluten:\n"
 "%s"
 
-#: meld/filediff.py:1985
+#: meld/filediff.py:1987
 msgid "Show without filters"
 msgstr "Visa utan filer"
 
-#: meld/filediff.py:2007
+#: meld/filediff.py:2009
 msgid "Change highlighting incomplete"
 msgstr "Ändra markering av ofärdiga"
 
-#: meld/filediff.py:2008
+#: meld/filediff.py:2010
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1954,19 +1963,19 @@ msgstr ""
 "Meld till att längre tid på sig att markera större ändringar, men det kan "
 "bli långsamt."
 
-#: meld/filediff.py:2016
+#: meld/filediff.py:2018
 msgid "Keep highlighting"
 msgstr "Använd markering"
 
-#: meld/filediff.py:2018
+#: meld/filediff.py:2020
 msgid "_Keep highlighting"
 msgstr "_Använd markering"
 
-#: meld/filediff.py:2031
+#: meld/filediff.py:2033
 msgid "Saving failed"
 msgstr "Misslyckades med att spara"
 
-#: meld/filediff.py:2032
+#: meld/filediff.py:2034
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1974,36 +1983,36 @@ msgstr ""
 "Överväg att kopiera kritiska ändringar till ett annat program eller en annan "
 "fil för att undvika förlust av data."
 
-#: meld/filediff.py:2041
+#: meld/filediff.py:2043
 msgid "Save Left Pane As"
 msgstr "Spara vänsterpanel som"
 
-#: meld/filediff.py:2043
+#: meld/filediff.py:2045
 msgid "Save Middle Pane As"
 msgstr "Spara mittenpanel som"
 
-#: meld/filediff.py:2045
+#: meld/filediff.py:2047
 msgid "Save Right Pane As"
 msgstr "Spara högerpanel som"
 
-#: meld/filediff.py:2056
+#: meld/filediff.py:2058
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Filen %s har ändrats på disk sedan den öppnades"
 
-#: meld/filediff.py:2058
+#: meld/filediff.py:2060
 msgid "If you save it, any external changes will be lost."
 msgstr "Om du sparar den kommer alla externa ändringar att gå förlorade."
 
-#: meld/filediff.py:2061
+#: meld/filediff.py:2063
 msgid "Save Anyway"
 msgstr "Spara ändå"
 
-#: meld/filediff.py:2062
+#: meld/filediff.py:2064
 msgid "Don’t Save"
 msgstr "Spara inte"
 
-#: meld/filediff.py:2104
+#: meld/filediff.py:2106
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2011,7 +2020,7 @@ msgstr ""
 "Filen ”{}” innehåller tecken som inte kan kodas med dess aktuella kodning "
 "”{}”."
 
-#: meld/filediff.py:2108 meld/patchdialog.py:138
+#: meld/filediff.py:2110 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2020,16 +2029,16 @@ msgstr ""
 "Kunde in spara fil beroende på:\n"
 "%s"
 
-#: meld/filediff.py:2112 meld/patchdialog.py:137
+#: meld/filediff.py:2114 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Kunde inte spara filen %s."
 
-#: meld/filediff.py:2522
+#: meld/filediff.py:2524
 msgid "Live comparison updating disabled"
 msgstr "Inaktivera realtidsuppdateringar av jämförelser"
 
-#: meld/filediff.py:2523
+#: meld/filediff.py:2525
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "

From f4e41e49fa74bddcf8672c46020c6c50f87c6cda Mon Sep 17 00:00:00 2001
From: Enrico Nicoletto <hiko@duck.com>
Date: Fri, 15 Apr 2022 18:08:58 +0000
Subject: [PATCH 096/116] Update Brazilian Portuguese translation

---
 po/pt_BR.po | 323 ++++++++++++++++++++++++++++------------------------
 1 file changed, 172 insertions(+), 151 deletions(-)

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 028088c7..aaf15474 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,15 +9,15 @@
 # Gabriel Speckhahn <gabspeck@gmail.com>, 2011.
 # Florêncio Neves <florencioneves@gmail.com>, 2012.
 # Rafael Fontenelle <rafaelff@gnome.org>, 2013-2021.
-# Matheus Barbosa <mdpb.matheus@gmail.com>, 2022.
 # Enrico Nicoletto <hiko@duck.com>, 2013, 2018-2022.
+# Matheus Barbosa <mdpb.matheus@gmail.com>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-02-28 21:56+0000\n"
-"PO-Revision-Date: 2022-03-04 19:59-0300\n"
+"POT-Creation-Date: 2022-04-10 01:05+0000\n"
+"PO-Revision-Date: 2022-04-15 15:07-0300\n"
 "Last-Translator: Enrico Nicoletto <hiko@duck.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -540,218 +540,223 @@ msgctxt "shortcut window"
 msgid "Fullscreen"
 msgstr "Tela cheia"
 
-#: meld/resources/gtk/help-overlay.ui:63
+#: meld/resources/gtk/help-overlay.ui:61
+msgctxt "shortcut window"
+msgid "Swap left and right panes"
+msgstr "Troca os painéis esquerdo e direito"
+
+#: meld/resources/gtk/help-overlay.ui:70
 msgctxt "shortcut window"
 msgid "Panes"
 msgstr "Painéis"
 
-#: meld/resources/gtk/help-overlay.ui:68
+#: meld/resources/gtk/help-overlay.ui:75
 msgctxt "shortcut window"
 msgid "Previous comparison pane"
 msgstr "Painel de comparação anterior"
 
-#: meld/resources/gtk/help-overlay.ui:75
+#: meld/resources/gtk/help-overlay.ui:82
 msgctxt "shortcut window"
 msgid "Next comparison pane"
 msgstr "Próximo painel de comparação"
 
-#: meld/resources/gtk/help-overlay.ui:84
+#: meld/resources/gtk/help-overlay.ui:91
 msgctxt "shortcut window"
 msgid "Changes"
 msgstr "Alterações"
 
-#: meld/resources/gtk/help-overlay.ui:89
+#: meld/resources/gtk/help-overlay.ui:96
 msgctxt "shortcut window"
 msgid "Go to previous change"
 msgstr "Vai para a alteração anterior"
 
-#: meld/resources/gtk/help-overlay.ui:96
+#: meld/resources/gtk/help-overlay.ui:103
 msgctxt "shortcut window"
 msgid "Go to next change"
 msgstr "Vai para a próxima alteração"
 
-#: meld/resources/gtk/help-overlay.ui:105
+#: meld/resources/gtk/help-overlay.ui:112
 msgctxt "shortcut window"
 msgid "Tabs"
 msgstr "Abas"
 
-#: meld/resources/gtk/help-overlay.ui:110
+#: meld/resources/gtk/help-overlay.ui:117
 msgctxt "shortcut window"
 msgid "Go to previous tab"
 msgstr "Vai para a aba anterior"
 
-#: meld/resources/gtk/help-overlay.ui:117
+#: meld/resources/gtk/help-overlay.ui:124
 msgctxt "shortcut window"
 msgid "Go to next tab"
 msgstr "Vai para a próxima aba"
 
-#: meld/resources/gtk/help-overlay.ui:124
+#: meld/resources/gtk/help-overlay.ui:131
 msgctxt "shortcut window"
 msgid "Switch to tab"
 msgstr "Alterna para aba"
 
-#: meld/resources/gtk/help-overlay.ui:131
+#: meld/resources/gtk/help-overlay.ui:138
 msgctxt "shortcut window"
 msgid "Move tab left"
 msgstr "Move uma aba para a esquerda"
 
-#: meld/resources/gtk/help-overlay.ui:138
+#: meld/resources/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
 msgid "Move tab right"
 msgstr "Move uma aba para a direita"
 
-#: meld/resources/gtk/help-overlay.ui:147
+#: meld/resources/gtk/help-overlay.ui:154
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Edição"
 
-#: meld/resources/gtk/help-overlay.ui:152
+#: meld/resources/gtk/help-overlay.ui:159
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "Desfaz"
 
-#: meld/resources/gtk/help-overlay.ui:159
+#: meld/resources/gtk/help-overlay.ui:166
 msgctxt "shortcut window"
 msgid "Redo"
 msgstr "Refaz"
 
-#: meld/resources/gtk/help-overlay.ui:166
+#: meld/resources/gtk/help-overlay.ui:173
 msgctxt "shortcut window"
 msgid "Cut"
 msgstr "Recorta"
 
-#: meld/resources/gtk/help-overlay.ui:173
+#: meld/resources/gtk/help-overlay.ui:180
 msgctxt "shortcut window"
 msgid "Copy"
 msgstr "Copia"
 
-#: meld/resources/gtk/help-overlay.ui:180
+#: meld/resources/gtk/help-overlay.ui:187
 msgctxt "shortcut window"
 msgid "Paste"
 msgstr "Cola"
 
-#: meld/resources/gtk/help-overlay.ui:187
+#: meld/resources/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Find"
 msgstr "Localiza"
 
-#: meld/resources/gtk/help-overlay.ui:194
+#: meld/resources/gtk/help-overlay.ui:201
 msgctxt "shortcut window"
 msgid "Find Next"
 msgstr "Localiza próximo"
 
-#: meld/resources/gtk/help-overlay.ui:201
+#: meld/resources/gtk/help-overlay.ui:208
 msgctxt "shortcut window"
 msgid "Find Previous"
 msgstr "Localiza anterior"
 
-#: meld/resources/gtk/help-overlay.ui:208
+#: meld/resources/gtk/help-overlay.ui:215
 msgctxt "shortcut window"
 msgid "Replace"
 msgstr "Substituir"
 
-#: meld/resources/gtk/help-overlay.ui:217
+#: meld/resources/gtk/help-overlay.ui:224
 msgctxt "shortcut window"
 msgid "File comparison"
 msgstr "Comparação de arquivos"
 
-#: meld/resources/gtk/help-overlay.ui:222
+#: meld/resources/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Save current file"
 msgstr "Salva o arquivo atual"
 
-#: meld/resources/gtk/help-overlay.ui:229
+#: meld/resources/gtk/help-overlay.ui:236
 msgctxt "shortcut window"
 msgid "Save current file to new path"
 msgstr "Salva o arquivo atual em novo caminho"
 
-#: meld/resources/gtk/help-overlay.ui:236
+#: meld/resources/gtk/help-overlay.ui:243
 msgctxt "shortcut window"
 msgid "Save all files in comparison"
 msgstr "Salva todos os arquivos na comparação"
 
-#: meld/resources/gtk/help-overlay.ui:243
+#: meld/resources/gtk/help-overlay.ui:250
 msgctxt "shortcut window"
 msgid "Previous conflict"
 msgstr "Conflito anterior"
 
-#: meld/resources/gtk/help-overlay.ui:250
+#: meld/resources/gtk/help-overlay.ui:257
 msgctxt "shortcut window"
 msgid "Next conflict"
 msgstr "Próximo conflito"
 
-#: meld/resources/gtk/help-overlay.ui:257
+#: meld/resources/gtk/help-overlay.ui:264
 msgctxt "shortcut window"
 msgid "Push change to left"
 msgstr "Leva a alteração atual para a esquerda"
 
-#: meld/resources/gtk/help-overlay.ui:264
+#: meld/resources/gtk/help-overlay.ui:271
 msgctxt "shortcut window"
 msgid "Push change to right"
 msgstr "Leva a alteração atual para a direita"
 
-#: meld/resources/gtk/help-overlay.ui:271
+#: meld/resources/gtk/help-overlay.ui:278
 msgctxt "shortcut window"
 msgid "Pull change from left"
 msgstr "Traz a alteração da esquerda"
 
-#: meld/resources/gtk/help-overlay.ui:278
+#: meld/resources/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Pull change from right"
 msgstr "Traz a alteração da direita"
 
-#: meld/resources/gtk/help-overlay.ui:285
+#: meld/resources/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Copy change above left"
 msgstr "Copia a alteração acima para a esquerda"
 
-#: meld/resources/gtk/help-overlay.ui:292
+#: meld/resources/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Copy change below left"
 msgstr "Copia a alteração abaixo para a esquerda"
 
-#: meld/resources/gtk/help-overlay.ui:299
+#: meld/resources/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Copy change above right"
 msgstr "Copia a alteração acima para a direita"
 
-#: meld/resources/gtk/help-overlay.ui:306
+#: meld/resources/gtk/help-overlay.ui:313
 msgctxt "shortcut window"
 msgid "Copy change below right"
 msgstr "Copia a alteração abaixo para a direita"
 
-#: meld/resources/gtk/help-overlay.ui:313
-#: meld/resources/gtk/help-overlay.ui:341
+#: meld/resources/gtk/help-overlay.ui:320
+#: meld/resources/gtk/help-overlay.ui:348
 msgctxt "shortcut window"
 msgid "Delete change"
 msgstr "Exclui a alteração"
 
-#: meld/resources/gtk/help-overlay.ui:322
+#: meld/resources/gtk/help-overlay.ui:329
 msgctxt "shortcut window"
 msgid "Folder comparison"
 msgstr "Comparação de pastas"
 
-#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
 msgid "Copy to left"
 msgstr "Copia para a esquerda"
 
-#: meld/resources/gtk/help-overlay.ui:334
+#: meld/resources/gtk/help-overlay.ui:341
 msgctxt "shortcut window"
 msgid "Copy to right"
 msgstr "Copia para a direita"
 
-#: meld/resources/gtk/help-overlay.ui:350
+#: meld/resources/gtk/help-overlay.ui:357
 msgctxt "shortcut window"
 msgid "Version control comparison"
 msgstr "Comparação de controle de versão"
 
-#: meld/resources/gtk/help-overlay.ui:355
+#: meld/resources/gtk/help-overlay.ui:362
 msgctxt "shortcut window"
 msgid "Commit to version control"
 msgstr "Faz commit para um controle de versão"
 
-#: meld/resources/gtk/help-overlay.ui:362
+#: meld/resources/gtk/help-overlay.ui:369
 msgctxt "shortcut window"
 msgid "Show/hide console output"
 msgstr "Mostra/oculta a saída de console"
@@ -808,90 +813,86 @@ msgstr "Console de controle de versão"
 msgid "Lock scrolling"
 msgstr "Bloquear rolagem"
 
-#: meld/resources/gtk/menus.ui:73
+#: meld/resources/gtk/menus.ui:74
+msgid "Swap left and right panes"
+msgstr "Trocar painéis esquerdo e direito"
+
+#: meld/resources/gtk/menus.ui:80
 msgid "Comparison"
 msgstr "Comparação"
 
 # todas = alterações
-#: meld/resources/gtk/menus.ui:77
+#: meld/resources/gtk/menus.ui:84
 msgid "Merge All from Left"
 msgstr "Mesclar todas da esquerda"
 
-#: meld/resources/gtk/menus.ui:81
+#: meld/resources/gtk/menus.ui:88
 msgid "Merge All from Right"
 msgstr "Mesclar todas da direita"
 
 # todas = alterações
-#: meld/resources/gtk/menus.ui:85
+#: meld/resources/gtk/menus.ui:92
 msgid "Merge All"
 msgstr "Mesclar todas"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
-msgid "Add Synchronization Point"
-msgstr "Adicionar ponto de sincronização"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
-msgid "Clear Synchronization Points"
-msgstr "Limpar pontos de sincronização"
-
-#: meld/resources/gtk/menus.ui:103
+#: meld/resources/gtk/menus.ui:99
 msgid "Format as Patch…"
 msgstr "Formatar como patch…"
 
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:108
 msgid "_Preferences"
 msgstr "Preferê_ncias"
 
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:112
 msgid "Keyboard Shortcuts"
 msgstr "Atalhos de teclado"
 
-#: meld/resources/gtk/menus.ui:120
+#: meld/resources/gtk/menus.ui:116
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: meld/resources/gtk/menus.ui:125
+#: meld/resources/gtk/menus.ui:121
 msgid "_About Meld"
 msgstr "_Sobre o Meld"
 
-#: meld/resources/gtk/menus.ui:138
+#: meld/resources/gtk/menus.ui:134
 msgid "File status"
 msgstr "Status do arquivo"
 
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:136
 msgid "Same"
 msgstr "Iguais"
 
-#: meld/resources/gtk/menus.ui:144
+#: meld/resources/gtk/menus.ui:140
 msgid "New"
 msgstr "Novos"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Modificados"
 
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:154
 msgid "Ignore filename case"
 msgstr "Ignorar maiúsculas/minúsculas em nomes de arquivos"
 
-#: meld/resources/gtk/menus.ui:162
+#: meld/resources/gtk/menus.ui:158
 msgid "Normalize Unicode paths"
 msgstr "Normalizar caminhos Unicode"
 
-#: meld/resources/gtk/menus.ui:175
+#: meld/resources/gtk/menus.ui:171
 msgid "Normal"
 msgstr "Normal"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Sem controle de versão"
 
-#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: meld/resources/gtk/menus.ui:190
+#: meld/resources/gtk/menus.ui:186
 msgid "Flatten folders"
 msgstr "Achata pastas"
 
@@ -1170,7 +1171,7 @@ msgstr "Arquivo 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:558
+#: meld/dirdiff.py:603
 msgid "Name"
 msgstr "Nome"
 
@@ -1210,7 +1211,7 @@ msgstr "Voltou ao início"
 msgid "Replace _All"
 msgstr "Substituir _todos"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1184 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "_Substituir"
 
@@ -1598,12 +1599,12 @@ msgstr "Se você não salvar, as mudanças serão perdidas permanentemente."
 msgid "Close _without Saving"
 msgstr "_Fechar sem salvar"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1183
-#: meld/iohelpers.py:56 meld/iohelpers.py:113
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: meld/resources/ui/save-confirm-dialog.ui:52
+#: meld/resources/ui/save-confirm-dialog.ui:55
 msgid "_Save"
 msgstr "_Salvar"
 
@@ -1708,53 +1709,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:579 meld/preferences.py:132
+#: meld/dirdiff.py:624 meld/preferences.py:132
 msgid "Size"
 msgstr "Tamanho"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:587 meld/preferences.py:133
+#: meld/dirdiff.py:632 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Hora da modificação"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:595 meld/preferences.py:134
+#: meld/dirdiff.py:640 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Hora da modificação (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:603 meld/preferences.py:135
+#: meld/dirdiff.py:648 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Permissões"
 
-#: meld/dirdiff.py:855
+#: meld/dirdiff.py:901
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (escaneando…)"
 
-#: meld/dirdiff.py:887 meld/dirdiff.py:919
+#: meld/dirdiff.py:933 meld/dirdiff.py:965
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Escaneando {folder}"
 
-#: meld/dirdiff.py:1055
+#: meld/dirdiff.py:1101
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Concluído"
 
-#: meld/dirdiff.py:1068
+#: meld/dirdiff.py:1114
 msgid "Folder {} is being compared to itself"
 msgstr "Pasta {} sendo comparada consigo própria"
 
-#: meld/dirdiff.py:1074
+#: meld/dirdiff.py:1120
 msgid "Folders have no differences"
 msgstr "As pastas têm nenhuma diferença"
 
-#: meld/dirdiff.py:1076
+#: meld/dirdiff.py:1122
 msgid "Contents of scanned files in folders are identical."
 msgstr "Conteúdos de arquivos verificados em pastas são idênticos."
 
-#: meld/dirdiff.py:1078
+#: meld/dirdiff.py:1124
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1762,48 +1763,48 @@ msgstr ""
 "Arquivos verificados em pastas parecem ser idênticos, mas conteúdos não "
 "foram verificados."
 
-#: meld/dirdiff.py:1081
+#: meld/dirdiff.py:1127
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Filtros de arquivo estão em uso, portanto nem todos os arquivos foram "
 "verificados."
 
-#: meld/dirdiff.py:1083
+#: meld/dirdiff.py:1129
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Filtros de texto estão sendo usados e podem estar escondendo diferenças no "
 "conteúdo."
 
-#: meld/dirdiff.py:1099 meld/filediff.py:1917
+#: meld/dirdiff.py:1145 meld/filediff.py:1983
 msgid "Hide"
 msgstr "Ocultar"
 
-#: meld/dirdiff.py:1101 meld/filediff.py:1919 meld/filediff.py:1949
-#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1985 meld/filediff.py:2015
+#: meld/filediff.py:2017 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "Ocu_ltar"
 
-#: meld/dirdiff.py:1110
+#: meld/dirdiff.py:1156
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Ocorreram vários erros ao escanear este diretório"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1157
 msgid "Files with invalid encodings found"
 msgstr "Arquivos com codificações inválidas encontrados"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1159
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Alguns arquivos estavam com uma codificação incorreta. Os nomes são algo "
 "como:"
 
-#: meld/dirdiff.py:1115
+#: meld/dirdiff.py:1161
 msgid "Files hidden by case insensitive comparison"
 msgstr "Arquivos ocultos pela comparação não sensível a maiusculização"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1117
+#: meld/dirdiff.py:1163
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1812,17 +1813,17 @@ msgstr ""
 "minúsculas em um sistema de arquivos que diferencia. Os seguintes arquivos "
 "neste diretório ficam ocultos:"
 
-#: meld/dirdiff.py:1128
+#: meld/dirdiff.py:1174
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}” ocultado por “{second_file}”"
 
-#: meld/dirdiff.py:1187
+#: meld/dirdiff.py:1236
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Substituir pasta “%s”?"
 
-#: meld/dirdiff.py:1189
+#: meld/dirdiff.py:1238
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1831,11 +1832,11 @@ msgstr ""
 "Uma outra pasta com o mesmo nome já existe em “%s”.\n"
 "Se você substituir a pasta existente, todos os arquivos nela serão perdidos."
 
-#: meld/dirdiff.py:1202
+#: meld/dirdiff.py:1251
 msgid "Error copying file"
 msgstr "Erro ao copiar arquivo"
 
-#: meld/dirdiff.py:1203
+#: meld/dirdiff.py:1252
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1848,19 +1849,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1228 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Erro ao excluir {}"
 
-#: meld/dirdiff.py:1756
+#: meld/dirdiff.py:1825
 msgid "No folder"
 msgstr "Nenhum pasta"
 
-#: meld/filediff.py:1149
+#: meld/filediff.py:1158
 msgid "Comparison results will be inaccurate"
 msgstr "Resultados da comparação será imprecisa"
 
-#: meld/filediff.py:1151
+#: meld/filediff.py:1160
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1868,75 +1869,95 @@ msgstr ""
 "Um filtro alterou o número de linhas no arquivo, não havendo suporte a essa "
 "alteração. A comparação pode não ser precisa."
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1232
 msgid "Mark conflict as resolved?"
 msgstr "Marcar como resolvido?"
 
-#: meld/filediff.py:1225
+#: meld/filediff.py:1234
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Se o conflito foi resolvido com sucesso, você pode marcá-lo como resolvido "
 "agora."
 
-#: meld/filediff.py:1227
+#: meld/filediff.py:1237
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: meld/filediff.py:1228
+#: meld/filediff.py:1238
 msgid "Mark _Resolved"
 msgstr "Marcar como _resolvido"
 
-#: meld/filediff.py:1591
+#: meld/filediff.py:1429 meld/filediff.py:1445
+msgid "Add Synchronization Point"
+msgstr "Adicionar ponto de sincronização"
+
+#: meld/filediff.py:1433
+msgid "Remove Synchronization Point"
+msgstr "Remover ponto de sincronização"
+
+#: meld/filediff.py:1437
+msgid "Move Synchronization Point"
+msgstr "Mover ponto de sincronização"
+
+#: meld/filediff.py:1441
+msgid "Match Synchronization Point"
+msgstr "Combinar ponto de sincronização"
+
+#: meld/filediff.py:1465
+msgid "Clear Synchronization Points"
+msgstr "Limpar pontos de sincronização"
+
+#: meld/filediff.py:1657
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Ocorreu um problema ao abrir o arquivo “%s”."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1666
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "O arquivo %s parece ser um arquivo binário."
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1668
 msgid "Do you want to open the file using the default application?"
 msgstr "Você gostaria de abrir o arquivo usando o aplicativo padrão?"
 
-#: meld/filediff.py:1604
+#: meld/filediff.py:1670
 msgid "Open"
 msgstr "Abrir"
 
-#: meld/filediff.py:1626
+#: meld/filediff.py:1692
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Mesclando arquivos"
 
-#: meld/filediff.py:1640
+#: meld/filediff.py:1706
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Analisando diferenças"
 
-#: meld/filediff.py:1700
+#: meld/filediff.py:1766
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "O arquivo %s foi alterado em disco"
 
-#: meld/filediff.py:1701
+#: meld/filediff.py:1767
 msgid "Do you want to reload the file?"
 msgstr "Deseja recarregar o arquivo?"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1769
 msgid "_Reload"
 msgstr "_Recarregar"
 
-#: meld/filediff.py:1873
+#: meld/filediff.py:1939
 msgid "File {} is being compared to itself"
 msgstr "Arquivo {} sendo comparado consigo próprio"
 
-#: meld/filediff.py:1882
+#: meld/filediff.py:1948
 msgid "Files are identical"
 msgstr "Os arquivos são idênticos"
 
-#: meld/filediff.py:1895
+#: meld/filediff.py:1961
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1944,11 +1965,11 @@ msgstr ""
 "Filtros de texto estão sendo usados e podem estar escondendo diferenças "
 "entre os arquivos. Você gostaria de comparar os arquivos sem filtro?"
 
-#: meld/filediff.py:1900
+#: meld/filediff.py:1966
 msgid "Files differ in line endings only"
 msgstr "Arquivos se diferenciam nos fins de linha apenas"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1968
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1957,15 +1978,15 @@ msgstr ""
 "Arquivos são idênticos, exceto pela diferença entre fins de linha:\n"
 "%s"
 
-#: meld/filediff.py:1922
+#: meld/filediff.py:1988
 msgid "Show without filters"
 msgstr "Mostrar sem filtros"
 
-#: meld/filediff.py:1944
+#: meld/filediff.py:2010
 msgid "Change highlighting incomplete"
 msgstr "Alteração de destaque incompleta"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:2011
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1974,19 +1995,19 @@ msgstr ""
 "grandes. Você pode forçar o Meld a levar mais tempo para destacar alterações "
 "longas, porém isso pode ser bem lento."
 
-#: meld/filediff.py:1953
+#: meld/filediff.py:2019
 msgid "Keep highlighting"
 msgstr "Manter destaque"
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:2021
 msgid "_Keep highlighting"
 msgstr "_Manter destaque"
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:2034
 msgid "Saving failed"
 msgstr "Salvamento falhou"
 
-#: meld/filediff.py:1969
+#: meld/filediff.py:2035
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1994,36 +2015,36 @@ msgstr ""
 "Por favor, considere copiar quaisquer alterações críticas para outro "
 "programa ou arquivo para evita perda de dados."
 
-#: meld/filediff.py:1978
+#: meld/filediff.py:2044
 msgid "Save Left Pane As"
 msgstr "Salvar o painel esquerdo como"
 
-#: meld/filediff.py:1980
+#: meld/filediff.py:2046
 msgid "Save Middle Pane As"
 msgstr "Salvar o painel do meio como"
 
-#: meld/filediff.py:1982
+#: meld/filediff.py:2048
 msgid "Save Right Pane As"
 msgstr "Salvar o painel direito como"
 
-#: meld/filediff.py:1993
+#: meld/filediff.py:2059
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "O arquivo %s foi alterado em disco após ter sido aberto"
 
-#: meld/filediff.py:1995
+#: meld/filediff.py:2061
 msgid "If you save it, any external changes will be lost."
 msgstr "Se você não salvá-lo, quaisquer mudanças externas serão perdidas."
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2064
 msgid "Save Anyway"
 msgstr "Salvar mesmo assim"
 
-#: meld/filediff.py:1999
+#: meld/filediff.py:2065
 msgid "Don’t Save"
 msgstr "Não salvar"
 
-#: meld/filediff.py:2041
+#: meld/filediff.py:2107
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2031,7 +2052,7 @@ msgstr ""
 "O arquivo “{}” contém caracteres que não pode ser codificado usando "
 "codificação “{}”."
 
-#: meld/filediff.py:2045 meld/patchdialog.py:138
+#: meld/filediff.py:2111 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2040,16 +2061,16 @@ msgstr ""
 "Não foi possível salvar o arquivo pois:\n"
 "%s"
 
-#: meld/filediff.py:2049 meld/patchdialog.py:137
+#: meld/filediff.py:2115 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Não foi possível salvar o arquivo %s."
 
-#: meld/filediff.py:2450
+#: meld/filediff.py:2525
 msgid "Live comparison updating disabled"
 msgstr "Atualização em tempo real de comparação desabilitada"
 
-#: meld/filediff.py:2451
+#: meld/filediff.py:2526
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2077,16 +2098,16 @@ msgstr ""
 msgid "This remote location does not support sending items to the trash."
 msgstr "Este local remoto não possui suporte ao envio de itens para a lixeira."
 
-#: meld/iohelpers.py:57
+#: meld/iohelpers.py:58
 msgid "_Delete Permanently"
 msgstr "_Excluir permanentemente"
 
-#: meld/iohelpers.py:107
+#: meld/iohelpers.py:110
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Substituir arquivo “%s”?"
 
-#: meld/iohelpers.py:109
+#: meld/iohelpers.py:112
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2213,7 +2234,7 @@ msgstr ""
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Não foi possível comparar uma mistura de arquivos e diretórios"
 
-#: meld/misc.py:150
+#: meld/misc.py:154
 msgid ""
 "{}\n"
 "\n"
@@ -2225,7 +2246,7 @@ msgstr ""
 "Meld encontrou um erro crítico na execução:\n"
 "<tt>{}</tt>"
 
-#: meld/misc.py:201
+#: meld/misc.py:205
 msgid "[None]"
 msgstr "[Nenhum]"
 

From 67d3b7cb901b48ff11602383b8a0777f59d3dad8 Mon Sep 17 00:00:00 2001
From: Sergej A <sw@atrus.ru>
Date: Sun, 17 Apr 2022 18:44:18 +0000
Subject: [PATCH 097/116] Update Russian translation

---
 po/ru.po | 289 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 149 insertions(+), 140 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 7d45068c..c85baa72 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Meld 1.4.0\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-03-27 12:07+0000\n"
-"PO-Revision-Date: 2022-03-30 17:13+1000\n"
+"POT-Creation-Date: 2022-04-09 23:19+0000\n"
+"PO-Revision-Date: 2022-04-13 21:12+1000\n"
 "Last-Translator: Ser82-png <sw@atrus.ru>\n"
 "Language-Team: Русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
@@ -537,219 +537,224 @@ msgctxt "shortcut window"
 msgid "Fullscreen"
 msgstr "Переключить полноэкранный режим"
 
-#: meld/resources/gtk/help-overlay.ui:63
+#: meld/resources/gtk/help-overlay.ui:61
+msgctxt "shortcut window"
+msgid "Swap left and right panes"
+msgstr "Поменять местами левую и правую панели"
+
+#: meld/resources/gtk/help-overlay.ui:70
 msgctxt "shortcut window"
 msgid "Panes"
 msgstr "Панели"
 
-#: meld/resources/gtk/help-overlay.ui:68
+#: meld/resources/gtk/help-overlay.ui:75
 msgctxt "shortcut window"
 msgid "Previous comparison pane"
 msgstr "Перейти к предыдущей панели сравнения"
 
-#: meld/resources/gtk/help-overlay.ui:75
+#: meld/resources/gtk/help-overlay.ui:82
 msgctxt "shortcut window"
 msgid "Next comparison pane"
 msgstr "Перейти к следующей панели сравнения"
 
-#: meld/resources/gtk/help-overlay.ui:84
+#: meld/resources/gtk/help-overlay.ui:91
 msgctxt "shortcut window"
 msgid "Changes"
 msgstr "Изменения"
 
-#: meld/resources/gtk/help-overlay.ui:89
+#: meld/resources/gtk/help-overlay.ui:96
 msgctxt "shortcut window"
 msgid "Go to previous change"
 msgstr "Перейти к предыдущему изменению"
 
-#: meld/resources/gtk/help-overlay.ui:96
+#: meld/resources/gtk/help-overlay.ui:103
 msgctxt "shortcut window"
 msgid "Go to next change"
 msgstr "Перейти к следующему изменению"
 
 # Ускоритель установлен на букву К, т. к. В конфликтует с _Вид
-#: meld/resources/gtk/help-overlay.ui:105
+#: meld/resources/gtk/help-overlay.ui:112
 msgctxt "shortcut window"
 msgid "Tabs"
 msgstr "Вкладки"
 
-#: meld/resources/gtk/help-overlay.ui:110
+#: meld/resources/gtk/help-overlay.ui:117
 msgctxt "shortcut window"
 msgid "Go to previous tab"
 msgstr "Перейти к предыдущей вкладке"
 
-#: meld/resources/gtk/help-overlay.ui:117
+#: meld/resources/gtk/help-overlay.ui:124
 msgctxt "shortcut window"
 msgid "Go to next tab"
 msgstr "Перейти к следующей вкладке"
 
-#: meld/resources/gtk/help-overlay.ui:124
+#: meld/resources/gtk/help-overlay.ui:131
 msgctxt "shortcut window"
 msgid "Switch to tab"
 msgstr "Переключиться на вкладку"
 
-#: meld/resources/gtk/help-overlay.ui:131
+#: meld/resources/gtk/help-overlay.ui:138
 msgctxt "shortcut window"
 msgid "Move tab left"
 msgstr "Переместить вкладку влево"
 
-#: meld/resources/gtk/help-overlay.ui:138
+#: meld/resources/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
 msgid "Move tab right"
 msgstr "Переместить вкладку вправо"
 
-#: meld/resources/gtk/help-overlay.ui:147
+#: meld/resources/gtk/help-overlay.ui:154
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Правка"
 
-#: meld/resources/gtk/help-overlay.ui:152
+#: meld/resources/gtk/help-overlay.ui:159
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "Отменить"
 
-#: meld/resources/gtk/help-overlay.ui:159
+#: meld/resources/gtk/help-overlay.ui:166
 msgctxt "shortcut window"
 msgid "Redo"
 msgstr "Повторить"
 
-#: meld/resources/gtk/help-overlay.ui:166
+#: meld/resources/gtk/help-overlay.ui:173
 msgctxt "shortcut window"
 msgid "Cut"
 msgstr "Вырезать"
 
-#: meld/resources/gtk/help-overlay.ui:173
+#: meld/resources/gtk/help-overlay.ui:180
 msgctxt "shortcut window"
 msgid "Copy"
 msgstr "Копировать"
 
-#: meld/resources/gtk/help-overlay.ui:180
+#: meld/resources/gtk/help-overlay.ui:187
 msgctxt "shortcut window"
 msgid "Paste"
 msgstr "Вставить"
 
-#: meld/resources/gtk/help-overlay.ui:187
+#: meld/resources/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Find"
 msgstr "Найти"
 
-#: meld/resources/gtk/help-overlay.ui:194
+#: meld/resources/gtk/help-overlay.ui:201
 msgctxt "shortcut window"
 msgid "Find Next"
 msgstr "Найти следующее"
 
-#: meld/resources/gtk/help-overlay.ui:201
+#: meld/resources/gtk/help-overlay.ui:208
 msgctxt "shortcut window"
 msgid "Find Previous"
 msgstr "Найти предыдущее"
 
-#: meld/resources/gtk/help-overlay.ui:208
+#: meld/resources/gtk/help-overlay.ui:215
 msgctxt "shortcut window"
 msgid "Replace"
 msgstr "Заменить"
 
-#: meld/resources/gtk/help-overlay.ui:217
+#: meld/resources/gtk/help-overlay.ui:224
 msgctxt "shortcut window"
 msgid "File comparison"
 msgstr "Сравнение файлов"
 
-#: meld/resources/gtk/help-overlay.ui:222
+#: meld/resources/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Save current file"
 msgstr "Сохранить текущий файл"
 
-#: meld/resources/gtk/help-overlay.ui:229
+#: meld/resources/gtk/help-overlay.ui:236
 msgctxt "shortcut window"
 msgid "Save current file to new path"
 msgstr "Сохранить текущий файл по новому пути"
 
-#: meld/resources/gtk/help-overlay.ui:236
+#: meld/resources/gtk/help-overlay.ui:243
 msgctxt "shortcut window"
 msgid "Save all files in comparison"
 msgstr "Сохраните все файлы в текущем сравнении"
 
-#: meld/resources/gtk/help-overlay.ui:243
+#: meld/resources/gtk/help-overlay.ui:250
 msgctxt "shortcut window"
 msgid "Previous conflict"
 msgstr "Предыдущий конфликт"
 
-#: meld/resources/gtk/help-overlay.ui:250
+#: meld/resources/gtk/help-overlay.ui:257
 msgctxt "shortcut window"
 msgid "Next conflict"
 msgstr "Следующий конфликт"
 
-#: meld/resources/gtk/help-overlay.ui:257
+#: meld/resources/gtk/help-overlay.ui:264
 msgctxt "shortcut window"
 msgid "Push change to left"
 msgstr "Переместить текущее изменение влево"
 
-#: meld/resources/gtk/help-overlay.ui:264
+#: meld/resources/gtk/help-overlay.ui:271
 msgctxt "shortcut window"
 msgid "Push change to right"
 msgstr "Переместить текущее изменение вправо"
 
-#: meld/resources/gtk/help-overlay.ui:271
+#: meld/resources/gtk/help-overlay.ui:278
 msgctxt "shortcut window"
 msgid "Pull change from left"
 msgstr "Взять изменение слева"
 
-#: meld/resources/gtk/help-overlay.ui:278
+#: meld/resources/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Pull change from right"
 msgstr "Взять изменение справа"
 
-#: meld/resources/gtk/help-overlay.ui:285
+#: meld/resources/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Copy change above left"
 msgstr "Копировать изменение выше левого блока"
 
-#: meld/resources/gtk/help-overlay.ui:292
+#: meld/resources/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Copy change below left"
 msgstr "Копировать изменение ниже левого блока"
 
-#: meld/resources/gtk/help-overlay.ui:299
+#: meld/resources/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Copy change above right"
 msgstr "Копировать изменения выше правого блока"
 
-#: meld/resources/gtk/help-overlay.ui:306
+#: meld/resources/gtk/help-overlay.ui:313
 msgctxt "shortcut window"
 msgid "Copy change below right"
 msgstr "Копировать изменения ниже правого блока"
 
-#: meld/resources/gtk/help-overlay.ui:313
-#: meld/resources/gtk/help-overlay.ui:341
+#: meld/resources/gtk/help-overlay.ui:320
+#: meld/resources/gtk/help-overlay.ui:348
 msgctxt "shortcut window"
 msgid "Delete change"
 msgstr "Удалить изменения"
 
-#: meld/resources/gtk/help-overlay.ui:322
+#: meld/resources/gtk/help-overlay.ui:329
 msgctxt "shortcut window"
 msgid "Folder comparison"
 msgstr "Сравнение папок"
 
-#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
 msgid "Copy to left"
 msgstr "Копировать влево"
 
-#: meld/resources/gtk/help-overlay.ui:334
+#: meld/resources/gtk/help-overlay.ui:341
 msgctxt "shortcut window"
 msgid "Copy to right"
 msgstr "Копировать вправо"
 
-#: meld/resources/gtk/help-overlay.ui:350
+#: meld/resources/gtk/help-overlay.ui:357
 msgctxt "shortcut window"
 msgid "Version control comparison"
 msgstr "Начать сравнение, используя сравнение контроля версий"
 
-#: meld/resources/gtk/help-overlay.ui:355
+#: meld/resources/gtk/help-overlay.ui:362
 msgctxt "shortcut window"
 msgid "Commit to version control"
 msgstr "Зафиксировать изменения в системе контроля версий"
 
-#: meld/resources/gtk/help-overlay.ui:362
+#: meld/resources/gtk/help-overlay.ui:369
 msgctxt "shortcut window"
 msgid "Show/hide console output"
 msgstr "Показать/скрыть вывод консоли"
@@ -806,80 +811,84 @@ msgstr "Консоль контроля версий"
 msgid "Lock scrolling"
 msgstr "Заблокировать прокрутку"
 
-#: meld/resources/gtk/menus.ui:73
+#: meld/resources/gtk/menus.ui:74
+msgid "Swap left and right panes"
+msgstr "Поменять местами левую и правую панели"
+
+#: meld/resources/gtk/menus.ui:80
 msgid "Comparison"
 msgstr "Сравнение"
 
-#: meld/resources/gtk/menus.ui:77
+#: meld/resources/gtk/menus.ui:84
 msgid "Merge All from Left"
 msgstr "Объединить все с левой панели"
 
-#: meld/resources/gtk/menus.ui:81
+#: meld/resources/gtk/menus.ui:88
 msgid "Merge All from Right"
 msgstr "Объединить все с правой панели"
 
-#: meld/resources/gtk/menus.ui:85
+#: meld/resources/gtk/menus.ui:92
 msgid "Merge All"
 msgstr "Объединить все"
 
-#: meld/resources/gtk/menus.ui:92
+#: meld/resources/gtk/menus.ui:99
 msgid "Format as Patch…"
 msgstr "Сформировать патч…"
 
-#: meld/resources/gtk/menus.ui:101
+#: meld/resources/gtk/menus.ui:108
 msgid "_Preferences"
 msgstr "_Параметры"
 
-#: meld/resources/gtk/menus.ui:105
+#: meld/resources/gtk/menus.ui:112
 msgid "Keyboard Shortcuts"
 msgstr "Клавиатурные сочетания"
 
-#: meld/resources/gtk/menus.ui:109
+#: meld/resources/gtk/menus.ui:116
 msgid "_Help"
 msgstr "_Справка"
 
-#: meld/resources/gtk/menus.ui:114
+#: meld/resources/gtk/menus.ui:121
 msgid "_About Meld"
 msgstr "О приложении Meld"
 
-#: meld/resources/gtk/menus.ui:127
+#: meld/resources/gtk/menus.ui:134
 msgid "File status"
 msgstr "Статус файла"
 
-#: meld/resources/gtk/menus.ui:129
+#: meld/resources/gtk/menus.ui:136
 msgid "Same"
 msgstr "Одинаковые"
 
-#: meld/resources/gtk/menus.ui:133
+#: meld/resources/gtk/menus.ui:140
 msgid "New"
 msgstr "Новые"
 
-#: meld/resources/gtk/menus.ui:137 meld/resources/gtk/menus.ui:160
+#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Изменён"
 
-#: meld/resources/gtk/menus.ui:147
+#: meld/resources/gtk/menus.ui:154
 msgid "Ignore filename case"
 msgstr "Игнорировать регистр имени файла"
 
-#: meld/resources/gtk/menus.ui:151
+#: meld/resources/gtk/menus.ui:158
 msgid "Normalize Unicode paths"
 msgstr "Нормализовать пути в Unicode"
 
-#: meld/resources/gtk/menus.ui:164
+#: meld/resources/gtk/menus.ui:171
 msgid "Normal"
 msgstr "Стандартные"
 
-#: meld/resources/gtk/menus.ui:168 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Без версии"
 
-#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Игнорируемые"
 
-#: meld/resources/gtk/menus.ui:179
+#: meld/resources/gtk/menus.ui:186
 msgid "Flatten folders"
 msgstr "Выровнять каталоги"
 
@@ -1153,7 +1162,7 @@ msgstr "Файл 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:602
+#: meld/dirdiff.py:603
 msgid "Name"
 msgstr "Имя"
 
@@ -1193,7 +1202,7 @@ msgstr "Перенесённый"
 msgid "Replace _All"
 msgstr "Заменить _все"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "_Заменить"
 
@@ -1578,7 +1587,7 @@ msgstr "Если вы не сохраните изменения они буду
 msgid "Close _without Saving"
 msgstr "Закрыть _без сохранения"
 
-#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229
 #: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "_Отменить"
@@ -1688,97 +1697,97 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:623 meld/preferences.py:132
+#: meld/dirdiff.py:624 meld/preferences.py:132
 msgid "Size"
 msgstr "Размер"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:631 meld/preferences.py:133
+#: meld/dirdiff.py:632 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Время изменения"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:639 meld/preferences.py:134
+#: meld/dirdiff.py:640 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Время изменения (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:647 meld/preferences.py:135
+#: meld/dirdiff.py:648 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Права доступа"
 
-#: meld/dirdiff.py:900
+#: meld/dirdiff.py:901
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (сканирование…)"
 
-#: meld/dirdiff.py:932 meld/dirdiff.py:964
+#: meld/dirdiff.py:933 meld/dirdiff.py:965
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Сканирование {folder}"
 
-#: meld/dirdiff.py:1100
+#: meld/dirdiff.py:1101
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Готово"
 
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1114
 msgid "Folder {} is being compared to itself"
 msgstr "Выполняется сравнение папки {} с самой собой"
 
-#: meld/dirdiff.py:1119
+#: meld/dirdiff.py:1120
 msgid "Folders have no differences"
 msgstr "Папки не имеют различий"
 
-#: meld/dirdiff.py:1121
+#: meld/dirdiff.py:1122
 msgid "Contents of scanned files in folders are identical."
 msgstr "Содержание сканированных файлов в папках идентично."
 
-#: meld/dirdiff.py:1123
+#: meld/dirdiff.py:1124
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 "Структура папок идентична, но содержание файлов не было просканированно."
 
-#: meld/dirdiff.py:1126
+#: meld/dirdiff.py:1127
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Включены фильтры файлов, поэтому часть файлов не учтена."
 
-#: meld/dirdiff.py:1128
+#: meld/dirdiff.py:1129
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Используются текстовые фильтры, которые могут маскировать различия между "
 "файлами."
 
-#: meld/dirdiff.py:1144 meld/filediff.py:1980
+#: meld/dirdiff.py:1145 meld/filediff.py:1982
 msgid "Hide"
 msgstr "Скрыть"
 
-#: meld/dirdiff.py:1146 meld/filediff.py:1982 meld/filediff.py:2012
-#: meld/filediff.py:2014 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1984 meld/filediff.py:2014
+#: meld/filediff.py:2016 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "С_крыть"
 
-#: meld/dirdiff.py:1155
+#: meld/dirdiff.py:1156
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "При сканировании этой папки произошло несколько ошибок"
 
-#: meld/dirdiff.py:1156
+#: meld/dirdiff.py:1157
 msgid "Files with invalid encodings found"
 msgstr "Найдены файлы с неверными кодировками"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1158
+#: meld/dirdiff.py:1159
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Некоторые файлы имеют неправильную кодировку. Названия что-то вроде:"
 
-#: meld/dirdiff.py:1160
+#: meld/dirdiff.py:1161
 msgid "Files hidden by case insensitive comparison"
 msgstr "Файлы, исключённые из сравнения из-за разного регистра"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1162
+#: meld/dirdiff.py:1163
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1786,17 +1795,17 @@ msgstr ""
 "Вы запускаете сравнение без учёта регистра в файловой системе, "
 "чувствительной к регистру. Следующие файлы в этой папке скрыты:"
 
-#: meld/dirdiff.py:1173
+#: meld/dirdiff.py:1174
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}” скрыто “{second_file}”"
 
-#: meld/dirdiff.py:1235
+#: meld/dirdiff.py:1236
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Заменить папку “%s”?"
 
-#: meld/dirdiff.py:1237
+#: meld/dirdiff.py:1238
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1805,11 +1814,11 @@ msgstr ""
 "Другая папка с таким же именем уже существует в “%s”.\n"
 "При замене существующей папки всё содержимое будет утеряно."
 
-#: meld/dirdiff.py:1250
+#: meld/dirdiff.py:1251
 msgid "Error copying file"
 msgstr "Ошибка при копировании файла"
 
-#: meld/dirdiff.py:1251
+#: meld/dirdiff.py:1252
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1822,112 +1831,112 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1276 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Ошибка при удалении {}"
 
-#: meld/dirdiff.py:1819
+#: meld/dirdiff.py:1825
 msgid "No folder"
 msgstr "Нет папки"
 
-#: meld/filediff.py:1156
+#: meld/filediff.py:1158
 msgid "Comparison results will be inaccurate"
 msgstr "Результаты сравнения будут некорректными"
 
-#: meld/filediff.py:1158
+#: meld/filediff.py:1160
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
 msgstr "Фильтр изменил количество строк в файле. Сравнение будет не точным."
 
-#: meld/filediff.py:1230
+#: meld/filediff.py:1232
 msgid "Mark conflict as resolved?"
 msgstr "Отметить конфликт как разрешённый?"
 
-#: meld/filediff.py:1232
+#: meld/filediff.py:1234
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Если конфликт был успешно разрешён, вы можете отметить его как решённый."
 
-#: meld/filediff.py:1235
+#: meld/filediff.py:1237
 msgid "Cancel"
 msgstr "Отменить"
 
-#: meld/filediff.py:1236
+#: meld/filediff.py:1238
 msgid "Mark _Resolved"
 msgstr "Отметить как _разрешённый"
 
-#: meld/filediff.py:1427 meld/filediff.py:1443
+#: meld/filediff.py:1429 meld/filediff.py:1445
 msgid "Add Synchronization Point"
 msgstr "Добавить точку синхронизации"
 
-#: meld/filediff.py:1431
+#: meld/filediff.py:1433
 msgid "Remove Synchronization Point"
 msgstr "Удалить точку синхронизации"
 
-#: meld/filediff.py:1435
+#: meld/filediff.py:1437
 msgid "Move Synchronization Point"
 msgstr "Переместить точку синхронизации"
 
-#: meld/filediff.py:1439
+#: meld/filediff.py:1441
 msgid "Match Synchronization Point"
 msgstr "Установить соответствие точки синхронизации"
 
-#: meld/filediff.py:1463
+#: meld/filediff.py:1465
 msgid "Clear Synchronization Points"
 msgstr "Удалить точки синхронизации"
 
-#: meld/filediff.py:1654
+#: meld/filediff.py:1656
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Возникла проблема при открытии файла “%s”."
 
-#: meld/filediff.py:1663
+#: meld/filediff.py:1665
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Файл %s выглядит как двоичный файл."
 
-#: meld/filediff.py:1665
+#: meld/filediff.py:1667
 msgid "Do you want to open the file using the default application?"
 msgstr "Открыть выбранный файл в приложении по умолчанию?"
 
-#: meld/filediff.py:1667
+#: meld/filediff.py:1669
 msgid "Open"
 msgstr "Открыть"
 
-#: meld/filediff.py:1689
+#: meld/filediff.py:1691
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Объединение файлов"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1705
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Вычисление различий"
 
-#: meld/filediff.py:1763
+#: meld/filediff.py:1765
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Файл %s изменился на диске"
 
-#: meld/filediff.py:1764
+#: meld/filediff.py:1766
 msgid "Do you want to reload the file?"
 msgstr "Хотите перезагрузить файл?"
 
-#: meld/filediff.py:1766
+#: meld/filediff.py:1768
 msgid "_Reload"
 msgstr "_Перезагрузить"
 
-#: meld/filediff.py:1936
+#: meld/filediff.py:1938
 msgid "File {} is being compared to itself"
 msgstr "Выполняется сравнение файла {} с самим собой"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1947
 msgid "Files are identical"
 msgstr "Файлы идентичны"
 
-#: meld/filediff.py:1958
+#: meld/filediff.py:1960
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1935,11 +1944,11 @@ msgstr ""
 "Используются текстовые фильтры, которые могут маскировать различия между "
 "файлами. Хотите сравнить файлы без использования фильтров?"
 
-#: meld/filediff.py:1963
+#: meld/filediff.py:1965
 msgid "Files differ in line endings only"
 msgstr "Файлы различаются только окончаниями строк"
 
-#: meld/filediff.py:1965
+#: meld/filediff.py:1967
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1948,15 +1957,15 @@ msgstr ""
 "Файлы идентичны, но различаются окончаниями строк:\n"
 "%s"
 
-#: meld/filediff.py:1985
+#: meld/filediff.py:1987
 msgid "Show without filters"
 msgstr "Показать без фильтров"
 
-#: meld/filediff.py:2007
+#: meld/filediff.py:2009
 msgid "Change highlighting incomplete"
 msgstr "Выделение изменений неполное"
 
-#: meld/filediff.py:2008
+#: meld/filediff.py:2010
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1965,19 +1974,19 @@ msgstr ""
 "можете дать Meld больше времени, чтобы их выделить, возможно это будет "
 "медленно."
 
-#: meld/filediff.py:2016
+#: meld/filediff.py:2018
 msgid "Keep highlighting"
 msgstr "Сохранить выделение"
 
-#: meld/filediff.py:2018
+#: meld/filediff.py:2020
 msgid "_Keep highlighting"
 msgstr "Сохранить в_ыделение"
 
-#: meld/filediff.py:2031
+#: meld/filediff.py:2033
 msgid "Saving failed"
 msgstr "Сохранение не удалось"
 
-#: meld/filediff.py:2032
+#: meld/filediff.py:2034
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1985,42 +1994,42 @@ msgstr ""
 "Рекомендуется скопировать критичные изменения в другую программу или файл "
 "для избежания потери данных."
 
-#: meld/filediff.py:2041
+#: meld/filediff.py:2043
 msgid "Save Left Pane As"
 msgstr "Сохранить левую панель как"
 
-#: meld/filediff.py:2043
+#: meld/filediff.py:2045
 msgid "Save Middle Pane As"
 msgstr "Сохранить среднюю панель как"
 
-#: meld/filediff.py:2045
+#: meld/filediff.py:2047
 msgid "Save Right Pane As"
 msgstr "Сохранить правую панель как"
 
-#: meld/filediff.py:2056
+#: meld/filediff.py:2058
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Файл %s изменился на диске, так как он был открыт"
 
-#: meld/filediff.py:2058
+#: meld/filediff.py:2060
 msgid "If you save it, any external changes will be lost."
 msgstr "Если вы сохраните его, любые внешние изменения будут потеряны."
 
-#: meld/filediff.py:2061
+#: meld/filediff.py:2063
 msgid "Save Anyway"
 msgstr "Всё равно сохранить"
 
-#: meld/filediff.py:2062
+#: meld/filediff.py:2064
 msgid "Don’t Save"
 msgstr "Не сохранять"
 
-#: meld/filediff.py:2104
+#: meld/filediff.py:2106
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
 msgstr "Файл “{}” содержит символы, недопустимые для текущей кодировки “{}”."
 
-#: meld/filediff.py:2108 meld/patchdialog.py:138
+#: meld/filediff.py:2110 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2029,16 +2038,16 @@ msgstr ""
 "Нельзя сохранить файл по следующей причине:\n"
 "%s"
 
-#: meld/filediff.py:2112 meld/patchdialog.py:137
+#: meld/filediff.py:2114 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Не удалось сохранить файл %s."
 
-#: meld/filediff.py:2522
+#: meld/filediff.py:2524
 msgid "Live comparison updating disabled"
 msgstr "Обновление Онлайн сравнения отключено"
 
-#: meld/filediff.py:2523
+#: meld/filediff.py:2525
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "

From cd402d5bd28033199bc0166a66107f5c25229536 Mon Sep 17 00:00:00 2001
From: Hugo Carvalho <hugokarvalho@hotmail.com>
Date: Sun, 17 Apr 2022 22:06:54 +0000
Subject: [PATCH 098/116] Update Portuguese translation

---
 po/pt.po | 341 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 185 insertions(+), 156 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index d4f82cda..504c4f3c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.6\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-01-30 21:55+0000\n"
-"PO-Revision-Date: 2022-02-26 22:07+0000\n"
+"POT-Creation-Date: 2022-04-09 23:19+0000\n"
+"PO-Revision-Date: 2022-04-17 23:06+0100\n"
 "Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
 "Language-Team: Português <https://l10n.gnome.org/teams/pt/>\n"
 "Language: pt\n"
@@ -531,218 +531,223 @@ msgctxt "shortcut window"
 msgid "Fullscreen"
 msgstr "Ecrã inteiro"
 
-#: meld/resources/gtk/help-overlay.ui:63
+#: meld/resources/gtk/help-overlay.ui:61
+msgctxt "shortcut window"
+msgid "Swap left and right panes"
+msgstr "Troca de painéis à esquerda e à direita"
+
+#: meld/resources/gtk/help-overlay.ui:70
 msgctxt "shortcut window"
 msgid "Panes"
 msgstr "Painéis"
 
-#: meld/resources/gtk/help-overlay.ui:68
+#: meld/resources/gtk/help-overlay.ui:75
 msgctxt "shortcut window"
 msgid "Previous comparison pane"
 msgstr "Painel de comparação anterior"
 
-#: meld/resources/gtk/help-overlay.ui:75
+#: meld/resources/gtk/help-overlay.ui:82
 msgctxt "shortcut window"
 msgid "Next comparison pane"
 msgstr "Próximo painel de comparação"
 
-#: meld/resources/gtk/help-overlay.ui:84
+#: meld/resources/gtk/help-overlay.ui:91
 msgctxt "shortcut window"
 msgid "Changes"
 msgstr "Alterações"
 
-#: meld/resources/gtk/help-overlay.ui:89
+#: meld/resources/gtk/help-overlay.ui:96
 msgctxt "shortcut window"
 msgid "Go to previous change"
 msgstr "Ir para a alteração anterior"
 
-#: meld/resources/gtk/help-overlay.ui:96
+#: meld/resources/gtk/help-overlay.ui:103
 msgctxt "shortcut window"
 msgid "Go to next change"
 msgstr "Ir para a alteração seguinte"
 
-#: meld/resources/gtk/help-overlay.ui:105
+#: meld/resources/gtk/help-overlay.ui:112
 msgctxt "shortcut window"
 msgid "Tabs"
 msgstr "Separadores"
 
-#: meld/resources/gtk/help-overlay.ui:110
+#: meld/resources/gtk/help-overlay.ui:117
 msgctxt "shortcut window"
 msgid "Go to previous tab"
 msgstr "Ir para o separador anterior"
 
-#: meld/resources/gtk/help-overlay.ui:117
+#: meld/resources/gtk/help-overlay.ui:124
 msgctxt "shortcut window"
 msgid "Go to next tab"
 msgstr "Ir para o separador seguinte"
 
-#: meld/resources/gtk/help-overlay.ui:124
+#: meld/resources/gtk/help-overlay.ui:131
 msgctxt "shortcut window"
 msgid "Switch to tab"
 msgstr "Mudar para o separador"
 
-#: meld/resources/gtk/help-overlay.ui:131
+#: meld/resources/gtk/help-overlay.ui:138
 msgctxt "shortcut window"
 msgid "Move tab left"
 msgstr "Mover separador à es_querda"
 
-#: meld/resources/gtk/help-overlay.ui:138
+#: meld/resources/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
 msgid "Move tab right"
 msgstr "Mover sepa_rador à direita"
 
-#: meld/resources/gtk/help-overlay.ui:147
+#: meld/resources/gtk/help-overlay.ui:154
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Editar"
 
-#: meld/resources/gtk/help-overlay.ui:152
+#: meld/resources/gtk/help-overlay.ui:159
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "Desfazer"
 
-#: meld/resources/gtk/help-overlay.ui:159
+#: meld/resources/gtk/help-overlay.ui:166
 msgctxt "shortcut window"
 msgid "Redo"
 msgstr "Refazer"
 
-#: meld/resources/gtk/help-overlay.ui:166
+#: meld/resources/gtk/help-overlay.ui:173
 msgctxt "shortcut window"
 msgid "Cut"
 msgstr "Cortar"
 
-#: meld/resources/gtk/help-overlay.ui:173
+#: meld/resources/gtk/help-overlay.ui:180
 msgctxt "shortcut window"
 msgid "Copy"
 msgstr "Copiar"
 
-#: meld/resources/gtk/help-overlay.ui:180
+#: meld/resources/gtk/help-overlay.ui:187
 msgctxt "shortcut window"
 msgid "Paste"
 msgstr "Colar"
 
-#: meld/resources/gtk/help-overlay.ui:187
+#: meld/resources/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Find"
 msgstr "Localizar"
 
-#: meld/resources/gtk/help-overlay.ui:194
+#: meld/resources/gtk/help-overlay.ui:201
 msgctxt "shortcut window"
 msgid "Find Next"
 msgstr "Localizar seguinte"
 
-#: meld/resources/gtk/help-overlay.ui:201
+#: meld/resources/gtk/help-overlay.ui:208
 msgctxt "shortcut window"
 msgid "Find Previous"
 msgstr "Localizar anterior"
 
-#: meld/resources/gtk/help-overlay.ui:208
+#: meld/resources/gtk/help-overlay.ui:215
 msgctxt "shortcut window"
 msgid "Replace"
 msgstr "Substituir"
 
-#: meld/resources/gtk/help-overlay.ui:217
+#: meld/resources/gtk/help-overlay.ui:224
 msgctxt "shortcut window"
 msgid "File comparison"
 msgstr "Comparação de ficheiros"
 
-#: meld/resources/gtk/help-overlay.ui:222
+#: meld/resources/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Save current file"
 msgstr "Guardar o ficheiro atual"
 
-#: meld/resources/gtk/help-overlay.ui:229
+#: meld/resources/gtk/help-overlay.ui:236
 msgctxt "shortcut window"
 msgid "Save current file to new path"
 msgstr "Guardar o ficheiro num novo caminho"
 
-#: meld/resources/gtk/help-overlay.ui:236
+#: meld/resources/gtk/help-overlay.ui:243
 msgctxt "shortcut window"
 msgid "Save all files in comparison"
 msgstr "Guardar todos os ficheiros na comparação"
 
-#: meld/resources/gtk/help-overlay.ui:243
+#: meld/resources/gtk/help-overlay.ui:250
 msgctxt "shortcut window"
 msgid "Previous conflict"
 msgstr "Conflito anterior"
 
-#: meld/resources/gtk/help-overlay.ui:250
+#: meld/resources/gtk/help-overlay.ui:257
 msgctxt "shortcut window"
 msgid "Next conflict"
 msgstr "Conflito seguinte"
 
-#: meld/resources/gtk/help-overlay.ui:257
+#: meld/resources/gtk/help-overlay.ui:264
 msgctxt "shortcut window"
 msgid "Push change to left"
 msgstr "Empurrar alteração atual para a esquerda"
 
-#: meld/resources/gtk/help-overlay.ui:264
+#: meld/resources/gtk/help-overlay.ui:271
 msgctxt "shortcut window"
 msgid "Push change to right"
 msgstr "Empurrar alteração atual para a direita"
 
-#: meld/resources/gtk/help-overlay.ui:271
+#: meld/resources/gtk/help-overlay.ui:278
 msgctxt "shortcut window"
 msgid "Pull change from left"
 msgstr "Puxar alteração da esquerda"
 
-#: meld/resources/gtk/help-overlay.ui:278
+#: meld/resources/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Pull change from right"
 msgstr "Puxar alteração da direita"
 
-#: meld/resources/gtk/help-overlay.ui:285
+#: meld/resources/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Copy change above left"
 msgstr "Copiar alteração acima do bloco esquerdo"
 
-#: meld/resources/gtk/help-overlay.ui:292
+#: meld/resources/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Copy change below left"
 msgstr "Copiar alteração abaixo do bloco esquerdo"
 
-#: meld/resources/gtk/help-overlay.ui:299
+#: meld/resources/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Copy change above right"
 msgstr "Copiar alteração acima do bloco direito"
 
-#: meld/resources/gtk/help-overlay.ui:306
+#: meld/resources/gtk/help-overlay.ui:313
 msgctxt "shortcut window"
 msgid "Copy change below right"
 msgstr "Copiar alteração abaixo do bloco direito"
 
-#: meld/resources/gtk/help-overlay.ui:313
-#: meld/resources/gtk/help-overlay.ui:341
+#: meld/resources/gtk/help-overlay.ui:320
+#: meld/resources/gtk/help-overlay.ui:348
 msgctxt "shortcut window"
 msgid "Delete change"
 msgstr "Eliminar alteração"
 
-#: meld/resources/gtk/help-overlay.ui:322
+#: meld/resources/gtk/help-overlay.ui:329
 msgctxt "shortcut window"
 msgid "Folder comparison"
 msgstr "Comparação de pastas"
 
-#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
 msgid "Copy to left"
 msgstr "Copiar para a esquerda"
 
-#: meld/resources/gtk/help-overlay.ui:334
+#: meld/resources/gtk/help-overlay.ui:341
 msgctxt "shortcut window"
 msgid "Copy to right"
 msgstr "Copiar para a direita"
 
-#: meld/resources/gtk/help-overlay.ui:350
+#: meld/resources/gtk/help-overlay.ui:357
 msgctxt "shortcut window"
 msgid "Version control comparison"
 msgstr "Comparação de controlo de versão"
 
-#: meld/resources/gtk/help-overlay.ui:355
+#: meld/resources/gtk/help-overlay.ui:362
 msgctxt "shortcut window"
 msgid "Commit to version control"
 msgstr "Submeter ao controlo de versão"
 
-#: meld/resources/gtk/help-overlay.ui:362
+#: meld/resources/gtk/help-overlay.ui:369
 msgctxt "shortcut window"
 msgid "Show/hide console output"
 msgstr "Alternar saída da consola"
@@ -799,88 +804,84 @@ msgstr "Console de controle de versão"
 msgid "Lock scrolling"
 msgstr "Bloquear deslocamento"
 
-#: meld/resources/gtk/menus.ui:73
+#: meld/resources/gtk/menus.ui:74
+msgid "Swap left and right panes"
+msgstr "Troca de painéis à esquerda e à direita"
+
+#: meld/resources/gtk/menus.ui:80
 msgid "Comparison"
 msgstr "Comparação"
 
-#: meld/resources/gtk/menus.ui:77
+#: meld/resources/gtk/menus.ui:84
 msgid "Merge All from Left"
 msgstr "Unir todas a partir da esquerda"
 
-#: meld/resources/gtk/menus.ui:81
+#: meld/resources/gtk/menus.ui:88
 msgid "Merge All from Right"
 msgstr "Unir todas a partir da direita"
 
-#: meld/resources/gtk/menus.ui:85
+#: meld/resources/gtk/menus.ui:92
 msgid "Merge All"
 msgstr "Unir todas"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
-msgid "Add Synchronization Point"
-msgstr "Adicionar ponto de sincronização"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
-msgid "Clear Synchronization Points"
-msgstr "Limpar pontos de sincronização"
-
-#: meld/resources/gtk/menus.ui:103
+#: meld/resources/gtk/menus.ui:99
 msgid "Format as Patch…"
 msgstr "Formatar como patch…"
 
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:108
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:112
 msgid "Keyboard Shortcuts"
 msgstr "Atalhos de teclado"
 
-#: meld/resources/gtk/menus.ui:120
+#: meld/resources/gtk/menus.ui:116
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: meld/resources/gtk/menus.ui:125
+#: meld/resources/gtk/menus.ui:121
 msgid "_About Meld"
 msgstr "Acerca do Meld"
 
-#: meld/resources/gtk/menus.ui:138
+#: meld/resources/gtk/menus.ui:134
 msgid "File status"
 msgstr "Estado do ficheiro"
 
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:136
 msgid "Same"
 msgstr "Mesmo"
 
-#: meld/resources/gtk/menus.ui:144
+#: meld/resources/gtk/menus.ui:140
 msgid "New"
 msgstr "Novo"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Alterado"
 
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:154
 msgid "Ignore filename case"
 msgstr "Ignorar maiúsculas/minúsculas em nomes de ficheiros"
 
-#: meld/resources/gtk/menus.ui:162
+#: meld/resources/gtk/menus.ui:158
 msgid "Normalize Unicode paths"
 msgstr "Normalizar as localizações Unicode"
 
-#: meld/resources/gtk/menus.ui:175
+#: meld/resources/gtk/menus.ui:171
 msgid "Normal"
 msgstr "Normal"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Sem versão"
 
-#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: meld/resources/gtk/menus.ui:190
+#: meld/resources/gtk/menus.ui:186
 msgid "Flatten folders"
 msgstr "Pastas planas"
 
@@ -1001,30 +1002,38 @@ msgid "_Compare selected files"
 msgstr "Comparar ficheiros selecionados"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+msgid "_Mark selected file"
+msgstr "_Marcar ficheiro selecionado"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Compare _with marked file"
+msgstr "Comparar _com ficheiro marcado"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "Copiar para a _esquerda"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "Copiar para a _direita"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "E_liminar selecionados"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "Recolher recursivamente"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "Expandir recursivamente"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "_Abrir externamente"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "_Copiar caminhos de ficheiros"
 
@@ -1142,7 +1151,7 @@ msgstr "Ficheiro 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:556
+#: meld/dirdiff.py:603
 msgid "Name"
 msgstr "Nome"
 
@@ -1182,7 +1191,7 @@ msgstr "Ajustado"
 msgid "Replace _All"
 msgstr "Su_bstituir tudo"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1180 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "Substitui_r"
 
@@ -1570,12 +1579,12 @@ msgstr "Se não guardar, as alterações serão perdidas permanentemente."
 msgid "Close _without Saving"
 msgstr "Fechar sem guardar"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1179
-#: meld/iohelpers.py:56 meld/iohelpers.py:113
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: meld/resources/ui/save-confirm-dialog.ui:52
+#: meld/resources/ui/save-confirm-dialog.ui:55
 msgid "_Save"
 msgstr "_Guardar"
 
@@ -1680,53 +1689,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:577 meld/preferences.py:132
+#: meld/dirdiff.py:624 meld/preferences.py:132
 msgid "Size"
 msgstr "Tamanho"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:585 meld/preferences.py:133
+#: meld/dirdiff.py:632 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Hora de modificação"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:593 meld/preferences.py:134
+#: meld/dirdiff.py:640 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Hora de modificação (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:601 meld/preferences.py:135
+#: meld/dirdiff.py:648 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Permissões"
 
-#: meld/dirdiff.py:851
+#: meld/dirdiff.py:901
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (a analisar…)"
 
-#: meld/dirdiff.py:883 meld/dirdiff.py:915
+#: meld/dirdiff.py:933 meld/dirdiff.py:965
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] A analisar {folder}"
 
-#: meld/dirdiff.py:1051
+#: meld/dirdiff.py:1101
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Concluído"
 
-#: meld/dirdiff.py:1064
+#: meld/dirdiff.py:1114
 msgid "Folder {} is being compared to itself"
 msgstr "Pasta {} sendo comparada consigo própria"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1120
 msgid "Folders have no differences"
 msgstr "As pastas não têm diferenças"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1122
 msgid "Contents of scanned files in folders are identical."
 msgstr "Os conteúdos de ficheiros pesquisados nas pastas são idênticos."
 
-#: meld/dirdiff.py:1074
+#: meld/dirdiff.py:1124
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1734,47 +1743,47 @@ msgstr ""
 "Os ficheiros pesquisados nas pastas parecem idênticos, mas os conteúdos não "
 "foram pesquisados."
 
-#: meld/dirdiff.py:1077
+#: meld/dirdiff.py:1127
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Os filtros de ficheiros estão em uso, pelo que nem todos os ficheiros foram "
 "pesquisados."
 
-#: meld/dirdiff.py:1079
+#: meld/dirdiff.py:1129
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Os filtros de texto estão em uso e podem estar a mascarar diferenças de "
 "conteúdo."
 
-#: meld/dirdiff.py:1095 meld/filediff.py:1917
+#: meld/dirdiff.py:1145 meld/filediff.py:1982
 msgid "Hide"
 msgstr "Ocultar %s"
 
-#: meld/dirdiff.py:1097 meld/filediff.py:1919 meld/filediff.py:1949
-#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1984 meld/filediff.py:2014
+#: meld/filediff.py:2016 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Ocultar"
 
-#: meld/dirdiff.py:1106
+#: meld/dirdiff.py:1156
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Ocorreram múltiplos erros ao pesquisar esta pasta"
 
-#: meld/dirdiff.py:1107
+#: meld/dirdiff.py:1157
 msgid "Files with invalid encodings found"
 msgstr "Encontrados ficheiros com codificação inválida"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1109
+#: meld/dirdiff.py:1159
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Alguns ficheiros tinham uma codificação incorreta. Os nomes são algo como:"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1161
 msgid "Files hidden by case insensitive comparison"
 msgstr "Ficheiros ocultos por comparação insensível a maiúsculas"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1163
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1783,17 +1792,17 @@ msgstr ""
 "ficheiros sensível a maiúsculas. Os seguintes ficheiros nesta pasta estão "
 "ocultos:"
 
-#: meld/dirdiff.py:1124
+#: meld/dirdiff.py:1174
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}” ocultado por “{second_file}”"
 
-#: meld/dirdiff.py:1183
+#: meld/dirdiff.py:1236
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Substituir pasta “%s”?"
 
-#: meld/dirdiff.py:1185
+#: meld/dirdiff.py:1238
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1803,11 +1812,11 @@ msgstr ""
 "Se substituir a pasta existente, todos os ficheiros nela contidos serão "
 "perdidos."
 
-#: meld/dirdiff.py:1198
+#: meld/dirdiff.py:1251
 msgid "Error copying file"
 msgstr "Erro ao copiar o ficheiro"
 
-#: meld/dirdiff.py:1199
+#: meld/dirdiff.py:1252
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1820,19 +1829,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1224 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Erro ao eliminar {}"
 
-#: meld/dirdiff.py:1715
+#: meld/dirdiff.py:1825
 msgid "No folder"
 msgstr "Sem pasta"
 
-#: meld/filediff.py:1149
+#: meld/filediff.py:1158
 msgid "Comparison results will be inaccurate"
 msgstr "Os resultados da comparação serão imprecisos"
 
-#: meld/filediff.py:1151
+#: meld/filediff.py:1160
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1840,74 +1849,94 @@ msgstr ""
 "O filtro alterou o número de linhas no ficheiro, o que não é suportado. A "
 "comparação será imprecisa."
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1232
 msgid "Mark conflict as resolved?"
 msgstr "Marcar conflito como resolvido?"
 
-#: meld/filediff.py:1225
+#: meld/filediff.py:1234
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Se o conflito foi resolvido com sucesso, pode agora marcá-lo como resolvido."
 
-#: meld/filediff.py:1227
+#: meld/filediff.py:1237
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: meld/filediff.py:1228
+#: meld/filediff.py:1238
 msgid "Mark _Resolved"
 msgstr "Marcar _resolvido"
 
-#: meld/filediff.py:1591
+#: meld/filediff.py:1429 meld/filediff.py:1445
+msgid "Add Synchronization Point"
+msgstr "Adicionar ponto de sincronização"
+
+#: meld/filediff.py:1433
+msgid "Remove Synchronization Point"
+msgstr "Remover ponto de sincronização"
+
+#: meld/filediff.py:1437
+msgid "Move Synchronization Point"
+msgstr "Mover ponto de sincronização"
+
+#: meld/filediff.py:1441
+msgid "Match Synchronization Point"
+msgstr "Coincidir ponto de sincronização"
+
+#: meld/filediff.py:1465
+msgid "Clear Synchronization Points"
+msgstr "Limpar pontos de sincronização"
+
+#: meld/filediff.py:1656
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Houve um problema ao abrir o ficheiro \"%s\"."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1665
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "%s parece ser um ficheiro binário."
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1667
 msgid "Do you want to open the file using the default application?"
 msgstr "Quer abrir o ficheiro usando a aplicação predefinida?"
 
-#: meld/filediff.py:1604
+#: meld/filediff.py:1669
 msgid "Open"
 msgstr "Abrir"
 
-#: meld/filediff.py:1626
+#: meld/filediff.py:1691
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] A unir ficheiros"
 
-#: meld/filediff.py:1640
+#: meld/filediff.py:1705
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] A calcular diferenças"
 
-#: meld/filediff.py:1700
+#: meld/filediff.py:1765
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "O ficheiro %s foi alterado no disco"
 
-#: meld/filediff.py:1701
+#: meld/filediff.py:1766
 msgid "Do you want to reload the file?"
 msgstr "Quer recarregar o ficheiro?"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1768
 msgid "_Reload"
 msgstr "_Recarregar"
 
-#: meld/filediff.py:1873
+#: meld/filediff.py:1938
 msgid "File {} is being compared to itself"
 msgstr "Arquivo {} sendo comparado consigo próprio"
 
-#: meld/filediff.py:1882
+#: meld/filediff.py:1947
 msgid "Files are identical"
 msgstr "Os ficheiros são idênticos"
 
-#: meld/filediff.py:1895
+#: meld/filediff.py:1960
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1915,11 +1944,11 @@ msgstr ""
 "Os filtros de texto estão em uso e podem estar a mascarar diferenças entre "
 "os ficheiros. Quer comparar os ficheiros sem filtragem?"
 
-#: meld/filediff.py:1900
+#: meld/filediff.py:1965
 msgid "Files differ in line endings only"
 msgstr "Os ficheiros só diferem nos fins de linha"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1967
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1928,15 +1957,15 @@ msgstr ""
 "Os ficheiros são idênticos, exceto por diferentes fins de linha:\n"
 "%s"
 
-#: meld/filediff.py:1922
+#: meld/filediff.py:1987
 msgid "Show without filters"
 msgstr "Mostrar sem filtros"
 
-#: meld/filediff.py:1944
+#: meld/filediff.py:2009
 msgid "Change highlighting incomplete"
 msgstr "Alterar realce incompleto"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:2010
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1945,19 +1974,19 @@ msgstr ""
 "forçar o Meld para demorar mais a realçar alterações grandes, mas pode ser "
 "lento."
 
-#: meld/filediff.py:1953
+#: meld/filediff.py:2018
 msgid "Keep highlighting"
 msgstr "Manter realce"
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:2020
 msgid "_Keep highlighting"
 msgstr "_Manter realce"
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:2033
 msgid "Saving failed"
 msgstr "Falha ao guardar"
 
-#: meld/filediff.py:1969
+#: meld/filediff.py:2034
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1965,36 +1994,36 @@ msgstr ""
 "Por favor, considere copiar quaisquer alterações críticas para outro "
 "programa ou ficheiro para evitar a perda de dados."
 
-#: meld/filediff.py:1978
+#: meld/filediff.py:2043
 msgid "Save Left Pane As"
 msgstr "Guardar painel esquerdo como"
 
-#: meld/filediff.py:1980
+#: meld/filediff.py:2045
 msgid "Save Middle Pane As"
 msgstr "Guardar painel central como"
 
-#: meld/filediff.py:1982
+#: meld/filediff.py:2047
 msgid "Save Right Pane As"
 msgstr "Guardar painel direito como"
 
-#: meld/filediff.py:1993
+#: meld/filediff.py:2058
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "O ficheiro %s foi alterado no disco desde que foi aberto"
 
-#: meld/filediff.py:1995
+#: meld/filediff.py:2060
 msgid "If you save it, any external changes will be lost."
 msgstr "Se o guardar, todas as alterações externas serão perdidas."
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2063
 msgid "Save Anyway"
 msgstr "Guardar mesmo assim"
 
-#: meld/filediff.py:1999
+#: meld/filediff.py:2064
 msgid "Don’t Save"
 msgstr "Não guardar"
 
-#: meld/filediff.py:2041
+#: meld/filediff.py:2106
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2002,7 +2031,7 @@ msgstr ""
 "O ficheiro “{}” contém caracteres que não podem ser codificados ao usar a "
 "sua codificação atual “{}”."
 
-#: meld/filediff.py:2045 meld/patchdialog.py:138
+#: meld/filediff.py:2110 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2011,16 +2040,16 @@ msgstr ""
 "Não foi possível guardar o ficheiro devido a:\n"
 "%s"
 
-#: meld/filediff.py:2049 meld/patchdialog.py:137
+#: meld/filediff.py:2114 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Impossível guardar o ficheiro %s."
 
-#: meld/filediff.py:2450
+#: meld/filediff.py:2524
 msgid "Live comparison updating disabled"
 msgstr "Atualização ao vivo da comparação desativada"
 
-#: meld/filediff.py:2451
+#: meld/filediff.py:2525
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2046,16 +2075,16 @@ msgstr "“{}” não pode ser colocado no lixo. Deseja elimina-lo imediatamente
 msgid "This remote location does not support sending items to the trash."
 msgstr "Esta localização remota não suporta enviar itens para o lixo."
 
-#: meld/iohelpers.py:57
+#: meld/iohelpers.py:58
 msgid "_Delete Permanently"
 msgstr "Eliminar _definitivamente"
 
-#: meld/iohelpers.py:107
+#: meld/iohelpers.py:110
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Substituir ficheiro “%s”?"
 
-#: meld/iohelpers.py:109
+#: meld/iohelpers.py:112
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2181,7 +2210,7 @@ msgstr "Necessários três ficheiros para união automática, obtidos %r"
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Impossível comparar uma mistura de ficheiros e pastas"
 
-#: meld/misc.py:150
+#: meld/misc.py:154
 msgid ""
 "{}\n"
 "\n"
@@ -2193,7 +2222,7 @@ msgstr ""
 "O Meld encontrou um erro crítico na execução:\n"
 "<tt>{}</tt>"
 
-#: meld/misc.py:201
+#: meld/misc.py:205
 msgid "[None]"
 msgstr "[Nenhum]"
 

From 5175bcb1099b1b237b1d7967278af114a145b1de Mon Sep 17 00:00:00 2001
From: Luming Zh <lumingzh@qq.com>
Date: Mon, 18 Apr 2022 16:33:31 +0000
Subject: [PATCH 099/116] Update Chinese (China) translation

---
 po/zh_CN.po | 318 ++++++++++++++++++++++++++++------------------------
 1 file changed, 170 insertions(+), 148 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 52d25835..5f2e3662 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,21 +9,22 @@
 # Wylmer Wang <wantinghard@gmail.com>, 2013.
 # Whired Planck <fungdaat31@outlook.com>, 2020-2021.
 # Dingzhong Chen <wsxy162@gmail.com>, 2021.
+# lumingzh <lumingzh@qq.com>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-03-15 12:52+0000\n"
-"PO-Revision-Date: 2022-03-16 08:17-0400\n"
-"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
+"POT-Creation-Date: 2022-04-09 23:19+0000\n"
+"PO-Revision-Date: 2022-04-18 19:13+0800\n"
+"Last-Translator: lumingzh <lumingzh@qq.com>\n"
 "Language-Team: Chinese - China <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.4.3\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: Gtranslator 42.0\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
 #: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
@@ -485,218 +486,223 @@ msgctxt "shortcut window"
 msgid "Fullscreen"
 msgstr "全屏"
 
-#: meld/resources/gtk/help-overlay.ui:63
+#: meld/resources/gtk/help-overlay.ui:61
+msgctxt "shortcut window"
+msgid "Swap left and right panes"
+msgstr "交换左右窗格"
+
+#: meld/resources/gtk/help-overlay.ui:70
 msgctxt "shortcut window"
 msgid "Panes"
 msgstr "窗格"
 
-#: meld/resources/gtk/help-overlay.ui:68
+#: meld/resources/gtk/help-overlay.ui:75
 msgctxt "shortcut window"
 msgid "Previous comparison pane"
 msgstr "上一个比较窗格"
 
-#: meld/resources/gtk/help-overlay.ui:75
+#: meld/resources/gtk/help-overlay.ui:82
 msgctxt "shortcut window"
 msgid "Next comparison pane"
 msgstr "下一个比较窗格"
 
-#: meld/resources/gtk/help-overlay.ui:84
+#: meld/resources/gtk/help-overlay.ui:91
 msgctxt "shortcut window"
 msgid "Changes"
 msgstr "更改"
 
-#: meld/resources/gtk/help-overlay.ui:89
+#: meld/resources/gtk/help-overlay.ui:96
 msgctxt "shortcut window"
 msgid "Go to previous change"
 msgstr "转到上一个更改"
 
-#: meld/resources/gtk/help-overlay.ui:96
+#: meld/resources/gtk/help-overlay.ui:103
 msgctxt "shortcut window"
 msgid "Go to next change"
 msgstr "转到下一个更改"
 
-#: meld/resources/gtk/help-overlay.ui:105
+#: meld/resources/gtk/help-overlay.ui:112
 msgctxt "shortcut window"
 msgid "Tabs"
 msgstr "标签页"
 
-#: meld/resources/gtk/help-overlay.ui:110
+#: meld/resources/gtk/help-overlay.ui:117
 msgctxt "shortcut window"
 msgid "Go to previous tab"
 msgstr "转到上一个标签页"
 
-#: meld/resources/gtk/help-overlay.ui:117
+#: meld/resources/gtk/help-overlay.ui:124
 msgctxt "shortcut window"
 msgid "Go to next tab"
 msgstr "转到下一个标签页"
 
-#: meld/resources/gtk/help-overlay.ui:124
+#: meld/resources/gtk/help-overlay.ui:131
 msgctxt "shortcut window"
 msgid "Switch to tab"
 msgstr "切换到标签页"
 
-#: meld/resources/gtk/help-overlay.ui:131
+#: meld/resources/gtk/help-overlay.ui:138
 msgctxt "shortcut window"
 msgid "Move tab left"
 msgstr "左移标签页"
 
-#: meld/resources/gtk/help-overlay.ui:138
+#: meld/resources/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
 msgid "Move tab right"
 msgstr "右移标签页"
 
-#: meld/resources/gtk/help-overlay.ui:147
+#: meld/resources/gtk/help-overlay.ui:154
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "编辑"
 
-#: meld/resources/gtk/help-overlay.ui:152
+#: meld/resources/gtk/help-overlay.ui:159
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "撤消"
 
-#: meld/resources/gtk/help-overlay.ui:159
+#: meld/resources/gtk/help-overlay.ui:166
 msgctxt "shortcut window"
 msgid "Redo"
 msgstr "重做"
 
-#: meld/resources/gtk/help-overlay.ui:166
+#: meld/resources/gtk/help-overlay.ui:173
 msgctxt "shortcut window"
 msgid "Cut"
 msgstr "剪切"
 
-#: meld/resources/gtk/help-overlay.ui:173
+#: meld/resources/gtk/help-overlay.ui:180
 msgctxt "shortcut window"
 msgid "Copy"
 msgstr "复制"
 
-#: meld/resources/gtk/help-overlay.ui:180
+#: meld/resources/gtk/help-overlay.ui:187
 msgctxt "shortcut window"
 msgid "Paste"
 msgstr "粘贴"
 
-#: meld/resources/gtk/help-overlay.ui:187
+#: meld/resources/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Find"
 msgstr "查找"
 
-#: meld/resources/gtk/help-overlay.ui:194
+#: meld/resources/gtk/help-overlay.ui:201
 msgctxt "shortcut window"
 msgid "Find Next"
 msgstr "查找下一个"
 
-#: meld/resources/gtk/help-overlay.ui:201
+#: meld/resources/gtk/help-overlay.ui:208
 msgctxt "shortcut window"
 msgid "Find Previous"
 msgstr "查找上一个"
 
-#: meld/resources/gtk/help-overlay.ui:208
+#: meld/resources/gtk/help-overlay.ui:215
 msgctxt "shortcut window"
 msgid "Replace"
 msgstr "替换"
 
-#: meld/resources/gtk/help-overlay.ui:217
+#: meld/resources/gtk/help-overlay.ui:224
 msgctxt "shortcut window"
 msgid "File comparison"
 msgstr "文件比较"
 
-#: meld/resources/gtk/help-overlay.ui:222
+#: meld/resources/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Save current file"
 msgstr "保存当前文件"
 
-#: meld/resources/gtk/help-overlay.ui:229
+#: meld/resources/gtk/help-overlay.ui:236
 msgctxt "shortcut window"
 msgid "Save current file to new path"
 msgstr "保存当前文件到新路径"
 
-#: meld/resources/gtk/help-overlay.ui:236
+#: meld/resources/gtk/help-overlay.ui:243
 msgctxt "shortcut window"
 msgid "Save all files in comparison"
 msgstr "保存比较中的所有文件"
 
-#: meld/resources/gtk/help-overlay.ui:243
+#: meld/resources/gtk/help-overlay.ui:250
 msgctxt "shortcut window"
 msgid "Previous conflict"
 msgstr "上一个冲突"
 
-#: meld/resources/gtk/help-overlay.ui:250
+#: meld/resources/gtk/help-overlay.ui:257
 msgctxt "shortcut window"
 msgid "Next conflict"
 msgstr "下一个冲突"
 
-#: meld/resources/gtk/help-overlay.ui:257
+#: meld/resources/gtk/help-overlay.ui:264
 msgctxt "shortcut window"
 msgid "Push change to left"
 msgstr "推送更改到左侧"
 
-#: meld/resources/gtk/help-overlay.ui:264
+#: meld/resources/gtk/help-overlay.ui:271
 msgctxt "shortcut window"
 msgid "Push change to right"
 msgstr "推送更改到右侧"
 
-#: meld/resources/gtk/help-overlay.ui:271
+#: meld/resources/gtk/help-overlay.ui:278
 msgctxt "shortcut window"
 msgid "Pull change from left"
 msgstr "从左侧拉取更改"
 
-#: meld/resources/gtk/help-overlay.ui:278
+#: meld/resources/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Pull change from right"
 msgstr "从右侧拉取更改"
 
-#: meld/resources/gtk/help-overlay.ui:285
+#: meld/resources/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Copy change above left"
 msgstr "复制更改到左侧上方"
 
-#: meld/resources/gtk/help-overlay.ui:292
+#: meld/resources/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Copy change below left"
 msgstr "复制更改到左侧下方"
 
-#: meld/resources/gtk/help-overlay.ui:299
+#: meld/resources/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Copy change above right"
 msgstr "复制更改到右侧上方"
 
-#: meld/resources/gtk/help-overlay.ui:306
+#: meld/resources/gtk/help-overlay.ui:313
 msgctxt "shortcut window"
 msgid "Copy change below right"
 msgstr "复制更改到右侧下方"
 
-#: meld/resources/gtk/help-overlay.ui:313
-#: meld/resources/gtk/help-overlay.ui:341
+#: meld/resources/gtk/help-overlay.ui:320
+#: meld/resources/gtk/help-overlay.ui:348
 msgctxt "shortcut window"
 msgid "Delete change"
 msgstr "删除更改"
 
-#: meld/resources/gtk/help-overlay.ui:322
+#: meld/resources/gtk/help-overlay.ui:329
 msgctxt "shortcut window"
 msgid "Folder comparison"
 msgstr "文件夹比较"
 
-#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
 msgid "Copy to left"
 msgstr "复制到左侧"
 
-#: meld/resources/gtk/help-overlay.ui:334
+#: meld/resources/gtk/help-overlay.ui:341
 msgctxt "shortcut window"
 msgid "Copy to right"
 msgstr "复制到右侧"
 
-#: meld/resources/gtk/help-overlay.ui:350
+#: meld/resources/gtk/help-overlay.ui:357
 msgctxt "shortcut window"
 msgid "Version control comparison"
 msgstr "版本控制比较"
 
-#: meld/resources/gtk/help-overlay.ui:355
+#: meld/resources/gtk/help-overlay.ui:362
 msgctxt "shortcut window"
 msgid "Commit to version control"
 msgstr "提交至版本控制"
 
-#: meld/resources/gtk/help-overlay.ui:362
+#: meld/resources/gtk/help-overlay.ui:369
 msgctxt "shortcut window"
 msgid "Show/hide console output"
 msgstr "显示/隐藏终端输出"
@@ -753,88 +759,84 @@ msgstr "版本控制终端"
 msgid "Lock scrolling"
 msgstr "锁定滚动"
 
-#: meld/resources/gtk/menus.ui:73
+#: meld/resources/gtk/menus.ui:74
+msgid "Swap left and right panes"
+msgstr "交换左右窗格"
+
+#: meld/resources/gtk/menus.ui:80
 msgid "Comparison"
 msgstr "比较"
 
-#: meld/resources/gtk/menus.ui:77
+#: meld/resources/gtk/menus.ui:84
 msgid "Merge All from Left"
 msgstr "合并左侧的全部更改"
 
-#: meld/resources/gtk/menus.ui:81
+#: meld/resources/gtk/menus.ui:88
 msgid "Merge All from Right"
 msgstr "合并右侧的全部更改"
 
-#: meld/resources/gtk/menus.ui:85
+#: meld/resources/gtk/menus.ui:92
 msgid "Merge All"
 msgstr "合并全部"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
-msgid "Add Synchronization Point"
-msgstr "增加同步点"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
-msgid "Clear Synchronization Points"
-msgstr "清除同步点"
-
-#: meld/resources/gtk/menus.ui:103
+#: meld/resources/gtk/menus.ui:99
 msgid "Format as Patch…"
 msgstr "格式化为补丁…"
 
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:108
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:112
 msgid "Keyboard Shortcuts"
 msgstr "快捷键"
 
-#: meld/resources/gtk/menus.ui:120
+#: meld/resources/gtk/menus.ui:116
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: meld/resources/gtk/menus.ui:125
+#: meld/resources/gtk/menus.ui:121
 msgid "_About Meld"
 msgstr "关于 Meld (_A)"
 
-#: meld/resources/gtk/menus.ui:138
+#: meld/resources/gtk/menus.ui:134
 msgid "File status"
 msgstr "文件状态"
 
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:136
 msgid "Same"
 msgstr "相同"
 
-#: meld/resources/gtk/menus.ui:144
+#: meld/resources/gtk/menus.ui:140
 msgid "New"
 msgstr "新建"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "已修改"
 
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:154
 msgid "Ignore filename case"
 msgstr "忽略文件名大小写"
 
-#: meld/resources/gtk/menus.ui:162
+#: meld/resources/gtk/menus.ui:158
 msgid "Normalize Unicode paths"
-msgstr ""
+msgstr "标准化万国码路径"
 
-#: meld/resources/gtk/menus.ui:175
+#: meld/resources/gtk/menus.ui:171
 msgid "Normal"
-msgstr "正常"
+msgstr "标准"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "未版本控制"
 
-#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "已忽略"
 
-#: meld/resources/gtk/menus.ui:190
+#: meld/resources/gtk/menus.ui:186
 msgid "Flatten folders"
 msgstr "收合文件夹"
 
@@ -1107,7 +1109,7 @@ msgstr "文件 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:602
+#: meld/dirdiff.py:603
 msgid "Name"
 msgstr "名称"
 
@@ -1147,7 +1149,7 @@ msgstr "有换行"
 msgid "Replace _All"
 msgstr "全部替换(_A)"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "替换(_R)"
 
@@ -1527,7 +1529,7 @@ msgstr "如果您不保存，更改将永久丢失。"
 msgid "Close _without Saving"
 msgstr "关闭但不保存(_W)"
 
-#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229
 #: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -1637,94 +1639,94 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:623 meld/preferences.py:132
+#: meld/dirdiff.py:624 meld/preferences.py:132
 msgid "Size"
 msgstr "大小"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:631 meld/preferences.py:133
+#: meld/dirdiff.py:632 meld/preferences.py:133
 msgid "Modification time"
 msgstr "修改时间"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:639 meld/preferences.py:134
+#: meld/dirdiff.py:640 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "修改时间（ISO）"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:647 meld/preferences.py:135
+#: meld/dirdiff.py:648 meld/preferences.py:135
 msgid "Permissions"
 msgstr "权限"
 
-#: meld/dirdiff.py:900
+#: meld/dirdiff.py:901
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (正在扫描…)"
 
-#: meld/dirdiff.py:932 meld/dirdiff.py:964
+#: meld/dirdiff.py:933 meld/dirdiff.py:965
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] 正在扫描 {folder}"
 
-#: meld/dirdiff.py:1100
+#: meld/dirdiff.py:1101
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] 完成"
 
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1114
 msgid "Folder {} is being compared to itself"
 msgstr "文件夹 {} 正与自己进行比较"
 
-#: meld/dirdiff.py:1119
+#: meld/dirdiff.py:1120
 msgid "Folders have no differences"
 msgstr "文件夹间没有差异"
 
-#: meld/dirdiff.py:1121
+#: meld/dirdiff.py:1122
 msgid "Contents of scanned files in folders are identical."
 msgstr "文件夹中的已扫描文件的内容相同。"
 
-#: meld/dirdiff.py:1123
+#: meld/dirdiff.py:1124
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr "文件夹中的已扫描文件似乎相同，但是内容尚未被扫描。"
 
-#: meld/dirdiff.py:1126
+#: meld/dirdiff.py:1127
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "文件过滤器正在使用中，因此并非所有文件都已被扫描。"
 
-#: meld/dirdiff.py:1128
+#: meld/dirdiff.py:1129
 msgid "Text filters are in use and may be masking content differences."
 msgstr "正在使用文本过滤器，可能会屏蔽文件之间的差异。"
 
-#: meld/dirdiff.py:1144 meld/filediff.py:1919
+#: meld/dirdiff.py:1145 meld/filediff.py:1982
 msgid "Hide"
 msgstr "隐藏"
 
-#: meld/dirdiff.py:1146 meld/filediff.py:1921 meld/filediff.py:1951
-#: meld/filediff.py:1953 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1984 meld/filediff.py:2014
+#: meld/filediff.py:2016 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "隐藏(_D)"
 
-#: meld/dirdiff.py:1155
+#: meld/dirdiff.py:1156
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "扫描此文件夹时出现了多个错误"
 
-#: meld/dirdiff.py:1156
+#: meld/dirdiff.py:1157
 msgid "Files with invalid encodings found"
 msgstr "发现编码无效的文件"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1158
+#: meld/dirdiff.py:1159
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "某些文件编码不正确。名称是这样的："
 
-#: meld/dirdiff.py:1160
+#: meld/dirdiff.py:1161
 msgid "Files hidden by case insensitive comparison"
 msgstr "因不区分大小写比较而隐藏的文件"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1162
+#: meld/dirdiff.py:1163
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1732,17 +1734,17 @@ msgstr ""
 "您正在区分大小写的文件系统上运行不区分大小写的比较。此文件夹中的以下文件被隐"
 "藏："
 
-#: meld/dirdiff.py:1173
+#: meld/dirdiff.py:1174
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}” 已被 “{second_file}”隐藏"
 
-#: meld/dirdiff.py:1235
+#: meld/dirdiff.py:1236
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "要替换文件夹“%s”吗？"
 
-#: meld/dirdiff.py:1237
+#: meld/dirdiff.py:1238
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1751,11 +1753,11 @@ msgstr ""
 "另一个同名的文件夹已存在于“%s”中。\n"
 "如果要替换已存在的文件夹，其中的所有文件都将丢失。"
 
-#: meld/dirdiff.py:1250
+#: meld/dirdiff.py:1251
 msgid "Error copying file"
 msgstr "复制文件时出错"
 
-#: meld/dirdiff.py:1251
+#: meld/dirdiff.py:1252
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1768,101 +1770,121 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1276 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "删除 {} 时出错"
 
-#: meld/dirdiff.py:1819
+#: meld/dirdiff.py:1825
 msgid "No folder"
 msgstr "没有文件夹"
 
-#: meld/filediff.py:1149
+#: meld/filediff.py:1158
 msgid "Comparison results will be inaccurate"
 msgstr "比较结果将会不准确"
 
-#: meld/filediff.py:1151
+#: meld/filediff.py:1160
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
 msgstr "过滤器更改了文件的行数，该行为不受支持。比较的结果将不准确。"
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1232
 msgid "Mark conflict as resolved?"
 msgstr "要标记冲突为“已解决”吗？"
 
-#: meld/filediff.py:1225
+#: meld/filediff.py:1234
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "如果冲突已成功解决，可以现在将其标记为已解决。"
 
-#: meld/filediff.py:1228
+#: meld/filediff.py:1237
 msgid "Cancel"
 msgstr "取消"
 
-#: meld/filediff.py:1229
+#: meld/filediff.py:1238
 msgid "Mark _Resolved"
 msgstr "标记为已解决(_R)"
 
-#: meld/filediff.py:1593
+#: meld/filediff.py:1429 meld/filediff.py:1445
+msgid "Add Synchronization Point"
+msgstr "增加同步点"
+
+#: meld/filediff.py:1433
+msgid "Remove Synchronization Point"
+msgstr "移除同步点"
+
+#: meld/filediff.py:1437
+msgid "Move Synchronization Point"
+msgstr "移动同步点"
+
+#: meld/filediff.py:1441
+msgid "Match Synchronization Point"
+msgstr "匹配同步点"
+
+#: meld/filediff.py:1465
+msgid "Clear Synchronization Points"
+msgstr "清除同步点"
+
+#: meld/filediff.py:1656
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "打开文件“%s”时出现问题。"
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1665
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "文件 %s 似乎是二进制文件。"
 
-#: meld/filediff.py:1604
+#: meld/filediff.py:1667
 msgid "Do you want to open the file using the default application?"
 msgstr "确定要使用默认程序打开文件吗？"
 
-#: meld/filediff.py:1606
+#: meld/filediff.py:1669
 msgid "Open"
 msgstr "打开"
 
-#: meld/filediff.py:1628
+#: meld/filediff.py:1691
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] 合并文件"
 
-#: meld/filediff.py:1642
+#: meld/filediff.py:1705
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] 计算差异"
 
-#: meld/filediff.py:1702
+#: meld/filediff.py:1765
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "文件 %s 在磁盘上已更改"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1766
 msgid "Do you want to reload the file?"
 msgstr "您想重新加载该文件吗？"
 
-#: meld/filediff.py:1705
+#: meld/filediff.py:1768
 msgid "_Reload"
 msgstr "重新加载(_R)"
 
-#: meld/filediff.py:1875
+#: meld/filediff.py:1938
 msgid "File {} is being compared to itself"
 msgstr "文件 {} 正与自己进行比较"
 
-#: meld/filediff.py:1884
+#: meld/filediff.py:1947
 msgid "Files are identical"
 msgstr "文件完全相同"
 
-#: meld/filediff.py:1897
+#: meld/filediff.py:1960
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
 msgstr "正在使用文本过滤器，可能会屏蔽文件之间的差异。您想比较未过滤的文件吗？"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1965
 msgid "Files differ in line endings only"
 msgstr "文件间仅行尾存在差异"
 
-#: meld/filediff.py:1904
+#: meld/filediff.py:1967
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1871,75 +1893,75 @@ msgstr ""
 "文件除了行尾均相同，差异细节：\n"
 "%s"
 
-#: meld/filediff.py:1924
+#: meld/filediff.py:1987
 msgid "Show without filters"
 msgstr "显示不过滤的结果"
 
-#: meld/filediff.py:1946
+#: meld/filediff.py:2009
 msgid "Change highlighting incomplete"
 msgstr "更改的高亮显示不完整"
 
-#: meld/filediff.py:1947
+#: meld/filediff.py:2010
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
 msgstr ""
 "某些更改由于太大没有被高亮。您可以强制高亮显示大幅的更改，尽管这可能很慢。"
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:2018
 msgid "Keep highlighting"
 msgstr "保持语法高亮"
 
-#: meld/filediff.py:1957
+#: meld/filediff.py:2020
 msgid "_Keep highlighting"
 msgstr "保持语法高亮(_K)"
 
-#: meld/filediff.py:1970
+#: meld/filediff.py:2033
 msgid "Saving failed"
 msgstr "保存失败"
 
-#: meld/filediff.py:1971
+#: meld/filediff.py:2034
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
 msgstr "请考虑将任何重要的更改复制到其他程序或文件中以避免数据丢失。"
 
-#: meld/filediff.py:1980
+#: meld/filediff.py:2043
 msgid "Save Left Pane As"
 msgstr "左侧窗格保存为"
 
-#: meld/filediff.py:1982
+#: meld/filediff.py:2045
 msgid "Save Middle Pane As"
 msgstr "中间窗格保存为"
 
-#: meld/filediff.py:1984
+#: meld/filediff.py:2047
 msgid "Save Right Pane As"
 msgstr "右侧窗格保存为"
 
-#: meld/filediff.py:1995
+#: meld/filediff.py:2058
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "文件 %s 打开后在磁盘上已更改"
 
-#: meld/filediff.py:1997
+#: meld/filediff.py:2060
 msgid "If you save it, any external changes will be lost."
 msgstr "如果您保存它，外部的更改将丢失。"
 
-#: meld/filediff.py:2000
+#: meld/filediff.py:2063
 msgid "Save Anyway"
 msgstr "依然保存"
 
-#: meld/filediff.py:2001
+#: meld/filediff.py:2064
 msgid "Don’t Save"
 msgstr "不保存"
 
-#: meld/filediff.py:2043
+#: meld/filediff.py:2106
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
 msgstr "文件“{}”包含了其当前编码“{}”无法编码的字符。"
 
-#: meld/filediff.py:2047 meld/patchdialog.py:138
+#: meld/filediff.py:2110 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1948,16 +1970,16 @@ msgstr ""
 "由于以下原因无法保存文件：\n"
 "%s"
 
-#: meld/filediff.py:2051 meld/patchdialog.py:137
+#: meld/filediff.py:2114 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "无法保存文件 %s。"
 
-#: meld/filediff.py:2452
+#: meld/filediff.py:2524
 msgid "Live comparison updating disabled"
 msgstr "实时比较更新已禁用"
 
-#: meld/filediff.py:2453
+#: meld/filediff.py:2525
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "

From b1beb207c302a3ef952b3c5a066d24faa4a567b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sabri=20=C3=9Cnal?= <libreajans@gmail.com>
Date: Wed, 27 Apr 2022 17:39:00 +0000
Subject: [PATCH 100/116] Update Turkish translation

---
 po/tr.po | 317 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 169 insertions(+), 148 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index 997c66ac..3533a73a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,27 +1,27 @@
 # Turkish translation for Meld
-# Copyright (C) 2004-2019 THE meld'S COPYRIGHT HOLDER
+# Copyright (C) 2004-2022 THE meld'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the meld package.
 #
 # Özgür Sarıer <ozgursarier1011601115@gmail.com>, 2013.
 # Simge Sezgin <simgesezgin88@gmail.com>, 2015.
-# Sabri Ünal <libreajans@gmail.com>, 2019.
 # Muhammet Kara <muhammetk@gmail.com>, 2013-2021.
-# Emin Tufan Çetin <etcetin@gmail.com>, 2017-2021.
+# Emin Tufan Çetin <etcetin@gmail.com>, 2017-2022.
+# Sabri Ünal <libreajans@gmail.com>, 2019, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-03-15 12:52+0000\n"
-"PO-Revision-Date: 2022-03-20 22:28+0300\n"
-"Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n"
+"POT-Creation-Date: 2022-04-09 23:19+0000\n"
+"PO-Revision-Date: 2022-04-24 16:31+0300\n"
+"Last-Translator: Sabri Ünal <libreajans@gmail.com>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.4.3\n"
+"X-Generator: Poedit 3.0.1\n"
 "X-POOTLE-MTIME: 1428188634.000000\n"
 "X-DL-Team: tr\n"
 "X-DL-Module: meld\n"
@@ -541,218 +541,223 @@ msgctxt "shortcut window"
 msgid "Fullscreen"
 msgstr "Tam Ekran"
 
-#: meld/resources/gtk/help-overlay.ui:63
+#: meld/resources/gtk/help-overlay.ui:61
+msgctxt "shortcut window"
+msgid "Swap left and right panes"
+msgstr "Sol ve sağ bölmeleri yer değiştir"
+
+#: meld/resources/gtk/help-overlay.ui:70
 msgctxt "shortcut window"
 msgid "Panes"
 msgstr "Bölmeler"
 
-#: meld/resources/gtk/help-overlay.ui:68
+#: meld/resources/gtk/help-overlay.ui:75
 msgctxt "shortcut window"
 msgid "Previous comparison pane"
 msgstr "Önceki karşılaştırma bölmesi"
 
-#: meld/resources/gtk/help-overlay.ui:75
+#: meld/resources/gtk/help-overlay.ui:82
 msgctxt "shortcut window"
 msgid "Next comparison pane"
 msgstr "Sonraki karşılaştırma bölmesi"
 
-#: meld/resources/gtk/help-overlay.ui:84
+#: meld/resources/gtk/help-overlay.ui:91
 msgctxt "shortcut window"
 msgid "Changes"
 msgstr "Değişiklikler"
 
-#: meld/resources/gtk/help-overlay.ui:89
+#: meld/resources/gtk/help-overlay.ui:96
 msgctxt "shortcut window"
 msgid "Go to previous change"
 msgstr "Önceki değişikliğe git"
 
-#: meld/resources/gtk/help-overlay.ui:96
+#: meld/resources/gtk/help-overlay.ui:103
 msgctxt "shortcut window"
 msgid "Go to next change"
 msgstr "Sonraki değişikliğe git"
 
-#: meld/resources/gtk/help-overlay.ui:105
+#: meld/resources/gtk/help-overlay.ui:112
 msgctxt "shortcut window"
 msgid "Tabs"
 msgstr "Sekmeler"
 
-#: meld/resources/gtk/help-overlay.ui:110
+#: meld/resources/gtk/help-overlay.ui:117
 msgctxt "shortcut window"
 msgid "Go to previous tab"
 msgstr "Önceki sekmeye git"
 
-#: meld/resources/gtk/help-overlay.ui:117
+#: meld/resources/gtk/help-overlay.ui:124
 msgctxt "shortcut window"
 msgid "Go to next tab"
 msgstr "Sonraki sekmeye git"
 
-#: meld/resources/gtk/help-overlay.ui:124
+#: meld/resources/gtk/help-overlay.ui:131
 msgctxt "shortcut window"
 msgid "Switch to tab"
 msgstr "Sekmeye geçiş yap"
 
-#: meld/resources/gtk/help-overlay.ui:131
+#: meld/resources/gtk/help-overlay.ui:138
 msgctxt "shortcut window"
 msgid "Move tab left"
 msgstr "Sekmeyi sola taşı"
 
-#: meld/resources/gtk/help-overlay.ui:138
+#: meld/resources/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
 msgid "Move tab right"
 msgstr "Sekmeyi sağa taşı"
 
-#: meld/resources/gtk/help-overlay.ui:147
+#: meld/resources/gtk/help-overlay.ui:154
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Düzenleme"
 
-#: meld/resources/gtk/help-overlay.ui:152
+#: meld/resources/gtk/help-overlay.ui:159
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "Geri Al"
 
-#: meld/resources/gtk/help-overlay.ui:159
+#: meld/resources/gtk/help-overlay.ui:166
 msgctxt "shortcut window"
 msgid "Redo"
 msgstr "Yinele"
 
-#: meld/resources/gtk/help-overlay.ui:166
+#: meld/resources/gtk/help-overlay.ui:173
 msgctxt "shortcut window"
 msgid "Cut"
 msgstr "Kes"
 
-#: meld/resources/gtk/help-overlay.ui:173
+#: meld/resources/gtk/help-overlay.ui:180
 msgctxt "shortcut window"
 msgid "Copy"
 msgstr "Kopyala"
 
-#: meld/resources/gtk/help-overlay.ui:180
+#: meld/resources/gtk/help-overlay.ui:187
 msgctxt "shortcut window"
 msgid "Paste"
 msgstr "Yapıştır"
 
-#: meld/resources/gtk/help-overlay.ui:187
+#: meld/resources/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Find"
 msgstr "Bul"
 
-#: meld/resources/gtk/help-overlay.ui:194
+#: meld/resources/gtk/help-overlay.ui:201
 msgctxt "shortcut window"
 msgid "Find Next"
 msgstr "Sonrakini Bul"
 
-#: meld/resources/gtk/help-overlay.ui:201
+#: meld/resources/gtk/help-overlay.ui:208
 msgctxt "shortcut window"
 msgid "Find Previous"
 msgstr "Öncekini Bul"
 
-#: meld/resources/gtk/help-overlay.ui:208
+#: meld/resources/gtk/help-overlay.ui:215
 msgctxt "shortcut window"
 msgid "Replace"
 msgstr "Değiştir"
 
-#: meld/resources/gtk/help-overlay.ui:217
+#: meld/resources/gtk/help-overlay.ui:224
 msgctxt "shortcut window"
 msgid "File comparison"
 msgstr "Dosya karşılaştırma"
 
-#: meld/resources/gtk/help-overlay.ui:222
+#: meld/resources/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Save current file"
 msgstr "Geçerli dosyayı kaydet"
 
-#: meld/resources/gtk/help-overlay.ui:229
+#: meld/resources/gtk/help-overlay.ui:236
 msgctxt "shortcut window"
 msgid "Save current file to new path"
 msgstr "Geçerli dosyayı yeni yere kaydet"
 
-#: meld/resources/gtk/help-overlay.ui:236
+#: meld/resources/gtk/help-overlay.ui:243
 msgctxt "shortcut window"
 msgid "Save all files in comparison"
 msgstr "Karşılaştırmadaki tüm dosyaları kaydet"
 
-#: meld/resources/gtk/help-overlay.ui:243
+#: meld/resources/gtk/help-overlay.ui:250
 msgctxt "shortcut window"
 msgid "Previous conflict"
 msgstr "Önceki çakışma"
 
-#: meld/resources/gtk/help-overlay.ui:250
+#: meld/resources/gtk/help-overlay.ui:257
 msgctxt "shortcut window"
 msgid "Next conflict"
 msgstr "Sonraki çakışma"
 
-#: meld/resources/gtk/help-overlay.ui:257
+#: meld/resources/gtk/help-overlay.ui:264
 msgctxt "shortcut window"
 msgid "Push change to left"
 msgstr "Değişikliği sola gönder"
 
-#: meld/resources/gtk/help-overlay.ui:264
+#: meld/resources/gtk/help-overlay.ui:271
 msgctxt "shortcut window"
 msgid "Push change to right"
 msgstr "Değişikliği sağa gönder"
 
-#: meld/resources/gtk/help-overlay.ui:271
+#: meld/resources/gtk/help-overlay.ui:278
 msgctxt "shortcut window"
 msgid "Pull change from left"
 msgstr "Değişikliği soldan iste"
 
-#: meld/resources/gtk/help-overlay.ui:278
+#: meld/resources/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Pull change from right"
 msgstr "Sağdan değişiklik iste"
 
-#: meld/resources/gtk/help-overlay.ui:285
+#: meld/resources/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Copy change above left"
 msgstr "Sol yığın üstüne değişiklik kopyala"
 
-#: meld/resources/gtk/help-overlay.ui:292
+#: meld/resources/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Copy change below left"
 msgstr "Sol yığın altına değişiklik kopyala"
 
-#: meld/resources/gtk/help-overlay.ui:299
+#: meld/resources/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Copy change above right"
 msgstr "Sağ yığın üstüne değişiklik kopyala"
 
-#: meld/resources/gtk/help-overlay.ui:306
+#: meld/resources/gtk/help-overlay.ui:313
 msgctxt "shortcut window"
 msgid "Copy change below right"
 msgstr "Sağ yığın altına değişiklik kopyala"
 
-#: meld/resources/gtk/help-overlay.ui:313
-#: meld/resources/gtk/help-overlay.ui:341
+#: meld/resources/gtk/help-overlay.ui:320
+#: meld/resources/gtk/help-overlay.ui:348
 msgctxt "shortcut window"
 msgid "Delete change"
 msgstr "Değişiklik sil"
 
-#: meld/resources/gtk/help-overlay.ui:322
+#: meld/resources/gtk/help-overlay.ui:329
 msgctxt "shortcut window"
 msgid "Folder comparison"
 msgstr "Klasör karşılaştırması"
 
-#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
 msgid "Copy to left"
 msgstr "Sola kopyala"
 
-#: meld/resources/gtk/help-overlay.ui:334
+#: meld/resources/gtk/help-overlay.ui:341
 msgctxt "shortcut window"
 msgid "Copy to right"
 msgstr "Sağa kopyala"
 
-#: meld/resources/gtk/help-overlay.ui:350
+#: meld/resources/gtk/help-overlay.ui:357
 msgctxt "shortcut window"
 msgid "Version control comparison"
 msgstr "Sürüm denetimi karşılaştırması"
 
-#: meld/resources/gtk/help-overlay.ui:355
+#: meld/resources/gtk/help-overlay.ui:362
 msgctxt "shortcut window"
 msgid "Commit to version control"
 msgstr "Sürüm denetimine gönder"
 
-#: meld/resources/gtk/help-overlay.ui:362
+#: meld/resources/gtk/help-overlay.ui:369
 msgctxt "shortcut window"
 msgid "Show/hide console output"
 msgstr "Konsol çıktısını göster/gizle"
@@ -809,88 +814,84 @@ msgstr "Sürüm denetimi konsolu"
 msgid "Lock scrolling"
 msgstr "Kaydırmayı kilitle"
 
-#: meld/resources/gtk/menus.ui:73
+#: meld/resources/gtk/menus.ui:74
+msgid "Swap left and right panes"
+msgstr "Sol ve sağ bölmeleri yer değiştir"
+
+#: meld/resources/gtk/menus.ui:80
 msgid "Comparison"
 msgstr "Karşılaştırma"
 
-#: meld/resources/gtk/menus.ui:77
+#: meld/resources/gtk/menus.ui:84
 msgid "Merge All from Left"
 msgstr "Solun Tümünü Birleştir"
 
-#: meld/resources/gtk/menus.ui:81
+#: meld/resources/gtk/menus.ui:88
 msgid "Merge All from Right"
 msgstr "Sağdan Tümünü Birleştir"
 
-#: meld/resources/gtk/menus.ui:85
+#: meld/resources/gtk/menus.ui:92
 msgid "Merge All"
 msgstr "Tümünü Birleştir"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
-msgid "Add Synchronization Point"
-msgstr "Eşzamanlama Noktası Ekle"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
-msgid "Clear Synchronization Points"
-msgstr "Eşzamanlama Noktalarını Temizle"
-
-#: meld/resources/gtk/menus.ui:103
+#: meld/resources/gtk/menus.ui:99
 msgid "Format as Patch…"
 msgstr "Yama Olarak Biçimlendir…"
 
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:108
 msgid "_Preferences"
 msgstr "_Tercihler"
 
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:112
 msgid "Keyboard Shortcuts"
 msgstr "Klavye Kısayolları"
 
-#: meld/resources/gtk/menus.ui:120
+#: meld/resources/gtk/menus.ui:116
 msgid "_Help"
 msgstr "_Yardım"
 
-#: meld/resources/gtk/menus.ui:125
+#: meld/resources/gtk/menus.ui:121
 msgid "_About Meld"
 msgstr "Meld _Hakkında"
 
-#: meld/resources/gtk/menus.ui:138
+#: meld/resources/gtk/menus.ui:134
 msgid "File status"
 msgstr "Dosya durumu"
 
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:136
 msgid "Same"
 msgstr "Aynı"
 
-#: meld/resources/gtk/menus.ui:144
+#: meld/resources/gtk/menus.ui:140
 msgid "New"
 msgstr "Yeni"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Değiştirilmiş"
 
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:154
 msgid "Ignore filename case"
 msgstr "Dosya adı büyük küçük harf durumunu yoksay"
 
-#: meld/resources/gtk/menus.ui:162
+#: meld/resources/gtk/menus.ui:158
 msgid "Normalize Unicode paths"
 msgstr "Unicode yollarını normalleştir"
 
-#: meld/resources/gtk/menus.ui:175
+#: meld/resources/gtk/menus.ui:171
 msgid "Normal"
 msgstr "Normal"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Sürümlendirilmemiş"
 
-#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Yoksayılmış"
 
-#: meld/resources/gtk/menus.ui:190
+#: meld/resources/gtk/menus.ui:186
 msgid "Flatten folders"
 msgstr "Klasörleri düzleştir"
 
@@ -1164,7 +1165,7 @@ msgstr "Dosya 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:602
+#: meld/dirdiff.py:603
 msgid "Name"
 msgstr "Ad"
 
@@ -1204,7 +1205,7 @@ msgstr "Kaydırılmış"
 msgid "Replace _All"
 msgstr "_Tümünü Değiştir"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "_Değiştir"
 
@@ -1590,7 +1591,7 @@ msgstr "Eğer kaydetmezseniz, değişiklikler kalıcı olarak yitecektir."
 msgid "Close _without Saving"
 msgstr "Kaydet_meden Kapat"
 
-#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229
 #: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "_İptal"
@@ -1700,95 +1701,95 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:623 meld/preferences.py:132
+#: meld/dirdiff.py:624 meld/preferences.py:132
 msgid "Size"
 msgstr "Boyut"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:631 meld/preferences.py:133
+#: meld/dirdiff.py:632 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Değiştirilme zamanı"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:639 meld/preferences.py:134
+#: meld/dirdiff.py:640 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Değiştirilme zamanı (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:647 meld/preferences.py:135
+#: meld/dirdiff.py:648 meld/preferences.py:135
 msgid "Permissions"
 msgstr "İzinler"
 
-#: meld/dirdiff.py:900
+#: meld/dirdiff.py:901
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (taranıyor…)"
 
-#: meld/dirdiff.py:932 meld/dirdiff.py:964
+#: meld/dirdiff.py:933 meld/dirdiff.py:965
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] {folder} taranıyor"
 
-#: meld/dirdiff.py:1100
+#: meld/dirdiff.py:1101
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Tamamlandı"
 
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1114
 msgid "Folder {} is being compared to itself"
 msgstr "{} klasörü kendiyle karşılaştırılıyor"
 
-#: meld/dirdiff.py:1119
+#: meld/dirdiff.py:1120
 msgid "Folders have no differences"
 msgstr "Klasörlerde fark yok"
 
-#: meld/dirdiff.py:1121
+#: meld/dirdiff.py:1122
 msgid "Contents of scanned files in folders are identical."
 msgstr "Klasörlerdeki taranan dosyaların içerikleri özdeş."
 
-#: meld/dirdiff.py:1123
+#: meld/dirdiff.py:1124
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 "Klasördeki taranan dosyalar özdeş gözüküyor fakat içerikleri taranmadı."
 
-#: meld/dirdiff.py:1126
+#: meld/dirdiff.py:1127
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Dosya süzgeçleri kullanımda, bu yüzden tüm dosyalar taranamamış."
 
-#: meld/dirdiff.py:1128
+#: meld/dirdiff.py:1129
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Metin süzgeçleri kullanımda ve içerik farklılıklarını maskeleyebilir."
 
-#: meld/dirdiff.py:1144 meld/filediff.py:1919
+#: meld/dirdiff.py:1145 meld/filediff.py:1982
 msgid "Hide"
 msgstr "Gizle"
 
-#: meld/dirdiff.py:1146 meld/filediff.py:1921 meld/filediff.py:1951
-#: meld/filediff.py:1953 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1984 meld/filediff.py:2014
+#: meld/filediff.py:2016 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "Gi_zle"
 
-#: meld/dirdiff.py:1155
+#: meld/dirdiff.py:1156
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Bu klasör taranırken birçok hata oluştu"
 
-#: meld/dirdiff.py:1156
+#: meld/dirdiff.py:1157
 msgid "Files with invalid encodings found"
 msgstr "Geçersiz kodlamalı dosyalar bulundu"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1158
+#: meld/dirdiff.py:1159
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Bazı dosyalar yanlış kodlamadaydı. Adları şu biçimdedir:"
 
-#: meld/dirdiff.py:1160
+#: meld/dirdiff.py:1161
 msgid "Files hidden by case insensitive comparison"
 msgstr "Büyük küçük harf duyarsız karşılaştırmaya göre gizli dosyalar"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1162
+#: meld/dirdiff.py:1163
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1796,17 +1797,17 @@ msgstr ""
 "Büyük/küçük harf duyarlı dosya sisteminde büyük/küçük harf duyarsız "
 "karşılaştırma yapmaktasınız. Bu klasördeki bazı dosyalar gizlidir:"
 
-#: meld/dirdiff.py:1173
+#: meld/dirdiff.py:1174
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}”, “{second_file}” tarafından gizlendi"
 
-#: meld/dirdiff.py:1235
+#: meld/dirdiff.py:1236
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "“%s” klasörü değiştirilsin mi?"
 
-#: meld/dirdiff.py:1237
+#: meld/dirdiff.py:1238
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1815,11 +1816,11 @@ msgstr ""
 "“%s” içinde aynı ad ile başka klasör zaten var.\n"
 "Eğer var olan klasörü değiştirirseniz, içindeki tüm dosyalar yitecektir."
 
-#: meld/dirdiff.py:1250
+#: meld/dirdiff.py:1251
 msgid "Error copying file"
 msgstr "Dosya kopyalamada hata"
 
-#: meld/dirdiff.py:1251
+#: meld/dirdiff.py:1252
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1832,19 +1833,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1276 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "{} silinirken hata"
 
-#: meld/dirdiff.py:1819
+#: meld/dirdiff.py:1825
 msgid "No folder"
 msgstr "Klasör yok"
 
-#: meld/filediff.py:1149
+#: meld/filediff.py:1158
 msgid "Comparison results will be inaccurate"
 msgstr "Karşılaştırma sonuçları hatalı olacak"
 
-#: meld/filediff.py:1151
+#: meld/filediff.py:1160
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1852,75 +1853,95 @@ msgstr ""
 "Bir süzgeç dosyadaki satır numaralarını desteklenmeyen biçimde değiştirdi. "
 "Karşılaştırma doğru olmayacaktır."
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1232
 msgid "Mark conflict as resolved?"
 msgstr "Çakışma çözüldü olarak işaretlensin mi?"
 
-#: meld/filediff.py:1225
+#: meld/filediff.py:1234
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Eğer çakışma başarıyla çözüldüyse, o zaman çözüldü olarak "
 "işaretleyebilirsiniz."
 
-#: meld/filediff.py:1228
+#: meld/filediff.py:1237
 msgid "Cancel"
 msgstr "İptal Et"
 
-#: meld/filediff.py:1229
+#: meld/filediff.py:1238
 msgid "Mark _Resolved"
 msgstr "_Çözümlendi olarak işaretle"
 
-#: meld/filediff.py:1593
+#: meld/filediff.py:1429 meld/filediff.py:1445
+msgid "Add Synchronization Point"
+msgstr "Eşzamanlama Noktası Ekle"
+
+#: meld/filediff.py:1433
+msgid "Remove Synchronization Point"
+msgstr "Eşzamanlama Noktasını Kaldır"
+
+#: meld/filediff.py:1437
+msgid "Move Synchronization Point"
+msgstr "Eşzamanlama Noktasını Taşı"
+
+#: meld/filediff.py:1441
+msgid "Match Synchronization Point"
+msgstr "Eşzamanlama Noktasını Eşleştir"
+
+#: meld/filediff.py:1465
+msgid "Clear Synchronization Points"
+msgstr "Eşzamanlama Noktalarını Temizle"
+
+#: meld/filediff.py:1656
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "“%s” dosyası açılırken sorun var."
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1665
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "%s dosyası ikili dosya olarak görünüyor."
 
-#: meld/filediff.py:1604
+#: meld/filediff.py:1667
 msgid "Do you want to open the file using the default application?"
 msgstr "Dosyayı öntanımlı uygulamayı kullanarak açmak istiyor musunuz?"
 
-#: meld/filediff.py:1606
+#: meld/filediff.py:1669
 msgid "Open"
 msgstr "Aç"
 
-#: meld/filediff.py:1628
+#: meld/filediff.py:1691
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Dosyalar birleştiriliyor"
 
-#: meld/filediff.py:1642
+#: meld/filediff.py:1705
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Farklılıklar hesaplanıyor"
 
-#: meld/filediff.py:1702
+#: meld/filediff.py:1765
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Disk üzerindeki %s dosyası değiştirildi"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1766
 msgid "Do you want to reload the file?"
 msgstr "Dosyayı yeniden yüklemek istiyor musunuz?"
 
-#: meld/filediff.py:1705
+#: meld/filediff.py:1768
 msgid "_Reload"
 msgstr "_Yeniden yükle"
 
-#: meld/filediff.py:1875
+#: meld/filediff.py:1938
 msgid "File {} is being compared to itself"
 msgstr "{} dosyası kendiyle karşılaştırılıyor"
 
-#: meld/filediff.py:1884
+#: meld/filediff.py:1947
 msgid "Files are identical"
 msgstr "Dosyalar özdeş"
 
-#: meld/filediff.py:1897
+#: meld/filediff.py:1960
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1928,11 +1949,11 @@ msgstr ""
 "Metin süzgeçleri kullanılmakta ve dosyalar arasındaki farklılıkları "
 "maskeliyor olabilir. Süzülmemiş dosyaları karşılaştırmak ister misiniz?"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1965
 msgid "Files differ in line endings only"
 msgstr "Dosyalar yalnızca satır sonlarında farklılaşıyor"
 
-#: meld/filediff.py:1904
+#: meld/filediff.py:1967
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1941,15 +1962,15 @@ msgstr ""
 "Dosyalar satır sonları dışında özdeş:\n"
 "%s"
 
-#: meld/filediff.py:1924
+#: meld/filediff.py:1987
 msgid "Show without filters"
 msgstr "Süzgeçsiz göster"
 
-#: meld/filediff.py:1946
+#: meld/filediff.py:2009
 msgid "Change highlighting incomplete"
 msgstr "Vurgulama değişikliği tamamlanamadı"
 
-#: meld/filediff.py:1947
+#: meld/filediff.py:2010
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1958,19 +1979,19 @@ msgstr ""
 "daha büyük değişiklikleri daha uzun sürede ve daha yavaş olmasına rağmen "
 "vurgulaması için zorlayabilirsiniz."
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:2018
 msgid "Keep highlighting"
 msgstr "Vurgulamayı koru"
 
-#: meld/filediff.py:1957
+#: meld/filediff.py:2020
 msgid "_Keep highlighting"
 msgstr "Vurgulamayı _koru"
 
-#: meld/filediff.py:1970
+#: meld/filediff.py:2033
 msgid "Saving failed"
 msgstr "Kaydetme başarısız"
 
-#: meld/filediff.py:1971
+#: meld/filediff.py:2034
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1978,36 +1999,36 @@ msgstr ""
 "Veri yitimini önlemek için lütfen önemli değişiklikleri başka programa veya "
 "dosyaya kopyalayın."
 
-#: meld/filediff.py:1980
+#: meld/filediff.py:2043
 msgid "Save Left Pane As"
 msgstr "Sol Bölme Olarak Kaydet"
 
-#: meld/filediff.py:1982
+#: meld/filediff.py:2045
 msgid "Save Middle Pane As"
 msgstr "Orta Bölme Olarak Kaydet"
 
-#: meld/filediff.py:1984
+#: meld/filediff.py:2047
 msgid "Save Right Pane As"
 msgstr "Sağ Bölme Olarak Kaydet"
 
-#: meld/filediff.py:1995
+#: meld/filediff.py:2058
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "%s dosyası açıldığından beri diskte değişti"
 
-#: meld/filediff.py:1997
+#: meld/filediff.py:2060
 msgid "If you save it, any external changes will be lost."
 msgstr "Eğer kaydederseniz, dış değişiklikler yitecektir."
 
-#: meld/filediff.py:2000
+#: meld/filediff.py:2063
 msgid "Save Anyway"
 msgstr "Yine De Kaydet"
 
-#: meld/filediff.py:2001
+#: meld/filediff.py:2064
 msgid "Don’t Save"
 msgstr "Kaydetme"
 
-#: meld/filediff.py:2043
+#: meld/filediff.py:2106
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2015,7 +2036,7 @@ msgstr ""
 "“{}” dosyası, kendisinin şu anki “{}” kodlaması kullanılarak kodlanamayacak "
 "karakterler içeriyor."
 
-#: meld/filediff.py:2047 meld/patchdialog.py:138
+#: meld/filediff.py:2110 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2024,16 +2045,16 @@ msgstr ""
 "Şu nedenle dosya kaydedilemedi:\n"
 "%s"
 
-#: meld/filediff.py:2051 meld/patchdialog.py:137
+#: meld/filediff.py:2114 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "%s dosyası kaydedilemedi."
 
-#: meld/filediff.py:2452
+#: meld/filediff.py:2524
 msgid "Live comparison updating disabled"
 msgstr "Canlı karşılaştırma güncellemesi devre dışı bırakıldı"
 
-#: meld/filediff.py:2453
+#: meld/filediff.py:2525
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "

From f850cdf3eaf0f08abea003d5fae118a5e92a3d61 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 29 Apr 2022 23:00:12 +0200
Subject: [PATCH 101/116] Import emblem-new from Evolution
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Emblems are considered deprecated since GNOME 3.32:
https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/commit/7f3f91f9c210ee240885c7d370c8ff3485c3a17b
and `emblem-new` has been removed in GNOME 42:
https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/commit/becf0674bb631bb2f2e092e1fb0f4d55cf380de7

This will cause Meld to complain loudly on vanilla GNOME, even breaking the file tree view:

	Traceback (most recent call last):
	  File "/nix/store/i9gy3x995nn7js4xipzw01gysq4fh5zz-meld-3.21.1/lib/python3.9/site-packages/meld/ui/emblemcellrenderer.py", line 100, in do_render
	    pixbuf = self._get_pixbuf(self.emblem_name, self._emblem_size)
	  File "/nix/store/i9gy3x995nn7js4xipzw01gysq4fh5zz-meld-3.21.1/lib/python3.9/site-packages/meld/ui/emblemcellrenderer.py", line 64, in _get_pixbuf
	    pixbuf = icon_theme.load_icon(name, size, 0).copy()
	gi.repository.GLib.GError: gtk-icon-theme-error-quark: Icon 'emblem-new' not present in theme Adwaita (0)

	cairo.Error: Context.restore() without matching Context.save()

`emblem-default-symbolic` and `emblem-symbolic-link` are still available.

Let’s bundle it with Meld as suggested.

Though, for improved contrast on GNOME 42’s blue folder icons,
let’s take the emblem from Evolution.

https://gitlab.gnome.org/GNOME/evolution/-/issues/1811#note_1423465
---
 .../icons/scalable/emblems/emblem-new.svg     | 26 +++++++++++++++++++
 meld/resources/meld.gresource.xml             |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 meld/resources/icons/scalable/emblems/emblem-new.svg

diff --git a/meld/resources/icons/scalable/emblems/emblem-new.svg b/meld/resources/icons/scalable/emblems/emblem-new.svg
new file mode 100644
index 00000000..b3971210
--- /dev/null
+++ b/meld/resources/icons/scalable/emblems/emblem-new.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg5"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <circle
+     style="opacity:1;fill:#d7eef4;stroke-width:0.396874;stroke-linecap:round;paint-order:markers stroke fill"
+     id="path1283"
+     cx="2.1166666"
+     cy="2.1166666"
+     r="1.984375" />
+  <circle
+     style="opacity:1;fill:#0044aa;fill-opacity:1;stroke-width:0.357187;stroke-linecap:round;paint-order:markers stroke fill"
+     id="path1285"
+     cx="2.1166666"
+     cy="2.1166666"
+     r="1.4287499" />
+</svg>
diff --git a/meld/resources/meld.gresource.xml b/meld/resources/meld.gresource.xml
index 689955e3..34b07e65 100644
--- a/meld/resources/meld.gresource.xml
+++ b/meld/resources/meld.gresource.xml
@@ -13,6 +13,7 @@
     <file>icons/16x16/actions/meld-change-apply-right.png</file>
     <file>icons/16x16/actions/meld-change-copy.png</file>
     <file>icons/16x16/actions/meld-change-delete.png</file>
+    <file preprocess="xml-stripblanks">icons/scalable/emblems/emblem-new.svg</file>
     <file>meld.css</file>
     <file>ui/about-dialog.ui</file>
     <file>ui/appwindow.ui</file>

From 59a3cddd61c31ff0456ad652f34d760abf02c665 Mon Sep 17 00:00:00 2001
From: Sergej A <sw@atrus.ru>
Date: Thu, 5 May 2022 12:59:57 +0000
Subject: [PATCH 102/116] Add Russian translation

---
 help/ru/ru.po | 1900 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1900 insertions(+)
 create mode 100644 help/ru/ru.po

diff --git a/help/ru/ru.po b/help/ru/ru.po
new file mode 100644
index 00000000..8e3fc683
--- /dev/null
+++ b/help/ru/ru.po
@@ -0,0 +1,1900 @@
+# Russian translation for meld.
+# Copyright (C) 2022 meld's COPYRIGHT HOLDER
+# This file is distributed under the same license as the meld package.
+# Sergej A. <sw@atrus.ru>, 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: meld master\n"
+"POT-Creation-Date: 2022-04-27 17:39+0000\n"
+"PO-Revision-Date: 2022-05-01 01:37+1000\n"
+"Last-Translator: Ser82-png <sw@atrus.ru>\n"
+"Language-Team: Russian <gnome-cyr@gnome.org>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 2.3\n"
+
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
+msgstr "Ser82-png <sw@atrus.ru>, 2022"
+
+#. (itstool) path: info/title
+#: C/command-line.page:5 C/file-changes.page:5 C/file-filters.page:5
+#: C/flattened-view.page:5 C/keyboard-shortcuts.page:5
+#: C/resolving-conflicts.page:5 C/text-filters.page:5
+msgctxt "sort"
+msgid "2"
+msgstr "2"
+
+#. (itstool) path: credit/name
+#: C/command-line.page:10 C/file-changes.page:10 C/file-filters.page:10
+#: C/file-mode.page:11 C/flattened-view.page:10 C/folder-mode.page:10
+#: C/index.page:8 C/introduction.page:10 C/keyboard-shortcuts.page:10
+#: C/missing-functionality.page:10 C/preferences.page:10
+#: C/resolving-conflicts.page:10 C/text-filters.page:11 C/vc-mode.page:10
+#: C/vc-supported.page:10
+msgid "Kai Willadsen"
+msgstr "Kai Willadsen"
+
+#. (itstool) path: credit/years
+#: C/command-line.page:12 C/file-changes.page:12 C/file-filters.page:12
+#: C/file-mode.page:13 C/flattened-view.page:12 C/folder-mode.page:12
+#: C/index.page:10 C/introduction.page:12 C/keyboard-shortcuts.page:12
+#: C/missing-functionality.page:12 C/resolving-conflicts.page:12
+#: C/text-filters.page:13 C/vc-mode.page:12 C/vc-supported.page:12
+msgid "2012"
+msgstr "2012"
+
+#. (itstool) path: page/title
+#: C/command-line.page:15
+msgid "Command line usage"
+msgstr "Использование командной строки"
+
+#. (itstool) path: page/p
+#: C/command-line.page:17
+msgid ""
+"If you start <app>Meld</app> from the command line, you can tell it what to "
+"do when it starts."
+msgstr ""
+"Если вы запускаете <app>Meld</app> из командной строки, то можете указать "
+"приложению, что делать при запуске."
+
+#. (itstool) path: page/p
+#: C/command-line.page:20
+msgid ""
+"For a two- or three-way <link xref=\"file-mode\">file comparison</link>, "
+"start <app>Meld</app> with <cmd>meld <var>file1</var> <var>file2</var></cmd> "
+"or <cmd>meld <var>file1</var> <var>file2</var> <var>file3</var></cmd> "
+"respectively."
+msgstr ""
+"Для двух- и трёхполосного <link xref=\"file-mode\">сравнения файлов</link>, "
+"запустите <app>Meld</app> с помощью <cmd>meld <var>file1</var> <var>file2</"
+"var></cmd> или <cmd>meld <var>file1</var> <var>file2</var> <var>file3</var></"
+"cmd> соответственно."
+
+#. (itstool) path: page/p
+#: C/command-line.page:26
+msgid ""
+"For a two- or three-way <link xref=\"folder-mode\">directory comparison</"
+"link>, start <app>Meld</app> with <cmd>meld <var>dir1</var> <var>dir2</var></"
+"cmd> or <cmd>meld <var>dir1</var> <var>dir2</var> <var>dir3</var></cmd>."
+msgstr ""
+"Для двух- и трёхполосного <link xref=\"folder-mode\">сравнения каталогов</"
+"link>, запустите <app>Meld</app> с помощью <cmd>meld <var>dir1</var> "
+"<var>dir2</var></cmd> или <cmd>meld <var>dir1</var> <var>dir2</var> "
+"<var>dir3</var></cmd>."
+
+#. (itstool) path: page/p
+#: C/command-line.page:31
+msgid ""
+"You can start a <link xref=\"vc-mode\">version control</link> comparison by "
+"just giving a single argument; if that file or directory is managed by a "
+"<link xref=\"vc-supported\">recognized version control system</link>, it "
+"will start a version control comparison on that argument. For example, "
+"<cmd>meld .</cmd> would start a version control view of the current "
+"directory."
+msgstr ""
+"Вы можете запустить сравнение по <link xref=\"vc-mode\">системе контроля "
+"версий</link>, передав программе единственный аргумент. Если соответствующий "
+"файл или каталог управляется <link xref=\"vc-supported\">известной системой "
+"контроля версий</link>, быдет запущено сравнение с системой контролем версий "
+"по этому аргументу. Например, <cmd>meld .</cmd> запустит просмотр изменений "
+"в системе контроля версий для текущего каталога."
+
+#. (itstool) path: note/p
+#: C/command-line.page:40
+msgid "Run <cmd>meld --help</cmd> for a list of all command line options."
+msgstr ""
+"Выполните <cmd>meld --help</cmd>, чтобы получить список всех параметров "
+"командной строки."
+
+#. (itstool) path: page/title
+#: C/file-changes.page:16
+msgid "Dealing with changes"
+msgstr "Работа с изменениями"
+
+#. (itstool) path: page/p
+#: C/file-changes.page:18
+msgid ""
+"<app>Meld</app> deals with differences between files as a list of <em>change "
+"blocks</em> or more simply <em>changes</em>. Each change is a group of lines "
+"which correspond between files. Since these changes are what you're usually "
+"interested in, <app>Meld</app> gives you specific tools to navigate between "
+"these changes and to edit them. You can find these tools in the <gui style="
+"\"menu\">Changes</gui> menu."
+msgstr ""
+"<app>Meld</app> обрабатывает различия между файлами в виде списка <em>блоков "
+"изменений</em> или, проще говоря, <em>изменений</em>. Каждое изменение "
+"представляет собой группу строк, которые являются соответствующими между "
+"файлами. Поскольку именно эти изменения вас обычно интересуют, <app>Meld</"
+"app> предоставляет специальные инструменты для навигации между этими "
+"изменениями и их редактирования. Эти инструменты можно найти в меню <gui "
+"style=\"menu\">Изменения</gui>."
+
+#. (itstool) path: section/title
+#: C/file-changes.page:30
+msgid "Navigating between changes"
+msgstr "Навигация между изменениями"
+
+#. (itstool) path: section/p
+#: C/file-changes.page:32
+msgid ""
+"You can navigate between changes with the <guiseq><gui style=\"menu"
+"\">Changes</gui><gui style=\"menuitem\">Previous change</gui></guiseq> and "
+"<guiseq><gui style=\"menu\">Changes</gui><gui style=\"menuitem\">Next "
+"change</gui></guiseq> menu items. You can also use your mouse's scroll wheel "
+"to move between changes, by scrolling on the central change bar."
+msgstr ""
+"Вы можете перемещаться между изменениями с помощью элементов меню: "
+"<guiseq><gui style=\"menu\">Изменения</gui><gui style=\"menuitem"
+"\">Предыдущее изменение</gui></guiseq> и <guiseq><gui style=\"menu"
+"\">Изменения</gui><gui style=\"menuitem\">Следующее изменение</gui></"
+"guiseq>. Вы также можете использовать колесо прокрутки мыши для перемещения "
+"между изменениями, прокручивая центральную полосу изменений."
+
+#. (itstool) path: section/title
+#: C/file-changes.page:46
+msgid "Changing changes"
+msgstr "Внесение изменений в изменения"
+
+#. (itstool) path: section/p
+#: C/file-changes.page:48
+msgid ""
+"In addition to directly editing text files, <app>Meld</app> gives you tools "
+"to move, copy or delete individual differences between files. The bar "
+"between two files not only shows you what parts of the two files correspond, "
+"but also lets you selectively merge or delete differing changes by clicking "
+"the arrow or cross icons next to the start of each change."
+msgstr ""
+"Помимо непосредственного редактирования текстовых файлов, <app>Meld</app> "
+"предоставляет инструменты для перемещения, копирования или удаления "
+"отдельных различий между файлами. Панель между двумя файлами не только "
+"показывает, какие части двух файлов соответствуют друг другу, но также "
+"позволяет выборочно объединять или удалять различные изменения, щёлкая "
+"значки со стрелкой или крестиком рядом с каждым изменением."
+
+#. (itstool) path: section/p
+#: C/file-changes.page:52
+msgid ""
+"The default action is <em>replace</em>. This action replaces the contents of "
+"the corresponding change with the current change."
+msgstr ""
+"Действием по умолчанию является <em>замена</em>. Это действие заменяет "
+"содержимое соответствующего изменения текущим изменением."
+
+#. (itstool) path: section/p
+#: C/file-changes.page:59
+msgid ""
+"Hold down the <key>Shift</key> key to change the current action to "
+"<em>delete</em>. This action deletes the current change."
+msgstr ""
+"Удерживайте нажатой клавишу <key>Shift</key>, чтобы изменить текущее "
+"действие на <em>удаление</em>. При этом, текущее изменение будет удалено."
+
+#. (itstool) path: section/p
+#: C/file-changes.page:62
+msgid ""
+"Hold down the <key>Ctrl</key> key to change the current action to "
+"<em>insert</em>. This action inserts the current change above or below (as "
+"selected) the corresponding change."
+msgstr ""
+"Удерживайте нажатой клавишу <key>Ctrl</key>, чтобы изменить текущее действие "
+"на <em>вставить</em>. При этом, текущее изменение будет вставлено выше или "
+"ниже (в зависимости от выбора) соответствующего изменения."
+
+#. (itstool) path: page/title
+#: C/file-filters.page:15
+msgid "Filtering out files"
+msgstr "Фильтрация файлов"
+
+#. (itstool) path: page/p
+#: C/file-filters.page:17
+msgid ""
+"When you compare folders, you may want to be able to ignore some files. For "
+"example, you may wish to only see files that are present and different in "
+"both folders, ignoring those that are the same or only exist in one folder. "
+"Alternatively, you might want to ignore all the files in your <file>.git</"
+"file> directory, or ignore all images."
+msgstr ""
+"При сравнении папок вы можете игнорировать некоторые файлы. Например, вы "
+"можете захотеть видеть только файлы, которые присутствуют и различаются в "
+"обеих папках, игнорируя те, которые одинаковы или существуют только в одной "
+"папке. В качестве альтернативы вы можете игнорировать все файлы в каталоге "
+"<file>.git</file> или игнорировать все изображения."
+
+#. (itstool) path: page/p
+#: C/file-filters.page:25
+msgid ""
+"<app>Meld</app> has several different ways of controlling which files and "
+"what kind of differences you see. You can filter based on <link xref=\"#file-"
+"state-filter\">differences between a file across folders</link> or <link "
+"xref=\"#file-name-filter\">file and folder names</link>. You can also tell "
+"<app>Meld</app> to treat filenames as being <link xref=\"#file-case-filter"
+"\">case insensitive</link>. Finally, you can use <link xref=\"text-filters"
+"\">text filters</link> to change what both folder and file comparisons see."
+msgstr ""
+"В приложении <app>Meld</app> предусмотрено несколько различных способов "
+"управления тем, какие файлы и какого типа различия следует показывать. Вы "
+"можете применить фильтрацию на основе <link xref=\"#file-state-filter"
+"\">различий между файлами в папках</link> или <link xref=\"#file-name-filter"
+"\">имен файлов и папок</link>. Вы также можете указать <app>Meld</app> "
+"обрабатывать имена файлов <link xref=\"#file-case-filter\">без учёта "
+"регистра</link>. Наконец, вы можете использовать <link xref=\"text-filters"
+"\">текстовые фильтры</link> для изменения области применения сравнений папок "
+"и файлов."
+
+#. (itstool) path: note/p
+#: C/file-filters.page:37
+msgid ""
+"Any <link xref=\"text-filters\">text filters</link> you've defined "
+"<em>automatically apply</em> when comparing folders. Files that are "
+"identical after all of the text filters are applied are not highlighted as "
+"being different, but are shown in italics."
+msgstr ""
+"Любые заданные вами <link xref=\"text-filters\">текстовые фильтры</link> "
+"<em>автоматически применяются</em> при сравнении папок. Файлы, идентичные "
+"после применения всех текстовых фильтров, не выделяются как отличающиеся, а "
+"отображаются курсивом."
+
+#. (itstool) path: section/title
+#: C/file-filters.page:48
+msgid "File differences filtering"
+msgstr "Фильтрация различий файлов"
+
+#. (itstool) path: section/p
+#: C/file-filters.page:50
+msgid ""
+"In a folder comparison, each line contains a single file or folder that is "
+"present in at least one of the folders being compared. Each of these lines "
+"is classified as being either <em>Modified</em>, <em>New</em> or <em>Same</"
+"em>:"
+msgstr ""
+"При сравнении папок каждая строка содержит один файл или папку, "
+"присутствующую по крайней мере в одной из сравниваемых папок. Каждая из этих "
+"строк классифицируется как <em>Изменённые</em>, <em>Новые</em> или "
+"<em>Одинаковые</em>:"
+
+#. (itstool) path: item/title
+#. (itstool) path: td/p
+#: C/file-filters.page:58 C/folder-mode.page:148 C/vc-mode.page:107
+msgid "Modified"
+msgstr "Изменённые"
+
+#. (itstool) path: item/p
+#: C/file-filters.page:59
+msgid "The file exists in multiple folders, but the files are different"
+msgstr "Файл существует в нескольких папках, но файлы отличаются"
+
+#. (itstool) path: item/title
+#. (itstool) path: td/p
+#: C/file-filters.page:62 C/folder-mode.page:162 C/vc-mode.page:121
+msgid "New"
+msgstr "Новые"
+
+#. (itstool) path: item/p
+#: C/file-filters.page:63
+msgid "The file exists in one folder but not in the others"
+msgstr "Файл имеется в одной папке, но отсутствует в другой"
+
+#. (itstool) path: item/title
+#. (itstool) path: td/p
+#: C/file-filters.page:66 C/folder-mode.page:118 C/vc-mode.page:93
+msgid "Same"
+msgstr "Одинаковые"
+
+#. (itstool) path: item/p
+#: C/file-filters.page:67
+msgid "The file exists in all folders, and is the same everywhere"
+msgstr "Файл существует во всех папках и везде одинаковый"
+
+#. (itstool) path: section/p
+#: C/file-filters.page:70
+msgid ""
+"You can change which types of differences you see in your current comparison "
+"by using the <gui style=\"button\">Same</gui>, <gui style=\"button\">New</"
+"gui> and <gui style=\"button\">Modified</gui> buttons on the toolbar or the "
+"<guiseq><gui style=\"menu\">View</gui><gui style=\"menuitem\">File Status</"
+"gui></guiseq> menu."
+msgstr ""
+"Вы можете изменить тип различий для отображения в текущем сравнении, с "
+"помощью кнопок на панели инструментов: <gui style=\"button\">Одинаковые</"
+"gui>, <gui style=\"button\">Новые</gui> и <gui style=\"button Кнопки "
+"\">Изменённые</gui> или в меню <guiseq><gui style=\"menu\">Вид</gui><gui "
+"style=\"menuitem\">Статус файла</gui></guiseq>."
+
+#. (itstool) path: note/p
+#: C/file-filters.page:80
+msgid ""
+"Currently, you can only filter files based on their state; folders can't be "
+"filtered in this way. For example, you can't tell <app>Meld</app> to ignore "
+"all folders that contain only new files. A folder containing only \"New\" "
+"files would show up as empty, but still present."
+msgstr ""
+"В настоящее время «по состоянию» вы можете фильтровать только файлы; папки "
+"таким образом не могут быть отфильтрованы. Например, вы не можете указать "
+"<app>Meld</app> игнорировать все папки, содержащие только новые файлы. "
+"Папка, содержащая только «Новые» файлы, будет отображаться как пустая, но "
+"всё равно будет присутствовать."
+
+#. (itstool) path: section/title
+#: C/file-filters.page:94
+msgid "Filename filtering"
+msgstr "Фильтрация по имени файла"
+
+#. (itstool) path: section/p
+#: C/file-filters.page:96
+msgid ""
+"<app>Meld</app> comes with a useful set of filename filters that let you "
+"ignore uninteresting files and folders like common backup files and the "
+"metadata folders of version control systems. Each filename filter can be "
+"separately activated or deactivated from the <gui style=\"button\">Filters</"
+"gui> button on the toolbar or the <guiseq><gui style=\"menu\">View</gui><gui "
+"style=\"menuitem\">File Filters</gui></guiseq> menu."
+msgstr ""
+"<app>Meld</app> поставляется с полезным набором фильтров имен файлов, с "
+"помощью которых вы можете игнорировать неинтересные файлы и папки, такие как "
+"общие файлы резервных копий и папки с метаданными систем контроля версий. "
+"Каждый фильтр имени файла можно отдельно активировать или деактивировать с "
+"помощью кнопки <gui style=\"button\">Фильтры</gui> на панели инструментов "
+"или в <guiseq><gui style=\"menu\">Вид</gui></gui><gui style=\"menuitem"
+"\">Фильтры файлов</gui></guiseq>."
+
+#. (itstool) path: section/p
+#: C/file-filters.page:106
+msgid ""
+"You can add, remove or change filename filters from the <gui style=\"tab"
+"\">File Filters</gui> section of the <gui>Preferences</gui> dialog. Filename "
+"filters specify patterns of filenames that will <em>not</em> be looked at "
+"when performing a folder comparison. Any file that matches an active filter "
+"won't even show up in the tree comparison. Filename filters match both files "
+"and folders; if a folder matches a filter, it and all of its contents are "
+"ignored."
+msgstr ""
+"Вы можете добавлять, удалять или изменять фильтры имен файлов в разделе <gui "
+"style=\"tab\">Фильтры файлов</gui> диалогового окна <gui>Настройки</gui>. "
+"Фильтры имен файлов задают шаблоны имен файлов, которые <em>не</em> будут "
+"учитываться при сравнении папок. Любой файл, соответствующий активному "
+"фильтру, не будет даже отображаться в дереве сравнения. Фильтры имен файлов "
+"применяются как файлам, так и папкам; если папка соответствует фильтру, она "
+"и всё её содержимое будет проигнорировано."
+
+#. (itstool) path: section/p
+#: C/file-filters.page:116
+msgid ""
+"Filename filters match according to shell glob patterns. For example, "
+"<code>*.jpg</code> will match all filenames ending in <code>.jpg</code>. The "
+"following table lists all of the shell glob characters that <app>Meld</app> "
+"recognises."
+msgstr ""
+"Установление соответствия фильтров имен файлов происходит с использованием "
+"общих правил образцов командной оболочки. Например, <code>*.jpg</code> будет "
+"соответствовать всем именам файлов, заканчивающимся на <code>.jpg</code>. В "
+"следующей таблице перечислены все символы-заменители, распознаваемые "
+"<app>Meld</app>."
+
+#. (itstool) path: table/title
+#: C/file-filters.page:124
+msgid "Shell glob patterns"
+msgstr "Символы-заменители командной оболички"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:128
+msgid "Wildcard"
+msgstr "Подстановочный знак"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:128
+msgid "Matches"
+msgstr "Совпадения"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:134
+msgid "<code>*</code>"
+msgstr "<code>*</code>"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:135
+msgid "anything (i.e., zero or more characters)"
+msgstr ""
+"всё, что угодно (т.е., может ничего не содержать или или какое-угодно "
+"количество символов)"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:138
+msgid "<code>?</code>"
+msgstr "<code>?</code>"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:139
+msgid "exactly one character"
+msgstr "ровно один символ"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:142
+msgid "<code>[abc]</code>"
+msgstr "<code>[abc]</code>"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:143
+msgid "any one of the listed characters"
+msgstr "любой из перечисленных символов"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:146
+msgid "<code>[!abc]</code>"
+msgstr "<code>[!abc]</code>"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:147
+msgid "anything <em>except</em> one of the listed characters"
+msgstr "всё, что угодно, <em>кроме</em> одного из перечисленных символов"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:150
+msgid "<code>{cat,dog}</code>"
+msgstr "<code>{cat,dog}</code>"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:151
+msgid "either \"cat\" or \"dog\""
+msgstr "либо \"cat\", либо \"dog\""
+
+#. (itstool) path: note/p
+#: C/file-filters.page:157
+msgid ""
+"Changing a filter's <gui>Active</gui> setting in the <gui>Preferences</gui> "
+"dialog changes whether that filter is active <em>by default</em>."
+msgstr ""
+"Изменение параметра <gui>Активен</gui> в диалоговом окне <gui>Параметры</"
+"gui> определяет, будет ли фильтр <em>по умолчанию</em> активным."
+
+#. (itstool) path: note/p
+#: C/file-filters.page:163
+msgid ""
+"Activating a filter from the menu or the toolbar turns the filter on or off "
+"for <em>this comparison only</em>."
+msgstr ""
+"Активация фильтра из меню или панели инструментов включает или выключает "
+"фильтр <em>только для этого сравнения</em>."
+
+#. (itstool) path: section/title
+#: C/file-filters.page:174
+msgid "Case insensitive filenames"
+msgstr "Имена файлов без учёта регистра"
+
+#. (itstool) path: section/p
+#: C/file-filters.page:176
+msgid ""
+"Files are compared across directories according to their name. This "
+"comparison is case sensitive by default; that is, the files <file>README</"
+"file>, <file>readme</file> and <file>ReadMe</file> would all be seen as "
+"different files."
+msgstr ""
+"Файлы сравниваются между каталогами в соответствии с их именем. По умолчанию "
+"это сравнение чувствительно к регистру; то есть файлы <file>README</file>, "
+"<file>readme</file> и <file>ReadMe</file> будут рассматриваться как разные "
+"файлы."
+
+#. (itstool) path: section/p
+#: C/file-filters.page:183
+msgid ""
+"When comparing folders on some filesystems (e.g., HFS+ or FAT) you may wish "
+"to make <app>Meld</app> treat filenames as case insensitive. You can do this "
+"by selecting <guiseq><gui style=\"menu\">View</gui><gui style=\"menuitem"
+"\">Ignore filename case</gui></guiseq> from the menus."
+msgstr ""
+"При сравнении папок в некоторых файловых системах (например, HFS+ или FAT) "
+"вы можете сделать так, чтобы <app>Meld</app> рассматривал имена файлов без "
+"учёта регистра. Это можно сделать, выбрав в меню <guiseq><gui style=\"menu"
+"\">Вид</gui><gui style=\"menuitem\">Игнорировать регистр имени файла</gui></"
+"guiseq>."
+
+#. (itstool) path: info/title
+#: C/file-mode.page:5 C/folder-mode.page:5 C/introduction.page:5
+#: C/missing-functionality.page:5 C/preferences.page:5
+msgctxt "sort"
+msgid "1"
+msgstr "1"
+
+#. (itstool) path: page/title
+#: C/file-mode.page:17
+msgid "Getting started comparing files"
+msgstr "Приступить к сравнению файлов"
+
+#. (itstool) path: page/p
+#: C/file-mode.page:19
+msgid ""
+"<app>Meld</app> lets you compare two or three text files side-by-side. You "
+"can start a new file comparison by selecting the <guiseq><gui style=\"menu"
+"\">File</gui><gui style=\"menuitem\">New...</gui></guiseq> menu item."
+msgstr ""
+"<app>Meld</app> позволяет сравнивать два или три текстовых файла в режиме "
+"параллельного просмотра. Вы можете начать новое сравнение файлов, выбрав "
+"пункт меню <guiseq><gui style=\"menu\">Файл</gui><gui style=\"menuitem"
+"\">Новое сравнение...</gui></guiseq>."
+
+#. (itstool) path: page/p
+#: C/file-mode.page:26
+msgid ""
+"Once you've selected your files, <app>Meld</app> will show them side-by-"
+"side. Differences between the files will be highlighted to make individual "
+"changes easier to see. Editing the files will cause the comparison to update "
+"on-the-fly. For details on navigating between individual changes, and on how "
+"to use change-based editing, see <link xref=\"file-changes\"/>."
+msgstr ""
+"После того, как файлы были выбраны, <app>Meld</app> отобразит их рядом друг "
+"с другом. Различия между файлами будут выделены, чтобы было легче увидеть "
+"отдельные изменения. Редактирование файлов приведет к тому, что сравнение "
+"будет обновляться на лету. Подробнее о навигации между отдельными "
+"изменениями и о том, как использовать редактирование на основе изменений, "
+"смотрите в разделе <link xref=\"file-changes\"/>."
+
+#. (itstool) path: section/title
+#: C/file-mode.page:35
+msgid "<app>Meld</app>'s file comparisons"
+msgstr "Сравнение файлов в <app>Meld</app>"
+
+#. (itstool) path: section/p
+#: C/file-mode.page:37
+msgid ""
+"There are several different parts to a file comparison. The most important "
+"parts are the editors where your files appear. In addition to these editors, "
+"the areas around and between your files give you a visual overview and "
+"actions to help you handle changes between the files."
+msgstr ""
+"Панель сравнения файлов разделена на несколько частей. Важнейшими частями "
+"являются панели редакторов, где будут показаны файлы. Помимо панелей "
+"редакторов предусмотрены области вокруг и между панелями файлов, которые "
+"предоставляют возможность просматривать и выполнять действия над различиями "
+"между файлами."
+
+#. (itstool) path: section/p
+#: C/file-mode.page:43
+msgid ""
+"On the left and right-hand sides of the window, there are two small vertical "
+"bars showing various coloured blocks. These bars are designed to give you an "
+"overview of all of the differences between your two files. Each coloured "
+"block represents a section that is inserted, deleted, changed or in conflict "
+"between your files, depending on the block's colour used."
+msgstr ""
+"Слева и справа от окна есть две маленькие вертикальные полоски, содержащие "
+"различные цветные блоки. Эти панели предназначены для того, чтобы дать вам "
+"обзор всех различий между вашими двумя файлами. Каждый цветной блок "
+"соответствует разделу, который вставлен, удалён, изменён или находится в "
+"конфликте между вашими файлами, в зависимости от используемого цвета блока."
+
+#. (itstool) path: section/p
+#: C/file-mode.page:50
+msgid ""
+"In between each pair of files is a segment that shows how the changed "
+"sections between your files correspond to each other. You can click on the "
+"arrows in a segment to replace sections in one file with sections from the "
+"other. You can also delete, copy or merge changes. For details on what you "
+"can do with individual change segments, see <link xref=\"file-changes#change-"
+"actions\"/>."
+msgstr ""
+"Между каждой парой файлов находится сегмент, который показывает, как "
+"изменённые разделы между вашими файлами соответствуют друг другу. Вы можете "
+"нажимать на стрелки в сегментах, чтобы заменять разделы в одном файле "
+"разделами из другого. Вы также можете удалять, копировать или объединять "
+"изменения. Подробнее о том, что вы можете делать с отдельными сегментами "
+"изменений, смотрите в разделе <link xref=\"file-changes#change-actions\"/>."
+
+#. (itstool) path: section/title
+#: C/file-mode.page:62
+msgid "Saving your changes"
+msgstr "Сохранение внесённых изменений"
+
+#. (itstool) path: section/p
+#: C/file-mode.page:64
+msgid ""
+"Once you've finished editing your files, you need to save each file you've "
+"changed."
+msgstr ""
+"После окончания редактирования файлов, нужно сохранить каждый, изменённый "
+"вами файл."
+
+#. (itstool) path: section/p
+#: C/file-mode.page:68
+msgid ""
+"You can tell whether your files have been saved since they last changed by "
+"the save icon that appears next to the file name above each file. Also, the "
+"notebook label will show an asterisk (<code>*</code>) after any file that "
+"hasn't been saved."
+msgstr ""
+"Узнать, были ли файлы сохранены с момента их последнего изменения, можно по "
+"значку сохранения, который появляется рядом с именем каждого файла. Кроме "
+"того, в метке блокнота будет отображаться звездочка (<code>*</code>) после "
+"названия каждого несохранённого файла."
+
+#. (itstool) path: section/p
+#: C/file-mode.page:74
+msgid ""
+"You can save the current file by selecting the <guiseq><gui style=\"menu"
+"\">File</gui><gui style=\"menuitem\">Save</gui></guiseq> menu item, or using "
+"the <keyseq><key>Ctrl</key><key>S</key></keyseq> keyboard shortcut."
+msgstr ""
+"Вы можете сохранить текущий файл, выбрав пункт меню <guiseq><gui style=\"menu"
+"\">Файл</gui><gui style=\"menuitem\">Сохранить</gui></guiseq> или "
+"воспользоваться комбинацией клавиш <keyseq ><key>Ctrl</key><key>S</key></"
+"keyseq>."
+
+#. (itstool) path: note/p
+#: C/file-mode.page:81
+msgid ""
+"Saving only saves the <em>currently focused</em> file, which is the file "
+"containing the cursor. If you can't tell which file is focused, you can "
+"click on the file to focus it before saving."
+msgstr ""
+"При этом сохраняется только файл, находящийся <em>в данный момент в фокусе</"
+"em>, то есть файл, содержащий курсор. Если вы не можете сказать, какой файл "
+"находится в фокусе, то можете щёлкнуть файл, чтобы перевести на него фокус "
+"перед сохранением."
+
+#. (itstool) path: page/title
+#: C/flattened-view.page:15
+msgid "Flattened view"
+msgstr "Упрощённое представление"
+
+#. (itstool) path: page/p
+#: C/flattened-view.page:17
+msgid ""
+"When viewing large folders, you may be interested in only a few files among "
+"the thousands in the folder itself. For this reason, <app>Meld</app> "
+"includes a <em>flattened view</em> of a folder; only files that have not "
+"been filtered out (e.g., by <link xref=\"vc-mode#vc-state-filtering\"/>) are "
+"shown, and the folder hierarchy is stripped away, with file paths shown in "
+"the <em>Location</em> column."
+msgstr ""
+"При просмотре больших папок вас могут заинтересовать лишь некоторые файлы из "
+"нескольких тысяч, находящихся в самой папке. По этой причине в <app>Meld</"
+"app> предусмотрено <em>упрощённое представление</em> папки: отображаются "
+"только файлы, которые не были отфильтрованы (например, по <link xref=\"vc-"
+"mode#vc-state-filtering\"/>), при этом, иерархия папок будет удалена, а пути "
+"к файлам будут показаны в колонке <em> Местоположение</em>."
+
+#. (itstool) path: page/p
+#: C/flattened-view.page:27
+msgid ""
+"You can turn this flattened view on or off by unchecking the <guiseq><gui "
+"style=\"menu\">View</gui><gui style=\"menuitem\">Flatten</gui></guiseq> menu "
+"item, or by clicking the corresponding <gui style=\"button\">Flatten</gui> "
+"button on the toolbar."
+msgstr ""
+"Вы можете включить или выключить упрощённое представление, сняв флажок с "
+"пункта меню <guiseq><gui style=\"menu\">Вид</gui><gui style=\"menuitem"
+"\">Выровнять</gui></guiseq> или нажав соответствующую кнопку <gui style="
+"\"button\">Выровнять</gui> на панели инструментов."
+
+#. (itstool) path: page/title
+#: C/folder-mode.page:16
+msgid "Getting started comparing folders"
+msgstr "Начало работы по сравнению файлов"
+
+#. (itstool) path: page/p
+#: C/folder-mode.page:18
+msgid ""
+"<app>Meld</app> lets you compare two or three folders side-by-side. You can "
+"start a new folder comparison by selecting the <guiseq><gui style=\"menu"
+"\">File</gui><gui style=\"menuitem\">New...</gui></guiseq> menu item, and "
+"clicking on the <gui style=\"tab\">Directory Comparison</gui> tab."
+msgstr ""
+"<app>Meld</app> позволяет сравнивать две или три папки располагая их рядом "
+"друг с другом. Вы можете начать сравнение новой папки, выбрав пункт меню "
+"<guiseq><gui style=\"menu\">Файл</gui><gui style=\"menuitem\">Новый...</"
+"gui></guiseq> и щёлкнув вкладку <gui style=\"tab\">Сравнение каталогов</gui>."
+
+#. (itstool) path: page/p
+#: C/folder-mode.page:26
+msgid ""
+"Your selected folders will be shown as side-by-side trees, with differences "
+"between files in each folder highlighted. You can copy or delete files from "
+"either folder, or compare individual text files in more detail."
+msgstr ""
+"Выбранные папки будут отображаться в виде расположенных рядом древовидных "
+"структур с выделенными различиями между файлами в каждой папке. Вы можете "
+"копировать и удалять файлы из любой папки или более подробно сравнивать "
+"отдельные текстовые файлы."
+
+#. (itstool) path: section/title
+#: C/folder-mode.page:36
+msgid "The folder comparison view"
+msgstr "Сравнение папок"
+
+#. (itstool) path: section/p
+#: C/folder-mode.page:38
+msgid ""
+"The main parts of a folder comparison are the trees showing the folders "
+"you're comparing. You can easily <link xref=\"#folder-navigation\">move "
+"around</link> these comparisons to find changes that you're interested in. "
+"When you select a file or folder, more detailed information is given in the "
+"status bar at the bottom of the window. Pressing <key>Enter</key> on a "
+"selected file, or double-clicking any file in the tree will open a side-by-"
+"side <link xref=\"file-mode\">file comparison</link> of the files in a new "
+"tab, but this will only work properly if they're text files!"
+msgstr ""
+"Основными частями панели сравнения папок являются древовидные списки, в виде "
+"которых отображаются сравниваемые папки. Вы можете легко <link xref="
+"\"#folder-navigation\">перемещаться</link> по этим сравнениям при поиске "
+"интересующих вас изменений. Если вы выбираете файл или папку, в строке "
+"состояния в нижней части окна будет отображена более подробная информация. "
+"Нажатие клавиши <key>Enter</key> или двойной щелчок по любому файлу в дереве "
+"откроет параллельное <link xref=\"file-mode\">сравнение файлов</link> в "
+"новой вкладке, но должным образом такое сравнение будет работать только для "
+"текстовых файлов!"
+
+#. (itstool) path: section/p
+#: C/folder-mode.page:50
+msgid ""
+"There are bars on the left and right-hand sides of the window that show you "
+"a simple coloured summary of the comparison results. Each file or folder in "
+"the comparison corresponds to a small section of these bars, though "
+"<app>Meld</app> doesn't show <em>Same</em> files so that it's easier to see "
+"any actually important differences. You can click anywhere on this bar to "
+"jump straight to that place in the comparison."
+msgstr ""
+"В левой и правой частях окна есть полосы, которые показывают простую цветную "
+"сводку результатов сравнения. Каждый файл или папка в сравнении "
+"соответствует небольшому участку этих полос, при этом <app>Meld</app> не "
+"показывает <em>одинаковые</em> файлы, чтобы было легче увидеть действительно "
+"важные различия. Вы можете щёлкнуть в любом месте этой панели, чтобы перейти "
+"прямо к этому месту в сравнении."
+
+#. (itstool) path: section/title
+#: C/folder-mode.page:63
+msgid "Navigating folder comparisons"
+msgstr "Навигация при сравнении папок"
+
+#. (itstool) path: section/p
+#: C/folder-mode.page:65
+msgid ""
+"You can jump between changed files (that is, any files/folders that are "
+"<em>not</em> classified as being identical) with the <guiseq><gui style="
+"\"menu\">Changes</gui><gui style=\"menuitem\">Previous change</gui></guiseq> "
+"and <guiseq><gui style=\"menu\">Changes</gui><gui style=\"menuitem\">Next "
+"change</gui></guiseq> menu items, or using the corresponding buttons on the "
+"toolbar."
+msgstr ""
+"Вы можете переключаться между изменёнными файлами (то есть любыми файлами/"
+"папками, которые <em>не</em> классифицированы как идентичные) с помощью "
+"пунктов меню <guiseq><gui style=\"menu\">Изменения</gui><gui style=\"menuitem"
+"\">Предыдущее изменение</gui></guiseq> и <guiseq><gui style=\"menu"
+"\">Изменения</gui><gui style=\"menuitem\">Следующее изменение</gui></guiseq> "
+"или используя соответствующие кнопки на панели инструментов."
+
+#. (itstool) path: section/p
+#: C/folder-mode.page:73
+msgid ""
+"You can use the <key>Left</key> and <key>Right</key> arrow keys to move "
+"between the folders you're comparing. This is useful so that you can select "
+"an individual file for copying or deletion."
+msgstr ""
+"Также вы можете использовать клавиши со стрелками <key>Влево</key> и "
+"<key>Вправо</key> для перемещения между сравниваемыми папками. Этот способ "
+"полезен тем, что вы можете выбрать индивидуальный файл для копирования или "
+"удаления."
+
+#. (itstool) path: section/title
+#: C/folder-mode.page:83
+msgid "States in folder comparisons"
+msgstr "Статус в сравнении папок"
+
+#. (itstool) path: section/p
+#: C/folder-mode.page:85
+msgid ""
+"Each file or folder in a tree has its own <em>state</em>, telling you how it "
+"differed from its corresponding files/folders. The possible states are:"
+msgstr ""
+"Каждый файл или папка в деревовидной структуре имеет собственный <em>статус</"
+"em>, говорящий вам, чем они отличаются от соответствующих им файлов/папок. "
+"Возможны следующие статусы:"
+
+#. (itstool) path: table/title
+#: C/folder-mode.page:106
+msgid "Folder comparison states"
+msgstr "Статусы сравнения папок"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:110 C/vc-mode.page:85
+msgid "State"
+msgstr "Статус"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:111 C/vc-mode.page:86
+msgid "Appearance"
+msgstr "Вид"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:112 C/vc-mode.page:87
+msgid "Meaning"
+msgstr "Значение"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:120 C/vc-mode.page:95
+msgid "Normal font"
+msgstr "Обычный шрифт"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:126
+msgid "The file/folder is the same across all compared folders."
+msgstr "Файл или папка одинаковы во всех сравниваемых папках."
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:132
+msgid "Same when filtered"
+msgstr "Одинаковые при фильтрации"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:134
+msgid "Italics"
+msgstr "Курсив"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:140
+msgid ""
+"These files are different across folders, but once <link xref=\"text-filters"
+"\">text filters</link> are applied, these files become identical."
+msgstr ""
+"Эти файлы различаются в разных папках, но после применения <link xref=\"text-"
+"filters\">текстовых фильтров</link> они становятся идентичными."
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:150
+msgid "Blue and bold"
+msgstr "Синий и жирный"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:156
+msgid "These files differ between the folders being compared."
+msgstr "В сравниваемых папках эти файлы различаются."
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:164 C/vc-mode.page:123
+msgid "Green and bold"
+msgstr "Зелёный и жирный"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:170
+msgid "This file/folder exists in this folder, but not in the others."
+msgstr "Этот файл или папка существуют в данной папке, но в других их нет."
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:176 C/vc-mode.page:167
+msgid "Missing"
+msgstr "Отсутствует"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:178
+msgid "Greyed out text with a line through the middle"
+msgstr "Перечёркнутый текст серого цвета"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:184
+msgid ""
+"This file/folder doesn't exist in this folder, but does in one of the others."
+msgstr ""
+"Этот файл или папка не существуют в данной папке, но существуют в одной из "
+"других."
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:191 C/vc-mode.page:212
+msgid "Error"
+msgstr "Ошибка"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:193 C/vc-mode.page:214
+msgid "Bright red with a yellow background and bold"
+msgstr "Ярко-красный жирный шрифт на жёлтом фоне"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:199
+msgid ""
+"When comparing this file, an error occurred. The most common error causes "
+"are file permissions (i.e., <app>Meld</app> was not allowed to open the "
+"file) and filename encoding errors."
+msgstr ""
+"При сравнении этого файла произошла ошибка. Наиболее распространёнными "
+"причинами ошибок являются права доступа к файлу (то есть, приложение "
+"<app>Meld</app> не смогло открывать файл) и ошибки в кодировке имени файла."
+
+#. (itstool) path: section/p
+#: C/folder-mode.page:217
+msgid ""
+"You can filter out files based on these states, for example, to show only "
+"files that have been <em>Modified</em>. You can read more about this in "
+"<link xref=\"file-filters#file-state-filter\"/>."
+msgstr ""
+"Вы можете отфильтровать файлы с учётом их статусов, например, можно показать "
+"только те файлы, которые были <em>изменены</em>. Подробнее об этом можно "
+"прочитать в <link xref=\"file-filters#file-state-filter\"/>."
+
+#. (itstool) path: section/p
+#: C/folder-mode.page:223
+msgid ""
+"Finally, the most recently modified file/folder has a small star emblem "
+"attached to it."
+msgstr ""
+"И наконец, последний изменённый файл или папка имеют пометку в виде "
+"небольшого символа звезды."
+
+#. (itstool) path: page/title
+#: C/index.page:14
+msgid "Meld Help"
+msgstr "Справка по Meld"
+
+#. (itstool) path: section/title
+#: C/index.page:17
+msgid "Introduction"
+msgstr "Введение"
+
+#. (itstool) path: section/title
+#: C/index.page:21
+msgid "Comparing Files"
+msgstr "Сравнение файлов"
+
+#. (itstool) path: section/title
+#: C/index.page:25
+msgid "Comparing Folders"
+msgstr "Сравнение папок"
+
+#. (itstool) path: section/title
+#: C/index.page:29
+msgid "Using Meld with Version Control"
+msgstr "Использование Meld с системой контроля версий"
+
+#. (itstool) path: section/title
+#: C/index.page:33
+msgid "Advanced Usage"
+msgstr "Дополнительные возможности"
+
+#. (itstool) path: page/title
+#: C/introduction.page:15
+msgid "What is Meld?"
+msgstr "Что такое Meld?"
+
+#. (itstool) path: page/p
+#: C/introduction.page:16
+msgid ""
+"<app>Meld</app> is a tool for comparing files and directories, and for "
+"resolving differences between them. It is also useful for comparing changes "
+"captured by version control systems."
+msgstr ""
+"<app>Meld</app> — это инструмент для сравнения файлов и каталогов и "
+"устранения различий между ними. Приложение также будет полезно для сравнения "
+"изменений, зафиксированных системами контроля версий."
+
+#. (itstool) path: page/p
+#: C/introduction.page:22
+msgid ""
+"<app>Meld</app> shows differences between two or three files (or two or "
+"three directories) and allows you to move content between them, or edit the "
+"files manually. <app>Meld</app>'s focus is on helping developers compare and "
+"merge source files, and get a visual overview of changes in their favourite "
+"version control system."
+msgstr ""
+"<app>Meld</app> показывает различия между двумя или тремя файлами (или двумя "
+"или тремя каталогами) и позволяет перемещать содержимое между ними или "
+"редактировать файлы вручную. <app>Meld</app> помогает разработчикам "
+"сравнивать и объединять исходные файлы, а также получать визуальный обзор "
+"изменений в их любимой системе контроля версий."
+
+#. (itstool) path: page/title
+#: C/keyboard-shortcuts.page:15
+msgid "Keyboard shortcuts"
+msgstr "Комбинации клавиш"
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:18
+msgid "Shortcuts for working with files and comparisons"
+msgstr "Комбинации клавиш для работы с файлами и сравнениями"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
+#: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
+#: C/keyboard-shortcuts.page:153
+msgid "Shortcut"
+msgstr "Комбинация клавиш"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
+#: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
+#: C/keyboard-shortcuts.page:153
+msgid "Description"
+msgstr "Описание"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:29
+msgid "<keyseq><key>Ctrl</key><key>N</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>N</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:30
+msgid "Start a new comparison."
+msgstr "Начать новое сравнение."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:33
+msgid "<keyseq><key>Ctrl</key><key>S</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>S</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:34
+msgid "Save the current document to disk."
+msgstr "Сохранить текущий документ на диск."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:37
+msgid "<keyseq><key>Ctrl</key><key>Shift</key><key>S</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>Shift</key><key>S</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:38
+msgid "Save the current document with a new filename."
+msgstr "Сохранить текущий документ с новым именем."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:41
+msgid "<keyseq><key>Ctrl</key><key>W</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>W</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:42
+msgid "Close the current comparison."
+msgstr "Закрыть текущее сравнение."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:45
+msgid "<keyseq><key>Ctrl</key><key>Q</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>Q</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:46
+msgid "Quit <app>Meld</app>."
+msgstr "Выйти из приложения <app>Meld</app>."
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:52
+msgid "Shortcuts for editing documents"
+msgstr "Комбинации клавиш для редактирования документов"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:62
+msgid "<keyseq><key>Ctrl</key><key>Z</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>Z</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:63
+msgid "Undo the last action."
+msgstr "Отмена последнего выполненного действия."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:66
+msgid "<keyseq><key>Ctrl</key><key>Shift</key><key>Z</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>Shift</key><key>Z</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:67
+msgid "Redo the last undone action."
+msgstr "Вернуть последнее отменённое действие."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:70
+msgid "<keyseq><key>Ctrl</key><key>X</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>X</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:71
+msgid "Cut the selected text or region and place it on the clipboard."
+msgstr "Вырезать выделенный текст или область и поместить его в буфер обмена."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:74
+msgid "<keyseq><key>Ctrl</key><key>C</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>C</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:75
+msgid "Copy the selected text or region onto the clipboard."
+msgstr "Копировать выделенный текст или область в буфер обмена."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:78
+msgid "<keyseq><key>Ctrl</key><key>V</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>V</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:79
+msgid "Paste the contents of the clipboard."
+msgstr "Вставка содержимого буфера обмена."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:82
+msgid "<keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>F</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:83
+msgid "Find a string."
+msgstr "Найти строку."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:86
+msgid "<keyseq><key>Ctrl</key><key>G</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>G</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:87
+msgid "Find the next instance of the string."
+msgstr "Найти следующую строку."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:90
+msgid "<keyseq><key>Alt</key><key>Down</key></keyseq>"
+msgstr "<keyseq><key>Alt</key><key>Down</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:91
+msgid ""
+"Go to the next difference. (Also <keyseq><key>Ctrl</key><key>D</key></"
+"keyseq>)"
+msgstr ""
+"Перейти к следующему различию. (<keyseq><key>Ctrl</key><key>D</key></keyseq>)"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:96
+msgid "<keyseq><key>Alt</key><key>Up</key></keyseq>"
+msgstr "<keyseq><key>Alt</key><key>Up</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:97
+msgid ""
+"Go to the previous difference. (Also <keyseq><key>Ctrl</key><key>E</key></"
+"keyseq>)"
+msgstr ""
+"Перейти к предыдущему различию. (<keyseq><key>Ctrl</key><key>E</key></"
+"keyseq>)"
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:105
+msgid "Shortcuts for folder comparison"
+msgstr "Комбинации клавиш для сравнения папок"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:115
+msgid "<keyseq><key>+</key></keyseq>"
+msgstr "<keyseq><key>+</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:116
+msgid "Expand the current folder."
+msgstr "Развернуть текущую папку."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:119
+msgid "<keyseq><key>-</key></keyseq>"
+msgstr "<keyseq><key>-</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:120
+msgid "Collapse the current folder."
+msgstr "Свернуть текущую папку."
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:127
+msgid "Shortcuts for view settings"
+msgstr "Комбинации клавиш для просмотра настроек"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:137
+msgid "<keyseq><key>Escape</key></keyseq>"
+msgstr "<keyseq><key>Escape</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:138
+msgid "Stop the current comparison."
+msgstr "Остановить текущее сравнение."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:141
+msgid "<keyseq><key>Ctrl</key><key>R</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>R</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:142
+msgid "Refresh the current comparison."
+msgstr "Обновить текущее сравнение."
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:149
+msgid "Shortcuts for help"
+msgstr "Комбинации клавиш для получения справки"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:159
+msgid "<keyseq><key>F1</key></keyseq>"
+msgstr "<keyseq><key>F1</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:160
+msgid "Open <app>Meld</app>'s user manual."
+msgstr "Открыть руководство пользователя по <app>Meld</app>."
+
+#. (itstool) path: p/link
+#: C/legal.xml:4
+msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
+msgstr "Лицензия Creative Commons Attribution-Share Alike 3.0 Unported License"
+
+#. (itstool) path: license/p
+#: C/legal.xml:3
+msgid "This work is licensed under a <_:link-1/>."
+msgstr "Эта работа распространяется на условиях <_:link-1/>."
+
+#. (itstool) path: license/p
+#: C/legal.xml:6
+msgid ""
+"As a special exception, the copyright holders give you permission to copy, "
+"modify, and distribute the example code contained in this document under the "
+"terms of your choosing, without restriction."
+msgstr ""
+"В качестве особого исключения, владельцы авторского права разрешают вам "
+"копировать, изменять и распространять примеры кодов, содержащиеся в "
+"документе на выбранных вами условиях, без ограничения."
+
+#. (itstool) path: page/title
+#: C/missing-functionality.page:15
+msgid "Things that <app>Meld</app> doesn't do"
+msgstr "Вещи, которые <app>Meld</app> не делает"
+
+#. (itstool) path: page/p
+#: C/missing-functionality.page:17
+msgid ""
+"Have you ever spent half an hour poking around an application trying to find "
+"out how to do something, thinking that <em>surely</em> there must be an "
+"option for this?"
+msgstr ""
+"Вы когда-нибудь проводили полчаса, копаясь в приложении, пытаясь выяснить, "
+"как что-то сделать, думая, что <em>наверняка</em> для этого должна быть "
+"возможность?"
+
+#. (itstool) path: page/p
+#: C/missing-functionality.page:23
+msgid ""
+"This section lists a few of the common things that <app>Meld</app> "
+"<em>doesn't</em> do, either as a deliberate choice, or because we just "
+"haven't had time."
+msgstr ""
+"В этом разделе перечислены некоторые из распространенных вещей, которые "
+"<app>Meld</app> <em>не делает</em> либо из-за сознательного нежелания "
+"разработчиков реализовать данную функцию, либо потому, что у нас просто не "
+"было времени."
+
+#. (itstool) path: section/title
+#: C/missing-functionality.page:30
+msgid "Aligning changes by adding lines"
+msgstr "Выравнивание изменений путем добавления строк"
+
+#. (itstool) path: section/p
+#: C/missing-functionality.page:31
+msgid ""
+"When <app>Meld</app> shows differences between files, it shows both files as "
+"they would appear in a normal text editor. It does <em>not</em> insert "
+"additional lines so that the left and right sides of a particular change are "
+"the same size. There is no option to do this."
+msgstr ""
+"Когда <app>Meld</app> показывает различия между файлами, оба файла "
+"отображаются так, как они выглядят в обычном текстовом редакторе. Приложение "
+"<em>не</em> вставляет дополнительные строки, чтобы левая и правая панели "
+"сравнения файлов имели одинаковые размеры. Такой возможности в приложении не "
+"предусмотрено."
+
+#. (itstool) path: credit/years
+#: C/preferences.page:12
+msgid "2013"
+msgstr "2013"
+
+#. (itstool) path: page/title
+#: C/preferences.page:15
+msgid "Meld's preferences"
+msgstr "Параметры Meld"
+
+#. (itstool) path: terms/title
+#: C/preferences.page:18
+msgid "Editor preferences"
+msgstr "Параметры редактора"
+
+#. (itstool) path: item/title
+#: C/preferences.page:20
+msgid "Editor command"
+msgstr "Команда редактора"
+
+#. (itstool) path: item/p
+#: C/preferences.page:21
+msgid ""
+"The name of the command to run to open text files in an external editor. "
+"This may be just the command (e.g., <cmd>gedit</cmd>) in which case the file "
+"to be opened will be passed as the last argument. Alternatively, you can add "
+"<code>{file}</code> and <code>{line}</code> elements to the command, in "
+"which case <app>Meld</app> will substitute the file path and current line "
+"number respectively (e.g., <cmd>gedit {file}:{line}</cmd>)."
+msgstr ""
+"Имя команды для открытия текстовых файлов во внешнем редакторе. Это может "
+"быть просто команда запуска (например, <cmd>gedit</cmd>), и в этом случае "
+"открываемый файл будет передан в качестве последнего аргумента. Кроме того, "
+"вы можете добавить в команду элементы <code>{file}</code> и <code>{line}</"
+"code>, и в этом случае <app>Meld</app> заменит их на путь к файлу и номеру "
+"текущей строки соответственно (например, <cmd>gedit {file}:{line}</cmd>)."
+
+#. (itstool) path: terms/title
+#: C/preferences.page:31
+msgid "Folder Comparison preferences"
+msgstr "Параметры сравнения папок"
+
+#. (itstool) path: item/title
+#: C/preferences.page:33
+msgid "Apply text filters during folder comparisons"
+msgstr "Применять текстовые фильтры во время сравнения папок"
+
+#. (itstool) path: item/p
+#: C/preferences.page:34
+msgid ""
+"When comparing files in folder comparison mode, text filters and other text "
+"manipulation options can be applied to the contents of files. If this option "
+"is enabled, all currently enabled text filters will be applied, the blank "
+"line trimming option will be applied as appropriate, and differences in line "
+"endings will be ignored."
+msgstr ""
+"При сравнении файлов в режиме сравнения папок к содержимому файлов можно "
+"применять текстовые фильтры и другие параметры обработки текста. Если этот "
+"параметр включен, будут применены все включённые в настоящее время текстовые "
+"фильтры, параметр обрезки пустых строк будет применен соответствующим "
+"образом, а различия в окончаниях строк будут проигнорированы."
+
+#. (itstool) path: item/p
+#: C/preferences.page:40
+msgid ""
+"Enabling this option means that <app>Meld</app> must fully read all non-"
+"binary files into memory during the folder comparison. With large text "
+"files, this can be slow and may cause memory issues."
+msgstr ""
+"Включение этого параметра означает, что во время сравнения папок <app>Meld</"
+"app> должен полностью загрузить в память все недвоичные файлы. С большими "
+"текстовыми файлами это может привести к замедлению работы и вызвать проблемы "
+"с памятью."
+
+#. (itstool) path: item/p
+#: C/preferences.page:44
+msgid ""
+"This option only has an effect if \"Compare files based only on size and "
+"timestamp\" is not enabled."
+msgstr ""
+"Этот параметр действует только в том случае, если параметр «Сравнение файлов "
+"только на основе размера и отметки времени» отключен."
+
+#. (itstool) path: page/title
+#: C/resolving-conflicts.page:15
+msgid "Resolving merge conflicts"
+msgstr "Разрешение конфликтов слияния"
+
+#. (itstool) path: page/p
+#: C/resolving-conflicts.page:17
+msgid ""
+"One of the best uses of <app>Meld</app> is to resolve conflicts that occur "
+"while merging different branches."
+msgstr ""
+"Одним из лучших применений <app>Meld</app> является разрешение конфликтов, "
+"возникающих при слиянии разных ветвей."
+
+#. (itstool) path: page/p
+#: C/resolving-conflicts.page:22
+msgid ""
+"For example, when using <app>Git</app>, <cmd>git mergetool</cmd> will start "
+"a 'merge helper'; <app>Meld</app> is one such helper. If you want to make "
+"<app>git mergetool</app> use <app>Meld</app> by default, you can add"
+msgstr ""
+"Например, при использовании <app>Git</app> <cmd>git mergetool</cmd> запустит "
+"«помощник по слиянию»; <app>Meld</app> — один из таких помощников. Если вы "
+"хотите, чтобы <app>git mergetool</app> использовал <app>Meld</app> по "
+"умолчанию, вы можете добавить"
+
+#. (itstool) path: page/code
+#: C/resolving-conflicts.page:27
+#, no-wrap
+msgid ""
+"\n"
+"[merge]\n"
+"    tool = meld\n"
+msgstr ""
+"\n"
+"[merge]\n"
+"    tool = meld\n"
+
+#. (itstool) path: page/p
+#: C/resolving-conflicts.page:31
+msgid ""
+"to <file>.git/gitconfig</file>. See the <app>git mergetool</app> manual for "
+"details."
+msgstr ""
+"в <file>.git/gitconfig</file>. Подробнее смотрите в руководстве по <app>git "
+"mergetool</app>."
+
+#. (itstool) path: page/title
+#: C/text-filters.page:17
+msgid "Filtering out text"
+msgstr "Фильтрация текста"
+
+#. (itstool) path: page/p
+#: C/text-filters.page:19
+msgid ""
+"When comparing several files, you may have sections of text where "
+"differences aren't really important. For example, you may want to focus on "
+"changed sections of code, and ignore any changes in comment lines. With text "
+"filters you can tell <app>Meld</app> to ignore text that matches a pattern "
+"(i.e., a regular expression) when showing differences between files."
+msgstr ""
+"При сравнении нескольких файлов у вас могут быть участки текста, в которых "
+"различия не очень важны. Например, вы можете захотеть сосредоточиться на "
+"изменённых участках кода и игнорировать любые изменения в строках "
+"комментариев. С помощью текстовых фильтров вы можете указать <app>Meld</app> "
+"игнорировать текст, соответствующий шаблону (например, регулярному "
+"выражению), при отображении различий между файлами."
+
+#. (itstool) path: note/p
+#: C/text-filters.page:28
+msgid ""
+"Text filters don't just affect file comparisons, but also folder "
+"comparisons. Check the <link xref=\"file-filters\">file filtering notes</"
+"link> for more details."
+msgstr ""
+"Текстовые фильтры затрагивают сравнение не только файлов, но и папок. "
+"Дополнительные сведения смотрите в <link xref=\"file-filters\">примечаниях к "
+"фильтрации файлов</link>."
+
+#. (itstool) path: section/title
+#: C/text-filters.page:37
+msgid "Adding and using text filters"
+msgstr "Добавление и использование текстовых фильтров"
+
+#. (itstool) path: section/p
+#: C/text-filters.page:39
+msgid ""
+"You can turn text filters on or off from the the <gui>Text Filters</gui> tab "
+"in <gui>Preferences</gui> dialog. <app>Meld</app> comes with a few simple "
+"filters that you might find useful, but you can add your own as well."
+msgstr ""
+"Включить или отключить текстовые фильтры вы можете на вкладке <gui>Текстовые "
+"фильтры</gui> в диалоговом окне <gui>Настройки</gui>. В <app>Meld</app> уже "
+"включены несколько простых фильтров, но вы также можете добавить свои "
+"собственные."
+
+#. (itstool) path: section/p
+#: C/text-filters.page:45
+msgid ""
+"In <app>Meld</app>, text filters are regular expressions that are matched "
+"against the text of files you're comparing. Any text that is matched is "
+"ignored during the comparison; you'll still see this text in the comparison "
+"view, but it won't be taken into account when finding differences. Text "
+"filters are applied in order, so it's possible for the first filter to "
+"remove text that now makes the second filter match, and so on."
+msgstr ""
+"Текстовыми фильтрами в <app>Meld</app> являются регулярные выражения, "
+"которые сопоставляются с текстом сравниваемых файлов. Любой совпавший при "
+"сравнении текст игнорируется; вы по-прежнему будете видеть этот текст при "
+"просмотре сравнения, но он не будет учитываться при поиске различий. "
+"Текстовые фильтры применяются по порядку, поэтому первый фильтр может "
+"удалить текст, который соответствует критериям второго фильтра, и так далее."
+
+#. (itstool) path: note/p
+#: C/text-filters.page:55
+msgid ""
+"If you're not familiar with regular expressions, you might want to check out "
+"the Python <link href=\"http://docs.python.org/howto/regex.html\">Regular "
+"Expression HOWTO</link>."
+msgstr ""
+"Если вы не знакомы с регулярными выражениями, то можете ознакомиться с "
+"Python <link href=\"http://docs.python.org/howto/regex.html\">Regular "
+"Expression HOWTO</link>."
+
+#. (itstool) path: section/title
+#: C/text-filters.page:67
+msgid "Getting text filters right"
+msgstr "Правильное использование текстовых фильтров"
+
+#. (itstool) path: section/p
+#: C/text-filters.page:69
+msgid ""
+"It's easy to get text filtering wrong, and Meld's support for filtering "
+"isn't complete. In particular, a text filter can't change the number of "
+"lines in a file. For example, if we had the built-in <gui>Script comment</"
+"gui> filter enabled, and compared the following files:"
+msgstr ""
+"Весьма вероятной является ситуация, когда текстовое фильтрование будет "
+"работать не так, как следует, а поддержка фильтрации в Meld не является "
+"полной. В частности, текстовый фильтр не может изменять количество строк в "
+"файле. Например, если включен встроенный фильтр <gui>Script comment</gui> и "
+"выполнено сравнение таких файлов:"
+
+#. (itstool) path: listing/title
+#: C/text-filters.page:80
+msgid "<file>comment1.txt</file>"
+msgstr "<file>comment1.txt</file>"
+
+#. (itstool) path: listing/code
+#: C/text-filters.page:81
+#, no-wrap
+msgid ""
+"\n"
+"a\n"
+"b#comment\n"
+"c\n"
+"d"
+msgstr ""
+"\n"
+"a\n"
+"b#comment\n"
+"c\n"
+"d"
+
+#. (itstool) path: listing/title
+#: C/text-filters.page:90
+msgid "<file>comment2.txt</file>"
+msgstr "<file>comment2.txt</file>"
+
+#. (itstool) path: listing/code
+#: C/text-filters.page:91
+#, no-wrap
+msgid ""
+"\n"
+"a\n"
+"b\n"
+"c\n"
+"#comment"
+msgstr ""
+"\n"
+"a\n"
+"b\n"
+"c\n"
+"#comment"
+
+#. (itstool) path: section/p
+#: C/text-filters.page:101
+msgid ""
+"then the lines starting with <code>b</code> would be shown as identical (the "
+"comment is stripped out) but the <code>d</code> line would be shown as "
+"different to the comment line on the right. This happens because the "
+"<code>#comment</code> is removed from the right-hand side, but the line "
+"itself can not be removed; <app>Meld</app> will show the <code>d</code> line "
+"as being different to what it sees as a blank line on the other side."
+msgstr ""
+"то строки, начинающиеся с <code>b</code>, будут отображаться как идентичные "
+"(#comment будет удалён), но строка с <code>d</code> будет отмечена как "
+"отличная от строки, содержащей #comment справа. Причина этого то, что "
+"<code>#comment</code> будет удалён с правой стороны, но сама строка "
+"останется; <app>Meld</app> покажет строку <code>d</code> как отличающуюся от "
+"пустой строки на другой стороне."
+
+#. (itstool) path: section/title
+#: C/text-filters.page:114
+msgid "Blank lines and filters"
+msgstr "Пустые строки и фильтры"
+
+#. (itstool) path: section/p
+#: C/text-filters.page:116
+msgid ""
+"The <gui>Ignore changes which insert or delete blank lines</gui> preference "
+"in the <gui>Text Filters</gui> tab requires special explanation. If this "
+"special filter is enabled, then any change consisting only of blank lines is "
+"completely ignored. This may occur because there was an actual whitespace "
+"change in the text, but it may also arise if your active text filters have "
+"removed all of the other content from a change, leaving only blank lines."
+msgstr ""
+"Параметр <gui>Игнорировать изменения пустых строк</gui> на вкладке "
+"<gui>Текстовые фильтры</gui> требует отдельного включения. Если этот фильтр "
+"включён, то любое изменение, состоящее только из пустых строк, полностью "
+"игнорируется. Это может произойти как из-за наличия фактического пробела в "
+"тексте, так и из-за действия текстовых фильтров, которые удалили содержимое, "
+"оставив только пустые строки."
+
+#. (itstool) path: section/p
+#: C/text-filters.page:125
+msgid ""
+"You can use this option to get around some of the <link xref=\"#text-filter-"
+"problems\">problems and limitations</link> resulting from filters not being "
+"able to remove whole lines, but it can also be useful in and of itself."
+msgstr ""
+"Вы можете использовать этот параметр, чтобы обойти некоторые <link xref="
+"\"#text-filter-problems\">проблемы и ограничения</link>, связанные с "
+"невозможностью фильтров удалить целые строки, но и сам по себе он может быть "
+"полезен."
+
+#. (itstool) path: info/title
+#: C/vc-mode.page:5
+msgctxt "sort"
+msgid "0"
+msgstr "0"
+
+#. (itstool) path: page/title
+#: C/vc-mode.page:16
+msgid "Viewing version-controlled files"
+msgstr "Просмотр файлов в системе контроля версий"
+
+#. (itstool) path: page/p
+#: C/vc-mode.page:18
+msgid ""
+"<app>Meld</app> integrates with <link xref=\"vc-supported\">many version "
+"control systems</link> to let you review local changes and perform simple "
+"version control tasks. You can start a new version control comparison by "
+"selecting the <guiseq><gui style=\"menu\">File</gui><gui style=\"menuitem"
+"\">New...</gui></guiseq> menu item, and clicking on the <gui style=\"tab"
+"\">Version Control</gui> tab."
+msgstr ""
+"<app>Meld</app> интегрируется с <link xref=\"vc-supported\">многими "
+"системами контроля версий</link>, чтобы вы могли просматривать локальные "
+"изменения и выполнять простые задачи по контролю версий. Начать новое "
+"сравнение с системой контроля версий можно выбрав пункт меню <guiseq><gui "
+"style=\"menu\">Файл</gui><gui style=\"menuitem\">Новый...</gui></guiseq>, и "
+"перейти на вкладку <gui style=\"tab\">Контроль версий</gui>."
+
+#. (itstool) path: section/title
+#: C/vc-mode.page:30
+msgid "Version control comparisons"
+msgstr "Сравнение в системе контроля версий"
+
+#. (itstool) path: section/p
+#: C/vc-mode.page:32
+msgid ""
+"Version control comparisons show the differences between the contents of "
+"your folder and the current repository version. Each file in your local copy "
+"has a <link xref=\"#vc-state\">state</link> that indicates how it differs "
+"from the repository copy."
+msgstr ""
+"На панели сравнения в системе контроля версий показаны различия между "
+"содержимым вашей локальной папки и текущей версией в репозитории. Каждый "
+"файл вашей локальной копии имеет <link xref=\"#vc-state\">статус</link> "
+"указывающий, чем он отличается от копии в репозитории."
+
+#. (itstool) path: section/p
+#: C/vc-mode.page:46
+msgid ""
+"If you want to look at a particular file's differences, you can select it "
+"and press <key>Enter</key>, or double-click the file to start a <link xref="
+"\"file-mode\">file comparison</link>. You can also interact with your "
+"version control system using the <gui style=\"menu\">Changes</gui> menu."
+msgstr ""
+"Если вы хотите посмотреть различия определённого файла, то можете выбрать "
+"его и нажать <key>Enter</key> или дважды щёлкнуть файл мышью, чтобы начать "
+"<link xref=\"file-mode\">сравнение файлов</link >. Вы также можете "
+"взаимодействовать со своей системой контроля версий, используя меню <gui "
+"style=\"menu\">Изменения</gui>."
+
+#. (itstool) path: section/title
+#. (itstool) path: table/title
+#: C/vc-mode.page:56 C/vc-mode.page:81
+msgid "Version control states"
+msgstr "Статусы системы контроля версий"
+
+#. (itstool) path: section/p
+#: C/vc-mode.page:58
+msgid ""
+"Each file or folder in a version control comparison has a <em>state</em>, "
+"obtained from the version control system itself. <app>Meld</app> maps these "
+"different states into a standard set of very similar concepts. As such, "
+"<app>Meld</app> might use slightly different names for states than your "
+"version control system does. The possible states are:"
+msgstr ""
+"К каждого файла или папки в системе контроля версий имеется <em>состояние</"
+"em>, полученное из самой системы контроля версий. <app>Meld</app> "
+"устанавливает соответствие этих состояний стандартному набору сходных "
+"понятий. Таким образом, <app>Meld</app> может использовать несколько иные "
+"названия для состояний, чем имеется в системе контроля версий. Возможны "
+"следующие состояния:"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:101
+msgid "The file/folder is the same as the repository version."
+msgstr "Этот файл или папка такие же, как и в версии репозитория."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:109
+msgid "Red and bold"
+msgstr "Красный и жирный"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:115
+msgid "This file is different to the repository version."
+msgstr "Файл отличается от версии репозитория."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:129
+msgid ""
+"This file/folder is new, and is scheduled to be added to the repository."
+msgstr ""
+"Этот файл или папка являются новыми и планируются к добавлению в репозиторий."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:136
+msgid "Removed"
+msgstr "Удалён"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:138
+msgid "Red bold text with a line through the middle"
+msgstr "Красный полужирный текст с чертой посередине"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:144
+msgid ""
+"This file/folder existed, but is scheduled to be removed from the repository."
+msgstr ""
+"Этот файл или папка существуют, но планируются к удалению из репозитория."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:151
+msgid "Conflict"
+msgstr "Конфликт"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:153
+msgid "Bright red bold text"
+msgstr "Ярко-красный полужирный текст"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:159
+msgid ""
+"When trying to merge with the repository, the differences between the local "
+"file and the repository could not be resolved, and the file is now in "
+"conflict with the repository contents"
+msgstr ""
+"При попытке слияния данных с репозиторием не удалось устранить различия "
+"между локальным файлом и находящемся в репозитории, и теперь файл "
+"конфликтует с содержимым репозитория"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:169
+msgid "Blue bold text with a line through the middle"
+msgstr "Синий полужирный текст с чертой посередине"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:175
+msgid "This file/folder should be present, but isn't."
+msgstr "Этот файл или папка должны быть быть в наличии, но их нет."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:181
+msgid "Ignored"
+msgstr "Игнорируемые"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:183 C/vc-mode.page:199
+msgid "Greyed out text"
+msgstr "Серый текст"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:189
+msgid ""
+"This file/folder has been explicitly ignored (e.g., by an entry in <file>."
+"gitignore</file>) and is not being tracked by version control."
+msgstr ""
+"Этот файл или папка были явно проигнорированы (например, записью <file>."
+"gitignore</file>) и не отслеживаются системой контроля версий."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:197
+msgid "Unversioned"
+msgstr "Без версии"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:205
+msgid ""
+"This file is not in the version control system; it is only in the local copy."
+msgstr ""
+"Этого файла нет в системе контроля версий; он имеется только в локальной "
+"копии."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:220
+msgid "The version control system has reported a problem with this file."
+msgstr "Система контроля версий сообщила о проблеме с этим файлом."
+
+#. (itstool) path: section/title
+#: C/vc-mode.page:230
+msgid "Version control state filtering"
+msgstr "Фильтрация по статусу в системе контроля версий"
+
+#. (itstool) path: section/p
+#: C/vc-mode.page:232
+msgid ""
+"Most often, you will only want to see files that are identified as being in "
+"some way different; this is the default setting in <app>Meld</app>. You can "
+"change which file states you see by using the <guiseq><gui style=\"menu"
+"\">View</gui><gui style=\"menuitem\">Version Status</gui></guiseq> menu, or "
+"by clicking the corresponding <gui style=\"button\">Modified</gui>, <gui "
+"style=\"button\">Normal</gui>, <gui style=\"button\">Unversioned</gui> and "
+"<gui style=\"button\">Ignored</gui> buttons on the toolbar."
+msgstr ""
+"Чаще всего вы хотите видеть только те файлы, которые идентифицируются как "
+"различающиеся каким-либо образом; это является типичным вариантом работы "
+"<app>Meld</app>. Вы можете изменить перечень отображаемых состояний файлов с "
+"помощью меню <guiseq><gui style=\"menu\">Вид</gui><gui style=\"menuitem"
+"\">Статус версии</gui></guiseq> или нажав соответствующую кнопку на панели "
+"инструментов: <gui style=\"button\">Изменённые</gui>, <gui style=\"button"
+"\">Стандартные</gui>, <gui style=\"button\">Без версии</gui> и <gui style="
+"\"button \">Игнорируемые</gui>."
+
+#. (itstool) path: info/title
+#: C/vc-supported.page:5
+msgctxt "sort"
+msgid "3"
+msgstr "3"
+
+#. (itstool) path: page/title
+#: C/vc-supported.page:15
+msgid "Supported version control systems"
+msgstr "Поддерживаемые системы контроля версий"
+
+#. (itstool) path: page/p
+#: C/vc-supported.page:17
+msgid "<app>Meld</app> supports a wide range of version control systems:"
+msgstr "<app>Meld</app> поддерживает широкий спектр систем контроля версий:"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:22
+msgid "Bazaar"
+msgstr "Bazaar"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:23
+msgid "Darcs"
+msgstr "Darcs"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:24
+msgid "Git"
+msgstr "Git"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:25
+msgid "Mercurial"
+msgstr "Mercurial"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:26
+msgid "SVN"
+msgstr "SVN"
+
+#. (itstool) path: page/p
+#: C/vc-supported.page:29
+msgid ""
+"Less common version control systems or unusual configurations may not be "
+"properly tested; please report any version control support bugs to the <link "
+"href=\"https://gitlab.gnome.org/GNOME/meld/issues\">Meld issue tracker</"
+"link>."
+msgstr ""
+"Менее распространенные системы контроля версий или необычные конфигурации "
+"могут быть не достаточное проверены; сообщайте о любых ошибках в поддержке "
+"систем контроля версий в <link href=\"https://gitlab.gnome.org/GNOME/meld/"
+"issues\">системе отслеживания проблем Meld</link>."

From 85dfccbccd33c6227f62e5d85f2141fa1f13c797 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 21 May 2022 20:35:50 +0200
Subject: [PATCH 103/116] Update more icons removed from Adwaita

---
 meld/preferences.py          | 4 ++--
 meld/resources/ui/findbar.ui | 2 +-
 meld/tree.py                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meld/preferences.py b/meld/preferences.py
index 67e99ad2..ae3c3434 100644
--- a/meld/preferences.py
+++ b/meld/preferences.py
@@ -78,8 +78,8 @@ def __init__(self, **kwargs):
 
     def valid_icon_celldata(self, col, cell, model, it, user_data=None):
         is_valid = model.get_value(it, 3)
-        icon_name = "gtk-dialog-warning" if not is_valid else None
-        cell.set_property("stock-id", icon_name)
+        icon_name = "dialog-warning-symbolic" if not is_valid else None
+        cell.set_property("icon-name", icon_name)
 
     @Gtk.Template.Callback()
     def on_add_clicked(self, button):
diff --git a/meld/resources/ui/findbar.ui b/meld/resources/ui/findbar.ui
index d089de90..a5454a71 100644
--- a/meld/resources/ui/findbar.ui
+++ b/meld/resources/ui/findbar.ui
@@ -160,7 +160,7 @@
           <object class="GtkImage" id="wrap_image">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="stock">gtk-info</property>
+            <property name="icon_name">view-wrapped-symbolic</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/meld/tree.py b/meld/tree.py
index af9eee75..08b1f4fb 100644
--- a/meld/tree.py
+++ b/meld/tree.py
@@ -112,7 +112,7 @@ def _setup_default_styles(self, style=None):
             ("text-x-generic", "folder", None,   None),    # NONE
             ("text-x-generic", "folder", None,   None),    # NORMAL
             ("text-x-generic", "folder", None,   None),    # NOCHANGE
-            ("dialog-warning", None,     None,   None),    # ERROR
+            ("dialog-warning-symbolic", None,     None,   None),    # ERROR
             (None,             None,     None,   None),    # EMPTY
             ("text-x-generic", "folder", new_fg, None),    # NEW
             ("text-x-generic", "folder", mod_fg, None),    # MODIFIED

From b7c93006bc22e72ac871395049a29a44ab670ea2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 21 May 2022 20:38:31 +0200
Subject: [PATCH 104/116] Remove remaining stock references

Those have long been deprecated and are removed in GTK 4.
---
 meld/resources/ui/commit-dialog.ui   | 4 ++--
 meld/resources/ui/patch-dialog.ui    | 4 ++--
 meld/resources/ui/push-dialog.ui     | 4 ++--
 meld/resources/ui/recent-selector.ui | 4 ++--
 meld/resources/ui/revert-dialog.ui   | 4 ++--
 meld/ui/msgarea.py                   | 8 ++++----
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/meld/resources/ui/commit-dialog.ui b/meld/resources/ui/commit-dialog.ui
index f37095b4..e9f19b29 100644
--- a/meld/resources/ui/commit-dialog.ui
+++ b/meld/resources/ui/commit-dialog.ui
@@ -241,12 +241,12 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancelbutton1">
-                <property name="label">gtk-cancel</property>
+                <property name="label">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/meld/resources/ui/patch-dialog.ui b/meld/resources/ui/patch-dialog.ui
index 732b2373..ec0ff824 100644
--- a/meld/resources/ui/patch-dialog.ui
+++ b/meld/resources/ui/patch-dialog.ui
@@ -38,12 +38,12 @@
             </child>
             <child>
               <object class="GtkButton" id="button9">
-                <property name="label">gtk-cancel</property>
+                <property name="label">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <accelerator key="Escape" signal="activate"/>
               </object>
               <packing>
diff --git a/meld/resources/ui/push-dialog.ui b/meld/resources/ui/push-dialog.ui
index 697b1626..00491005 100644
--- a/meld/resources/ui/push-dialog.ui
+++ b/meld/resources/ui/push-dialog.ui
@@ -21,11 +21,11 @@
             <property name="layout_style">expand</property>
             <child>
               <object class="GtkButton" id="cancelbutton">
-                <property name="label">gtk-cancel</property>
+                <property name="label">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/meld/resources/ui/recent-selector.ui b/meld/resources/ui/recent-selector.ui
index 32fd36bb..4ac7000c 100644
--- a/meld/resources/ui/recent-selector.ui
+++ b/meld/resources/ui/recent-selector.ui
@@ -40,11 +40,11 @@
     </child>
     <child>
       <object class="GtkButton" id="open_button">
-        <property name="label">gtk-open</property>
+        <property name="label">_Open</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="can_default">True</property>
-        <property name="use_stock">True</property>
+        <property name="use_underline">True</property>
         <signal name="clicked" handler="on_activate" swapped="no"/>
       </object>
       <packing>
diff --git a/meld/resources/ui/revert-dialog.ui b/meld/resources/ui/revert-dialog.ui
index 009a974e..0d0ad6da 100644
--- a/meld/resources/ui/revert-dialog.ui
+++ b/meld/resources/ui/revert-dialog.ui
@@ -21,12 +21,12 @@
             <property name="layout_style">expand</property>
             <child>
               <object class="GtkButton" id="cancel_button1">
-                <property name="label">gtk-cancel</property>
+                <property name="label">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/meld/ui/msgarea.py b/meld/ui/msgarea.py
index 69520d66..f3246ff2 100644
--- a/meld/ui/msgarea.py
+++ b/meld/ui/msgarea.py
@@ -24,8 +24,8 @@
 from meld.conf import _
 
 
-def layout_text_and_icon(stockid, primary_text, secondary_text=None):
-    image = Gtk.Image.new_from_icon_name(stockid, Gtk.IconSize.DIALOG)
+def layout_text_and_icon(icon_name, primary_text, secondary_text=None):
+    image = Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.DIALOG)
     image.set_alignment(0.5, 0.5)
 
     vbox = Gtk.VBox(homogeneous=False, spacing=6)
@@ -86,7 +86,7 @@ def clear(self):
         self.__msgid = None
 
     def new_from_text_and_icon(
-            self, stockid, primary, secondary=None, buttons=None):
+            self, icon_name, primary, secondary=None, buttons=None):
         self.clear()
         msgarea = self.__msgarea = Gtk.InfoBar()
 
@@ -94,7 +94,7 @@ def new_from_text_and_icon(
             for (text, respid) in buttons:
                 self.add_button(text, respid)
 
-        content = layout_text_and_icon(stockid, primary, secondary)
+        content = layout_text_and_icon(icon_name, primary, secondary)
 
         content_area = msgarea.get_content_area()
         content_area.foreach(content_area.remove, None)

From e763d2599dfc30cd8d785031b0c977d90563db06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Benvenuti?= <gastornis@posteo.org>
Date: Thu, 26 May 2022 17:24:02 +0000
Subject: [PATCH 105/116] Update German translation

---
 po/de.po | 669 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 375 insertions(+), 294 deletions(-)

diff --git a/po/de.po b/po/de.po
index 3c528949..126a50ef 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,25 +11,26 @@
 # Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>, 2017.
 # Wolfgang Stöggl <c72578@yahoo.de>, 2019.
 # Philipp Kiemle <philipp.kiemle@gmail.com>, 2021.
+# Tim Sabsch <tim@sabsch.com>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2021-09-18 05:50+0000\n"
-"PO-Revision-Date: 2021-09-20 01:19+0200\n"
-"Last-Translator: Philipp Kiemle <philipp.kiemle@gmail.com>\n"
+"POT-Creation-Date: 2022-05-23 07:43+0000\n"
+"PO-Revision-Date: 2022-05-26 17:39+0200\n"
+"Last-Translator: Tim Sabsch <tim@sabsch.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.0.1\n"
 "X-Poedit-Bookmarks: -1,351,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
-#: meld/resources/ui/appwindow.ui:9
+#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
 msgid "Meld"
 msgstr "Meld"
 
@@ -94,13 +95,16 @@ msgstr "Voreingestellter Vollbildzustand des Fensters"
 
 #: data/org.gnome.meld.gschema.xml:58
 msgid "Prefer application-wide dark theme"
-msgstr ""
+msgstr "Programmübergreifendes dunkles Thema bevorzugen"
 
 #: data/org.gnome.meld.gschema.xml:59
 msgid ""
 "If true, the GTK dark theme variant will be used, if available. Note that "
 "this is separate from the syntax highlighting scheme."
 msgstr ""
+"Falls gesetzt, wird die dunkle Variante des GTK-Themas verwendet, falls "
+"verfügbar. Beachten Sie, dass dies getrennt ist vom Schema der "
+"Syntaxhervorhebung."
 
 #: data/org.gnome.meld.gschema.xml:65
 msgid "Additional automatically detected text encodings"
@@ -546,218 +550,223 @@ msgctxt "shortcut window"
 msgid "Fullscreen"
 msgstr "Vollbild"
 
-#: meld/resources/gtk/help-overlay.ui:63
+#: meld/resources/gtk/help-overlay.ui:61
+msgctxt "shortcut window"
+msgid "Swap left and right panes"
+msgstr "Linken und rechten Bereich tauschen"
+
+#: meld/resources/gtk/help-overlay.ui:70
 msgctxt "shortcut window"
 msgid "Panes"
 msgstr "Bereiche"
 
-#: meld/resources/gtk/help-overlay.ui:68
+#: meld/resources/gtk/help-overlay.ui:75
 msgctxt "shortcut window"
 msgid "Previous comparison pane"
 msgstr "Vorheriger Vergleichsbereich"
 
-#: meld/resources/gtk/help-overlay.ui:75
+#: meld/resources/gtk/help-overlay.ui:82
 msgctxt "shortcut window"
 msgid "Next comparison pane"
 msgstr "Nächster Vergleichsbereich"
 
-#: meld/resources/gtk/help-overlay.ui:84
+#: meld/resources/gtk/help-overlay.ui:91
 msgctxt "shortcut window"
 msgid "Changes"
 msgstr "Änderungen"
 
-#: meld/resources/gtk/help-overlay.ui:89
+#: meld/resources/gtk/help-overlay.ui:96
 msgctxt "shortcut window"
 msgid "Go to previous change"
 msgstr "Zur vorherigen Änderung gehen"
 
-#: meld/resources/gtk/help-overlay.ui:96
+#: meld/resources/gtk/help-overlay.ui:103
 msgctxt "shortcut window"
 msgid "Go to next change"
 msgstr "Zur nächsten Änderung gehen"
 
-#: meld/resources/gtk/help-overlay.ui:105
+#: meld/resources/gtk/help-overlay.ui:112
 msgctxt "shortcut window"
 msgid "Tabs"
 msgstr "Reiter"
 
-#: meld/resources/gtk/help-overlay.ui:110
+#: meld/resources/gtk/help-overlay.ui:117
 msgctxt "shortcut window"
 msgid "Go to previous tab"
 msgstr "Zum vorherigen Reiter wechseln"
 
-#: meld/resources/gtk/help-overlay.ui:117
+#: meld/resources/gtk/help-overlay.ui:124
 msgctxt "shortcut window"
 msgid "Go to next tab"
 msgstr "Zum nächsten Reiter wechseln"
 
-#: meld/resources/gtk/help-overlay.ui:124
+#: meld/resources/gtk/help-overlay.ui:131
 msgctxt "shortcut window"
 msgid "Switch to tab"
 msgstr "Zum Reiter wechseln"
 
-#: meld/resources/gtk/help-overlay.ui:131
+#: meld/resources/gtk/help-overlay.ui:138
 msgctxt "shortcut window"
 msgid "Move tab left"
 msgstr "Reiter nach links verschieben"
 
-#: meld/resources/gtk/help-overlay.ui:138
+#: meld/resources/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
 msgid "Move tab right"
 msgstr "Reiter nach rechts verschieben"
 
-#: meld/resources/gtk/help-overlay.ui:147
+#: meld/resources/gtk/help-overlay.ui:154
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Bearbeitung"
 
-#: meld/resources/gtk/help-overlay.ui:152
+#: meld/resources/gtk/help-overlay.ui:159
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: meld/resources/gtk/help-overlay.ui:159
+#: meld/resources/gtk/help-overlay.ui:166
 msgctxt "shortcut window"
 msgid "Redo"
 msgstr "Wiederholen"
 
-#: meld/resources/gtk/help-overlay.ui:166
+#: meld/resources/gtk/help-overlay.ui:173
 msgctxt "shortcut window"
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: meld/resources/gtk/help-overlay.ui:173
+#: meld/resources/gtk/help-overlay.ui:180
 msgctxt "shortcut window"
 msgid "Copy"
 msgstr "Kopieren"
 
-#: meld/resources/gtk/help-overlay.ui:180
+#: meld/resources/gtk/help-overlay.ui:187
 msgctxt "shortcut window"
 msgid "Paste"
 msgstr "Einfügen"
 
-#: meld/resources/gtk/help-overlay.ui:187
+#: meld/resources/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Find"
 msgstr "Suchen"
 
-#: meld/resources/gtk/help-overlay.ui:194
+#: meld/resources/gtk/help-overlay.ui:201
 msgctxt "shortcut window"
 msgid "Find Next"
 msgstr "Weitersuchen"
 
-#: meld/resources/gtk/help-overlay.ui:201
+#: meld/resources/gtk/help-overlay.ui:208
 msgctxt "shortcut window"
 msgid "Find Previous"
 msgstr "Rückwärts suchen"
 
-#: meld/resources/gtk/help-overlay.ui:208
+#: meld/resources/gtk/help-overlay.ui:215
 msgctxt "shortcut window"
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: meld/resources/gtk/help-overlay.ui:217
+#: meld/resources/gtk/help-overlay.ui:224
 msgctxt "shortcut window"
 msgid "File comparison"
 msgstr "Dateivergleich"
 
-#: meld/resources/gtk/help-overlay.ui:222
+#: meld/resources/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Save current file"
 msgstr "Aktuelle Datei speichern"
 
-#: meld/resources/gtk/help-overlay.ui:229
+#: meld/resources/gtk/help-overlay.ui:236
 msgctxt "shortcut window"
 msgid "Save current file to new path"
 msgstr "Aktuelle Datei an einem anderen Ort speichern"
 
-#: meld/resources/gtk/help-overlay.ui:236
+#: meld/resources/gtk/help-overlay.ui:243
 msgctxt "shortcut window"
 msgid "Save all files in comparison"
 msgstr "Alle Dateien im aktuellen Vergleich speichern"
 
-#: meld/resources/gtk/help-overlay.ui:243
+#: meld/resources/gtk/help-overlay.ui:250
 msgctxt "shortcut window"
 msgid "Previous conflict"
 msgstr "Vorheriger Konflikt"
 
-#: meld/resources/gtk/help-overlay.ui:250
+#: meld/resources/gtk/help-overlay.ui:257
 msgctxt "shortcut window"
 msgid "Next conflict"
 msgstr "Nächster Konflikt"
 
-#: meld/resources/gtk/help-overlay.ui:257
+#: meld/resources/gtk/help-overlay.ui:264
 msgctxt "shortcut window"
 msgid "Push change to left"
 msgstr "Änderung nach links schieben"
 
-#: meld/resources/gtk/help-overlay.ui:264
+#: meld/resources/gtk/help-overlay.ui:271
 msgctxt "shortcut window"
 msgid "Push change to right"
 msgstr "Änderung nach rechts schieben"
 
-#: meld/resources/gtk/help-overlay.ui:271
+#: meld/resources/gtk/help-overlay.ui:278
 msgctxt "shortcut window"
 msgid "Pull change from left"
 msgstr "Änderung von links ziehen"
 
-#: meld/resources/gtk/help-overlay.ui:278
+#: meld/resources/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Pull change from right"
 msgstr "Änderung von rechts ziehen"
 
-#: meld/resources/gtk/help-overlay.ui:285
+#: meld/resources/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Copy change above left"
 msgstr "Änderung über den linken Teil kopieren"
 
-#: meld/resources/gtk/help-overlay.ui:292
+#: meld/resources/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Copy change below left"
 msgstr "Änderung unter den linken Teil kopieren"
 
-#: meld/resources/gtk/help-overlay.ui:299
+#: meld/resources/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Copy change above right"
 msgstr "Änderung über den rechten Teil kopieren"
 
-#: meld/resources/gtk/help-overlay.ui:306
+#: meld/resources/gtk/help-overlay.ui:313
 msgctxt "shortcut window"
 msgid "Copy change below right"
 msgstr "Änderung unter den rechten Teil kopieren"
 
-#: meld/resources/gtk/help-overlay.ui:313
-#: meld/resources/gtk/help-overlay.ui:341
+#: meld/resources/gtk/help-overlay.ui:320
+#: meld/resources/gtk/help-overlay.ui:348
 msgctxt "shortcut window"
 msgid "Delete change"
 msgstr "Änderung löschen"
 
-#: meld/resources/gtk/help-overlay.ui:322
+#: meld/resources/gtk/help-overlay.ui:329
 msgctxt "shortcut window"
 msgid "Folder comparison"
 msgstr "Ordnervergleiche"
 
-#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
 msgid "Copy to left"
 msgstr "Nach links kopieren"
 
-#: meld/resources/gtk/help-overlay.ui:334
+#: meld/resources/gtk/help-overlay.ui:341
 msgctxt "shortcut window"
 msgid "Copy to right"
 msgstr "Nach rechts kopieren"
 
-#: meld/resources/gtk/help-overlay.ui:350
+#: meld/resources/gtk/help-overlay.ui:357
 msgctxt "shortcut window"
 msgid "Version control comparison"
 msgstr "Versionskontrollvergleich"
 
-#: meld/resources/gtk/help-overlay.ui:355
+#: meld/resources/gtk/help-overlay.ui:362
 msgctxt "shortcut window"
 msgid "Commit to version control"
 msgstr "Änderungen in die Versionskontrolle einspielen"
 
-#: meld/resources/gtk/help-overlay.ui:362
+#: meld/resources/gtk/help-overlay.ui:369
 msgctxt "shortcut window"
 msgid "Show/hide console output"
 msgstr "Konsolenausgabe anzeigen/verbergen"
@@ -814,71 +823,71 @@ msgstr "Versionskontrollkonsole"
 msgid "Lock scrolling"
 msgstr "Rollen sperren"
 
-#: meld/resources/gtk/menus.ui:73
+#: meld/resources/gtk/menus.ui:74
+msgid "Swap left and right panes"
+msgstr "Linken und rechten Bereich tauschen"
+
+#: meld/resources/gtk/menus.ui:80
 msgid "Comparison"
 msgstr "Vergleich"
 
-#: meld/resources/gtk/menus.ui:77
+#: meld/resources/gtk/menus.ui:84
 msgid "Merge All from Left"
 msgstr "Alle Änderungen von links zusammenführen"
 
-#: meld/resources/gtk/menus.ui:81
+#: meld/resources/gtk/menus.ui:88
 msgid "Merge All from Right"
 msgstr "Alle Änderungen von rechts zusammenführen"
 
-#: meld/resources/gtk/menus.ui:85
+#: meld/resources/gtk/menus.ui:92
 msgid "Merge All"
 msgstr "Alles zusammenfügen"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
-msgid "Add Synchronization Point"
-msgstr "Synchronisationspunkt hinzufügen"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
-msgid "Clear Synchronization Points"
-msgstr "Synchronisationspunkte entfernen"
-
-#: meld/resources/gtk/menus.ui:103
+#: meld/resources/gtk/menus.ui:99
 msgid "Format as Patch…"
 msgstr "Als Patch formatieren …"
 
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:108
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:112
 msgid "Keyboard Shortcuts"
 msgstr "Tastenkombinationen"
 
-#: meld/resources/gtk/menus.ui:120
+#: meld/resources/gtk/menus.ui:116
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: meld/resources/gtk/menus.ui:125
+#: meld/resources/gtk/menus.ui:121
 msgid "_About Meld"
 msgstr "_Info zu Meld"
 
-#: meld/resources/gtk/menus.ui:138
+#: meld/resources/gtk/menus.ui:134
 msgid "File status"
 msgstr "Dateistatus"
 
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:136
 msgid "Same"
 msgstr "Identisch"
 
-#: meld/resources/gtk/menus.ui:144
+#: meld/resources/gtk/menus.ui:140
 msgid "New"
 msgstr "Neu"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Geändert"
 
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:154
 msgid "Ignore filename case"
 msgstr "Groß-/Kleinschreibung in Dateinamen ignorieren"
 
+#: meld/resources/gtk/menus.ui:158
+msgid "Normalize Unicode paths"
+msgstr "Unicode-Pfade vereinheitlichen"
+
 #: meld/resources/gtk/menus.ui:171
 msgid "Normal"
 msgstr "Normal"
@@ -915,41 +924,42 @@ msgstr ""
 "Christian Kirbach <christian.kirbach@gmail.com>\n"
 "Bernd Homuth <dev@hmt.im>\n"
 "Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>\n"
-"Philipp Kiemle <philipp.kiemle@gmail.com>"
+"Philipp Kiemle <philipp.kiemle@gmail.com>\n"
+"Tim Sabsch <tim@sabsch.com>"
 
-#: meld/resources/ui/appwindow.ui:29
+#: meld/resources/ui/appwindow.ui:30
 msgid "Start a new comparison"
 msgstr "Neuen Vergleich starten"
 
-#: meld/resources/ui/appwindow.ui:45
+#: meld/resources/ui/appwindow.ui:46
 msgid "Open a recent comparison"
 msgstr "Einen aktuellen Vergleich öffnen"
 
-#: meld/resources/ui/appwindow.ui:73
+#: meld/resources/ui/appwindow.ui:74
 msgid "Go to the previous change"
 msgstr "Zur vorherigen Änderung gehen"
 
-#: meld/resources/ui/appwindow.ui:93
+#: meld/resources/ui/appwindow.ui:94
 msgid "Go to the next change"
 msgstr "Zur nächsten Änderung gehen"
 
-#: meld/resources/ui/appwindow.ui:123
+#: meld/resources/ui/appwindow.ui:124
 msgid "Go to the previous conflict"
 msgstr "Zum vorherigen Konflikt gehen"
 
-#: meld/resources/ui/appwindow.ui:143
+#: meld/resources/ui/appwindow.ui:144
 msgid "Go to the next conflict"
 msgstr "Zum nächsten Konflikt gehen"
 
-#: meld/resources/ui/appwindow.ui:192
+#: meld/resources/ui/appwindow.ui:193
 msgid "Version Filters"
 msgstr "Versionsfilter"
 
-#: meld/resources/ui/appwindow.ui:207 meld/resources/ui/preferences.ui:1472
+#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472
 msgid "File Filters"
 msgstr "Dateifilter"
 
-#: meld/resources/ui/appwindow.ui:222 meld/resources/ui/preferences.ui:1657
+#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657
 msgid "Text Filters"
 msgstr "Textfilter"
 
@@ -962,7 +972,7 @@ msgid "Column Name"
 msgstr "Spaltenname"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
 msgid "_Remove"
 msgstr "_Löschen"
 
@@ -1019,33 +1029,58 @@ msgid "_Compare selected files"
 msgstr "Markierte Dateien _vergleichen"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+msgid "_Mark selected file"
+msgstr "Gewählte Datei _markieren"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Compare _with marked file"
+msgstr "Mit markierter Datei _vergleichen"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "Nach _links kopieren"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "Nach _rechts kopieren"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "Markierte _löschen"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "Rekursiv einklappen"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "Rekursiv ausklappen"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "_Extern öffnen"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "Dateipfade _kopieren"
 
+#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
+#: meld/resources/ui/dirdiff.ui:117
+msgid "Select folder to open in this pane"
+msgstr "Ordner wählen, der in diesem Bereich geöffnet werden soll"
+
+#: meld/resources/ui/dirdiff.ui:43
+msgid "Folder 1"
+msgstr "Ordner 1"
+
+#: meld/resources/ui/dirdiff.ui:84
+msgid "Folder 2"
+msgstr "Ordner 2"
+
+#: meld/resources/ui/dirdiff.ui:125
+msgid "Folder 3"
+msgstr "Ordner 3"
+
 #: meld/resources/ui/encoding-selector.ui:31
 msgid "Search text encoding…"
 msgstr "Zeichenkodierung suchen …"
@@ -1102,8 +1137,16 @@ msgstr "_Kopieren"
 msgid "_Paste"
 msgstr "E_infügen"
 
-#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
-#: meld/resources/ui/filediff.ui:171
+#: meld/resources/ui/filediff-menus.ui:54
+msgid "Open Containing Folder"
+msgstr "Den beinhaltenden Ordner öffnen"
+
+#: meld/resources/ui/filediff-menus.ui:58
+msgid "Copy Full Path"
+msgstr "Vollständigen Dateipfad _kopieren"
+
+#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
+#: meld/resources/ui/filediff.ui:169
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -1112,31 +1155,31 @@ msgstr ""
 "Datei zu entsperren und Ihre Änderungen vorzunehmen, aber Sie müssen diese "
 "Änderungen in eine neue Datei speichern."
 
-#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
-#: meld/resources/ui/filediff.ui:185
-msgid "Open file in this pane"
-msgstr "Datei in diesem Bereich öffnen"
-
-#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
-#: meld/resources/ui/filediff.ui:194
+#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
+#: meld/resources/ui/filediff.ui:183
 msgid "Save file in this pane"
 msgstr "Datei in diesem Bereich speichern"
 
-#: meld/resources/ui/filediff.ui:73
+#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
+#: meld/resources/ui/filediff.ui:209
+msgid "Open file in this pane"
+msgstr "Datei in diesem Bereich öffnen"
+
+#: meld/resources/ui/filediff.ui:79
 msgid "File 3"
 msgstr "Datei 3"
 
-#: meld/resources/ui/filediff.ui:142
+#: meld/resources/ui/filediff.ui:148
 msgid "File 2"
 msgstr "Datei 2"
 
-#: meld/resources/ui/filediff.ui:207
+#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148
 msgid "File 1"
 msgstr "Datei 1"
 
 #. Create icon and filename CellRenderer
-#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
-#: meld/dirdiff.py:517
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
+#: meld/dirdiff.py:603
 msgid "Name"
 msgstr "Name"
 
@@ -1148,7 +1191,7 @@ msgstr "Muster"
 msgid "Add new filter"
 msgstr "Neuen Filter hinzufügen"
 
-#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18
 msgid "_Add"
 msgstr "_Hinzufügen"
 
@@ -1176,7 +1219,7 @@ msgstr "Umgebrochen"
 msgid "Replace _All"
 msgstr "_Alle ersetzen"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1067 meld/iohelpers.py:113
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "E_rsetzen"
 
@@ -1188,7 +1231,7 @@ msgstr "Zwischen Suchen und Suchen und Ersetzen wechseln"
 msgid "Search highlight mode…"
 msgstr "Hervorhebungsmodus suchen …"
 
-#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:349
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342
 #: meld/newdifftab.py:49
 msgid "New comparison"
 msgstr "Neuer Vergleich"
@@ -1277,6 +1320,18 @@ msgstr "Mittlerer und rechter Bereich"
 msgid "_Reverse patch direction"
 msgstr "Patch-_Richtung umkehren"
 
+#: meld/resources/ui/path-label.ui:23
+msgid "Path"
+msgstr "Pfad"
+
+#: meld/resources/ui/path-label.ui:62
+msgid "Copy Path"
+msgstr "Pfad _kopieren"
+
+#: meld/resources/ui/path-label.ui:78
+msgid "Open Folder"
+msgstr "Ordner öffnen"
+
 #: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
 msgid "Preferences"
 msgstr "Einstellungen"
@@ -1551,12 +1606,12 @@ msgstr "Wenn Sie nicht speichern, gehen die Änderungen verloren."
 msgid "Close _without Saving"
 msgstr "Schließen _ohne zu Speichern"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1066
-#: meld/iohelpers.py:55 meld/iohelpers.py:112
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
-#: meld/resources/ui/save-confirm-dialog.ui:52
+#: meld/resources/ui/save-confirm-dialog.ui:55
 msgid "_Save"
 msgstr "_Speichern"
 
@@ -1574,97 +1629,69 @@ msgstr "_Vergleichen"
 
 #: meld/resources/ui/vcview-menus.ui:11
 msgid "Co_mmit…"
-msgstr "Co_mmit …"
-
-#: meld/resources/ui/vcview-menus.ui:15
-msgid "_Update"
-msgstr "_Aktualisieren"
+msgstr "Eins_pielen …"
 
-#: meld/resources/ui/vcview-menus.ui:30
+#: meld/resources/ui/vcview-menus.ui:26
 msgid "Re_vert"
 msgstr "Zu_rücksetzen"
 
-#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+#: meld/resources/ui/vcview-menus.ui:30
 msgid "Delete"
 msgstr "Löschen"
 
-#: meld/resources/ui/vcview-menus.ui:41
-msgid "Mar_k as Resolved"
-msgstr "Als _gelöst markieren"
+#: meld/resources/ui/vcview-menus.ui:37
+msgid "Resolve Conflict"
+msgstr "Konflikt auflösen"
 
-#: meld/resources/ui/vcview.ui:73
-msgid "Commit…"
-msgstr "Commit …"
-
-#: meld/resources/ui/vcview.ui:74
+#: meld/resources/ui/vcview.ui:16
 msgid "Commit changes to version control"
 msgstr "Änderungen in die Versionskontrolle einspielen"
 
-#: meld/resources/ui/vcview.ui:86
-msgid "Update"
-msgstr "Aktualisieren"
-
-#: meld/resources/ui/vcview.ui:87
-msgid "Update working copy from version control"
-msgstr "Arbeitsverzeichnis aus der Versionskontrolle aktualisieren"
+#: meld/resources/ui/vcview.ui:21
+msgid "Commit…"
+msgstr "Einspielen …"
 
-#: meld/resources/ui/vcview.ui:99
-msgid "Push"
-msgstr "Hochladen"
+#: meld/resources/ui/vcview.ui:38
+msgid "Pull remote changes to the local repository"
+msgstr "Änderungen der Gegenstelle in das lokale Repository herunterladen"
 
-#: meld/resources/ui/vcview.ui:100
+#: meld/resources/ui/vcview.ui:51
 msgid "Push local changes to remote"
-msgstr "Lokale Änderungen nach entfernt schieben"
-
-#: meld/resources/ui/vcview.ui:112
-msgid "Add"
-msgstr "Hinzufügen"
+msgstr "Lokale Änderungen zur Gegenstelle hochladen"
 
-#: meld/resources/ui/vcview.ui:113
+#: meld/resources/ui/vcview.ui:74
 msgid "Add to version control"
 msgstr "Zur Versionskontrolle hinzufügen"
 
-#: meld/resources/ui/vcview.ui:125
-msgid "Remove"
-msgstr "Entfernen"
-
-#: meld/resources/ui/vcview.ui:126
+#: meld/resources/ui/vcview.ui:87
 msgid "Remove from version control"
 msgstr "Von der Versionskontrolle entfernen"
 
-#: meld/resources/ui/vcview.ui:138
-msgid "Mark as Resolved"
-msgstr "Als gelöst markieren"
+#: meld/resources/ui/vcview.ui:100
+msgid "Revert working copy to original state"
+msgstr "Die Arbeitskopie auf Original zurücksetzen"
 
-#: meld/resources/ui/vcview.ui:139
+#: meld/resources/ui/vcview.ui:113
 msgid "Mark as resolved in version control"
 msgstr "Für die Versionskontrolle als gelöst markieren"
 
-#: meld/resources/ui/vcview.ui:151
-msgid "Revert"
-msgstr "Zurücksetzen"
-
-#: meld/resources/ui/vcview.ui:152
-msgid "Revert working copy to original state"
-msgstr "Die Arbeitskopie auf Original zurücksetzen"
-
-#: meld/resources/ui/vcview.ui:165
-msgid "Delete from working copy"
-msgstr "Aus der Arbeitskopie löschen"
+#: meld/resources/ui/vcview.ui:140
+msgid "Open version controlled folder in this pane"
+msgstr "Ordner unter Versionskontrolle in diesem Bereich öffnen"
 
-#: meld/resources/ui/vcview.ui:220
+#: meld/resources/ui/vcview.ui:229
 msgid "Location"
 msgstr "Ort"
 
-#: meld/resources/ui/vcview.ui:229
+#: meld/resources/ui/vcview.ui:238
 msgid "Status"
 msgstr "Status"
 
-#: meld/resources/ui/vcview.ui:238
+#: meld/resources/ui/vcview.ui:247
 msgid "Extra"
 msgstr "Extra"
 
-#: meld/resources/ui/vcview.ui:270
+#: meld/resources/ui/vcview.ui:279
 msgid "Console output"
 msgstr "Konsolenausgabe"
 
@@ -1689,44 +1716,53 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:538 meld/preferences.py:132
+#: meld/dirdiff.py:624 meld/preferences.py:132
 msgid "Size"
 msgstr "Größe"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:546 meld/preferences.py:133
+#: meld/dirdiff.py:632 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Änderungszeit"
 
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:640 meld/preferences.py:134
+msgid "Modification time (ISO)"
+msgstr "Änderungszeit (ISO)"
+
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:554 meld/preferences.py:134
+#: meld/dirdiff.py:648 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: meld/dirdiff.py:778 meld/dirdiff.py:802
+#: meld/dirdiff.py:901
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "(durchsucht …) {filename}"
+
+#: meld/dirdiff.py:933 meld/dirdiff.py:965
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
-msgstr ""
+msgstr "[{label}] Durchsucht {folder}"
 
-#: meld/dirdiff.py:942
+#: meld/dirdiff.py:1101
 #, python-brace-format
-#| msgid "[%s] Done"
 msgid "[{label}] Done"
 msgstr "[{label}] Fertig"
 
-#: meld/dirdiff.py:951
+#: meld/dirdiff.py:1114
 msgid "Folder {} is being compared to itself"
 msgstr "Der Ordner »{}« wird mit sich selbst verglichen"
 
-#: meld/dirdiff.py:957
+#: meld/dirdiff.py:1120
 msgid "Folders have no differences"
 msgstr "Keine Unterschiede zwischen Ordnern"
 
-#: meld/dirdiff.py:959
+#: meld/dirdiff.py:1122
 msgid "Contents of scanned files in folders are identical."
 msgstr "Inhalte der untersuchten Dateien in den Ordnern sind identisch."
 
-#: meld/dirdiff.py:961
+#: meld/dirdiff.py:1124
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1734,47 +1770,47 @@ msgstr ""
 "Untersuchte Dateien in den Ordner scheinen identisch zu sein, jedoch wurden "
 "die Dateiinhalte nicht geprüft."
 
-#: meld/dirdiff.py:964
+#: meld/dirdiff.py:1127
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Dateifilter wurden verwendet, deshalb wurden nicht alle Dateien untersucht."
 
-#: meld/dirdiff.py:966
+#: meld/dirdiff.py:1129
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren "
 "könnten."
 
-#: meld/dirdiff.py:982 meld/filediff.py:1874
+#: meld/dirdiff.py:1145 meld/filediff.py:1983
 msgid "Hide"
 msgstr "Verbergen"
 
-#: meld/dirdiff.py:984 meld/filediff.py:1876 meld/filediff.py:1906
-#: meld/filediff.py:1908 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1985 meld/filediff.py:2015
+#: meld/filediff.py:2017 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "Ver_bergen"
 
-#: meld/dirdiff.py:993
+#: meld/dirdiff.py:1156
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Beim Einlesen dieses Ordners traten mehrere Fehler auf"
 
-#: meld/dirdiff.py:994
+#: meld/dirdiff.py:1157
 msgid "Files with invalid encodings found"
 msgstr "Dateien mit ungültigen Kodierungen gefunden"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:996
+#: meld/dirdiff.py:1159
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Einige Dateien lagen in einer inkorrekten Kodierung vor. Folgende Namen sind "
 "davon betroffen:"
 
-#: meld/dirdiff.py:998
+#: meld/dirdiff.py:1161
 msgid "Files hidden by case insensitive comparison"
 msgstr "Dateien durch von Schreibweise unabhängigen Vergleich verborgen"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1000
+#: meld/dirdiff.py:1163
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1783,18 +1819,17 @@ msgstr ""
 "auf einem Dateisystem durch, welches zwischen Groß- und Kleinschreibung "
 "unterscheidet. Die folgenden Dateien in diesem Ordner sind nicht sichtbar:"
 
-#: meld/dirdiff.py:1011
+#: meld/dirdiff.py:1174
 #, python-brace-format
-#| msgid "“%s” hidden by “%s”"
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "»{first_file}« verborgen durch »{second_file}«"
 
-#: meld/dirdiff.py:1070
+#: meld/dirdiff.py:1236
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ordner »%s« ersetzen?"
 
-#: meld/dirdiff.py:1072
+#: meld/dirdiff.py:1238
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1803,11 +1838,11 @@ msgstr ""
 "Ein Ordner mit diesem Namen existiert bereits in »%s«.\n"
 "Wenn Sie den vorhandenen Ordner ersetzen, gehen alle Dateien darin verloren."
 
-#: meld/dirdiff.py:1085
+#: meld/dirdiff.py:1251
 msgid "Error copying file"
 msgstr "Fehler beim Kopieren der Datei"
 
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1252
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1820,19 +1855,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1111 meld/vcview.py:759
+#: meld/dirdiff.py:1277 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Fehler beim Löschen von {}"
 
-#: meld/dirdiff.py:1604
+#: meld/dirdiff.py:1825
 msgid "No folder"
 msgstr "Kein Ordner"
 
-#: meld/filediff.py:1144
+#: meld/filediff.py:1158
 msgid "Comparison results will be inaccurate"
 msgstr "Ergebnisse werden ungenau sein"
 
-#: meld/filediff.py:1146
+#: meld/filediff.py:1160
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1841,75 +1876,95 @@ msgstr ""
 "nicht unterstützt, deshalb wird ein Vergleich keine korrekten Ergebnisse "
 "liefern."
 
-#: meld/filediff.py:1218
+#: meld/filediff.py:1232
 msgid "Mark conflict as resolved?"
 msgstr "Konflikt als _gelöst markieren?"
 
-#: meld/filediff.py:1220
+#: meld/filediff.py:1234
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Wenn der Konflikt erfolgreich gelöst wurde, können Sie ihn jetzt als gelöst "
 "markieren."
 
-#: meld/filediff.py:1222
+#: meld/filediff.py:1237
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1238
 msgid "Mark _Resolved"
 msgstr "Als _gelöst markieren"
 
-#: meld/filediff.py:1556
+#: meld/filediff.py:1429 meld/filediff.py:1445
+msgid "Add Synchronization Point"
+msgstr "Synchronisationspunkt hinzufügen"
+
+#: meld/filediff.py:1433
+msgid "Remove Synchronization Point"
+msgstr "Synchronisationspunkt entfernen"
+
+#: meld/filediff.py:1437
+msgid "Move Synchronization Point"
+msgstr "Synchronisationspunkt verschieben"
+
+#: meld/filediff.py:1441
+msgid "Match Synchronization Point"
+msgstr "An Synchronisationspunkt anpassen"
+
+#: meld/filediff.py:1465
+msgid "Clear Synchronization Points"
+msgstr "Synchronisationspunkte entfernen"
+
+#: meld/filediff.py:1657
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Beim Öffnen der Datei »%s« ist ein Fehler aufgetreten."
 
-#: meld/filediff.py:1564
+#: meld/filediff.py:1666
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Datei %s scheint eine Binärdatei zu sein."
 
-#: meld/filediff.py:1566
+#: meld/filediff.py:1668
 msgid "Do you want to open the file using the default application?"
 msgstr "Gewählte Datei in der vorgegebenen externen Anwendung öffnen?"
 
-#: meld/filediff.py:1568
+#: meld/filediff.py:1670
 msgid "Open"
 msgstr "Öffnen"
 
-#: meld/filediff.py:1582
+#: meld/filediff.py:1692
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Dateien werden zusammengeführt"
 
-#: meld/filediff.py:1596
+#: meld/filediff.py:1706
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Unterschiede werden berechnet"
 
-#: meld/filediff.py:1657
+#: meld/filediff.py:1766
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Die Datei %s wurde auf dem Datenträger geändert"
 
-#: meld/filediff.py:1658
+#: meld/filediff.py:1767
 msgid "Do you want to reload the file?"
 msgstr "Möchten Sie die Datei neu laden?"
 
-#: meld/filediff.py:1660
+#: meld/filediff.py:1769
 msgid "_Reload"
 msgstr "_Neu laden"
 
-#: meld/filediff.py:1830
+#: meld/filediff.py:1939
 msgid "File {} is being compared to itself"
 msgstr "Die Datei »{}« wird mit sich selbst verglichen"
 
-#: meld/filediff.py:1839
+#: meld/filediff.py:1948
 msgid "Files are identical"
 msgstr "Dateien sind identisch"
 
-#: meld/filediff.py:1852
+#: meld/filediff.py:1961
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1917,11 +1972,11 @@ msgstr ""
 "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren "
 "könnten. Wollen Sie die ungefilterten Dateien vergleichen?"
 
-#: meld/filediff.py:1857
+#: meld/filediff.py:1966
 msgid "Files differ in line endings only"
 msgstr "Dateien unterscheiden sich nur in den Zeilenendungen"
 
-#: meld/filediff.py:1859
+#: meld/filediff.py:1968
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1930,15 +1985,15 @@ msgstr ""
 "Dateien sind identisch, abgesehen von unterschiedlichen Zeilenenden:\n"
 "%s"
 
-#: meld/filediff.py:1879
+#: meld/filediff.py:1988
 msgid "Show without filters"
 msgstr "Ungefiltert anzeigen"
 
-#: meld/filediff.py:1901
+#: meld/filediff.py:2010
 msgid "Change highlighting incomplete"
 msgstr "Änderungsmarkierung unvollständig"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:2011
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1947,19 +2002,19 @@ msgstr ""
 "Sie können Meld zur Hervorhebung längerer Änderungen zwingen, was jedoch "
 "langsam sein könnte."
 
-#: meld/filediff.py:1910
+#: meld/filediff.py:2019
 msgid "Keep highlighting"
 msgstr "Hervorhebung fortführen"
 
-#: meld/filediff.py:1912
+#: meld/filediff.py:2021
 msgid "_Keep highlighting"
 msgstr "Hervorhebung _fortführen"
 
-#: meld/filediff.py:1925
+#: meld/filediff.py:2034
 msgid "Saving failed"
 msgstr "Speichern ist fehlgeschlagen"
 
-#: meld/filediff.py:1926
+#: meld/filediff.py:2035
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1967,37 +2022,37 @@ msgstr ""
 "Bitte denken Sie darüber nach, kritische Änderungen in ein anderes Programm "
 "oder eine andere Datei zu kopieren, um Datenverlust zu vermeiden."
 
-#: meld/filediff.py:1935
+#: meld/filediff.py:2044
 msgid "Save Left Pane As"
 msgstr "Linken Bereich speichern unter"
 
-#: meld/filediff.py:1937
+#: meld/filediff.py:2046
 msgid "Save Middle Pane As"
 msgstr "Mittleren Bereich speichern unter"
 
-#: meld/filediff.py:1939
+#: meld/filediff.py:2048
 msgid "Save Right Pane As"
 msgstr "Rechten Bereich speichern unter"
 
-#: meld/filediff.py:1950
+#: meld/filediff.py:2059
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr ""
 "Die Datei %s wurde auf dem Datenträger geändert, seit sie geöffnet wurde"
 
-#: meld/filediff.py:1952
+#: meld/filediff.py:2061
 msgid "If you save it, any external changes will be lost."
 msgstr "Wenn Sie speichern, gehen externe Änderungen verloren."
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:2064
 msgid "Save Anyway"
 msgstr "Dennoch speichern"
 
-#: meld/filediff.py:1956
+#: meld/filediff.py:2065
 msgid "Don’t Save"
 msgstr "Nicht speichern"
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2107
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2005,7 +2060,7 @@ msgstr ""
 "Die Datei »{}« enthält Zeichen, die mit der aktuellen Kodierung »{}« nicht "
 "kodierbar sind."
 
-#: meld/filediff.py:2002 meld/patchdialog.py:138
+#: meld/filediff.py:2111 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2014,20 +2069,16 @@ msgstr ""
 "Datei konnte nicht gespeichert werden:\n"
 "%s"
 
-#: meld/filediff.py:2006 meld/patchdialog.py:137
+#: meld/filediff.py:2115 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Datei %s konnte nicht gespeichert werden."
 
-#: meld/filediff.py:2067
-msgid "Open File"
-msgstr "Datei öffnen"
-
-#: meld/filediff.py:2421
+#: meld/filediff.py:2525
 msgid "Live comparison updating disabled"
 msgstr "Direkte Vergleichsaktualisierung deaktiviert"
 
-#: meld/filediff.py:2422
+#: meld/filediff.py:2526
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2038,36 +2089,36 @@ msgstr ""
 "aktualisieren. Die direkten Aktualisierungen werden beim Löschen der "
 "Synchronisierungspunkte wieder fortgeführt."
 
-#: meld/iohelpers.py:40
+#: meld/iohelpers.py:41
 msgid "Deleting remote folders is not supported"
-msgstr "Lösche entfernter Ordner wird nicht unterstützt"
+msgstr "Löschen entfernter Ordner wird nicht unterstützt"
 
-#: meld/iohelpers.py:42
+#: meld/iohelpers.py:43
 msgid "Not a file or directory"
 msgstr "Weder eine Datei noch ein Ordner"
 
-#: meld/iohelpers.py:46
+#: meld/iohelpers.py:47
 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
 msgstr ""
 "»{}« kann nicht in den Papierkorb verschoben werden. Wollen Sie es dauerhaft "
 "löschen?"
 
-#: meld/iohelpers.py:51
+#: meld/iohelpers.py:52
 msgid "This remote location does not support sending items to the trash."
 msgstr ""
 "Dieser entfernte Ort unterstützt kein Verschieben von Objekten in den "
 "Papierkorb."
 
-#: meld/iohelpers.py:56
+#: meld/iohelpers.py:58
 msgid "_Delete Permanently"
 msgstr "_Dauerhaft löschen"
 
-#: meld/iohelpers.py:106
+#: meld/iohelpers.py:110
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Datei »%s« ersetzen?"
 
-#: meld/iohelpers.py:108
+#: meld/iohelpers.py:112
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2177,24 +2228,24 @@ msgstr "Entfernter Ordner »{}« wird nicht unterstützt"
 msgid "<unnamed>"
 msgstr "<unbenannt>"
 
-#: meld/melddoc.py:61
+#: meld/melddoc.py:124
 msgid "untitled"
 msgstr "unbenannt"
 
-#: meld/meldwindow.py:155
+#: meld/meldwindow.py:158
 msgid "Filename"
 msgstr "Dateiname"
 
-#: meld/meldwindow.py:384
+#: meld/meldwindow.py:381
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
-msgstr "Drei Dateien zum automatischen Zusammenführen benötigt, %r erhalten."
+msgstr "Drei Dateien zum automatischen Zusammenführen benötigt, %r erhalten"
 
-#: meld/meldwindow.py:406
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Es kann keine Mischung aus Dateien und Ordnern verglichen werden"
 
-#: meld/misc.py:150
+#: meld/misc.py:154
 msgid ""
 "{}\n"
 "\n"
@@ -2206,7 +2257,7 @@ msgstr ""
 "Meld entdeckte einen kritischen Fehler während der Ausführung:\n"
 "<tt>{}</tt>"
 
-#: meld/misc.py:201
+#: meld/misc.py:205
 msgid "[None]"
 msgstr "[Nichts]"
 
@@ -2218,7 +2269,7 @@ msgstr "Bezeichnung"
 msgid "pattern"
 msgstr "Muster"
 
-#: meld/recent.py:104
+#: meld/recent.py:111
 msgid "Version control:"
 msgstr "Versionskontrolle:"
 
@@ -2237,6 +2288,10 @@ msgstr "{name} ({charset})"
 msgid "Plain Text"
 msgstr "Einfacher Text"
 
+#: meld/ui/pathlabel.py:36
+msgid "Unnamed file"
+msgstr "Unbenannte Datei"
+
 #. Abbreviation for line, column so that it will fit in the status bar
 #: meld/ui/statusbar.py:125
 #, python-brace-format
@@ -2259,14 +2314,12 @@ msgstr "Keine Dateien zum Einspielen"
 msgid "{unpushed_commits} in {unpushed_branches}"
 msgstr "{unpushed_commits} in {unpushed_branches}"
 
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: meld/vc/git.py:94 meld/vc/git.py:103
+#: meld/vc/git.py:94 meld/vc/git.py:104
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
-msgstr[0] "%d nicht geschobene Einbringung"
-msgstr[1] "%d nicht geschobene Einbringungen"
+msgstr[0] "%d nicht hochgeladener Commit"
+msgstr[1] "%d nicht hochgeladene Commits"
 
 #: meld/vc/git.py:97
 #, python-format
@@ -2275,16 +2328,16 @@ msgid_plural "%d branches"
 msgstr[0] "%d Zweig"
 msgstr[1] "%d Zweige"
 
-#: meld/vc/git.py:344
+#: meld/vc/git.py:345
 #, python-brace-format
 msgid "Mode changed from {old_mode} to {new_mode}"
 msgstr "Modus wechselte von {old_mode} zu {new_mode}"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Partially staged"
 msgstr "Teilweise bereitgestellt"
 
-#: meld/vc/git.py:352
+#: meld/vc/git.py:353
 msgid "Staged"
 msgstr "Bereitgestellt"
 
@@ -2313,7 +2366,7 @@ msgstr "Lokal"
 
 #: meld/vc/_vc.py:54
 msgid "Remote"
-msgstr "Entfernt"
+msgstr "Gegenstelle"
 
 #: meld/vc/_vc.py:73
 msgid "Error"
@@ -2343,96 +2396,100 @@ msgstr "Fehlend"
 msgid "Not present"
 msgstr "Nicht vorhanden"
 
+#: meld/vc/_vc.py:82
+msgid "Scanning…"
+msgstr "Wird durchsucht …"
+
 #. Translators: This error message is shown when no
 #. repository of this type is found.
-#: meld/vcview.py:333
+#: meld/vcview.py:334
 #, python-format
 msgid "%(name)s (not found)"
 msgstr "%(name)s (nicht gefunden)"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: meld/vcview.py:337
+#: meld/vcview.py:338
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s ist nicht installiert"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: meld/vcview.py:341
+#: meld/vcview.py:342
 #, python-format
 msgid "%(name)s (invalid repository)"
 msgstr "%(name)s (ungültiges Repository)"
 
-#: meld/vcview.py:355
+#: meld/vcview.py:356
 msgid "No valid version control system found in this folder"
 msgstr "Kein gültiges Versionskontrollsystem in diesem Verzeichnis gefunden"
 
-#: meld/vcview.py:357
+#: meld/vcview.py:358
 msgid "Choose which version control system to use"
 msgstr "Wählen Sie die zu verwendende Versionskontrolle"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:411
+#: meld/vcview.py:412
 #, python-brace-format
 msgid "Location: {path}"
 msgstr "Ort: {path}"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:418
+#: meld/vcview.py:419
 msgid "Scanning repository"
-msgstr "Softwarebestand wird durchsucht"
+msgstr "Repository wird durchsucht"
 
-#: meld/vcview.py:447
+#: meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "%s wird durchsucht"
 
-#: meld/vcview.py:486
+#: meld/vcview.py:487
 msgid "(Empty)"
 msgstr "(Leer)"
 
-#: meld/vcview.py:533
+#: meld/vcview.py:535
 #, python-format
 msgid "%s — local"
 msgstr "%s — lokal"
 
-#: meld/vcview.py:534
+#: meld/vcview.py:536
 #, python-format
 msgid "%s — remote"
-msgstr "%s — entfernt"
+msgstr "%s — Gegenstelle"
 
-#: meld/vcview.py:542
+#: meld/vcview.py:544
 #, python-format
 msgid "%s (local, merge, remote)"
-msgstr "%s (lokal, zusammengeführt, entfernt)"
+msgstr "%s (lokal, zusammengeführt, Gegenstelle)"
 
-#: meld/vcview.py:547
+#: meld/vcview.py:549
 #, python-format
 msgid "%s (remote, merge, local)"
-msgstr "%s (entfernt, zusammengeführt, lokal)"
+msgstr "%s (Gegenstelle, zusammengeführt, lokal)"
 
-#: meld/vcview.py:558
+#: meld/vcview.py:560
 #, python-format
 msgid "%s — repository"
-msgstr "%s — Softwarebestand"
+msgstr "%s — Repository"
 
-#: meld/vcview.py:564
+#: meld/vcview.py:566
 #, python-format
 msgid "%s (working, repository)"
-msgstr "%s (Arbeitskopie, Softwarebestand)"
+msgstr "%s (Arbeitskopie, Repository)"
 
-#: meld/vcview.py:568
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (repository, working)"
-msgstr "%s (Softwarebestand, Arbeitskopie)"
+msgstr "%s (Repository, Arbeitskopie)"
 
-#: meld/vcview.py:730
+#: meld/vcview.py:735
 msgid "Remove folder and all its files?"
 msgstr "Den Ordner und alle Dateien entfernen?"
 
-#: meld/vcview.py:732
+#: meld/vcview.py:737
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2440,10 +2497,40 @@ msgstr ""
 "Dadurch werden alle gewählten Dateien, Ordner und deren Inhalte aus der "
 "Versionskontrolle entfernt."
 
-#: meld/vcview.py:845
+#: meld/vcview.py:850
 msgid "Clear"
 msgstr "Leeren"
 
+#~ msgid "_Update"
+#~ msgstr "_Aktualisieren"
+
+#~ msgid "Mar_k as Resolved"
+#~ msgstr "Als _gelöst markieren"
+
+#~ msgid "Update"
+#~ msgstr "Aktualisieren"
+
+#~ msgid "Update working copy from version control"
+#~ msgstr "Arbeitsverzeichnis aus der Versionskontrolle aktualisieren"
+
+#~ msgid "Push"
+#~ msgstr "Hochladen"
+
+#~ msgid "Add"
+#~ msgstr "Hinzufügen"
+
+#~ msgid "Remove"
+#~ msgstr "Entfernen"
+
+#~ msgid "Mark as Resolved"
+#~ msgstr "Als gelöst markieren"
+
+#~ msgid "Revert"
+#~ msgstr "Zurücksetzen"
+
+#~ msgid "Delete from working copy"
+#~ msgstr "Aus der Arbeitskopie löschen"
+
 #~ msgid "[%s] Scanning %s"
 #~ msgstr "[%s] %s wird durchsucht"
 
@@ -2558,9 +2645,6 @@ msgstr "Leeren"
 #~ msgid "Previous Conflict"
 #~ msgstr "Vorheriger Konflikt"
 
-#~ msgid "Next Conflict"
-#~ msgstr "Nächster Konflikt"
-
 #~ msgid "Push to Left"
 #~ msgstr "Nach links schieben"
 
@@ -2742,9 +2826,6 @@ msgstr "Leeren"
 #~ msgid "Open Recent"
 #~ msgstr "Zuletzt verwendete Dateien öffnen"
 
-#~ msgid "Only one version control system found in this folder"
-#~ msgstr "Nur eine Versionskontrolle in diesem Ordner gefunden"
-
 #~ msgid "Show toolbar"
 #~ msgstr "Werkzeugleiste anzeigen"
 

From f280e14fc561383405345a525cda43ba25842526 Mon Sep 17 00:00:00 2001
From: Andre Klapper <a9016009@gmx.de>
Date: Sat, 28 May 2022 11:19:48 +0200
Subject: [PATCH 106/116] Fix incorrect markup in Russian help translation

---
 help/ru/ru.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/help/ru/ru.po b/help/ru/ru.po
index 8e3fc683..856f845c 100644
--- a/help/ru/ru.po
+++ b/help/ru/ru.po
@@ -361,7 +361,7 @@ msgstr ""
 "общие файлы резервных копий и папки с метаданными систем контроля версий. "
 "Каждый фильтр имени файла можно отдельно активировать или деактивировать с "
 "помощью кнопки <gui style=\"button\">Фильтры</gui> на панели инструментов "
-"или в <guiseq><gui style=\"menu\">Вид</gui></gui><gui style=\"menuitem"
+"или в <guiseq><gui style=\"menu\">Вид</gui><gui style=\"menuitem"
 "\">Фильтры файлов</gui></guiseq>."
 
 #. (itstool) path: section/p

From e4b335c6f95f697a8d040ba3503d29e902d3d37f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=80=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=9D?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B8=D1=9B?=
 <miroslavnikolic@rocketmail.com>
Date: Mon, 13 Jun 2022 04:10:54 +0000
Subject: [PATCH 107/116] Update Serbian translation

---
 po/sr.po | 330 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 176 insertions(+), 154 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index 00135f51..c7156028 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-02-28 21:56+0000\n"
-"PO-Revision-Date: 2022-03-04 06:20+0200\n"
+"POT-Creation-Date: 2022-05-05 13:00+0000\n"
+"PO-Revision-Date: 2022-06-13 06:07+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
@@ -525,218 +525,224 @@ msgctxt "shortcut window"
 msgid "Fullscreen"
 msgstr "Преко целог екрана"
 
-#: meld/resources/gtk/help-overlay.ui:63
+#: meld/resources/gtk/help-overlay.ui:61
+#| msgid "Middle and right panes"
+msgctxt "shortcut window"
+msgid "Swap left and right panes"
+msgstr "Размењује леву и десну површ"
+
+#: meld/resources/gtk/help-overlay.ui:70
 msgctxt "shortcut window"
 msgid "Panes"
 msgstr "Окна"
 
-#: meld/resources/gtk/help-overlay.ui:68
+#: meld/resources/gtk/help-overlay.ui:75
 msgctxt "shortcut window"
 msgid "Previous comparison pane"
 msgstr "Претходно окно поређења"
 
-#: meld/resources/gtk/help-overlay.ui:75
+#: meld/resources/gtk/help-overlay.ui:82
 msgctxt "shortcut window"
 msgid "Next comparison pane"
 msgstr "Следеће окно поређења"
 
-#: meld/resources/gtk/help-overlay.ui:84
+#: meld/resources/gtk/help-overlay.ui:91
 msgctxt "shortcut window"
 msgid "Changes"
 msgstr "Измене"
 
-#: meld/resources/gtk/help-overlay.ui:89
+#: meld/resources/gtk/help-overlay.ui:96
 msgctxt "shortcut window"
 msgid "Go to previous change"
 msgstr "Иде на претходну измену"
 
-#: meld/resources/gtk/help-overlay.ui:96
+#: meld/resources/gtk/help-overlay.ui:103
 msgctxt "shortcut window"
 msgid "Go to next change"
 msgstr "Иде на следећу измену"
 
-#: meld/resources/gtk/help-overlay.ui:105
+#: meld/resources/gtk/help-overlay.ui:112
 msgctxt "shortcut window"
 msgid "Tabs"
 msgstr "Језичци"
 
-#: meld/resources/gtk/help-overlay.ui:110
+#: meld/resources/gtk/help-overlay.ui:117
 msgctxt "shortcut window"
 msgid "Go to previous tab"
 msgstr "Иде на претходни језичак"
 
-#: meld/resources/gtk/help-overlay.ui:117
+#: meld/resources/gtk/help-overlay.ui:124
 msgctxt "shortcut window"
 msgid "Go to next tab"
 msgstr "Иде на следећи језичак"
 
-#: meld/resources/gtk/help-overlay.ui:124
+#: meld/resources/gtk/help-overlay.ui:131
 msgctxt "shortcut window"
 msgid "Switch to tab"
 msgstr "Пребацује се на језичак"
 
-#: meld/resources/gtk/help-overlay.ui:131
+#: meld/resources/gtk/help-overlay.ui:138
 msgctxt "shortcut window"
 msgid "Move tab left"
 msgstr "Премешта језичак лево"
 
-#: meld/resources/gtk/help-overlay.ui:138
+#: meld/resources/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
 msgid "Move tab right"
 msgstr "Премешта језичак десно"
 
-#: meld/resources/gtk/help-overlay.ui:147
+#: meld/resources/gtk/help-overlay.ui:154
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Уређивање"
 
-#: meld/resources/gtk/help-overlay.ui:152
+#: meld/resources/gtk/help-overlay.ui:159
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "Поништава"
 
-#: meld/resources/gtk/help-overlay.ui:159
+#: meld/resources/gtk/help-overlay.ui:166
 msgctxt "shortcut window"
 msgid "Redo"
 msgstr "Враћа"
 
-#: meld/resources/gtk/help-overlay.ui:166
+#: meld/resources/gtk/help-overlay.ui:173
 msgctxt "shortcut window"
 msgid "Cut"
 msgstr "Исеца"
 
-#: meld/resources/gtk/help-overlay.ui:173
+#: meld/resources/gtk/help-overlay.ui:180
 msgctxt "shortcut window"
 msgid "Copy"
 msgstr "Умножава"
 
-#: meld/resources/gtk/help-overlay.ui:180
+#: meld/resources/gtk/help-overlay.ui:187
 msgctxt "shortcut window"
 msgid "Paste"
 msgstr "Убацује"
 
-#: meld/resources/gtk/help-overlay.ui:187
+#: meld/resources/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Find"
 msgstr "Налази"
 
-#: meld/resources/gtk/help-overlay.ui:194
+#: meld/resources/gtk/help-overlay.ui:201
 msgctxt "shortcut window"
 msgid "Find Next"
 msgstr "Налази следећи"
 
-#: meld/resources/gtk/help-overlay.ui:201
+#: meld/resources/gtk/help-overlay.ui:208
 msgctxt "shortcut window"
 msgid "Find Previous"
 msgstr "Налази претходно"
 
-#: meld/resources/gtk/help-overlay.ui:208
+#: meld/resources/gtk/help-overlay.ui:215
 msgctxt "shortcut window"
 msgid "Replace"
 msgstr "Замењује"
 
-#: meld/resources/gtk/help-overlay.ui:217
+#: meld/resources/gtk/help-overlay.ui:224
 msgctxt "shortcut window"
 msgid "File comparison"
 msgstr "Поређење датотека"
 
-#: meld/resources/gtk/help-overlay.ui:222
+#: meld/resources/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Save current file"
 msgstr "Чува тренутну датотеку"
 
-#: meld/resources/gtk/help-overlay.ui:229
+#: meld/resources/gtk/help-overlay.ui:236
 msgctxt "shortcut window"
 msgid "Save current file to new path"
 msgstr "Чува тренутну датотеку на новој путањи"
 
-#: meld/resources/gtk/help-overlay.ui:236
+#: meld/resources/gtk/help-overlay.ui:243
 msgctxt "shortcut window"
 msgid "Save all files in comparison"
 msgstr "Чува све датотеке у поређењу"
 
-#: meld/resources/gtk/help-overlay.ui:243
+#: meld/resources/gtk/help-overlay.ui:250
 msgctxt "shortcut window"
 msgid "Previous conflict"
 msgstr "Претходни сукоб"
 
-#: meld/resources/gtk/help-overlay.ui:250
+#: meld/resources/gtk/help-overlay.ui:257
 msgctxt "shortcut window"
 msgid "Next conflict"
 msgstr "Следећи сукоб"
 
-#: meld/resources/gtk/help-overlay.ui:257
+#: meld/resources/gtk/help-overlay.ui:264
 msgctxt "shortcut window"
 msgid "Push change to left"
 msgstr "Гура измену улево"
 
-#: meld/resources/gtk/help-overlay.ui:264
+#: meld/resources/gtk/help-overlay.ui:271
 msgctxt "shortcut window"
 msgid "Push change to right"
 msgstr "Гура измену удесно"
 
-#: meld/resources/gtk/help-overlay.ui:271
+#: meld/resources/gtk/help-overlay.ui:278
 msgctxt "shortcut window"
 msgid "Pull change from left"
 msgstr "Вуче измену с лева"
 
-#: meld/resources/gtk/help-overlay.ui:278
+#: meld/resources/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Pull change from right"
 msgstr "Вуче измену с десна"
 
-#: meld/resources/gtk/help-overlay.ui:285
+#: meld/resources/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Copy change above left"
 msgstr "Умножава измену изнад леве"
 
-#: meld/resources/gtk/help-overlay.ui:292
+#: meld/resources/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Copy change below left"
 msgstr "Умножава измену испод леве"
 
-#: meld/resources/gtk/help-overlay.ui:299
+#: meld/resources/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Copy change above right"
 msgstr "Умножава измену изнад десне"
 
-#: meld/resources/gtk/help-overlay.ui:306
+#: meld/resources/gtk/help-overlay.ui:313
 msgctxt "shortcut window"
 msgid "Copy change below right"
 msgstr "Умножава измену испод десне"
 
-#: meld/resources/gtk/help-overlay.ui:313
-#: meld/resources/gtk/help-overlay.ui:341
+#: meld/resources/gtk/help-overlay.ui:320
+#: meld/resources/gtk/help-overlay.ui:348
 msgctxt "shortcut window"
 msgid "Delete change"
 msgstr "Брише измену"
 
-#: meld/resources/gtk/help-overlay.ui:322
+#: meld/resources/gtk/help-overlay.ui:329
 msgctxt "shortcut window"
 msgid "Folder comparison"
 msgstr "Поређење фасцикли"
 
-#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
 msgid "Copy to left"
 msgstr "Умножава на лево"
 
-#: meld/resources/gtk/help-overlay.ui:334
+#: meld/resources/gtk/help-overlay.ui:341
 msgctxt "shortcut window"
 msgid "Copy to right"
 msgstr "Умножава на десно"
 
-#: meld/resources/gtk/help-overlay.ui:350
+#: meld/resources/gtk/help-overlay.ui:357
 msgctxt "shortcut window"
 msgid "Version control comparison"
 msgstr "Поређење управљања издањем"
 
-#: meld/resources/gtk/help-overlay.ui:355
+#: meld/resources/gtk/help-overlay.ui:362
 msgctxt "shortcut window"
 msgid "Commit to version control"
 msgstr "Уграђује измене у управљање издањем"
 
-#: meld/resources/gtk/help-overlay.ui:362
+#: meld/resources/gtk/help-overlay.ui:369
 msgctxt "shortcut window"
 msgid "Show/hide console output"
 msgstr "Приказује/скрива излаз конзоле"
@@ -793,88 +799,85 @@ msgstr "Конзола управљања издањем"
 msgid "Lock scrolling"
 msgstr "Закључај клизање"
 
-#: meld/resources/gtk/menus.ui:73
+#: meld/resources/gtk/menus.ui:74
+#| msgid "Middle and right panes"
+msgid "Swap left and right panes"
+msgstr "Размењује леву и десну површ"
+
+#: meld/resources/gtk/menus.ui:80
 msgid "Comparison"
 msgstr "Поређење"
 
-#: meld/resources/gtk/menus.ui:77
+#: meld/resources/gtk/menus.ui:84
 msgid "Merge All from Left"
 msgstr "Обједини све с лева"
 
-#: meld/resources/gtk/menus.ui:81
+#: meld/resources/gtk/menus.ui:88
 msgid "Merge All from Right"
 msgstr "Обједини све с десна"
 
-#: meld/resources/gtk/menus.ui:85
+#: meld/resources/gtk/menus.ui:92
 msgid "Merge All"
 msgstr "Стопи све"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
-msgid "Add Synchronization Point"
-msgstr "Додај тачку усклађивања"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
-msgid "Clear Synchronization Points"
-msgstr "Очисти тачке усклађивања"
-
-#: meld/resources/gtk/menus.ui:103
+#: meld/resources/gtk/menus.ui:99
 msgid "Format as Patch…"
 msgstr "Обликуј као исправку…"
 
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:108
 msgid "_Preferences"
 msgstr "_Поставке"
 
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:112
 msgid "Keyboard Shortcuts"
 msgstr "Пречице тастатуре"
 
-#: meld/resources/gtk/menus.ui:120
+#: meld/resources/gtk/menus.ui:116
 msgid "_Help"
 msgstr "По_моћ"
 
-#: meld/resources/gtk/menus.ui:125
+#: meld/resources/gtk/menus.ui:121
 msgid "_About Meld"
 msgstr "_О Мелду"
 
-#: meld/resources/gtk/menus.ui:138
+#: meld/resources/gtk/menus.ui:134
 msgid "File status"
 msgstr "Стање датотеке"
 
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:136
 msgid "Same"
 msgstr "Исто"
 
-#: meld/resources/gtk/menus.ui:144
+#: meld/resources/gtk/menus.ui:140
 msgid "New"
 msgstr "Нови"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Измењени"
 
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:154
 msgid "Ignore filename case"
 msgstr "Занемари величину слова назива датотеке"
 
-#: meld/resources/gtk/menus.ui:162
+#: meld/resources/gtk/menus.ui:158
 msgid "Normalize Unicode paths"
 msgstr "Нормализуј Јуникод путање"
 
-#: meld/resources/gtk/menus.ui:175
+#: meld/resources/gtk/menus.ui:171
 msgid "Normal"
 msgstr "Обично"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Необрађено"
 
-#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Занемарене"
 
-#: meld/resources/gtk/menus.ui:190
+#: meld/resources/gtk/menus.ui:186
 msgid "Flatten folders"
 msgstr "Поравнате фасцикле"
 
@@ -996,12 +999,10 @@ msgid "_Compare selected files"
 msgstr "_Упореди изабране датотеке"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
-#| msgid "_Compare selected files"
 msgid "_Mark selected file"
 msgstr "_Означи изабране датотеке"
 
 #: meld/resources/ui/dirdiff-menus.ui:18
-#| msgid "_Compare selected files"
 msgid "Compare _with marked file"
 msgstr "Упореди _са означеном датотеком"
 
@@ -1148,7 +1149,7 @@ msgstr "1. датотека"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:558
+#: meld/dirdiff.py:603
 msgid "Name"
 msgstr "Назив"
 
@@ -1188,7 +1189,7 @@ msgstr "Преломљено"
 msgid "Replace _All"
 msgstr "Замени с_ве"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1184 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "_Замени"
 
@@ -1573,12 +1574,12 @@ msgstr "Ако не сачувате, измене ће бити трајно и
 msgid "Close _without Saving"
 msgstr "Затвори _без чувања"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1183
-#: meld/iohelpers.py:56 meld/iohelpers.py:113
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: meld/resources/ui/save-confirm-dialog.ui:52
+#: meld/resources/ui/save-confirm-dialog.ui:55
 msgid "_Save"
 msgstr "_Сачувај"
 
@@ -1683,54 +1684,53 @@ msgid "Mac OS (CR)"
 msgstr "Мек ОС (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:579 meld/preferences.py:132
+#: meld/dirdiff.py:624 meld/preferences.py:132
 msgid "Size"
 msgstr "Величина"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:587 meld/preferences.py:133
+#: meld/dirdiff.py:632 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Време измене"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:595 meld/preferences.py:134
-#| msgid "Modification time"
+#: meld/dirdiff.py:640 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "Време измене (ISO)"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:603 meld/preferences.py:135
+#: meld/dirdiff.py:648 meld/preferences.py:135
 msgid "Permissions"
 msgstr "Овлашћења"
 
-#: meld/dirdiff.py:855
+#: meld/dirdiff.py:901
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (скенирам…)"
 
-#: meld/dirdiff.py:887 meld/dirdiff.py:919
+#: meld/dirdiff.py:933 meld/dirdiff.py:965
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] Скенирам „{folder}“"
 
-#: meld/dirdiff.py:1055
+#: meld/dirdiff.py:1101
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] Готово"
 
-#: meld/dirdiff.py:1068
+#: meld/dirdiff.py:1114
 msgid "Folder {} is being compared to itself"
 msgstr "Фасцикла „{}“ је упоређена са самом собом"
 
-#: meld/dirdiff.py:1074
+#: meld/dirdiff.py:1120
 msgid "Folders have no differences"
 msgstr "Фасцикле се не разликују"
 
-#: meld/dirdiff.py:1076
+#: meld/dirdiff.py:1122
 msgid "Contents of scanned files in folders are identical."
 msgstr "Садржаји прегледаних датотека у фасциклама су исти."
 
-#: meld/dirdiff.py:1078
+#: meld/dirdiff.py:1124
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1738,42 +1738,42 @@ msgstr ""
 "Прегледане датотеке у фасциклама изгледа да су исте, али садржај није "
 "прегледан."
 
-#: meld/dirdiff.py:1081
+#: meld/dirdiff.py:1127
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Филтери датотека су у употреби, тако да нису све датотеке прегледане."
 
-#: meld/dirdiff.py:1083
+#: meld/dirdiff.py:1129
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Филтери текста су у употреби и можда су замаскирали разлике садржаја."
 
-#: meld/dirdiff.py:1099 meld/filediff.py:1917
+#: meld/dirdiff.py:1145 meld/filediff.py:1983
 msgid "Hide"
 msgstr "Сакриј"
 
-#: meld/dirdiff.py:1101 meld/filediff.py:1919 meld/filediff.py:1949
-#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1985 meld/filediff.py:2015
+#: meld/filediff.py:2017 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Сакриј"
 
-#: meld/dirdiff.py:1110
+#: meld/dirdiff.py:1156
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Дошло је до више грешака за време претраживања ове фасцикле"
 
-#: meld/dirdiff.py:1111
+#: meld/dirdiff.py:1157
 msgid "Files with invalid encodings found"
 msgstr "Пронађене су датотеке са неисправним кодирањем"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1159
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Неке датотеке бејаху у неисправном кодирању. Називи су нешто као:"
 
-#: meld/dirdiff.py:1115
+#: meld/dirdiff.py:1161
 msgid "Files hidden by case insensitive comparison"
 msgstr "Датотеке скривене поређењем неосетљивим на величину слова"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1117
+#: meld/dirdiff.py:1163
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1781,17 +1781,17 @@ msgstr ""
 "Покренули сте поређење независно од величине слова на систему датотека где "
 "је она битна. Неке датотеке нису видљиве:"
 
-#: meld/dirdiff.py:1128
+#: meld/dirdiff.py:1174
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "„{first_file}“ је скривена од стране „{second_file}“"
 
-#: meld/dirdiff.py:1187
+#: meld/dirdiff.py:1236
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Да заменим фасциклу „%s“?"
 
-#: meld/dirdiff.py:1189
+#: meld/dirdiff.py:1238
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1800,11 +1800,11 @@ msgstr ""
 "Фасцикла са истим називом већ постоји у „%s“.\n"
 "Ако замените постојећу фасциклу, све датотеке у њој биће изгубљене."
 
-#: meld/dirdiff.py:1202
+#: meld/dirdiff.py:1251
 msgid "Error copying file"
 msgstr "Грешка умножавања датотеке"
 
-#: meld/dirdiff.py:1203
+#: meld/dirdiff.py:1252
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1817,19 +1817,19 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1228 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "Грешка брисања {}"
 
-#: meld/dirdiff.py:1756
+#: meld/dirdiff.py:1825
 msgid "No folder"
 msgstr "Нема фасцикле"
 
-#: meld/filediff.py:1149
+#: meld/filediff.py:1158
 msgid "Comparison results will be inaccurate"
 msgstr "Резултати поређења биће нетачни"
 
-#: meld/filediff.py:1151
+#: meld/filediff.py:1160
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1837,73 +1837,96 @@ msgstr ""
 "Филтер је изменио број редова у датотеци, а то није подржано. Поређење неће "
 "бити тачно."
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1232
 msgid "Mark conflict as resolved?"
 msgstr "Да означим сукоб решеним?"
 
-#: meld/filediff.py:1225
+#: meld/filediff.py:1234
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "Ако је сукоб успешно решен, сада га можете означити решеним."
 
-#: meld/filediff.py:1227
+#: meld/filediff.py:1237
 msgid "Cancel"
 msgstr "Откажи"
 
-#: meld/filediff.py:1228
+#: meld/filediff.py:1238
 msgid "Mark _Resolved"
 msgstr "Означи _решеним"
 
-#: meld/filediff.py:1591
+#: meld/filediff.py:1429 meld/filediff.py:1445
+msgid "Add Synchronization Point"
+msgstr "Додај тачку усклађивања"
+
+#: meld/filediff.py:1433
+#| msgid "Add Synchronization Point"
+msgid "Remove Synchronization Point"
+msgstr "У тачку усклађивања"
+
+#: meld/filediff.py:1437
+#| msgid "Add Synchronization Point"
+msgid "Move Synchronization Point"
+msgstr "П тачку усклађивања"
+
+#: meld/filediff.py:1441
+#| msgid "Add Synchronization Point"
+msgid "Match Synchronization Point"
+msgstr "П тачку усклађивања"
+
+#: meld/filediff.py:1465
+msgid "Clear Synchronization Points"
+msgstr "Очисти тачке усклађивања"
+
+#: meld/filediff.py:1657
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Дошло је до проблема отварања датотеке „%s“."
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1666
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Изгледа да је „%s“ извршна датотека."
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1668
 msgid "Do you want to open the file using the default application?"
 msgstr "Да ли желите да отворите датотеку користећи основни програм?"
 
-#: meld/filediff.py:1604
+#: meld/filediff.py:1670
 msgid "Open"
 msgstr "Отвори"
 
-#: meld/filediff.py:1626
+#: meld/filediff.py:1692
 #, python-format
 msgid "[%s] Merging files"
 msgstr "Обједињујем датотеке [%s]"
 
-#: meld/filediff.py:1640
+#: meld/filediff.py:1706
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "Срачунавам разлике [%s]"
 
-#: meld/filediff.py:1700
+#: meld/filediff.py:1766
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Датотека „%s“ је измењена на диску"
 
-#: meld/filediff.py:1701
+#: meld/filediff.py:1767
 msgid "Do you want to reload the file?"
 msgstr "Да ли желите поново да учитате датотеку?"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1769
 msgid "_Reload"
 msgstr "_Учитај поново"
 
-#: meld/filediff.py:1873
+#: meld/filediff.py:1939
 msgid "File {} is being compared to itself"
 msgstr "Датотека „{}“ је упоређена са самом собом"
 
-#: meld/filediff.py:1882
+#: meld/filediff.py:1948
 msgid "Files are identical"
 msgstr "Датотеке су истоветне"
 
-#: meld/filediff.py:1895
+#: meld/filediff.py:1961
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1911,11 +1934,11 @@ msgstr ""
 "Коришћени су филтери текста, а могу постојати и замаскиране разлике између "
 "датотека. Да ли желите да поредите неиздвојене датотеке?"
 
-#: meld/filediff.py:1900
+#: meld/filediff.py:1966
 msgid "Files differ in line endings only"
 msgstr "Датотеке се разликују само по завршецима редова"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1968
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1924,15 +1947,15 @@ msgstr ""
 "Датотеке су истоветне али се разликују само по завршецима редова:\n"
 "%s"
 
-#: meld/filediff.py:1922
+#: meld/filediff.py:1988
 msgid "Show without filters"
 msgstr "Приказује без филтера"
 
-#: meld/filediff.py:1944
+#: meld/filediff.py:2010
 msgid "Change highlighting incomplete"
 msgstr "Истицање измена није довршено"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:2011
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1940,19 +1963,19 @@ msgstr ""
 "Неке измене нису истакнуте зато што су превелике. Можете да приморате Мелд "
 "да продужи са истицањем већих измена, иако то може бити споро."
 
-#: meld/filediff.py:1953
+#: meld/filediff.py:2019
 msgid "Keep highlighting"
 msgstr "Задржите истицање"
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:2021
 msgid "_Keep highlighting"
 msgstr "_Задржи истицање"
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:2034
 msgid "Saving failed"
 msgstr "Чување није успело"
 
-#: meld/filediff.py:1969
+#: meld/filediff.py:2035
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1960,36 +1983,36 @@ msgstr ""
 "Размотрите умножавање свих ризичних измена у други програм или датотеку да "
 "избегнете губитак података."
 
-#: meld/filediff.py:1978
+#: meld/filediff.py:2044
 msgid "Save Left Pane As"
 msgstr "Сачувај леву површ као"
 
-#: meld/filediff.py:1980
+#: meld/filediff.py:2046
 msgid "Save Middle Pane As"
 msgstr "Сачувај средњу површ као"
 
-#: meld/filediff.py:1982
+#: meld/filediff.py:2048
 msgid "Save Right Pane As"
 msgstr "Сачувај десну површ као"
 
-#: meld/filediff.py:1993
+#: meld/filediff.py:2059
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Датотека „%s“ је измењена на диску након отварања"
 
-#: meld/filediff.py:1995
+#: meld/filediff.py:2061
 msgid "If you save it, any external changes will be lost."
 msgstr "Ако је сачувате, све спољне измене ће бити изгубљене."
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2064
 msgid "Save Anyway"
 msgstr "Ипак сачувај"
 
-#: meld/filediff.py:1999
+#: meld/filediff.py:2065
 msgid "Don’t Save"
 msgstr "Немој чувати"
 
-#: meld/filediff.py:2041
+#: meld/filediff.py:2107
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -1997,7 +2020,7 @@ msgstr ""
 "Датотека „{}“ садржи знакове који се не могу кодирати употребом њеног "
 "тренутног кодирања „{}“."
 
-#: meld/filediff.py:2045 meld/patchdialog.py:138
+#: meld/filediff.py:2111 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2006,16 +2029,16 @@ msgstr ""
 "Не могу да сачувам датотеку због следећег:\n"
 "%s"
 
-#: meld/filediff.py:2049 meld/patchdialog.py:137
+#: meld/filediff.py:2115 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Не могу да сачувам датотеку „%s“."
 
-#: meld/filediff.py:2450
+#: meld/filediff.py:2525
 msgid "Live comparison updating disabled"
 msgstr "Искључено је живо ажурирање поређења"
 
-#: meld/filediff.py:2451
+#: meld/filediff.py:2526
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2041,16 +2064,16 @@ msgstr "Не могу да пребацим „{}“ у смеће. Да ли ж
 msgid "This remote location does not support sending items to the trash."
 msgstr "Ово удаљено место не подржава слање ставки у смеће."
 
-#: meld/iohelpers.py:57
+#: meld/iohelpers.py:58
 msgid "_Delete Permanently"
 msgstr "_Трајно обриши"
 
-#: meld/iohelpers.py:107
+#: meld/iohelpers.py:110
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Да заменим датотеку „%s“?"
 
-#: meld/iohelpers.py:109
+#: meld/iohelpers.py:112
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2177,7 +2200,7 @@ msgstr "Потребне су три датотеке за само-спајањ
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Не могу да поредим мешавину датотека и фасцикли"
 
-#: meld/misc.py:150
+#: meld/misc.py:154
 msgid ""
 "{}\n"
 "\n"
@@ -2189,7 +2212,7 @@ msgstr ""
 "Мелд је наишао на критичну грешку приликом покретања:\n"
 "<tt>{}</tt>"
 
-#: meld/misc.py:201
+#: meld/misc.py:205
 msgid "[None]"
 msgstr "[ништа]"
 
@@ -2332,7 +2355,6 @@ msgid "Not present"
 msgstr "Није присутно"
 
 #: meld/vc/_vc.py:82
-#| msgid "Scanning %s"
 msgid "Scanning…"
 msgstr "Прегледам…"
 

From 29f751b10d5eb661878f416a0dc3b424442b0521 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 18 Jun 2022 11:01:21 +1000
Subject: [PATCH 108/116] Update NEWS + appdata

---
 NEWS                                  | 72 +++++++++++++++++++++++++++
 data/org.gnome.meld.appdata.xml.in.in | 16 ++++++
 2 files changed, 88 insertions(+)

diff --git a/NEWS b/NEWS
index 331d0aab..b95320b5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,76 @@
 
+2022-06-18 meld 3.21.2
+======================
+
+  Features:
+
+   * Folder comparison now supports compare differently-named files across
+     panes, by marking files for comparison (Helly Guo)
+   * Synchronization points are now significantly easier to use and more
+     robust, and have new user documentation (Roberto Vidal)
+   * Added option to ignore Unicode normalisation form differences when
+     comparing paths (Dan B)
+   * The files or folders being compared can now be swapped in two pane mode,
+     using the new View -> Swap left and right panes menu item (Helly Guo)
+   * Folder comparisons now show a "(scanning...)" indication in tree view
+     rows as an additional visual cue that the comparison is still running
+     (Kai Willadsen)
+   * Folder comparisons have a new optional ISO-format time column (Kai
+     Willadsen)
+
+  Fixes:
+
+   * Update icon usage to support stock icon removal from new Adwaita versions
+     (Jan Tojnar)
+   * Build fix for Meson 0.61.0 (Silvio Fricke)
+   * The new pathlabel widgets now support user-provided custom labels (Kai
+     Willadsen)
+   * Fix file selectors in folder comparisons to always open in the current
+     folder (Kai Willadsen)
+   * Using a custom save path (i.e., the --output flag) now sets a buffer as
+     modified, so that unchanged merges can be saved (Kai Willadsen)
+   * Comparing new or deleted rows in folder comparison now opens a two-pane
+     file comparisons for consistency (Kai Willadsen)
+   * Destructive dialog actions now have appropriate styling (Kai Willadsen)
+   * Invalid user settings for folder comparison columns are now handled more
+     gracefully (Kai Willadsen)
+   * The nightly flatpak build now includes Git to make version control
+     comparisons somewhat functional (Kai Willadsen)
+   * Issues fixed: #11, #85, #188, #319, #381, #475, #492, #581, #620, #638,
+     #645, #660, #662, #672
+
+  Translations:
+
+   * Alan Mortensen (da)
+   * Anders Jonsson (sv)
+   * Andre Klapper (ru)
+   * Asier Sarasua Garmendia (eu)
+   * Balázs Úr (hu)
+   * Boyuan Yang (zh_CN)
+   * Daniel Mustieles (es)
+   * Daniel Șerbănescu (ro)
+   * Emin Tufan Çetin (tr)
+   * Enrico Nicoletto (pt_BR)
+   * Hugo Carvalho (pt)
+   * Jiri Grönroos (fi)
+   * Jordi Mas (ca)
+   * Jürgen Benvenuti (de)
+   * Kjell Cato Heskjestad (nb)
+   * Luming Zh (zh_CN)
+   * Luna Jernberg (sv)
+   * Marek Černocký (cs)
+   * Matej Urbančič (sl)
+   * Matheus Barbosa (pt_BR)
+   * Milo Casagrande (it)
+   * Piotr Drąg (pl)
+   * Roberto Vidal ()
+   * Sabri Ünal (tr)
+   * Sergej A (ru)
+   * sicklylife (ja)
+   * Yuri Chornoivan (uk)
+   * Мирослав Николић (sr)
+
+
 2022-01-07 meld 3.21.1
 ======================
 
diff --git a/data/org.gnome.meld.appdata.xml.in.in b/data/org.gnome.meld.appdata.xml.in.in
index 3bbba995..d06292ac 100644
--- a/data/org.gnome.meld.appdata.xml.in.in
+++ b/data/org.gnome.meld.appdata.xml.in.in
@@ -52,6 +52,22 @@
   <translation type="gettext">meld</translation>
   <content_rating type="oars-1.1" />
   <releases>
+    <release date="2022-06-18" version="3.21.2">
+      <description>
+        <p>
+          This is an unstable release in the 3.21 development series.
+        </p>
+        <ul>
+          <li>Folder comparison now supports comparing differently-named files across panes</li>
+          <li>Synchronization points are now significantly easier to use</li>
+          <li>Unicode normalisation form differences in paths can be ignored</li>
+          <li>Order of comparison panes can now be swapped after loading</li>
+          <li>In-progress scans are more clearly shown in folder comparisons</li>
+          <li>Folder comparison has an optional ISO-format time column</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
     <release date="2022-01-07" version="3.21.1">
       <description>
         <p>

From 1e6f258a69e1e0c45e4b174eef0e6334377dcd2f Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 18 Jun 2022 11:02:10 +1000
Subject: [PATCH 109/116] Post-release version bump

---
 meld/conf.py.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meld/conf.py.in b/meld/conf.py.in
index 19c13634..8bb35472 100644
--- a/meld/conf.py.in
+++ b/meld/conf.py.in
@@ -4,7 +4,7 @@ import sys
 from pathlib import Path
 
 __package__ = "meld"
-__version__ = "3.21.2"
+__version__ = "3.21.3"
 
 APPLICATION_NAME = 'Meld'
 APPLICATION_ID = 'org.gnome.Meld'

From d03bf5334cd67489ac1d896c4c22cc1134dc0a98 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 10 Jul 2022 08:45:17 +1000
Subject: [PATCH 110/116] Remove email templating from maintenance script

This used to be for gnome-announce-list emails, but that list is now
basically defunct.
---
 maint | 47 -----------------------------------------------
 1 file changed, 47 deletions(-)

diff --git a/maint b/maint
index 58f21fec..6e1a3975 100755
--- a/maint
+++ b/maint
@@ -77,46 +77,6 @@ APPDATA_TEMPLATE = """
     </release>
 """
 
-EMAIL_TEMPLATE = """
-{{ app|title }} {{version}} has been released, and is now available at:
-  https://download.gnome.org/sources/meld/{{ version|minor_version }}/{{ app }}-{{ version }}.tar.xz
-{%- if features %}
-
-
-Features
---------
-{% for feature in features %}
- {{ feature }}
-{%- endfor %}
-{%- endif %}
-
-
-Fixes
------
-{% for fix in fixes %}
- {{ fix }}
-{%- endfor %}
-
-
-Translations
-------------
-{% for translator in translators %}
- {{ translator }}
-{%- endfor %}
-
-
-What is Meld?
--------------
-
-Meld is a visual diff and merge tool. It lets you compare two or three files,
-and updates the comparisons while you edit them in-place. You can also compare
-folders, launching comparisons of individual files as desired. Last but by no
-means least, Meld lets you work with your current changes in a wide variety of
-version control systems, including Git, Bazaar, Mercurial, CVS and Subversion.
-
-"""
-
-
 MARKDOWN_TEMPLATE = """
 <!--
 {{ [date, app, version]|join(' ') }}
@@ -451,12 +411,6 @@ def write_somewhere(filename, output):
         click.echo(output)
 
 
-@cli.command()
-@click.argument('filename', type=click.Path(), default=None, required=False)
-def email(filename):
-    write_somewhere(filename, render_template(EMAIL_TEMPLATE))
-
-
 @cli.command()
 @click.argument('filename', type=click.Path(), default=None, required=False)
 def markdown(filename):
@@ -572,7 +526,6 @@ def make_release(ctx):
     ctx.forward(tag)
     ctx.forward(gitlab_release)
     file_prefix = '%s-%s' % (meld.conf.__package__, meld.conf.__version__)
-    ctx.forward(email, filename=file_prefix + '-email')
     ctx.forward(markdown, filename=file_prefix + '.md')
     ctx.forward(version_bump)
     commit(message='Post-release version bump')

From 1b50df56a2d7e80111845129386c7019e317a2fc Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 10 Jul 2022 09:20:27 +1000
Subject: [PATCH 111/116] CI: Pin our CI SDK version

This is an attempt to fix current CI breakage, possibly caused by an
update to use the 22.08 beta freedesktop base.
---
 .gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f65d6568..c78ccc96 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,9 @@
 include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
 
-image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
+variables:
+  GNOME_SDK: 42
+
+image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:${GNOME_SDK}"
 
 stages:
   - check

From 8925708880af43f37f9424b9136ed1be9dfea0df Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 10 Jul 2022 09:22:38 +1000
Subject: [PATCH 112/116] CI: Fix typo

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c78ccc96..c3ece9cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_
 variables:
   GNOME_SDK: 42
 
-image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:${GNOME_SDK}"
+image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:${GNOME_SDK}
 
 stages:
   - check

From 743f434492c93fb5a45d068becf6ee35fe8f422e Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 10 Jul 2022 11:02:13 +1000
Subject: [PATCH 113/116] Reinstate and improve tab label tooltip usage (#682)

We used to support custom tooltips for tabs ages ago, but
support was unintentionally dropped and not noticed because the
tooltips were never actually usefully different. This makes
custom tooltips work again, and also makes them actually provide
useful additional information.
---
 meld/dirdiff.py     | 14 +++++++++++---
 meld/filediff.py    |  4 +++-
 meld/ui/notebook.py |  3 ++-
 meld/vcview.py      |  8 ++++++--
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 14a43264..5e3f9463 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -1824,12 +1824,20 @@ def recompute_label(self):
         filenames = self.model.value_paths(root)
         filenames = [f or _('No folder') for f in filenames]
         if self.custom_labels:
-            label_options = zip(self.custom_labels, filenames)
-            shortnames = [l[0] or l[1] for l in label_options]
+            shortnames = [
+                custom or filename for custom, filename in
+                zip(self.custom_labels, filenames)
+            ]
+            tooltip_names = shortnames
         else:
             shortnames = misc.shorten_names(*filenames)
+            tooltip_names = filenames
+
         self.label_text = " : ".join(shortnames)
-        self.tooltip_text = self.label_text
+        self.tooltip_text = "\n".join((
+            _("Folder comparison:"),
+            *tooltip_names,
+        ))
         self.label_changed.emit(self.label_text, self.tooltip_text)
 
     def set_labels(self, labels):
diff --git a/meld/filediff.py b/meld/filediff.py
index 92101429..5a686c6d 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1518,9 +1518,11 @@ def recompute_label(self):
         label = self.meta.get("tablabel", "")
         if label:
             self.label_text = label
+            tooltip_names = [label]
         else:
             self.label_text = " — ".join(shortnames)
-        self.tooltip_text = self.label_text
+            tooltip_names = filenames
+        self.tooltip_text = "\n".join((_("File comparison:"), *tooltip_names))
         self.label_changed.emit(self.label_text, self.tooltip_text)
 
     def pre_comparison_init(self):
diff --git a/meld/ui/notebook.py b/meld/ui/notebook.py
index 90e185cf..e6fad77b 100644
--- a/meld/ui/notebook.py
+++ b/meld/ui/notebook.py
@@ -154,9 +154,10 @@ def on_page_removed(self, notebook, child, page_num, *args):
         child.disconnect_by_func(self.on_label_changed)
         self.props.show_tabs = self.get_n_pages() > 1
 
-    def on_label_changed(self, page, text, tooltip):
+    def on_label_changed(self, page, text: str, tooltip: str) -> None:
         nbl = self.get_tab_label(page)
         nbl.props.label_text = text
+        nbl.set_tooltip_text(tooltip)
 
         # Only update the window title if the current page is active
         if self.get_current_page() == self.page_num(page):
diff --git a/meld/vcview.py b/meld/vcview.py
index ef520a45..f98b89bc 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -408,8 +408,12 @@ def get_comparison(self):
 
     def recompute_label(self):
         self.label_text = os.path.basename(self.location)
-        # TRANSLATORS: This is the location of the directory being viewed
-        self.tooltip_text = _("Location: {path}").format(path=self.location)
+        self.tooltip_text = "\n".join((
+            # TRANSLATORS: This is the name of the version control
+            # system being used, e.g., "Git" or "Subversion"
+            _("{vc} comparison:").format(vc=self.vc.NAME),
+            self.location,
+        ))
         self.label_changed.emit(self.label_text, self.tooltip_text)
 
     def _search_recursively_iter(self, start_path, replace=False):

From 19270c195ea4c0ce5e3e8893b2fe2d75a70bf685 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Sun, 10 Jul 2022 06:46:43 +0000
Subject: [PATCH 114/116] Update Ukrainian translation

---
 po/uk.po | 140 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 79 insertions(+), 61 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index 763385af..b2576637 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-04-09 23:19+0000\n"
-"PO-Revision-Date: 2022-04-10 22:57+0300\n"
+"POT-Creation-Date: 2022-07-10 01:05+0000\n"
+"PO-Revision-Date: 2022-07-10 09:46+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\n"
@@ -547,7 +547,6 @@ msgid "Fullscreen"
 msgstr "На весь екран"
 
 #: meld/resources/gtk/help-overlay.ui:61
-#| msgid "Middle and right panes"
 msgctxt "shortcut window"
 msgid "Swap left and right panes"
 msgstr "Поміняти місцями ліву і праву панелі"
@@ -821,7 +820,6 @@ msgid "Lock scrolling"
 msgstr "Блокувати гортання"
 
 #: meld/resources/gtk/menus.ui:74
-#| msgid "Middle and right panes"
 msgid "Swap left and right panes"
 msgstr "Поміняти місцями ліву і праву панелі"
 
@@ -959,7 +957,7 @@ msgid "Column Name"
 msgstr "Назва стовпчика"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745
 msgid "_Remove"
 msgstr "_Вилучити"
 
@@ -1556,7 +1554,8 @@ msgid "Push local commits to remote?"
 msgstr "Надіслати локальні внески до віддаленого сховища?"
 
 #: meld/resources/ui/push-dialog.ui:10
-msgid "The commits to be pushed are determined by your version control system."
+msgid ""
+"The commits to be pushed are determined by your version control system."
 msgstr ""
 "Внески, які буде надіслано, визначаються вашою системою керування версіями."
 
@@ -1768,12 +1767,12 @@ msgstr ""
 "Використано текстові фільтри, що могли замаскувати відмінності у вмісті "
 "файлів."
 
-#: meld/dirdiff.py:1145 meld/filediff.py:1982
+#: meld/dirdiff.py:1145 meld/filediff.py:1985
 msgid "Hide"
 msgstr "Приховати"
 
-#: meld/dirdiff.py:1147 meld/filediff.py:1984 meld/filediff.py:2014
-#: meld/filediff.py:2016 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1987 meld/filediff.py:2017
+#: meld/filediff.py:2019 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Сховати"
 
@@ -1787,7 +1786,8 @@ msgstr "Знайдено файли із некоректним кодуванн
 
 #. TRANSLATORS: This is followed by a list of files
 #: meld/dirdiff.py:1159
-msgid "Some files were in an incorrect encoding. The names are something like:"
+msgid ""
+"Some files were in an incorrect encoding. The names are something like:"
 msgstr "Кодування деяких файлів є помилковим. Назви десь такі:"
 
 #: meld/dirdiff.py:1161
@@ -1839,7 +1839,7 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1277 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:768
 msgid "Error deleting {}"
 msgstr "Помилка під час спроби вилучити {}"
 
@@ -1847,6 +1847,12 @@ msgstr "Помилка під час спроби вилучити {}"
 msgid "No folder"
 msgstr "Немає теки"
 
+#: meld/dirdiff.py:1838
+#| msgctxt "shortcut window"
+#| msgid "Folder comparison"
+msgid "Folder comparison:"
+msgstr "Порівняння тек:"
+
 #: meld/filediff.py:1158
 msgid "Comparison results will be inaccurate"
 msgstr "Результати порівняння не будуть точними"
@@ -1897,56 +1903,62 @@ msgstr "Встановити відповідність точки синхро
 msgid "Clear Synchronization Points"
 msgstr "Вилучити точки синхронізації"
 
-#: meld/filediff.py:1656
+#: meld/filediff.py:1525
+#| msgctxt "shortcut window"
+#| msgid "File comparison"
+msgid "File comparison:"
+msgstr "Порівняння файлів:"
+
+#: meld/filediff.py:1659
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Помилка відкриття файла «%s»."
 
-#: meld/filediff.py:1665
+#: meld/filediff.py:1668
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Здається, файл %s є файлом двійкових даних."
 
-#: meld/filediff.py:1667
+#: meld/filediff.py:1670
 msgid "Do you want to open the file using the default application?"
 msgstr "Хочете відкрити файл за допомогою типової програми?"
 
-#: meld/filediff.py:1669
+#: meld/filediff.py:1672
 msgid "Open"
 msgstr "Відкрити"
 
-#: meld/filediff.py:1691
+#: meld/filediff.py:1694
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Об'єднання файлів"
 
-#: meld/filediff.py:1705
+#: meld/filediff.py:1708
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Обчислення відмінностей"
 
-#: meld/filediff.py:1765
+#: meld/filediff.py:1768
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "До файла %s було внесено зміни на диску"
 
-#: meld/filediff.py:1766
+#: meld/filediff.py:1769
 msgid "Do you want to reload the file?"
 msgstr "Хочете перезавантажити файл?"
 
-#: meld/filediff.py:1768
+#: meld/filediff.py:1771
 msgid "_Reload"
 msgstr "Перезаванта_жити"
 
-#: meld/filediff.py:1938
+#: meld/filediff.py:1941
 msgid "File {} is being compared to itself"
 msgstr "Виконуємо порівняння файла {} із самим собою"
 
-#: meld/filediff.py:1947
+#: meld/filediff.py:1950
 msgid "Files are identical"
 msgstr "Файли є однаковими"
 
-#: meld/filediff.py:1960
+#: meld/filediff.py:1963
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1954,11 +1966,11 @@ msgstr ""
 "Використано текстові фільтри, які могли замаскувати відмінності між файлами. "
 "Хочете виконати порівняння файлів без фільтрування?"
 
-#: meld/filediff.py:1965
+#: meld/filediff.py:1968
 msgid "Files differ in line endings only"
 msgstr "Файли відрізняються лише символами завершення рядків"
 
-#: meld/filediff.py:1967
+#: meld/filediff.py:1970
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1967,15 +1979,15 @@ msgstr ""
 "Файли є однаковими, окрім різних символів завершення рядків:\n"
 "%s"
 
-#: meld/filediff.py:1987
+#: meld/filediff.py:1990
 msgid "Show without filters"
 msgstr "Показати без фільтрів"
 
-#: meld/filediff.py:2009
+#: meld/filediff.py:2012
 msgid "Change highlighting incomplete"
 msgstr "Неповна зміна підсвічування"
 
-#: meld/filediff.py:2010
+#: meld/filediff.py:2013
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1984,19 +1996,19 @@ msgstr ""
 "наказати Meld підсвітити більші зміни, але вам доведеться почекати, доки "
 "програма виконає ваш наказ."
 
-#: meld/filediff.py:2018
+#: meld/filediff.py:2021
 msgid "Keep highlighting"
 msgstr "Зберігати підсвічування"
 
-#: meld/filediff.py:2020
+#: meld/filediff.py:2023
 msgid "_Keep highlighting"
 msgstr "З_берігати підсвічування"
 
-#: meld/filediff.py:2033
+#: meld/filediff.py:2036
 msgid "Saving failed"
 msgstr "Не вдалося зберегти"
 
-#: meld/filediff.py:2034
+#: meld/filediff.py:2037
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -2004,37 +2016,37 @@ msgstr ""
 "Вам варто скопіювати критичні зміни до вікна іншої програми або файла, щоб "
 "уникнути втрати даних."
 
-#: meld/filediff.py:2043
+#: meld/filediff.py:2046
 msgid "Save Left Pane As"
 msgstr "Зберегти ліву панель як"
 
-#: meld/filediff.py:2045
+#: meld/filediff.py:2048
 msgid "Save Middle Pane As"
 msgstr "Зберегти середню панель як"
 
-#: meld/filediff.py:2047
+#: meld/filediff.py:2050
 msgid "Save Right Pane As"
 msgstr "Зберегти праву панель як"
 
-#: meld/filediff.py:2058
+#: meld/filediff.py:2061
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "З часу відкриття до файла %s було внесено зміни на диску"
 
-#: meld/filediff.py:2060
+#: meld/filediff.py:2063
 msgid "If you save it, any external changes will be lost."
 msgstr ""
 "Якщо ви збережете файл, внесені сторонніми програмами зміни буде втрачено."
 
-#: meld/filediff.py:2063
+#: meld/filediff.py:2066
 msgid "Save Anyway"
 msgstr "Зберегти попри це"
 
-#: meld/filediff.py:2064
+#: meld/filediff.py:2067
 msgid "Don’t Save"
 msgstr "Не зберігати"
 
-#: meld/filediff.py:2106
+#: meld/filediff.py:2109
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2042,7 +2054,7 @@ msgstr ""
 "У файлі «{}» містяться символи, які не входять до його поточного кодування "
 "«{}»."
 
-#: meld/filediff.py:2110 meld/patchdialog.py:138
+#: meld/filediff.py:2113 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2051,16 +2063,16 @@ msgstr ""
 "Не вдалося зберегти файл. Причина:\n"
 "%s"
 
-#: meld/filediff.py:2114 meld/patchdialog.py:137
+#: meld/filediff.py:2117 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Не вдалося зберегти файл %s."
 
-#: meld/filediff.py:2524
+#: meld/filediff.py:2527
 msgid "Live comparison updating disabled"
 msgstr "Інтерактивне оновлення порівняння вимкнено"
 
-#: meld/filediff.py:2525
+#: meld/filediff.py:2528
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2410,67 +2422,69 @@ msgstr ""
 msgid "Choose which version control system to use"
 msgstr "Виберіть систему керування версіями, якою слід скористатися"
 
-#. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:412
+#. TRANSLATORS: This is the name of the version control
+#. system being used, e.g., "Git" or "Subversion"
+#: meld/vcview.py:414
 #, python-brace-format
-msgid "Location: {path}"
-msgstr "Розташування: {path}"
+#| msgid "New comparison"
+msgid "{vc} comparison:"
+msgstr "Порівняння {vc}:"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:419
+#: meld/vcview.py:423
 msgid "Scanning repository"
 msgstr "Скануємо сховище"
 
-#: meld/vcview.py:448
+#: meld/vcview.py:452
 #, python-format
 msgid "Scanning %s"
 msgstr "Сканування %s"
 
-#: meld/vcview.py:487
+#: meld/vcview.py:491
 msgid "(Empty)"
 msgstr "(Порожньо)"
 
-#: meld/vcview.py:535
+#: meld/vcview.py:539
 #, python-format
 msgid "%s — local"
 msgstr "%s — локальний"
 
-#: meld/vcview.py:536
+#: meld/vcview.py:540
 #, python-format
 msgid "%s — remote"
 msgstr "%s — віддалений"
 
-#: meld/vcview.py:544
+#: meld/vcview.py:548
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (локальний, об'єднання, віддалений)"
 
-#: meld/vcview.py:549
+#: meld/vcview.py:553
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (віддалений, об'єднання, локальний)"
 
-#: meld/vcview.py:560
+#: meld/vcview.py:564
 #, python-format
 msgid "%s — repository"
 msgstr "%s — сховище"
 
-#: meld/vcview.py:566
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (робоча копія, сховище)"
 
-#: meld/vcview.py:570
+#: meld/vcview.py:574
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (сховище, робоча копія)"
 
-#: meld/vcview.py:735
+#: meld/vcview.py:739
 msgid "Remove folder and all its files?"
 msgstr "Вилучити теку і усі файли у ній?"
 
-#: meld/vcview.py:737
+#: meld/vcview.py:741
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2478,10 +2492,14 @@ msgstr ""
 "У результаті виконання цієї дії з системи керування версіями буде вилучено "
 "усі позначені файли і теки і усі файли у позначених теках."
 
-#: meld/vcview.py:850
+#: meld/vcview.py:854
 msgid "Clear"
 msgstr "Очистити"
 
+#, python-brace-format
+#~ msgid "Location: {path}"
+#~ msgstr "Розташування: {path}"
+
 #~ msgid "_Update"
 #~ msgstr "_Оновити"
 

From f1b703344c6a38d6cae73a48687014592caeeea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Sun, 10 Jul 2022 13:37:41 +0200
Subject: [PATCH 115/116] Update Polish translation

---
 po/pl.po | 125 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 67 insertions(+), 58 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index e404fea8..68deceda 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-04-09 23:19+0000\n"
-"PO-Revision-Date: 2022-04-10 13:03+0200\n"
+"POT-Creation-Date: 2022-07-10 01:05+0000\n"
+"PO-Revision-Date: 2022-07-10 13:35+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -736,7 +736,7 @@ msgstr "Usunięcie zmiany"
 #: meld/resources/gtk/help-overlay.ui:329
 msgctxt "shortcut window"
 msgid "Folder comparison"
-msgstr "Porównywanie katalogów"
+msgstr "Porównanie katalogów"
 
 #: meld/resources/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
@@ -956,7 +956,7 @@ msgid "Column Name"
 msgstr "Nazwa kolumny"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745
 msgid "_Remove"
 msgstr "U_suń"
 
@@ -1763,12 +1763,12 @@ msgstr ""
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Filtry tekstowe są używane i mogą ukrywać różnice między plikami."
 
-#: meld/dirdiff.py:1145 meld/filediff.py:1982
+#: meld/dirdiff.py:1145 meld/filediff.py:1985
 msgid "Hide"
 msgstr "Ukryj"
 
-#: meld/dirdiff.py:1147 meld/filediff.py:1984 meld/filediff.py:2014
-#: meld/filediff.py:2016 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1987 meld/filediff.py:2017
+#: meld/filediff.py:2019 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Ukryj"
 
@@ -1837,7 +1837,7 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1277 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:768
 msgid "Error deleting {}"
 msgstr "Błąd podczas usuwania {}"
 
@@ -1845,6 +1845,10 @@ msgstr "Błąd podczas usuwania {}"
 msgid "No folder"
 msgstr "Brak katalogu"
 
+#: meld/dirdiff.py:1838
+msgid "Folder comparison:"
+msgstr "Porównanie katalogów:"
+
 #: meld/filediff.py:1158
 msgid "Comparison results will be inaccurate"
 msgstr "Wyniki porównania będą niepoprawne"
@@ -1896,56 +1900,60 @@ msgstr "Dopasuj punkt synchronizacji"
 msgid "Clear Synchronization Points"
 msgstr "Wyczyść punkty synchronizacji"
 
-#: meld/filediff.py:1656
+#: meld/filediff.py:1525
+msgid "File comparison:"
+msgstr "Porównanie plików:"
+
+#: meld/filediff.py:1659
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Wystąpił problem podczas otwierania pliku „%s”."
 
-#: meld/filediff.py:1665
+#: meld/filediff.py:1668
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Plik %s wygląda na plik binarny."
 
-#: meld/filediff.py:1667
+#: meld/filediff.py:1670
 msgid "Do you want to open the file using the default application?"
 msgstr "Otworzyć go w domyślnym programie?"
 
-#: meld/filediff.py:1669
+#: meld/filediff.py:1672
 msgid "Open"
 msgstr "Otwórz"
 
-#: meld/filediff.py:1691
+#: meld/filediff.py:1694
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Scalanie plików"
 
-#: meld/filediff.py:1705
+#: meld/filediff.py:1708
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Analizowanie różnic"
 
-#: meld/filediff.py:1765
+#: meld/filediff.py:1768
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Plik %s został zmieniony na dysku"
 
-#: meld/filediff.py:1766
+#: meld/filediff.py:1769
 msgid "Do you want to reload the file?"
 msgstr "Ponownie wczytać plik?"
 
-#: meld/filediff.py:1768
+#: meld/filediff.py:1771
 msgid "_Reload"
 msgstr "_Wczytaj ponownie"
 
-#: meld/filediff.py:1938
+#: meld/filediff.py:1941
 msgid "File {} is being compared to itself"
 msgstr "Plik {} jest porównywany z samym sobą"
 
-#: meld/filediff.py:1947
+#: meld/filediff.py:1950
 msgid "Files are identical"
 msgstr "Pliki są identyczne"
 
-#: meld/filediff.py:1960
+#: meld/filediff.py:1963
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1953,11 +1961,11 @@ msgstr ""
 "Filtry tekstowe są używane i mogą ukrywać różnice między plikami. Porównać "
 "pliki bez uwzględniania filtrów?"
 
-#: meld/filediff.py:1965
+#: meld/filediff.py:1968
 msgid "Files differ in line endings only"
 msgstr "Pliki różnią się tylko znacznikami końca wierszy"
 
-#: meld/filediff.py:1967
+#: meld/filediff.py:1970
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1966,15 +1974,15 @@ msgstr ""
 "Pliki są identyczne, z wyjątkiem różnych znaczników końca wierszy:\n"
 "%s"
 
-#: meld/filediff.py:1987
+#: meld/filediff.py:1990
 msgid "Show without filters"
 msgstr "Wyświetl bez filtrów"
 
-#: meld/filediff.py:2009
+#: meld/filediff.py:2012
 msgid "Change highlighting incomplete"
 msgstr "Wyróżnianie zmian jest niepełne"
 
-#: meld/filediff.py:2010
+#: meld/filediff.py:2013
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1982,19 +1990,19 @@ msgstr ""
 "Niektóre zmiany nie zostały wyróżnione, ponieważ były za duże. Można "
 "wymusić, aby program Meld wyróżnił większe zmiany, ale może to być wolne."
 
-#: meld/filediff.py:2018
+#: meld/filediff.py:2021
 msgid "Keep highlighting"
 msgstr "Wyróżniaj dalej"
 
-#: meld/filediff.py:2020
+#: meld/filediff.py:2023
 msgid "_Keep highlighting"
 msgstr "_Wyróżniaj dalej"
 
-#: meld/filediff.py:2033
+#: meld/filediff.py:2036
 msgid "Saving failed"
 msgstr "Zapisanie się nie powiodło"
 
-#: meld/filediff.py:2034
+#: meld/filediff.py:2037
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -2002,38 +2010,38 @@ msgstr ""
 "Proszę rozważyć skopiowanie wszelkich ważnych zmian w innym programie lub "
 "pliku, aby uniknąć utraty danych."
 
-#: meld/filediff.py:2043
+#: meld/filediff.py:2046
 msgid "Save Left Pane As"
 msgstr "Zapis lewego panelu jako"
 
-#: meld/filediff.py:2045
+#: meld/filediff.py:2048
 msgid "Save Middle Pane As"
 msgstr "Zapis środkowego panelu jako"
 
-#: meld/filediff.py:2047
+#: meld/filediff.py:2050
 msgid "Save Right Pane As"
 msgstr "Zapis prawego panelu jako"
 
-#: meld/filediff.py:2058
+#: meld/filediff.py:2061
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Plik %s został zmieniony na dysku od czasu jego otwarcia"
 
-#: meld/filediff.py:2060
+#: meld/filediff.py:2063
 msgid "If you save it, any external changes will be lost."
 msgstr ""
 "Jeżeli plik zostanie zapisany, to wszystkie zewnętrzne zmiany zostaną "
 "utracone."
 
-#: meld/filediff.py:2063
+#: meld/filediff.py:2066
 msgid "Save Anyway"
 msgstr "Zapisz mimo to"
 
-#: meld/filediff.py:2064
+#: meld/filediff.py:2067
 msgid "Don’t Save"
 msgstr "Nie zapisuj"
 
-#: meld/filediff.py:2106
+#: meld/filediff.py:2109
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2041,7 +2049,7 @@ msgstr ""
 "Plik „{}” zawiera znaki, których nie można zakodować za pomocą jego obecnego "
 "kodowania, „{}”."
 
-#: meld/filediff.py:2110 meld/patchdialog.py:138
+#: meld/filediff.py:2113 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2050,16 +2058,16 @@ msgstr ""
 "Nie można zapisać pliku z powodu:\n"
 "%s"
 
-#: meld/filediff.py:2114 meld/patchdialog.py:137
+#: meld/filediff.py:2117 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Nie można zapisać pliku %s."
 
-#: meld/filediff.py:2524
+#: meld/filediff.py:2527
 msgid "Live comparison updating disabled"
 msgstr "Wyłączono aktualizowanie porównań na żywo"
 
-#: meld/filediff.py:2525
+#: meld/filediff.py:2528
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2407,67 +2415,68 @@ msgstr ""
 msgid "Choose which version control system to use"
 msgstr "Proszę wybrać system kontroli wersji do użycia"
 
-#. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:412
+#. TRANSLATORS: This is the name of the version control
+#. system being used, e.g., "Git" or "Subversion"
+#: meld/vcview.py:414
 #, python-brace-format
-msgid "Location: {path}"
-msgstr "Położenie: {path}"
+msgid "{vc} comparison:"
+msgstr "Porównanie {vc}:"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:419
+#: meld/vcview.py:423
 msgid "Scanning repository"
 msgstr "Skanowanie repozytorium"
 
-#: meld/vcview.py:448
+#: meld/vcview.py:452
 #, python-format
 msgid "Scanning %s"
 msgstr "Skanowanie %s"
 
-#: meld/vcview.py:487
+#: meld/vcview.py:491
 msgid "(Empty)"
 msgstr "(Pusty)"
 
-#: meld/vcview.py:535
+#: meld/vcview.py:539
 #, python-format
 msgid "%s — local"
 msgstr "%s — lokalne"
 
-#: meld/vcview.py:536
+#: meld/vcview.py:540
 #, python-format
 msgid "%s — remote"
 msgstr "%s — zdalne"
 
-#: meld/vcview.py:544
+#: meld/vcview.py:548
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (lokalne, scalanie, zdalne)"
 
-#: meld/vcview.py:549
+#: meld/vcview.py:553
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (zdalne, scalanie, lokalne)"
 
-#: meld/vcview.py:560
+#: meld/vcview.py:564
 #, python-format
 msgid "%s — repository"
 msgstr "%s — repozytorium"
 
-#: meld/vcview.py:566
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (kopia robocza, repozytorium)"
 
-#: meld/vcview.py:570
+#: meld/vcview.py:574
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (repozytorium, kopia robocza)"
 
-#: meld/vcview.py:735
+#: meld/vcview.py:739
 msgid "Remove folder and all its files?"
 msgstr "Usunąć katalog i wszystkie zawarte w nim pliki?"
 
-#: meld/vcview.py:737
+#: meld/vcview.py:741
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2475,6 +2484,6 @@ msgstr ""
 "Spowoduje to usunięcie z systemu kontroli wersji wszystkich zaznaczonych "
 "plików i katalogów, a także wszystkich plików w zaznaczonych katalogach."
 
-#: meld/vcview.py:850
+#: meld/vcview.py:854
 msgid "Clear"
 msgstr "Wyczyść"

From 9f7116372900d225765a64becca47e55a2a563aa Mon Sep 17 00:00:00 2001
From: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date: Sun, 10 Jul 2022 20:06:10 +0000
Subject: [PATCH 116/116] Update Swedish translation

---
 po/sv.po | 132 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 71 insertions(+), 61 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index 2f51e8dc..c4d52835 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-04-09 23:19+0000\n"
-"PO-Revision-Date: 2022-04-11 10:34+0200\n"
+"POT-Creation-Date: 2022-07-10 01:05+0000\n"
+"PO-Revision-Date: 2022-07-10 10:20+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.1\n"
 "X-Project-Style: gnome\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
@@ -945,7 +945,7 @@ msgid "Column Name"
 msgstr "Kolumnnamn"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745
 msgid "_Remove"
 msgstr "_Ta bort"
 
@@ -1748,12 +1748,12 @@ msgstr "Filfilter används, och därför har inte alla filer genomsökts."
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Textfilter används och kan dölja skillnader i innehåll."
 
-#: meld/dirdiff.py:1145 meld/filediff.py:1982
+#: meld/dirdiff.py:1145 meld/filediff.py:1985
 msgid "Hide"
 msgstr "Dölj"
 
-#: meld/dirdiff.py:1147 meld/filediff.py:1984 meld/filediff.py:2014
-#: meld/filediff.py:2016 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1987 meld/filediff.py:2017
+#: meld/filediff.py:2019 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "_Dölj"
 
@@ -1819,7 +1819,7 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1277 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:768
 msgid "Error deleting {}"
 msgstr "Fel vid borttagning av {}"
 
@@ -1827,6 +1827,10 @@ msgstr "Fel vid borttagning av {}"
 msgid "No folder"
 msgstr "Ingen mapp"
 
+#: meld/dirdiff.py:1838
+msgid "Folder comparison:"
+msgstr "Mappjämförelse:"
+
 #: meld/filediff.py:1158
 msgid "Comparison results will be inaccurate"
 msgstr "Jämförelseresultat kommer att bli osäkra"
@@ -1876,56 +1880,60 @@ msgstr "Matcha synkroniseringspunkt"
 msgid "Clear Synchronization Points"
 msgstr "Rensa synkroniseringspunkter"
 
-#: meld/filediff.py:1656
+#: meld/filediff.py:1525
+msgid "File comparison:"
+msgstr "Filjämförelse:"
+
+#: meld/filediff.py:1659
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”."
 
-#: meld/filediff.py:1665
+#: meld/filediff.py:1668
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Filen %s verkar vara en binärfil."
 
-#: meld/filediff.py:1667
+#: meld/filediff.py:1670
 msgid "Do you want to open the file using the default application?"
 msgstr "Vill du öppna filen med standardprogrammet?"
 
-#: meld/filediff.py:1669
+#: meld/filediff.py:1672
 msgid "Open"
 msgstr "Öppna"
 
-#: meld/filediff.py:1691
+#: meld/filediff.py:1694
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Sammanfogar filer"
 
-#: meld/filediff.py:1705
+#: meld/filediff.py:1708
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Beräknar skillnader"
 
-#: meld/filediff.py:1765
+#: meld/filediff.py:1768
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Filen %s har ändrats på disk"
 
-#: meld/filediff.py:1766
+#: meld/filediff.py:1769
 msgid "Do you want to reload the file?"
 msgstr "Vill du läsa om filen?"
 
-#: meld/filediff.py:1768
+#: meld/filediff.py:1771
 msgid "_Reload"
 msgstr "_Läs om"
 
-#: meld/filediff.py:1938
+#: meld/filediff.py:1941
 msgid "File {} is being compared to itself"
 msgstr "Filen {} jämförs med sig själv"
 
-#: meld/filediff.py:1947
+#: meld/filediff.py:1950
 msgid "Files are identical"
 msgstr "Filerna är identiska"
 
-#: meld/filediff.py:1960
+#: meld/filediff.py:1963
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1933,11 +1941,11 @@ msgstr ""
 "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
 "ofiltrerade filerna?"
 
-#: meld/filediff.py:1965
+#: meld/filediff.py:1968
 msgid "Files differ in line endings only"
 msgstr "Filer skiljer sig endast vad gäller radslut"
 
-#: meld/filediff.py:1967
+#: meld/filediff.py:1970
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1946,15 +1954,15 @@ msgstr ""
 "Filerna är identiska förutom radavsluten:\n"
 "%s"
 
-#: meld/filediff.py:1987
+#: meld/filediff.py:1990
 msgid "Show without filters"
 msgstr "Visa utan filer"
 
-#: meld/filediff.py:2009
+#: meld/filediff.py:2012
 msgid "Change highlighting incomplete"
 msgstr "Ändra markering av ofärdiga"
 
-#: meld/filediff.py:2010
+#: meld/filediff.py:2013
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1963,19 +1971,19 @@ msgstr ""
 "Meld till att längre tid på sig att markera större ändringar, men det kan "
 "bli långsamt."
 
-#: meld/filediff.py:2018
+#: meld/filediff.py:2021
 msgid "Keep highlighting"
 msgstr "Använd markering"
 
-#: meld/filediff.py:2020
+#: meld/filediff.py:2023
 msgid "_Keep highlighting"
 msgstr "_Använd markering"
 
-#: meld/filediff.py:2033
+#: meld/filediff.py:2036
 msgid "Saving failed"
 msgstr "Misslyckades med att spara"
 
-#: meld/filediff.py:2034
+#: meld/filediff.py:2037
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1983,36 +1991,36 @@ msgstr ""
 "Överväg att kopiera kritiska ändringar till ett annat program eller en annan "
 "fil för att undvika förlust av data."
 
-#: meld/filediff.py:2043
+#: meld/filediff.py:2046
 msgid "Save Left Pane As"
 msgstr "Spara vänsterpanel som"
 
-#: meld/filediff.py:2045
+#: meld/filediff.py:2048
 msgid "Save Middle Pane As"
 msgstr "Spara mittenpanel som"
 
-#: meld/filediff.py:2047
+#: meld/filediff.py:2050
 msgid "Save Right Pane As"
 msgstr "Spara högerpanel som"
 
-#: meld/filediff.py:2058
+#: meld/filediff.py:2061
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Filen %s har ändrats på disk sedan den öppnades"
 
-#: meld/filediff.py:2060
+#: meld/filediff.py:2063
 msgid "If you save it, any external changes will be lost."
 msgstr "Om du sparar den kommer alla externa ändringar att gå förlorade."
 
-#: meld/filediff.py:2063
+#: meld/filediff.py:2066
 msgid "Save Anyway"
 msgstr "Spara ändå"
 
-#: meld/filediff.py:2064
+#: meld/filediff.py:2067
 msgid "Don’t Save"
 msgstr "Spara inte"
 
-#: meld/filediff.py:2106
+#: meld/filediff.py:2109
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
@@ -2020,7 +2028,7 @@ msgstr ""
 "Filen ”{}” innehåller tecken som inte kan kodas med dess aktuella kodning "
 "”{}”."
 
-#: meld/filediff.py:2110 meld/patchdialog.py:138
+#: meld/filediff.py:2113 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -2029,16 +2037,16 @@ msgstr ""
 "Kunde in spara fil beroende på:\n"
 "%s"
 
-#: meld/filediff.py:2114 meld/patchdialog.py:137
+#: meld/filediff.py:2117 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Kunde inte spara filen %s."
 
-#: meld/filediff.py:2524
+#: meld/filediff.py:2527
 msgid "Live comparison updating disabled"
 msgstr "Inaktivera realtidsuppdateringar av jämförelser"
 
-#: meld/filediff.py:2525
+#: meld/filediff.py:2528
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2384,67 +2392,68 @@ msgstr "Inget giltigt versionshanteringssystem hittades i denna mapp"
 msgid "Choose which version control system to use"
 msgstr "Välj vilket versionshanteringssystem som ska användas"
 
-#. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:412
+#. TRANSLATORS: This is the name of the version control
+#. system being used, e.g., "Git" or "Subversion"
+#: meld/vcview.py:414
 #, python-brace-format
-msgid "Location: {path}"
-msgstr "Plats: {path}"
+msgid "{vc} comparison:"
+msgstr "{vc}-jämförelse:"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:419
+#: meld/vcview.py:423
 msgid "Scanning repository"
 msgstr "Söker igenom förråd"
 
-#: meld/vcview.py:448
+#: meld/vcview.py:452
 #, python-format
 msgid "Scanning %s"
 msgstr "Söker igenom %s"
 
-#: meld/vcview.py:487
+#: meld/vcview.py:491
 msgid "(Empty)"
 msgstr "(Tom)"
 
-#: meld/vcview.py:535
+#: meld/vcview.py:539
 #, python-format
 msgid "%s — local"
 msgstr "%s — lokal"
 
-#: meld/vcview.py:536
+#: meld/vcview.py:540
 #, python-format
 msgid "%s — remote"
 msgstr "%s — fjärr"
 
-#: meld/vcview.py:544
+#: meld/vcview.py:548
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (lokal, sammanfoga, fjärr)"
 
-#: meld/vcview.py:549
+#: meld/vcview.py:553
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (fjärr, sammanfoga, lokal)"
 
-#: meld/vcview.py:560
+#: meld/vcview.py:564
 #, python-format
 msgid "%s — repository"
 msgstr "%s — förråd"
 
-#: meld/vcview.py:566
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (arbetskopia, förråd)"
 
-#: meld/vcview.py:570
+#: meld/vcview.py:574
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (förråd, arbetskopia)"
 
-#: meld/vcview.py:735
+#: meld/vcview.py:739
 msgid "Remove folder and all its files?"
 msgstr "Ta bort mapp och dess filer?"
 
-#: meld/vcview.py:737
+#: meld/vcview.py:741
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2452,10 +2461,14 @@ msgstr ""
 "Det här kommer att ta bort alla markerade filer och mappar samt alla filer i "
 "markerade mappar från versionshantering."
 
-#: meld/vcview.py:850
+#: meld/vcview.py:854
 msgid "Clear"
 msgstr "Töm"
 
+#, python-brace-format
+#~ msgid "Location: {path}"
+#~ msgstr "Plats: {path}"
+
 #~ msgid "_Update"
 #~ msgstr "_Uppdatera"
 
@@ -2661,9 +2674,6 @@ msgstr "Töm"
 #~ msgid "Replace _with:"
 #~ msgstr "Ersätt _med:"
 
-#~ msgid "File comparison"
-#~ msgstr "Filjämförelse"
-
 #~ msgid "Directory comparison"
 #~ msgstr "Katalogjämförelse"