Added a new update mechanism

[TortoiseGit.git] / doc / po / TortoiseMerge_id.po

#
# Indonesian translation for TortoiseMerge
# Copyright (C) 2004-2009 the TortoiseGit team
# This file is distributed under the same license as TortoiseGit
#
# Last commit by:
# $Author: luebbe $
# $Date: 2009-01-08 17:19:56 +0800 (Thu, 08 Jan 2009) $
# $Rev: 15043 $
#
# Authors:
# Zaenal Mutaquin
# Thomas Edwin Santosa
#
msgid ""
msgstr ""
"Project-Id-Version: TortoiseGit Documentation\n"
"POT-Creation-Date: 2008-11-17 00:14 +0000\n"
"PO-Revision-Date: 2009-01-01 22:35+0700\n"
"Last-Translator: Thomas Edwin Santosa <thomas@katalisindonesia.com>\n"
"Language-Team: TortoiseGit translation team <tortoisegit-dev@googlegroups.com >\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Indonesian\n"
"X-Poedit-Country: INDONESIA\n"
"X-Poedit-SourceCharset: utf-8\n"

#. (title)
#: ../source/TortoiseMerge_en.xml:4
msgid "TortoiseMerge"
msgstr "TortoiseMerge"

#. (subtitle)
#: ../source/TortoiseMerge_en.xml:6
msgid "A diff/merge tool for Windows"
msgstr "Piranti diff/merge untuk Windows"

#. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated
#. (subtitle)
#: ../source/TortoiseMerge_en.xml:7
msgid "Version $MajorVersion$.$MinorVersion$.$MicroVersion$"
msgstr "Versi $MajorVersion$.$MinorVersion$.$MicroVersion$"

#. (edition)
#: ../source/TortoiseMerge_en.xml:9
msgid "First"
msgstr "Pertama"

#. (firstname)
#: ../source/TortoiseMerge_en.xml:12
msgid "Stefan"
msgstr "Stefan"

#. (surname)
#: ../source/TortoiseMerge_en.xml:13
msgid "Küng"
msgstr "Küng"

#. (firstname)
#: ../source/TortoiseMerge_en.xml:16
msgid "Lübbe"
msgstr "Lübbe"

#. (surname)
#: ../source/TortoiseMerge_en.xml:17
msgid "Onken"
msgstr "Onken"

#. (firstname)
#: ../source/TortoiseMerge_en.xml:20
msgid "Simon"
msgstr "Simon"

# Indonesian#: source/TortoiseMerge_en.xml:1306
#. (surname)
#: ../source/TortoiseMerge_en.xml:21
msgid "Large"
msgstr "Besar"

#. (title)
#: ../source/TortoiseMerge_en.xml:28
msgid "Preface"
msgstr "Pendahuluan"

#. (para)
#: ../source/TortoiseMerge_en.xml:33
msgid "When working on a project, either an open-source project where several people review your code, or a commercial project where you sell a component with your source code, there will be people and customers who find bugs or want to improve your project. To do that they send you patches which you have to review and decide if you want to apply them."
msgstr "Ketika bekerja pada proyek, baik proyek sumber terbuka di mana beberapa orang mengulas kode Anda, atau proyek komersial di mana Anda menjual komponen dengan kode sumber Anda, disana akan ada orang dan kustomer yang menemukan bug atau ingin meningkatkan proyek Anda. Untuk melakukannya, mereka mengirimkan tambalan kepada Anda yang harus Anda tinjau dan putuskan apakah Anda akan menerapkannya."

#. (para)
#: ../source/TortoiseMerge_en.xml:45
msgid "Reviewing patches"
msgstr "Meninjau patches"

#. (para)
#: ../source/TortoiseMerge_en.xml:50
msgid "Applying the patches"
msgstr "Menerapkan patches"

#. (para)
#: ../source/TortoiseMerge_en.xml:41
msgid "TortoiseMerge helps you with both those tasks: <placeholder-1/>"
msgstr "TortoiseMerge membantu Anda dengan kedua tugas tersebut: <placeholder-1/>"

#. (para)
#: ../source/TortoiseMerge_en.xml:56
msgid "TortoiseMerge also helps you to sort out conflicted files which can occur if you're working with a source control system and others are working on the same files as you."
msgstr "TortoiseMerge juga membantu Anda untuk mengurut file yang konflik yang bisa terjadi jika Anda bekerja dengan sistem kontrol sumber dan yang lain bekerja pada file yang sama dengan Anda."

#. (title)
#: ../source/TortoiseMerge_en.xml:66
msgid "TortoiseMerge is free!"
msgstr "TortoiseMerge bebas!"

#. (para)
#: ../source/TortoiseMerge_en.xml:67
msgid "TortoiseMerge is free. You don't have to pay for it, you can use it any way you want. It is developed under the GP license (GPL)."
msgstr "TortoiseMerge adalah bebas. Anda tidak perlu membayarnya, Anda bisa menggunakannya dengan cara apapun yang Anda inginkan. Ini dikembangkan di bawah lisensi GP (GPL)."

# Indonesian#: source/TortoiseMerge_en.xml:68
#. (para)
#: ../source/TortoiseMerge_en.xml:71
msgid "TortoiseMerge is an Open Source project. That means you have full read access to the source code of this program. You can browse it on this link <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/\"><citetitle>http://TortoiseGit.tigris.org/svn/TortoiseGit/</citetitle></ulink>. You will be prompted to enter username and password. The username is <literal>guest</literal>, and the password must be left blank. The most recent version (where we're currently working) is located under <filename>/trunk/</filename>, and the released versions are located under <filename>/tags/</filename>."
msgstr "TortoiseMerge adalah proyek Sumber Terbuka. Ini berarti bahwa Anda mempunyai akses penuh ke kode sumber dari program ini. Anda bisa melihatnya pada pranala ini <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/\"><citetitle>http://TortoiseGit.tigris.org/svn/TortoiseGit/</citetitle></ulink>. Anda akan diminta untuk memasukkan nama pengguna dan sandi lewat. Nama pengguna adalah <literal>guest</literal>, dan sandi lewat harus dibiarkan kosong. Versi paling baru (di mana saat ini kami sedang bekerja) ditempatkan di bawah <filename>/trunk/</filename>, dan versi rilis ditempatkan di bawah <filename>/tags/</filename>."

#. (title)
#: ../source/TortoiseMerge_en.xml:90
msgid "Donate!"
msgstr "Sumbang!"

#. (para)
#: ../source/TortoiseMerge_en.xml:91
msgid "Even though TortoiseGit and TortoiseMerge are free, you can support the developers by sending in patches and play an active role in the development. You can also help to cheer us up during the endless hours we spend in front of our computers."
msgstr "Meskipun TortoiseGit dan TortoiseMerge bebas, Anda bisa mendukung para pengembang dengan mengirimkan patch dan berperan aktif dalam pengembangan. Anda juga bisa membuat kami gembira selama jam tanpa akhir yang kami luangkan di depan komputer kami."

#. (para)
#: ../source/TortoiseMerge_en.xml:97
msgid "While working on TortoiseGit we love to listen to music. And since we spend many hours on the project we need a <emphasis>lot</emphasis> of music. Therefore we have set up some wish-lists with our favourite music CDs and DVDs: <ulink url=\"http://TortoiseGit.tigris.org/donate.html\"><citetitle>http://TortoiseGit.tigris.org/donate.html</citetitle></ulink> Please also have a look at the list of people who contributed to the project by sending in patches or translations."
msgstr "Ketika bekerja pada TortoiseGit kami senang mendengarkan musik. Dan karena kami meluangkan banyak jam pada proyek, kami memerlukan <emphasis>banyak</emphasis> musik. Oleh karena itu, kami telah menyiapkan beberapa daftar keinginan dengan CD dan DVD musik favorit kami: <ulink url=\"http://TortoiseGit.tigris.org/donate.html\"><citetitle>http://TortoiseGit.tigris.org/donate.html</citetitle></ulink> Silahkan lihat daftar orang yang berkontribusi terhadap proyek dengan mengirimkan tambalan atau terjemahan."

# Indonesian#: source/TortoiseMerge_en.xml:110
#. (title)
#: ../source/TortoiseMerge_en.xml:113
msgid "Acknowledgments"
msgstr "Pengakuan"

# Indonesian#: source/TortoiseMerge_en.xml:114
#. (term)
#: ../source/TortoiseMerge_en.xml:117
msgid "Stefan Küng"
msgstr "Stefan Küng"

# Indonesian#: source/TortoiseMerge_en.xml:118
#. (para)
#: ../source/TortoiseMerge_en.xml:121
msgid "for the hard work on TortoiseMerge"
msgstr "atas kerja keras pada TortoiseMerge"

# Indonesian#: source/TortoiseMerge_en.xml:124
#. (term)
#: ../source/TortoiseMerge_en.xml:127
msgid "Lübbe Onken"
msgstr "Lübbe Onken"

# Indonesian#: source/TortoiseMerge_en.xml:128
#. (para)
#: ../source/TortoiseMerge_en.xml:131
msgid "for the beautiful icons, logo, bug hunting and taking care of the documentation"
msgstr "atas ikon-ikon yang indah, logo, pemburuan bug dan pemeliharaan dokumentasi"

# Indonesian#: source/TortoiseMerge_en.xml:135
#. (term)
#: ../source/TortoiseMerge_en.xml:138
msgid "The Tigris Style project"
msgstr "The Tigris Style project"

# Indonesian#: source/TortoiseMerge_en.xml:139
#. (para)
#: ../source/TortoiseMerge_en.xml:142
msgid "for some of the styles which are reused in this documentation"
msgstr "atas beberapa gaya yang digunakan kembali dalam dokumentasi ini"

# Indonesian#: source/TortoiseMerge_en.xml:146
#. (term)
#: ../source/TortoiseMerge_en.xml:149
msgid "Our Contributors"
msgstr "Kontributor Kami"

# Indonesian#: source/TortoiseMerge_en.xml:150
#. (para)
#: ../source/TortoiseMerge_en.xml:153
msgid "for the patches, bug reports and new ideas, and for helping others by answering questions on our mailing list."
msgstr "atas tambalan-tambalan, laporan bug dan ide baru, dan untuk menolong yang lain dengan menjawab pertanyaan pada milis kami."

# Indonesian#: source/TortoiseMerge_en.xml:157
#. (term)
#: ../source/TortoiseMerge_en.xml:160
msgid "Our Donators"
msgstr "Donatur Kami"

# Indonesian#: source/TortoiseMerge_en.xml:161
#. (para)
#: ../source/TortoiseMerge_en.xml:164
msgid "for many hours of joy with the music they sent us"
msgstr "atas banyaknya jam kesenangan dengan musik yang mereka kirimkan kepada kami"

# Indonesian#: source/TortoiseMerge_en.xml:173
#. (title)
#: ../source/TortoiseMerge_en.xml:175
msgid "Introduction"
msgstr "Pengenalan"

# Indonesian#: source/TortoiseMerge_en.xml:182
#. (title)
#: ../source/TortoiseMerge_en.xml:184
msgid "Overview"
msgstr "Tinjauan"

# Indonesian#: source/TortoiseMerge_en.xml:183
#. (para)
#: ../source/TortoiseMerge_en.xml:185
msgid "TortoiseMerge is a free/open-source application. It lets you see differences in text files, merge those changes and even review and apply unified diff files, often called <firstterm>patches</firstterm>."
msgstr "TortoiseMerge adalah aplikasi bebas/sumber-terbuka. Ia membolehkan Anda melihat perbedaan dalam file teks, menggabungkan perubahan itu dan bahkan meninjau dan menerapkan file unified diff, sering disebut <firstterm>patches</firstterm>."

# Indonesian#: source/TortoiseMerge_en.xml:189
#. (para)
#: ../source/TortoiseMerge_en.xml:190
msgid "While working on text files, e.g. source files in your favourite programming language, or html/xml files for your documentation or website, you will often have a situation where you need to compare different versions of those files. Sometimes you get a different version from someone else, sometimes you just want to see the changes you've made."
msgstr "Ketika bekerja pada file teks, contohnya file sumber dalam bahasa pemrograman favorit Anda, atau file html/xml untuk dokumentasi Anda atau website, Anda akan sering menghadapi situasi di mana Anda perlu membandingkan versi yang berbeda dari file-file tersebut. Kadang-kadang Anda mendapatkan versi berbeda dari orang lain, ada kalanya Anda hanya ingin melihat perubahan yang telah Anda buat."

# Indonesian#: source/TortoiseMerge_en.xml:197
#. (para)
#: ../source/TortoiseMerge_en.xml:198
msgid "If you're working with a version control system (e.g. Git) then you sometimes get <emphasis>conflicts</emphasis> when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you."
msgstr "Jika Anda bekerja dengan sistem kontrol versi (contohnya Git) maka Anda biasanya akan menghadapi <emphasis>konflik</emphasis> ketika Anda memutahirkan copy pekerjaan Anda. Ini terjadi jika orang lain mengubah bagian yang sama dari file yang sama yang Anda kerjakan. Maka Anda harus menyelesaikan konflik itu secara manual. Disinilah TortoiseMerge bisa membantu Anda."

# Indonesian#: source/TortoiseMerge_en.xml:205
#. (para)
#: ../source/TortoiseMerge_en.xml:206
msgid "The following diagram shows you the relationships between the files involved in a conflict:"
msgstr "Diagram berikut memperlihatkan kepada Anda hubungan antara file dalam keadaan konflik:"

# Indonesian#: source/TortoiseMerge_en.xml:210
#. (title)
#. (title)
#: ../source/TortoiseMerge_en.xml:211
#: ../source/TortoiseMerge_en.xml:347
msgid "File Conflict"
msgstr "Konflik File"

# Indonesian#: source/TortoiseMerge_en.xml:213
#. (para)
#: ../source/TortoiseMerge_en.xml:214
msgid "A conflict can also occur if you try to apply an outdated patch file. In such cases, without TortoiseMerge, you would either have to ask the person you got that patch file from for a current version or try to apply that patch file manually."
msgstr "Suatu konflik bisa juga terjadi jika Anda mencoba menerapkan sebuah berkas tambalan yang ketinggalan zaman. Dalam kasus-kasus tersebut, tanpa TortoiseMerge, Anda harus menanyakan seseorang di mana Anda mendapatkan berkas tambalan itu untuk versi saat ini atau mencoba menerapkan berkas tambalan itu secara manual."

