[c3ea99f86b2f8a74ef4145bb245155ff5f91cd856f287523481c15a1959d5fd1] Update Indonesian translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [c3ea99f86b2f8a74ef4145bb245155ff5f91cd856f287523481c15a1959d5fd1] Update Indonesian translation
- Date: Wed, 8 Jul 2020 03:43:02 +0000 (UTC)
commit f56f653c276cfbeacf358f8afca8ede637c6d4bb
Author: Andika Triwidada <atriwidada gnome org>
Date: Wed Jul 8 03:42:59 2020 +0000
Update Indonesian translation
po/id.po | 2005 +++++++++++++++++++++++++++++---------------------------------
1 file changed, 937 insertions(+), 1068 deletions(-)
---
diff --git a/po/id.po b/po/id.po
index 4da0d08b..7a2ea87a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,60 +7,36 @@ msgid ""
msgstr ""
"Project-Id-Version: meld master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\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"
+"POT-Creation-Date: 2020-07-02 17:08+0000\n"
+"PO-Revision-Date: 2020-07-08 10:41+0700\n"
+"Last-Translator: Andika Triwidada <andika gmail com>\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=2; plural= n!=1;\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.3.1\n"
-#: ../bin/meld:190
-msgid "Cannot import: "
-msgstr "Tak bisa mengimpor: "
-
-#: ../bin/meld:193
-#, c-format
-msgid "Meld requires %s or higher."
-msgstr "Meld memerlukan %s atau lebih tinggi."
-
-#: ../bin/meld:262
-#, c-format
-msgid ""
-"Couldn’t load Meld-specific CSS (%s)\n"
-"%s"
-msgstr ""
-"Tak bisa memuat CSS spesifik Meld (%s)\n"
-"%s"
-
-#: ../data/org.gnome.meld.desktop.in.h:1
-#: ../data/org.gnome.meld.appdata.xml.in.h:1
-#: ../meld/resources/ui/appwindow.ui.h:1
+#: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
+#: meld/resources/ui/appwindow.ui:9
msgid "Meld"
msgstr "Meld"
-#: ../data/org.gnome.meld.desktop.in.h:2
+#: data/org.gnome.meld.desktop.in.in:4
msgid "Diff Viewer"
msgstr "Penampil Diff"
-#: ../data/org.gnome.meld.desktop.in.h:3
-msgid "Meld Diff Viewer"
-msgstr "Meld Penampil Diff"
-
-#: ../data/org.gnome.meld.desktop.in.h:4
-#: ../data/org.gnome.meld.appdata.xml.in.h:2
+#: data/org.gnome.meld.desktop.in.in:5 data/org.gnome.meld.appdata.xml.in.in:12
msgid "Compare and merge your files"
msgstr "Membandingkan dan menggabung berkas-berkas Anda"
#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list
MUST also end with a semicolon!
-#: ../data/org.gnome.meld.desktop.in.h:6
+#: data/org.gnome.meld.desktop.in.in:7
msgid "diff;merge;"
msgstr "diff;merge;"
-#: ../data/org.gnome.meld.appdata.xml.in.h:3
+#: data/org.gnome.meld.appdata.xml.in.in:14
msgid ""
"Meld is a visual diff and merge tool targeted at developers. Meld helps you "
"compare files, directories, and version controlled projects. It provides "
@@ -73,7 +49,7 @@ msgstr ""
"berkas dan direktori, dan mendukung banyak kendali sistem versi termasuk "
"Git, Mercurial, Bazaar, dan Subversion."
-#: ../data/org.gnome.meld.appdata.xml.in.h:4
+#: data/org.gnome.meld.appdata.xml.in.in:21
msgid ""
"Meld helps you review code changes, understand patches, and makes enormous "
"merge conflicts slightly less painful."
@@ -81,35 +57,35 @@ msgstr ""
"Meld membantu Anda meninjau perubahan kode, memahami patch, dan membuat "
"konflik merge yang besar sedikit lebih mudah."
-#: ../data/org.gnome.meld.appdata.xml.in.h:5
+#: data/org.gnome.meld.appdata.xml.in.in:51
msgid "The GNOME Project"
msgstr "Proyek GNOME"
-#: ../data/mime/org.gnome.meld.xml.in.h:1
+#: data/mime/org.gnome.meld.xml.in:4
msgid "Meld comparison description"
msgstr "Deskripsi perbandingan Meld"
-#: ../data/org.gnome.meld.gschema.xml.h:1
+#: data/org.gnome.meld.gschema.xml:37
msgid "Default window width"
msgstr "Lebar jendela baku"
-#: ../data/org.gnome.meld.gschema.xml.h:2
+#: data/org.gnome.meld.gschema.xml:41
msgid "Default window height"
msgstr "Tinggi jendela baku"
-#: ../data/org.gnome.meld.gschema.xml.h:3
+#: data/org.gnome.meld.gschema.xml:45
msgid "Default window maximised state"
msgstr "Keadaan termaksimalkan jendela baku"
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: data/org.gnome.meld.gschema.xml:49
msgid "Default window fullscreen state"
msgstr "Keadaan layar penuh jendela baku"
-#: ../data/org.gnome.meld.gschema.xml.h:5
+#: data/org.gnome.meld.gschema.xml:58
msgid "Additional automatically detected text encodings"
msgstr "Tambahan enkoding teks yang dideteksi secara otomatis"
-#: ../data/org.gnome.meld.gschema.xml.h:6
+#: data/org.gnome.meld.gschema.xml:59
msgid ""
"Meld will use these text encodings to try to decode loaded text files before "
"trying any other encodings. In addition to the encodings in this list, UTF-8 "
@@ -122,40 +98,39 @@ msgstr ""
"selalu dipakai; encoding lain mungkin juga dicoba, bergantung kepada locale "
"pengguna."
-#: ../data/org.gnome.meld.gschema.xml.h:7
+#: data/org.gnome.meld.gschema.xml:66
msgid "Width of an indentation step"
msgstr "Lebar langkah indentasi"
-#: ../data/org.gnome.meld.gschema.xml.h:8
+#: data/org.gnome.meld.gschema.xml:67
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:9
+#: data/org.gnome.meld.gschema.xml:71
msgid "Whether to indent using spaces or tabs"
msgstr "Apakah indentasi memakai spasi atau tab"
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: data/org.gnome.meld.gschema.xml:72
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:11
-#: ../meld/resources/ui/statusbar-menu.ui.h:1
+#: data/org.gnome.meld.gschema.xml:76 meld/resources/ui/statusbar-menu.ui:5
msgid "Show line numbers"
msgstr "Tampilkan nomor baris"
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: data/org.gnome.meld.gschema.xml:77
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:13
+#: data/org.gnome.meld.gschema.xml:81
msgid "Highlight syntax"
msgstr "Sorot sintaks"
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: data/org.gnome.meld.gschema.xml:82
msgid ""
"Whether to highlight syntax in comparisons. Because of Meld’s own color "
"highlighting, this is off by default."
@@ -163,33 +138,35 @@ msgstr ""
"Apakah menyorot sintaks dalam perbandingan. Karena warna penyorotan milik "
"Meld, ini secara baku mati."
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: data/org.gnome.meld.gschema.xml:86
msgid "Color scheme to use for syntax highlighting"
msgstr "Skema warna yang digunakan untuk penyorotan sintaks"
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: data/org.gnome.meld.gschema.xml:87
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:17
-msgid "Displayed whitespace"
-msgstr "Whitespace yang ditampilkan"
+#: data/org.gnome.meld.gschema.xml:91
+#, fuzzy
+#| msgid "Show whitespace"
+msgid "Draw whitespace"
+msgstr "Tampilkan whitespace"
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: data/org.gnome.meld.gschema.xml:92
+#, fuzzy
msgid ""
-"Selector for individual whitespace character types to be shown. Possible "
-"values are 'space', 'tab', 'newline' and 'nbsp'."
+"If true, whitespace characters will be drawn in comparisons even if they are "
+"not in a changed area."
msgstr ""
-"Pemilih bagi tipe karakter whitespace individu yang akan ditampilkan. Nilai "
-"yang mungkin adalah 'space' (spasi), 'tab', 'newline' (baris baru), dan "
-"'nbsp' (spasi tak putus)."
+"Jika benar, karakter spasi akan ditarik dalam perbandingan bahkan jika "
+"mereka tidak berada di area yang berubah."
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: data/org.gnome.meld.gschema.xml:101
msgid "Wrap mode"
msgstr "Mode lipat"
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: data/org.gnome.meld.gschema.xml:102
msgid ""
"Lines in file comparisons will be wrapped according to this setting, either "
"not at all ('none'), at any character ('char') or only at the end of words "
@@ -199,12 +176,11 @@ msgstr ""
"tidak sedikitpun ('none'), pada sebarang karakter ('char'), atau hanya pada "
"akhir kata ('word')."
-#: ../data/org.gnome.meld.gschema.xml.h:21
-#: ../meld/resources/ui/statusbar-menu.ui.h:3
+#: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
msgid "Highlight current line"
msgstr "Sorot baris saat ini"
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: data/org.gnome.meld.gschema.xml:110
msgid ""
"If true, the line containing the cursor will be highlighted in file "
"comparisons."
@@ -212,22 +188,22 @@ msgstr ""
"Bila berisi true, baris yang memuat kursor akan disorot dalam perbandingan "
"berkas."
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: data/org.gnome.meld.gschema.xml:114
msgid "Use the system default monospace font"
msgstr "Gunakan fonta monospace bawaan sistem"
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: data/org.gnome.meld.gschema.xml:115
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:25
+#: data/org.gnome.meld.gschema.xml:119
msgid "Custom font"
msgstr "Fonta ubahan"
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: data/org.gnome.meld.gschema.xml:120
msgid ""
"The custom font to use, stored as a string and parsed as a Pango font "
"description."
@@ -235,22 +211,45 @@ msgstr ""
"Fonta ubahan yang dipakai, disimpan sebagai suatu string dan diurai sebagai "
"suatu deskripsi fonta Pango."
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: data/org.gnome.meld.gschema.xml:126
+#, fuzzy
+msgid "Show overview source map"
+msgstr "Tampilkan Ikhtisar peta sumber"
+
+#: data/org.gnome.meld.gschema.xml:127
+#, fuzzy
+msgid ""
+"If true, file comparisons will have paired source maps for compared files."
+msgstr ""
+"Jika benar, perbandingan file akan memiliki peta sumber berpasangan untuk "
+"file yang dibandingkan."
+
+#: data/org.gnome.meld.gschema.xml:132
+#, fuzzy
+msgid "Style of overview map"
+msgstr "Gaya peta Ikhtisar"
+
+#: data/org.gnome.meld.gschema.xml:133
+#, fuzzy
+msgid "Style options for how the overview map is displayed."
+msgstr "Pilihan style untuk bagaimana peta Overview ditampilkan."
+
+#: data/org.gnome.meld.gschema.xml:139
msgid "Ignore blank lines when comparing files"
msgstr "Abaikan baris kosong ketika membandingkan berkas"
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: data/org.gnome.meld.gschema.xml:140
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:29
+#: data/org.gnome.meld.gschema.xml:147
msgid "Use the system default editor"
msgstr "Gunakan penyunting bawaan sistem"
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: data/org.gnome.meld.gschema.xml:148
msgid ""
"If false, custom-editor-command will be used instead of the system editor "
"when opening files externally."
@@ -258,11 +257,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:31
+#: data/org.gnome.meld.gschema.xml:152
msgid "The custom editor launch command"
msgstr "Perintah peluncuran penyunting ubahan"
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: data/org.gnome.meld.gschema.xml:153
msgid ""
"The command used to launch a custom editor. Some limited templating is "
"supported here; at the moment '{file}' and '{line}' are recognised tokens."
@@ -271,11 +270,11 @@ msgstr ""
"penemplatan yang terbatas didukung di sini; saat ini '{file}' dan '{line}' "
"adalah token yang dikenal."
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: data/org.gnome.meld.gschema.xml:159
msgid "Columns to display"
msgstr "Kolom yang akan ditampilkan"
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: data/org.gnome.meld.gschema.xml:160
msgid ""
"List of column names in folder comparison and whether they should be "
"displayed."
@@ -283,12 +282,11 @@ msgstr ""
"Daftar nama kolom dalam perbandingan folder dan apakah mereka mesti "
"ditampilkan."
-#: ../data/org.gnome.meld.gschema.xml.h:35
-#: ../meld/resources/ui/preferences.ui.h:25
+#: data/org.gnome.meld.gschema.xml:164 meld/resources/ui/preferences.ui:935
msgid "Ignore symbolic links"
msgstr "Abaikan taut simbolik"
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: data/org.gnome.meld.gschema.xml:165
msgid ""
"If true, folder comparisons do not follow symbolic links when traversing the "
"folder tree."
@@ -296,11 +294,11 @@ msgstr ""
"Bila berisi true, perbandingan folder tidak mengikuti taut simbolik ketika "
"menelusuri pohon folder."
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: data/org.gnome.meld.gschema.xml:169
msgid "Use shallow comparison"
msgstr "Gunakan perbandingan dangkal"
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: data/org.gnome.meld.gschema.xml:170
msgid ""
"If true, folder comparisons compare files based solely on size and mtime, "
"considering files to be identical if their size and mtime match, and "
@@ -310,11 +308,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:39
+#: data/org.gnome.meld.gschema.xml:174
msgid "File timestamp resolution"
msgstr "Resolusi penanda waktu"
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: data/org.gnome.meld.gschema.xml:175
msgid ""
"When comparing based on mtime, this is the minimum difference in nanoseconds "
"between two files before they’re considered to have different mtimes. This "
@@ -326,12 +324,11 @@ msgstr ""
"berbeda. Ini berguna ketika membandingkan berkas antar sistem berkas dengan "
"resolusi penanda waktu yang berbeda."
-#: ../data/org.gnome.meld.gschema.xml.h:41
-#: ../meld/resources/ui/preferences.ui.h:22
+#: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
msgid "Apply text filters during folder comparisons"
msgstr "Terapkan penyaring teks selama perbandingan folder"
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: data/org.gnome.meld.gschema.xml:180
msgid ""
"If true, folder comparisons that compare file contents also apply active "
"text filters and the blank line trimming option, and ignore newline "
@@ -341,21 +338,21 @@ msgstr ""
"menerapkan penyaring teks aktif dan opsi pemangkasan baris kosong, dan "
"mengabaikan perbedaan baris baru."
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: data/org.gnome.meld.gschema.xml:184
msgid "File status filters"
msgstr "Penyaring status berkas"
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: data/org.gnome.meld.gschema.xml:185
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:45
+#: data/org.gnome.meld.gschema.xml:191
msgid "Show the version control console output"
msgstr "Tampilkan keluaran konsol kendali versi"
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: data/org.gnome.meld.gschema.xml:192
msgid ""
"If true, a console output section will be shown in version control views, "
"showing the commands run for version control operations."
@@ -364,22 +361,22 @@ msgstr ""
"kendali versi, menunjukkan perintah yang dijalankan bagi operasi kendali "
"versi."
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: data/org.gnome.meld.gschema.xml:196
msgid "Version control pane position"
msgstr "Posisi panel kendali versi"
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: data/org.gnome.meld.gschema.xml:197
msgid ""
"This is the height of the main version control tree when the console pane is "
"shown."
msgstr ""
"Ini adalah tinggi phon kendali versi utama ketika panel konsol ditampilkan."
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: data/org.gnome.meld.gschema.xml:201
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:50
+#: data/org.gnome.meld.gschema.xml:202
msgid ""
"If true, version control comparisons will use a left-is-local, right-is-"
"remote scheme to determine what order to present files in panes. Otherwise, "
@@ -390,11 +387,11 @@ msgstr ""
"dalam panel. Bila tidak, skema left-adalah-milik-mereka, kanan-adalah-"
"milikku dipakai."
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: data/org.gnome.meld.gschema.xml:206
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:52
+#: data/org.gnome.meld.gschema.xml:207
msgid ""
"Choices for file order are remote/merged/local and local/merged/remote. This "
"preference only affects three-way comparisons launched from the version "
@@ -405,11 +402,11 @@ msgstr ""
"diluncurkan dari tilikan kendali versi, sehingga hanya dipakai untuk "
"resolusi merge/konflik di dalam Meld."
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: data/org.gnome.meld.gschema.xml:211
msgid "Show margin in commit message editor"
msgstr "Tampilkan marjin dalam penyunting pesan komit"
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: data/org.gnome.meld.gschema.xml:212
msgid ""
"If true, a guide will be displayed to show what column the margin is at in "
"the version control commit message editor."
@@ -417,11 +414,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:55
+#: data/org.gnome.meld.gschema.xml:216
msgid "Margin column in commit message editor"
msgstr "Marjin kolom dalam penyunting pesan komit"
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: data/org.gnome.meld.gschema.xml:217
msgid ""
"The column at which to show the margin in the version control commit message "
"editor."
@@ -429,11 +426,11 @@ msgstr ""
"Kolom tempat menunjukkan posisi marjin dalam penyunting pesan komit kendali "
"versi."
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: data/org.gnome.meld.gschema.xml:221
msgid "Automatically hard-wrap commit messages"
msgstr "Secara otomatis melipat isi pesan komit"
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: data/org.gnome.meld.gschema.xml:222
msgid ""
"If true, the version control commit message editor will hard-wrap (i.e., "
"insert line breaks) at the commit margin before commit."
@@ -441,22 +438,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:59
+#: data/org.gnome.meld.gschema.xml:226
msgid "Version control status filters"
msgstr "Penyaring status kendali versi"
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: data/org.gnome.meld.gschema.xml:227
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:61
+#: data/org.gnome.meld.gschema.xml:241
msgid "Filename-based filters"
msgstr "Penyaring berbasis nama berkas"
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: data/org.gnome.meld.gschema.xml:242
msgid ""
"List of predefined filename-based filters that, if active, will remove "
"matching files from a folder comparison."
@@ -464,11 +461,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:63
+#: data/org.gnome.meld.gschema.xml:256
msgid "Text-based filters"
msgstr "Penyaring berbasis teks"
-#: ../data/org.gnome.meld.gschema.xml.h:64
+#: data/org.gnome.meld.gschema.xml:257
msgid ""
"List of predefined text-based regex filters that, if active, will remove "
"text from being used in a file comparison. The text will still be displayed, "
@@ -478,639 +475,663 @@ msgstr ""
"menghapus teks agar tidak dipakai dalam perbandingan berkas. Teks masih akan "
"ditampilkan, tapi tak akan menyumbang ke perbandingan itu sendiri."
-#: ../data/styles/meld-base.xml.h:1
-msgid "Meld base scheme"
-msgstr "Skema basis Meld"
+#: data/styles/meld-base.style-scheme.xml.in:1
+#, fuzzy
+msgid "Classic (Meld)"
+msgstr "Klasik (Meld)"
-#: ../data/styles/meld-base.xml.h:2
+#: data/styles/meld-base.style-scheme.xml.in:3
msgid "Base color scheme for Meld highlighting"
msgstr "Skema warna basis untuk penyorotan Meld"
-#: ../data/styles/meld-dark.xml.h:1
+#: data/styles/meld-dark.style-scheme.xml.in:1
msgid "Meld dark scheme"
msgstr "Skema gelap Meld"
-#: ../data/styles/meld-dark.xml.h:2
+#: data/styles/meld-dark.style-scheme.xml.in:3
msgid "Dark color scheme for Meld highlighting"
msgstr "Skema warna gelap untuk penyorotan Meld"
-#: ../meld/resources/gtk/help-overlay.ui.h:1
+#: meld/resources/gtk/help-overlay.ui:14
msgctxt "shortcut window"
msgid "General"
msgstr "Umum"
-#: ../meld/resources/gtk/help-overlay.ui.h:2
+#: meld/resources/gtk/help-overlay.ui:19
msgctxt "shortcut window"
msgid "New comparison"
msgstr "Perbandingan baru"
-#: ../meld/resources/gtk/help-overlay.ui.h:3
+#: meld/resources/gtk/help-overlay.ui:26
msgctxt "shortcut window"
msgid "Close a comparison"
msgstr "Tutup suatu perbandingan"
-#: ../meld/resources/gtk/help-overlay.ui.h:4
+#: meld/resources/gtk/help-overlay.ui:33
msgctxt "shortcut window"
msgid "Quit Meld"
msgstr "Keluar Meld"
-#: ../meld/resources/gtk/help-overlay.ui.h:5
+#: meld/resources/gtk/help-overlay.ui:40
msgctxt "shortcut window"
msgid "Stop the current action"
msgstr "Hentikan aksi saat ini"
-#: ../meld/resources/gtk/help-overlay.ui.h:6
+#: meld/resources/gtk/help-overlay.ui:47
msgctxt "shortcut window"
msgid "Refresh comparison"
msgstr "Segarkan perbandingan"
-#: ../meld/resources/gtk/help-overlay.ui.h:7
+#: meld/resources/gtk/help-overlay.ui:54
msgctxt "shortcut window"
msgid "Fullscreen"
msgstr "Layar Penuh"
-#: ../meld/resources/gtk/help-overlay.ui.h:8
+#: meld/resources/gtk/help-overlay.ui:63
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Panes"
+msgstr "Panel"
+
+#: meld/resources/gtk/help-overlay.ui:68
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "Panel perbandingan sebelumnya"
+
+#: meld/resources/gtk/help-overlay.ui:75
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "Panel perbandingan selanjutnya"
+
+#: meld/resources/gtk/help-overlay.ui:84
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Perubahan"
+
+#: meld/resources/gtk/help-overlay.ui:89
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Ke perubahan sebelumnya"
+
+#: meld/resources/gtk/help-overlay.ui:96
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Ke perubahan selanjutnya"
+
+#: meld/resources/gtk/help-overlay.ui:105
msgctxt "shortcut window"
msgid "Tabs"
msgstr "Tab"
-#: ../meld/resources/gtk/help-overlay.ui.h:9
+#: meld/resources/gtk/help-overlay.ui:110
msgctxt "shortcut window"
msgid "Go to previous tab"
msgstr "Ke tab sebelumnya"
-#: ../meld/resources/gtk/help-overlay.ui.h:10
+#: meld/resources/gtk/help-overlay.ui:117
msgctxt "shortcut window"
msgid "Go to next tab"
msgstr "Ke tab selanjutnya"
-#: ../meld/resources/gtk/help-overlay.ui.h:11
+#: meld/resources/gtk/help-overlay.ui:124
msgctxt "shortcut window"
msgid "Switch to tab"
msgstr "Tukar ke tab"
-#: ../meld/resources/gtk/help-overlay.ui.h:12
+#: meld/resources/gtk/help-overlay.ui:131
msgctxt "shortcut window"
msgid "Move tab left"
msgstr "Pindahkan tab ke kiri"
-#: ../meld/resources/gtk/help-overlay.ui.h:13
+#: meld/resources/gtk/help-overlay.ui:138
msgctxt "shortcut window"
msgid "Move tab right"
msgstr "Pindahkan tab ke kanan"
-#: ../meld/resources/gtk/help-overlay.ui.h:14
-msgctxt "shortcut window"
-msgid "Changes"
-msgstr "Perubahan"
-
-#: ../meld/resources/gtk/help-overlay.ui.h:15
-msgctxt "shortcut window"
-msgid "Go to previous change"
-msgstr "Ke perubahan sebelumnya"
-
-#: ../meld/resources/gtk/help-overlay.ui.h:16
-msgctxt "shortcut window"
-msgid "Go to next change"
-msgstr "Ke perubahan selanjutnya"
-
-#: ../meld/resources/gtk/help-overlay.ui.h:17
+#: meld/resources/gtk/help-overlay.ui:147
msgctxt "shortcut window"
msgid "Editing"
msgstr "Menyunting"
-#: ../meld/resources/gtk/help-overlay.ui.h:18
+#: meld/resources/gtk/help-overlay.ui:152
msgctxt "shortcut window"
msgid "Undo"
msgstr "Tak jadi"
-#: ../meld/resources/gtk/help-overlay.ui.h:19
+#: meld/resources/gtk/help-overlay.ui:159
msgctxt "shortcut window"
msgid "Redo"
msgstr "Jadi lagi"
-#: ../meld/resources/gtk/help-overlay.ui.h:20
+#: meld/resources/gtk/help-overlay.ui:166
msgctxt "shortcut window"
msgid "Cut"
msgstr "Potong"
-#: ../meld/resources/gtk/help-overlay.ui.h:21
+#: meld/resources/gtk/help-overlay.ui:173
msgctxt "shortcut window"
msgid "Copy"
msgstr "Salin"
-#: ../meld/resources/gtk/help-overlay.ui.h:22
+#: meld/resources/gtk/help-overlay.ui:180
msgctxt "shortcut window"
msgid "Paste"
msgstr "Tempel"
-#: ../meld/resources/gtk/help-overlay.ui.h:23
+#: meld/resources/gtk/help-overlay.ui:187
msgctxt "shortcut window"
msgid "Find"
msgstr "Cari"
-#: ../meld/resources/gtk/help-overlay.ui.h:24
+#: meld/resources/gtk/help-overlay.ui:194
msgctxt "shortcut window"
msgid "Find Next"
msgstr "Cari Selanjutnya"
-#: ../meld/resources/gtk/help-overlay.ui.h:25
+#: meld/resources/gtk/help-overlay.ui:201
msgctxt "shortcut window"
msgid "Find Previous"
msgstr "Cari Sebelumnya"
-#: ../meld/resources/gtk/help-overlay.ui.h:26
+#: meld/resources/gtk/help-overlay.ui:208
msgctxt "shortcut window"
msgid "Replace"
msgstr "Ganti"
-#: ../meld/resources/gtk/help-overlay.ui.h:27
+#: meld/resources/gtk/help-overlay.ui:217
msgctxt "shortcut window"
msgid "File comparison"
msgstr "Perbandingan berkas"
-#: ../meld/resources/gtk/help-overlay.ui.h:28
+#: meld/resources/gtk/help-overlay.ui:222
msgctxt "shortcut window"
msgid "Save current file"
msgstr "Simpan berkas kini"
-#: ../meld/resources/gtk/help-overlay.ui.h:29
+#: meld/resources/gtk/help-overlay.ui:229
msgctxt "shortcut window"
msgid "Save current file to new path"
msgstr "Simpan berkas saat ini ke path baru"
-#: ../meld/resources/gtk/help-overlay.ui.h:30
+#: meld/resources/gtk/help-overlay.ui:236
msgctxt "shortcut window"
msgid "Save all files in comparison"
msgstr "Simpan semua berkas dalam perbandingan"
-#: ../meld/resources/gtk/help-overlay.ui.h:31
+#: meld/resources/gtk/help-overlay.ui:243
msgctxt "shortcut window"
msgid "Previous conflict"
msgstr "Konflik sebelumnya"
-#: ../meld/resources/gtk/help-overlay.ui.h:32
+#: meld/resources/gtk/help-overlay.ui:250
msgctxt "shortcut window"
msgid "Next conflict"
msgstr "Konflik selanjutnya"
-#: ../meld/resources/gtk/help-overlay.ui.h:33
+#: meld/resources/gtk/help-overlay.ui:257
msgctxt "shortcut window"
msgid "Push change to left"
msgstr "Push perubahan ke kiri"
-#: ../meld/resources/gtk/help-overlay.ui.h:34
+#: meld/resources/gtk/help-overlay.ui:264
msgctxt "shortcut window"
msgid "Push change to right"
msgstr "Push perubahan ke kanan"
-#: ../meld/resources/gtk/help-overlay.ui.h:35
+#: meld/resources/gtk/help-overlay.ui:271
msgctxt "shortcut window"
msgid "Pull change from left"
msgstr "Pull perubahan dari kiri"
-#: ../meld/resources/gtk/help-overlay.ui.h:36
+#: meld/resources/gtk/help-overlay.ui:278
msgctxt "shortcut window"
msgid "Pull change from right"
msgstr "Pull perubahan dari kanan"
-#: ../meld/resources/gtk/help-overlay.ui.h:37
+#: meld/resources/gtk/help-overlay.ui:285
msgctxt "shortcut window"
msgid "Copy change above left"
msgstr "Salin perubahan di atas kiri"
-#: ../meld/resources/gtk/help-overlay.ui.h:38
+#: meld/resources/gtk/help-overlay.ui:292
msgctxt "shortcut window"
msgid "Copy change below left"
msgstr "Salin perubahan di bawah kiri"
-#: ../meld/resources/gtk/help-overlay.ui.h:39
+#: meld/resources/gtk/help-overlay.ui:299
msgctxt "shortcut window"
msgid "Copy change above right"
msgstr "Salin perubahan di atas kanan"
-#: ../meld/resources/gtk/help-overlay.ui.h:40
+#: meld/resources/gtk/help-overlay.ui:306
msgctxt "shortcut window"
msgid "Copy change below right"
msgstr "Salin perubahan di bawah kanan"
-#: ../meld/resources/gtk/help-overlay.ui.h:41
+#: meld/resources/gtk/help-overlay.ui:313
+#: meld/resources/gtk/help-overlay.ui:341
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
+#: meld/resources/gtk/help-overlay.ui:322
msgctxt "shortcut window"
msgid "Folder comparison"
msgstr "Perbandingan folder"
-#: ../meld/resources/gtk/help-overlay.ui.h:45
+#: meld/resources/gtk/help-overlay.ui:327
msgctxt "shortcut window"
msgid "Copy to left"
msgstr "Salin ke kiri"
-#: ../meld/resources/gtk/help-overlay.ui.h:46
+#: meld/resources/gtk/help-overlay.ui:334
msgctxt "shortcut window"
msgid "Copy to right"
msgstr "Salin ke kanan"
-#: ../meld/resources/gtk/help-overlay.ui.h:47
+#: meld/resources/gtk/help-overlay.ui:350
msgctxt "shortcut window"
msgid "Version control comparison"
msgstr "Perbandingan kendali versi"
-#: ../meld/resources/gtk/help-overlay.ui.h:48
+#: meld/resources/gtk/help-overlay.ui:355
msgctxt "shortcut window"
msgid "Commit to version control"
msgstr "Komit ke kendali versi"
-#: ../meld/resources/gtk/help-overlay.ui.h:49
+#: meld/resources/gtk/help-overlay.ui:362
msgctxt "shortcut window"
msgid "Show/hide console output"
msgstr "Tampilkan/sembunyikan keluaran konsol"
-#: ../meld/resources/gtk/menus.ui.h:1
+#: meld/resources/gtk/menus.ui:7
+#, fuzzy
+#| msgid "Refresh the view"
+msgid "Refresh"
+msgstr "Segarkan"
+
+#: meld/resources/gtk/menus.ui:12
+#, fuzzy
+msgid "Stop"
+msgstr "Berhenti"
+
+#: meld/resources/gtk/menus.ui:17
+msgid "Fullscreen"
+msgstr "Layar Penuh"
+
+#: meld/resources/gtk/menus.ui:26
+msgid "Save As…"
+msgstr "Simpan Sebagai…"
+
+#: meld/resources/gtk/menus.ui:30
+msgid "Save A_ll"
+msgstr "Simpan Semu_a"
+
+#: meld/resources/gtk/menus.ui:34
+#, fuzzy
+msgid "Revert files…"
+msgstr "Kembalikan file..."
+
+#: meld/resources/gtk/menus.ui:38
+msgid "Open Externally"
+msgstr "Buka Secara Eksternal"
+
+#: meld/resources/gtk/menus.ui:45
+#, fuzzy
+#| msgid "Find…"
+msgid "_Find…"
+msgstr "_Cari…"
+
+#: meld/resources/gtk/menus.ui:49
+msgid "_Replace…"
+msgstr "_Ganti…"
+
+#: meld/resources/gtk/menus.ui:55
+#, fuzzy
+#| msgid "_View"
+msgid "View"
+msgstr "Tampilan"
+
+#: meld/resources/gtk/menus.ui:59
+#, fuzzy
+msgid "Overview Map"
+msgstr "Peta Overview"
+
+#: meld/resources/gtk/menus.ui:63
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Version control comparison"
+msgid "Version control console"
+msgstr "Perbandingan kendali versi"
+
+#: meld/resources/gtk/menus.ui:67
+msgid "Lock scrolling"
+msgstr "Kunci pengguliran"
+
+#: meld/resources/gtk/menus.ui:73
+#, fuzzy
+#| msgid "New comparison"
+msgid "Comparison"
+msgstr "Perbandingan"
+
+#: meld/resources/gtk/menus.ui:77
+msgid "Merge All from Left"
+msgstr "Merge Semua dari Kiri"
+
+#: meld/resources/gtk/menus.ui:81
+msgid "Merge All from Right"
+msgstr "Merge Semua dari Kanan"
+
+#: meld/resources/gtk/menus.ui:85
+msgid "Merge All"
+msgstr "Merge Semua"
+
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+msgid "Add Synchronization Point"
+msgstr "Tambahkan Titik Sinkronisasi"
+
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+msgid "Clear Synchronization Points"
+msgstr "Bersihkan Titik Sinkronisasi"
+
+#: meld/resources/gtk/menus.ui:103
+msgid "Format as Patch…"
+msgstr "Format sebagai Patch…"
+
+#: meld/resources/gtk/menus.ui:112
msgid "_Preferences"
msgstr "_Preferensi"
-#: ../meld/resources/gtk/menus.ui.h:2
+#: meld/resources/gtk/menus.ui:116
+msgid "Keyboard Shortcuts"
+msgstr "Tombol Pintas"
+
+#: meld/resources/gtk/menus.ui:120
msgid "_Help"
msgstr "_Bantuan"
-#: ../meld/resources/gtk/menus.ui.h:3
-msgid "Keyboard Shortcuts"
-msgstr "Tombol Pintas"
+#: meld/resources/gtk/menus.ui:125
+#, fuzzy
+#| msgid "About Meld"
+msgid "_About Meld"
+msgstr "Tentang Meld"
+
+#: meld/resources/gtk/menus.ui:138
+#, fuzzy
+#| msgid "File Status"
+msgid "File status"
+msgstr "Status Berkas"
-#: ../meld/resources/gtk/menus.ui.h:4
-msgid "_About"
-msgstr "Tent_ang"
+#: meld/resources/gtk/menus.ui:140
+msgid "Same"
+msgstr "Sama"
-#: ../meld/resources/gtk/menus.ui.h:5
-msgid "_Quit"
-msgstr "_Keluar"
+#: meld/resources/gtk/menus.ui:144
+msgid "New"
+msgstr "Baru"
-#: ../meld/resources/ui/about-dialog.ui.h:1
-msgid "About Meld"
-msgstr "Tentang Meld"
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/vc/_vc.py:76
+msgid "Modified"
+msgstr "Diubah"
-#: ../meld/resources/ui/about-dialog.ui.h:2
+#: meld/resources/gtk/menus.ui:158
+#, fuzzy
+#| msgid "Ignore Filename Case"
+msgid "Ignore filename case"
+msgstr "Abaikan Besar Kecil Huruf Nama Berkas"
+
+#: meld/resources/gtk/menus.ui:171
+#, fuzzy
+#| msgid "_Normal"
+msgid "Normal"
+msgstr "Normal"
+
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+msgid "Unversioned"
+msgstr "Tanpa versi"
+
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+msgid "Ignored"
+msgstr "Diabaikan"
+
+#: meld/resources/gtk/menus.ui:186
+#, fuzzy
+#| msgid "Flatten directories"
+msgid "Flatten folders"
+msgstr "Ratakan direktori"
+
+#: meld/resources/ui/about-dialog.ui:8
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
+"Copyright © 2009-2019 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"
+"Hak Cipta © 2009-2019 Kai Willadsen"
-#: ../meld/resources/ui/about-dialog.ui.h:5
+#: meld/resources/ui/about-dialog.ui:14
msgid "translator-credits"
msgstr ""
-"Andika Triwidada <andika gmail com>, 2013, 2014, 2016, 2018.\n"
+"Andika Triwidada <andika gmail com>, 2013, 2014, 2016, 2018, 2020.\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
+#: meld/resources/ui/appwindow.ui:29
+msgid "Start a new comparison"
+msgstr "Mulai suatu perbandingan baru"
+
+#: meld/resources/ui/appwindow.ui:45
+#, fuzzy
+#| msgid "Open recent files"
+msgid "Open a recent comparison"
+msgstr "Buka berkas yang baru-baru ini"
+
+#: meld/resources/ui/appwindow.ui:73
+msgid "Go to the previous change"
+msgstr "Pergi ke perubahan sebelumnya"
+
+#: meld/resources/ui/appwindow.ui:93
+msgid "Go to the next change"
+msgstr "Pergi ke perubahan selanjutnya"
+
+#: meld/resources/ui/appwindow.ui:123
+msgid "Go to the previous conflict"
+msgstr "Pindah ke konflik sebelumnya"
+
+#: meld/resources/ui/appwindow.ui:143
+msgid "Go to the next conflict"
+msgstr "Pindah ke konflik selanjutnya"
+
+#: meld/resources/ui/appwindow.ui:191
+#, fuzzy
+#| msgid "Version Status"
+msgid "Version Filters"
+msgstr "Status Versi"
+
+#: meld/resources/ui/appwindow.ui:206 meld/resources/ui/preferences.ui:1456
+msgid "File Filters"
+msgstr "Penyaring Berkas"
+
+#: meld/resources/ui/appwindow.ui:221 meld/resources/ui/preferences.ui:1641
+msgid "Text Filters"
+msgstr "Penyaring Teks"
+
+#: meld/resources/ui/column-list.ui:37 meld/resources/ui/filter-list.ui:40
msgid "Active"
msgstr "Aktif"
-#: ../meld/resources/ui/column-list.ui.h:2
+#: meld/resources/ui/column-list.ui:50
msgid "Column Name"
msgstr "Nama Kolom"
-#: ../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
+#: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
+#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736
msgid "_Remove"
msgstr "_Hapus"
-#: ../meld/resources/ui/column-list.ui.h:4
-#: ../meld/resources/ui/filter-list.ui.h:8
+#: meld/resources/ui/column-list.ui:96 meld/resources/ui/filter-list.ui:152
msgid "Move item up"
msgstr "Pindahkan item ke atas"
-#: ../meld/resources/ui/column-list.ui.h:5
-#: ../meld/resources/ui/filter-list.ui.h:9
+#: meld/resources/ui/column-list.ui:98 meld/resources/ui/filter-list.ui:154
msgid "Move _Up"
msgstr "_Naikkan"
-#: ../meld/resources/ui/column-list.ui.h:6
-#: ../meld/resources/ui/filter-list.ui.h:10
+#: meld/resources/ui/column-list.ui:112 meld/resources/ui/filter-list.ui:168
msgid "Move item down"
msgstr "Pindahkan item ke bawah"
-#: ../meld/resources/ui/column-list.ui.h:7
-#: ../meld/resources/ui/filter-list.ui.h:11
+#: meld/resources/ui/column-list.ui:114 meld/resources/ui/filter-list.ui:170
msgid "Move _Down"
msgstr "_Turunkan"
-#: ../meld/resources/ui/commit-dialog.ui.h:1
+#: meld/resources/ui/commit-dialog.ui:8
msgid "Commit"
msgstr "Komit"
-#: ../meld/resources/ui/commit-dialog.ui.h:2
+#: meld/resources/ui/commit-dialog.ui:36
msgid "Commit Files"
msgstr "Komit Berkas"
-#: ../meld/resources/ui/commit-dialog.ui.h:3
+#: meld/resources/ui/commit-dialog.ui:117
msgid "Log Message"
msgstr "Pesan Log"
-#: ../meld/resources/ui/commit-dialog.ui.h:4
+#: meld/resources/ui/commit-dialog.ui:181
msgid "Previous logs:"
msgstr "Log sebelumnya:"
-#: ../meld/resources/ui/commit-dialog.ui.h:5
+#: meld/resources/ui/commit-dialog.ui:259
msgid "Co_mmit"
msgstr "Ko_mit"
-#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1
-msgid "_Compare"
-msgstr "_Bandingkan"
-
-#: ../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
+#: meld/resources/ui/dirdiff-actions.ui:20
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
+#: meld/resources/ui/dirdiff-actions.ui:42
msgid "Copy to right"
msgstr "Salin ke kanan"
-#: ../meld/resources/ui/dirdiff.ui.h:11
+#: meld/resources/ui/dirdiff-actions.ui:66
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-menus.ui:7
+#, fuzzy
+#| msgid "Compare selected files"
+msgid "_Compare selected files"
+msgstr "Bandingkan berkas-berkas yang dipilih"
-#: ../meld/resources/ui/dirdiff.ui.h:17
-msgid "Show identical"
-msgstr "Tampilkan yang identik"
+#: meld/resources/ui/dirdiff-menus.ui:14
+#, fuzzy
+#| msgid "Copy to left"
+msgid "Copy to _left"
+msgstr "Salin ke kiri"
-#: ../meld/resources/ui/dirdiff.ui.h:18
-msgid "New"
-msgstr "Baru"
+#: meld/resources/ui/dirdiff-menus.ui:18
+#, fuzzy
+#| msgid "Copy to right"
+msgid "Copy to _right"
+msgstr "Salin ke kanan"
-#: ../meld/resources/ui/dirdiff.ui.h:19
-msgid "Show new"
-msgstr "Tampilkan yang baru"
+#: meld/resources/ui/dirdiff-menus.ui:22
+#, fuzzy
+#| msgid "Delete selected"
+msgid "_Delete selected"
+msgstr "Hapus yang dipilih"
-#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77
-msgid "Modified"
-msgstr "Diubah"
+#: meld/resources/ui/dirdiff-menus.ui:29
+msgid "Collapse Recursively"
+msgstr "Ciutkan Secara Rekursif"
-#: ../meld/resources/ui/dirdiff.ui.h:21
-msgid "Show modified"
-msgstr "Tampilkan yang berubah"
+#: meld/resources/ui/dirdiff-menus.ui:33
+msgid "Expand Recursively"
+msgstr "Perluas Secara Rekursif"
-#: ../meld/resources/ui/dirdiff.ui.h:22
-msgid "Filters"
-msgstr "Penyaring"
+#: meld/resources/ui/dirdiff-menus.ui:40
+#, fuzzy
+#| msgid "Open Externally"
+msgid "_Open Externally"
+msgstr "Buka Secara Eksternal"
-#: ../meld/resources/ui/dirdiff.ui.h:23
-msgid "Set active filters"
-msgstr "Tata penyaring aktif"
+#: meld/resources/ui/dirdiff-menus.ui:44
+#, fuzzy
+msgid "_Copy File Paths"
+msgstr "Jalur berkas _Copy"
-#: ../meld/resources/ui/encoding-selector.ui.h:1
+#: meld/resources/ui/encoding-selector.ui:31
msgid "Search text encoding…"
msgstr "Pengkodean teks pencarian…"
-#: ../meld/resources/ui/filediff.ui.h:1
-msgid "Format as Patch…"
-msgstr "Format sebagai Patch…"
-
-#: ../meld/resources/ui/filediff.ui.h:2
-msgid "Create a patch using differences between files"
-msgstr "Buat patch memakai perbedaan antar berkas"
-
-#: ../meld/resources/ui/filediff.ui.h:3
-msgid "Save A_ll"
-msgstr "Simpan Semu_a"
-
-#: ../meld/resources/ui/filediff.ui.h:4
-msgid "Save all files in the current comparison"
-msgstr "Simpan semua berkas dalam perbandingan saat ini"
-
-#: ../meld/resources/ui/filediff.ui.h:5
-msgid "Revert files to their saved versions"
-msgstr "Kembalikan berkas ke versi tersimpan"
-
-#: ../meld/resources/ui/filediff.ui.h:6
-msgid "Add Synchronization Point"
-msgstr "Tambahkan Titik Sinkronisasi"
-
-#: ../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"
-
-#: ../meld/resources/ui/filediff.ui.h:8
-msgid "Clear Synchronization Points"
-msgstr "Bersihkan Titik Sinkronisasi"
-
-#: ../meld/resources/ui/filediff.ui.h:9
-msgid "Clear sychronization points for changes between files"
-msgstr "Bersihkan titik sinkronisasi untuk perubahan antar berkas"
-
-#: ../meld/resources/ui/filediff.ui.h:10
-msgid "Previous Conflict"
-msgstr "Konflik Sebelumnya"
-
-#: ../meld/resources/ui/filediff.ui.h:11
-msgid "Go to the previous conflict"
-msgstr "Pindah ke konflik sebelumnya"
-
-#: ../meld/resources/ui/filediff.ui.h:12
-msgid "Next Conflict"
-msgstr "Konflik Selanjutnya"
-
-#: ../meld/resources/ui/filediff.ui.h:13
-msgid "Go to the next conflict"
-msgstr "Pindah ke konflik selanjutnya"
-
-#: ../meld/resources/ui/filediff.ui.h:14
-msgid "Push to Left"
-msgstr "Push ke Kiri"
-
-#: ../meld/resources/ui/filediff.ui.h:15
+#: meld/resources/ui/filediff-actions.ui:20
msgid "Push current change to the left"
msgstr "Push perubahan saat ini ke kiri"
-#: ../meld/resources/ui/filediff.ui.h:16
-msgid "Push to Right"
-msgstr "Push ke Kanan"
-
-#: ../meld/resources/ui/filediff.ui.h:17
+#: meld/resources/ui/filediff-actions.ui:42
msgid "Push current change to the right"
msgstr "Push perubahan saat ini ke kanan"
-#: ../meld/resources/ui/filediff.ui.h:18
-msgid "Pull from Left"
-msgstr "Pull dari Kiri"
-
-#: ../meld/resources/ui/filediff.ui.h:19
-msgid "Pull change from the left"
-msgstr "Pull perubahan dari kiri"
-
-#: ../meld/resources/ui/filediff.ui.h:20
-msgid "Pull from Right"
-msgstr "Pull dari Kanan"
-
-#: ../meld/resources/ui/filediff.ui.h:21
-msgid "Pull change from the right"
-msgstr "Pull perubahan dari kanan"
+#: meld/resources/ui/filediff-actions.ui:65
+#, fuzzy
+#| msgid "Copy _up"
+msgid "Copy chunks"
+msgstr "Salin _naik"
-#: ../meld/resources/ui/filediff.ui.h:22
-msgid "Copy Above Left"
-msgstr "Salin Di Atas Kiri"
+#: meld/resources/ui/filediff-actions.ui:87
+msgid "Delete change"
+msgstr "Hapus perubahan"
-#: ../meld/resources/ui/filediff.ui.h:23
+#: meld/resources/ui/filediff-menus.ui:7
msgid "Copy change above the left chunk"
msgstr "Salin perubahan di atas chunk kiri"
-#: ../meld/resources/ui/filediff.ui.h:24
-msgid "Copy Below Left"
-msgstr "Salin Di Bawah Kiri"
-
-#: ../meld/resources/ui/filediff.ui.h:25
+#: meld/resources/ui/filediff-menus.ui:11
msgid "Copy change below the left chunk"
msgstr "Salin perubahan di bawah chunk kiri"
-#: ../meld/resources/ui/filediff.ui.h:26
-msgid "Copy Above Right"
-msgstr "Salin Di Atas Kanan"
-
-#: ../meld/resources/ui/filediff.ui.h:27
+#: meld/resources/ui/filediff-menus.ui:15
msgid "Copy change above the right chunk"
msgstr "Salin perubahan di atas chunk kanan"
-#: ../meld/resources/ui/filediff.ui.h:28
-msgid "Copy Below Right"
-msgstr "Salin Di Bawah Kanan"
-
-#: ../meld/resources/ui/filediff.ui.h:29
+#: meld/resources/ui/filediff-menus.ui:19
msgid "Copy change below the right chunk"
msgstr "Salin perubahan di bawah chunk kanan"
-#: ../meld/resources/ui/filediff.ui.h:30
-msgid "Delete"
-msgstr "Hapus"
-
-#: ../meld/resources/ui/filediff.ui.h:31
-msgid "Delete change"
-msgstr "Hapus perubahan"
-
-#: ../meld/resources/ui/filediff.ui.h:32
-msgid "Merge All from Left"
-msgstr "Merge Semua dari Kiri"
-
-#: ../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"
-
-#: ../meld/resources/ui/filediff.ui.h:34
-msgid "Merge All from Right"
-msgstr "Merge Semua dari Kanan"
-
-#: ../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"
-
-#: ../meld/resources/ui/filediff.ui.h:36
-msgid "Merge All"
-msgstr "Merge Semua"
-
-#: ../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"
-
-#: ../meld/resources/ui/filediff.ui.h:38
-msgid "Previous Pane"
-msgstr "Panel Sebelumnya"
-
-#: ../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"
-
-#: ../meld/resources/ui/filediff.ui.h:40
-msgid "Next Pane"
-msgstr "Panel Selanjutnya"
-
-#: ../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"
-
-#: ../meld/resources/ui/filediff.ui.h:42
-msgid "Lock Scrolling"
-msgstr "Kunci Pengguliran"
-
-#: ../meld/resources/ui/filediff.ui.h:43
-msgid "Lock scrolling of all panes"
-msgstr "Kunci pengguliran semua panel"
-
-#: ../meld/resources/ui/filediff.ui.h:44
+#: meld/resources/ui/filediff-menus.ui:28
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Undo"
+msgid "_Undo"
+msgstr "_Tak Jadi"
+
+#: meld/resources/ui/filediff-menus.ui:32
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Redo"
+msgid "_Redo"
+msgstr "_Jadi Lagi"
+
+#: meld/resources/ui/filediff-menus.ui:39
+#, fuzzy
+msgid "Cu_t"
+msgstr "Po_tong"
+
+#: meld/resources/ui/filediff-menus.ui:43
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Copy"
+msgid "_Copy"
+msgstr "_Salin"
+
+#: meld/resources/ui/filediff-menus.ui:47
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Paste"
+msgid "_Paste"
+msgstr "Tem_pel"
+
+#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
+#: meld/resources/ui/filediff.ui:171
msgid ""
"This file can not be written to. You may click here to unlock this file and "
"make changes anyway, but these changes must be saved to a new file."
@@ -1119,311 +1140,334 @@ msgstr ""
"kunci berkas dan membuat perubahan, tapi perubahan tersebut mesti disimpan "
"ke suatu berkas baru."
-#: ../meld/resources/ui/filediff.ui.h:45
+#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
+#: meld/resources/ui/filediff.ui:185
+#, fuzzy
+msgid "Open file in this pane"
+msgstr "Buka file di panel ini"
+
+#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
+#: meld/resources/ui/filediff.ui:194
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Save all files in comparison"
+msgid "Save file in this pane"
+msgstr "Simpan semua berkas dalam perbandingan"
+
+#: meld/resources/ui/filediff.ui:73
msgid "File 3"
msgstr "Berkas 3"
-#: ../meld/resources/ui/filediff.ui.h:46
+#: meld/resources/ui/filediff.ui:142
msgid "File 2"
msgstr "Berkas 2"
-#: ../meld/resources/ui/filediff.ui.h:47
+#: meld/resources/ui/filediff.ui:207
msgid "File 1"
msgstr "Berkas 1"
#. Create icon and filename CellRenderer
-#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30
-#: ../meld/dirdiff.py:455
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
+#: meld/dirdiff.py:509
msgid "Name"
msgstr "Nama"
-#: ../meld/resources/ui/filter-list.ui.h:3
+#: meld/resources/ui/filter-list.ui:68
msgid "Pattern"
msgstr "Pola"
-#: ../meld/resources/ui/filter-list.ui.h:4
+#: meld/resources/ui/filter-list.ui:110
msgid "Add new filter"
msgstr "Tambah penyaring baru"
-#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
msgid "_Add"
msgstr "T_ambah"
-#: ../meld/resources/ui/filter-list.ui.h:6
+#: meld/resources/ui/filter-list.ui:126
msgid "Remove selected filter"
msgstr "Hapus penyaring yang dipilih"
-#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041
-#: ../meld/iohelpers.py:113
-msgid "_Replace"
-msgstr "_Timpa"
-
-#: ../meld/resources/ui/findbar.ui.h:2
-msgid "Replace _All"
-msgstr "Timp_a Semua"
-
-#: ../meld/resources/ui/findbar.ui.h:3
-msgid "_Previous"
-msgstr "Se_belumnya"
-
-#: ../meld/resources/ui/findbar.ui.h:4
-msgid "_Next"
-msgstr "Se_lanjutnya"
-
-#: ../meld/resources/ui/findbar.ui.h:5
-msgid "Find:"
-msgstr "Cari:"
-
-#: ../meld/resources/ui/findbar.ui.h:6
-msgid "Replace _with:"
-msgstr "Gantikan _dengan:"
-
-#: ../meld/resources/ui/findbar.ui.h:7
+#: meld/resources/ui/findbar.ui:103
msgid "_Match case"
msgstr "_Cocok huruf besar kecil"
-#: ../meld/resources/ui/findbar.ui.h:8
+#: meld/resources/ui/findbar.ui:119
msgid "Who_le word"
msgstr "Se_luruh kata"
-#: ../meld/resources/ui/findbar.ui.h:9
+#: meld/resources/ui/findbar.ui:135
msgid "Regular e_xpression"
msgstr "E_kspresi reguler"
-#: ../meld/resources/ui/findbar.ui.h:10
+#: meld/resources/ui/findbar.ui:175
msgid "Wrapped"
msgstr "Dilipat"
-#: ../meld/resources/ui/language-selector.ui.h:1
+#: meld/resources/ui/findbar.ui:193
+msgid "Replace _All"
+msgstr "Timp_a Semua"
+
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1042 meld/iohelpers.py:115
+msgid "_Replace"
+msgstr "_Timpa"
+
+#: meld/resources/ui/findbar.ui:226
+#, fuzzy
+msgid "Switch between Find and Find-and-Replace"
+msgstr "Beralih antara Cari dan temukan-dan-ganti"
+
+#: meld/resources/ui/language-selector.ui:31
msgid "Search highlight mode…"
msgstr "Mode sorot pencarian…"
-#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532
-#: ../meld/newdifftab.py:53
+#: meld/resources/ui/new-diff-tab.ui:119 meld/meldwindow.py:345
+#: meld/newdifftab.py:49
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
+#: meld/resources/ui/new-diff-tab.ui:171
+#, fuzzy
+#| msgid "_File"
+msgid "File"
+msgstr "Berkas"
+
+#: meld/resources/ui/new-diff-tab.ui:220
+#, fuzzy
+#| msgid "folder"
+msgid "Folder"
+msgstr "Folder"
+
+#: meld/resources/ui/new-diff-tab.ui:269
+#, fuzzy
+#| msgid "Version control:"
+msgid "Version control"
+msgstr "Kontrol versi"
+
+#: meld/resources/ui/new-diff-tab.ui:334 meld/resources/ui/new-diff-tab.ui:454
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:353
+msgid "Select First File"
+msgstr "Pilih Berkas Pertama"
-#: ../meld/resources/ui/new-diff-tab.ui.h:7
+#: meld/resources/ui/new-diff-tab.ui:367
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:383
+msgid "Select Third File"
+msgstr "Pilih Berkas Ke Tiga"
-#: ../meld/resources/ui/new-diff-tab.ui.h:9
+#: meld/resources/ui/new-diff-tab.ui:418
msgid "Select First Folder"
msgstr "Pilih Folder Pertama"
-#: ../meld/resources/ui/new-diff-tab.ui.h:10
+#: meld/resources/ui/new-diff-tab.ui:431
msgid "Select Second Folder"
msgstr "Pilih Folder Ke Dua"
-#: ../meld/resources/ui/new-diff-tab.ui.h:11
+#: meld/resources/ui/new-diff-tab.ui:445
msgid "Select Third Folder"
msgstr "Pilih Folder Ke Tiga"
-#: ../meld/resources/ui/new-diff-tab.ui.h:12
+#: meld/resources/ui/new-diff-tab.ui:495
msgid "Select A Version-Controlled Folder"
msgstr "Pilih Suatu Folder Versi-Terkendali"
-#: ../meld/resources/ui/new-diff-tab.ui.h:13
+#: meld/resources/ui/new-diff-tab.ui:544
msgid "_Blank comparison"
msgstr "Per_bandingan kosong"
-#: ../meld/resources/ui/new-diff-tab.ui.h:14
+#: meld/resources/ui/new-diff-tab.ui:561
msgid "C_ompare"
msgstr "B_andingkan"
-#: ../meld/resources/ui/notebook-label.ui.h:1
+#: meld/resources/ui/notebook-label.ui:24
msgid "Close Tab"
msgstr "Tutup Tab"
-#: ../meld/resources/ui/patch-dialog.ui.h:1
+#: meld/resources/ui/patch-dialog.ui:9
msgid "Format as Patch"
msgstr "Format sebagai Patch"
-#: ../meld/resources/ui/patch-dialog.ui.h:2
+#: meld/resources/ui/patch-dialog.ui:26
msgid "Copy to Clipboard"
msgstr "Salin ke Papan Klip"
-#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165
+#: meld/resources/ui/patch-dialog.ui:57 meld/patchdialog.py:159
msgid "Save Patch"
msgstr "Simpan Patch"
-#: ../meld/resources/ui/patch-dialog.ui.h:4
+#: meld/resources/ui/patch-dialog.ui:88
msgid "Use differences between:"
msgstr "Pakai perbedaan antara:"
-#: ../meld/resources/ui/patch-dialog.ui.h:5
+#: meld/resources/ui/patch-dialog.ui:105
msgid "Left and middle panes"
msgstr "Panel kiri dan tengah"
-#: ../meld/resources/ui/patch-dialog.ui.h:6
+#: meld/resources/ui/patch-dialog.ui:123
msgid "Middle and right panes"
msgstr "Panel tengah dan kanan"
-#: ../meld/resources/ui/patch-dialog.ui.h:7
+#: meld/resources/ui/patch-dialog.ui:149
msgid "_Reverse patch direction"
msgstr "Balikkan a_rah patch"
-#: ../meld/resources/ui/preferences.ui.h:1
+#: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
msgid "Preferences"
msgstr "Preferensi"
-#: ../meld/resources/ui/preferences.ui.h:2
+#: meld/resources/ui/preferences.ui:75
msgid "Font"
msgstr "Fonta"
-#: ../meld/resources/ui/preferences.ui.h:3
+#: meld/resources/ui/preferences.ui:112
msgid "_Use the system fixed width font"
msgstr "G_unakan fonta lebar tetap sistem"
-#: ../meld/resources/ui/preferences.ui.h:4
+#: meld/resources/ui/preferences.ui:136
msgid "_Editor font:"
msgstr "Fonta p_enyunting:"
#. 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
+#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:288
msgid "Display"
msgstr "Tampilan"
-#: ../meld/resources/ui/preferences.ui.h:6
+#: meld/resources/ui/preferences.ui:241
msgid "_Tab width:"
msgstr "Lebar _tab:"
-#: ../meld/resources/ui/preferences.ui.h:7
+#: meld/resources/ui/preferences.ui:274
msgid "_Insert spaces instead of tabs"
-msgstr "S_isipkan spasi-spasi sebagai penggati tab"
+msgstr "S_isipkan spasi-spasi sebagai pengganti tab"
-#: ../meld/resources/ui/preferences.ui.h:8
+#: meld/resources/ui/preferences.ui:290
msgid "Enable text _wrapping"
msgstr "Fungsikan pe_lipatan text"
-#: ../meld/resources/ui/preferences.ui.h:9
+#: meld/resources/ui/preferences.ui:312
msgid "Do not _split words over two lines"
msgstr "Jangan penggal kata ke dua bari_s"
-#: ../meld/resources/ui/preferences.ui.h:10
+#: meld/resources/ui/preferences.ui:333
msgid "Highlight _current line"
msgstr "Sorot baris _saat ini"
-#: ../meld/resources/ui/preferences.ui.h:11
+#: meld/resources/ui/preferences.ui:349
msgid "Show _line numbers"
msgstr "Tampi_lkan nomor baris"
-#: ../meld/resources/ui/preferences.ui.h:12
+#: meld/resources/ui/preferences.ui:365
msgid "Show w_hitespace"
msgstr "Tampilkan w_hitespace"
-#: ../meld/resources/ui/preferences.ui.h:13
+#: meld/resources/ui/preferences.ui:381
msgid "Use s_yntax highlighting"
msgstr "Gunakan penyorotan s_intaks"
-#: ../meld/resources/ui/preferences.ui.h:14
+#: meld/resources/ui/preferences.ui:404
msgid "Syntax highlighting color scheme:"
msgstr "Skema warna penyorotan sintaks:"
-#: ../meld/resources/ui/preferences.ui.h:15
+#: meld/resources/ui/preferences.ui:469
+#, fuzzy
+msgid "Code Overview"
+msgstr "Ikhtisar kode"
+
+#: meld/resources/ui/preferences.ui:506
+#, fuzzy
+msgid "Show overview map"
+msgstr "Tampilkan peta Ikhtisar"
+
+#: meld/resources/ui/preferences.ui:529
+#, fuzzy
+msgid "Overview map style:"
+msgstr "Ikhtisar gaya peta:"
+
+#: meld/resources/ui/preferences.ui:596
msgid "External Editor"
msgstr "Penyunting Eksternal"
-#: ../meld/resources/ui/preferences.ui.h:16
+#: meld/resources/ui/preferences.ui:632
msgid "Use _default system editor"
msgstr "_Gunakan penyunting bawaan sistem"
-#: ../meld/resources/ui/preferences.ui.h:17
+#: meld/resources/ui/preferences.ui:655
msgid "Edito_r command:"
msgstr "Pe_rintah penyunting:"
-#: ../meld/resources/ui/preferences.ui.h:18
+#: meld/resources/ui/preferences.ui:711
msgid "Editor"
msgstr "Penyunting"
-#: ../meld/resources/ui/preferences.ui.h:19
+#: meld/resources/ui/preferences.ui:732
msgid "Shallow Comparison"
msgstr "Perbandingan Dangkal"
-#: ../meld/resources/ui/preferences.ui.h:20
+#: meld/resources/ui/preferences.ui:768
msgid "C_ompare files based only on size and timestamp"
msgstr "B_andingkan berkas hanya berdasarkan ukuran dan penanda waktu"
-#: ../meld/resources/ui/preferences.ui.h:21
+#: meld/resources/ui/preferences.ui:791
msgid "_Timestamp resolution:"
msgstr "Resolusi penanda wak_tu:"
-#: ../meld/resources/ui/preferences.ui.h:23
+#: meld/resources/ui/preferences.ui:855
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"
-#: ../meld/resources/ui/preferences.ui.h:24
+#: meld/resources/ui/preferences.ui:904
msgid "Symbolic Links"
msgstr "Taut Simbolik"
-#: ../meld/resources/ui/preferences.ui.h:26
+#: meld/resources/ui/preferences.ui:972
msgid "Visible Columns"
msgstr "Kolom Yang Nampak"
-#: ../meld/resources/ui/preferences.ui.h:27
+#: meld/resources/ui/preferences.ui:1039
msgid "Folder Comparisons"
msgstr "Perbandingan Folder"
-#: ../meld/resources/ui/preferences.ui.h:28
+#: meld/resources/ui/preferences.ui:1061
msgid "Version Comparisons"
msgstr "Perbandingan Versi"
-#: ../meld/resources/ui/preferences.ui.h:29
+#: meld/resources/ui/preferences.ui:1104
msgid "_Order when comparing file revisions:"
msgstr "_Urutan ketika membandingkan revisi berkas:"
-#: ../meld/resources/ui/preferences.ui.h:30
+#: meld/resources/ui/preferences.ui:1151
msgid "Order when _merging files:"
msgstr "Urutan ketika _merge berkas:"
-#: ../meld/resources/ui/preferences.ui.h:31
+#: meld/resources/ui/preferences.ui:1219
msgid "Commit Messages"
msgstr "Pesan Komit"
-#: ../meld/resources/ui/preferences.ui.h:32
+#: meld/resources/ui/preferences.ui:1260
msgid "Show _right margin at:"
msgstr "Tampilkan ma_rjin kanan pada:"
-#: ../meld/resources/ui/preferences.ui.h:33
+#: meld/resources/ui/preferences.ui:1301
msgid "Automatically _break lines at right margin on commit"
msgstr "Otomatis lipat _baris pada marjin kanan saat komit"
-#: ../meld/resources/ui/preferences.ui.h:34
+#: meld/resources/ui/preferences.ui:1351
msgid "Version Control"
msgstr "Kendali Versi"
-#: ../meld/resources/ui/preferences.ui.h:35
+#: meld/resources/ui/preferences.ui:1373
msgid "Filename filters"
msgstr "Penyaring nama berkas"
-#: ../meld/resources/ui/preferences.ui.h:36
+#: meld/resources/ui/preferences.ui:1411
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -1433,23 +1477,19 @@ msgstr ""
"direktori menurut namanya. Setiap pola adalah daftar dari wildcard gaya "
"shell yang dipisahkan oleh spasi."
-#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114
-msgid "File Filters"
-msgstr "Penyaring Berkas"
-
-#: ../meld/resources/ui/preferences.ui.h:38
+#: meld/resources/ui/preferences.ui:1478
msgid "Change trimming"
msgstr "Ubah pemangkasan"
-#: ../meld/resources/ui/preferences.ui.h:39
+#: meld/resources/ui/preferences.ui:1514
msgid "Trim blank line differences from the start and end of changes"
msgstr "Pangkas perbedaan baris kosong dari awal dan akhir perubahan"
-#: ../meld/resources/ui/preferences.ui.h:40
+#: meld/resources/ui/preferences.ui:1558
msgid "Text filters"
msgstr "Penyaring teks"
-#: ../meld/resources/ui/preferences.ui.h:41
+#: meld/resources/ui/preferences.ui:1596
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -1463,263 +1503,280 @@ msgstr ""
"dilakukan. Bila ekspresi memuat grup, hanya grup tersebut yang diganti. "
"Lihat manual pengguna untuk rincian lebih lanjut."
-#: ../meld/resources/ui/preferences.ui.h:42
-msgid "Text Filters"
-msgstr "Penyaring Teks"
-
-#: ../meld/resources/ui/preferences.ui.h:43
+#: meld/resources/ui/preferences.ui:1687
msgid "Left is remote, right is local"
msgstr "Kiri remote, kanan lokal"
-#: ../meld/resources/ui/preferences.ui.h:44
+#: meld/resources/ui/preferences.ui:1691
msgid "Left is local, right is remote"
msgstr "Kiri lokal, kanan remote"
-#: ../meld/resources/ui/preferences.ui.h:45
+#: meld/resources/ui/preferences.ui:1705
+#, fuzzy
+#| msgid "Delete change"
+msgid "Simple change map"
+msgstr "Hapus perubahan"
+
+#: meld/resources/ui/preferences.ui:1709
+#, fuzzy
+msgid "Compact source map"
+msgstr "Peta sumber ringkas"
+
+#: meld/resources/ui/preferences.ui:1713
+#, fuzzy
+msgid "Full source map"
+msgstr "Peta sumber penuh"
+
+#: meld/resources/ui/preferences.ui:1727
msgid "Remote, merge, local"
msgstr "Remote, merge, lokal"
-#: ../meld/resources/ui/preferences.ui.h:46
+#: meld/resources/ui/preferences.ui:1731
msgid "Local, merge, remote"
msgstr "Lokal, merge, remote"
-#: ../meld/resources/ui/preferences.ui.h:47
+#: meld/resources/ui/preferences.ui:1753
msgid "1ns (ext4)"
msgstr "1ns (ext4)"
-#: ../meld/resources/ui/preferences.ui.h:48
+#: meld/resources/ui/preferences.ui:1757
msgid "100ns (NTFS)"
msgstr "100ns (NTFS)"
-#: ../meld/resources/ui/preferences.ui.h:49
+#: meld/resources/ui/preferences.ui:1761
msgid "1s (ext2/ext3)"
msgstr "1s (ext2/ext3)"
-#: ../meld/resources/ui/preferences.ui.h:50
+#: meld/resources/ui/preferences.ui:1765
msgid "2s (VFAT)"
msgstr "2s (VFAT)"
-#: ../meld/resources/ui/push-dialog.ui.h:1
+#: meld/resources/ui/push-dialog.ui:9
msgid "Push local commits to remote?"
msgstr "Push komit lokal ke remote?"
-#: ../meld/resources/ui/push-dialog.ui.h:2
+#: meld/resources/ui/push-dialog.ui:10
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."
-#: ../meld/resources/ui/push-dialog.ui.h:3
+#: meld/resources/ui/push-dialog.ui:38
msgid "_Push commits"
msgstr "_Push komit"
-#: ../meld/resources/ui/revert-dialog.ui.h:1
+#: meld/resources/ui/recent-selector.ui:16
+#, fuzzy
+#| msgid "Search text encoding…"
+msgid "Search recent comparisons…"
+msgstr "Pengkodean teks pencarian…"
+
+#: meld/resources/ui/revert-dialog.ui:9
msgid "Discard unsaved changes to documents?"
msgstr "Buang perubahan yang belum tersimpan ke dokumen?"
-#: ../meld/resources/ui/revert-dialog.ui.h:2
+#: meld/resources/ui/revert-dialog.ui:10
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/revert-dialog.ui.h:3
+#: meld/resources/ui/revert-dialog.ui:39
msgid "_Discard"
msgstr "_Buang"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:1
+#: meld/resources/ui/save-confirm-dialog.ui:9
msgid "Save changes to documents before closing?"
msgstr "Simpan perubahan ke dokumen sebelum menutup?"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:2
+#: meld/resources/ui/save-confirm-dialog.ui:10
msgid "If you don’t save, changes will be permanently lost."
msgstr "Bila Anda tak menyimpan, perubahan akan hilang selamanya."
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:3
+#: meld/resources/ui/save-confirm-dialog.ui:24
msgid "Close _without Saving"
msgstr "Tutup _Tanpa Menyimpan"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040
-#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1041
+#: meld/iohelpers.py:56 meld/iohelpers.py:114
msgid "_Cancel"
msgstr "_Batal"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:5
+#: meld/resources/ui/save-confirm-dialog.ui:52
msgid "_Save"
msgstr "_Simpan"
-#: ../meld/resources/ui/statusbar-menu.ui.h:2
+#: meld/resources/ui/statusbar-menu.ui:9
msgid "Show whitespace"
msgstr "Tampilkan whitespace"
-#: ../meld/resources/ui/statusbar-menu.ui.h:4
+#: meld/resources/ui/statusbar-menu.ui:17
msgid "Text wrapping"
msgstr "Pelipatan teks"
-#: ../meld/resources/ui/vcview.ui.h:3
+#: meld/resources/ui/vcview-menus.ui:7
+msgid "_Compare"
+msgstr "_Bandingkan"
+
+#: meld/resources/ui/vcview-menus.ui:11
msgid "Co_mmit…"
msgstr "Ko_mit…"
-#: ../meld/resources/ui/vcview.ui.h:4
+#: meld/resources/ui/vcview-menus.ui:15
+msgid "_Update"
+msgstr "M_utakhirkan"
+
+#: meld/resources/ui/vcview-menus.ui:30
+msgid "Re_vert"
+msgstr "Re_vert"
+
+#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+msgid "Delete"
+msgstr "Hapus"
+
+#: meld/resources/ui/vcview-menus.ui:41
+msgid "Mar_k as Resolved"
+msgstr "Tandai sebagai Terselesai_kan"
+
+#: meld/resources/ui/vcview.ui:73
+#, fuzzy
+#| msgid "Co_mmit…"
+msgid "Commit…"
+msgstr "Komit"
+
+#: meld/resources/ui/vcview.ui:74
msgid "Commit changes to version control"
msgstr "Komit perubahan ke kendali versi"
-#: ../meld/resources/ui/vcview.ui.h:5
-msgid "_Update"
-msgstr "M_utakhirkan"
+#: meld/resources/ui/vcview.ui:86
+#, fuzzy
+#| msgid "_Update"
+msgid "Update"
+msgstr "Mutakhiran"
-#: ../meld/resources/ui/vcview.ui.h:6
+#: meld/resources/ui/vcview.ui:87
msgid "Update working copy from version control"
msgstr "Mutakhirkan salinan kerja dari kendali versi"
-#: ../meld/resources/ui/vcview.ui.h:7
-msgid "_Push"
-msgstr "_Push"
+#: meld/resources/ui/vcview.ui:99
+#, fuzzy
+#| msgid "_Push"
+msgid "Push"
+msgstr "Push"
-#: ../meld/resources/ui/vcview.ui.h:8
+#: meld/resources/ui/vcview.ui:100
msgid "Push local changes to remote"
msgstr "Push perubahan lokal ke remote"
-#: ../meld/resources/ui/vcview.ui.h:10
+#: meld/resources/ui/vcview.ui:112
+#, fuzzy
+#| msgid "_Add"
+msgid "Add"
+msgstr "Tambahkan"
+
+#: meld/resources/ui/vcview.ui:113
msgid "Add to version control"
msgstr "Tambahkan ke kendali versi"
-#: ../meld/resources/ui/vcview.ui.h:12
+#: meld/resources/ui/vcview.ui:125
+#, fuzzy
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "Hapus"
+
+#: meld/resources/ui/vcview.ui:126
msgid "Remove from version control"
msgstr "Hapus dari kendali versi"
-#: ../meld/resources/ui/vcview.ui.h:13
-msgid "Mar_k as Resolved"
-msgstr "Tandai sebagai Terselesai_kan"
+#: meld/resources/ui/vcview.ui:138
+msgid "Mark as Resolved"
+msgstr "Tandai sebagai Terselesaikan"
-#: ../meld/resources/ui/vcview.ui.h:14
+#: meld/resources/ui/vcview.ui:139
msgid "Mark as resolved in version control"
msgstr "Tandai sebagai terselesaikan dalam kendali versi"
-#: ../meld/resources/ui/vcview.ui.h:15
-msgid "Re_vert"
-msgstr "Re_vert"
+#: meld/resources/ui/vcview.ui:151
+#, fuzzy
+#| msgid "Re_vert"
+msgid "Revert"
+msgstr "Kembalikan"
-#: ../meld/resources/ui/vcview.ui.h:16
+#: meld/resources/ui/vcview.ui:152
msgid "Revert working copy to original state"
msgstr "Kembalikan salinan kerja ke keadaan asli"
-#: ../meld/resources/ui/vcview.ui.h:17
+#: meld/resources/ui/vcview.ui:165
msgid "Delete from working copy"
msgstr "Hapus dari salinan kerja"
-#: ../meld/resources/ui/vcview.ui.h:18
-msgid "Console"
-msgstr "Konsol"
-
-#: ../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"
-
-#: ../meld/resources/ui/vcview.ui.h:20
-msgid "_Flatten"
-msgstr "_Ratakan"
-
-#: ../meld/resources/ui/vcview.ui.h:21
-msgid "Flatten directories"
-msgstr "Ratakan direktori"
-
-#: ../meld/resources/ui/vcview.ui.h:22
-msgid "_Modified"
-msgstr "_Berubah"
-
-#: ../meld/resources/ui/vcview.ui.h:23
-msgid "Show modified files"
-msgstr "Tampilkan berkas-berkas yang berubah"
-
-#: ../meld/resources/ui/vcview.ui.h:24
-msgid "_Normal"
-msgstr "_Normal"
-
-#: ../meld/resources/ui/vcview.ui.h:25
-msgid "Show normal files"
-msgstr "Tampilkan berkas-berkas normal"
-
-#: ../meld/resources/ui/vcview.ui.h:26
-msgid "Un_versioned"
-msgstr "Tanpa _Versi"
-
-#: ../meld/resources/ui/vcview.ui.h:27
-msgid "Show unversioned files"
-msgstr "Tampilkan berkas tanpa versi"
-
-#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70
-msgid "Ignored"
-msgstr "Diabaikan"
-
-#: ../meld/resources/ui/vcview.ui.h:29
-msgid "Show ignored files"
-msgstr "Tampilkan berkas-berkas yang diabaikan"
-
-#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366
+#: meld/resources/ui/vcview.ui:220 meld/vcview.py:411
msgid "Location"
msgstr "Lokasi"
-#: ../meld/resources/ui/vcview.ui.h:32
+#: meld/resources/ui/vcview.ui:229
msgid "Status"
msgstr "Status"
-#: ../meld/resources/ui/vcview.ui.h:33
+#: meld/resources/ui/vcview.ui:238
msgid "Extra"
msgstr "Ekstra"
-#: ../meld/resources/ui/vcview.ui.h:34
+#: meld/resources/ui/vcview.ui:270
msgid "Console output"
msgstr "Keluaran konsol"
-#: ../meld/const.py:12
+#: meld/actiongutter.py:247
+msgid "Copy _up"
+msgstr "Salin _naik"
+
+#: meld/actiongutter.py:248
+msgid "Copy _down"
+msgstr "Salin _turun"
+
+#: meld/const.py:30
msgid "UNIX (LF)"
msgstr "UNIX (LF)"
-#: ../meld/const.py:13
+#: meld/const.py:31
msgid "DOS/Windows (CR-LF)"
msgstr "DOS/Windows (CR-LF)"
-#: ../meld/const.py:14
+#: meld/const.py:32
msgid "Mac OS (CR)"
msgstr "Mac OS (CR)"
#. Create file size CellRenderer
-#: ../meld/dirdiff.py:476 ../meld/preferences.py:138
+#: meld/dirdiff.py:530 meld/preferences.py:132
msgid "Size"
msgstr "Ukuran"
#. Create date-time CellRenderer
-#: ../meld/dirdiff.py:484 ../meld/preferences.py:139
+#: meld/dirdiff.py:538 meld/preferences.py:133
msgid "Modification time"
msgstr "Waktu modifikasi"
#. Create permissions CellRenderer
-#: ../meld/dirdiff.py:492 ../meld/preferences.py:140
+#: meld/dirdiff.py:546 meld/preferences.py:134
msgid "Permissions"
msgstr "Ijin"
-#: ../meld/dirdiff.py:626
-#, python-format
-msgid "Hide %s"
-msgstr "Sembunyikan %s"
-
-#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791
+#: meld/dirdiff.py:769 meld/dirdiff.py:792
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] Memindai %s"
-#: ../meld/dirdiff.py:926
+#: meld/dirdiff.py:928
#, python-format
msgid "[%s] Done"
msgstr "[%s] Selesai"
-#: ../meld/dirdiff.py:934
+#: meld/dirdiff.py:935
msgid "Folders have no differences"
msgstr "Folder-folder tak punya perbedaan"
-#: ../meld/dirdiff.py:936
+#: meld/dirdiff.py:937
msgid "Contents of scanned files in folders are identical."
msgstr "Isi berkas yang dipindai dalam folder-folder identik."
-#: ../meld/dirdiff.py:938
+#: meld/dirdiff.py:939
msgid ""
"Scanned files in folders appear identical, but contents have not been "
"scanned."
@@ -1727,42 +1784,46 @@ msgstr ""
"Berkas-berkas yang dipindai dalam folder-folder tampak identik, tapi isi "
"belum dipindai."
-#: ../meld/dirdiff.py:941
+#: meld/dirdiff.py:942
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:943
+#: meld/dirdiff.py:944
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:961 ../meld/filediff.py:1603 ../meld/filediff.py:1633
-#: ../meld/filediff.py:1635 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
+#: meld/dirdiff.py:960 meld/filediff.py:1829
+msgid "Hide"
+msgstr "Sembunyikan"
+
+#: meld/dirdiff.py:962 meld/filediff.py:1831 meld/filediff.py:1861
+#: meld/filediff.py:1863 meld/ui/msgarea.py:108 meld/ui/msgarea.py:121
msgid "Hi_de"
msgstr "Sem_bunyikan"
-#: ../meld/dirdiff.py:970
+#: meld/dirdiff.py:971
msgid "Multiple errors occurred while scanning this folder"
msgstr "Galat berganda terjadi ketika memindai folder ini"
-#: ../meld/dirdiff.py:971
+#: meld/dirdiff.py:972
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:973
+#: meld/dirdiff.py:974
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:975
+#: meld/dirdiff.py:976
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:977
+#: meld/dirdiff.py:978
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -1771,17 +1832,17 @@ msgstr ""
"sistem berkas yang peka huruf besar kecil. Berkas-berkas berikut dalam "
"folder ini tersembunyi:"
-#: ../meld/dirdiff.py:988
+#: meld/dirdiff.py:989
#, python-format
msgid "“%s” hidden by “%s”"
msgstr "\"%s\" disembunyikan oleh \"%s\""
-#: ../meld/dirdiff.py:1044
+#: meld/dirdiff.py:1045
#, python-format
msgid "Replace folder “%s”?"
msgstr "Timpa folder “%s”?"
-#: ../meld/dirdiff.py:1046
+#: meld/dirdiff.py:1047
#, python-format
msgid ""
"Another folder with the same name already exists in “%s”.\n"
@@ -1790,11 +1851,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:1059
+#: meld/dirdiff.py:1060
msgid "Error copying file"
msgstr "Galat saat menyalin berkas"
-#: ../meld/dirdiff.py:1060
+#: meld/dirdiff.py:1061
#, python-format
msgid ""
"Couldn’t copy %s\n"
@@ -1807,19 +1868,19 @@ msgstr ""
"\n"
"%s"
-#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720
+#: meld/dirdiff.py:1086 meld/vcview.py:759
msgid "Error deleting {}"
msgstr "Galat saat menghapus {}"
-#: ../meld/dirdiff.py:1597
+#: meld/dirdiff.py:1579
msgid "No folder"
msgstr "Tidak ada folder"
-#: ../meld/filediff.py:920
+#: meld/filediff.py:1119
msgid "Comparison results will be inaccurate"
msgstr "Hasil perbandingan tidak akan akurat"
-#: ../meld/filediff.py:922
+#: meld/filediff.py:1121
msgid ""
"A filter changed the number of lines in the file, which is unsupported. The "
"comparison will not be accurate."
@@ -1827,66 +1888,71 @@ msgstr ""
"Suatu penyaring mengubah cacah baris dalam berkas, yang tidak didukung. "
"Perbandingan tidak akan akurat."
-#: ../meld/filediff.py:994
+#: meld/filediff.py:1193
msgid "Mark conflict as resolved?"
msgstr "Tandai konflik sebagai terselesaikan?"
-#: ../meld/filediff.py:996
+#: meld/filediff.py:1195
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:998
+#: meld/filediff.py:1197
msgid "Cancel"
msgstr "Batal"
-#: ../meld/filediff.py:999
+#: meld/filediff.py:1198
msgid "Mark _Resolved"
msgstr "Tandai Te_rselesaikan"
-#: ../meld/filediff.py:1318
+#: meld/filediff.py:1523
#, python-format
msgid "There was a problem opening the file “%s”."
msgstr "Ada masalah saat membuka berkas \"%s\"."
-#: ../meld/filediff.py:1326
+#: meld/filediff.py:1531
#, python-format
msgid "File %s appears to be a binary file."
msgstr "Berkas %s tampaknya berkas biner."
-#: ../meld/filediff.py:1328
+#: meld/filediff.py:1533
msgid "Do you want to open the file using the default application?"
msgstr "Apakah Anda ingin membuka berkas memakai aplikasi baku?"
-#: ../meld/filediff.py:1330
+#: meld/filediff.py:1535
msgid "Open"
msgstr "Buka"
-#: ../meld/filediff.py:1346
+#: meld/filediff.py:1549
+#, python-format
+msgid "[%s] Merging files"
+msgstr "[%s] Sedang merge berkas"
+
+#: meld/filediff.py:1563
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Menghitung perbedaan"
-#: ../meld/filediff.py:1407
+#: meld/filediff.py:1624
#, python-format
msgid "File %s has changed on disk"
msgstr "Berkas %s telah berubah pada disk"
-#: ../meld/filediff.py:1408
+#: meld/filediff.py:1625
msgid "Do you want to reload the file?"
msgstr "Apakah Anda ingin memuat ulang berkas?"
-#: ../meld/filediff.py:1410
+#: meld/filediff.py:1627
msgid "_Reload"
msgstr "Muat _Ulang"
-#: ../meld/filediff.py:1566
+#: meld/filediff.py:1794
msgid "Files are identical"
msgstr "Berkas identik"
-#: ../meld/filediff.py:1579
+#: meld/filediff.py:1807
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -1894,11 +1960,11 @@ msgstr ""
"Penyaring teks sedang dipakai, dan mungkin menutupi perbedaan antara berkas. "
"Apakah Anda ingin membandingkan berkas-berkas yang tak tersaring?"
-#: ../meld/filediff.py:1584
+#: meld/filediff.py:1812
msgid "Files differ in line endings only"
msgstr "Berkas berbeda hanya pada akhiran baris"
-#: ../meld/filediff.py:1586
+#: meld/filediff.py:1814
#, python-format
msgid ""
"Files are identical except for differing line endings:\n"
@@ -1907,36 +1973,36 @@ msgstr ""
"Berkas-berkas identik kecuali perbedaan akhiran baris:\n"
"%s"
-#: ../meld/filediff.py:1606
+#: meld/filediff.py:1834
msgid "Show without filters"
msgstr "Tampilkan tanpa penyaring"
-#: ../meld/filediff.py:1628
+#: meld/filediff.py:1856
msgid "Change highlighting incomplete"
msgstr "Penyorotan perubahan tak lengkap"
-#: ../meld/filediff.py:1629
+#: meld/filediff.py:1857
msgid ""
"Some changes were not highlighted because they were too large. You can force "
"Meld to take longer to highlight larger changes, though this may be slow."
msgstr ""
"Beberapa perubahan tak disorot karena terlalu besar. Anda dapat memaksa Meld "
-"untuk lebih panjanga sehingga menyorot perubahan yang lebih besar, walaupun "
+"untuk lebih panjang sehingga menyorot perubahan yang lebih besar, walaupun "
"ini mungkin lambat."
-#: ../meld/filediff.py:1637
+#: meld/filediff.py:1865
msgid "Keep highlighting"
msgstr "Tetap menyorot"
-#: ../meld/filediff.py:1639
+#: meld/filediff.py:1867
msgid "_Keep highlighting"
msgstr "_Tetap menyorot"
-#: ../meld/filediff.py:1652
+#: meld/filediff.py:1880
msgid "Saving failed"
msgstr "Gagal menyimpan"
-#: ../meld/filediff.py:1653
+#: meld/filediff.py:1881
msgid ""
"Please consider copying any critical changes to another program or file to "
"avoid data loss."
@@ -1944,42 +2010,42 @@ msgstr ""
"Harap pertimbangkan untuk menyalin perubahan penting apapun ke program atau "
"berkas lain untuk menghindari kehilangan data."
-#: ../meld/filediff.py:1662
+#: meld/filediff.py:1890
msgid "Save Left Pane As"
msgstr "Simpan Panel Kiri Sebagai"
-#: ../meld/filediff.py:1664
+#: meld/filediff.py:1892
msgid "Save Middle Pane As"
msgstr "Simpan Panel Tengah Sebagai"
-#: ../meld/filediff.py:1666
+#: meld/filediff.py:1894
msgid "Save Right Pane As"
msgstr "Simpan Panel Kanan Sebagai"
-#: ../meld/filediff.py:1679
+#: meld/filediff.py:1905
#, 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:1681
+#: meld/filediff.py:1907
msgid "If you save it, any external changes will be lost."
msgstr "Bila Anda menyimpannya, perubahan eksternal akan hilang."
-#: ../meld/filediff.py:1684
+#: meld/filediff.py:1910
msgid "Save Anyway"
msgstr "Simpan Saja"
-#: ../meld/filediff.py:1685
+#: meld/filediff.py:1911
msgid "Don’t Save"
msgstr "Jangan Simpan"
-#: ../meld/filediff.py:1727
+#: meld/filediff.py:1953
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:1731 ../meld/patchdialog.py:144
+#: meld/filediff.py:1957 meld/patchdialog.py:138
#, python-format
msgid ""
"Couldn’t save file due to:\n"
@@ -1988,16 +2054,22 @@ msgstr ""
"Tidak bisa menyimpan berkas karena:\n"
"%s"
-#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143
+#: meld/filediff.py:1961 meld/patchdialog.py:137
#, python-format
msgid "Could not save file %s."
msgstr "Tak bisa menyimpan berkas %s."
-#: ../meld/filediff.py:2128
+#: meld/filediff.py:2022
+#, fuzzy
+#| msgid "Open recent files"
+msgid "Open File"
+msgstr "Buka Berkas"
+
+#: meld/filediff.py:2376
msgid "Live comparison updating disabled"
msgstr "Pemutakhiran perbandingan live dinonaktifkan"
-#: ../meld/filediff.py:2129
+#: meld/filediff.py:2377
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
@@ -2008,47 +2080,34 @@ msgstr ""
"dan pemutakhiran secara live akan dilanjutkan ketika titik penyelarasan "
"dibersihkan."
-#: ../meld/filemerge.py:37
-#, python-format
-msgid "[%s] Merging files"
-msgstr "[%s] Sedang merge berkas"
-
-#: ../meld/gutterrendererchunk.py:220
-msgid "Copy _up"
-msgstr "Salin _naik"
-
-#: ../meld/gutterrendererchunk.py:221
-msgid "Copy _down"
-msgstr "Salin _turun"
-
-#: ../meld/iohelpers.py:43
+#: meld/iohelpers.py:41
msgid "Deleting remote folders is not supported"
msgstr "Menghapus folder jauh tidak didukung"
-#: ../meld/iohelpers.py:45
+#: meld/iohelpers.py:43
msgid "Not a file or directory"
msgstr "Bukan suatu berkas atau direktori"
-#: ../meld/iohelpers.py:49
+#: meld/iohelpers.py:47
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:54
+#: meld/iohelpers.py:52
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:59
+#: meld/iohelpers.py:57
msgid "_Delete Permanently"
msgstr "_Hapus Permanen"
-#: ../meld/iohelpers.py:106
+#: meld/iohelpers.py:108
#, python-format
msgid "Replace file “%s”?"
msgstr "Timpa berkas “%s”?"
-#: ../meld/iohelpers.py:108
+#: meld/iohelpers.py:110
#, python-format
msgid ""
"A file with this name already exists in “%s”.\n"
@@ -2057,276 +2116,126 @@ msgstr ""
"Sebuah berkas dengan nama ini telah ada dalam \"%s\".\n"
"Bila Anda menimpa berkas yang ada, isinya akan hilang."
-#: ../meld/meldapp.py:169
+#: meld/meldapp.py:179
msgid "wrong number of arguments supplied to --diff"
msgstr "banyaknya argumen yang diberikan ke --diff salah"
-#: ../meld/meldapp.py:174
+#: meld/meldapp.py:184
msgid "Start with an empty window"
msgstr "Mulai dengan jendela kosong"
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:177
+#: meld/meldapp.py:185 meld/meldapp.py:187
msgid "file"
msgstr "berkas"
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:179
+#: meld/meldapp.py:185 meld/meldapp.py:189
msgid "folder"
msgstr "folder"
-#: ../meld/meldapp.py:176
+#: meld/meldapp.py:186
msgid "Start a version control comparison"
msgstr "Mulai suatu perbandingan kendali versi"
-#: ../meld/meldapp.py:178
+#: meld/meldapp.py:188
msgid "Start a 2- or 3-way file comparison"
msgstr "Mulai perbandingan berkas 2 atau 3 pihak"
-#: ../meld/meldapp.py:180
+#: meld/meldapp.py:190
msgid "Start a 2- or 3-way folder comparison"
msgstr "Mulai perbandingan folder 2 atau 3 pihak"
-#: ../meld/meldapp.py:223
+#: meld/meldapp.py:233
#, python-format
msgid "Error: %s\n"
msgstr "Galat: %s\n"
-#: ../meld/meldapp.py:230
+#: meld/meldapp.py:240
msgid "Meld is a file and directory comparison tool."
msgstr "Meld adalah alat perbandingan berkas dan direktori."
-#: ../meld/meldapp.py:234
+#: meld/meldapp.py:244
msgid "Set label to use instead of file name"
msgstr "Tata label yang akan dipakai sebagai ganti nama berkas"
-#: ../meld/meldapp.py:237
+#: meld/meldapp.py:247
msgid "Open a new tab in an already running instance"
msgstr "Buka tab baru pada instansi yang sedang berjalan"
-#: ../meld/meldapp.py:240
+#: meld/meldapp.py:250
msgid "Automatically compare all differing files on startup"
msgstr "Otomatis membandingkan semua berkas yang berbeda saat awal mula"
-#: ../meld/meldapp.py:243
+#: meld/meldapp.py:253
msgid "Ignored for compatibility"
msgstr "Diabaikan untuk kompatibilitas"
-#: ../meld/meldapp.py:247
+#: meld/meldapp.py:257
msgid "Set the target file for saving a merge result"
msgstr "Tata berkas target untuk menyimpan hasil merge"
-#: ../meld/meldapp.py:250
+#: meld/meldapp.py:260
msgid "Automatically merge files"
msgstr "Otomatis me-merge berkas"
-#: ../meld/meldapp.py:254
+#: meld/meldapp.py:264
msgid "Load a saved comparison from a Meld comparison file"
msgstr "Muat perbandingan yang disimpan dari suatu berkas perbandingan Meld"
-#: ../meld/meldapp.py:258
+#: meld/meldapp.py:268
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:278
+#: meld/meldapp.py:288
#, python-format
msgid "too many arguments (wanted 0-3, got %d)"
msgstr "terlalu banyak argumen (diinginkan 0-3, diperoleh %d)"
-#: ../meld/meldapp.py:281
+#: meld/meldapp.py:291
msgid "can’t auto-merge less than 3 files"
msgstr "tak bisa merge otomatis kurang dari 3 berkas"
-#: ../meld/meldapp.py:283
+#: meld/meldapp.py:293
msgid "can’t auto-merge directories"
msgstr "tak bisa merge otomatis direktori"
-#: ../meld/meldapp.py:297
+#: meld/meldapp.py:308
msgid "Error reading saved comparison file"
msgstr "Galat saat membaca berkas perbandingan yang disimpan"
-#: ../meld/meldapp.py:314
+#: meld/meldapp.py:325
#, python-format
msgid "invalid path or URI “%s”"
msgstr "path atau URI \"%s\" tidak valid"
-#: ../meld/meldapp.py:320
+#: meld/meldapp.py:331
msgid "remote folder “{}” not supported"
msgstr "folder jauh “{}” tidak didukung"
#. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:123
+#: meld/meldbuffer.py:114
msgid "<unnamed>"
msgstr "<tanpa nama>"
-#: ../meld/melddoc.py:63
+#: meld/melddoc.py:60
msgid "untitled"
msgstr "tanpa judul"
-#: ../meld/meldwindow.py:56
-msgid "_File"
-msgstr "_Berkas"
-
-#: ../meld/meldwindow.py:57
-msgid "_New Comparison…"
-msgstr "Perba_ndingan Baru…"
-
-#: ../meld/meldwindow.py:58
-msgid "Start a new comparison"
-msgstr "Mulai suatu perbandingan baru"
-
-#: ../meld/meldwindow.py:61
-msgid "Save the current file"
-msgstr "Simpan berkas saat ini"
-
-#: ../meld/meldwindow.py:63
-msgid "Save As…"
-msgstr "Simpan Sebagai…"
-
-#: ../meld/meldwindow.py:64
-msgid "Save the current file with a different name"
-msgstr "Simpan berkas saat ini dengan nama lain"
-
-#: ../meld/meldwindow.py:67
-msgid "Close the current file"
-msgstr "Tutup berkas saat ini"
-
-#: ../meld/meldwindow.py:70
-msgid "_Edit"
-msgstr "_Sunting"
-
-#: ../meld/meldwindow.py:72
-msgid "Undo the last action"
-msgstr "Batalkan aksi terakhir"
-
-#: ../meld/meldwindow.py:75
-msgid "Redo the last undone action"
-msgstr "Jadikan lagi aksi terakhir yang dibatalkan"
-
-#: ../meld/meldwindow.py:77
-msgid "Cut the selection"
-msgstr "Potong yang dipilih"
-
-#: ../meld/meldwindow.py:79
-msgid "Copy the selection"
-msgstr "Salin yang dipilih"
-
-#: ../meld/meldwindow.py:81
-msgid "Paste the clipboard"
-msgstr "Tempel yang dipilih"
-
-#: ../meld/meldwindow.py:83
-msgid "Find…"
-msgstr "Cari…"
-
-#: ../meld/meldwindow.py:83
-msgid "Search for text"
-msgstr "Mencari teks"
-
-#: ../meld/meldwindow.py:85
-msgid "Find Ne_xt"
-msgstr "Cari Sela_njutnya"
-
-#: ../meld/meldwindow.py:86
-msgid "Search forwards for the same text"
-msgstr "Cari terus teks yang sama"
-
-#: ../meld/meldwindow.py:88
-msgid "Find _Previous"
-msgstr "Cari Se_belumnya"
-
-#: ../meld/meldwindow.py:89
-msgid "Search backwards for the same text"
-msgstr "Cari mundur teks yang sama"
-
-#: ../meld/meldwindow.py:92
-msgid "_Replace…"
-msgstr "_Ganti…"
-
-#: ../meld/meldwindow.py:93
-msgid "Find and replace text"
-msgstr "Cari dan gantikan teks"
-
-#: ../meld/meldwindow.py:95
-msgid "Go to _Line"
-msgstr "Pergi ke _Baris"
-
-#: ../meld/meldwindow.py:96
-msgid "Go to a specific line"
-msgstr "Pergi ke baris tertentu"
-
-#: ../meld/meldwindow.py:99
-msgid "_Changes"
-msgstr "_Perubahan"
-
-#: ../meld/meldwindow.py:100
-msgid "Next Change"
-msgstr "Perubahan Selanjutnya"
-
-#: ../meld/meldwindow.py:101
-msgid "Go to the next change"
-msgstr "Pergi ke perubahan selanjutnya"
-
-#: ../meld/meldwindow.py:103
-msgid "Previous Change"
-msgstr "Perubahan Sebelumnya"
-
-#: ../meld/meldwindow.py:104
-msgid "Go to the previous change"
-msgstr "Pergi ke perubahan sebelumnya"
-
-#: ../meld/meldwindow.py:106
-msgid "Open Externally"
-msgstr "Buka Secara Eksternal"
-
-#: ../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:151
+#, fuzzy
+#| msgid "Filename filters"
+msgid "Filename"
+msgstr "Nama Berkas"
-#: ../meld/meldwindow.py:111
-msgid "_View"
-msgstr "_Tilik"
-
-#: ../meld/meldwindow.py:112
-msgid "File Status"
-msgstr "Status Berkas"
-
-#: ../meld/meldwindow.py:113
-msgid "Version Status"
-msgstr "Status Versi"
-
-#: ../meld/meldwindow.py:116
-msgid "Stop the current action"
-msgstr "Hentikan aksi saat ini"
-
-#: ../meld/meldwindow.py:119
-msgid "Refresh the view"
-msgstr "Segarkan tilikan"
-
-#: ../meld/meldwindow.py:123
-msgid "Fullscreen"
-msgstr "Layar Penuh"
-
-#: ../meld/meldwindow.py:124
-msgid "View the comparison in fullscreen"
-msgstr "Tilik perbandingan dalam layar penuh"
-
-#: ../meld/meldwindow.py:133
-msgid "Open Recent"
-msgstr "Buka Terkini"
-
-#: ../meld/meldwindow.py:134
-msgid "Open recent files"
-msgstr "Buka berkas yang baru-baru ini"
-
-#: ../meld/meldwindow.py:567
+#: meld/meldwindow.py:380
#, python-format
msgid "Need three files to auto-merge, got: %r"
msgstr "Perlu tiga berkas untuk merge otomatis, mendapat: %r"
-#: ../meld/meldwindow.py:588
+#: meld/meldwindow.py:402
msgid "Cannot compare a mixture of files and directories"
msgstr "Tak bisa membandingkan campuran berkas dan direktori"
-#: ../meld/misc.py:155
+#: meld/misc.py:150
msgid ""
"{}\n"
"\n"
@@ -2338,234 +2247,245 @@ msgstr ""
"Meld mengalami kesalahan kritis saat menjalankan:\n"
"<tt>{}</tt>"
-#: ../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:311
+#: meld/misc.py:201
msgid "[None]"
msgstr "[Nihil]"
-#: ../meld/preferences.py:42 ../meld/preferences.py:135
+#: meld/preferences.py:37 meld/preferences.py:129
msgid "label"
msgstr "label"
-#: ../meld/preferences.py:42 ../meld/preferences.py:135
+#: meld/preferences.py:37 meld/preferences.py:129
msgid "pattern"
msgstr "pola"
-#: ../meld/recent.py:106
+#: meld/recent.py:104
msgid "Version control:"
msgstr "Kendali versi:"
-#: ../meld/ui/bufferselectors.py:114
+#: meld/style.py:90
+#, 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/ui/bufferselectors.py:110
#, python-brace-format
msgid "{name} ({charset})"
msgstr "{name} ({charset})"
-#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152
+#: meld/ui/bufferselectors.py:140 meld/ui/bufferselectors.py:148
msgid "Plain Text"
msgstr "Teks Polos"
+#: meld/ui/filechooser.py:68
+#, fuzzy
+msgid "Autodetect Encoding"
+msgstr "Deteksi Mandiri Pengkodean"
+
+#: meld/ui/filechooser.py:71
+#, fuzzy
+msgid "Current Locale ({})"
+msgstr "Lokal Saat Ini: "
+
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/ui/statusbar.py:124
+#: meld/ui/statusbar.py:123
#, python-format
msgid "Ln %i, Col %i"
msgstr "Brs %i, Kol %i"
-#: ../meld/ui/statusbar.py:182
+#: meld/ui/statusbar.py:183
msgid "Line you want to move the cursor to"
msgstr "Baris yang ingin Anda pindahkan kursor ke"
-#: ../meld/ui/vcdialogs.py:55
+#: meld/ui/vcdialogs.py:50
msgid "No files will be committed"
msgstr "Tak ada berkas yang akan dikomit"
#. Translators: First %s is replaced by translated "%d unpushed
#. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:92
+#: meld/vc/git.py:91
#, python-format
msgid "%s in %s"
msgstr "%s dalam %s"
#. Translators: These messages cover the case where there is
#. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:93 ../meld/vc/git.py:100
+#: meld/vc/git.py:92 meld/vc/git.py:99
#, python-format
msgid "%d unpushed commit"
msgid_plural "%d unpushed commits"
msgstr[0] "%d komit belum didorong"
msgstr[1] "%d komit belum didorong"
-#: ../meld/vc/git.py:95
+#: meld/vc/git.py:94
#, python-format
msgid "%d branch"
msgid_plural "%d branches"
msgstr[0] "%d cabang"
msgstr[1] "%d cabang"
-#: ../meld/vc/git.py:334
+#: meld/vc/git.py:336
#, python-format
msgid "Mode changed from %s to %s"
msgstr "Mode diubah dari %s ke %s"
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:344
msgid "Partially staged"
msgstr "Di-stage sebagian"
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:344
msgid "Staged"
msgstr "Di-stage"
#. Translators: This is the displayed name of a version control system
#. when no version control system is actually found.
-#: ../meld/vc/_null.py:37
+#: meld/vc/_null.py:37
msgid "None"
msgstr "Nihil"
-#: ../meld/vc/svn.py:203
+#: meld/vc/svn.py:204
#, python-format
msgid "Rev %s"
msgstr "Rev %s"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Merged"
msgstr "Di-merge"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Base"
msgstr "Basis"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Local"
msgstr "Lokal"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Remote"
msgstr "Remote"
-#: ../meld/vc/_vc.py:71
-msgid "Unversioned"
-msgstr "Tanpa versi"
-
-#: ../meld/vc/_vc.py:74
+#: meld/vc/_vc.py:73
msgid "Error"
msgstr "Galat"
-#: ../meld/vc/_vc.py:76
+#: meld/vc/_vc.py:75
msgid "Newly added"
msgstr "Baru ditambahkan"
-#: ../meld/vc/_vc.py:78
+#: meld/vc/_vc.py:77
msgid "Renamed"
msgstr "Diubah nama"
-#: ../meld/vc/_vc.py:79
+#: meld/vc/_vc.py:78
msgid "Conflict"
msgstr "Konflik"
-#: ../meld/vc/_vc.py:80
+#: meld/vc/_vc.py:79
msgid "Removed"
msgstr "Dihapus"
-#: ../meld/vc/_vc.py:81
+#: meld/vc/_vc.py:80
msgid "Missing"
msgstr "Kurang"
-#: ../meld/vc/_vc.py:82
+#: meld/vc/_vc.py:81
msgid "Not present"
msgstr "Tak ada"
+#. Translators: This error message is shown when no
+#. repository of this type is found.
+#: meld/vcview.py:333
+#, fuzzy, python-format
+#| msgid "%(name)s (%(cmd)s not installed)"
+msgid "%(name)s (not found)"
+msgstr "%(name)s (%(cmd)s tidak terpasang)"
+
#. Translators: This error message is shown when a version
#. control binary isn't installed.
-#: ../meld/vcview.py:282
+#: meld/vcview.py:337
#, 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:286
-#, python-format
-msgid "%(name)s (Invalid repository)"
+#: meld/vcview.py:341
+#, fuzzy, python-format
+#| msgid "%(name)s (Invalid repository)"
+msgid "%(name)s (invalid repository)"
msgstr "%(name)s (Repositori tak valid)"
-#: ../meld/vcview.py:307
+#: meld/vcview.py:355
msgid "No valid version control system found in this folder"
msgstr "Tak ada sistem kendali versi yang valid dalam folder ini"
-#: ../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:311
+#: meld/vcview.py:357
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:366
+#: meld/vcview.py:411
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
#. Initial yield so when we add this to our tasks, we don't
#. create iterators that may be invalidated.
-#: ../meld/vcview.py:373
+#: meld/vcview.py:418
msgid "Scanning repository"
msgstr "Memindai repositori"
-#: ../meld/vcview.py:402
+#: meld/vcview.py:447
#, python-format
msgid "Scanning %s"
msgstr "Memindai %s"
-#: ../meld/vcview.py:441
+#: meld/vcview.py:486
msgid "(Empty)"
msgstr "(Kosong)"
-#: ../meld/vcview.py:487
+#: meld/vcview.py:533
#, python-format
msgid "%s — local"
msgstr "%s — lokal"
-#: ../meld/vcview.py:488
+#: meld/vcview.py:534
#, python-format
msgid "%s — remote"
msgstr "%s — remote"
-#: ../meld/vcview.py:496
+#: meld/vcview.py:542
#, python-format
msgid "%s (local, merge, remote)"
msgstr "%s (lokal, merge, remote)"
-#: ../meld/vcview.py:501
+#: meld/vcview.py:547
#, python-format
msgid "%s (remote, merge, local)"
msgstr "%s (remote, merge, lokal)"
-#: ../meld/vcview.py:512
+#: meld/vcview.py:558
#, python-format
msgid "%s — repository"
msgstr "%s — repositori"
-#: ../meld/vcview.py:518
+#: meld/vcview.py:564
#, python-format
msgid "%s (working, repository)"
msgstr "%s (kerja, repositori)"
-#: ../meld/vcview.py:522
+#: meld/vcview.py:568
#, python-format
msgid "%s (repository, working)"
msgstr "%s (repositori, kerja)"
-#: ../meld/vcview.py:688
+#: meld/vcview.py:730
msgid "Remove folder and all its files?"
msgstr "Hapus folder dan semua berkasnya?"
-#: ../meld/vcview.py:690
+#: meld/vcview.py:732
msgid ""
"This will remove all selected files and folders, and all files within any "
"selected folders, from version control."
@@ -2573,57 +2493,6 @@ 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:804
+#: meld/vcview.py:845
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"
-
-#~ msgid "Couldn’t encode text as “%s”"
-#~ msgstr "Tak bisa meng-encode teks sebagai \"%s\""
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
