[meld] Update Indonesian translation



commit 5ab3b24575b9115de1bd2eb86530723791712252
Author: Kukuh Syafaat <kukuhsyafaat gnome org>
Date:   Thu Feb 28 07:24:13 2019 +0000

    Update Indonesian translation

 po/id.po | 1998 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1006 insertions(+), 992 deletions(-)
---
diff --git a/po/id.po b/po/id.po
index 1d9d1eff..4da0d08b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,27 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n";
-"POT-Creation-Date: 2018-11-13 20:40+0000\n"
-"PO-Revision-Date: 2018-11-15 23:40+0700\n"
+"POT-Creation-Date: 2019-01-20 20:13+0000\n"
+"PO-Revision-Date: 2019-02-28 14:22+0700\n"
 "Last-Translator: Kukuh Syafaat <kukuhsyafaat gnome org>\n"
 "Language-Team: Indonesian <gnome i15n org>\n"
 "Language: id\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.0.6\n"
+"Plural-Forms: nplurals=2; plural= n!=1;\n"
+"X-Generator: Poedit 2.2.1\n"
 
-#: ../bin/meld:194
+#: ../bin/meld:190
 msgid "Cannot import: "
 msgstr "Tak bisa mengimpor: "
 
-#: ../bin/meld:197
+#: ../bin/meld:193
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld memerlukan %s atau lebih tinggi."
 
-#: ../bin/meld:243
+#: ../bin/meld:262
 #, c-format
 msgid ""
 "Couldn’t load Meld-specific CSS (%s)\n"
@@ -37,7 +37,8 @@ msgstr ""
 "%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.appdata.xml.in.h:1
+#: ../meld/resources/ui/appwindow.ui.h:1
 msgid "Meld"
 msgstr "Meld"
 
@@ -105,26 +106,10 @@ msgid "Default window fullscreen state"
 msgstr "Keadaan layar penuh jendela baku"
 
 #: ../data/org.gnome.meld.gschema.xml.h:5
-msgid "Show toolbar"
-msgstr "Tampilkan bilah alat"
-
-#: ../data/org.gnome.meld.gschema.xml.h:6
-msgid "If true, the window toolbar is visible."
-msgstr "Bila berisi true, bilah alat jendela tampak."
-
-#: ../data/org.gnome.meld.gschema.xml.h:7
-msgid "Show statusbar"
-msgstr "Tampilkan bilah status"
-
-#: ../data/org.gnome.meld.gschema.xml.h:8
-msgid "If true, the window statusbar is visible."
-msgstr "Bila berisi true, bilah status jendela tampak."
-
-#: ../data/org.gnome.meld.gschema.xml.h:9
 msgid "Additional automatically detected text encodings"
 msgstr "Tambahan enkoding teks yang dideteksi secara otomatis"
 
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: ../data/org.gnome.meld.gschema.xml.h:6
 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 "
@@ -137,39 +122,40 @@ msgstr ""
 "selalu dipakai; encoding lain mungkin juga dicoba, bergantung kepada locale "
 "pengguna."
 
-#: ../data/org.gnome.meld.gschema.xml.h:11
+#: ../data/org.gnome.meld.gschema.xml.h:7
 msgid "Width of an indentation step"
 msgstr "Lebar langkah indentasi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: ../data/org.gnome.meld.gschema.xml.h:8
 msgid "The number of spaces to use for a single indent step"
 msgstr "Banyaknya spasi yang dipakai untuk langkah indentasi tunggal"
 
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: ../data/org.gnome.meld.gschema.xml.h:9
 msgid "Whether to indent using spaces or tabs"
 msgstr "Apakah indentasi memakai spasi atau tab"
 
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: ../data/org.gnome.meld.gschema.xml.h:10
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr ""
 "Bila berisi true, sebarang indentasi baru akan memakai spasi sebagai ganti "
 "tab."
 
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: ../data/org.gnome.meld.gschema.xml.h:11
+#: ../meld/resources/ui/statusbar-menu.ui.h:1
 msgid "Show line numbers"
 msgstr "Tampilkan nomor baris"
 
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: ../data/org.gnome.meld.gschema.xml.h:12
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr ""
 "Bila berisi true, nomor baris akan ditampilkan dalam parit perbandingan "
 "berkas."
 
-#: ../data/org.gnome.meld.gschema.xml.h:17
+#: ../data/org.gnome.meld.gschema.xml.h:13
 msgid "Highlight syntax"
 msgstr "Sorot sintaks"
 
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: ../data/org.gnome.meld.gschema.xml.h:14
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld’s own color "
 "highlighting, this is off by default."
@@ -177,20 +163,20 @@ msgstr ""
 "Apakah menyorot sintaks dalam perbandingan. Karena warna penyorotan milik "
 "Meld, ini secara baku mati."
 
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: ../data/org.gnome.meld.gschema.xml.h:15
 msgid "Color scheme to use for syntax highlighting"
 msgstr "Skema warna yang digunakan untuk penyorotan sintaks"
 
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: ../data/org.gnome.meld.gschema.xml.h:16
 msgid "Used by GtkSourceView to determine colors for syntax highlighting"
 msgstr ""
 "Dipakai oleh GtkSourceView untuk menentukan warna bagi penyorotan sintaks"
 
-#: ../data/org.gnome.meld.gschema.xml.h:21
+#: ../data/org.gnome.meld.gschema.xml.h:17
 msgid "Displayed whitespace"
 msgstr "Whitespace yang ditampilkan"
 
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:18
 msgid ""
 "Selector for individual whitespace character types to be shown. Possible "
 "values are 'space', 'tab', 'newline' and 'nbsp'."
@@ -199,11 +185,11 @@ msgstr ""
 "yang mungkin adalah 'space' (spasi), 'tab', 'newline' (baris baru), dan "
 "'nbsp' (spasi tak putus)."
 
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: ../data/org.gnome.meld.gschema.xml.h:19
 msgid "Wrap mode"
 msgstr "Mode lipat"
 
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: ../data/org.gnome.meld.gschema.xml.h:20
 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 "
@@ -213,11 +199,12 @@ msgstr ""
 "tidak sedikitpun ('none'), pada sebarang karakter ('char'), atau hanya pada "
 "akhir kata ('word')."
 
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:21
+#: ../meld/resources/ui/statusbar-menu.ui.h:3
 msgid "Highlight current line"
 msgstr "Sorot baris saat ini"
 
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: ../data/org.gnome.meld.gschema.xml.h:22
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
@@ -225,22 +212,22 @@ msgstr ""
 "Bila berisi true, baris yang memuat kursor akan disorot dalam perbandingan "
 "berkas."
 
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: ../data/org.gnome.meld.gschema.xml.h:23
 msgid "Use the system default monospace font"
 msgstr "Gunakan fonta monospace bawaan sistem"
 
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:24
 msgid ""
 "If false, custom-font will be used instead of the system monospace font."
 msgstr ""
 "Bila berisi false, fonta ubahan akan dipakai sebagai ganti fonta monospace "
 "sistem."
 
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: ../data/org.gnome.meld.gschema.xml.h:25
 msgid "Custom font"
 msgstr "Fonta ubahan"
 
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:26
 msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
@@ -248,22 +235,22 @@ msgstr ""
 "Fonta ubahan yang dipakai, disimpan sebagai suatu string dan diurai sebagai "
 "suatu deskripsi fonta Pango."
 
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: ../data/org.gnome.meld.gschema.xml.h:27
 msgid "Ignore blank lines when comparing files"
 msgstr "Abaikan baris kosong ketika membandingkan berkas"
 
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: ../data/org.gnome.meld.gschema.xml.h:28
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
 "Bila berisi true, baris-baris kosong akan dibuang ketika menyorot perubahan "
 "antar berkas."
 
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: ../data/org.gnome.meld.gschema.xml.h:29
 msgid "Use the system default editor"
 msgstr "Gunakan penyunting bawaan sistem"
 
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: ../data/org.gnome.meld.gschema.xml.h:30
 msgid ""
 "If false, custom-editor-command will be used instead of the system editor "
 "when opening files externally."
@@ -271,11 +258,11 @@ msgstr ""
 "Bila berisi false, perintah penyunting ubahan akan dipakai sebagai ganti "
 "penyunting sistem ketika membuka berkas secara eksternal."
 
-#: ../data/org.gnome.meld.gschema.xml.h:35
+#: ../data/org.gnome.meld.gschema.xml.h:31
 msgid "The custom editor launch command"
 msgstr "Perintah peluncuran penyunting ubahan"
 
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: ../data/org.gnome.meld.gschema.xml.h:32
 msgid ""
 "The command used to launch a custom editor. Some limited templating is "
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
@@ -284,11 +271,11 @@ msgstr ""
 "penemplatan yang terbatas didukung di sini; saat ini '{file}' dan '{line}' "
 "adalah token yang dikenal."
 
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: ../data/org.gnome.meld.gschema.xml.h:33
 msgid "Columns to display"
 msgstr "Kolom yang akan ditampilkan"
 
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: ../data/org.gnome.meld.gschema.xml.h:34
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
@@ -296,11 +283,12 @@ msgstr ""
 "Daftar nama kolom dalam perbandingan folder dan apakah mereka mesti "
 "ditampilkan."
 
-#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:35
+#: ../meld/resources/ui/preferences.ui.h:25
 msgid "Ignore symbolic links"
 msgstr "Abaikan taut simbolik"
 
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: ../data/org.gnome.meld.gschema.xml.h:36
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
@@ -308,11 +296,11 @@ msgstr ""
 "Bila berisi true, perbandingan folder tidak mengikuti taut simbolik ketika "
 "menelusuri pohon folder."
 
-#: ../data/org.gnome.meld.gschema.xml.h:41
+#: ../data/org.gnome.meld.gschema.xml.h:37
 msgid "Use shallow comparison"
 msgstr "Gunakan perbandingan dangkal"
 
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: ../data/org.gnome.meld.gschema.xml.h:38
 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 "
@@ -322,11 +310,11 @@ msgstr ""
 "pada ukuran dan mtime, menganggap berkas identik bila ukuran dan mtime "
 "mereka cocok, dan berbeda bila tidak."
 
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: ../data/org.gnome.meld.gschema.xml.h:39
 msgid "File timestamp resolution"
 msgstr "Resolusi penanda waktu"
 
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../data/org.gnome.meld.gschema.xml.h:40
 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 "
@@ -338,11 +326,12 @@ msgstr ""
 "berbeda. Ini berguna ketika membandingkan berkas antar sistem berkas dengan "
 "resolusi penanda waktu yang berbeda."
 
-#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:41
+#: ../meld/resources/ui/preferences.ui.h:22
 msgid "Apply text filters during folder comparisons"
 msgstr "Terapkan penyaring teks selama perbandingan folder"
 
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../data/org.gnome.meld.gschema.xml.h:42
 msgid ""
 "If true, folder comparisons that compare file contents also apply active "
 "text filters and the blank line trimming option, and ignore newline "
@@ -352,21 +341,21 @@ msgstr ""
 "menerapkan penyaring teks aktif dan opsi pemangkasan baris kosong, dan "
 "mengabaikan perbedaan baris baru."
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:43
 msgid "File status filters"
 msgstr "Penyaring status berkas"
 
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../data/org.gnome.meld.gschema.xml.h:44
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 "Daftar dari status yang dipakai untuk menyaring berkas yang tampak dalam "
 "perbandingan folder."
 
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: ../data/org.gnome.meld.gschema.xml.h:45
 msgid "Show the version control console output"
 msgstr "Tampilkan keluaran konsol kendali versi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:46
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
@@ -375,22 +364,22 @@ msgstr ""
 "kendali versi, menunjukkan perintah yang dijalankan bagi operasi kendali "
 "versi."
 
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: ../data/org.gnome.meld.gschema.xml.h:47
 msgid "Version control pane position"
 msgstr "Posisi panel kendali versi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:48
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
 msgstr ""
 "Ini adalah tinggi phon kendali versi utama ketika panel konsol ditampilkan."
 
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: ../data/org.gnome.meld.gschema.xml.h:49
 msgid "Present version comparisons as left-local/right-remote"
 msgstr "Sajikan perbandingan versi sebagai kiri-lokal/kanan-jauh"
 
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: ../data/org.gnome.meld.gschema.xml.h:50
 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, "
@@ -401,11 +390,11 @@ msgstr ""
 "dalam panel. Bila tidak, skema left-adalah-milik-mereka, kanan-adalah-"
 "milikku dipakai."
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:51
 msgid "Order for files in three-way version control merge comparisons"
 msgstr "Urutan bagi berkas dalam perbandingan merge kendali versi tiga arah"
 
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: ../data/org.gnome.meld.gschema.xml.h:52
 msgid ""
 "Choices for file order are remote/merged/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
@@ -416,11 +405,11 @@ msgstr ""
 "diluncurkan dari tilikan kendali versi, sehingga hanya dipakai untuk "
 "resolusi merge/konflik di dalam Meld."
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:53
 msgid "Show margin in commit message editor"
 msgstr "Tampilkan marjin dalam penyunting pesan komit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: ../data/org.gnome.meld.gschema.xml.h:54
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
@@ -428,11 +417,11 @@ msgstr ""
 "Bila berisi true, suatu panduan akan ditampilkan untuk menunjukkan marjin "
 "pada kolom mana dalam penyunting pesan komit kendali versi."
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:55
 msgid "Margin column in commit message editor"
 msgstr "Marjin kolom dalam penyunting pesan komit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: ../data/org.gnome.meld.gschema.xml.h:56
 msgid ""
 "The column at which to show the margin in the version control commit message "
 "editor."
@@ -440,11 +429,11 @@ msgstr ""
 "Kolom tempat menunjukkan posisi marjin dalam penyunting pesan komit kendali "
 "versi."
 
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: ../data/org.gnome.meld.gschema.xml.h:57
 msgid "Automatically hard-wrap commit messages"
 msgstr "Secara otomatis melipat isi pesan komit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: ../data/org.gnome.meld.gschema.xml.h:58
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the commit margin before commit."
@@ -452,22 +441,22 @@ msgstr ""
 "Bila berisi true, penyunting pesan komit kendali versi akan melipat (yaitu "
 "menyisipkan pemecah baris) pada marjin komit sebelum komit."
 
-#: ../data/org.gnome.meld.gschema.xml.h:63
+#: ../data/org.gnome.meld.gschema.xml.h:59
 msgid "Version control status filters"
 msgstr "Penyaring status kendali versi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:64