# Indonesian#: source/TortoiseMerge_en.xml:219
#. (para)
#: ../source/TortoiseMerge_en.xml:220
msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Git. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep."
msgstr "Tetapi sekarang dengan TortoiseMerge ini tidak perlu lagi - setidaknya tidak jika Anda bekerja dengan sistem kontrol versi seperti Git. TortoiseMerge mengurai berkas tambalan untuk revisi/versi dari tambalan yang dibuat untuk dan secara otomatis mencoba mengambil versi tertentu dari kontrol-sumber Anda. Kemudian menerapkan tambalan dan memungkinkan Anda meninjau kedua perubahan Anda pada berkas, dan milik mereka. Lalu Anda bisa memutuskan perubahan mana yang ingin Anda simpan."

# Indonesian#: source/TortoiseMerge_en.xml:233
#. (title)
#: ../source/TortoiseMerge_en.xml:235
msgid "TortoiseMerge's History"
msgstr "Sejarah TortoiseMerge"

# Indonesian#: source/TortoiseMerge_en.xml:234
#. (para)
#: ../source/TortoiseMerge_en.xml:236
msgid "While working on <ulink url=\"http://TortoiseGit.tigris.org\"><citetitle>TortoiseGit</citetitle></ulink> we found that whenever users sent in patches to enhance the project or just to fix bugs, we had a lot of work just applying those patches. And many times those patches were outdated and couldn't be applied with the command line patch tool <ulink url=\"http://unxutils.sourceforge.net/\"><citetitle>http://unxutils.sourceforge.net/</citetitle></ulink> because we were working on those files and had sometimes changed those files already."
msgstr "Ketika bekerja pada <ulink url=\"http://TortoiseGit.tigris.org\"><citetitle>TortoiseGit</citetitle></ulink> kami menemukan bahwa kapan saja pengguna mengirimkan patch untuk meningkatkan proyek atau hanya membetulkan bug, kami banyak bekerja hanya untuk menerapkan patch itu. Dan banyak waktu dari patch itu yang ketinggalan jaman dan tidak bisa diterapkan dengan piranti baris perintah patch <ulink url=\"http://unxutils.sourceforge.net/\"><citetitle>http://unxutils.sourceforge.net/</citetitle></ulink> karena kami bekerja pada file-file itu dan kadang kala sudah mengubah file tersebut."

# Indonesian#: source/TortoiseMerge_en.xml:250
#. (para)
#: ../source/TortoiseMerge_en.xml:251
msgid "This was also the main reason why TortoiseGit did not originally have a <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Create Patch</guimenuitem></menuchoice> implemented: we preferred users to send us the whole files because with those it was easier to apply patches."
msgstr "Ini juga alasa utama mengapa TortoiseGit aslinya tidak mempunyai <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Buat Patch</guimenuitem></menuchoice> diimplementasikan: kami lebih menyukai pengguna untuk mengirimkan kepada kami keseluruhan file karena dengan itu lebih mudah menerapkan patches."

# Indonesian#: source/TortoiseMerge_en.xml:260
#. (para)
#: ../source/TortoiseMerge_en.xml:261
msgid "So we spent a lot of time, searching the Internet for a GUI tool which could apply patch files, but all we found was that such a tool didn't exist. So to cut a long story short: We decided that if no-one else could provide such a tool we would have to write our own. That's when TortoiseMerge was born."
msgstr "Maka kami meluangkan banyak waktu, mencari internet untuk piranti GUI yang bisa menerapkan berkas-berkas tambalan, tetapi kami menemukan bahwa piranti demikian tidak ada. Singkat cerita, kami memutuskan bahwa jika tidak ada orang lain yang bisa menyediakan piranti itu, kami akan menulisnya sendiri. Itulah saat TortoiseMerge dilahirkan."

# Indonesian#: source/TortoiseMerge_en.xml:268
#. (para)
#: ../source/TortoiseMerge_en.xml:268
msgid "Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff."
msgstr "Karena TortoiseGit sudah menggunakan pustaka Git, yang mempunyai mesin pembeda secara pabrikan, ini menjadi alami untuk menggunakan librari ini daripada GNU diff."

#. (title)
#: ../source/TortoiseMerge_en.xml:276
msgid "Basic Concepts"
msgstr "Konsep-Konsep Dasar"

#. (para)
#: ../source/TortoiseMerge_en.xml:282
msgid "Viewing the difference between two files and merging changes into one of them, or removing unwanted changes."
msgstr "Melihat perbedaan di antara dua berkas dan menggabungkan perubahan-perubahan ke salah satu berkas, atau menghilangkan perubahan yang tidak diinginkan."

#. (para)
#: ../source/TortoiseMerge_en.xml:288
msgid "Editing conflicts between local changes and changes in the Git repository following an update."
msgstr "Menyunting konflik di antara perubahan-perubahan lokal dan perubahan-perubahan dalam repositori Git setelah suatu update."

#. (para)
#: ../source/TortoiseMerge_en.xml:294
msgid "Applying patch files. This is the reason TortoiseMerge was created :)"
msgstr "Menerapkan berkas tambalan. Ini adalah salah satu alasan TortoiseMerge dibuat :)"

#. (para)
#: ../source/TortoiseMerge_en.xml:278
msgid "TortoiseMerge has several different uses: <placeholder-1/>"
msgstr "TortoiseMerge memiliki beberapa penggunaan: <placeholder-1/>"

# Indonesian#: source/TortoiseMerge_en.xml:308
#. (title)
#: ../source/TortoiseMerge_en.xml:303
msgid "Viewing and Merging Differences"
msgstr "Melihat dan Menggabung Perbedaan"

#. (para)
#: ../source/TortoiseMerge_en.xml:304
msgid "In this mode you are comparing two files. The file in the left pane is considered to be the original file (sometimes referred to as <emphasis>Theirs</emphasis>, and the file in the right pane is the modified file (sometimes referred to as <emphasis>Mine</emphasis>."
msgstr "Pada moda ini, Anda dapat membandingkan dua berkas. Berkas di jendela kiri dianggap sebagai berkas asli (terkadang dirujuk sebagai <emphasis>Mereka</emphasis>, dan berkas di jendela kanan adalah berkas terubah (terkadang dirujuk sebagai <emphasis>Saya</emphasis>."

#. (para)
#: ../source/TortoiseMerge_en.xml:315
msgid "Reverting changed lines back to the text shown in the left pane."
msgstr "Membatalkan baris-baris terubah kembali ke teks yang ditampilkan di jendela kiri."

#. (para)
#: ../source/TortoiseMerge_en.xml:320
msgid "Using a combination of both blocks, either <emphasis>Theirs</emphasis> before <emphasis>Mine</emphasis> or <emphasis>Mine</emphasis> before <emphasis>Theirs</emphasis>."
msgstr "Menggunakan kombinasi kedua blok, <emphasis>Mereka</emphasis> sebelum <emphasis>Saya</emphasis> atau <emphasis>Saya</emphasis> sebelum <emphasis>Mereka</emphasis>."

# Indonesian#: source/TortoiseMerge_en.xml:330
#. (para)
#: ../source/TortoiseMerge_en.xml:310
#, fuzzy
msgid "You can make simple line-based changes to the file in the right pane which include: <placeholder-1/>"
msgstr "Tampilan dua pane mempunyai beberapa fitur yang tidak tersedia dalam tampilan satu pane: <placeholder-1/>"

#. (para)
#: ../source/TortoiseMerge_en.xml:328
msgid "You can also edit the file in the right pane just as you would in a text editor. Such lines are marked using a pencil icon. Please note that if you want to make any of the line/block-based changes described above, it is better to do those first since once you start editing the file yourself it becomes impossible for TortoiseMerge to keep track of the relationship to the original files."
msgstr "Anda juga dapat menyunting berkas di jendela kiri sebagaimana Anda akan lakukan di sebuah editor teks. Baris-baris tersebut ditandai dengan ikon pensil. Tolong ingat bahwa jika Anda ingin membuat perubahan-perubahan berbasis baris/blok seperti yang diceritakan di atas, adalah lebih baik untuk melakukannya dahulu karena sekali Anda mulai menyunting berkas tersebut, TortoiseMerge sudah tidak dapat lagi mencatat hubungannya ke berkas asli."

# Indonesian#: source/TortoiseMerge_en.xml:588
#. (title)
#: ../source/TortoiseMerge_en.xml:338
msgid "Editing Conflicts"
msgstr "Mengedit Konflik"

#. (para)
#: ../source/TortoiseMerge_en.xml:339
msgid "This is sometimes referred to as a three-way merge, and is shown in three panes. However there are actually four files involved. The file which is not shown is the common base file, the last common ancestor of the two files which are now in conflict. The relationships between the three files are explained in the diagram below:"
msgstr ""

# Indonesian#: source/TortoiseMerge_en.xml:389
#. (para)
#: ../source/TortoiseMerge_en.xml:350
#, fuzzy
msgid "The base file represents the oldest version of a file, from where <emphasis>You</emphasis> and <emphasis>They</emphasis> start making changes. <emphasis>Mine</emphasis> represents the base file with all the changes <emphasis>you</emphasis> made, and <emphasis>Theirs</emphasis> is the file with all the changes <emphasis>someone else</emphasis> made to the file. The left pane shows the changes in <emphasis>Theirs</emphasis> relative to the base file and the right pane shows the changes in <emphasis>Mine</emphasis> relative to the base file. The bottom pane is the output file which is where you are trying to resolve the conflicts."
msgstr "Basis file menggambarkan versi file terlama, di mana <literal>Anda</literal> dan <literal>Mereka</literal> mulai membuat perubahan. <literal>Saya</literal> menggambarkan file basisi dengan semua perubahan yang <emphasis>Anda</emphasis> buat, dan <literal>Mereka</literal> adalah file dengan semua perubahan pada file yang dibuat <emphasis>orang lain</emphasis>."

#. (para)
#: ../source/TortoiseMerge_en.xml:362
msgid "In conflict resolution view, you can choose to use blocks from <emphasis>Mine</emphasis> or <emphasis>Theirs</emphasis> or both. But in this case, the changes are shown in the bottom pane."
msgstr ""

# Indonesian#: source/TortoiseMerge_en.xml:399
#. (title)
#. (title)
#. (title)
#: ../source/TortoiseMerge_en.xml:369
#: ../source/TortoiseMerge_en.xml:478
#: ../source/TortoiseMerge_en.xml:866
msgid "Applying Patches"
msgstr "Menerapkan Patch"

#. (para)
#: ../source/TortoiseMerge_en.xml:370
msgid "A patch file is a Git unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:380
msgid "In either case TortoiseMerge will show a small window listing the files included in the patch. By double clicking on one of these files you fetch the relevant file and apply the changes. The left pane shows the original file content and the right pane shows it after the patch is applied."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:387
msgid "You can edit the file in the right pane exactly as you would in compare/edit mode."
msgstr ""

# Indonesian#: source/TortoiseMerge_en.xml:278
#. (title)
#: ../source/TortoiseMerge_en.xml:394
msgid "Using TortoiseMerge"
msgstr "Menggunakan TortoiseMerge"

# Indonesian#: source/TortoiseMerge_en.xml:308
#. (title)
#: ../source/TortoiseMerge_en.xml:402
msgid "Viewing Modes"
msgstr "Moda-Moda Melihat"

#. (para)
#: ../source/TortoiseMerge_en.xml:403
msgid "TortoiseMerge has three main viewing modes: one-pane, two-pane and three-pane view. One/two-pane view is used to view changes and three-pane view is used to resolve conflicts."
msgstr ""

# Indonesian#: source/TortoiseMerge_en.xml:308
#. (title)
#. (title)
#: ../source/TortoiseMerge_en.xml:409
#: ../source/TortoiseMerge_en.xml:843
msgid "Viewing / Merging"
msgstr "Melihat / Menggabung"

#. (title)
#: ../source/TortoiseMerge_en.xml:411
msgid "One Pane View"
msgstr "Tampilan Satu Pane"

# Indonesian#: source/TortoiseMerge_en.xml:327
#. (title)
#: ../source/TortoiseMerge_en.xml:415
msgid "Two Pane View"
msgstr "Tampilan Dua Pane"

# Indonesian#: source/TortoiseMerge_en.xml:335
#. (para)
#: ../source/TortoiseMerge_en.xml:423
msgid "Changes inside the modified lines are shown in different colors. Added string parts are shown with a lighter color, but you can of course configure the colors used here. Removed parts are indicated with a dark brown vertical line in the string. Check out the screenshot above to see how this works."
msgstr "Perubahan di dalam baris yang diubah ditampilkan dalam warna berbeda. Bagian string yang ditambahkan ditampilkan dengan warna lebih terang, tetapi tentunya Anda bisa mengkonfigurasi warna-warna yang digunakan di sini. Bagian yang dihapus ditunjukan dengan warna garis vertikal coklat tua dalam string. Periksa foto layar untuk melihat bagaimana ini bekerja."

# Indonesian#: source/TortoiseMerge_en.xml:345
#. (para)
#: ../source/TortoiseMerge_en.xml:433
msgid "Code reorganization usually means a lot of changes in whitespaces (space, tab, newlines) but no actual code change. For example, you split up a very long line into several lines, or you sometimes compact several lines together into one."
msgstr "Reorganisasi kode biasanya berarti banyak perubahan dalam spasi putih (spasi, tab, baris baru) tapi tidak ada perubahan kode aktual. Sebagai contoh, Anda memisahkan baris yang sangat panjang menjadi beberapa baris, atau kadang kala Anda memampatkan beberapa baris bersama menjadi satu baris."

