diff options
| author | Andreas Fischer <bantu@owncloud.com> | 2014-05-28 22:57:33 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@owncloud.com> | 2014-05-28 22:57:33 +0200 |
| commit | 5754b0b9e70824786878b847abb6b728ca0414bb (patch) | |
| tree | 9ad1fbc35edde8f54f44c9ef7029e007a16815b9 /core/l10n/id.php | |
| parent | f81ee94cad8a997c3a2fef0b6aac4f8d509571f6 (diff) | |
| parent | ce9d5df6df37e51587dcde638086dfe501892b56 (diff) | |
| download | nextcloud-server-5754b0b9e70824786878b847abb6b728ca0414bb.tar.gz nextcloud-server-5754b0b9e70824786878b847abb6b728ca0414bb.zip | |
Merge remote-tracking branch 'owncloud/master' into add_resetadminpass_command
* owncloud/master: (238 commits)
Change visibility of scanner internals
[tx-robot] updated from transifex
remove legacy OC_Filesystem being used in a hook callback
add title property to share dialog
forgotten infobox messages translations
reverts 188c543 and translates only mail
fix warning text and margin
Adjust core apps to use "requiremin" instead of "require"
Added requiremin/requiremax fields for apps
[tx-robot] updated from transifex
unwrapped strings fix
allow resharing of files with only share permissions
don't lose file size during rename
drop superflous statement in phpdoc
add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook
[tx-robot] updated from transifex
fix grammar
make user_ldap fully translatable
[tx-robot] updated from transifex
fix typo
...
Conflicts:
core/register_command.php
Diffstat (limited to 'core/l10n/id.php')
| -rw-r--r-- | core/l10n/id.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/l10n/id.php b/core/l10n/id.php index 7bb6883943d..c8b7853365e 100644 --- a/core/l10n/id.php +++ b/core/l10n/id.php @@ -40,10 +40,10 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n bulan yang lalu"), "last year" => "tahun kemarin", "years ago" => "beberapa tahun lalu", -"Choose" => "Pilih", -"Error loading file picker template: {error}" => "Galat memuat templat berkas pemilih: {error}", "Yes" => "Ya", "No" => "Tidak", +"Choose" => "Pilih", +"Error loading file picker template: {error}" => "Galat memuat templat berkas pemilih: {error}", "Ok" => "Oke", "Error loading message template: {error}" => "Galat memuat templat pesan: {error}", "_{count} file conflict_::_{count} file conflicts_" => array("{count} berkas konflik"), @@ -73,7 +73,6 @@ $TRANSLATIONS = array( "Share with user or group …" => "Bagikan dengan pengguna atau grup ...", "Share link" => "Bagikan tautan", "Password protect" => "Lindungi dengan sandi", -"Password" => "Sandi", "Allow Public Upload" => "Izinkan Unggahan Publik", "Email link to person" => "Emailkan tautan ini ke orang", "Send" => "Kirim", @@ -149,6 +148,7 @@ $TRANSLATIONS = array( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.", "Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>", +"Password" => "Sandi", "Storage & database" => "Penyimpanan & Basis data", "Data folder" => "Folder data", "Configure the database" => "Konfigurasikan basis data", |