[meld] Updated Indonesian translation

From: Damned-Lies <translations src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Indonesian translation
Date: Sat, 6 Sep 2014 06:22:13 +0000 (UTC)
commit 149e3b40f25f7abb9146f192a5ab98ef15db2543
Author: Andika Triwidada <andika gmail com>
Date:   Sat Sep 6 06:22:08 2014 +0000

    Updated Indonesian translation

 po/id.po |  663 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 406 insertions(+), 257 deletions(-)
---
diff --git a/po/id.po b/po/id.po
index 4f09bce..8d6bba4 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-30 10:16+0000\n"
-"PO-Revision-Date: 2014-03-30 18:02+0700\n"
+"POT-Creation-Date: 2014-09-05 09:45+0000\n"
+"PO-Revision-Date: 2014-09-06 13:21+0700\n"
 "Last-Translator: Andika Triwidada <andika gmail com>\n"
 "Language-Team: Indonesian <gnome i15n org>\n"
 "Language: id\n"
@@ -17,18 +17,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.6.9\n"
 
-#: ../bin/meld:134
+#: ../bin/meld:138
 msgid "Cannot import: "
 msgstr "Tak bisa mengimpor:"
 
-#: ../bin/meld:137
+#: ../bin/meld:141
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld memerlukan %s atau lebih tinggi."
 
-#: ../bin/meld:141
+#: ../bin/meld:145
 msgid "Meld does not support Python 3."
 msgstr "Meld tidak mendukung Python 3."
 
@@ -78,26 +78,30 @@ msgid "Default window size"
 msgstr "Ukuran jendela baku"
 
 #: ../data/org.gnome.meld.gschema.xml.h:2
+msgid "Default window state"
+msgstr "Keadaan jendela baku"
+
+#: ../data/org.gnome.meld.gschema.xml.h:3
 msgid "Show toolbar"
 msgstr "Tampilkan bilah alat"
 
-#: ../data/org.gnome.meld.gschema.xml.h:3
+#: ../data/org.gnome.meld.gschema.xml.h:4
 msgid "If true, the window toolbar is visible."
 msgstr "Bila berisi true, bilah alat jendela tampak."
 
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: ../data/org.gnome.meld.gschema.xml.h:5
 msgid "Show statusbar"
 msgstr "Tampilkan bilah status"
 
-#: ../data/org.gnome.meld.gschema.xml.h:5
+#: ../data/org.gnome.meld.gschema.xml.h:6
 msgid "If true, the window statusbar is visible."
 msgstr "Bila berisi true, bilah status jendela tampak."
 
-#: ../data/org.gnome.meld.gschema.xml.h:6
+#: ../data/org.gnome.meld.gschema.xml.h:7
 msgid "Automatically detected text encodings"
 msgstr "Enkoding teks yang dideteksi secara otomatis "
 
-#: ../data/org.gnome.meld.gschema.xml.h:7
+#: ../data/org.gnome.meld.gschema.xml.h:8
 msgid ""
 "These text encodings will be automatically used (in order) to try to decode "
 "loaded text files."
@@ -105,39 +109,39 @@ msgstr ""
 "Enkoding teks ini akan dipakai secara otomatis (sesuai urutan) untuk mencoba "
 "mendekode berkas teks yang dimuat."
 
-#: ../data/org.gnome.meld.gschema.xml.h:8
+#: ../data/org.gnome.meld.gschema.xml.h:9
 msgid "Width of an indentation step"
 msgstr "Lebar langkah indentasi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:9
+#: ../data/org.gnome.meld.gschema.xml.h:10
 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:10
+#: ../data/org.gnome.meld.gschema.xml.h:11
 msgid "Whether to indent using spaces or tabs"
 msgstr "Apakah indentasi memakai spasi atau tab"
 
-#: ../data/org.gnome.meld.gschema.xml.h:11
+#: ../data/org.gnome.meld.gschema.xml.h:12
 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:12
+#: ../data/org.gnome.meld.gschema.xml.h:13
 msgid "Show line numbers"
 msgstr "Tampilkan nomor baris"
 
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: ../data/org.gnome.meld.gschema.xml.h:14
 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:14
+#: ../data/org.gnome.meld.gschema.xml.h:15
 msgid "Highlight syntax"
 msgstr "Sorot sintaks"
 
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: ../data/org.gnome.meld.gschema.xml.h:16
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld's own color "
 "highlighting, this is off by default."
@@ -145,11 +149,11 @@ msgstr ""
 "Apakah menyorot sintaks dalam perbandingan. Karena warna penyorotan milik "
 "Meld, ini secara baku mati."
 
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: ../data/org.gnome.meld.gschema.xml.h:17
 msgid "Displayed whitespace"
 msgstr "Whitespace yang ditampilkan"
 
-#: ../data/org.gnome.meld.gschema.xml.h:17
+#: ../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'."
@@ -158,11 +162,11 @@ msgstr ""
 "yang mungkin adalah 'space' (spasi), 'tab', 'newline' (baris baru), dan "
 "'nbsp' (spasi tak putus)."
 
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: ../data/org.gnome.meld.gschema.xml.h:19
 msgid "Wrap mode"
 msgstr "Mode lipat"
 
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: ../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 "
@@ -172,11 +176,11 @@ msgstr ""
 "tidak sedikitpun ('none'), pada sebarang karakter ('char'), atau hanya pada "
 "akhir kata ('word')."
 
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: ../data/org.gnome.meld.gschema.xml.h:21
 msgid "Highlight current line"
 msgstr "Sorot baris saat ini"
 
-#: ../data/org.gnome.meld.gschema.xml.h:21
+#: ../data/org.gnome.meld.gschema.xml.h:22
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
@@ -184,11 +188,11 @@ msgstr ""
 "Bila berisi true, baris yang memuat kursor akan disorot dalam perbandingan "
 "berkas."
 
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: ../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:23
+#: ../data/org.gnome.meld.gschema.xml.h:24
 msgid ""
 "If false, the defined custom font will be used instead of the system "
 "monospace font."