# Indonesian#: source/TortoiseMerge_en.xml:344
#. (para)
#: ../source/TortoiseMerge_en.xml:439
#, fuzzy
msgid "Such changes are marked with a white circle symbol on the left side of the views. If you see such a white circle, you know immediately that no real code change is there and you don't have to check the changed block further."
msgstr "<placeholder-1/> Perubahan-perubahan demikian ditandai dengan simbol lingkaran putih disisi tampilan. Jika Anda melihat lingkaran putih tersebut, Anda segera mengetahui bahwa tidak ada perubahan kode secara nyata disana dan Anda tidak harus memeriksa blok perubahan selanjutnya. <placeholder-2/>"

#. (para)
#: ../source/TortoiseMerge_en.xml:447
msgid "Hand editing of the file in the right pane is possible in two-pane view. Such changes are marked with a pencil symbol."
msgstr ""

# Indonesian#: source/TortoiseMerge_en.xml:330
#. (para)
#: ../source/TortoiseMerge_en.xml:418
msgid "The two pane view has some features which are not available in the one pane view: <placeholder-1/>"
msgstr "Tampilan dua pane mempunyai beberapa fitur yang tidak tersedia dalam tampilan satu pane: <placeholder-1/>"

# Indonesian#: source/TortoiseMerge_en.xml:361
#. (para)
#: ../source/TortoiseMerge_en.xml:454
msgid "If you want to compare/merge three files, TortoiseMerge will show you the differences in a three pane view. This view is also used if you need to resolve conflicted files."
msgstr "Jika Anda ingin membandingkan/menggabung tiga file, TortoiseMerge akan memperlihatkan kepada Anda perbedaan dalam tampilan tiga pane. Tampilan ini juga digunakan jika Anda perlu untuk menyelesaikan file berkonflik."

# Indonesian#: source/TortoiseMerge_en.xml:368
#. (title)
#: ../source/TortoiseMerge_en.xml:460
msgid "Three Pane View"
msgstr "Tampilan Tiga Pane"

# Indonesian#: source/TortoiseMerge_en.xml:371
#. (para)
#: ../source/TortoiseMerge_en.xml:463
#, fuzzy
msgid "The left pane shows you the differences between <emphasis>Their</emphasis> file and the <emphasis>Base</emphasis> file, while the right pane shows you the differences between <emphasis>Mine</emphasis> file and the <emphasis>Base</emphasis> file. The bottom pane shows you the result of merging <emphasis>Base</emphasis>, <emphasis>Mine</emphasis> and <emphasis>Theirs</emphasis> with possible conflicts."
msgstr "Pane kiri memperlihatkan kepada Anda perbedaan antara file <literal>Mereka</literal> dan file <literal>Base</literal>, sementara pane kanan memperlihatkan kepada Anda perbedaan antara file <literal>Saya</literal> dan file <literal>Base</literal>. Pane bawah memperlihatkan kepada Anda hasil dari penggabungan <literal>Base</literal>, <literal>Saya</literal> dan <literal>Mereka</literal> dengan kemungkinan konflik. Jika Anda mengarahkan mouse di atas judul pane, tooltip akan menampilkan nama file yang digunakan untuk diff dalam setiap pane."

#. (para)
#: ../source/TortoiseMerge_en.xml:472
msgid "If you hover the mouse over the pane title, a tooltip will show the filenames used for the diff in each pane."
msgstr ""

# Indonesian#: source/TortoiseMerge_en.xml:418
#. (title)
#: ../source/TortoiseMerge_en.xml:484
msgid "Patch File List"
msgstr "Daftar Berkas Tambalan"

# Indonesian#: source/TortoiseMerge_en.xml:413
#. (para)
#: ../source/TortoiseMerge_en.xml:479
#, fuzzy
msgid "After TortoiseMerge parses the patch file it will show you a small window with all the files which have changes according to the patch file. <placeholder-1/> If the filename is shown in black, then the patch can be applied without any problems. That means the file is not outdated according to the patch. However, if the filename is shown in red, then the patch can't get applied directly because you already changed that file."
msgstr "Jika TortoiseMerge bisa mengurai patchfile ia akan memperlihatkan kepada Anda jendela kecil dengan semua file yang mempunyai perubahan menurut patchfile. <placeholder-1/> Jika nama file ditampilkan hitam, maka patch bisa diterapkan tanpa masalah. Itu berarti file tidak ketinggalan jaman menurut patch. Akan tetapi, jika nama file ditampilkan merah, patch tidak bisa diterapkan secara langsung karena Anda sudah mengubah file itu."

# Indonesian#: source/TortoiseMerge_en.xml:427
#. (para)
#: ../source/TortoiseMerge_en.xml:493
#, fuzzy
msgid "But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between <emphasis>Base</emphasis> (the older version of the file), <emphasis>Mine</emphasis> (the file as it is currently in your working copy) and <emphasis>Theirs</emphasis> (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually."
msgstr "Tapi jangan khawatir. Jika Anda bekerja dengan Git Anda bisa mengambil versi file lama dan menyelesaikan konflik tersebut. Kenyataannya, TortoiseMerge secara otomatis mencoba mendapatkan versi file lama itu dan kemudian memperlihatkannya kepada Anda perbedaan di antara <literal>Base</literal> (file versi lebih lama), <literal>Saya</literal> (file di mana copy pekerjaan Anda saat ini) dan <literal>Mereka</literal> (versi file lama dengan patch yang sudah diterapkan). Selanjutnya Anda bisa menyelesaikan kemungkinan konflik secara manual."

# Indonesian#: source/TortoiseMerge_en.xml:438
#. (para)
#: ../source/TortoiseMerge_en.xml:504
#, fuzzy
msgid "The patch file window has a context menu which allows you to preview the effect of the patch on the current file (apply without saving), to apply and save the changes for the selected file, or to apply and save changes to <emphasis>all</emphasis> files in the list. The double-click action is to preview."
msgstr "Jendela patchfile mempunyai menu konteks yang membolehkan Anda untuk meninjau akibat dari patch pada file saat ini (menerapkan tanpa menyimpan), untuk menerapkan dan menyimpan perubahan untuk file yang dipilih, atau menerapkan dan menyimpan perubahan ke <emphasis>semua</emphasis> file dalam daftar. Aksi klik-ganda untuk meninjau."

# Indonesian#: source/TortoiseMerge_en.xml:447
#. (para)
#: ../source/TortoiseMerge_en.xml:512
msgid "Depending on whether TortoiseMerge can apply the patch directly or by fetching an older version of the file first, it shows you a two pane view (patch can be applied directly) or a three pane view (older version of file fetched)."
msgstr "Tergantung apakah TortoiseMerge bisa menerapkan patch secara langsung atau dengan mengambil versi lama lebih dulu, ia memperlihatkan kepada Anda tampilan dua pane (patch bisa diterapkan secara langsung) atau tampilan tiga pane (versi file lebih lama diambil)."

# Indonesian#: source/TortoiseMerge_en.xml:460
#. (title)
#: ../source/TortoiseMerge_en.xml:521
msgid "Buttons and Other Controls"
msgstr "Tombol dan Kontrol Lain"

#. (title)
#: ../source/TortoiseMerge_en.xml:524
msgid "The Toolbar"
msgstr "Toolbar"

# Indonesian#: source/TortoiseMerge_en.xml:463
#. (para)
#: ../source/TortoiseMerge_en.xml:531
msgid "<guibutton>Open</guibutton> accesses the file-open dialog. What else?"
msgstr "<guibutton>Buka</guibutton> mengakses dialog buka-file. Apa lagi?"

#. (para)
#: ../source/TortoiseMerge_en.xml:537
msgid "<guibutton>Save</guibutton> saves any changes you have made."
msgstr "<guibutton>Simpan</guibutton> menyimpan setiap perubahan yang Anda buat."

#. (para)
#: ../source/TortoiseMerge_en.xml:543
msgid "<guibutton>Reload</guibutton> discards any changes you have made in TortoiseMerge and reloads the files from disk."
msgstr "<guibutton>Ambil lagi</guibutton> mengabaikan setiap perubahan yang Anda buat dalam TortoiseMerge dan mengambil lagi file asli sebelumnya dari disk."

#. (para)
#: ../source/TortoiseMerge_en.xml:550
msgid "<guibutton>Undo</guibutton> implements a multi-level undo, allowing you to reverse any changes you have made within TortoiseMerge."
msgstr "<guibutton>Undo</guibutton> mengimplementasikan suatu undo multi-level, memungkinkan Anda untuk membalik setiap perubahan yang Anda buat dalam TortoiseMerge."

#. (para)
#: ../source/TortoiseMerge_en.xml:557
msgid "<guibutton>Prev/Next Difference</guibutton> jumps directly to the next point where the files differ. This saves scrolling through all the unchanged parts of the file."
msgstr "<guibutton>Perbedaan Sebelumnya/Berikutnya</guibutton> melompat secara langsung ke titik berikutnya di mana file berbeda. Ini menghemat penggulungan melalui semua bagian file yang tidak berubah."

#. (para)
#: ../source/TortoiseMerge_en.xml:563
msgid "When you do this in 2-pane diff mode, the detail bar at the bottom of the screen will show you the inline differences for the first line, regardless of where the mouse is hovering."
msgstr "Ketika Anda melakukan ini dalam mode 2-pane diff, bar detil di bawah layar akan menampilkan kepada Anda perbedaan sebaris untuk baris pertama, dimanapun mouse berada."

#. (para)
#: ../source/TortoiseMerge_en.xml:570
msgid "<guibutton>Prev/Next Conflict</guibutton> jumps directly to the next point where the file differences are in conflict and need to be resolved."
msgstr "<guibutton>Konflik Sebelumnya/Berikutnya</guibutton> melompat secara langsung ke titik di mana perbedaan file dalam keadaan konflik dan perlu untuk diselesaikan."

#. (para)
#: ../source/TortoiseMerge_en.xml:577
msgid "<guibutton>Use Theirs/Use Mine</guibutton> selects whether to use a block from the left or the right pane. Refer to the next section for more information about editing changes and conflicts."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:586
msgid "<guibutton>Theirs before Mine/Mine before Theirs</guibutton> is used when you want to combine changes in a conflicted file. Refer to the next section for more information about editing changes and conflicts."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:594
msgid "<guibutton>Mark as Resolved</guibutton> When you have resolved all the conflicts in a file and saved the changes, you can mark it as resolved from within TortoiseMerge, rather than going back to explorer and marking as resolved from there."
msgstr "<guibutton>Tandai Diselesaikan</guibutton> Ketika Anda telah menyelesaikan semua konflik dalam file dan menyimpan perubahan, Anda bisa menandainya sudah diselesaikan dari dalam TortoiseMerge, daripada pergi kembali ke explorer dan menandainya terselesaikan dari sana."

#. (para)
#: ../source/TortoiseMerge_en.xml:603
msgid "<guibutton>Show Whitespaces</guibutton> toggles the option to display space and tab characters as symbols so you can distinguish white space changes."
msgstr "<guibutton>Tampilkan Spasi Putih</guibutton> menghidup/matikan opsi untuk menampilkan karakter spasi dan tab sebagai simbol agar Anda bisa membedakan spasi putih."

#. (para)
#: ../source/TortoiseMerge_en.xml:610
msgid "<guibutton>Inline Diff Word-wise</guibutton> toggles the method used to display inline diffs. In word-wise mode, when a character is changed, the whole word is highlighted. In char-wise mode, each individual changed character is highlighted."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:617
msgid "Word-wise is the default and in most cases it works better. For example if you change a variable name, the whole name is highlighted in word-wise mode, whereas in char-wise mode you tend to get a mess of added and deleted characters which doesn't make much sense. However, some content does not resolve neatly into words, for example a hex file, and in that case, char-wise display works better."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:628
msgid "<guibutton>Switch View</guibutton> selects between one-pane and two-pane view. Disabled in 3-pane view."
msgstr "<guibutton>Tukar Tampilan</guibutton> memilih antara tampilan satu-pane dan dua-pane. Dimatikan dalam tampilan 3-pane."

#. (para)
#: ../source/TortoiseMerge_en.xml:635
msgid "<guibutton>Switch Left and Right View</guibutton> In 2-pane view, swaps the left and right windows. When you are comparing a file in 2 different trees, as opposed to 2 revisions of the same file, TortoiseGit does not know which one should go in the left pane as the <quote>original/base</quote> version. If it gets this wrong, you can change it to make viewing easier."
msgstr "<guibutton>Tukar Tampilan Kiri dan Kanan</guibutton> Dalam tampilan 2-pane, menukar jendela kiri dan kanan. Ketika Anda membandingkan file dalam 2 susunan berbeda, kebalikan dari 2 revisi dari file yang sama, TortoiseGit tidak mengetahui yang mana yang harus di sebelah pane kiri karena versi <quote>original/base</quote>. Jika ini salah, Anda bisa mengubahnya untuk kemudahan melihatnya."

#. (para)
#: ../source/TortoiseMerge_en.xml:646
msgid "<guibutton>Show/Hide Patch List</guibutton> When TortoiseMerge has a patch list, this button allows you to hide it (so you can see both windows), or show it (so you can review the file list)."
msgstr "<guibutton>Tampilkan/Sembunyikan Daftar Patch</guibutton> Ketika TortoiseMerge mempunyai daftar patch, tombol ini membolehkan Anda untuk menyembunyikannya (agar Anda bisa melihat kedua jendela), atau menampilkannya (agar Anda bisa meninjau daftar file)."

# Indonesian#: source/TortoiseMerge_en.xml:560
#. (para)
#: ../source/TortoiseMerge_en.xml:654
msgid "<guibutton>Settings</guibutton> takes you to TortoiseMerge's settings dialog."
msgstr "<guibutton>Seting</guibutton> membawa Anda ke dialog seting TortoiseMerge."

# Indonesian#: source/TortoiseMerge_en.xml:461
#. (para)
#: ../source/TortoiseMerge_en.xml:522
msgid "<placeholder-1/> Below the menu bar lies the tool bar. This provides easy access to the most commonly used tools, which are <placeholder-2/>"
msgstr "<placeholder-1/> Di bawah ini bar menu menyediakan tool bar. Ini memudahkan akses ke piranti yang sering digunakan, yakni <placeholder-2/>"