+#: ../data/org.gnome.meld.gschema.xml.h:60
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 "Daftar status yang dipakai untuk menyaring berkas yang tampak dalam "
 "perbandingan kendali versi."
 
-#: ../data/org.gnome.meld.gschema.xml.h:65
+#: ../data/org.gnome.meld.gschema.xml.h:61
 msgid "Filename-based filters"
 msgstr "Penyaring berbasis nama berkas"
 
-#: ../data/org.gnome.meld.gschema.xml.h:66
+#: ../data/org.gnome.meld.gschema.xml.h:62
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
@@ -475,11 +464,11 @@ msgstr ""
 "Daftar penyaring berbasis nama berkas yang terpradefinisi, yang bila aktif, "
 "akan menghapus berkas yang cocok dari perbandingan folder."
 
-#: ../data/org.gnome.meld.gschema.xml.h:67
+#: ../data/org.gnome.meld.gschema.xml.h:63
 msgid "Text-based filters"
 msgstr "Penyaring berbasis teks"
 
-#: ../data/org.gnome.meld.gschema.xml.h:68
+#: ../data/org.gnome.meld.gschema.xml.h:64
 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, "
@@ -505,398 +494,623 @@ msgstr "Skema gelap Meld"
 msgid "Dark color scheme for Meld highlighting"
 msgstr "Skema warna gelap untuk penyorotan Meld"
 
-#: ../data/ui/application.ui.h:1
-msgid "About Meld"
-msgstr "Tentang Meld"
-
-#: ../data/ui/application.ui.h:2
-msgid ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
-msgstr ""
-"Hak Cipta © 2002-2009 Stephen Kennedy\n"
-"Hak Cipta © 2009-2017 Kai Willadsen"
+#: ../meld/resources/gtk/help-overlay.ui.h:1
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Umum"
 
-#: ../data/ui/application.ui.h:4
-msgid "Website"
-msgstr "Situs web"
+#: ../meld/resources/gtk/help-overlay.ui.h:2
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr "Perbandingan baru"
 
-#: ../data/ui/application.ui.h:5
-msgid "translator-credits"
-msgstr ""
-"Andika Triwidada <andika gmail com>, 2013, 2014, 2016, 2018.\n"
-"Kukuh Syafaat <kukuhsyafaat gnome org>, 2017, 2018."
+#: ../meld/resources/gtk/help-overlay.ui.h:3
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "Tutup suatu perbandingan"
 
-#: ../data/ui/application.ui.h:6
-msgid "_Preferences"
-msgstr "_Preferensi"
+#: ../meld/resources/gtk/help-overlay.ui.h:4
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Keluar Meld"
 
-#: ../data/ui/application.ui.h:7
-msgid "_Help"
-msgstr "_Bantuan"
+#: ../meld/resources/gtk/help-overlay.ui.h:5
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "Hentikan aksi saat ini"
 
-#: ../data/ui/application.ui.h:8
-msgid "Keyboard Shortcuts"
-msgstr "Tombol Pintas"
+#: ../meld/resources/gtk/help-overlay.ui.h:6
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr "Segarkan perbandingan"
 
-#: ../data/ui/application.ui.h:9
-msgid "_About"
-msgstr "Tent_ang"
+#: ../meld/resources/gtk/help-overlay.ui.h:7
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "Layar Penuh"
 
-#: ../data/ui/application.ui.h:10
-msgid "_Quit"
-msgstr "_Keluar"
+#: ../meld/resources/gtk/help-overlay.ui.h:8
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "Tab"
 
-#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
-msgid "_Compare"
-msgstr "_Bandingkan"
+#: ../meld/resources/gtk/help-overlay.ui.h:9
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr "Ke tab sebelumnya"
 
-#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
-msgid "Compare selected files"
-msgstr "Bandingkan berkas-berkas yang dipilih"
+#: ../meld/resources/gtk/help-overlay.ui.h:10
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr "Ke tab selanjutnya"
 
-#: ../data/ui/dirdiff.ui.h:3
-msgid "Collapse Recursively"
-msgstr "Ciutkan Secara Rekursif"
+#: ../meld/resources/gtk/help-overlay.ui.h:11
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "Tukar ke tab"
 
-#: ../data/ui/dirdiff.ui.h:4
-msgid "Collapse selected folder and all subfolders"
-msgstr "Ciutkan folder yang dipilih dan semua subfolder"
+#: ../meld/resources/gtk/help-overlay.ui.h:12
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "Pindahkan tab ke kiri"
 
-#: ../data/ui/dirdiff.ui.h:5
-msgid "Expand Recursively"
-msgstr "Perluas Secara Rekursif"
+#: ../meld/resources/gtk/help-overlay.ui.h:13
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "Pindahkan tab ke kanan"
 
-#: ../data/ui/dirdiff.ui.h:6
-msgid "Expand selected folder and all subfolders"
-msgstr "Perluas folder yang dipilih dan semua subfolder"
+#: ../meld/resources/gtk/help-overlay.ui.h:14
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Perubahan"
 
-#: ../data/ui/dirdiff.ui.h:7
-msgid "Copy to _Left"
-msgstr "Salin ke K_iri"
+#: ../meld/resources/gtk/help-overlay.ui.h:15
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Ke perubahan sebelumnya"
 
-#: ../data/ui/dirdiff.ui.h:8
-msgid "Copy to left"
-msgstr "Salin ke kiri"
+#: ../meld/resources/gtk/help-overlay.ui.h:16
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Ke perubahan selanjutnya"
 
-#: ../data/ui/dirdiff.ui.h:9
-msgid "Copy to _Right"
-msgstr "Salin ke K_anan"
+#: ../meld/resources/gtk/help-overlay.ui.h:17
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Menyunting"
 
-#: ../data/ui/dirdiff.ui.h:10
-msgid "Copy to right"
-msgstr "Salin ke kanan"
+#: ../meld/resources/gtk/help-overlay.ui.h:18
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "Tak jadi"
 
-#: ../data/ui/dirdiff.ui.h:11
-msgid "Delete selected"
-msgstr "Hapus yang dipilih"
+#: ../meld/resources/gtk/help-overlay.ui.h:19
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "Jadi lagi"
 
-#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:920 ../meld/filediff.py:1489
-msgid "Hide"
-msgstr "Sembunyikan"
+#: ../meld/resources/gtk/help-overlay.ui.h:20
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr "Potong"
 
-#: ../data/ui/dirdiff.ui.h:13
-msgid "Hide selected"
-msgstr "Sembunyikan yang dipilih"
+#: ../meld/resources/gtk/help-overlay.ui.h:21
+msgctxt "shortcut window"
+msgid "Copy"
+msgstr "Salin"
 
-#: ../data/ui/dirdiff.ui.h:14
-msgid "Ignore Filename Case"
-msgstr "Abaikan Besar Kecil Huruf Nama Berkas"
+#: ../meld/resources/gtk/help-overlay.ui.h:22
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr "Tempel"
 
-#: ../data/ui/dirdiff.ui.h:15
-msgid ""
-"Consider differently-cased filenames that are otherwise-identical to be the "
-"same"
-msgstr ""
-"Menganggap sama nama berkas yang berbeda huruf besar kecilnya yang bila "
-"tidak menjadi identik"
+#: ../meld/resources/gtk/help-overlay.ui.h:23
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "Cari"
 
-#: ../data/ui/dirdiff.ui.h:16
-msgid "Same"
-msgstr "Sama"
+#: ../meld/resources/gtk/help-overlay.ui.h:24
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "Cari Selanjutnya"
 
-#: ../data/ui/dirdiff.ui.h:17
-msgid "Show identical"
-msgstr "Tampilkan yang identik"
+#: ../meld/resources/gtk/help-overlay.ui.h:25
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "Cari Sebelumnya"
 
-#: ../data/ui/dirdiff.ui.h:18
-msgid "New"
-msgstr "Baru"
+#: ../meld/resources/gtk/help-overlay.ui.h:26
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "Ganti"
 
-#: ../data/ui/dirdiff.ui.h:19
-msgid "Show new"
-msgstr "Tampilkan yang baru"
+#: ../meld/resources/gtk/help-overlay.ui.h:27
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr "Perbandingan berkas"
 
-#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76
-msgid "Modified"
-msgstr "Diubah"
+#: ../meld/resources/gtk/help-overlay.ui.h:28
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "Simpan berkas kini"
 
-#: ../data/ui/dirdiff.ui.h:21
-msgid "Show modified"
-msgstr "Tampilkan yang berubah"
+#: ../meld/resources/gtk/help-overlay.ui.h:29
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr "Simpan berkas saat ini ke path baru"
 
-#: ../data/ui/dirdiff.ui.h:22
-msgid "Filters"
-msgstr "Penyaring"
+#: ../meld/resources/gtk/help-overlay.ui.h:30
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr "Simpan semua berkas dalam perbandingan"
 
-#: ../data/ui/dirdiff.ui.h:23
-msgid "Set active filters"
-msgstr "Tata penyaring aktif"
+#: ../meld/resources/gtk/help-overlay.ui.h:31
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "Konflik sebelumnya"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:32
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr "Konflik selanjutnya"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:33
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr "Push perubahan ke kiri"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:34
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr "Push perubahan ke kanan"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:35
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr "Pull perubahan dari kiri"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:36
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr "Pull perubahan dari kanan"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:37
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "Salin perubahan di atas kiri"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:38
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "Salin perubahan di bawah kiri"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:39
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr "Salin perubahan di atas kanan"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:40
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr "Salin perubahan di bawah kanan"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:41
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "Hapus perubahan"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:42
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "Panel perbandingan sebelumnya"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:43
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "Panel perbandingan selanjutnya"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:44
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "Perbandingan folder"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:45
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "Salin ke kiri"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:46
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr "Salin ke kanan"
 
-#: ../data/ui/EditableList.ui.h:1
-msgid "Editable List"
-msgstr "Daftar Yang Dapat Disunting"
+#: ../meld/resources/gtk/help-overlay.ui.h:47
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr "Perbandingan kendali versi"
 
-#: ../data/ui/EditableList.ui.h:2
+#: ../meld/resources/gtk/help-overlay.ui.h:48
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr "Komit ke kendali versi"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:49
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr "Tampilkan/sembunyikan keluaran konsol"
+
+#: ../meld/resources/gtk/menus.ui.h:1
+msgid "_Preferences"
+msgstr "_Preferensi"
+
+#: ../meld/resources/gtk/menus.ui.h:2
+msgid "_Help"
+msgstr "_Bantuan"
+
+#: ../meld/resources/gtk/menus.ui.h:3
+msgid "Keyboard Shortcuts"
+msgstr "Tombol Pintas"
+
+#: ../meld/resources/gtk/menus.ui.h:4
+msgid "_About"
+msgstr "Tent_ang"
+
+#: ../meld/resources/gtk/menus.ui.h:5
+msgid "_Quit"
+msgstr "_Keluar"
+
+#: ../meld/resources/ui/about-dialog.ui.h:1
+msgid "About Meld"
+msgstr "Tentang Meld"
+
+#: ../meld/resources/ui/about-dialog.ui.h:2
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2017 Kai Willadsen"
+msgstr ""
+"Hak Cipta © 2002-2009 Stephen Kennedy\n"
+"Hak Cipta © 2009-2017 Kai Willadsen"
+
+#: ../meld/resources/ui/about-dialog.ui.h:4
+msgid "Website"
+msgstr "Situs web"
+
+#: ../meld/resources/ui/about-dialog.ui.h:5
+msgid "translator-credits"
+msgstr ""
+"Andika Triwidada <andika gmail com>, 2013, 2014, 2016, 2018.\n"
+"Kukuh Syafaat <kukuhsyafaat gnome org>, 2017, 2018, 2019."
+
+#: ../meld/resources/ui/column-list.ui.h:1
+#: ../meld/resources/ui/filter-list.ui.h:1
 msgid "Active"
 msgstr "Aktif"
 
-#: ../data/ui/EditableList.ui.h:3
+#: ../meld/resources/ui/column-list.ui.h:2
 msgid "Column Name"
 msgstr "Nama Kolom"
 
-#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9
-msgid "_Add"
-msgstr "T_ambah"
-
-#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:680
+#: ../meld/resources/ui/column-list.ui.h:3
+#: ../meld/resources/ui/filter-list.ui.h:7 ../meld/resources/ui/vcview.ui.h:11
+#: ../meld/vcview.py:694
 msgid "_Remove"
 msgstr "_Hapus"
 
-#: ../data/ui/EditableList.ui.h:6
+#: ../meld/resources/ui/column-list.ui.h:4
+#: ../meld/resources/ui/filter-list.ui.h:8
 msgid "Move item up"
 msgstr "Pindahkan item ke atas"
 
-#: ../data/ui/EditableList.ui.h:7
+#: ../meld/resources/ui/column-list.ui.h:5
+#: ../meld/resources/ui/filter-list.ui.h:9
 msgid "Move _Up"
 msgstr "_Naikkan"
 
-#: ../data/ui/EditableList.ui.h:8
+#: ../meld/resources/ui/column-list.ui.h:6
+#: ../meld/resources/ui/filter-list.ui.h:10
 msgid "Move item down"
 msgstr "Pindahkan item ke bawah"
 
-#: ../data/ui/EditableList.ui.h:9
+#: ../meld/resources/ui/column-list.ui.h:7
+#: ../meld/resources/ui/filter-list.ui.h:11
 msgid "Move _Down"
 msgstr "_Turunkan"
 
-#. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:416
-msgid "Name"
-msgstr "Nama"
+#: ../meld/resources/ui/commit-dialog.ui.h:1
+msgid "Commit"
+msgstr "Komit"
 
-#: ../data/ui/EditableList.ui.h:11
-msgid "Pattern"
-msgstr "Pola"
+#: ../meld/resources/ui/commit-dialog.ui.h:2
+msgid "Commit Files"
+msgstr "Komit Berkas"
 
-#: ../data/ui/EditableList.ui.h:12
-msgid "Add new filter"
-msgstr "Tambah penyaring baru"
+#: ../meld/resources/ui/commit-dialog.ui.h:3
+msgid "Log Message"
+msgstr "Pesan Log"
 