@@ -196,11 +200,11 @@ msgstr ""
 "Bila berisi false, fonta ubahan yang didefinisikan akan dipakai sebagai "
 "ganti fonta monospace sistem."
 
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: ../data/org.gnome.meld.gschema.xml.h:25
 msgid "Custom font"
 msgstr "Fonta ubahan"
 
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: ../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."
@@ -208,22 +212,22 @@ msgstr ""
 "Fonta ubahan yang dipakai, disimpan sebagai suatu string dan diurai sebagai "
 "suatu deskripsi fonta Pango."
 
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: ../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:27
+#: ../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:28
+#: ../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:29
+#: ../data/org.gnome.meld.gschema.xml.h:30
 msgid ""
 "If false, the defined custom editor will be used instead of the system "
 "editor when opening files externally."
@@ -231,11 +235,11 @@ msgstr ""
 "Bila berisi false, penyunting ubahan yang didefinisikan akan dipakai sebagai "
 "ganti penyunting sistem ketika membuka berkas secara eksternal."
 
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../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:31
+#: ../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."
@@ -244,11 +248,11 @@ msgstr ""
 "penemplatan yang terbatas didukung di sini; saat ini '{file}' dan '{line}' "
 "adalah token yang dikenal."
 
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: ../data/org.gnome.meld.gschema.xml.h:33
 msgid "Columns to display"
 msgstr "Kolom yang akan ditampilkan"
 
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: ../data/org.gnome.meld.gschema.xml.h:34
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
@@ -256,11 +260,11 @@ msgstr ""
 "Daftar nama kolom dalam perbandingan folder dan apakah mereka mesti "
 "ditampilkan."
 
-#: ../data/org.gnome.meld.gschema.xml.h:34 ../data/ui/preferences.ui.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:35 ../data/ui/preferences.ui.h:30
 msgid "Ignore symbolic links"
 msgstr "Abaikan taut simbolik"
 
-#: ../data/org.gnome.meld.gschema.xml.h:35
+#: ../data/org.gnome.meld.gschema.xml.h:36
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
@@ -268,11 +272,11 @@ msgstr ""
 "Bila berisi true, perbandingan folder tidak mengikuti taut simbolik ketika "
 "menelusuri pohon folder."
 
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: ../data/org.gnome.meld.gschema.xml.h:37
 msgid "Use shallow comparison"
 msgstr "Gunakan perbandingan dangkal"
 
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: ../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 "
@@ -282,11 +286,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:38
+#: ../data/org.gnome.meld.gschema.xml.h:39
 msgid "File timestamp resolution"
 msgstr "Resolusi penanda waktu"
 
-#: ../data/org.gnome.meld.gschema.xml.h:39
+#: ../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 "
@@ -298,21 +302,21 @@ msgstr ""
 "berbeda. Ini berguna ketika membandingkan berkas antar sistem berkas dengan "
 "resolusi penanda waktu yang berbeda."
 
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: ../data/org.gnome.meld.gschema.xml.h:41
 msgid "File status filters"
 msgstr "Penyaring status berkas"
 
-#: ../data/org.gnome.meld.gschema.xml.h:41
+#: ../data/org.gnome.meld.gschema.xml.h:42
 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:42
+#: ../data/org.gnome.meld.gschema.xml.h:43
 msgid "Show the version control console output"
 msgstr "Tampilkan keluaran konsol kendali versi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: ../data/org.gnome.meld.gschema.xml.h:44
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
@@ -321,22 +325,22 @@ msgstr ""
 "kendali versi, menunjukkan perintah yang dijalankan bagi operasi kendali "
 "versi."
 
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../data/org.gnome.meld.gschema.xml.h:45
 msgid "Version control pane position"
 msgstr "Posisi panel kendali versi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: ../data/org.gnome.meld.gschema.xml.h:46
 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:46
+#: ../data/org.gnome.meld.gschema.xml.h:47
 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:47
+#: ../data/org.gnome.meld.gschema.xml.h:48
 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, "
@@ -347,11 +351,26 @@ msgstr ""
 "dalam panel. Bila tidak, skema left-adalah-milik-mereka, kanan-adalah-"
 "milikku dipakai."
 
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../data/org.gnome.meld.gschema.xml.h:49
+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:50
+msgid ""
+"Choices for file order are remote/merge/local and local/merged/remote. This "
+"preference only affects three-way comparisons launched from the version "
+"control view, so is used solely for merges/conflict resolution within Meld."
+msgstr ""
+"Pilihan untuk urutan berkas adalah remote/merge/local dan local/merged/"
+"remote. Preferensi ini hanya mempengaruhi perbandingan tiga arah yang "
+"diluncurkan dari tilikan kendali versi, sehingga hanya dipakai untuk "
+"resolusi merge/konflik di dalam Meld."
+
+#: ../data/org.gnome.meld.gschema.xml.h:51
 msgid "Show margin in commit message editor"
 msgstr "Tampilkan marjin dalam penyunting pesan komit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: ../data/org.gnome.meld.gschema.xml.h:52
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
@@ -359,20 +378,23 @@ 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:50
+#: ../data/org.gnome.meld.gschema.xml.h:53
 msgid "Margin column in commit message editor"
 msgstr "Marjin kolom dalam penyunting pesan komit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: ../data/org.gnome.meld.gschema.xml.h:54
 msgid ""
-"The column of the margin is at in the version control commit message editor."
-msgstr "Kolom tempat marjin berada dalam penyunting pesan komit kendali versi."
+"The column at which to show the margin in the version control commit message "
+"editor."
+msgstr ""
+"Kolom tempat menunjukkan posisi marjin dalam penyunting pesan komit kendali "
+"versi."
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:55
 msgid "Automatically hard-wrap commit messages"
 msgstr "Secara otomatis melipat isi pesan komit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: ../data/org.gnome.meld.gschema.xml.h:56
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the defined commit margin before commit."
@@ -381,22 +403,22 @@ msgstr ""
 "menyisipkan pemecah baris) pada marjin komit yang didefinisikan sebelum "
 "komit."
 
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: ../data/org.gnome.meld.gschema.xml.h:57
 msgid "Version control status filters"
 msgstr "Penyaring status kendali versi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:58
 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:56