# Indonesian#: source/TortoiseMerge_en.xml:567
#. (para)
#: ../source/TortoiseMerge_en.xml:661
msgid "On the left side of the window is a locator bar. This provides a quick visual reference as to where the changes lie within the file. The bar has three columns. The left column refers to the left pane, the right column to the right pane, and the centre column to the bottom pane (if present). In one-pane view only the left column is used. The locator bar can also be used as a scroll bar to scroll all the windows simultaneously."
msgstr "Di sisi kiri jendela adalah bar lokator. Ini menyediakan referensi visual cepat di mana adanya perubahan di dalam file. Bar mempunyai tiga kolom. Kolom kiri ke pane kiri, kolom kanan ke pane kanan, dan kolom tengah ke pane bawah (jika ada). Dalam tampilan satu-pane hanya kolom kiri yang digunakan. Bar lokator bisa juga digunakan sebagai bar penggulung untuk menggulung jendela secara simultan."

# Indonesian#: source/TortoiseMerge_en.xml:575
#. (para)
#: ../source/TortoiseMerge_en.xml:670
msgid "Below the bottom window is the status bar. This shows the number of lines added and deleted in <literal>Theirs</literal> and <literal>Mine</literal>, and the number of unresolved conflicts remaining. You can also see which line-ending style is in use, what encoding (ASCII, UTF-8, etc) is assumed by TortoiseMerge, and whether there is a byte-order-mark (BOM) present in UTF-8 files. The left side of the status bar is used to display hints when you hover the mouse over a control."
msgstr "Di bawah jendela bawah adalah status bar. Ini memperlihatkan jumlah baris yang ditambahkan dan dihapus dalam <literal>Mereka</literal> dan <literal>Saya</literal>, dan jumlah sisa konflik yang belum diselesaikan. Anda juga dapat melihat gaya akhiran baris mana yang digunakan, pengenkodean (ASCII, UTF-8, dll) yang diasumsi oleh TortoiseMerge, dan apakah byte-order-mark (BOM) ada dalam file-file UTF-8. Sisi kiri dari status bar digunakan untuk menampilkan petunjuk saat mouse melewati sebuah kontrol."

#. (title)
#: ../source/TortoiseMerge_en.xml:683
msgid "Line Status Icons"
msgstr "Ikon-Ikon Status Baris"

#. (para)
#: ../source/TortoiseMerge_en.xml:684
msgid "Changed lines are marked with an icon to indicate what type of change has occurred."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:688
msgid "<graphic fileref=\"images/TMerge_lineadded.png\"/> A line has been added."
msgstr "<graphic fileref=\"images/TMerge_lineadded.png\"/> Sebuah baris telah ditambahkan."

#. (para)
#: ../source/TortoiseMerge_en.xml:692
msgid "<graphic fileref=\"images/TMerge_lineremoved.png\"/> A line has been removed."
msgstr "<graphic fileref=\"images/TMerge_lineremoved.png\"/> Sebuah baris telah dihapus."

#. (para)
#: ../source/TortoiseMerge_en.xml:696
msgid "<graphic fileref=\"images/TMerge_lineequal.png\"/> A change has been undone by reverting to the original content of the line."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:700
msgid "<graphic fileref=\"images/TMerge_linewhitespace.png\"/> This line contains only whitespace changes. Where several consecutive lines are marked, the paragraph may have been re-wrapped, causing words to shuffle onto adjacent lines."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:706
msgid "<graphic fileref=\"images/TMerge_lineedited.png\"/> A line has been edited by hand, using TortoiseMerge as a text editor."
msgstr "<graphic fileref=\"images/TMerge_lineedited.png\"/> Sebuah baris telah disunting secara manual, menggunakan TortoiseMerge sebagai penyunting teks."

#. (para)
#: ../source/TortoiseMerge_en.xml:710
msgid "<graphic fileref=\"images/TMerge_lineconflicted.png\"/> This line is in conflict."
msgstr "<graphic fileref=\"images/TMerge_lineconflicted.png\"/> Baris ini dalam konflik."

#. (para)
#: ../source/TortoiseMerge_en.xml:714
msgid "<graphic fileref=\"images/TMerge_lineconflictedignored.png\"/> This line is conflicted, but the effect is hidden by whitespace or line-ending settings."
msgstr "<graphic fileref=\"images/TMerge_lineconflictedignored.png\"/> Baris ini dalam konflik, tetapi disembunyikan oleh pengaturan spasi putih atau pengakhiran baris."

# Indonesian#: source/TortoiseMerge_en.xml:588
#. (title)
#: ../source/TortoiseMerge_en.xml:721
msgid "Merging / Editing Conflicts"
msgstr "Menggabung / Mengedit Konflik"

# Indonesian#: source/TortoiseMerge_en.xml:589
#. (para)
#: ../source/TortoiseMerge_en.xml:722
msgid "TortoiseMerge not only <emphasis>shows</emphasis> you the differences between files but also lets you resolve conflicts or apply changes."
msgstr "TortoiseMerge tidak hanya <emphasis>memperlihatkan</emphasis> kepada Anda perbedaan di antara file tetapi juga membolehkan Anda menyelesaikan konflik atau menerapkan perubahan."

# Indonesian#: source/TortoiseMerge_en.xml:594
#. (para)
#: ../source/TortoiseMerge_en.xml:726
msgid "If you're in two pane view, then you can only edit the file in the right pane (<literal>Mine</literal>). To apply changes made in the left file (<literal>Theirs</literal>), <action>right-click</action> on the changed lines and select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use text block from <quote>theirs</quote></guimenuitem></menuchoice>. Then the changes from the left file are added to the right file."
msgstr "Jika Anda dalam tampilan dua pane, maka Anda hanya bisa mengedit file dalam pane kanan (<literal>Saya</literal>). Untuk menerapkan perubahan yang dibuat dalam file kiri (<literal>Mereka</literal>), <action>klik-kanan</action> pada baris yang diubah dan pilih <menuchoice><guimenu>Menu Konteks</guimenu><guimenuitem>Gunakan blok teks dari <quote>mereka</quote></guimenuitem></menuchoice>. Maka perubahan dari file kiri ditambahkan ke file kanan."

# Indonesian#: source/TortoiseMerge_en.xml:606
#. (para)
#: ../source/TortoiseMerge_en.xml:738
msgid "Sometimes you actually want both text blocks, and the context menu also offers you <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use both text blocks (this one first)</guimenuitem></menuchoice> and <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use both text blocks (this one last)</guimenuitem></menuchoice>."
msgstr "Terkadang Anda sebenarnya ingin kedua blok teks, dan menu kontekstual juga menawarkan kepada Anda <menuchoice><guimenu>Menu Konteks</guimenu><guimenuitem>Gunakan kedua blok teks (yang ini terlebih dahulu)</guimenuitem></menuchoice> dan <menuchoice><guimenu>Menu Konteks</guimenu><guimenuitem>Gunakan kedua blok teks (yang ini terkemudian)</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseMerge_en.xml:751
msgid "You can also edit the output file just as you would in a text editor. Such lines are marked using a pencil icon. Please note that if you want to make any of the line/block-based changes described above, it is better to do those first since once you start editing the file yourself it becomes impossible for TortoiseMerge to keep track of the relationship to the original files."
msgstr ""

# Indonesian#: source/TortoiseMerge_en.xml:606
#. (para)
#: ../source/TortoiseMerge_en.xml:759
msgid "If you're in three pane view (sometimes called <emphasis>merge view</emphasis>) you can only edit the file in the bottom view (<literal>Merged</literal>). As in two pane view, you can <action>right-click</action> on conflicted lines and either select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use text block from <quote>theirs</quote></guimenuitem></menuchoice> or <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use text block from <quote>mine</quote></guimenuitem></menuchoice>. In addition, if you want <emphasis>both</emphasis> blocks, you can select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem> Use text block from <quote>mine</quote> before <quote>theirs</quote></guimenuitem></menuchoice> or <menuchoice><guimenu>Context Menu</guimenu><guimenuitem> Use text block from <quote>theirs</quote> before <quote>mine</quote></guimenuitem></menuchoice>. According to the command you've selected, the changes are used in the resulting <literal>Merged</literal> file."
msgstr "Jika Anda dalam tampilan tiga pane (kadang kala disebut <emphasis>tampilan gabungan</emphasis>) Anda hanya bisa mengedit file dalam tampilan bawah (<literal>Digabung</literal>). Seperti dalam tampilan dua pane, Anda bisa <action>mengklik-kanan</action> pada baris yang konflik dan memilih <menuchoice><guimenu>Menu Konteks</guimenu><guimenuitem>Gunakan blok teks dari <quote>mereka</quote></guimenuitem></menuchoice> atau <menuchoice><guimenu>Menu Konteks</guimenu><guimenuitem>Gunakan blok teks dari <quote>saya</quote></guimenuitem></menuchoice>. Sebagai tambahan, jika Anda menginginkan <emphasis>kedua</emphasis> blok, Anda bisa memilih <menuchoice><guimenu>Menu Konteks</guimenu><guimenuitem> Gunakan blok teks dari <quote>saya</quote> sebelum <quote>mereka</quote></guimenuitem></menuchoice> atau <menuchoice><guimenu>Menu Konteks</guimenu><guimenuitem> Gunakan blok teks dari <quote>mereka</quote> sebelum <quote>saya</quote></guimenuitem></menuchoice>. Tergantung pada perintah yang telah Anda pilih, perubahan digunakan dalam hasil file <literal>Digabung</literal>."

#. (para)
#: ../source/TortoiseMerge_en.xml:796
msgid "Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the <emphasis>Conflict-Ignored</emphasis> icon. To resolve the conflict you still need to pick which version you want to use."
msgstr ""

# Indonesian#: source/TortoiseMerge_en.xml:643
#. (para)
#: ../source/TortoiseMerge_en.xml:804
msgid "Sometimes the conflict is too difficult to resolve by simply picking <literal>Theirs</literal> and <literal>Mine</literal> and it requires hand editing. TortoiseMerge allows you to do all the easy changes visually first and then save the file, leaving only the difficult changes to be resolved by hand-editing."
msgstr "Kadang-kadang konflik terlalu sulit untuk diselesaikan hanya dengan mengambil <literal>Theirs</literal> dan <literal>Mine</literal> dan memerlukan pengeditan tangan. TortoiseMerge membolehkan Anda untuk melakukan semua perubahan yang mudah secara visual terlebih dulu dan menyimpan file, membiarkan hanya perubahan yang sulit untuk diselesaikan dengan pengeditan manual."

# Indonesian#: source/TortoiseMerge_en.xml:652
#. (para)
#: ../source/TortoiseMerge_en.xml:812
msgid "Note that if you use TortoiseMerge on the same files again, any changes to your working copy, whether in TortoiseMerge, or by hand-editing, <emphasis>will be discarded</emphasis> and the file will appear as it did when conflict-editing first started."
msgstr "Catatan bahwa jika Anda menggunakan TortoiseMerge pada file yang sama lagi, setiap perubahan terhadap copy pekerjaan Anda, baik dalam TortoiseMerge, atau pengeditan manual, akan <emphasis>diabaikan</emphasis> dan file akan muncul seperti ketika pengeditan-konflik pertama dimulai."

# Indonesian#: source/TortoiseMerge_en.xml:287
#. (title)
#: ../source/TortoiseMerge_en.xml:822
msgid "Open Files"
msgstr "Buka File"

# Indonesian#: source/TortoiseMerge_en.xml:289
#. (para)
#: ../source/TortoiseMerge_en.xml:824
msgid "When you start TortoiseMerge without any command line switches then you have to open the files manually, using <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem></menuchoice>."
msgstr "Ketika Anda memulai TortoiseMerge tanpa saklar baris perintah maka Anda harus membuka file secara manual, menggunakan <menuchoice><guimenu>File</guimenu><guimenuitem>Buka</guimenuitem></menuchoice>."

# Indonesian#: source/TortoiseMerge_en.xml:298
#. (title)
#: ../source/TortoiseMerge_en.xml:833
msgid "The Open Dialog"
msgstr "Dialog Buka"

# Indonesian#: source/TortoiseMerge_en.xml:301
#. (para)
#: ../source/TortoiseMerge_en.xml:836
#, fuzzy
msgid "The first thing you have to do is to decide whether you just want to compare/merge files, or whether you want to apply a patch file. Depending on what you choose, the corresponding edit boxes and browse buttons are activated."
msgstr "Hal pertama yang harus Anda kerjakan adalah memutuskan apakah Anda hanya ingin membandingkan/menggabung file, atau apakah Anda ingin menerapkan patchfile. Tergantung pada apa yang Anda pilih, kotak edit terkait dan tombol lihat diaktifkan."

# Indonesian#: source/TortoiseMerge_en.xml:309
#. (para)
#: ../source/TortoiseMerge_en.xml:844
#, fuzzy
msgid "If you want to compare / merge files you have to set at least two of the three possible paths for <literal>Base</literal>, <literal>Mine</literal> and <literal>Theirs</literal>. If you select only two files, then TortoiseMerge will show you the differences between those two files, either in a two pane view or in a one pane view."
msgstr "Jika Anda ingin membandingkan / menggabungkan file Anda harus menetapkan setidaknya dua dari tiga path yang mungkin untuk <literal>Base</literal>, <literal>Saya</literal> dan <literal>Mereka</literal>. Jika Anda hanya memilih dua file, maka TortoiseMerge akan menampilkan kepada Anda perbedaan di antara dua file itu, baik dalam tampilan dua pane atau dalam tampilan satu pane. Anda bisa menukar kedua tampilan itu dengan perintah menu <menuchoice><guimenu>Lihat</guimenu><guimenuitem>DuaCara Diff</guimenuitem></menuchoice>"

# Indonesian#: source/TortoiseMerge_en.xml:361
#. (para)
#: ../source/TortoiseMerge_en.xml:852
#, fuzzy
msgid "If you want to merge three files, TortoiseMerge will show you the differences in a three pane view. This view is generally used if you need to resolve conflicted files. The output file is not named in this case and you will have to use the <menuchoice><guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem></menuchoice>. to save the results."
msgstr "Jika Anda ingin membandingkan/menggabung tiga file, TortoiseMerge akan memperlihatkan kepada Anda perbedaan dalam tampilan tiga pane. Tampilan ini juga digunakan jika Anda perlu untuk menyelesaikan file berkonflik."

