summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2013-01-23 11:30:40 +0100
committerLukas Reschke <lukas@statuscode.ch>2013-01-23 11:30:40 +0100
commitc8bbbb48d3214d3ce141110aebcd59577d9e5c40 (patch)
treec7f41e33783878ee664f919ac5818066047dea10 /core
parent48949ba04acacd5cc4039ba15266619ebe61a52b (diff)
parentc986dbe5739347f3fd40fa17132169de9fd9494c (diff)
downloadnextcloud-server-c8bbbb48d3214d3ce141110aebcd59577d9e5c40.tar.gz
nextcloud-server-c8bbbb48d3214d3ce141110aebcd59577d9e5c40.zip
Merge master...
Diffstat (limited to 'core')
-rw-r--r--core/js/js.js2
-rw-r--r--core/l10n/fa.php1
-rw-r--r--core/l10n/th_TH.php11
-rw-r--r--core/l10n/tr.php24
-rw-r--r--core/templates/layout.base.php8
-rw-r--r--core/templates/layout.guest.php12
6 files changed, 55 insertions, 3 deletions
diff --git a/core/js/js.js b/core/js/js.js
index 23ace89f4e3..6241036b1b8 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -88,7 +88,7 @@ var OC={
PERMISSION_DELETE:8,
PERMISSION_SHARE:16,
webroot:oc_webroot,
- appswebroots:oc_appswebroots,
+ appswebroots:(typeof oc_appswebroots !== 'undefined') ? oc_appswebroots:false,
currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,
coreApps:['', 'admin','log','search','settings','core','3rdparty'],
/**
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index a7c3c9ab2e5..ad5bafeb1a2 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -17,6 +17,7 @@
"Ok" => "قبول",
"Error" => "خطا",
"Password" => "گذرواژه",
+"Unshare" => "لغو اشتراک",
"create" => "ایجاد",
"ownCloud password reset" => "پسورد ابرهای شما تغییرکرد",
"Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 183997e4c94..bcbd70d03e6 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "ผู้ใช้งาน %s ได้แชร์ไฟล์ให้กับคุณ",
+"User %s shared a folder with you" => "ผู้ใช้งาน %s ได้แชร์โฟลเดอร์ให้กับคุณ",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "ผู้ใช้งาน %s ได้แชร์ไฟล์ \"%s\" ให้กับคุณ และคุณสามารถสามารถดาวน์โหลดไฟล์ดังกล่าวได้จากที่นี่: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "ผู้ใช้งาน %s ได้แชร์โฟลเดอร์ \"%s\" ให้กับคุณ และคุณสามารถดาวน์โหลดโฟลเดอร์ดังกล่าวได้จากที่นี่: %s",
"Category type not provided." => "ยังไม่ได้ระบุชนิดของหมวดหมู่",
"No category to add?" => "ไม่มีหมวดหมู่ที่ต้องการเพิ่ม?",
"This category already exists: " => "หมวดหมู่นี้มีอยู่แล้ว: ",
@@ -39,6 +43,8 @@
"Share with link" => "แชร์ด้วยลิงก์",
"Password protect" => "ใส่รหัสผ่านไว้",
"Password" => "รหัสผ่าน",
+"Email link to person" => "ส่งลิงก์ให้ทางอีเมล",
+"Send" => "ส่ง",
"Set expiration date" => "กำหนดวันที่หมดอายุ",
"Expiration date" => "วันที่หมดอายุ",
"Share via email:" => "แชร์ผ่านทางอีเมล",
@@ -55,6 +61,8 @@
"Password protected" => "ใส่รหัสผ่านไว้",
"Error unsetting expiration date" => "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ",
"Error setting expiration date" => "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
+"Sending ..." => "กำลังส่ง...",
+"Email sent" => "ส่งอีเมล์แล้ว",
"ownCloud password reset" => "รีเซ็ตรหัสผ่าน ownCloud",
"Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
"You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
@@ -118,5 +126,6 @@
"remember" => "จำรหัสผ่าน",
"Log in" => "เข้าสู่ระบบ",
"prev" => "ก่อนหน้า",
-"next" => "ถัดไป"
+"next" => "ถัดไป",
+"Updating ownCloud to version %s, this may take a while." => "กำลังอัพเดท ownCloud ไปเป็นรุ่น %s, กรุณารอสักครู่"
);
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 284a4d97130..58e28a9b3b9 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -1,9 +1,16 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "%s kullanıcısı sizinle bir dosyayı paylaştı",
+"User %s shared a folder with you" => "%s kullanıcısı sizinle bir dizini paylaştı",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s kullanıcısı \"%s\" dosyasını sizinle paylaştı. %s adresinden indirilebilir",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s kullanıcısı \"%s\" dizinini sizinle paylaştı. %s adresinden indirilebilir",
"Category type not provided." => "Kategori türü desteklenmemektedir.",
"No category to add?" => "Eklenecek kategori yok?",
"This category already exists: " => "Bu kategori zaten mevcut: ",
"Object type not provided." => "Nesne türü desteklenmemektedir.",
+"%s ID not provided." => "%s ID belirtilmedi.",
+"Error adding %s to favorites." => "%s favorilere eklenirken hata oluştu",
"No categories selected for deletion." => "Silmek için bir kategori seçilmedi",
+"Error removing %s from favorites." => "%s favorilere çıkarılırken hata oluştu",
"Settings" => "Ayarlar",
"seconds ago" => "saniye önce",
"1 minute ago" => "1 dakika önce",
@@ -25,18 +32,25 @@
"Ok" => "Tamam",
"The object type is not specified." => "Nesne türü belirtilmemiş.",
"Error" => "Hata",
+"The app name is not specified." => "uygulama adı belirtilmedi.",
+"The required file {file} is not installed!" => "İhtiyaç duyulan {file} dosyası kurulu değil.",
"Error while sharing" => "Paylaşım sırasında hata ",
+"Error while unsharing" => "Paylaşım iptal ediliyorken hata",
"Error while changing permissions" => "İzinleri değiştirirken hata oluştu",
+"Shared with you and the group {group} by {owner}" => " {owner} tarafından sizinle ve {group} ile paylaştırılmış",
+"Shared with you by {owner}" => "{owner} trafından sizinle paylaştırıldı",
"Share with" => "ile Paylaş",
"Share with link" => "Bağlantı ile paylaş",
"Password protect" => "Şifre korunması",
"Password" => "Parola",
+"Email link to person" => "Kişiye e-posta linki",
"Send" => "Gönder",
"Set expiration date" => "Son kullanma tarihini ayarla",
"Expiration date" => "Son kullanım tarihi",
"Share via email:" => "Eposta ile paylaş",
"No people found" => "Kişi bulunamadı",
"Resharing is not allowed" => "Tekrar paylaşmaya izin verilmiyor",
+"Shared in {item} with {user}" => " {item} içinde {user} ile paylaşılanlarlar",
"Unshare" => "Paylaşılmayan",
"can edit" => "düzenleyebilir",
"access control" => "erişim kontrolü",
@@ -45,6 +59,8 @@
"delete" => "sil",
"share" => "paylaş",
"Password protected" => "Paralo korumalı",
+"Error unsetting expiration date" => "Geçerlilik tarihi tanımlama kaldırma hatası",
+"Error setting expiration date" => "Geçerlilik tarihi tanımlama hatası",
"Sending ..." => "Gönderiliyor...",
"Email sent" => "Eposta gönderildi",
"ownCloud password reset" => "ownCloud parola sıfırlama",
@@ -68,6 +84,9 @@
"Edit categories" => "Kategorileri düzenle",
"Add" => "Ekle",
"Security Warning" => "Güvenlik Uyarisi",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Güvenli rasgele sayı üreticisi bulunamadı. Lütfen PHP OpenSSL eklentisini etkinleştirin.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Güvenli rasgele sayı üreticisi olmadan saldırganlar parola sıfırlama simgelerini tahmin edip hesabınızı ele geçirebilir.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. Owncloud tarafından sağlanan .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu döküman dizini dışına almanızı şiddetle tavsiye ederiz.",
"Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun",
"Advanced" => "Gelişmiş",
"Data folder" => "Veri klasörü",
@@ -101,9 +120,12 @@
"web services under your control" => "kontrolünüzdeki web servisleri",
"Log out" => "Çıkış yap",
"Automatic logon rejected!" => "Otomatik oturum açma reddedildi!",
+"If you did not change your password recently, your account may be compromised!" => "Yakın zamanda parolanızı değiştirmedi iseniz hesabınız riske girebilir.",
+"Please change your password to secure your account again." => "Hesabınızı korumak için lütfen parolanızı değiştirin.",
"Lost your password?" => "Parolanızı mı unuttunuz?",
"remember" => "hatırla",
"Log in" => "Giriş yap",
"prev" => "önceki",
-"next" => "sonraki"
+"next" => "sonraki",
+"Updating ownCloud to version %s, this may take a while." => "Owncloud %s versiyonuna güncelleniyor. Biraz zaman alabilir."
);
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 47fb75612cf..08083a2924a 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -7,7 +7,15 @@
<?php foreach ($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
<?php endforeach; ?>
+<<<<<<< HEAD
<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script>
+=======
+ <script type="text/javascript">
+ var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>;
+ var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
+ var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
+ </script>
+>>>>>>> master
<?php foreach ($_['jsfiles'] as $jsfile): ?>
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
<?php endforeach; ?>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 499d49e445d..7f33d539658 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -7,7 +7,19 @@
<?php foreach($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
<?php endforeach; ?>
+<<<<<<< HEAD
<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script>
+=======
+ <script type="text/javascript">
+ var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>;
+ var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
+ var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
+ var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>;
+ var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>;
+ var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>;
+ var firstDay = <?php echo json_encode($l->l('firstday', 'firstday')) ?>;
+ </script>
+>>>>>>> master
<?php foreach($_['jsfiles'] as $jsfile): ?>
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
<?php endforeach; ?>