+#: ../data/org.gnome.meld.gschema.xml.h:59
 msgid "Filename-based filters"
 msgstr "Penyaring berbasis nama berkas"
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:60
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
@@ -404,11 +426,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:58
+#: ../data/org.gnome.meld.gschema.xml.h:61
 msgid "Text-based filters"
 msgstr "Penyaring berbasis teks"
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:62
 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, "
@@ -482,7 +504,7 @@ msgstr "Salin ke kanan"
 msgid "Delete selected"
 msgstr "Hapus yang dipilih"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1419
+#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1449
 msgid "Hide"
 msgstr "Sembunyikan"
 
@@ -551,7 +573,7 @@ msgid "_Add"
 msgstr "T_ambah"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:674
+#: ../meld/vcview.py:747
 msgid "_Remove"
 msgstr "_Hapus"
 
@@ -572,8 +594,8 @@ msgid "Move _Down"
 msgstr "_Turunkan"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:355
-#: ../meld/vcview.py:185
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:363
+#: ../meld/vcview.py:203
 msgid "Name"
 msgstr "Nama"
 
@@ -619,10 +641,22 @@ msgstr ""
 "ke suatu berkas baru."
 
 #: ../data/ui/filediff.ui.h:7
+msgid "File 3"
+msgstr "Berkas 3"
+
+#: ../data/ui/filediff.ui.h:8
+msgid "File 2"
+msgstr "Berkas 2"
+
+#: ../data/ui/filediff.ui.h:9
+msgid "File 1"
+msgstr "Berkas 1"
+
+#: ../data/ui/filediff.ui.h:10
 msgid "Revert unsaved changes to documents?"
 msgstr "Batalkan perubahan yang belum tersimpan ke dokumen?"
 
-#: ../data/ui/filediff.ui.h:8
+#: ../data/ui/filediff.ui.h:11
 msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr ""
 "Perubahan yang dibuat ke dokumen-dokumen berikut akan hilang selamanya:\n"
@@ -704,138 +738,154 @@ msgid "Left is local, right is remote"
 msgstr "Kiri lokal, kanan remote"
 
 #: ../data/ui/preferences.ui.h:3
+msgid "Remote, merge, local"
+msgstr "Remote, merge, lokal"
+
+#: ../data/ui/preferences.ui.h:4
+msgid "Local, merge, remote"
+msgstr "Lokal, merge, remote"
+
+#: ../data/ui/preferences.ui.h:5
 msgid "1ns (ext4)"
 msgstr "1ns (ext4)"
 
-#: ../data/ui/preferences.ui.h:4
+#: ../data/ui/preferences.ui.h:6
 msgid "100ns (NTFS)"
 msgstr "100ns (NTFS)"
 
-#: ../data/ui/preferences.ui.h:5
+#: ../data/ui/preferences.ui.h:7
 msgid "1s (ext2/ext3)"
 msgstr "1s (ext2/ext3)"
 
-#: ../data/ui/preferences.ui.h:6
+#: ../data/ui/preferences.ui.h:8
 msgid "2s (VFAT)"
 msgstr "2s (VFAT)"
 
-#: ../data/ui/preferences.ui.h:7
+#: ../data/ui/preferences.ui.h:9
 msgid "Meld Preferences"
 msgstr "Preferensi Meld"
 
-#: ../data/ui/preferences.ui.h:8
+#: ../data/ui/preferences.ui.h:10
 msgid "Font"
 msgstr "Fonta"
 
-#: ../data/ui/preferences.ui.h:9
+#: ../data/ui/preferences.ui.h:11
 msgid "_Use the system fixed width font"
 msgstr "G_unakan fonta lebar tetap sistem"
 
-#: ../data/ui/preferences.ui.h:10
+#: ../data/ui/preferences.ui.h:12
 msgid "_Editor font:"
 msgstr "Fonta p_enyunting:"
 
-#: ../data/ui/preferences.ui.h:11
+#: ../data/ui/preferences.ui.h:13
 msgid "Display"
 msgstr "Tampilan"
 
-#: ../data/ui/preferences.ui.h:12
+#: ../data/ui/preferences.ui.h:14
 msgid "_Tab width:"
 msgstr "Lebar _tab:"
 
-#: ../data/ui/preferences.ui.h:13
+#: ../data/ui/preferences.ui.h:15
 msgid "_Insert spaces instead of tabs"
 msgstr "S_isipkan spasi-spasi sebagai penggati tab"
 
-#: ../data/ui/preferences.ui.h:14
+#: ../data/ui/preferences.ui.h:16
 msgid "Enable text _wrapping"
 msgstr "Fungsikan pe_lipatan text"
 
-#: ../data/ui/preferences.ui.h:15
+#: ../data/ui/preferences.ui.h:17
 msgid "Do not _split words over two lines"
 msgstr "Jangan penggal kata ke dua bari_s"
 
-#: ../data/ui/preferences.ui.h:16
+#: ../data/ui/preferences.ui.h:18
 msgid "Highlight _current line"
 msgstr "Sorot baris _saat ini"
 
-#: ../data/ui/preferences.ui.h:17
+#: ../data/ui/preferences.ui.h:19
 msgid "Show _line numbers"
 msgstr "Tampi_lkan nomor baris"
 
-#: ../data/ui/preferences.ui.h:18
+#: ../data/ui/preferences.ui.h:20
 msgid "Show w_hitespace"
 msgstr "Tampilkan w_hitespace"
 
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:21
 msgid "Use s_yntax highlighting"
 msgstr "Gunakan penyorotan s_intaks"
 
-#: ../data/ui/preferences.ui.h:20
+#: ../data/ui/preferences.ui.h:22
 msgid "External Editor"
 msgstr "Penyunting Eksternal"
 
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:23
 msgid "Use _default system editor"
 msgstr "_Gunakan penyunting bawaan sistem"
 
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:24
 msgid "Edito_r command:"
 msgstr "Pe_rintah penyunting:"
 
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:25
 msgid "Editor"
 msgstr "Penyunting"
 
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:26
 msgid "Shallow Comparison"
 msgstr "Perbandingan Dangkal"
 
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:27
 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:26