# Indonesian#: source/TortoiseMerge_en.xml:400
#. (para)
#: ../source/TortoiseMerge_en.xml:867
#, fuzzy
msgid "If you want to apply a patch file you have to set both the path to the patch file itself and the path to the folder where the patch file should be applied."
msgstr "Jika Anda ingin menerapkan patchfile Anda harus menetapkan kedua path terhadap patchfile sendiri dan path ke folder di mana patchfile harus diterapkan."

# Indonesian#: source/TortoiseMerge_en.xml:406
#. (para)
#: ../source/TortoiseMerge_en.xml:873
#, fuzzy
msgid "Currently, only patch files in <emphasis>Unified Diff Format</emphasis> are supported. And only files which were generated from a Git working copy. Other formats like patch files generated by CVS are currently not supported!"
msgstr "Saat ini, hanya patchfiles dalam <emphasis>Format Unified Diff</emphasis> yang didukung. Dan hanya file yang dibuat dari working copy Git. Format lain seperti patchfiles yang dibuat oleh CVS saat ini tidak didukung!"

# Indonesian#: source/TortoiseMerge_en.xml:673
#. (title)
#: ../source/TortoiseMerge_en.xml:884
msgid "Settings"
msgstr "Seting"

# Indonesian#: source/TortoiseMerge_en.xml:675
#. (title)
#: ../source/TortoiseMerge_en.xml:886
msgid "Main Settings Page"
msgstr "Halaman Seting Utama"

# Indonesian#: source/TortoiseMerge_en.xml:675
#. (title)
#: ../source/TortoiseMerge_en.xml:889
msgid "The Settings Main Page"
msgstr "Halaman Seting Utama"

#. (para)
#: ../source/TortoiseMerge_en.xml:892
msgid "Most of the options here are self-explanatory, but a few points need clarifying."
msgstr "Kebanyakan opsi disini mempunyai penjelasan-sendiri, tetapi beberapa poin perlu dinjelaskan."

# Indonesian#: source/TortoiseMerge_en.xml:685
#. (para)
#: ../source/TortoiseMerge_en.xml:896
msgid "<guilabel>Backup original file</guilabel> renames the original file in the WC to <literal>filename.bak</literal> before saving the modified version."
msgstr "<guilabel>Backup file original</guilabel> mengganti nama file original dalam WC ke <literal>filename.bak</literal> sebelum menyimpan versi yang diubah."

# Indonesian#: source/TortoiseMerge_en.xml:690
#. (para)
#: ../source/TortoiseMerge_en.xml:901
#, fuzzy
msgid "<guilabel>Ignore line endings</guilabel> hides changes which are due solely to difference in line-end style."
msgstr "<guilabel>Abaikan akhir baris</guilabel> menyembunyikan perubahan karena perbedaan dalam gaya akhir baris."

# Indonesian#: source/TortoiseMerge_en.xml:694
#. (para)
#: ../source/TortoiseMerge_en.xml:905
msgid "<guilabel>Ignore case changes</guilabel> hides changes which are due solely to case changes within the text. This can be useful with apps such as Visual Basic, which changes case in variables without warning."
msgstr "<guilabel>Abaikan perubahan huruf</guilabel> menyembunyikan perubahan karena perubahan di dalam teks. Ini sangat berguna dengan aplikasi seperti Visual Basic, yang mengubah jenis huruf dalam variabel tanpa peringatan."

# Indonesian#: source/TortoiseMerge_en.xml:700
#. (para)
#: ../source/TortoiseMerge_en.xml:911
msgid "<guilabel>Colour code in-line changes</guilabel> uses the same scheme as the line diff bar to show the detailed in-line changes within the main display panes. Lines which have been heavily modified will not be shown using this method as the results are simply confusing. In this case the line will be shown as replaced (old line deleted, new line added)."
msgstr "<guilabel>Kode warna perubahan-perubahan sebaris</guilabel> menggunakan skema sama dengan baris bar diff untuk menampilkan detil perubahan sebaris di dalam tampilan pane utama. Baris-baris yang telah banyak diubah tidak akan ditampilkan dengan metode ini karena hasilnya akan membingungkan. Dalam kasus ini, baris tersebut akan ditampilkan sebagai diganti (baris yang lama dihapus, baris yang baru ditambahkan)."

# Indonesian#: source/TortoiseMerge_en.xml:705
#. (para)
#: ../source/TortoiseMerge_en.xml:919
msgid "<guilabel>Compare whitespaces</guilabel> shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)."
msgstr "<guilabel>Bandingkan spasi putih</guilabel> memperlihatkan semua perubahan dalam indentasi dan spasi putih sebaris karena baris ditambah/dihapus (inilah bagaimana Git memperlakukan perubahan demikian)."

# Indonesian#: source/TortoiseMerge_en.xml:711
#. (para)
#: ../source/TortoiseMerge_en.xml:924
msgid "<guilabel>Ignore whitespace changes</guilabel> hides changes which are due solely to a change in the amount or type of whitespace, eg. changing the indentation or changing tabs to spaces. Adding whitespace where there was none before, or removing a whitespace completely is still shown as a change."
msgstr "<guilabel>Abaikan perubahan spasi putih</guilabel> menyembunyikan perubahan karena perubahan dalam sejumlah atau tipe spasi putih, contoh perubahan indentasi atau perubahan tab ke spasi. Menambah spasi putih di mana tidak ada sebelumnya, atau menghapus spasi putih sepenuhnya masih ditampilkan sebagai perubahan."

# Indonesian#: source/TortoiseMerge_en.xml:718
#. (para)
#: ../source/TortoiseMerge_en.xml:932
msgid "<guilabel>Ignore all whitespaces</guilabel> hides all whitespace-only changes."
msgstr "<guilabel>Abaikan semua spasi putih</guilabel> menyembunyikan semua perubahan hanya-spasi putih."

# Indonesian#: source/TortoiseMerge_en.xml:724
#. (title)
#: ../source/TortoiseMerge_en.xml:938
msgid "Colour Settings Page"
msgstr "Halaman Seting Warna"

# Indonesian#: source/TortoiseMerge_en.xml:675
#. (title)
#: ../source/TortoiseMerge_en.xml:941
msgid "The Settings Color Page"
msgstr "Halaman Seting Warna"

# Indonesian#: source/TortoiseMerge_en.xml:730
#. (para)
#: ../source/TortoiseMerge_en.xml:944
msgid "This dialog allows you to select the background color coding used to highlight the different line changes."
msgstr "Dialog ini membolehkan Anda untuk memilih kode warna latar belakang yang digunakan untuk menerangi baris perubahan yang berbeda."

# Indonesian#: source/TortoiseMerge_en.xml:736
#. (term)
#: ../source/TortoiseMerge_en.xml:950
msgid "Normal"
msgstr "Normal"

# Indonesian#: source/TortoiseMerge_en.xml:737
#. (listitem)
#: ../source/TortoiseMerge_en.xml:951
msgid "All lines which are unchanged, or where changes are hidden."
msgstr "Semua baris yang tidak berubah, atau di mana perubahan disembunyikan."

# Indonesian#: source/TortoiseMerge_en.xml:749
#. (term)
#: ../source/TortoiseMerge_en.xml:956
msgid "Added"
msgstr "Ditambahkan"

# Indonesian#: source/TortoiseMerge_en.xml:750
#. (listitem)
#: ../source/TortoiseMerge_en.xml:957
msgid "Lines which have been added."
msgstr "Baris yang sudah ditambahkan."

# Indonesian#: source/TortoiseMerge_en.xml:743
#. (term)
#: ../source/TortoiseMerge_en.xml:962
msgid "Removed"
msgstr "Dihapus"

# Indonesian#: source/TortoiseMerge_en.xml:744
#. (listitem)
#: ../source/TortoiseMerge_en.xml:963
msgid "Lines which have been deleted."
msgstr "Baris yang sudah dihapus."

#. (term)
#: ../source/TortoiseMerge_en.xml:968
msgid "Modified"
msgstr "Diubah"

#. (emphasis)
#: ../source/TortoiseMerge_en.xml:971
msgid "unchanged"
msgstr "tak berubah"

#. (guilabel)
#: ../source/TortoiseMerge_en.xml:974
msgid "Colour code in-line changes"
msgstr "Kode warna perubahan-perubahan sebaris"

#. (listitem)
#: ../source/TortoiseMerge_en.xml:969
msgid "Lines which have relatively small changes, and are shown using inline diff. This colour is used for the <placeholder-1/> portion of the line content. Changed portions will be shown using the inline added and deleted colours described below. If <placeholder-2/> is not enabled, this colour will not be used and changed lines will always be shown as replacements."
msgstr "Baris-baris yang memiliki perubahan-perubahan relatif kecil, dan ditampilkan dengan menggunakan diff sebaris. Warna ini digunakan untuk porsi <placeholder-1/> dari isi baris. Porsi-porsi yang diubah akan ditampilkan dengan menggunakan warna ditambah dan dihapus sebaris yang dijelaskan di atas. Jika <placeholder-2/> tidak dihidupkan, warna ini tidak akan digunakan dan baris-baris yang berubah akan selalu ditampilkan sebagai pengganti."

# Indonesian#: source/TortoiseMerge_en.xml:762
#. (term)
#: ../source/TortoiseMerge_en.xml:980
msgid "Conflicted"
msgstr "Konflik"

# Indonesian#: source/TortoiseMerge_en.xml:763
#. (listitem)
#: ../source/TortoiseMerge_en.xml:981
msgid "Where the same line has been changed in both files."
msgstr "Di mana baris yang sama sudah diubah dalam kedua file."

# Indonesian#: source/TortoiseMerge_en.xml:762
#. (term)
#: ../source/TortoiseMerge_en.xml:986
msgid "Conflict resolved"
msgstr "Konflik diselesaikan"

# Indonesian#: source/TortoiseMerge_en.xml:763
#. (listitem)
#: ../source/TortoiseMerge_en.xml:987
#, fuzzy
msgid "Where the same line has been changed in both files, and you have now selected which version should be used."
msgstr "Di mana baris yang sama sudah diubah dalam kedua file."

# Indonesian#: source/TortoiseMerge_en.xml:755
#. (term)
#: ../source/TortoiseMerge_en.xml:993
msgid "Empty"
msgstr "Kosong"

# Indonesian#: source/TortoiseMerge_en.xml:756
#. (listitem)
#: ../source/TortoiseMerge_en.xml:994
msgid "Where lines have been added in the opposite pane, and no such line existed in this pane."
msgstr "Di mana baris sudah ditambahkan ke pane berlawanan, dan tidak ada baris tersebut muncul dalam pane ini."

#. (term)
#: ../source/TortoiseMerge_en.xml:1000
msgid "Inline added text"
msgstr "Teks ditambahkan sebaris"

#. (listitem)
#: ../source/TortoiseMerge_en.xml:1001
msgid "When inline diffs are shown, added text is shown in this colour."
msgstr "Saat diff sebaris ditampilkan, teks yang ditambahkan ditampilkan dalam warna ini."

#. (term)
#: ../source/TortoiseMerge_en.xml:1006
msgid "Inline removed text"
msgstr "Teks dihilangkan sebaris"

#. (listitem)
#: ../source/TortoiseMerge_en.xml:1007
msgid "When inline diffs are shown, deleted text is shown in this colour."
msgstr "Saat diff-diff sebaris ditampilkan, teks yang dihapus ditampilkan dalam warna ini."

#. (term)
#: ../source/TortoiseMerge_en.xml:1012
msgid "Misc whitespaces"
msgstr ""

#. (listitem)
#: ../source/TortoiseMerge_en.xml:1013
msgid "Characters used to indicate Whitespace are shown in a different colour from normal text."
msgstr ""

# Indonesian#: source/TortoiseMerge_en.xml:787
#. (title)
#: ../source/TortoiseMerge_en.xml:1023
msgid "keyboard shortcuts"
msgstr "jalan pintas keyboard"

# Indonesian#: source/TortoiseMerge_en.xml:789
#. (para)
#: ../source/TortoiseMerge_en.xml:1025
msgid "List of keyboard shortcuts and commands."
msgstr "Daftar jalan pintas keyboard dan perintah."

# Indonesian#: source/TortoiseMerge_en.xml:794
#. (title)
#: ../source/TortoiseMerge_en.xml:1030
msgid "Keyboard shortcuts"
msgstr "Jalan pintas keyboard"

# Indonesian#: source/TortoiseMerge_en.xml:797
#. (term)
#: ../source/TortoiseMerge_en.xml:1033
msgid "Ctrl-Q"
msgstr "Ctrl-Q"

# Indonesian#: source/TortoiseMerge_en.xml:799
#. (para)
#: ../source/TortoiseMerge_en.xml:1035
msgid "Quit the program"
msgstr "Keluar dari program"

# Indonesian#: source/TortoiseMerge_en.xml:805
#. (term)
#: ../source/TortoiseMerge_en.xml:1041
msgid "Ctrl-C"
msgstr "Ctrl-C"

# Indonesian#: source/TortoiseMerge_en.xml:807
#. (para)
#: ../source/TortoiseMerge_en.xml:1043
msgid "Copy the selected text to the clipboard"
msgstr "Salin baris terpilih ke clipboard"

# Indonesian#: source/TortoiseMerge_en.xml:813
#. (term)
#: ../source/TortoiseMerge_en.xml:1049
msgid "Ctrl-F"
msgstr "Ctrl-F"

# Indonesian#: source/TortoiseMerge_en.xml:815
#. (para)
#: ../source/TortoiseMerge_en.xml:1051
msgid "Open the Find dialog for text searches"
msgstr "Buka dialog Cari untuk pencarian teks"

# Indonesian#: source/TortoiseMerge_en.xml:821
#. (term)
#: ../source/TortoiseMerge_en.xml:1057
msgid "Ctrl-O"
msgstr "Ctrl-O"