-#: ../data/ui/EditableList.ui.h:13
-msgid "Remove selected filter"
-msgstr "Hapus penyaring yang dipilih"
+#: ../meld/resources/ui/commit-dialog.ui.h:4
+msgid "Previous logs:"
+msgstr "Log sebelumnya:"
+
+#: ../meld/resources/ui/commit-dialog.ui.h:5
+msgid "Co_mmit"
+msgstr "Ko_mit"
+
+#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1
+msgid "_Compare"
+msgstr "_Bandingkan"
 
-#: ../data/ui/encoding-selector.ui.h:1
+#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2
+msgid "Compare selected files"
+msgstr "Bandingkan berkas-berkas yang dipilih"
+
+#: ../meld/resources/ui/dirdiff.ui.h:3
+msgid "Collapse Recursively"
+msgstr "Ciutkan Secara Rekursif"
+
+#: ../meld/resources/ui/dirdiff.ui.h:4
+msgid "Collapse selected folder and all subfolders"
+msgstr "Ciutkan folder yang dipilih dan semua subfolder"
+
+#: ../meld/resources/ui/dirdiff.ui.h:5
+msgid "Expand Recursively"
+msgstr "Perluas Secara Rekursif"
+
+#: ../meld/resources/ui/dirdiff.ui.h:6
+msgid "Expand selected folder and all subfolders"
+msgstr "Perluas folder yang dipilih dan semua subfolder"
+
+#: ../meld/resources/ui/dirdiff.ui.h:7
+msgid "Copy to _Left"
+msgstr "Salin ke K_iri"
+
+#: ../meld/resources/ui/dirdiff.ui.h:8
+msgid "Copy to left"
+msgstr "Salin ke kiri"
+
+#: ../meld/resources/ui/dirdiff.ui.h:9
+msgid "Copy to _Right"
+msgstr "Salin ke K_anan"
+
+#: ../meld/resources/ui/dirdiff.ui.h:10
+msgid "Copy to right"
+msgstr "Salin ke kanan"
+
+#: ../meld/resources/ui/dirdiff.ui.h:11
+msgid "Delete selected"
+msgstr "Hapus yang dipilih"
+
+#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:959
+#: ../meld/filediff.py:1601
+msgid "Hide"
+msgstr "Sembunyikan"
+
+#: ../meld/resources/ui/dirdiff.ui.h:13
+msgid "Hide selected"
+msgstr "Sembunyikan yang dipilih"
+
+#: ../meld/resources/ui/dirdiff.ui.h:14
+msgid "Ignore Filename Case"
+msgstr "Abaikan Besar Kecil Huruf Nama Berkas"
+
+#: ../meld/resources/ui/dirdiff.ui.h:15
+msgid ""
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr ""
+"Menganggap sama nama berkas yang berbeda huruf besar kecilnya yang bila "
+"tidak menjadi identik"
+
+#: ../meld/resources/ui/dirdiff.ui.h:16
+msgid "Same"
+msgstr "Sama"
+
+#: ../meld/resources/ui/dirdiff.ui.h:17
+msgid "Show identical"
+msgstr "Tampilkan yang identik"
+
+#: ../meld/resources/ui/dirdiff.ui.h:18
+msgid "New"
+msgstr "Baru"
+
+#: ../meld/resources/ui/dirdiff.ui.h:19
+msgid "Show new"
+msgstr "Tampilkan yang baru"
+
+#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77
+msgid "Modified"
+msgstr "Diubah"
+
+#: ../meld/resources/ui/dirdiff.ui.h:21
+msgid "Show modified"
+msgstr "Tampilkan yang berubah"
+
+#: ../meld/resources/ui/dirdiff.ui.h:22
+msgid "Filters"
+msgstr "Penyaring"
+
+#: ../meld/resources/ui/dirdiff.ui.h:23
+msgid "Set active filters"
+msgstr "Tata penyaring aktif"
+
+#: ../meld/resources/ui/encoding-selector.ui.h:1
 msgid "Search text encoding…"
 msgstr "Pengkodean teks pencarian…"
 
-#: ../data/ui/filediff.ui.h:1
+#: ../meld/resources/ui/filediff.ui.h:1
 msgid "Format as Patch…"
 msgstr "Format sebagai Patch…"
 
-#: ../data/ui/filediff.ui.h:2
+#: ../meld/resources/ui/filediff.ui.h:2
 msgid "Create a patch using differences between files"
 msgstr "Buat patch memakai perbedaan antar berkas"
 
-#: ../data/ui/filediff.ui.h:3
+#: ../meld/resources/ui/filediff.ui.h:3
 msgid "Save A_ll"
 msgstr "Simpan Semu_a"
 
-#: ../data/ui/filediff.ui.h:4
+#: ../meld/resources/ui/filediff.ui.h:4
 msgid "Save all files in the current comparison"
 msgstr "Simpan semua berkas dalam perbandingan saat ini"
 
-#: ../data/ui/filediff.ui.h:5
+#: ../meld/resources/ui/filediff.ui.h:5
 msgid "Revert files to their saved versions"
 msgstr "Kembalikan berkas ke versi tersimpan"
 
-#: ../data/ui/filediff.ui.h:6
+#: ../meld/resources/ui/filediff.ui.h:6
 msgid "Add Synchronization Point"
 msgstr "Tambahkan Titik Sinkronisasi"
 
-#: ../data/ui/filediff.ui.h:7
+#: ../meld/resources/ui/filediff.ui.h:7
 msgid "Add a synchronization point for changes between files"
 msgstr "Tambahkan satu titik sinkronisasi untuk perubahan antar berkas"
 
-#: ../data/ui/filediff.ui.h:8
+#: ../meld/resources/ui/filediff.ui.h:8
 msgid "Clear Synchronization Points"
 msgstr "Bersihkan Titik Sinkronisasi"
 
-#: ../data/ui/filediff.ui.h:9
+#: ../meld/resources/ui/filediff.ui.h:9
 msgid "Clear sychronization points for changes between files"
 msgstr "Bersihkan titik sinkronisasi untuk perubahan antar berkas"
 
-#: ../data/ui/filediff.ui.h:10
+#: ../meld/resources/ui/filediff.ui.h:10
 msgid "Previous Conflict"
 msgstr "Konflik Sebelumnya"
 
-#: ../data/ui/filediff.ui.h:11
+#: ../meld/resources/ui/filediff.ui.h:11
 msgid "Go to the previous conflict"
 msgstr "Pindah ke konflik sebelumnya"
 
-#: ../data/ui/filediff.ui.h:12
+#: ../meld/resources/ui/filediff.ui.h:12
 msgid "Next Conflict"
 msgstr "Konflik Selanjutnya"
 
-#: ../data/ui/filediff.ui.h:13
+#: ../meld/resources/ui/filediff.ui.h:13
 msgid "Go to the next conflict"
 msgstr "Pindah ke konflik selanjutnya"
 
-#: ../data/ui/filediff.ui.h:14
+#: ../meld/resources/ui/filediff.ui.h:14
 msgid "Push to Left"
 msgstr "Push ke Kiri"
 
-#: ../data/ui/filediff.ui.h:15
+#: ../meld/resources/ui/filediff.ui.h:15
 msgid "Push current change to the left"
 msgstr "Push perubahan saat ini ke kiri"
 
-#: ../data/ui/filediff.ui.h:16
+#: ../meld/resources/ui/filediff.ui.h:16
 msgid "Push to Right"
 msgstr "Push ke Kanan"
 
-#: ../data/ui/filediff.ui.h:17
+#: ../meld/resources/ui/filediff.ui.h:17
 msgid "Push current change to the right"
 msgstr "Push perubahan saat ini ke kanan"
 
-#: ../data/ui/filediff.ui.h:18
+#: ../meld/resources/ui/filediff.ui.h:18
 msgid "Pull from Left"
 msgstr "Pull dari Kiri"
 
-#: ../data/ui/filediff.ui.h:19
+#: ../meld/resources/ui/filediff.ui.h:19
 msgid "Pull change from the left"
 msgstr "Pull perubahan dari kiri"
 
-#: ../data/ui/filediff.ui.h:20
+#: ../meld/resources/ui/filediff.ui.h:20
 msgid "Pull from Right"
 msgstr "Pull dari Kanan"
 
-#: ../data/ui/filediff.ui.h:21
+#: ../meld/resources/ui/filediff.ui.h:21
 msgid "Pull change from the right"
 msgstr "Pull perubahan dari kanan"
 
-#: ../data/ui/filediff.ui.h:22
+#: ../meld/resources/ui/filediff.ui.h:22
 msgid "Copy Above Left"
 msgstr "Salin Di Atas Kiri"
 
-#: ../data/ui/filediff.ui.h:23
+#: ../meld/resources/ui/filediff.ui.h:23
 msgid "Copy change above the left chunk"
 msgstr "Salin perubahan di atas chunk kiri"
 
-#: ../data/ui/filediff.ui.h:24
+#: ../meld/resources/ui/filediff.ui.h:24
 msgid "Copy Below Left"
 msgstr "Salin Di Bawah Kiri"
 
-#: ../data/ui/filediff.ui.h:25
+#: ../meld/resources/ui/filediff.ui.h:25
 msgid "Copy change below the left chunk"
 msgstr "Salin perubahan di bawah chunk kiri"
 
-#: ../data/ui/filediff.ui.h:26
+#: ../meld/resources/ui/filediff.ui.h:26
 msgid "Copy Above Right"
 msgstr "Salin Di Atas Kanan"
 
-#: ../data/ui/filediff.ui.h:27
+#: ../meld/resources/ui/filediff.ui.h:27
 msgid "Copy change above the right chunk"
 msgstr "Salin perubahan di atas chunk kanan"
 
-#: ../data/ui/filediff.ui.h:28
+#: ../meld/resources/ui/filediff.ui.h:28
 msgid "Copy Below Right"
 msgstr "Salin Di Bawah Kanan"
 
-#: ../data/ui/filediff.ui.h:29
+#: ../meld/resources/ui/filediff.ui.h:29
 msgid "Copy change below the right chunk"
 msgstr "Salin perubahan di bawah chunk kanan"
 
-#: ../data/ui/filediff.ui.h:30
+#: ../meld/resources/ui/filediff.ui.h:30
 msgid "Delete"
 msgstr "Hapus"
 
-#: ../data/ui/filediff.ui.h:31
+#: ../meld/resources/ui/filediff.ui.h:31
 msgid "Delete change"
 msgstr "Hapus perubahan"
 
-#: ../data/ui/filediff.ui.h:32
+#: ../meld/resources/ui/filediff.ui.h:32
 msgid "Merge All from Left"
 msgstr "Merge Semua dari Kiri"
 
-#: ../data/ui/filediff.ui.h:33
+#: ../meld/resources/ui/filediff.ui.h:33
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Merge semua perubahan yang tak konflik dari kiri"
 
-#: ../data/ui/filediff.ui.h:34
+#: ../meld/resources/ui/filediff.ui.h:34
 msgid "Merge All from Right"
 msgstr "Merge Semua dari Kanan"
 
-#: ../data/ui/filediff.ui.h:35
+#: ../meld/resources/ui/filediff.ui.h:35
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Merge semua perubahan yang tak konflik dari kanan"
 
-#: ../data/ui/filediff.ui.h:36
+#: ../meld/resources/ui/filediff.ui.h:36
 msgid "Merge All"
 msgstr "Merge Semua"
 
-#: ../data/ui/filediff.ui.h:37
+#: ../meld/resources/ui/filediff.ui.h:37
 msgid "Merge all non-conflicting changes from left and right panes"
 msgstr "Merge semua perubahan yang tak konflik dari panel kiri dan kanan"
 
-#: ../data/ui/filediff.ui.h:38
+#: ../meld/resources/ui/filediff.ui.h:38
 msgid "Previous Pane"
 msgstr "Panel Sebelumnya"
 
-#: ../data/ui/filediff.ui.h:39
+#: ../meld/resources/ui/filediff.ui.h:39
 msgid "Move keyboard focus to the previous document in this comparison"
 msgstr "Pindahkan fokus papan tik ke dokumen sebelumnya dalam perbandingan ini"
 
-#: ../data/ui/filediff.ui.h:40
+#: ../meld/resources/ui/filediff.ui.h:40
 msgid "Next Pane"
 msgstr "Panel Selanjutnya"
 
-#: ../data/ui/filediff.ui.h:41
+#: ../meld/resources/ui/filediff.ui.h:41
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr ""
 "Pindahkan fokus papan tik ke dokumen selanjutnya dalam perbandingan ini"
 
-#: ../data/ui/filediff.ui.h:42
+#: ../meld/resources/ui/filediff.ui.h:42
 msgid "Lock Scrolling"
 msgstr "Kunci Pengguliran"
 
-#: ../data/ui/filediff.ui.h:43
+#: ../meld/resources/ui/filediff.ui.h:43
 msgid "Lock scrolling of all panes"
 msgstr "Kunci pengguliran semua panel"
 
-#: ../data/ui/filediff.ui.h:44
-msgid "Save changes to documents before closing?"
-msgstr "Simpan perubahan ke dokumen sebelum menutup?"
-
-#: ../data/ui/filediff.ui.h:45
-msgid "If you don’t save, changes will be permanently lost."
-msgstr "Bila Anda tak menyimpan, perubahan akan hilang selamanya."
-
-#: ../data/ui/filediff.ui.h:46
-msgid "Close _without Saving"
-msgstr "Tutup _Tanpa Menyimpan"
-
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:1001 ../meld/iohelpers.py:50
-#: ../meld/iohelpers.py:100
-msgid "_Cancel"
-msgstr "_Batal"
-
-#: ../data/ui/filediff.ui.h:48
-msgid "_Save"
-msgstr "_Simpan"
-
-#: ../data/ui/filediff.ui.h:49
+#: ../meld/resources/ui/filediff.ui.h:44
 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."
@@ -905,763 +1119,556 @@ msgstr ""
 "kunci berkas dan membuat perubahan, tapi perubahan tersebut mesti disimpan "
 "ke suatu berkas baru."
 
-#: ../data/ui/filediff.ui.h:50
+#: ../meld/resources/ui/filediff.ui.h:45
 msgid "File 3"
 msgstr "Berkas 3"
 
-#: ../data/ui/filediff.ui.h:51
+#: ../meld/resources/ui/filediff.ui.h:46
 msgid "File 2"
 msgstr "Berkas 2"
 
-#: ../data/ui/filediff.ui.h:52
+#: ../meld/resources/ui/filediff.ui.h:47
 msgid "File 1"
 msgstr "Berkas 1"
 