+#: ../data/ui/preferences.ui.h:28
 msgid "_Timestamp resolution:"
 msgstr "Resolusi penanda wak_tu:"
 
-#: ../data/ui/preferences.ui.h:27
+#: ../data/ui/preferences.ui.h:29
 msgid "Symbolic Links"
 msgstr "Taut Simbolik"
 
-#: ../data/ui/preferences.ui.h:29
+#: ../data/ui/preferences.ui.h:31
 msgid "Visible Columns"
 msgstr "Kolom Yang Nampak"
 
-#: ../data/ui/preferences.ui.h:30
+#: ../data/ui/preferences.ui.h:32
 msgid "Folder Comparisons"
 msgstr "Perbandingan Folder"
 
-#: ../data/ui/preferences.ui.h:31
+#: ../data/ui/preferences.ui.h:33
 msgid "Version Comparisons"
 msgstr "Perbandingan Versi"
 
-#: ../data/ui/preferences.ui.h:32
-msgid "_When comparing file revisions:"
-msgstr "_Ketika membandingkan revisi berkas:"
+#: ../data/ui/preferences.ui.h:34
+msgid "_Order when comparing file revisions:"
+msgstr "_Urutan ketika membandingkan revisi berkas:"
 
-#: ../data/ui/preferences.ui.h:33
+#: ../data/ui/preferences.ui.h:35
+msgid "Order when _merging files:"
+msgstr "Urutan ketika _merge berkas"
+
+#: ../data/ui/preferences.ui.h:36
 msgid "Commit Messages"
 msgstr "Pesan Komit"
 
-#: ../data/ui/preferences.ui.h:34
+#: ../data/ui/preferences.ui.h:37
 msgid "Show _right margin at:"
 msgstr "Tampilkan ma_rjin kanan pada:"
 
-#: ../data/ui/preferences.ui.h:35
+#: ../data/ui/preferences.ui.h:38
 msgid "Automatically _break lines at right margin on commit"
 msgstr "Otomatis lipat _baris pada marjin kanan saat komit"
 
-#: ../data/ui/preferences.ui.h:36
+#: ../data/ui/preferences.ui.h:39
 msgid "Version Control"
 msgstr "Kendali Versi"
 
-#: ../data/ui/preferences.ui.h:37
+#: ../data/ui/preferences.ui.h:40
+msgid "Filename filters"
+msgstr "Penyaring nama berkas"
+
+#: ../data/ui/preferences.ui.h:41
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -845,11 +895,23 @@ msgstr ""
 "direktori menurut namanya. Setiap pola adalah daftar dari wildcard gaya "
 "shell yang dipisahkan oleh spasi."
 
-#: ../data/ui/preferences.ui.h:38 ../meld/meldwindow.py:103
+#: ../data/ui/preferences.ui.h:42 ../meld/meldwindow.py:103
 msgid "File Filters"
 msgstr "Penyaring Berkas"
 
-#: ../data/ui/preferences.ui.h:39
+#: ../data/ui/preferences.ui.h:43
+msgid "Change trimming"
+msgstr "Ubah pemangkasan"
+
+#: ../data/ui/preferences.ui.h:44
+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:45
+msgid "Text filters"
+msgstr "Penyaring teks"
+
+#: ../data/ui/preferences.ui.h:46
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -863,15 +925,11 @@ msgstr ""
 "dilakukan. Bila ekspresi memuat grup, hanya grup tersebut yang diganti. "
 "Lihat manual pengguna untuk rincian lebih lanjut."
 
-#: ../data/ui/preferences.ui.h:40
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "Abaikan perubahan yang menyisipkan atau menghapus baris-baris kosong"
-
-#: ../data/ui/preferences.ui.h:41
+#: ../data/ui/preferences.ui.h:47
 msgid "Text Filters"
 msgstr "Penyaring Teks"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:581
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:623
 msgid "New comparison"
 msgstr "Perbandingan baru"
 
@@ -1064,57 +1122,57 @@ msgid "_Push commits"
 msgstr "_Push komit"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:373
+#: ../meld/dirdiff.py:381 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Ukuran"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:381
+#: ../meld/dirdiff.py:389 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Waktu modifikasi"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:389
+#: ../meld/dirdiff.py:397 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Ijin"
 
-#: ../meld/dirdiff.py:548
+#: ../meld/dirdiff.py:543
 #, python-format
 msgid "Hide %s"
 msgstr "Sembunyikan %s"
 
-#: ../meld/dirdiff.py:677 ../meld/dirdiff.py:699
+#: ../meld/dirdiff.py:672 ../meld/dirdiff.py:694
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Memindai %s"
 
-#: ../meld/dirdiff.py:828
+#: ../meld/dirdiff.py:823
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Selesai"
 
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:830
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Galat berganda terjadi ketika memindai folder ini"
 
-#: ../meld/dirdiff.py:836
+#: ../meld/dirdiff.py:831
 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:838
+#: ../meld/dirdiff.py:833
 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:840
+#: ../meld/dirdiff.py:835
 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:842
+#: ../meld/dirdiff.py:837
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1123,17 +1181,17 @@ msgstr ""
 "sistem berkas yang peka huruf besar kecil. Berkas-berkas berikut dalam "
 "folder ini tersembunyi: "
 
-#: ../meld/dirdiff.py:853
+#: ../meld/dirdiff.py:848
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' disembunyikan oleh '%s'"
 
-#: ../meld/dirdiff.py:878 ../meld/filediff.py:1107 ../meld/filediff.py:1245
-#: ../meld/filediff.py:1421 ../meld/filediff.py:1451 ../meld/filediff.py:1453
+#: ../meld/dirdiff.py:873 ../meld/filediff.py:1124 ../meld/filediff.py:1275
+#: ../meld/filediff.py:1451 ../meld/filediff.py:1481 ../meld/filediff.py:1483
 msgid "Hi_de"
 msgstr "Sem_bunyikan"
 
