summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJenkins for ownCloud <thomas.mueller@tmit.eu>2014-04-06 01:56:11 -0400
committerJenkins for ownCloud <thomas.mueller@tmit.eu>2014-04-06 01:56:11 -0400
commita9d49de46575308348194ce5617b065f896f8b89 (patch)
treeb566d742389acfdd97cf433b4c8763558d043d34 /core
parent86adee98bffbfdca7dd1e81b64351b007fc0a427 (diff)
downloadnextcloud-server-a9d49de46575308348194ce5617b065f896f8b89.tar.gz
nextcloud-server-a9d49de46575308348194ce5617b065f896f8b89.zip
[tx-robot] updated from transifex
Diffstat (limited to 'core')
-rw-r--r--core/l10n/ja.php3
-rw-r--r--core/l10n/tr.php4
2 files changed, 5 insertions, 2 deletions
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
index eb3e6882578..5f8d6a05ae9 100644
--- a/core/l10n/ja.php
+++ b/core/l10n/ja.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Expiration date is in the past." => "有効期限が切れています。",
"Couldn't send mail to following users: %s " => "次のユーザーにメールを送信できませんでした: %s",
"Turned on maintenance mode" => "メンテナンスモードがオンになりました",
"Turned off maintenance mode" => "メンテナンスモードがオフになりました",
@@ -121,6 +122,8 @@ $TRANSLATIONS = array(
"To login page" => "ログインページへ戻る",
"New password" => "新しいパスワードを入力",
"Reset password" => "パスワードをリセット",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。",
+"For the best results, please consider using a GNU/Linux server instead." => "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。",
"Personal" => "個人",
"Users" => "ユーザー",
"Apps" => "アプリ",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index cb9a98a8faa..9d211bd0570 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -31,7 +31,7 @@ $TRANSLATIONS = array(
"December" => "Aralık",
"Settings" => "Ayarlar",
"Saving..." => "Kaydediliyor...",
-"seconds ago" => "saniye önce",
+"seconds ago" => "saniyeler önce",
"_%n minute ago_::_%n minutes ago_" => array("%n dakika önce","%n dakika önce"),
"_%n hour ago_::_%n hours ago_" => array("%n saat önce","%n saat önce"),
"today" => "bugün",
@@ -51,7 +51,7 @@ $TRANSLATIONS = array(
"_{count} file conflict_::_{count} file conflicts_" => array("{count} dosya çakışması","{count} dosya çakışması"),
"One file conflict" => "Bir dosya çakışması",
"Which files do you want to keep?" => "Hangi dosyaları saklamak istiyorsunuz?",
-"If you select both versions, the copied file will have a number added to its name." => "Eğer iki sürümü de seçerseniz, kopyalanan dosya ismine eklenmiş bir sayı içerecektir.",
+"If you select both versions, the copied file will have a number added to its name." => "İki sürümü de seçerseniz, kopyalanan dosyanın ismine bir sayı ilave edilecektir.",
"Cancel" => "İptal",
"Continue" => "Devam et",
"(all selected)" => "(tümü seçildi)",