-#: ../data/ui/filediff.ui.h:53
-msgid "Discard unsaved changes to documents?"
-msgstr "Buang perubahan yang belum tersimpan ke dokumen?"
+#. Create icon and filename CellRenderer
+#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30
+#: ../meld/dirdiff.py:455
+msgid "Name"
+msgstr "Nama"
 
-#: ../data/ui/filediff.ui.h:54
-msgid "Changes made to the following documents will be permanently lost:"
-msgstr ""
-"Perubahan yang dibuat ke dokumen-dokumen berikut akan hilang selamanya:"
+#: ../meld/resources/ui/filter-list.ui.h:3
+msgid "Pattern"
+msgstr "Pola"
 
-#: ../data/ui/filediff.ui.h:55
-msgid "_Discard"
-msgstr "_Buang"
+#: ../meld/resources/ui/filter-list.ui.h:4
+msgid "Add new filter"
+msgstr "Tambah penyaring baru"
+
+#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9
+msgid "_Add"
+msgstr "T_ambah"
+
+#: ../meld/resources/ui/filter-list.ui.h:6
+msgid "Remove selected filter"
+msgstr "Hapus penyaring yang dipilih"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:1002 ../meld/iohelpers.py:101
+#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041
+#: ../meld/iohelpers.py:113
 msgid "_Replace"
 msgstr "_Timpa"
 
-#: ../data/ui/findbar.ui.h:2
+#: ../meld/resources/ui/findbar.ui.h:2
 msgid "Replace _All"
 msgstr "Timp_a Semua"
 
-#: ../data/ui/findbar.ui.h:3
+#: ../meld/resources/ui/findbar.ui.h:3
 msgid "_Previous"
 msgstr "Se_belumnya"
 
-#: ../data/ui/findbar.ui.h:4
+#: ../meld/resources/ui/findbar.ui.h:4
 msgid "_Next"
 msgstr "Se_lanjutnya"
 
-#: ../data/ui/findbar.ui.h:5
+#: ../meld/resources/ui/findbar.ui.h:5
 msgid "Find:"
 msgstr "Cari:"
 
-#: ../data/ui/findbar.ui.h:6
+#: ../meld/resources/ui/findbar.ui.h:6
 msgid "Replace _with:"
 msgstr "Gantikan _dengan:"
 
-#: ../data/ui/findbar.ui.h:7
+#: ../meld/resources/ui/findbar.ui.h:7
 msgid "_Match case"
 msgstr "_Cocok huruf besar kecil"
 
-#: ../data/ui/findbar.ui.h:8
+#: ../meld/resources/ui/findbar.ui.h:8
 msgid "Who_le word"
 msgstr "Se_luruh kata"
 
-#: ../data/ui/findbar.ui.h:9
+#: ../meld/resources/ui/findbar.ui.h:9
 msgid "Regular e_xpression"
 msgstr "E_kspresi reguler"
 
-#: ../data/ui/findbar.ui.h:10
+#: ../meld/resources/ui/findbar.ui.h:10
 msgid "Wrapped"
 msgstr "Dilipat"
 
-#: ../data/ui/language-selector.ui.h:1
+#: ../meld/resources/ui/language-selector.ui.h:1
 msgid "Search highlight mode…"
 msgstr "Mode sorot pencarian…"
 
-#: ../data/ui/patch-dialog.ui.h:1
+#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532
+#: ../meld/newdifftab.py:53
+msgid "New comparison"
+msgstr "Perbandingan baru"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:2
+msgid "File comparison"
+msgstr "Perbandingan berkas"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:3
+msgid "Directory comparison"
+msgstr "Perbandingan direktori"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:4
+msgid "Version control view"
+msgstr "Tilikan kendali versi"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:5
+msgid "_3-way comparison"
+msgstr "Perbandingan _3 pihak"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:6
+msgid "Select Third File"
+msgstr "Pilih Berkas Ke Tiga"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:7
+msgid "Select Second File"
+msgstr "Pilih Berkas Ke Dua"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:8
+msgid "Select First File"
+msgstr "Pilih Berkas Pertama"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:9
+msgid "Select First Folder"
+msgstr "Pilih Folder Pertama"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:10
+msgid "Select Second Folder"
+msgstr "Pilih Folder Ke Dua"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:11
+msgid "Select Third Folder"
+msgstr "Pilih Folder Ke Tiga"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:12
+msgid "Select A Version-Controlled Folder"
+msgstr "Pilih Suatu Folder Versi-Terkendali"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:13
+msgid "_Blank comparison"
+msgstr "Per_bandingan kosong"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:14
+msgid "C_ompare"
+msgstr "B_andingkan"
+
+#: ../meld/resources/ui/notebook-label.ui.h:1
+msgid "Close Tab"
+msgstr "Tutup Tab"
+
+#: ../meld/resources/ui/patch-dialog.ui.h:1
 msgid "Format as Patch"
 msgstr "Format sebagai Patch"
 
-#: ../data/ui/patch-dialog.ui.h:2
+#: ../meld/resources/ui/patch-dialog.ui.h:2
 msgid "Copy to Clipboard"
 msgstr "Salin ke Papan Klip"
 
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152
+#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165
 msgid "Save Patch"
 msgstr "Simpan Patch"
 
-#: ../data/ui/patch-dialog.ui.h:4
+#: ../meld/resources/ui/patch-dialog.ui.h:4
 msgid "Use differences between:"
 msgstr "Pakai perbedaan antara:"
 
-#: ../data/ui/patch-dialog.ui.h:5
+#: ../meld/resources/ui/patch-dialog.ui.h:5
 msgid "Left and middle panes"
 msgstr "Panel kiri dan tengah"
 
-#: ../data/ui/patch-dialog.ui.h:6
+#: ../meld/resources/ui/patch-dialog.ui.h:6
 msgid "Middle and right panes"
 msgstr "Panel tengah dan kanan"
 
-#: ../data/ui/patch-dialog.ui.h:7
+#: ../meld/resources/ui/patch-dialog.ui.h:7
 msgid "_Reverse patch direction"
 msgstr "Balikkan a_rah patch"
 
-#: ../data/ui/preferences.ui.h:1
-msgid "Meld Preferences"
-msgstr "Preferensi Meld"
+#: ../meld/resources/ui/preferences.ui.h:1
+msgid "Preferences"
+msgstr "Preferensi"
 
-#: ../data/ui/preferences.ui.h:2
+#: ../meld/resources/ui/preferences.ui.h:2
 msgid "Font"
 msgstr "Fonta"
 
-#: ../data/ui/preferences.ui.h:3
+#: ../meld/resources/ui/preferences.ui.h:3
 msgid "_Use the system fixed width font"
 msgstr "G_unakan fonta lebar tetap sistem"
 
-#: ../data/ui/preferences.ui.h:4
+#: ../meld/resources/ui/preferences.ui.h:4
 msgid "_Editor font:"
 msgstr "Fonta p_enyunting:"
 
-#: ../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.h:5 ../meld/ui/statusbar.py:282
 msgid "Display"
 msgstr "Tampilan"
 
-#: ../data/ui/preferences.ui.h:6
+#: ../meld/resources/ui/preferences.ui.h:6
 msgid "_Tab width:"
 msgstr "Lebar _tab:"
 
-#: ../data/ui/preferences.ui.h:7
+#: ../meld/resources/ui/preferences.ui.h:7
 msgid "_Insert spaces instead of tabs"
 msgstr "S_isipkan spasi-spasi sebagai penggati tab"
 
-#: ../data/ui/preferences.ui.h:8
+#: ../meld/resources/ui/preferences.ui.h:8
 msgid "Enable text _wrapping"
 msgstr "Fungsikan pe_lipatan text"
 
-#: ../data/ui/preferences.ui.h:9
+#: ../meld/resources/ui/preferences.ui.h:9
 msgid "Do not _split words over two lines"
 msgstr "Jangan penggal kata ke dua bari_s"
 
-#: ../data/ui/preferences.ui.h:10
+#: ../meld/resources/ui/preferences.ui.h:10
 msgid "Highlight _current line"
 msgstr "Sorot baris _saat ini"
 
-#: ../data/ui/preferences.ui.h:11
+#: ../meld/resources/ui/preferences.ui.h:11
 msgid "Show _line numbers"
 msgstr "Tampi_lkan nomor baris"
 
-#: ../data/ui/preferences.ui.h:12
+#: ../meld/resources/ui/preferences.ui.h:12
 msgid "Show w_hitespace"
 msgstr "Tampilkan w_hitespace"
 
-#: ../data/ui/preferences.ui.h:13
+#: ../meld/resources/ui/preferences.ui.h:13
 msgid "Use s_yntax highlighting"
 msgstr "Gunakan penyorotan s_intaks"
 
-#: ../data/ui/preferences.ui.h:14
+#: ../meld/resources/ui/preferences.ui.h:14
 msgid "Syntax highlighting color scheme:"
 msgstr "Skema warna penyorotan sintaks:"
 
-#: ../data/ui/preferences.ui.h:15
+#: ../meld/resources/ui/preferences.ui.h:15
 msgid "External Editor"
 msgstr "Penyunting Eksternal"
 
-#: ../data/ui/preferences.ui.h:16
+#: ../meld/resources/ui/preferences.ui.h:16
 msgid "Use _default system editor"
 msgstr "_Gunakan penyunting bawaan sistem"
 
-#: ../data/ui/preferences.ui.h:17
+#: ../meld/resources/ui/preferences.ui.h:17
 msgid "Edito_r command:"
 msgstr "Pe_rintah penyunting:"
 
-#: ../data/ui/preferences.ui.h:18
+#: ../meld/resources/ui/preferences.ui.h:18
 msgid "Editor"
 msgstr "Penyunting"
 
-#: ../data/ui/preferences.ui.h:19
+#: ../meld/resources/ui/preferences.ui.h:19
 msgid "Shallow Comparison"
 msgstr "Perbandingan Dangkal"
 
-#: ../data/ui/preferences.ui.h:20
+#: ../meld/resources/ui/preferences.ui.h:20
 msgid "C_ompare files based only on size and timestamp"
 msgstr "B_andingkan berkas hanya berdasarkan ukuran dan penanda waktu"
 
-#: ../data/ui/preferences.ui.h:21
+#: ../meld/resources/ui/preferences.ui.h:21
 msgid "_Timestamp resolution:"
 msgstr "Resolusi penanda wak_tu:"
 
-#: ../data/ui/preferences.ui.h:23
+#: ../meld/resources/ui/preferences.ui.h:23
 msgid "Note: enabling text filters may make comparing large files much slower"
 msgstr ""
 "Catatan: memfungsikan penyaring teks bisa membuat membandingkan berkas-"
 "berkas besar jauh lebih lambat"
 
-#: ../data/ui/preferences.ui.h:24
+#: ../meld/resources/ui/preferences.ui.h:24
 msgid "Symbolic Links"
 msgstr "Taut Simbolik"
 
-#: ../data/ui/preferences.ui.h:26
+#: ../meld/resources/ui/preferences.ui.h:26
 msgid "Visible Columns"
 msgstr "Kolom Yang Nampak"
 
-#: ../data/ui/preferences.ui.h:27
+#: ../meld/resources/ui/preferences.ui.h:27
 msgid "Folder Comparisons"
 msgstr "Perbandingan Folder"
 
-#: ../data/ui/preferences.ui.h:28
+#: ../meld/resources/ui/preferences.ui.h:28
 msgid "Version Comparisons"
 msgstr "Perbandingan Versi"
 
-#: ../data/ui/preferences.ui.h:29
+#: ../meld/resources/ui/preferences.ui.h:29
 msgid "_Order when comparing file revisions:"
 msgstr "_Urutan ketika membandingkan revisi berkas:"
 
-#: ../data/ui/preferences.ui.h:30
+#: ../meld/resources/ui/preferences.ui.h:30
 msgid "Order when _merging files:"
 msgstr "Urutan ketika _merge berkas:"
 