# Indonesian#: source/TortoiseMerge_en.xml:823
#. (para)
#: ../source/TortoiseMerge_en.xml:1059
msgid "Open files to diff/merge"
msgstr "Buka file untuk diff/merge"

# Indonesian#: source/TortoiseMerge_en.xml:829
#. (term)
#: ../source/TortoiseMerge_en.xml:1065
msgid "Ctrl-S"
msgstr "Ctrl-S"

# Indonesian#: source/TortoiseMerge_en.xml:831
#. (para)
#: ../source/TortoiseMerge_en.xml:1067
msgid "Save the changes"
msgstr "Simpan perubahan"

# Indonesian#: source/TortoiseMerge_en.xml:837
#. (term)
#: ../source/TortoiseMerge_en.xml:1073
msgid "Ctrl-Shift-S"
msgstr "Ctrl-Shift-S"

# Indonesian#: source/TortoiseMerge_en.xml:839
#. (para)
#: ../source/TortoiseMerge_en.xml:1075
msgid "Save as..."
msgstr "Simpan sebagai..."

#. (term)
#: ../source/TortoiseMerge_en.xml:1081
msgid "F7"
msgstr "F7"

# Indonesian#: source/TortoiseMerge_en.xml:847
#. (para)
#: ../source/TortoiseMerge_en.xml:1083
msgid "Go to next difference"
msgstr "Pergi ke perbedaan berikutnya"

# Indonesian#: source/TortoiseMerge_en.xml:837
#. (term)
#: ../source/TortoiseMerge_en.xml:1089
msgid "Shift-F7"
msgstr "Shift-F7"

# Indonesian#: source/TortoiseMerge_en.xml:855
#. (para)
#: ../source/TortoiseMerge_en.xml:1091
msgid "Go to previous difference"
msgstr "Pergi ke perbedaan sebelumnya"

#. (term)
#: ../source/TortoiseMerge_en.xml:1097
msgid "F8"
msgstr "F8"

# Indonesian#: source/TortoiseMerge_en.xml:863
#. (para)
#: ../source/TortoiseMerge_en.xml:1099
msgid "Go to next conflict"
msgstr "Pergi ke konflik berikutnya"

# Indonesian#: source/TortoiseMerge_en.xml:837
#. (term)
#: ../source/TortoiseMerge_en.xml:1105
msgid "Shift-F8"
msgstr "Shift-F8"

# Indonesian#: source/TortoiseMerge_en.xml:871
#. (para)
#: ../source/TortoiseMerge_en.xml:1107
msgid "Go to previous conflict"
msgstr "Pergi ke konflik sebelumnya"

# Indonesian#: source/TortoiseMerge_en.xml:877
#. (term)
#: ../source/TortoiseMerge_en.xml:1113
msgid "Ctrl-D"
msgstr "Ctrl-D"

# Indonesian#: source/TortoiseMerge_en.xml:879
#. (para)
#: ../source/TortoiseMerge_en.xml:1115
msgid "Toggle between one-pane diff and two-pane diff"
msgstr "Hidup/matikan antara satu-pane diff dan dua-pane diff"

# Indonesian#: source/TortoiseMerge_en.xml:885
#. (term)
#: ../source/TortoiseMerge_en.xml:1121
msgid "Ctrl-R"
msgstr "Ctrl-R"

# Indonesian#: source/TortoiseMerge_en.xml:887
#. (para)
#: ../source/TortoiseMerge_en.xml:1123
msgid "Reload the files and revert all changes made"
msgstr "Ambil kembali file dan balikan semua perubahan yang sudah dibuat"

# Indonesian#: source/TortoiseMerge_en.xml:894
#. (term)
#: ../source/TortoiseMerge_en.xml:1129
msgid "Ctrl-T"
msgstr "Ctrl-T"

# Indonesian#: source/TortoiseMerge_en.xml:896
#. (para)
#: ../source/TortoiseMerge_en.xml:1131
msgid "Toggles between showing whitespaces or not"
msgstr "Hidup/matikan menampilkan spasi putih atau tidak"

# Indonesian#: source/TortoiseMerge_en.xml:902
#. (term)
#: ../source/TortoiseMerge_en.xml:1137
msgid "Ctrl-mousewheel"
msgstr "Ctrl-roda tetikus"

# Indonesian#: source/TortoiseMerge_en.xml:904
#. (para)
#: ../source/TortoiseMerge_en.xml:1139
msgid "Scroll the display left/right"
msgstr "Gulung layar ke kiri/kanan"

# Indonesian#: source/TortoiseMerge_en.xml:913
#. (title)
#: ../source/TortoiseMerge_en.xml:1148
msgid "Automating TortoiseMerge"
msgstr "Mengotomasi TortoiseMerge"

# Indonesian#: source/TortoiseMerge_en.xml:915
#. (para)
#: ../source/TortoiseMerge_en.xml:1150
msgid "TortoiseMerge can be started with command line parameters to avoid having to go through the <guilabel>Open</guilabel> dialog to select the files yourself. This is useful also if you want to use TortoiseMerge from another application."
msgstr "TortoiseMerge bisa dimulai dengan parameter baris perintah untuk menghindari keharusan pergi melalui dialog <guilabel>Buka</guilabel> untuk memilih file Anda sendiri. Ini berguna juga jika Anda ingin menggunakan TortoiseMerge dari aplikasi lain."

# Indonesian#: source/TortoiseMerge_en.xml:926
#. (title)
#: ../source/TortoiseMerge_en.xml:1161
msgid "TortoiseMerge Command Line Switches"
msgstr "Saklar Baris Perintah TortoiseMerge"

# Indonesian#: source/TortoiseMerge_en.xml:928
#. (primary)
#: ../source/TortoiseMerge_en.xml:1163
msgid "automation"
msgstr "otomasi"

# Indonesian#: source/TortoiseMerge_en.xml:931
#. (primary)
#: ../source/TortoiseMerge_en.xml:1166
msgid "command line"
msgstr "baris perintah"

# Indonesian#: source/TortoiseMerge_en.xml:933
#. (para)
#: ../source/TortoiseMerge_en.xml:1168
msgid ""
"Most switches require additional information like a path or some other string. In those cases, append an ':' to the switch and put the string/path after it. Example: <screen>\n"
"/base:\"c:\\folder\\my base file.txt\"\n"
"</screen>"
msgstr ""
"Kebanyakan saklar memerlukan informasi seperti path atau beberapa string lain. Dalam hal itu, tambahkan ':' ke saklar dan simpan string/path setelahnya. Contoh: <screen>\n"
"/base:\"c:\\folder\\my base file.txt\"\n"
"</screen>"

# Indonesian#: source/TortoiseMerge_en.xml:953
#. (title)
#: ../source/TortoiseMerge_en.xml:1188
msgid "List of available command line options"
msgstr "Daftar opsi baris perintah yang tersedia"

# Indonesian#: source/TortoiseMerge_en.xml:959
#. (entry)
#: ../source/TortoiseMerge_en.xml:1194
msgid "Command"
msgstr "Perintah"

# Indonesian#: source/TortoiseMerge_en.xml:960
#. (entry)
#: ../source/TortoiseMerge_en.xml:1195
msgid "Description"
msgstr "Penjelasan"

# Indonesian#: source/TortoiseMerge_en.xml:966
#. (entry)
#: ../source/TortoiseMerge_en.xml:1201
msgid "Shows a dialog box with the most important command line switches."
msgstr "Menampilkan kotak dialog dengan saklar baris perintah yang penting."

# Indonesian#: source/TortoiseMerge_en.xml:973
#. (option)
#: ../source/TortoiseMerge_en.xml:1209
msgid "?"
msgstr "?"

# Indonesian#: source/TortoiseMerge_en.xml:972
#. (entry)
#: ../source/TortoiseMerge_en.xml:1208
msgid "The same as <placeholder-1/>."
msgstr "Sama seperti <placeholder-1/>."

# Indonesian#: source/TortoiseMerge_en.xml:979
#. (emphasis)
#: ../source/TortoiseMerge_en.xml:1215
msgid "base"
msgstr "basis"

# Indonesian#: source/TortoiseMerge_en.xml:978
#. (entry)
#: ../source/TortoiseMerge_en.xml:1214
msgid "Specifies the <placeholder-1/> file used in three way diffs. This is the common ancestor of the files being diffed, although it is not shown in a separate window. For two way diffs, this is the left file."
msgstr "Menetapkan file <placeholder-1/> yang digunakan dalam tiga cara diffs. Ini adalah leluhur umum dari file yang sedang di-diff, meskipun tidak ditampilkan dalam jendela terpisah. Untuk dua cara diffs, ini adalah file kiri."

# Indonesian#: source/TortoiseMerge_en.xml:987
#. (entry)
#: ../source/TortoiseMerge_en.xml:1224
msgid "The name of the base file. This is shown in the view title instead of the file path. For three way diffs it is shown in a tooltip for the view title."
msgstr "Nama dari file base. Ini ditampilkan dalam tampilan judul daripada path file. Untuk tiga cara diffs ditampilkan dalam tooltip untuk judul tampilan."

# Indonesian#: source/TortoiseMerge_en.xml:997
#. (emphasis)
#: ../source/TortoiseMerge_en.xml:1234
msgid "theirs"
msgstr "mereka"

# Indonesian#: source/TortoiseMerge_en.xml:996
#. (entry)
#: ../source/TortoiseMerge_en.xml:1233
msgid "Specifies the <placeholder-1/> file used in three way diffs, displayed in the left pane."
msgstr "Menetapkan file <placeholder-1/> yang digunakan dalam tiga cara diffs, ditampilkan dalam pane kiri."

# Indonesian#: source/TortoiseMerge_en.xml:1003
#. (entry)
#: ../source/TortoiseMerge_en.xml:1240
msgid "The name of the theirs file. This is shown in the view title instead of the file path."
msgstr "Nama dari file mereka. Ini ditampilkan dalam judul tampilan daripada path file."

# Indonesian#: source/TortoiseMerge_en.xml:1011
#. (emphasis)
#: ../source/TortoiseMerge_en.xml:1248
msgid "mine"
msgstr "saya"

# Indonesian#: source/TortoiseMerge_en.xml:1010
#. (entry)
#: ../source/TortoiseMerge_en.xml:1247
msgid "Specifies the <placeholder-1/> file used in three way diffs, displayed in the right pane. For two way diffs, this is the right file."
msgstr "Menetapkan file <placeholder-1/> yang digunakan dalam tiga cara diffs, ditampilkan dalam pane kanan. Untuk dua cara diffs, ini adalah file kanan."

# Indonesian#: source/TortoiseMerge_en.xml:1018
#. (entry)
#: ../source/TortoiseMerge_en.xml:1255
msgid "The name of the mine file. This is shown in the view title instead of the file path."
msgstr "Nama dari file mine. Ini ditampilkan dalam judul tampilan daripada path file."

# Indonesian#: source/TortoiseMerge_en.xml:1026
#. (emphasis)
#: ../source/TortoiseMerge_en.xml:1263
msgid "merged"
msgstr "gabungan"

# Indonesian#: source/TortoiseMerge_en.xml:1025
#. (entry)
#: ../source/TortoiseMerge_en.xml:1262
#, fuzzy
msgid "Specifies the resulting <placeholder-1/> file used in three way diffs. This is the file path where the result of the merge/conflict resolving is saved. If this is not set, then TortoiseMerge will ask the user where to save the result."
msgstr "Menetapkan hasil file <placeholder-1/> yang digunakan dalam tiga cara diffs. Ini adalah filepath di mana hasil dari merge/penyelesaian konfil disimpan. Jika ini tidak diset, maka TortoiseMerge akan menanyakan di mana untuk menyimpan hasilnya."

# Indonesian#: source/TortoiseMerge_en.xml:1035
#. (entry)
#: ../source/TortoiseMerge_en.xml:1272
msgid "The name of the merged file. This is shown in the view title instead of the file path."
msgstr "Nama dari file gabungan. Ini ditampilkan dalam judul tampilan daripada path file."

# Indonesian#: source/TortoiseMerge_en.xml:1046
#. (emphasis)
#: ../source/TortoiseMerge_en.xml:1283
msgid "very long"
msgstr "sangat lama"

# Indonesian#: source/TortoiseMerge_en.xml:1042
#. (entry)
#: ../source/TortoiseMerge_en.xml:1279
#, fuzzy
msgid "The path where a patch should be applied to. If you don't set this path, then TortoiseMerge will try to find the path itself to match the paths in the patch file, but that can take <placeholder-1/>."
msgstr "Path di mana patch harus diterapkan. Jika Anda tidak men-set path ini, maka TortoiseMerge akan mencoba mencari path sendiri yang sama dengan path dalam patchfile, tapi itu memerlukan waktu <placeholder-1/>."

# Indonesian#: source/TortoiseMerge_en.xml:1051
#. (entry)
#: ../source/TortoiseMerge_en.xml:1288
msgid "The name of the original file to patch. Used for the view title."
msgstr "Nama dari file original untuk di-patch. Digunakan untuk judul tampilan."

# Indonesian#: source/TortoiseMerge_en.xml:1058
#. (entry)
#: ../source/TortoiseMerge_en.xml:1295
msgid "The name of the resulting patched file. Used for the view title."
msgstr "Nama dari file hasil patch. Digunakan untuk judul tampilan."

# Indonesian#: source/TortoiseMerge_en.xml:1064
#. (entry)
#: ../source/TortoiseMerge_en.xml:1302
msgid "The path to the patch/diff file to apply to a directory."
msgstr "Path ke file patch/diff untuk diterapkan ke direktori."

# Indonesian#: source/TortoiseMerge_en.xml:1070
#. (entry)
#: ../source/TortoiseMerge_en.xml:1308
msgid "Forces TortoiseMerge to start with the one-way view instead of the view the user specified in the settings."
msgstr "Memaksa TortoiseMerge untuk dimulai dengan satu-cara tampilan daripada tampilan yang ditetapkan pengguna dalam seting."