-#: ../meld/dirdiff.py:909
+#: ../meld/dirdiff.py:904
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -1142,11 +1200,11 @@ msgstr ""
 "'%s' sudah ada.\n"
 "Timpa?"
 
-#: ../meld/dirdiff.py:917
+#: ../meld/dirdiff.py:912
 msgid "Error copying file"
 msgstr "Galat saat menyalin berkas"
 
-#: ../meld/dirdiff.py:918
+#: ../meld/dirdiff.py:913
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1159,192 +1217,192 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:941
+#: ../meld/dirdiff.py:936
 #, python-format
 msgid "Error deleting %s"
 msgstr "Galat saat menghapus %s"
 
-#: ../meld/filediff.py:234
+#: ../meld/filediff.py:243
 msgid "Format as Patch..."
 msgstr "Format sebagai Patch..."
 
-#: ../meld/filediff.py:235
+#: ../meld/filediff.py:244
 msgid "Create a patch using differences between files"
 msgstr "Buat patch memakai perbedaan antar berkas"
 
-#: ../meld/filediff.py:237
+#: ../meld/filediff.py:246
 msgid "Save A_ll"
 msgstr "Simpan Semu_a"
 
-#: ../meld/filediff.py:238
+#: ../meld/filediff.py:247
 msgid "Save all files in the current comparison"
 msgstr "Simpan semua berkas dalam perbandingan saat ini"
 
-#: ../meld/filediff.py:241
+#: ../meld/filediff.py:250
 msgid "Revert files to their saved versions"
 msgstr "Kembalikan berkas ke versi tersimpan"
 
-#: ../meld/filediff.py:243
+#: ../meld/filediff.py:252
 msgid "Add Synchronization Point"
 msgstr "Tambahkan Titik Sinkronisasi"
 
-#: ../meld/filediff.py:244
+#: ../meld/filediff.py:253
 msgid "Add a manual point for synchronization of changes between files"
 msgstr "Tambahkan satu titik manual untuk sinkronisasi perubahan antar berkas"
 
-#: ../meld/filediff.py:247
+#: ../meld/filediff.py:256
 msgid "Clear Synchronization Points"
 msgstr "Bersihkan Titik Sinkronisasi"
 
-#: ../meld/filediff.py:248
+#: ../meld/filediff.py:257
 msgid "Clear manual change sychronization points"
 msgstr "Bersihkan perubahan manual titik-titik sinkronisasi"
 
-#: ../meld/filediff.py:250
+#: ../meld/filediff.py:259
 msgid "Previous Conflict"
 msgstr "Konflik Sebelumnya"
 
-#: ../meld/filediff.py:251
+#: ../meld/filediff.py:260
 msgid "Go to the previous conflict"
 msgstr "Pindah ke konflik sebelumnya"
 
-#: ../meld/filediff.py:253
+#: ../meld/filediff.py:262
 msgid "Next Conflict"
 msgstr "Konflik Selanjutnya"
 
-#: ../meld/filediff.py:254
+#: ../meld/filediff.py:263
 msgid "Go to the next conflict"
 msgstr "Pindah ke konflik selanjutnya"
 
-#: ../meld/filediff.py:256
+#: ../meld/filediff.py:265
 msgid "Push to Left"
 msgstr "Push ke Kiri"
 
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:266
 msgid "Push current change to the left"
 msgstr "Push perubahan saat ini ke kiri"
 
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:269
 msgid "Push to Right"
 msgstr "Push ke Kanan"
 
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:270
 msgid "Push current change to the right"
 msgstr "Push perubahan saat ini ke kanan"
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:274
 msgid "Pull from Left"
 msgstr "Pull dari Kiri"
 
-#: ../meld/filediff.py:266
+#: ../meld/filediff.py:275
 msgid "Pull change from the left"
 msgstr "Pull perubahan dari kiri"
 
-#: ../meld/filediff.py:269
+#: ../meld/filediff.py:278
 msgid "Pull from Right"
 msgstr "Pull dari Kanan"
 
-#: ../meld/filediff.py:270
+#: ../meld/filediff.py:279
 msgid "Pull change from the right"
 msgstr "Pull perubahan dari kanan"
 
-#: ../meld/filediff.py:272
+#: ../meld/filediff.py:281
 msgid "Copy Above Left"
 msgstr "Salin Di Atas Kiri"
 
-#: ../meld/filediff.py:273
+#: ../meld/filediff.py:282
 msgid "Copy change above the left chunk"
 msgstr "Salin perubahan di atas chunk kiri"
 
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:284
 msgid "Copy Below Left"
 msgstr "Salin Di Bawah Kiri"
 
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:285
 msgid "Copy change below the left chunk"
 msgstr "Salin perubahan di bawah chunk kiri"
 
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:287
 msgid "Copy Above Right"
 msgstr "Salin Di Atas Kanan"
 
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:288
 msgid "Copy change above the right chunk"
 msgstr "Salin perubahan di atas chunk kanan"
 
-#: ../meld/filediff.py:281
+#: ../meld/filediff.py:290
 msgid "Copy Below Right"
 msgstr "Salin Di Bawah Kanan"
 
-#: ../meld/filediff.py:282
+#: ../meld/filediff.py:291
 msgid "Copy change below the right chunk"
 msgstr "Salin perubahan di bawah chunk kanan"
 
-#: ../meld/filediff.py:284
+#: ../meld/filediff.py:293
 msgid "Delete"
 msgstr "Hapus"
 
-#: ../meld/filediff.py:285
+#: ../meld/filediff.py:294
 msgid "Delete change"
 msgstr "Hapus perubahan"
 
-#: ../meld/filediff.py:287
+#: ../meld/filediff.py:296
 msgid "Merge All from Left"
 msgstr "Merge Semua dari Kiri"
 
-#: ../meld/filediff.py:288
+#: ../meld/filediff.py:297
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Merge semua perubahan yang tak konflik dari kiri"
 
-#: ../meld/filediff.py:290
+#: ../meld/filediff.py:299
 msgid "Merge All from Right"
 msgstr "Merge Semua dari Kanan"
 