-#: ../data/ui/preferences.ui.h:31
-msgid "Commit Messages"
-msgstr "Pesan Komit"
-
-#: ../data/ui/preferences.ui.h:32
-msgid "Show _right margin at:"
-msgstr "Tampilkan ma_rjin kanan pada:"
-
-#: ../data/ui/preferences.ui.h:33
-msgid "Automatically _break lines at right margin on commit"
-msgstr "Otomatis lipat _baris pada marjin kanan saat komit"
-
-#: ../data/ui/preferences.ui.h:34
-msgid "Version Control"
-msgstr "Kendali Versi"
-
-#: ../data/ui/preferences.ui.h:35
-msgid "Filename filters"
-msgstr "Penyaring nama berkas"
-
-#: ../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 ""
-"Ketika melakukan perbandingan direktori, Anda mungkin menyaring berkas dan "
-"direktori menurut namanya. Setiap pola adalah daftar dari wildcard gaya "
-"shell yang dipisahkan oleh spasi."
-
-#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105
-msgid "File Filters"
-msgstr "Penyaring Berkas"
-
-#: ../data/ui/preferences.ui.h:38
-msgid "Change trimming"
-msgstr "Ubah pemangkasan"
-
-#: ../data/ui/preferences.ui.h:39
-msgid "Trim blank line differences from the start and end of changes"
-msgstr "Pangkas perbedaan baris kosong dari awal dan akhir perubahan"
-
-#: ../data/ui/preferences.ui.h:40
-msgid "Text filters"
-msgstr "Penyaring teks"
-
-#: ../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 ""
-"Ketika melakukan perbandingan berkas, Anda mungkin mengabaikan beberapa "
-"jenis perubahan. Setiap pola di sini adalah ekspresi reguler python yang "
-"menggantikan teks yang cocok dengan string kosong sebelum perbandingan "
-"dilakukan. Bila ekspresi memuat grup, hanya grup tersebut yang diganti. "
-"Lihat manual pengguna untuk rincian lebih lanjut."
-
-#: ../data/ui/preferences.ui.h:42
-msgid "Text Filters"
-msgstr "Penyaring Teks"
-
-#: ../data/ui/preferences.ui.h:43
-msgid "Left is remote, right is local"
-msgstr "Kiri remote, kanan lokal"
-
-#: ../data/ui/preferences.ui.h:44
-msgid "Left is local, right is remote"
-msgstr "Kiri lokal, kanan remote"
-
-#: ../data/ui/preferences.ui.h:45
-msgid "Remote, merge, local"
-msgstr "Remote, merge, lokal"
-
-#: ../data/ui/preferences.ui.h:46
-msgid "Local, merge, remote"
-msgstr "Lokal, merge, remote"
-
-#: ../data/ui/preferences.ui.h:47
-msgid "1ns (ext4)"
-msgstr "1ns (ext4)"
-
-#: ../data/ui/preferences.ui.h:48
-msgid "100ns (NTFS)"
-msgstr "100ns (NTFS)"
-
-#: ../data/ui/preferences.ui.h:49
-msgid "1s (ext2/ext3)"
-msgstr "1s (ext2/ext3)"
-
-#: ../data/ui/preferences.ui.h:50
-msgid "2s (VFAT)"
-msgstr "2s (VFAT)"
-
-#: ../data/ui/shortcuts.ui.h:1
-msgctxt "shortcut window"
-msgid "General"
-msgstr "Umum"
-
-#: ../data/ui/shortcuts.ui.h:2
-msgctxt "shortcut window"
-msgid "New comparison"
-msgstr "Perbandingan baru"
-
-#: ../data/ui/shortcuts.ui.h:3
-msgctxt "shortcut window"
-msgid "Close a comparison"
-msgstr "Tutup suatu perbandingan"
-
-#: ../data/ui/shortcuts.ui.h:4
-msgctxt "shortcut window"
-msgid "Quit Meld"
-msgstr "Keluar Meld"
-
-#: ../data/ui/shortcuts.ui.h:5
-msgctxt "shortcut window"
-msgid "Stop the current action"
-msgstr "Hentikan aksi saat ini"
-
-#: ../data/ui/shortcuts.ui.h:6
-msgctxt "shortcut window"
-msgid "Refresh comparison"
-msgstr "Segarkan perbandingan"
-
-#: ../data/ui/shortcuts.ui.h:7
-msgctxt "shortcut window"
-msgid "Fullscreen"
-msgstr "Layar Penuh"
-
-#: ../data/ui/shortcuts.ui.h:8
-msgctxt "shortcut window"
-msgid "Tabs"
-msgstr "Tab"
-
-#: ../data/ui/shortcuts.ui.h:9
-msgctxt "shortcut window"
-msgid "Go to previous tab"
-msgstr "Ke tab sebelumnya"
-
-#: ../data/ui/shortcuts.ui.h:10
-msgctxt "shortcut window"
-msgid "Go to next tab"
-msgstr "Ke tab selanjutnya"
-
-#: ../data/ui/shortcuts.ui.h:11
-msgctxt "shortcut window"
-msgid "Switch to tab"
-msgstr "Tukar ke tab"
-
-#: ../data/ui/shortcuts.ui.h:12
-msgctxt "shortcut window"
-msgid "Move tab left"
-msgstr "Pindahkan tab ke kiri"
-
-#: ../data/ui/shortcuts.ui.h:13
-msgctxt "shortcut window"
-msgid "Move tab right"
-msgstr "Pindahkan tab ke kanan"
-
-#: ../data/ui/shortcuts.ui.h:14
-msgctxt "shortcut window"
-msgid "Changes"
-msgstr "Perubahan"
-
-#: ../data/ui/shortcuts.ui.h:15
-msgctxt "shortcut window"
-msgid "Go to previous change"
-msgstr "Ke perubahan sebelumnya"
-
-#: ../data/ui/shortcuts.ui.h:16
-msgctxt "shortcut window"
-msgid "Go to next change"
-msgstr "Ke perubahan selanjutnya"
-
-#: ../data/ui/shortcuts.ui.h:17
-msgctxt "shortcut window"
-msgid "Editing"
-msgstr "Menyunting"
-
-#: ../data/ui/shortcuts.ui.h:18
-msgctxt "shortcut window"
-msgid "Undo"
-msgstr "Tak jadi"
-
-#: ../data/ui/shortcuts.ui.h:19
-msgctxt "shortcut window"
-msgid "Redo"
-msgstr "Jadi lagi"
-
-#: ../data/ui/shortcuts.ui.h:20
-msgctxt "shortcut window"
-msgid "Cut"
-msgstr "Potong"
-
-#: ../data/ui/shortcuts.ui.h:21
-msgctxt "shortcut window"
-msgid "Copy"
-msgstr "Salin"
-
-#: ../data/ui/shortcuts.ui.h:22
-msgctxt "shortcut window"
-msgid "Paste"
-msgstr "Tempel"
-
-#: ../data/ui/shortcuts.ui.h:23
-msgctxt "shortcut window"
-msgid "Find"
-msgstr "Cari"
-
-#: ../data/ui/shortcuts.ui.h:24
-msgctxt "shortcut window"
-msgid "Find Next"
-msgstr "Cari Selanjutnya"
-
-#: ../data/ui/shortcuts.ui.h:25
-msgctxt "shortcut window"
-msgid "Find Previous"
-msgstr "Cari Sebelumnya"
-
-#: ../data/ui/shortcuts.ui.h:26
-msgctxt "shortcut window"
-msgid "Replace"
-msgstr "Ganti"
-
-#: ../data/ui/shortcuts.ui.h:27
-msgctxt "shortcut window"
-msgid "File comparison"
-msgstr "Perbandingan berkas"
-
-#: ../data/ui/shortcuts.ui.h:28
-msgctxt "shortcut window"
-msgid "Save current file"
-msgstr "Simpan berkas kini"
-
-#: ../data/ui/shortcuts.ui.h:29
-msgctxt "shortcut window"
-msgid "Save current file to new path"
-msgstr "Simpan berkas saat ini ke path baru"
-
-#: ../data/ui/shortcuts.ui.h:30
-msgctxt "shortcut window"
-msgid "Save all files in comparison"
-msgstr "Simpan semua berkas dalam perbandingan"
-
-#: ../data/ui/shortcuts.ui.h:31
-msgctxt "shortcut window"
-msgid "Previous conflict"
-msgstr "Konflik sebelumnya"
+#: ../meld/resources/ui/preferences.ui.h:31
+msgid "Commit Messages"
+msgstr "Pesan Komit"
 
-#: ../data/ui/shortcuts.ui.h:32
-msgctxt "shortcut window"
-msgid "Next conflict"
-msgstr "Konflik selanjutnya"
+#: ../meld/resources/ui/preferences.ui.h:32
+msgid "Show _right margin at:"
+msgstr "Tampilkan ma_rjin kanan pada:"
 
-#: ../data/ui/shortcuts.ui.h:33
-msgctxt "shortcut window"
-msgid "Push change to left"
-msgstr "Push perubahan ke kiri"
+#: ../meld/resources/ui/preferences.ui.h:33
+msgid "Automatically _break lines at right margin on commit"
+msgstr "Otomatis lipat _baris pada marjin kanan saat komit"
 
-#: ../data/ui/shortcuts.ui.h:34
-msgctxt "shortcut window"
-msgid "Push change to right"
-msgstr "Push perubahan ke kanan"
+#: ../meld/resources/ui/preferences.ui.h:34
+msgid "Version Control"
+msgstr "Kendali Versi"
 
-#: ../data/ui/shortcuts.ui.h:35
-msgctxt "shortcut window"
-msgid "Pull change from left"
-msgstr "Pull perubahan dari kiri"
+#: ../meld/resources/ui/preferences.ui.h:35
+msgid "Filename filters"
+msgstr "Penyaring nama berkas"
 
-#: ../data/ui/shortcuts.ui.h:36
-msgctxt "shortcut window"
-msgid "Pull change from right"
-msgstr "Pull perubahan dari kanan"
+#: ../meld/resources/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 ""
+"Ketika melakukan perbandingan direktori, Anda mungkin menyaring berkas dan "
+"direktori menurut namanya. Setiap pola adalah daftar dari wildcard gaya "
+"shell yang dipisahkan oleh spasi."
 
-#: ../data/ui/shortcuts.ui.h:37
-msgctxt "shortcut window"
-msgid "Copy change above left"
-msgstr "Salin perubahan di atas kiri"
+#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114
+msgid "File Filters"
+msgstr "Penyaring Berkas"
 
-#: ../data/ui/shortcuts.ui.h:38
-msgctxt "shortcut window"
-msgid "Copy change below left"
-msgstr "Salin perubahan di bawah kiri"
+#: ../meld/resources/ui/preferences.ui.h:38
+msgid "Change trimming"
+msgstr "Ubah pemangkasan"
 
-#: ../data/ui/shortcuts.ui.h:39
-msgctxt "shortcut window"
-msgid "Copy change above right"
-msgstr "Salin perubahan di atas kanan"
+#: ../meld/resources/ui/preferences.ui.h:39
+msgid "Trim blank line differences from the start and end of changes"
+msgstr "Pangkas perbedaan baris kosong dari awal dan akhir perubahan"
 
-#: ../data/ui/shortcuts.ui.h:40
-msgctxt "shortcut window"
-msgid "Copy change below right"
-msgstr "Salin perubahan di bawah kanan"
+#: ../meld/resources/ui/preferences.ui.h:40
+msgid "Text filters"
+msgstr "Penyaring teks"
 
-#: ../data/ui/shortcuts.ui.h:41
-msgctxt "shortcut window"
-msgid "Delete change"
-msgstr "Hapus perubahan"
+#: ../meld/resources/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 ""
+"Ketika melakukan perbandingan berkas, Anda mungkin mengabaikan beberapa "
+"jenis perubahan. Setiap pola di sini adalah ekspresi reguler python yang "
+"menggantikan teks yang cocok dengan string kosong sebelum perbandingan "
+"dilakukan. Bila ekspresi memuat grup, hanya grup tersebut yang diganti. "
+"Lihat manual pengguna untuk rincian lebih lanjut."
 
-#: ../data/ui/shortcuts.ui.h:42
-msgctxt "shortcut window"
-msgid "Previous comparison pane"
-msgstr "Panel perbandingan sebelumnya"
+#: ../meld/resources/ui/preferences.ui.h:42
+msgid "Text Filters"
+msgstr "Penyaring Teks"
 
-#: ../data/ui/shortcuts.ui.h:43
-msgctxt "shortcut window"
-msgid "Next comparison pane"
-msgstr "Panel perbandingan selanjutnya"
+#: ../meld/resources/ui/preferences.ui.h:43
+msgid "Left is remote, right is local"
+msgstr "Kiri remote, kanan lokal"
 
-#: ../data/ui/shortcuts.ui.h:44
-msgctxt "shortcut window"
-msgid "Folder comparison"
-msgstr "Perbandingan folder"
+#: ../meld/resources/ui/preferences.ui.h:44
+msgid "Left is local, right is remote"
+msgstr "Kiri lokal, kanan remote"
 
-#: ../data/ui/shortcuts.ui.h:45
-msgctxt "shortcut window"
-msgid "Copy to left"
-msgstr "Salin ke kiri"
+#: ../meld/resources/ui/preferences.ui.h:45
+msgid "Remote, merge, local"
+msgstr "Remote, merge, lokal"
 
-#: ../data/ui/shortcuts.ui.h:46
-msgctxt "shortcut window"
-msgid "Copy to right"
-msgstr "Salin ke kanan"
+#: ../meld/resources/ui/preferences.ui.h:46
+msgid "Local, merge, remote"
+msgstr "Lokal, merge, remote"
 
-#: ../data/ui/shortcuts.ui.h:47
-msgctxt "shortcut window"
-msgid "Version control comparison"
-msgstr "Perbandingan kendali versi"
+#: ../meld/resources/ui/preferences.ui.h:47
+msgid "1ns (ext4)"
+msgstr "1ns (ext4)"
 
-#: ../data/ui/shortcuts.ui.h:48
-msgctxt "shortcut window"
-msgid "Commit to version control"
-msgstr "Komit ke kendali versi"
+#: ../meld/resources/ui/preferences.ui.h:48
+msgid "100ns (NTFS)"
+msgstr "100ns (NTFS)"
 
-#: ../data/ui/shortcuts.ui.h:49
-msgctxt "shortcut window"
-msgid "Show/hide console output"
-msgstr "Tampilkan/sembunyikan keluaran konsol"
+#: ../meld/resources/ui/preferences.ui.h:49
+msgid "1s (ext2/ext3)"
+msgstr "1s (ext2/ext3)"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567
-#: ../meld/newdifftab.py:49
-msgid "New comparison"
-msgstr "Perbandingan baru"
+#: ../meld/resources/ui/preferences.ui.h:50
+msgid "2s (VFAT)"
+msgstr "2s (VFAT)"
 
-#: ../data/ui/tab-placeholder.ui.h:2
-msgid "File comparison"
-msgstr "Perbandingan berkas"
+#: ../meld/resources/ui/push-dialog.ui.h:1
+msgid "Push local commits to remote?"
+msgstr "Push komit lokal ke remote?"
 
-#: ../data/ui/tab-placeholder.ui.h:3
-msgid "Directory comparison"
-msgstr "Perbandingan direktori"
+#: ../meld/resources/ui/push-dialog.ui.h:2
+msgid "The commits to be pushed are determined by your version control system."
+msgstr "Komit yang akan di-push ditentukan oleh sistem kendali versi Anda."
 
-#: ../data/ui/tab-placeholder.ui.h:4
-msgid "Version control view"
-msgstr "Tilikan kendali versi"
+#: ../meld/resources/ui/push-dialog.ui.h:3
+msgid "_Push commits"
+msgstr "_Push komit"
 
-#: ../data/ui/tab-placeholder.ui.h:5
-msgid "_3-way comparison"
-msgstr "Perbandingan _3 pihak"
+#: ../meld/resources/ui/revert-dialog.ui.h:1
+msgid "Discard unsaved changes to documents?"
+msgstr "Buang perubahan yang belum tersimpan ke dokumen?"
 
-#: ../data/ui/tab-placeholder.ui.h:6
-msgid "Select Third File"
-msgstr "Pilih Berkas Ke Tiga"
+#: ../meld/resources/ui/revert-dialog.ui.h:2
+msgid "Changes made to the following documents will be permanently lost:"
+msgstr ""
+"Perubahan yang dibuat ke dokumen-dokumen berikut akan hilang selamanya:"
 
-#: ../data/ui/tab-placeholder.ui.h:7
-msgid "Select Second File"
-msgstr "Pilih Berkas Ke Dua"
+#: ../meld/resources/ui/revert-dialog.ui.h:3
+msgid "_Discard"
+msgstr "_Buang"
 