# Indonesian#: source/TortoiseMerge_en.xml:1078
#. (entry)
#: ../source/TortoiseMerge_en.xml:1315
msgid "Switches the left and right view of the specified two files to diff."
msgstr "Menukar tampilan kiri dan kanan dari dua file yang di-diff."

#. (literal)
#: ../source/TortoiseMerge_en.xml:1325
msgid "/origfile:\"path_to_original_file\""
msgstr "/origfile:\"path_ke_berkas_asal\""

#. (literal)
#: ../source/TortoiseMerge_en.xml:1326
msgid "/modifiedfile:\"path_to_modified_file\""
msgstr "/modifiedfile:\"path_ke_berkas_yang_berubah\""

#. (literal)
#: ../source/TortoiseMerge_en.xml:1328
msgid "/outfile:\"path_to_resulting_patchfile\""
msgstr "/outfile:\"path_ke_hasil_berkastambalan\""

#. (literal)
#: ../source/TortoiseMerge_en.xml:1329
msgid "/outfile"
msgstr "/outfile"

#. (literal)
#: ../source/TortoiseMerge_en.xml:1332
msgid "/createunifieddiff"
msgstr "/createunifieddiff"

#. (entry)
#: ../source/TortoiseMerge_en.xml:1322
msgid "Creates a unified diff file (patch file) of two files specified with <placeholder-1/> and <placeholder-2/>. The target path is set with <placeholder-3/>. If <placeholder-4/> is not set, a file save dialog is shown so the user can choose the location to save the patch file. Note: If <placeholder-5/> is set, all other parameters are ignored."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:1340
msgid ""
"You can also supply simple filenames on the command line for compatibility with other diff programs. In this simplified form the command line is <screen>\n"
"TortoiseMerge BaseFilePath MyFilePath [ TheirFilePath ]\n"
"</screen> If two files are given they will be compared with each other. If three files are given, the first is taken as the BASE file, and the other two are compared with it in a three-way diff."
msgstr ""
"Anda juga dapat menyediakan nama-nama file sederhana pada baris perintah untuk kompatibilitas dengan program-program diff yang lain. Dalam bentuk yang disederhanakan ini, baris perintahnya adalah<screen>\n"
"TortoiseMerge BaseFilePath MyFilePath [ TheirFilePath ]\n"
"</screen> Jika dua file diberikan, mereka akan dibandingkan satu sama lain. Jika tiga file diberikan, file pertama akan dianggap sebagai file BASE, dan dua lainnya akan dibandingkan dengannya dalam diff tiga-cara."

# Indonesian#: source/TortoiseMerge_en.xml:1092
#. (title)
#: ../source/TortoiseMerge_en.xml:1356
msgid "Glossary"
msgstr "Daftar Kata"

# Indonesian#: source/TortoiseMerge_en.xml:1094
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1358
msgid "Add"
msgstr "Add (Tambah)"

# Indonesian#: source/TortoiseMerge_en.xml:1096
#. (para)
#: ../source/TortoiseMerge_en.xml:1360
msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit."
msgstr "Perintah Git yang digunakan untuk menambah file atau direktori ke copy pekerjaan Anda. Item baru ditambahkan ke repositori saat Anda komit."

# Indonesian#: source/TortoiseMerge_en.xml:1104
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1368
msgid "BASE revision"
msgstr "BASE revision (BASE revisi)"

# Indonesian#: source/TortoiseMerge_en.xml:1106
#. (para)
#: ../source/TortoiseMerge_en.xml:1370
msgid "The current base revision of a file or folder in your <emphasis>working copy</emphasis>. This is the revision the file or folder was in, when the last checkout, update or commit was run. The BASE revision is normally not equal to the HEAD revision."
msgstr "Revisi base saat ini dari file atau folder dalam <emphasis>copy pekerjaan</emphasis>. Anda. Ini adalah revisi file atau folder terakhir, ketika checkout terakhir, memutahirkan atau komit yang sudah dijalankan. Revisi BASE biasanya tidak sama dengan revisi HEAD."

# Indonesian#: source/TortoiseMerge_en.xml:1115
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1379
msgid "Blame"
msgstr "Blame"

# Indonesian#: source/TortoiseMerge_en.xml:1117
#. (para)
#: ../source/TortoiseMerge_en.xml:1381
msgid "This command is for text files only, and it annotates every line to show the repository revision in which it was last changed, and the author who made that change. Our GUI implementation is called TortoiseBlame and it also shows the commit date/time and the log message when you hover the mouse of the revision number."
msgstr "Perintah ini hanya untuk file teks, dan menambahkan catatan setiap baris untuk menampilkan revisi repositori di mana perubahan terakhir dilakukan, dan pembuat yang membuat perubahan itu. Implementasi GUI kami disebut TortoiseBlame dan ia juga menampilkan tanggal/jam komit dan log pesan ketika Anda membawa mouse ke angka revisi."

# Indonesian#: source/TortoiseMerge_en.xml:1127
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1391
msgid "BDB"
msgstr "BDB"

# Indonesian#: source/TortoiseMerge_en.xml:1129
#. (para)
#: ../source/TortoiseMerge_en.xml:1393
msgid "Berkeley DB. A well tested database backend for repositories, that cannot be used on network shares. Default for pre 1.2 repositories."
msgstr "Berkeley DB. Database yang sudah teruji baik untuk jalan belakang pada repositori, yang tidak bisa digunakan pada jaringan berbagi. Standar untuk pre 1.2 repositori."

# Indonesian#: source/TortoiseMerge_en.xml:1137
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1400
msgid "Branch"
msgstr "Branch (Cabang)"

# Indonesian#: source/TortoiseMerge_en.xml:1139
#. (para)
#: ../source/TortoiseMerge_en.xml:1402
#, fuzzy
msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a <quote>cheap copy</quote>."
msgstr "Batasan yang sering digunakan dalam sistem kontrol revisi untuk menjelaskan apa yang terjadi ketika garpu pengembangan pada titik tertentu dan mengikuti 2 path terpisah. Anda bisa membuat cabang di luar barisan pengembangan utama untuk mengembangkan fitur baru tanpa membuat barisan utama menjadi tidak stabil. Atau Anda bisa mencabangkan rilis stabil ke mana Anda hanya membuat pembetulan bug, sementara pengembangan baru menempati batang tidak stabil. Dalam Git cabang diimplementasikan sebagai <quote>copy murah</quote>."

# Indonesian#: source/TortoiseMerge_en.xml:1152
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1415
msgid "Checkout"
msgstr "Checkout"

# Indonesian#: source/TortoiseMerge_en.xml:1154
#. (para)
#: ../source/TortoiseMerge_en.xml:1417
msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository."
msgstr "Perintah Git yang membuat copy pekerjaan lokal dalam direktori kosong dengan mengunduh file berversi dari repositori."

# Indonesian#: source/TortoiseMerge_en.xml:1161
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1424
msgid "Cleanup"
msgstr "Cleanup (Bersihkan)"

# Indonesian#: source/TortoiseMerge_en.xml:1163
#. (para)
#: ../source/TortoiseMerge_en.xml:1426
#, fuzzy
msgid "To quote from the Git book: <quote> Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a <emphasis>working copy locked</emphasis> error, run this command to remove stale locks and get your working copy into a usable state again. </quote> Note that in this context <emphasis>lock</emphasis> refers to local filesystem locking, not repository locking."
msgstr "Mengutip dari buku Git: <quote> Secara rekursif membersihkan copy pekerjaan, menghapus kuncian dan melanjutkan operasi yang belum selesai. Jika Anda pernah mendapatkan kesalahan <literal>copy pekerjaan dikunci</literal>, jalankan perintah ini untuk menghapus kuncian basi dan mendapatkan copy pekerjaan Anda kedalam kondisi yang berguna lagi. </quote> Catatan bahwa konteks <quote>kunci</quote> merujuk ke penguncian sistem file lokal, bukan penguncian repositori."

# Indonesian#: source/TortoiseMerge_en.xml:1178
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1441
msgid "Commit"
msgstr "Commit (Komit)"

# Indonesian#: source/TortoiseMerge_en.xml:1180
#. (para)
#: ../source/TortoiseMerge_en.xml:1443
msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision."
msgstr "Perintah Git ini digunakan untuk mengoper perubahan dalam copy pekerjaan Anda kembali ke dalam repositori, membuat revisi repositori baru."

# Indonesian#: source/TortoiseMerge_en.xml:762
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1451
msgid "Conflict"
msgstr "Conflict (Konflik)"

# Indonesian#: source/TortoiseMerge_en.xml:1190
#. (para)
#: ../source/TortoiseMerge_en.xml:1453
msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes."
msgstr "Ketika perubahan dari repositori digabung dengan perubahan lokal, ada kalanya perubahan itu terjadi pada baris yang sama. Dalam hal ini Git tidak bisa secara otomatis menentukan versi yang mana untuk digunakan dan file yang dinyatakan sebagai konflik. Anda harus mengedit file secara manual dan menyelesaikan konflik sebelum Anda bisa mengkomit perubahan selanjutnya."

# Indonesian#: source/TortoiseMerge_en.xml:1201
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1463
msgid "Copy"
msgstr "Copy"

# Indonesian#: source/TortoiseMerge_en.xml:1203
#. (para)
#: ../source/TortoiseMerge_en.xml:1465
msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as <quote>cheap copies</quote> which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made."
msgstr "Dalam repositori Git Anda bisa membuat copy dari file tunggal atau susunan keseluruhan. Ini diimplementasikan sebagai <quote>copy murah</quote> yang bertindak sedikit mirip link ke original di dalamnya hampir tidak ada ruang. Membuat copy menjaga sejarah dari item dalam copy, dengan demikian Anda bisa melacak perubahan yang dibuat sebelum copy dibuat."

# Indonesian#: source/TortoiseMerge_en.xml:1213
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1475
msgid "Delete"
msgstr "Delete (Hapus)"

# Indonesian#: source/TortoiseMerge_en.xml:1215
#. (para)
#: ../source/TortoiseMerge_en.xml:1477
#, fuzzy
msgid "When you delete a versioned item (and commit the change) the item no longer exists in the repository after the committed revision. But of course it still exists in earlier repository revisions, so you can still access it. If necessary, you can copy a deleted item and <quote>resurrect</quote> it complete with history."
msgstr "Ketika Anda menghapus item berversi (dan mengkomit perubahan tersebut) item tidak lagi ada dalam repositori setelah revisi yang dikomit. Tapi tentunya masih ada dalam revisi repositori sebelumnya, dan Anda masih bisa mengaksesnya. Jika perlu, Anda bisa mengcopy item yang dihapus dan <quote>menghidupkannya</quote> sepenuhnya dengan histori."

# Indonesian#: source/TortoiseMerge_en.xml:1225
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1487
msgid "Diff"
msgstr "Diff"

# Indonesian#: source/TortoiseMerge_en.xml:1227
#. (para)
#: ../source/TortoiseMerge_en.xml:1489
msgid "Shorthand for <quote>Show Differences</quote>. Very useful when you want to see exactly what changes have been made."
msgstr "Kependekan dari <quote>Tampilkan Perbedaan</quote>. Sangat berguna ketika Anda ingin melihat perubahan apa yang telah dibuat secara pasti."

# Indonesian#: source/TortoiseMerge_en.xml:1234
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1496
msgid "Export"
msgstr "Export (Ekspor)"

# Indonesian#: source/TortoiseMerge_en.xml:1236
#. (para)
#: ../source/TortoiseMerge_en.xml:1498
msgid "This command produces a copy of a versioned folder, just like a working copy, but without the local <literal>.svn</literal> folders."
msgstr "Perintah ini menghasilkan salinan dari folder berversi, seperti copy pekerjaan, tapi tanpa folder <literal>.svn</literal> lokal."

# Indonesian#: source/TortoiseMerge_en.xml:1243
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1506
msgid "FSFS"
msgstr "FSFS"

# Indonesian#: source/TortoiseMerge_en.xml:1245
#. (para)
#: ../source/TortoiseMerge_en.xml:1508
#, fuzzy
msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories."
msgstr "FS Filesystem. Backend sistem file untuk repositori hak milik Git. Bisa digunakan pada jaringan berbagi. Standar untuk repositori 1.2 dan lebih baru."

# Indonesian#: source/TortoiseMerge_en.xml:1253
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1515
msgid "GPO"
msgstr "GPO"

# Indonesian#: source/TortoiseMerge_en.xml:1255
#. (para)
#: ../source/TortoiseMerge_en.xml:1517
msgid "Group policy object"
msgstr "Group policy object"

# Indonesian#: source/TortoiseMerge_en.xml:1261
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1523
msgid "HEAD revision"
msgstr "HEAD revision (HEAD revisi)"

# Indonesian#: source/TortoiseMerge_en.xml:1263
#. (para)
#: ../source/TortoiseMerge_en.xml:1525
msgid "The latest revision of a file or folder in the <emphasis>repository</emphasis>."
msgstr "Revisi terbaru dari file atau folder dalam <emphasis>repositori</emphasis>."

# Indonesian#: source/TortoiseMerge_en.xml:1269
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1531
msgid "Import"
msgstr "Import (Impor)"

# Indonesian#: source/TortoiseMerge_en.xml:1271
#. (para)
#: ../source/TortoiseMerge_en.xml:1533
msgid "Git command to import an entire folder hierarchy into the repository in a single revision."
msgstr "Perintah Git untuk mengimpor keseluruhan hirarki folder ke dalam revisi tunggal."

# Indonesian#: source/TortoiseMerge_en.xml:1278
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1540
msgid "Lock"
msgstr "Lock (Kunci)"

# Indonesian#: source/TortoiseMerge_en.xml:1280
#. (para)
#: ../source/TortoiseMerge_en.xml:1542
#, fuzzy
msgid "When you take out a lock on a versioned item, you mark it in the repository as non-committable, except from the working copy where the lock was taken out."
msgstr "Ketika Anda membawa kuncian pada item berversi, Anda menandainya dalam repositori sebagai tidak bisa dikomit, kecuali dari copy pekerjaan di mana kuncian tersebut dibawa."