-#: ../meld/filediff.py:291
+#: ../meld/filediff.py:300
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Merge semua perubahan yang tak konflik dari kanan"
 
-#: ../meld/filediff.py:293
+#: ../meld/filediff.py:302
 msgid "Merge All"
 msgstr "Merge Semua"
 
-#: ../meld/filediff.py:294
+#: ../meld/filediff.py:303
 msgid "Merge all non-conflicting changes from left and right panes"
 msgstr "Merge semua perubahan yang tak konflik dari panel kiri dan kanan"
 
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:307
 msgid "Cycle Through Documents"
 msgstr "Berpindah Antar Dokumen"
 
-#: ../meld/filediff.py:299
+#: ../meld/filediff.py:308
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr ""
 "Pindahkan fokus papan tik ke dokumen selanjutnya dalam perbandingan ini"
 
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:314
 msgid "Lock Scrolling"
 msgstr "Kunci Pengguliran"
 
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:315
 msgid "Lock scrolling of all panes"
 msgstr "Kunci pengguliran semua panel"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:493
+#: ../meld/filediff.py:472
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:493
+#: ../meld/filediff.py:472
 msgid "OVR"
 msgstr "OVR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:495
+#: ../meld/filediff.py:474
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Brs %i, Kol %i"
 
-#: ../meld/filediff.py:832
+#: ../meld/filediff.py:821
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -1353,55 +1411,74 @@ msgstr ""
 "Penyaring '%s' mengubah cacah baris dalam berkas. Perbandingan akan salah. "
 "Lihat manual pengguna untuk rincian lebih lanjut."
 
-#: ../meld/filediff.py:1095
+#: ../meld/filediff.py:890
+msgid "Mark conflict as resolved?"
+msgstr "Tandai konflik sebagai terselesaikan?"
+
+#: ../meld/filediff.py:892
+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:894
+msgid "Cancel"
+msgstr "Batal"
+
+#: ../meld/filediff.py:895
+msgid "Mark _Resolved"
+msgstr "Tandai Te_rselesaikan"
+
+#: ../meld/filediff.py:1111
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Tata cacah panel"
 
-#: ../meld/filediff.py:1101
+#: ../meld/filediff.py:1118
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Membuka berkas"
 
-#: ../meld/filediff.py:1124 ../meld/filediff.py:1134 ../meld/filediff.py:1147
-#: ../meld/filediff.py:1153
+#: ../meld/filediff.py:1141 ../meld/filediff.py:1151 ../meld/filediff.py:1164
+#: ../meld/filediff.py:1170
 msgid "Could not read file"
 msgstr "Tak bisa baca berkas"
 
-#: ../meld/filediff.py:1125
+#: ../meld/filediff.py:1142
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Membaca berkas"
 
-#: ../meld/filediff.py:1135
+#: ../meld/filediff.py:1152
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s nampaknya berkas biner."
 
-#: ../meld/filediff.py:1148
+#: ../meld/filediff.py:1165
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s tidak dalam pengkodean: %s"
 
-#: ../meld/filediff.py:1183
+#: ../meld/filediff.py:1203
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Menghitung perbedaan"
 
-#: ../meld/filediff.py:1240
+#: ../meld/filediff.py:1270
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Berkas %s telah berubah pada disk"
 
-#: ../meld/filediff.py:1241
+#: ../meld/filediff.py:1271
 msgid "Do you want to reload the file?"
 msgstr "Apakah Anda ingin memuat ulang berkas?"
 
-#: ../meld/filediff.py:1244
+#: ../meld/filediff.py:1274
 msgid "_Reload"
 msgstr "Muat _Ulang"
 
-#: ../meld/filediff.py:1410
+#: ../meld/filediff.py:1440
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1409,19 +1486,19 @@ msgstr ""
 "Penyaring teks sedang dipakai, dan mungkin menutupi perbedaan antara berkas. "
 "Apakah Anda ingin membandingkan berkas-berkas yang tak tersaring?"
 
-#: ../meld/filediff.py:1416
+#: ../meld/filediff.py:1446
 msgid "Files are identical"
 msgstr "Berkas identik"
 
-#: ../meld/filediff.py:1424
+#: ../meld/filediff.py:1454
 msgid "Show without filters"
 msgstr "Tampilkan tanpa penyaring"
 
-#: ../meld/filediff.py:1446
+#: ../meld/filediff.py:1476
 msgid "Change highlighting incomplete"
 msgstr "Penyorotan perubahan tak lengkap"
 
-#: ../meld/filediff.py:1447
+#: ../meld/filediff.py:1477
 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."
@@ -1430,15 +1507,15 @@ msgstr ""
 "untuk lebih panjanga sehingga menyorot perubahan yang lebih besar, walaupun "
 "ini mungkin lambat."
 
-#: ../meld/filediff.py:1455
+#: ../meld/filediff.py:1485
 msgid "Keep highlighting"
 msgstr "Tetap menyorot"
 
-#: ../meld/filediff.py:1457
+#: ../meld/filediff.py:1487
 msgid "_Keep highlighting"
 msgstr "_Tetap menyorot"
 
-#: ../meld/filediff.py:1588
+#: ../meld/filediff.py:1618
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -1447,7 +1524,7 @@ msgstr ""
 "\"%s\" sudah ada!\n"
 "Timpa?"
 
-#: ../meld/filediff.py:1601
+#: ../meld/filediff.py:1631
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -1458,36 +1535,36 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1612
+#: ../meld/filediff.py:1642
 msgid "Save Left Pane As"
 msgstr "Simpan Panel Kiri Sebagai"
 
-#: ../meld/filediff.py:1614
+#: ../meld/filediff.py:1644
 msgid "Save Middle Pane As"
 msgstr "Simpan Panel Tengah Sebagai"
 
-#: ../meld/filediff.py:1616
+#: ../meld/filediff.py:1646
 msgid "Save Right Pane As"
 msgstr "Simpan Panel Kanan Sebagai"
 
-#: ../meld/filediff.py:1627
+#: ../meld/filediff.py:1659
 #, 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:1629