-#: ../data/ui/tab-placeholder.ui.h:8
-msgid "Select First File"
-msgstr "Pilih Berkas Pertama"
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:1
+msgid "Save changes to documents before closing?"
+msgstr "Simpan perubahan ke dokumen sebelum menutup?"
 
-#: ../data/ui/tab-placeholder.ui.h:9
-msgid "Select First Folder"
-msgstr "Pilih Folder Pertama"
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:2
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Bila Anda tak menyimpan, perubahan akan hilang selamanya."
 
-#: ../data/ui/tab-placeholder.ui.h:10
-msgid "Select Second Folder"
-msgstr "Pilih Folder Ke Dua"
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:3
+msgid "Close _without Saving"
+msgstr "Tutup _Tanpa Menyimpan"
 
-#: ../data/ui/tab-placeholder.ui.h:11
-msgid "Select Third Folder"
-msgstr "Pilih Folder Ke Tiga"
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040
+#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112
+msgid "_Cancel"
+msgstr "_Batal"
 
-#: ../data/ui/tab-placeholder.ui.h:12
-msgid "Select A Version-Controlled Folder"
-msgstr "Pilih Suatu Folder Versi-Terkendali"
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:5
+msgid "_Save"
+msgstr "_Simpan"
 
-#: ../data/ui/tab-placeholder.ui.h:13
-msgid "_Blank comparison"
-msgstr "Per_bandingan kosong"
+#: ../meld/resources/ui/statusbar-menu.ui.h:2
+msgid "Show whitespace"
+msgstr "Tampilkan whitespace"
 
-#: ../data/ui/tab-placeholder.ui.h:14
-msgid "C_ompare"
-msgstr "B_andingkan"
+#: ../meld/resources/ui/statusbar-menu.ui.h:4
+msgid "Text wrapping"
+msgstr "Pelipatan teks"
 
-#: ../data/ui/vcview.ui.h:3
+#: ../meld/resources/ui/vcview.ui.h:3
 msgid "Co_mmit…"
 msgstr "Ko_mit…"
 
-#: ../data/ui/vcview.ui.h:4
+#: ../meld/resources/ui/vcview.ui.h:4
 msgid "Commit changes to version control"
 msgstr "Komit perubahan ke kendali versi"
 
-#: ../data/ui/vcview.ui.h:5
+#: ../meld/resources/ui/vcview.ui.h:5
 msgid "_Update"
 msgstr "M_utakhirkan"
 
-#: ../data/ui/vcview.ui.h:6
+#: ../meld/resources/ui/vcview.ui.h:6
 msgid "Update working copy from version control"
 msgstr "Mutakhirkan salinan kerja dari kendali versi"
 
-#: ../data/ui/vcview.ui.h:7
+#: ../meld/resources/ui/vcview.ui.h:7
 msgid "_Push"
 msgstr "_Push"
 
-#: ../data/ui/vcview.ui.h:8
+#: ../meld/resources/ui/vcview.ui.h:8
 msgid "Push local changes to remote"
 msgstr "Push perubahan lokal ke remote"
 
-#: ../data/ui/vcview.ui.h:10
+#: ../meld/resources/ui/vcview.ui.h:10
 msgid "Add to version control"
 msgstr "Tambahkan ke kendali versi"
 
-#: ../data/ui/vcview.ui.h:12
+#: ../meld/resources/ui/vcview.ui.h:12
 msgid "Remove from version control"
 msgstr "Hapus dari kendali versi"
 
-#: ../data/ui/vcview.ui.h:13
+#: ../meld/resources/ui/vcview.ui.h:13
 msgid "Mar_k as Resolved"
 msgstr "Tandai sebagai Terselesai_kan"
 
-#: ../data/ui/vcview.ui.h:14
+#: ../meld/resources/ui/vcview.ui.h:14
 msgid "Mark as resolved in version control"
 msgstr "Tandai sebagai terselesaikan dalam kendali versi"
 
-#: ../data/ui/vcview.ui.h:15
+#: ../meld/resources/ui/vcview.ui.h:15
 msgid "Re_vert"
 msgstr "Re_vert"
 
-#: ../data/ui/vcview.ui.h:16
+#: ../meld/resources/ui/vcview.ui.h:16
 msgid "Revert working copy to original state"
 msgstr "Kembalikan salinan kerja ke keadaan asli"
 
-#: ../data/ui/vcview.ui.h:17
+#: ../meld/resources/ui/vcview.ui.h:17
 msgid "Delete from working copy"
 msgstr "Hapus dari salinan kerja"
 
-#: ../data/ui/vcview.ui.h:18
+#: ../meld/resources/ui/vcview.ui.h:18
 msgid "Console"
 msgstr "Konsol"
 
-#: ../data/ui/vcview.ui.h:19
+#: ../meld/resources/ui/vcview.ui.h:19
 msgid "Show or hide the version control console output pane"
 msgstr "Tampilkan atau sembunyikan panel keluaran konsol kendali versi"
 
-#: ../data/ui/vcview.ui.h:20
+#: ../meld/resources/ui/vcview.ui.h:20
 msgid "_Flatten"
 msgstr "_Ratakan"
 
-#: ../data/ui/vcview.ui.h:21
+#: ../meld/resources/ui/vcview.ui.h:21
 msgid "Flatten directories"
 msgstr "Ratakan direktori"
 
-#: ../data/ui/vcview.ui.h:22
+#: ../meld/resources/ui/vcview.ui.h:22
 msgid "_Modified"
 msgstr "_Berubah"
 
-#: ../data/ui/vcview.ui.h:23
+#: ../meld/resources/ui/vcview.ui.h:23
 msgid "Show modified files"
 msgstr "Tampilkan berkas-berkas yang berubah"
 
-#: ../data/ui/vcview.ui.h:24
+#: ../meld/resources/ui/vcview.ui.h:24
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../data/ui/vcview.ui.h:25
+#: ../meld/resources/ui/vcview.ui.h:25
 msgid "Show normal files"
 msgstr "Tampilkan berkas-berkas normal"
 
-#: ../data/ui/vcview.ui.h:26
+#: ../meld/resources/ui/vcview.ui.h:26
 msgid "Un_versioned"
 msgstr "Tanpa _Versi"
 
-#: ../data/ui/vcview.ui.h:27
+#: ../meld/resources/ui/vcview.ui.h:27
 msgid "Show unversioned files"
 msgstr "Tampilkan berkas tanpa versi"
 
-#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69
+#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70
 msgid "Ignored"
 msgstr "Diabaikan"
 
-#: ../data/ui/vcview.ui.h:29
+#: ../meld/resources/ui/vcview.ui.h:29
 msgid "Show ignored files"
 msgstr "Tampilkan berkas-berkas yang diabaikan"
 
-#: ../data/ui/vcview.ui.h:30
-msgid "Commit"
-msgstr "Komit"
-
-#: ../data/ui/vcview.ui.h:31
-msgid "Commit Files"
-msgstr "Komit Berkas"
-
-#: ../data/ui/vcview.ui.h:32
-msgid "Log Message"
-msgstr "Pesan Log"
-
-#: ../data/ui/vcview.ui.h:33
-msgid "Previous logs:"
-msgstr "Log sebelumnya:"
-
-#: ../data/ui/vcview.ui.h:34
-msgid "Co_mmit"
-msgstr "Ko_mit"
-
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331
+#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366
 msgid "Location"
 msgstr "Lokasi"
 
-#: ../data/ui/vcview.ui.h:37
+#: ../meld/resources/ui/vcview.ui.h:32
 msgid "Status"
 msgstr "Status"
 
-#: ../data/ui/vcview.ui.h:38
+#: ../meld/resources/ui/vcview.ui.h:33
 msgid "Extra"
 msgstr "Ekstra"
 
-#: ../data/ui/vcview.ui.h:39
+#: ../meld/resources/ui/vcview.ui.h:34
 msgid "Console output"
 msgstr "Keluaran konsol"
 
-#: ../data/ui/vcview.ui.h:40
-msgid "Push local commits to remote?"
-msgstr "Push komit lokal ke remote?"
-
-#: ../data/ui/vcview.ui.h:41
-msgid "The commits to be pushed are determined by your version control system."
-msgstr "Komit yang akan di-push ditentukan oleh sistem kendali versi Anda."
-
-#: ../data/ui/vcview.ui.h:42
-msgid "_Push commits"
-msgstr "_Push komit"
-
 #: ../meld/const.py:12
 msgid "UNIX (LF)"
 msgstr "UNIX (LF)"
@@ -1675,44 +1682,44 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:437 ../meld/preferences.py:81
+#: ../meld/dirdiff.py:476 ../meld/preferences.py:138
 msgid "Size"
 msgstr "Ukuran"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:445 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:484 ../meld/preferences.py:139
 msgid "Modification time"
 msgstr "Waktu modifikasi"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:453 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:492 ../meld/preferences.py:140
 msgid "Permissions"
 msgstr "Ijin"
 
-#: ../meld/dirdiff.py:588
+#: ../meld/dirdiff.py:626
 #, python-format
 msgid "Hide %s"
 msgstr "Sembunyikan %s"
 
-#: ../meld/dirdiff.py:729 ../meld/dirdiff.py:752
+#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Memindai %s"
 
-#: ../meld/dirdiff.py:887
+#: ../meld/dirdiff.py:926
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Selesai"
 
-#: ../meld/dirdiff.py:895
+#: ../meld/dirdiff.py:934
 msgid "Folders have no differences"
 msgstr "Folder-folder tak punya perbedaan"
 
-#: ../meld/dirdiff.py:897
+#: ../meld/dirdiff.py:936
 msgid "Contents of scanned files in folders are identical."
 msgstr "Isi berkas yang dipindai dalam folder-folder identik."
 
-#: ../meld/dirdiff.py:899
+#: ../meld/dirdiff.py:938
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1720,42 +1727,42 @@ msgstr ""
 "Berkas-berkas yang dipindai dalam folder-folder tampak identik, tapi isi "
 "belum dipindai."
 
-#: ../meld/dirdiff.py:902
+#: ../meld/dirdiff.py:941
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Penyaring berkas sedang dipakai, maka tidak semua berkas telah dipindai."
 
-#: ../meld/dirdiff.py:904
+#: ../meld/dirdiff.py:943
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Penyaring teks sedang dipakai dan mungkin menutupi perbedaan isi."
 
-#: ../meld/dirdiff.py:922 ../meld/filediff.py:1491 ../meld/filediff.py:1521
-#: ../meld/filediff.py:1523 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
+#: ../meld/dirdiff.py:961 ../meld/filediff.py:1603 ../meld/filediff.py:1633
+#: ../meld/filediff.py:1635 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
 msgid "Hi_de"
 msgstr "Sem_bunyikan"
 
-#: ../meld/dirdiff.py:931
+#: ../meld/dirdiff.py:970
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Galat berganda terjadi ketika memindai folder ini"
 
-#: ../meld/dirdiff.py:932
+#: ../meld/dirdiff.py:971
 msgid "Files with invalid encodings found"
 msgstr "Berkas dengan pengkodean tak valid ditemukan"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:934
+#: ../meld/dirdiff.py:973
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Beberapa berkas memiliki pengkodean yang salah. Namanya kurang lebih seperti:"
 
-#: ../meld/dirdiff.py:936
+#: ../meld/dirdiff.py:975
 msgid "Files hidden by case insensitive comparison"
 msgstr ""
 "Berkasn yang disembunyikan oleh perbandingan yang tak membedakan huruf besar "
 "kecil"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:938
+#: ../meld/dirdiff.py:977
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1764,17 +1771,17 @@ msgstr ""
 "sistem berkas yang peka huruf besar kecil. Berkas-berkas berikut dalam "
 "folder ini tersembunyi:"
 
-#: ../meld/dirdiff.py:949
+#: ../meld/dirdiff.py:988
 #, python-format
 msgid "“%s” hidden by “%s”"
 msgstr "\"%s\" disembunyikan oleh \"%s\""
 
-#: ../meld/dirdiff.py:1005
+#: ../meld/dirdiff.py:1044
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Timpa folder “%s”?"
 
-#: ../meld/dirdiff.py:1007
+#: ../meld/dirdiff.py:1046
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1783,11 +1790,11 @@ msgstr ""
 "Folder lain dengan nama sama telah ada dalam \"%s\".\n"
 "Bila Anda menimpa folder yang ada, semua berkas di dalamnya akan hilang."
 
-#: ../meld/dirdiff.py:1020
+#: ../meld/dirdiff.py:1059
 msgid "Error copying file"
 msgstr "Galat saat menyalin berkas"
 
-#: ../meld/dirdiff.py:1021
+#: ../meld/dirdiff.py:1060
 #, python-format
 msgid ""
 "Couldn’t copy %s\n"
@@ -1800,19 +1807,19 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:1046 ../meld/vcview.py:703
+#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720
 msgid "Error deleting {}"
 msgstr "Galat saat menghapus {}"
 
-#: ../meld/dirdiff.py:1577
+#: ../meld/dirdiff.py:1597
 msgid "No folder"
 msgstr "Tidak ada folder"
 
-#: ../meld/filediff.py:834
+#: ../meld/filediff.py:920
 msgid "Comparison results will be inaccurate"
 msgstr "Hasil perbandingan tidak akan akurat"
 
-#: ../meld/filediff.py:836
+#: ../meld/filediff.py:922
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1820,66 +1827,66 @@ msgstr ""
 "Suatu penyaring mengubah cacah baris dalam berkas, yang tidak didukung. "
 "Perbandingan tidak akan akurat."
 
-#: ../meld/filediff.py:893
+#: ../meld/filediff.py:994
 msgid "Mark conflict as resolved?"
 msgstr "Tandai konflik sebagai terselesaikan?"
 
-#: ../meld/filediff.py:895
+#: ../meld/filediff.py:996
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Bila konflik sukses dipecahkan, Anda dapat menandainya sebagai terpecahkan "
 "sekarang."
 
-#: ../meld/filediff.py:897
+#: ../meld/filediff.py:998
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../meld/filediff.py:898
+#: ../meld/filediff.py:999
 msgid "Mark _Resolved"
 msgstr "Tandai Te_rselesaikan"
 
-#: ../meld/filediff.py:1206
+#: ../meld/filediff.py:1318
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Ada masalah saat membuka berkas \"%s\"."
 
-#: ../meld/filediff.py:1214
+#: ../meld/filediff.py:1326
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Berkas %s tampaknya berkas biner."
 
