diff options
author | Bart Visscher <bartv@thisnet.nl> | 2012-09-07 15:42:37 +0200 |
---|---|---|
committer | Bart Visscher <bartv@thisnet.nl> | 2012-09-07 15:51:44 +0200 |
commit | 5eba5798274823fe3147a8d671ca5e15b3eb7843 (patch) | |
tree | eb9cfb3fc687b8be26dde07a08fd23ca3455991f /core/l10n/tr.php | |
parent | b483f2aab856e3324026588a9702043072fd7ad2 (diff) | |
parent | 3829460ab8cbb6de65c53583a20fd04cbe7927dd (diff) | |
download | nextcloud-server-5eba5798274823fe3147a8d671ca5e15b3eb7843.tar.gz nextcloud-server-5eba5798274823fe3147a8d671ca5e15b3eb7843.zip |
Merge branch 'master' into routing
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
Diffstat (limited to 'core/l10n/tr.php')
-rw-r--r-- | core/l10n/tr.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/l10n/tr.php b/core/l10n/tr.php index e2d0d9b073d..7d6d4a33a6d 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -2,7 +2,6 @@ "Application name not provided." => "Uygulama adı verilmedi.", "No category to add?" => "Eklenecek kategori yok?", "This category already exists: " => "Bu kategori zaten mevcut: ", -"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=", "Settings" => "Ayarlar", "January" => "Ocak", "February" => "Şubat", @@ -51,6 +50,7 @@ "Database user" => "Veritabanı kullanıcı adı", "Database password" => "Veritabanı parolası", "Database name" => "Veritabanı adı", +"Database tablespace" => "Veritabanı tablo alanı", "Database host" => "Veritabanı sunucusu", "Finish setup" => "Kurulumu tamamla", "web services under your control" => "kontrolünüzdeki web servisleri", |