# Indonesian#: source/TortoiseMerge_en.xml:1288
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1550
msgid "Log"
msgstr "Log"

# Indonesian#: source/TortoiseMerge_en.xml:1290
#. (para)
#: ../source/TortoiseMerge_en.xml:1552
msgid "Show the revision history of a file or folder. Also known as <quote>History</quote>."
msgstr "Menampilkan histori revisi dari file atau folder. Juga dikenal sebagai <quote>Histori</quote>."

# Indonesian#: source/TortoiseMerge_en.xml:1297
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1559
msgid "History"
msgstr "History (Histori)"

# Indonesian#: source/TortoiseMerge_en.xml:1299
#. (para)
#: ../source/TortoiseMerge_en.xml:1561
msgid "Show the revision history of a file or folder. Also known as <quote>Log</quote>."
msgstr "Menampilkan histori revisi dari file atau folder. Juga dikenal sebagai <quote>Log</quote>."

# Indonesian#: source/TortoiseMerge_en.xml:1306
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1568
msgid "Merge"
msgstr "Merge (Gabung)"

# Indonesian#: source/TortoiseMerge_en.xml:1308
#. (para)
#: ../source/TortoiseMerge_en.xml:1570
msgid "The process by which changes from the repository are added to your working copy without disrupting any changes you have already made locally. Sometimes these changes cannot be reconciled automatically and the working copy is said to be in conflict."
msgstr "Proses di mana perubahan dari repositori ditambahkan ke copy pekerjaan Anda tanpa mengganggu setiap perubahan yang sudah Anda buat secara lokal. Kadang kala perubahan ini tidak bisa disesuaikan secara otomatis dan copy pekerjaan dinyatakan dalam keadaan konflik."

# Indonesian#: source/TortoiseMerge_en.xml:1314
#. (para)
#: ../source/TortoiseMerge_en.xml:1576
msgid "Merging happens automatically when you update your working copy. You can also merge specific changes from another branch using TortoiseGit's Merge command."
msgstr "Penggabungan terjadi secara otomatis ketika Anda memutahirkan copy pekerjaan Anda. Anda juga bisa menggabung perubahan spesifik dari cabang lain menggunakan perintah Merge TortoiseGit."

# Indonesian#: source/TortoiseMerge_en.xml:1322
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1584
msgid "Patch"
msgstr "Patch"

# Indonesian#: source/TortoiseMerge_en.xml:1324
#. (para)
#: ../source/TortoiseMerge_en.xml:1586
msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a <quote>Patch</quote>, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review."
msgstr "Jika copy pekerjaan sudah berubah ke hanya file teks, ini memungkinkan untuk menggunakan perintah Diff Git untuk menghasilkan ringkasan file tunggal dari perubahan itu dalam format Unified Diff. File dari tipe ini sering dirujuk sebagai <quote>Patch</quote>, dan bisa diemail ke orang lain (atau daftar mailing) dan diterapkan ke copy pekerjaan lain. Seseorang tanpa akses komit bisa membuat perubahan dan mengirimkan file patch untuk pengkomit yang diotorisasi untuk menerapkan. Atau jika Anda tidak yakin mengenai perubahan Anda bisa mengirimkan patch untuk ditinjau orang lain."

# Indonesian#: source/TortoiseMerge_en.xml:1338
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1599
msgid "Property"
msgstr "Property (Properti)"

# Indonesian#: source/TortoiseMerge_en.xml:1340
#. (para)
#: ../source/TortoiseMerge_en.xml:1601
msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as <quote>properties</quote> to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as <literal>svn:eol-style</literal>. TortoiseGit has some too, such as <literal>tsvn:logminsize</literal>. You can add your own properties with any name and value you choose."
msgstr "Sebagai tambahan ke direktori dan file versi Anda, Git membolehkan Anda untuk menambahkan metadata yang diversi - dirujuk sebagai <quote>properties</quote> ke setiap direktori dan file yang diversi Anda. Setiap properti mempunyai nama dan nilai, mirip kunci registri. Git mempunyai beberapa properti khusus yang digunakan secara internal, seperti <literal>svn:eol-style</literal>. TortoiseGit juga mempunyai beberapa, seperti <literal>tsvn:logminsize</literal>. Anda bisa menambah properti Anda sendiri dengan setiap nama dan nilai yang Anda pilih."

# Indonesian#: source/TortoiseMerge_en.xml:1353
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1614
msgid "Relocate"
msgstr "Relocate (Relokasi)"

# Indonesian#: source/TortoiseMerge_en.xml:1355
#. (para)
#: ../source/TortoiseMerge_en.xml:1616
msgid "If your repository moves, perhaps because you have moved it to a different directory on your server, or the server domain name has changed, you need to <quote>relocate</quote> your working copy so that its repository URLs point to the new location."
msgstr "Jika repositori Anda pindah, barangkali karena Anda telah memindahkannya ke direktori berbeda pada server Anda, atau nama domain server berubah, Anda perlu untuk <quote>merelokasi</quote> copy pekerjaan Anda agar URL repositorinya merujuk ke lokasi baru."

# Indonesian#: source/TortoiseMerge_en.xml:1361
#. (para)
#: ../source/TortoiseMerge_en.xml:1622
msgid "Note: you should only use this command if your working copy is referring to the same location in the same repository, but the repository itself has moved. In any other circumstance you probably need the <quote>Switch</quote> command instead."
msgstr "Catatan: Anda hanya menggunakan perintah ini jika copy pekerjaan Anda merujuk ke lokasi yang sama dalam repositori yang sama, tapi repositori itu sendiri sudah dipindah. Dalam persoalan lain sebaliknya Anda mungkin memerlukan perintah <quote>Tukar</quote>."

# Indonesian#: source/TortoiseMerge_en.xml:1370
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1631
msgid "Repository"
msgstr "Repository (Repositori)"

# Indonesian#: source/TortoiseMerge_en.xml:1372
#. (para)
#: ../source/TortoiseMerge_en.xml:1633
msgid "A repository is a central place where data is stored and maintained. A repository can be a place where multiple databases or files are located for distribution over a network, or a repository can be a location that is directly accessible to the user without having to travel across a network."
msgstr "Repositori adalah pusat tempat di mana data disimpan dan dipelihara. Repositori bisa berupa tempat di mana database multipel atau file ditempatkan untuk distribusi melalui jaringan, atau repositori bisa berupa lokasi yang diakses secara langsung ke pengguna tanpa harus berjalan melalui jaringan."

# Indonesian#: source/TortoiseMerge_en.xml:1381
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1642
msgid "Resolve"
msgstr "Resolve (Selesaikan)"

# Indonesian#: source/TortoiseMerge_en.xml:1383
#. (para)
#: ../source/TortoiseMerge_en.xml:1644
msgid "When files in a working copy are left in a conflicted state following a merge, those conflicts must be sorted out by a human using an editor (or perhaps TortoiseMerge). This process is referred to as <quote>Resolving Conflicts</quote>. When this is complete you can mark the conflicted files as being resolved, which allows them to be committed."
msgstr "Ketika file dalam copy pekerjaan dibiarkan dalam kondisi konflik mengikuti gabungan, konflik itu harus diurut oleh manusia menggunakan editor (atau mungkin TortoiseMerge). Proses ini dirujuk sebagai <quote>Menyelesaikan Konflik</quote>. Ketika ini lengkap Anda bisa menandai file yang konflik sebagai sudah diselesaikan, yang membolehkannya dikomit."

# Indonesian#: source/TortoiseMerge_en.xml:1393
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1654
msgid "Revert"
msgstr "Revert (Pulihkan)"

# Indonesian#: source/TortoiseMerge_en.xml:1395
#. (para)
#: ../source/TortoiseMerge_en.xml:1656
msgid "Git keeps a local <quote>pristine</quote> copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the <quote>revert</quote> command to go back to the pristine copy."
msgstr "Git memelihara copy <quote>murni</quote> lokal dari setiap file seperti setelah saat terakhir Anda memutahirkan copy pekerjaan Anda. Jika Anda telah membuat perubahan dan menentukan Anda ingin membatalkannya, Anda bisa menggunakan perintah <quote>pulihkan</quote> untuk kembali ke copy murni."

# Indonesian#: source/TortoiseMerge_en.xml:1404
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1665
msgid "Revision"
msgstr "Revision (Revisi)"

# Indonesian#: source/TortoiseMerge_en.xml:1406
#. (para)
#: ../source/TortoiseMerge_en.xml:1667
msgid "Every time you commit a set of changes, you create one new <quote>revision</quote> in the repository. Each revision represents the state of the repository tree at a certain point in its history. If you want to go back in time you can examine the repository as it was at revision N."
msgstr "Setiap kali Anda mengkomit set perubahan, Anda membuat satu <quote>revisi</quote> baru dalam repositori. Setiap revisi menggambarkan keadaan dari susunan repositori pada titik tertentu dalam historinya. Jika Anda ingin kembali ke waktu Anda bisa memeriksa repositori seperti pada revisi N."

# Indonesian#: source/TortoiseMerge_en.xml:1413
#. (para)
#: ../source/TortoiseMerge_en.xml:1674
msgid "In another sense, a revision can refer to the set of changes that were made when that revision was created."
msgstr "Dengan kata lain, revisi bisa merujuk ke set dari perubahan yang dibuat ketika revisi itu dibuat."

# Indonesian#: source/TortoiseMerge_en.xml:1420
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1681
msgid "Revision Property (revprop)"
msgstr "Revision Property (Revisi Properti (revprop))"

# Indonesian#: source/TortoiseMerge_en.xml:1422
#. (para)
#: ../source/TortoiseMerge_en.xml:1683
msgid "Just as files can have properties, so can each revision in the repository. Some special revprops are added automatically when the revision is created, namely: <literal>svn:date svn:author svn:log</literal> which represent the commit date/time, the committer and the log message respectively. These properties can be edited, but they are not versioned, so any change is permanent and cannot be undone."
msgstr "Seperti halnya file bisa mempunyai properti, juga setiap revisi dalam repositori. Beberapa revprops khusus ditambahkan secara otomatis ke revisi yang dibuat, yaitu <literal>svn:date svn:author svn:log</literal> yang menggambarkan tanggal/jam komit, pengkomit dan log pesan masing-masing. Properti ini bisa diedit, tapi tidak diversi, maka setiap perubahan adalah permanen dan tidak bisa dibatalkan."

# Indonesian#: source/TortoiseMerge_en.xml:1434
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1695
msgid "SVN"
msgstr "SVN"

# Indonesian#: source/TortoiseMerge_en.xml:1436
#. (para)
#: ../source/TortoiseMerge_en.xml:1697
msgid "A frequently-used abbreviation for Git."
msgstr "Singkatan dari Git yang sering digunakan."

# Indonesian#: source/TortoiseMerge_en.xml:1439
#. (para)
#: ../source/TortoiseMerge_en.xml:1700
msgid "The name of the Git custom protocol used by the <quote>svnserve</quote> repository server."
msgstr "Nama dari protokol bebas Git yang digunakan oleh server repositori <quote>svnserve</quote>."

# Indonesian#: source/TortoiseMerge_en.xml:1446
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1707
msgid "Switch"
msgstr "Switch (Tukar)"

# Indonesian#: source/TortoiseMerge_en.xml:1448
#. (para)
#: ../source/TortoiseMerge_en.xml:1709
msgid "Just as <quote>Update-to-revision</quote> changes the time window of a working copy to look at a different point in history, so <quote>Switch</quote> changes the space window of a working copy so that it points to a different part of the repository. It is particularly useful when working on trunk and branches where only a few files differ. You can switch your working copy between the two and only the changed files will be transferred."
msgstr "Seperti <quote>Mutahirkan-ke-revisi</quote> mengubah jendela waktu dari copy pekerjaan untuk melihat titik perbedaan dalam histori, maka <quote>Tukar</quote> mengubah jendela ruang dari copy pekerjaan agar merujuk ke bagian yang berbeda dari repositori. Ini kadang berguna ketika pekerjaan pada batang dan cabang di mana hanya sedikit file yang berbeda. Anda bisa menukar copy pekerjaan Anda antara dua dan hanya file yang berubah yang akan ditransfer."

# Indonesian#: source/TortoiseMerge_en.xml:1460
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1721
msgid "Update"
msgstr "Update (Mutahirkan)"

# Indonesian#: source/TortoiseMerge_en.xml:1462
#. (para)
#: ../source/TortoiseMerge_en.xml:1723
msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy."
msgstr "Perintah Git ini menarik perubahan terbaru dari repositori ke dalam copy pekerjaan Anda, menggabung setiap perubahan oleh orang lain dengan perubahan lokal dalam copy pekerjaan."

# Indonesian#: source/TortoiseMerge_en.xml:1470
#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1731
msgid "Working Copy"
msgstr "Working Copy (Copy Pekerjaan)"

# Indonesian#: source/TortoiseMerge_en.xml:1472
#. (para)
#: ../source/TortoiseMerge_en.xml:1733
msgid "This is your local <quote>sandbox</quote>, the area where you work on the versioned files, and it normally resides on your local hard disk. You create a working copy by doing a <quote>Checkout</quote> from a repository, and you feed your changes back into the repository using <quote>Commit</quote>."
msgstr "Ini adalah <quote>bak pasir</quote> lokal Anda, area di mana Anda bekerja pada file berversi, dan biasanya berada pada hard disk lokal Anda. Anda membuat copy pekerjaan dengan melakukan <quote>Checkout</quote> dari repositori, dan mengisi perubahan Anda kembali ke dalam repositori menggunakan <quote>Komit</quote>."

#. Put one translator per line, in the form of NAME <EMAIL>.
#. (None)
#: ../source/TortoiseMerge_en.xml:0
msgid "translator-credits"
msgstr ""
"Zaenal Mutaquin\n"
"Thomas Edwin Santosa"

#. Place the translation of 'translation' here.
#. (None)
#: ../source/TortoiseMerge_en.xml:0
msgid "translator-translation"
msgstr "Terjemahan oleh"

#~ msgid "Wishlist"
#~ msgstr "Daftar Keinginan"