+#: ../meld/filediff.py:1661
 msgid "If you save it, any external changes will be lost."
 msgstr "Bila Anda menyimpannya, perubahan eksternal akan hilang."
 
-#: ../meld/filediff.py:1632
+#: ../meld/filediff.py:1664
 msgid "Save Anyway"
 msgstr "Simpan Saja"
 
-#: ../meld/filediff.py:1633
+#: ../meld/filediff.py:1665
 msgid "Don't Save"
 msgstr "Jangan Simpan"
 
-#: ../meld/filediff.py:1657
+#: ../meld/filediff.py:1689
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -1498,7 +1575,7 @@ msgstr ""
 "\n"
 "Format mana yang ingin Anda pakai?"
 
-#: ../meld/filediff.py:1673
+#: ../meld/filediff.py:1705
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -1507,11 +1584,11 @@ msgstr ""
 "'%s' memuat karakter yang tak bisa dienkode dengan '%s'\n"
 "Apakah Anda ingin menyimpan sebagai UTF-8?"
 
-#: ../meld/filediff.py:2032
+#: ../meld/filediff.py:2068
 msgid "Live comparison updating disabled"
 msgstr "Pemutakhiran perbandingan live dinonaktifkan"
 
-#: ../meld/filediff.py:2033
+#: ../meld/filediff.py:2069
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1527,101 +1604,106 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] Sedang merge berkas"
 
-#: ../meld/gutterrendererchunk.py:91
+#: ../meld/gutterrendererchunk.py:90
 msgid "Copy _up"
 msgstr "Salin _naik"
 
-#: ../meld/gutterrendererchunk.py:92
+#: ../meld/gutterrendererchunk.py:91
 msgid "Copy _down"
 msgstr "Salin _turun"
 
-#: ../meld/meldapp.py:160
+#: ../meld/meldapp.py:170
 msgid "wrong number of arguments supplied to --diff"
 msgstr "banyaknya argumen yang diberikan ke --diff salah"
 
-#: ../meld/meldapp.py:165
+#: ../meld/meldapp.py:175
 msgid "Start with an empty window"
 msgstr "Mulai dengan jendela kosong"
 
-#: ../meld/meldapp.py:166 ../meld/meldapp.py:168
+#: ../meld/meldapp.py:176 ../meld/meldapp.py:178
 msgid "file"
 msgstr "berkas"
 
-#: ../meld/meldapp.py:166 ../meld/meldapp.py:170
+#: ../meld/meldapp.py:176 ../meld/meldapp.py:180
 msgid "folder"
 msgstr "folder"
 
-#: ../meld/meldapp.py:167
+#: ../meld/meldapp.py:177
 msgid "Start a version control comparison"
 msgstr "Mulai suatu perbandingan kendali versi"
 
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:179
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Mulai perbandingan berkas 2 atau 3 pihak"
 
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:181
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Mulai perbandingan folder 2 atau 3 pihak"
 
-#: ../meld/meldapp.py:209
+#: ../meld/meldapp.py:224
+#, python-format
+msgid "Error: %s\n"
+msgstr "Galat: %s\n"
+
+#: ../meld/meldapp.py:231
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld adalah alat perbandingan berkas dan direktori."
 
-#: ../meld/meldapp.py:213
+#: ../meld/meldapp.py:235
 msgid "Set label to use instead of file name"
 msgstr "Tata label yang akan dipakai sebagai ganti nama berkas"
 
-#: ../meld/meldapp.py:216
+#: ../meld/meldapp.py:238
 msgid "Open a new tab in an already running instance"
 msgstr "Buka tab baru pada instansi yang sedang berjalan"
 
-#: ../meld/meldapp.py:219
+#: ../meld/meldapp.py:241
 msgid "Automatically compare all differing files on startup"
 msgstr "Otomatis membandingkan semua berkas yang berbeda saat awal mula"
 
-#: ../meld/meldapp.py:222
+#: ../meld/meldapp.py:244
 msgid "Ignored for compatibility"
 msgstr "Diabaikan untuk kompatibilitas"
 
-#: ../meld/meldapp.py:226
+#: ../meld/meldapp.py:248
 msgid "Set the target file for saving a merge result"
 msgstr "Tata berkas target untuk menyimpan hasil merge"
 
-#: ../meld/meldapp.py:229
+#: ../meld/meldapp.py:251
 msgid "Automatically merge files"
 msgstr "Otomatis me-merge berkas"
 
-#: ../meld/meldapp.py:233
+#: ../meld/meldapp.py:255
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Muat perbandingan yang disimpan dari suatu berkas perbandingan Meld"
 
-#: ../meld/meldapp.py:237
+#: ../meld/meldapp.py:259
 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:249
+#: ../meld/meldapp.py:279
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "terlalu banyak argumen (diinginkan 0-3, diperoleh %d)"
 
-#: ../meld/meldapp.py:252
+#: ../meld/meldapp.py:282
 msgid "can't auto-merge less than 3 files"
 msgstr "tak bisa merge otomatis kurang dari 3 berkas"
 
-#: ../meld/meldapp.py:254
+#: ../meld/meldapp.py:284
 msgid "can't auto-merge directories"
 msgstr "tak bisa merge otomatis direktori"
 
-#: ../meld/meldapp.py:264
+#: ../meld/meldapp.py:298
 msgid "Error reading saved comparison file"
 msgstr "Galat saat membaca berkas perbandingan yang disimpan"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:125
+#: ../meld/meldbuffer.py:131
 msgid "<unnamed>"
 msgstr "<tanpa nama>"
 
-#: ../meld/melddoc.py:76 ../meld/melddoc.py:77
+#: ../meld/melddoc.py:78 ../meld/melddoc.py:79
 msgid "untitled"
 msgstr "tanpa judul"
 
@@ -1817,16 +1899,44 @@ msgstr "Buka Terkini"
 msgid "Open recent files"
 msgstr "Buka berkas yang baru-baru ini"
 