-#: ../meld/filediff.py:1216
+#: ../meld/filediff.py:1328
 msgid "Do you want to open the file using the default application?"
 msgstr "Apakah Anda ingin membuka berkas memakai aplikasi baku?"
 
-#: ../meld/filediff.py:1218
+#: ../meld/filediff.py:1330
 msgid "Open"
 msgstr "Buka"
 
-#: ../meld/filediff.py:1234
+#: ../meld/filediff.py:1346
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Menghitung perbedaan"
 
-#: ../meld/filediff.py:1295
+#: ../meld/filediff.py:1407
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Berkas %s telah berubah pada disk"
 
-#: ../meld/filediff.py:1296
+#: ../meld/filediff.py:1408
 msgid "Do you want to reload the file?"
 msgstr "Apakah Anda ingin memuat ulang berkas?"
 
-#: ../meld/filediff.py:1298
+#: ../meld/filediff.py:1410
 msgid "_Reload"
 msgstr "Muat _Ulang"
 
-#: ../meld/filediff.py:1454
+#: ../meld/filediff.py:1566
 msgid "Files are identical"
 msgstr "Berkas identik"
 
-#: ../meld/filediff.py:1467
+#: ../meld/filediff.py:1579
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1887,11 +1894,11 @@ msgstr ""
 "Penyaring teks sedang dipakai, dan mungkin menutupi perbedaan antara berkas. "
 "Apakah Anda ingin membandingkan berkas-berkas yang tak tersaring?"
 
-#: ../meld/filediff.py:1472
+#: ../meld/filediff.py:1584
 msgid "Files differ in line endings only"
 msgstr "Berkas berbeda hanya pada akhiran baris"
 
-#: ../meld/filediff.py:1474
+#: ../meld/filediff.py:1586
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1900,15 +1907,15 @@ msgstr ""
 "Berkas-berkas identik kecuali perbedaan akhiran baris:\n"
 "%s"
 
-#: ../meld/filediff.py:1494
+#: ../meld/filediff.py:1606
 msgid "Show without filters"
 msgstr "Tampilkan tanpa penyaring"
 
-#: ../meld/filediff.py:1516
+#: ../meld/filediff.py:1628
 msgid "Change highlighting incomplete"
 msgstr "Penyorotan perubahan tak lengkap"
 
-#: ../meld/filediff.py:1517
+#: ../meld/filediff.py:1629
 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."
@@ -1917,19 +1924,19 @@ msgstr ""
 "untuk lebih panjanga sehingga menyorot perubahan yang lebih besar, walaupun "
 "ini mungkin lambat."
 
-#: ../meld/filediff.py:1525
+#: ../meld/filediff.py:1637
 msgid "Keep highlighting"
 msgstr "Tetap menyorot"
 
-#: ../meld/filediff.py:1527
+#: ../meld/filediff.py:1639
 msgid "_Keep highlighting"
 msgstr "_Tetap menyorot"
 
-#: ../meld/filediff.py:1540
+#: ../meld/filediff.py:1652
 msgid "Saving failed"
 msgstr "Gagal menyimpan"
 
-#: ../meld/filediff.py:1541
+#: ../meld/filediff.py:1653
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
@@ -1937,42 +1944,42 @@ msgstr ""
 "Harap pertimbangkan untuk menyalin perubahan penting apapun ke program atau "
 "berkas lain untuk menghindari kehilangan data."
 
-#: ../meld/filediff.py:1550
+#: ../meld/filediff.py:1662
 msgid "Save Left Pane As"
 msgstr "Simpan Panel Kiri Sebagai"
 
-#: ../meld/filediff.py:1552
+#: ../meld/filediff.py:1664
 msgid "Save Middle Pane As"
 msgstr "Simpan Panel Tengah Sebagai"
 
-#: ../meld/filediff.py:1554
+#: ../meld/filediff.py:1666
 msgid "Save Right Pane As"
 msgstr "Simpan Panel Kanan Sebagai"
 
-#: ../meld/filediff.py:1567
+#: ../meld/filediff.py:1679
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Berkas %s telah berubah pada disk sejak dibuka"
 
-#: ../meld/filediff.py:1569
+#: ../meld/filediff.py:1681
 msgid "If you save it, any external changes will be lost."
 msgstr "Bila Anda menyimpannya, perubahan eksternal akan hilang."
 
-#: ../meld/filediff.py:1572
+#: ../meld/filediff.py:1684
 msgid "Save Anyway"
 msgstr "Simpan Saja"
 
-#: ../meld/filediff.py:1573
+#: ../meld/filediff.py:1685
 msgid "Don’t Save"
 msgstr "Jangan Simpan"
 
-#: ../meld/filediff.py:1615
+#: ../meld/filediff.py:1727
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
 msgstr "Berkas “{}” memuat karakter yang tak bisa dienkode dengan “{}”."
 
-#: ../meld/filediff.py:1619 ../meld/patchdialog.py:131
+#: ../meld/filediff.py:1731 ../meld/patchdialog.py:144
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1981,16 +1988,16 @@ msgstr ""
 "Tidak bisa menyimpan berkas karena:\n"
 "%s"
 
-#: ../meld/filediff.py:1623 ../meld/patchdialog.py:130
+#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143
 #, python-format
 msgid "Could not save file %s."
 msgstr "Tak bisa menyimpan berkas %s."
 
-#: ../meld/filediff.py:1998
+#: ../meld/filediff.py:2128
 msgid "Live comparison updating disabled"
 msgstr "Pemutakhiran perbandingan live dinonaktifkan"
 
-#: ../meld/filediff.py:1999
+#: ../meld/filediff.py:2129
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2006,42 +2013,42 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] Sedang merge berkas"
 
-#: ../meld/gutterrendererchunk.py:216
+#: ../meld/gutterrendererchunk.py:220
 msgid "Copy _up"
 msgstr "Salin _naik"
 
-#: ../meld/gutterrendererchunk.py:217
+#: ../meld/gutterrendererchunk.py:221
 msgid "Copy _down"
 msgstr "Salin _turun"
 
-#: ../meld/iohelpers.py:35
+#: ../meld/iohelpers.py:43
 msgid "Deleting remote folders is not supported"
 msgstr "Menghapus folder jauh tidak didukung"
 
-#: ../meld/iohelpers.py:37
+#: ../meld/iohelpers.py:45
 msgid "Not a file or directory"
 msgstr "Bukan suatu berkas atau direktori"
 
-#: ../meld/iohelpers.py:41
+#: ../meld/iohelpers.py:49
 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
 msgstr ""
 "\"{}\" tak bisa dibuang ke tong sampah. Apakah Anda hendak langsung "
 "menghapusnya?"
 
-#: ../meld/iohelpers.py:46
+#: ../meld/iohelpers.py:54
 msgid "This remote location does not support sending items to the trash."
 msgstr "Lokasi remote ini tidak mendukung pengiriman butir ke tong sampah."
 
-#: ../meld/iohelpers.py:51
+#: ../meld/iohelpers.py:59
 msgid "_Delete Permanently"
 msgstr "_Hapus Permanen"
 
-#: ../meld/iohelpers.py:94
+#: ../meld/iohelpers.py:106
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Timpa berkas “%s”?"
 
-#: ../meld/iohelpers.py:96
+#: ../meld/iohelpers.py:108
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2050,312 +2057,276 @@ msgstr ""
 "Sebuah berkas dengan nama ini telah ada dalam \"%s\".\n"
 "Bila Anda menimpa berkas yang ada, isinya akan hilang."
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:169
 msgid "wrong number of arguments supplied to --diff"
 msgstr "banyaknya argumen yang diberikan ke --diff salah"
 
-#: ../meld/meldapp.py:186
+#: ../meld/meldapp.py:174
 msgid "Start with an empty window"
 msgstr "Mulai dengan jendela kosong"
 
-#: ../meld/meldapp.py:187 ../meld/meldapp.py:189
+#: ../meld/meldapp.py:175 ../meld/meldapp.py:177
 msgid "file"
 msgstr "berkas"
 
-#: ../meld/meldapp.py:187 ../meld/meldapp.py:191
+#: ../meld/meldapp.py:175 ../meld/meldapp.py:179
 msgid "folder"
 msgstr "folder"
 
-#: ../meld/meldapp.py:188
+#: ../meld/meldapp.py:176
 msgid "Start a version control comparison"
 msgstr "Mulai suatu perbandingan kendali versi"
 
-#: ../meld/meldapp.py:190
+#: ../meld/meldapp.py:178
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Mulai perbandingan berkas 2 atau 3 pihak"
 
-#: ../meld/meldapp.py:192
+#: ../meld/meldapp.py:180
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Mulai perbandingan folder 2 atau 3 pihak"
 
-#: ../meld/meldapp.py:235
+#: ../meld/meldapp.py:223
 #, python-format
 msgid "Error: %s\n"
 msgstr "Galat: %s\n"
 
-#: ../meld/meldapp.py:242
+#: ../meld/meldapp.py:230
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld adalah alat perbandingan berkas dan direktori."
 
-#: ../meld/meldapp.py:246
+#: ../meld/meldapp.py:234
 msgid "Set label to use instead of file name"
 msgstr "Tata label yang akan dipakai sebagai ganti nama berkas"
 
-#: ../meld/meldapp.py:249
+#: ../meld/meldapp.py:237
 msgid "Open a new tab in an already running instance"
 msgstr "Buka tab baru pada instansi yang sedang berjalan"
 
-#: ../meld/meldapp.py:252
+#: ../meld/meldapp.py:240
 msgid "Automatically compare all differing files on startup"
 msgstr "Otomatis membandingkan semua berkas yang berbeda saat awal mula"
 
-#: ../meld/meldapp.py:255
+#: ../meld/meldapp.py:243
 msgid "Ignored for compatibility"
 msgstr "Diabaikan untuk kompatibilitas"
 
-#: ../meld/meldapp.py:259
+#: ../meld/meldapp.py:247
 msgid "Set the target file for saving a merge result"
 msgstr "Tata berkas target untuk menyimpan hasil merge"
 
-#: ../meld/meldapp.py:262
+#: ../meld/meldapp.py:250
 msgid "Automatically merge files"
 msgstr "Otomatis me-merge berkas"
 
-#: ../meld/meldapp.py:266
+#: ../meld/meldapp.py:254
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Muat perbandingan yang disimpan dari suatu berkas perbandingan Meld"
 
-#: ../meld/meldapp.py:270
+#: ../meld/meldapp.py:258
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Buat suatu tab diff bagi berkas atau folder yang diberikan"
 
-#: ../meld/meldapp.py:290
+#: ../meld/meldapp.py:278
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "terlalu banyak argumen (diinginkan 0-3, diperoleh %d)"
 
-#: ../meld/meldapp.py:293
+#: ../meld/meldapp.py:281
 msgid "can’t auto-merge less than 3 files"
 msgstr "tak bisa merge otomatis kurang dari 3 berkas"
 
-#: ../meld/meldapp.py:295
+#: ../meld/meldapp.py:283
 msgid "can’t auto-merge directories"
 msgstr "tak bisa merge otomatis direktori"
 
-#: ../meld/meldapp.py:309
+#: ../meld/meldapp.py:297
 msgid "Error reading saved comparison file"
 msgstr "Galat saat membaca berkas perbandingan yang disimpan"
 
-#: ../meld/meldapp.py:326
+#: ../meld/meldapp.py:314
 #, python-format
 msgid "invalid path or URI “%s”"
 msgstr "path atau URI \"%s\" tidak valid"
 
-#: ../meld/meldapp.py:332
+#: ../meld/meldapp.py:320
 msgid "remote folder “{}” not supported"
 msgstr "folder jauh “{}” tidak didukung"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:124
+#: ../meld/meldbuffer.py:123
 msgid "<unnamed>"
 msgstr "<tanpa nama>"
 
-#: ../meld/melddoc.py:68
+#: ../meld/melddoc.py:63
 msgid "untitled"
 msgstr "tanpa judul"
 
-#: ../meld/meldwindow.py:47
+#: ../meld/meldwindow.py:56
 msgid "_File"
 msgstr "_Berkas"
 
-#: ../meld/meldwindow.py:48
+#: ../meld/meldwindow.py:57
 msgid "_New Comparison…"
 msgstr "Perba_ndingan Baru…"
 
-#: ../meld/meldwindow.py:49
+#: ../meld/meldwindow.py:58
 msgid "Start a new comparison"
 msgstr "Mulai suatu perbandingan baru"
 
-#: ../meld/meldwindow.py:52
+#: ../meld/meldwindow.py:61
 msgid "Save the current file"
 msgstr "Simpan berkas saat ini"
 
-#: ../meld/meldwindow.py:54
+#: ../meld/meldwindow.py:63
 msgid "Save As…"
 msgstr "Simpan Sebagai…"
 
-#: ../meld/meldwindow.py:55
+#: ../meld/meldwindow.py:64
 msgid "Save the current file with a different name"
 msgstr "Simpan berkas saat ini dengan nama lain"
 
-#: ../meld/meldwindow.py:58
+#: ../meld/meldwindow.py:67
 msgid "Close the current file"
 msgstr "Tutup berkas saat ini"
 
-#: ../meld/meldwindow.py:61
+#: ../meld/meldwindow.py:70
 msgid "_Edit"
 msgstr "_Sunting"
 
-#: ../meld/meldwindow.py:63
+#: ../meld/meldwindow.py:72
 msgid "Undo the last action"
 msgstr "Batalkan aksi terakhir"
 
-#: ../meld/meldwindow.py:66
+#: ../meld/meldwindow.py:75
 msgid "Redo the last undone action"
 msgstr "Jadikan lagi aksi terakhir yang dibatalkan"
 
-#: ../meld/meldwindow.py:68
+#: ../meld/meldwindow.py:77
 msgid "Cut the selection"
 msgstr "Potong yang dipilih"
 
-#: ../meld/meldwindow.py:70
+#: ../meld/meldwindow.py:79
 msgid "Copy the selection"
 msgstr "Salin yang dipilih"
 
-#: ../meld/meldwindow.py:72
+#: ../meld/meldwindow.py:81
 msgid "Paste the clipboard"
 msgstr "Tempel yang dipilih"
 
-#: ../meld/meldwindow.py:74
+#: ../meld/meldwindow.py:83
 msgid "Find…"
 msgstr "Cari…"
 
