diff options
author | Björn Schießle <schiessle@owncloud.com> | 2013-01-28 11:18:04 +0100 |
---|---|---|
committer | Björn Schießle <schiessle@owncloud.com> | 2013-01-28 11:18:04 +0100 |
commit | 8067a1394e3dab551e65ec8abd12e673a811bf40 (patch) | |
tree | fd18fac68c7ca62ee50142e771f0da70a9c0925d /apps/files/l10n/id.php | |
parent | dbb0d0407324830f4a7ff51781c535c1cb0d2a06 (diff) | |
parent | 857b15db3739fe8fbbad4df0f10e9b48ba1f90c2 (diff) | |
download | nextcloud-server-8067a1394e3dab551e65ec8abd12e673a811bf40.tar.gz nextcloud-server-8067a1394e3dab551e65ec8abd12e673a811bf40.zip |
fix merge conflicts
Diffstat (limited to 'apps/files/l10n/id.php')
-rw-r--r-- | apps/files/l10n/id.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php index 46d9ad1a75a..3ebb9983291 100644 --- a/apps/files/l10n/id.php +++ b/apps/files/l10n/id.php @@ -1,5 +1,4 @@ <?php $TRANSLATIONS = array( -"Upload" => "Unggah", "There is no error, the file uploaded with success" => "Tidak ada galat, berkas sukses diunggah", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "File yang diunggah melampaui directive MAX_FILE_SIZE yang disebutan dalam form HTML.", "The uploaded file was only partially uploaded" => "Berkas hanya diunggah sebagian", @@ -21,6 +20,7 @@ "Name" => "Nama", "Size" => "Ukuran", "Modified" => "Dimodifikasi", +"Upload" => "Unggah", "File handling" => "Penanganan berkas", "Maximum upload size" => "Ukuran unggah maksimum", "max. possible: " => "Kemungkinan maks:", |