-#: ../meld/meldwindow.py:504
+#: ../meld/meldwindow.py:164
+msgid "_Meld"
+msgstr "_Meld"
+
+#: ../meld/meldwindow.py:165
+msgid "Quit the program"
+msgstr "Keluar program"
+
+#: ../meld/meldwindow.py:167
+msgid "Prefere_nces"
+msgstr "Prefere_nsi"
+
+#: ../meld/meldwindow.py:168
+msgid "Configure the application"
+msgstr "Atur konfigurasi aplikasi"
+
+#: ../meld/meldwindow.py:170
+msgid "_Contents"
+msgstr "_Isi"
+
+#: ../meld/meldwindow.py:171
+msgid "Open the Meld manual"
+msgstr "Buka manual Meld"
+
+#: ../meld/meldwindow.py:173
+msgid "About this application"
+msgstr "Tentang aplikasi ini"
+
+#: ../meld/meldwindow.py:546
 msgid "Switch to this tab"
 msgstr "Tukar ke tab ini"
 
-#: ../meld/meldwindow.py:625
+#: ../meld/meldwindow.py:669
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Tak bisa membandingkan campuran berkas dan direktori"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:179
+#: ../meld/misc.py:213
 msgid "[None]"
 msgstr "[Nihil]"
 
@@ -1838,11 +1948,11 @@ msgstr "label"
 msgid "pattern"
 msgstr "pola"
 
-#: ../meld/recent.py:105
+#: ../meld/recent.py:114
 msgid "Version control:"
 msgstr "Kendali versi:"
 
-#: ../meld/ui/findbar.py:141
+#: ../meld/ui/findbar.py:144
 msgid "Regular expression error"
 msgstr "Galat ekspresi reguler"
 
@@ -1875,7 +1985,7 @@ msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "%d branch"
 
-#: ../meld/vc/git.py:344
+#: ../meld/vc/git.py:348
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Mode diubah dari %s ke %s"
@@ -1909,91 +2019,130 @@ msgid "Newly added"
 msgstr "Baru ditambahkan"
 
 #: ../meld/vc/_vc.py:72
+msgid "Renamed"
+msgstr "Diubah nama"
+
+#: ../meld/vc/_vc.py:73
 msgid "Conflict"
 msgstr "Konflik"
 
-#: ../meld/vc/_vc.py:73
+#: ../meld/vc/_vc.py:74
 msgid "Removed"
 msgstr "Dihapus"
 
-#: ../meld/vc/_vc.py:74
+#: ../meld/vc/_vc.py:75
 msgid "Missing"
 msgstr "Kurang"
 
-#: ../meld/vc/_vc.py:75
+#: ../meld/vc/_vc.py:76
 msgid "Not present"
 msgstr "Tak ada"
 
-#: ../meld/vcview.py:215 ../meld/vcview.py:387
+#: ../meld/vcview.py:233 ../meld/vcview.py:417
 msgid "Location"
 msgstr "Lokasi"
 
-#: ../meld/vcview.py:216
+#: ../meld/vcview.py:234
 msgid "Status"
 msgstr "Status"
 
-#: ../meld/vcview.py:217
+#: ../meld/vcview.py:235
 msgid "Revision"
 msgstr "Revisi"
 
-#: ../meld/vcview.py:218
+#: ../meld/vcview.py:236
 msgid "Options"
 msgstr "Opsi"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:298
+#: ../meld/vcview.py:324
 #, python-format
 msgid "%s not installed"
 msgstr "%s tidak terpasang"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:302
+#: ../meld/vcview.py:328
 msgid "Invalid repository"
 msgstr "Repositori tak valid"
 
-#: ../meld/vcview.py:311
+#: ../meld/vcview.py:337
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:313 ../meld/vcview.py:321
+#: ../meld/vcview.py:339 ../meld/vcview.py:347
 msgid "None"
 msgstr "Nihil"
 
-#: ../meld/vcview.py:332
+#: ../meld/vcview.py:358
 msgid "No valid version control system found in this folder"
 msgstr "Tak ada sistem kendali versi yang valid dalam folder ini"
 
-#: ../meld/vcview.py:334
+#: ../meld/vcview.py:360
 msgid "Only one version control system found in this folder"
 msgstr "Hanya satu sistem kendali versi ditemukan dalam folder ini"
 
-#: ../meld/vcview.py:336
+#: ../meld/vcview.py:362
 msgid "Choose which version control system to use"
 msgstr "Pilih sistem kendali mana yang akan dipakai"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:387
+#: ../meld/vcview.py:417
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:401 ../meld/vcview.py:409
+#: ../meld/vcview.py:431 ../meld/vcview.py:439
 #, python-format
 msgid "Scanning %s"
 msgstr "Memindai %s"
 
-#: ../meld/vcview.py:444
+#: ../meld/vcview.py:479
 msgid "(Empty)"
 msgstr "(Kosong)"
 
-#: ../meld/vcview.py:668
+#: ../meld/vcview.py:522
+#, python-format
+msgid "%s — local"
+msgstr "%s — lokal"
+
+#: ../meld/vcview.py:523
+#, python-format
+msgid "%s — remote"
+msgstr "%s — remote"
+
+#: ../meld/vcview.py:531
+#, python-format
+msgid "%s (local, merge, remote)"
+msgstr "%s (lokal, merge, remote)"
+
+#: ../meld/vcview.py:536
+#, python-format
+msgid "%s (remote, merge, local)"
+msgstr "%s (remote, merge, lokal)"
+
+#: ../meld/vcview.py:547
+#, python-format
+msgid "%s — repository"
+msgstr "%s — repositori"
+
+#: ../meld/vcview.py:553
+#, python-format
+msgid "%s (working, repository)"
+msgstr "%s (kerja, repositori)"
+
+#: ../meld/vcview.py:557
+#, python-format
+msgid "%s (repository, working)"
+msgstr "%s (repositori, kerja)"
+
+#: ../meld/vcview.py:741
 msgid "Remove folder and all its files?"
 msgstr "Hapus folder dan semua berkasnya?"
 
-#: ../meld/vcview.py:670
+#: ../meld/vcview.py:743
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2001,7 +2150,7 @@ 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:704
+#: ../meld/vcview.py:777
 #, python-format
 msgid "Error removing %s"
 msgstr "Galat saat menghapus %s"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]