-#: ../meld/meldwindow.py:74
+#: ../meld/meldwindow.py:83
 msgid "Search for text"
 msgstr "Mencari teks"
 
-#: ../meld/meldwindow.py:76
+#: ../meld/meldwindow.py:85
 msgid "Find Ne_xt"
 msgstr "Cari Sela_njutnya"
 
-#: ../meld/meldwindow.py:77
+#: ../meld/meldwindow.py:86
 msgid "Search forwards for the same text"
 msgstr "Cari terus teks yang sama"
 
-#: ../meld/meldwindow.py:79
+#: ../meld/meldwindow.py:88
 msgid "Find _Previous"
 msgstr "Cari Se_belumnya"
 
-#: ../meld/meldwindow.py:80
+#: ../meld/meldwindow.py:89
 msgid "Search backwards for the same text"
 msgstr "Cari mundur teks yang sama"
 
-#: ../meld/meldwindow.py:83
+#: ../meld/meldwindow.py:92
 msgid "_Replace…"
 msgstr "_Ganti…"
 
-#: ../meld/meldwindow.py:84
+#: ../meld/meldwindow.py:93
 msgid "Find and replace text"
 msgstr "Cari dan gantikan teks"
 
-#: ../meld/meldwindow.py:86
+#: ../meld/meldwindow.py:95
 msgid "Go to _Line"
 msgstr "Pergi ke _Baris"
 
-#: ../meld/meldwindow.py:87
+#: ../meld/meldwindow.py:96
 msgid "Go to a specific line"
 msgstr "Pergi ke baris tertentu"
 
-#: ../meld/meldwindow.py:90
+#: ../meld/meldwindow.py:99
 msgid "_Changes"
 msgstr "_Perubahan"
 
-#: ../meld/meldwindow.py:91
+#: ../meld/meldwindow.py:100
 msgid "Next Change"
 msgstr "Perubahan Selanjutnya"
 
-#: ../meld/meldwindow.py:92
+#: ../meld/meldwindow.py:101
 msgid "Go to the next change"
 msgstr "Pergi ke perubahan selanjutnya"
 
-#: ../meld/meldwindow.py:94
+#: ../meld/meldwindow.py:103
 msgid "Previous Change"
 msgstr "Perubahan Sebelumnya"
 
-#: ../meld/meldwindow.py:95
+#: ../meld/meldwindow.py:104
 msgid "Go to the previous change"
 msgstr "Pergi ke perubahan sebelumnya"
 
-#: ../meld/meldwindow.py:97
+#: ../meld/meldwindow.py:106
 msgid "Open Externally"
 msgstr "Buka Secara Eksternal"
 
-#: ../meld/meldwindow.py:98
+#: ../meld/meldwindow.py:107
 msgid "Open selected file or directory in the default external application"
 msgstr "Buka berkas atau direktori yang dipilih dalam aplikasi eksternal baku"
 
-#: ../meld/meldwindow.py:102
+#: ../meld/meldwindow.py:111
 msgid "_View"
 msgstr "_Tilik"
 
-#: ../meld/meldwindow.py:103
+#: ../meld/meldwindow.py:112
 msgid "File Status"
 msgstr "Status Berkas"
 
-#: ../meld/meldwindow.py:104
+#: ../meld/meldwindow.py:113
 msgid "Version Status"
 msgstr "Status Versi"
 
-#: ../meld/meldwindow.py:107
+#: ../meld/meldwindow.py:116
 msgid "Stop the current action"
 msgstr "Hentikan aksi saat ini"
 
-#: ../meld/meldwindow.py:110
+#: ../meld/meldwindow.py:119
 msgid "Refresh the view"
 msgstr "Segarkan tilikan"
 
-#: ../meld/meldwindow.py:114
+#: ../meld/meldwindow.py:123
 msgid "Fullscreen"
 msgstr "Layar Penuh"
 
-#: ../meld/meldwindow.py:115
+#: ../meld/meldwindow.py:124
 msgid "View the comparison in fullscreen"
 msgstr "Tilik perbandingan dalam layar penuh"
 
-#: ../meld/meldwindow.py:117
-msgid "_Toolbar"
-msgstr "Bilah Ala_t"
-
-#: ../meld/meldwindow.py:118
-msgid "Show or hide the toolbar"
-msgstr "Tampilkan atau sembunyikan bilah alat"
-
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:133
 msgid "Open Recent"
 msgstr "Buka Terkini"
 
-#: ../meld/meldwindow.py:128
+#: ../meld/meldwindow.py:134
 msgid "Open recent files"
 msgstr "Buka berkas yang baru-baru ini"
 
-#: ../meld/meldwindow.py:150
-msgid "_Meld"
-msgstr "_Meld"
-
-#: ../meld/meldwindow.py:151
-msgid "Quit the program"
-msgstr "Keluar program"
-
-#: ../meld/meldwindow.py:153
-msgid "Prefere_nces"
-msgstr "Prefere_nsi"
-
-#: ../meld/meldwindow.py:154
-msgid "Configure the application"
-msgstr "Atur konfigurasi aplikasi"
-
-#: ../meld/meldwindow.py:156
-msgid "_Contents"
-msgstr "_Isi"
-
-#: ../meld/meldwindow.py:157
-msgid "Open the Meld manual"
-msgstr "Buka manual Meld"
-
-#: ../meld/meldwindow.py:159
-msgid "About this application"
-msgstr "Tentang aplikasi ini"
-
-#: ../meld/meldwindow.py:602
+#: ../meld/meldwindow.py:567
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Perlu tiga berkas untuk merge otomatis, mendapat: %r"
 
-#: ../meld/meldwindow.py:623
+#: ../meld/meldwindow.py:588
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Tak bisa membandingkan campuran berkas dan direktori"
 
-#: ../meld/misc.py:135
+#: ../meld/misc.py:155
 msgid ""
 "{}\n"
 "\n"
@@ -2367,53 +2338,49 @@ msgstr ""
 "Meld mengalami kesalahan kritis saat menjalankan:\n"
 "<tt>{}</tt>"
 
-#: ../meld/misc.py:254
+#: ../meld/misc.py:237
 #, python-format
 msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
 msgstr ""
 "Tak bisa temukan rincian skema warna bagi %s-%s; ini adalah instalasi yang "
 "buruk"
 
-#: ../meld/misc.py:325
+#: ../meld/misc.py:311
 msgid "[None]"
 msgstr "[Nihil]"
 
-#: ../meld/preferences.py:33
+#: ../meld/preferences.py:42 ../meld/preferences.py:135
 msgid "label"
 msgstr "label"
 
-#: ../meld/preferences.py:33
+#: ../meld/preferences.py:42 ../meld/preferences.py:135
 msgid "pattern"
 msgstr "pola"
 
-#: ../meld/recent.py:105
+#: ../meld/recent.py:106
 msgid "Version control:"
 msgstr "Kendali versi:"
 
-#: ../meld/ui/bufferselectors.py:32
+#: ../meld/ui/bufferselectors.py:114
 #, python-brace-format
 msgid "{name} ({charset})"
 msgstr "{name} ({charset})"
 
-#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73
+#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152
 msgid "Plain Text"
 msgstr "Teks Polos"
 
-#: ../meld/ui/notebooklabel.py:63
-msgid "Close tab"
-msgstr "Tutup tab"
-
 #. Abbreviation for line, column so that it will fit in the status bar
 #: ../meld/ui/statusbar.py:124
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Brs %i, Kol %i"
 
-#: ../meld/ui/statusbar.py:177
+#: ../meld/ui/statusbar.py:182
 msgid "Line you want to move the cursor to"
 msgstr "Baris yang ingin Anda pindahkan kursor ke"
 
-#: ../meld/ui/vcdialogs.py:48
+#: ../meld/ui/vcdialogs.py:55
 msgid "No files will be committed"
 msgstr "Tak ada berkas yang akan dikomit"
 
@@ -2430,13 +2397,15 @@ msgstr "%s dalam %s"
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
-msgstr[0] "%d komit belum di-push"
+msgstr[0] "%d komit belum didorong"
+msgstr[1] "%d komit belum didorong"
 
 #: ../meld/vc/git.py:95
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
-msgstr[0] "%d branch"
+msgstr[0] "%d cabang"
+msgstr[1] "%d cabang"
 
 #: ../meld/vc/git.py:334
 #, python-format
@@ -2462,141 +2431,141 @@ msgstr "Nihil"
 msgid "Rev %s"
 msgstr "Rev %s"
 
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
 msgid "Merged"
 msgstr "Di-merge"
 
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
 msgid "Base"
 msgstr "Basis"
 
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
 msgid "Local"
 msgstr "Lokal"
 
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
 msgid "Remote"
 msgstr "Remote"
 
-#: ../meld/vc/_vc.py:70
+#: ../meld/vc/_vc.py:71
 msgid "Unversioned"
 msgstr "Tanpa versi"
 
-#: ../meld/vc/_vc.py:73
+#: ../meld/vc/_vc.py:74
 msgid "Error"
 msgstr "Galat"
 
-#: ../meld/vc/_vc.py:75
+#: ../meld/vc/_vc.py:76
 msgid "Newly added"
 msgstr "Baru ditambahkan"
 
-#: ../meld/vc/_vc.py:77
+#: ../meld/vc/_vc.py:78
 msgid "Renamed"
 msgstr "Diubah nama"
 
-#: ../meld/vc/_vc.py:78
+#: ../meld/vc/_vc.py:79
 msgid "Conflict"
 msgstr "Konflik"
 
-#: ../meld/vc/_vc.py:79
+#: ../meld/vc/_vc.py:80
 msgid "Removed"
 msgstr "Dihapus"
 
-#: ../meld/vc/_vc.py:80
+#: ../meld/vc/_vc.py:81
 msgid "Missing"
 msgstr "Kurang"
 
-#: ../meld/vc/_vc.py:81
+#: ../meld/vc/_vc.py:82
 msgid "Not present"
 msgstr "Tak ada"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:248
+#: ../meld/vcview.py:282
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s tidak terpasang)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: ../meld/vcview.py:252
+#: ../meld/vcview.py:286
 #, python-format
 msgid "%(name)s (Invalid repository)"
 msgstr "%(name)s (Repositori tak valid)"
 
-#: ../meld/vcview.py:273
+#: ../meld/vcview.py:307
 msgid "No valid version control system found in this folder"
 msgstr "Tak ada sistem kendali versi yang valid dalam folder ini"
 
-#: ../meld/vcview.py:275
+#: ../meld/vcview.py:309
 msgid "Only one version control system found in this folder"
 msgstr "Hanya satu sistem kendali versi ditemukan dalam folder ini"
 
-#: ../meld/vcview.py:277
+#: ../meld/vcview.py:311
 msgid "Choose which version control system to use"
 msgstr "Pilih sistem kendali mana yang akan dipakai"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:331
+#: ../meld/vcview.py:366
 #, 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:373
 msgid "Scanning repository"
 msgstr "Memindai repositori"
 
-#: ../meld/vcview.py:367
+#: ../meld/vcview.py:402
 #, python-format
 msgid "Scanning %s"
 msgstr "Memindai %s"
 
-#: ../meld/vcview.py:406
+#: ../meld/vcview.py:441
 msgid "(Empty)"
 msgstr "(Kosong)"
 
-#: ../meld/vcview.py:450
+#: ../meld/vcview.py:487
 #, python-format
 msgid "%s — local"
 msgstr "%s — lokal"
 
-#: ../meld/vcview.py:451
+#: ../meld/vcview.py:488
 #, python-format
 msgid "%s — remote"
 msgstr "%s — remote"
 
-#: ../meld/vcview.py:459
+#: ../meld/vcview.py:496
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (lokal, merge, remote)"
 
-#: ../meld/vcview.py:464
+#: ../meld/vcview.py:501
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (remote, merge, lokal)"
 
-#: ../meld/vcview.py:475
+#: ../meld/vcview.py:512
 #, python-format
 msgid "%s — repository"
 msgstr "%s — repositori"
 
-#: ../meld/vcview.py:481
+#: ../meld/vcview.py:518
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (kerja, repositori)"
 
-#: ../meld/vcview.py:485
+#: ../meld/vcview.py:522
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (repositori, kerja)"
 
-#: ../meld/vcview.py:674
+#: ../meld/vcview.py:688
 msgid "Remove folder and all its files?"
 msgstr "Hapus folder dan semua berkasnya?"
 
-#: ../meld/vcview.py:676
+#: ../meld/vcview.py:690
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2604,10 +2573,55 @@ msgstr ""
 "Ini akan menghapus semua berkas dan folder yang dipilih, dan semua berkas di "
 "dalam sebarang folder yang dipilih, dari kendali versi."
 
-#: ../meld/vcview.py:785
+#: ../meld/vcview.py:804
 msgid "Clear"
 msgstr "Bersihkan"
 
+#~ msgid "Show toolbar"
+#~ msgstr "Tampilkan bilah alat"
+
+#~ msgid "If true, the window toolbar is visible."
+#~ msgstr "Bila berisi true, bilah alat jendela tampak."
+
+#~ msgid "Show statusbar"
+#~ msgstr "Tampilkan bilah status"
+
+#~ msgid "If true, the window statusbar is visible."
+#~ msgstr "Bila berisi true, bilah status jendela tampak."
+
+#~ msgid "Editable List"
+#~ msgstr "Daftar Yang Dapat Disunting"
+
+#~ msgid "Meld Preferences"
+#~ msgstr "Preferensi Meld"
+
+#~ msgid "_Toolbar"
+#~ msgstr "Bilah Ala_t"
+
+#~ msgid "Show or hide the toolbar"
+#~ msgstr "Tampilkan atau sembunyikan bilah alat"
+
+#~ msgid "_Meld"
+#~ msgstr "_Meld"
+
+#~ msgid "Quit the program"
+#~ msgstr "Keluar program"
+
+#~ msgid "Prefere_nces"
+#~ msgstr "Prefere_nsi"
+
+#~ msgid "Configure the application"
+#~ msgstr "Atur konfigurasi aplikasi"
+
+#~ msgid "_Contents"
+#~ msgstr "_Isi"
+
+#~ msgid "Open the Meld manual"
+#~ msgstr "Buka manual Meld"
+
+#~ msgid "About this application"
+#~ msgstr "Tentang aplikasi ini"
+
 #~ msgid "_Save as UTF-8"
 #~ msgstr "_Simpan sebagai UTF-8"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]