merge master into filesystem

20 files changed, 129 insertions, 16 deletions

diff --git a/settings/apps.php b/settings/apps.php
index 40b72639cd6..0889b0c45ed 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -57,14 +57,22 @@ usort($apps, 'app_sort');
  	$categories=array_keys($catagoryNames);
  	$externalApps=OC_OCSClient::getApplications($categories);
  	foreach($externalApps as $app){
- 		$apps[]=array(
- 			'name'=>$app['name'],
- 			'id'=>$app['id'],
- 			'active'=>false,
- 			'description'=>$app['description'],
- 			'author'=>$app['personid'],
- 			'license'=>$app['license'],
- 		);
+		// show only external apps that are not exist yet
+		$local=false;
+ 		foreach($apps as $a){
+			if($a['name']==$app['name']) $local=true;			
+		}
+
+		if(!$local) {
+	 		$apps[]=array(
+ 				'name'=>$app['name'],
+ 				'id'=>$app['id'],
+ 				'active'=>false,
+ 				'description'=>$app['description'],
+ 				'author'=>$app['personid'],
+ 				'license'=>$app['license'],
+ 			);
+		}
  	}
  }
 
diff --git a/settings/js/users.js b/settings/js/users.js
index b45038e5b04..c9b1d855db0 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -127,12 +127,16 @@ $(document).ready(function(){
 	$('#newuser').submit(function(event){
 		event.preventDefault();
 		var username=$('#newusername').val();
+		if($('#content table tbody tr').filterAttr('data-uid',username).length>0){
+			return;
+		}
 		if($.trim(username) == '') {
 			alert('Please provide a username!');
 			return false;
 		}
 		var password=$('#newuserpassword').val();
 		var groups=$('#newusergroups').prev().children('div').data('settings').checked;
+		var tr
 		$.post(
 			OC.filePath('settings','ajax','createuser.php'),
 			{
@@ -141,10 +145,12 @@ $(document).ready(function(){
 				groups:groups,
 			},
 			function(result){
-				
+				if(result.status!='success'){
+					tr.remove();
+				}
 			}
 		);
-		var tr=$('#content table tbody tr').first().clone();
+		tr=$('#content table tbody tr').first().clone();
 		tr.attr('data-uid',username);
 		tr.find('td.name').text(username);
 		var select=$('<select multiple="multiple" data-placehoder="Groups" title="Groups">');
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index a65dc2fe9bd..7758c9bdfce 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -1,7 +1,10 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "تم تغير العنوان البريدي",
 "Invalid request" => "طلبك غير مفهوم",
 "OpenID Changed" => "تم تغيير ال OpenID",
 "Language changed" => "تم تغيير اللغة",
+"__language_name__" => "__language_name__",
+"Log level" => "مستوى المراقبه",
 "Add your application" => "أضف تطبيقاتك",
 "Select an App" => "إختر تطبيقاً",
 "-licensed" => "-مسجل",
@@ -18,11 +21,16 @@
 "New password" => "كلمات سر جديدة",
 "show" => "أظهر",
 "Change password" => "عدل كلمة السر",
+"Email" => "العنوان البريدي",
+"Your email address" => "عنوانك البريدي",
+"Fill in an email address to enable password recovery" => "أدخل عنوانك البريدي لتفعيل استرجاع كلمة المرور",
 "Language" => "اللغة",
+"Help translate" => "ساعد في الترجمه",
 "use this address to connect to your ownCloud in your file manager" => "إستخدم هذا العنوان للإتصال ب ownCloud داخل نظام الملفات ",
 "Name" => "الاسم",
 "Password" => "كلمات السر",
 "Groups" => "مجموعات",
 "Create" => "انشئ",
+"Quota" => "حصه",
 "Delete" => "حذف"
 );
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 43d1b8ba1fd..5221bdb4894 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -3,6 +3,7 @@
 "Invalid request" => "Sol.licitud no vàlida",
 "OpenID Changed" => "OpenID ha canviat",
 "Language changed" => "S'ha canviat l'idioma",
+"__language_name__" => "Català",
 "Log level" => "Nivell de registres",
 "Add your application" => "Afegir una aplicació",
 "Select an App" => "Seleccioneu una aplicació",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 3ddebf0cd99..c7f537922c6 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -3,6 +3,7 @@
 "Invalid request" => "Chybný dotaz",
 "OpenID Changed" => "OpenID změněn",
 "Language changed" => "Jazyk byl změněn",
+"__language_name__" => "Česky",
 "Log level" => "Úroveň logu",
 "Add your application" => "Přidejte svou aplikaci",
 "Select an App" => "Vyberte aplikaci",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 05b5e579a78..701768aef65 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -3,6 +3,7 @@
 "Invalid request" => "Ugyldig forespørgsel",
 "OpenID Changed" => "OpenID ændret",
 "Language changed" => "Sprog ændret",
+"__language_name__" => "Dansk",
 "Log level" => "Log-niveau",
 "Add your application" => "Tilføj dit program",
 "Select an App" => "Vælg en App",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index cb1f4bd0817..0772b0aef6f 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -3,6 +3,8 @@
 "Invalid request" => "Ungültige Anfrage",
 "OpenID Changed" => "OpenID geändert",
 "Language changed" => "Sprache geändert",
+"__language_name__" => "Deutsch",
+"Log level" => "Log Level",
 "Add your application" => "Eigene Anwendung hinzufügen",
 "Select an App" => "Wähle eine Anwendung aus",
 "-licensed" => "-lizenziert",
@@ -13,7 +15,7 @@
 "Answer" => "Antwort",
 "You use" => "Du nutzt",
 "of the available" => "der verfügbaren",
-"Your password got changed" => "Dein Passwort wurde geändert",
+"Your password got changed" => "Dein Passwort wurde geändert.",
 "Unable to change your password" => "Passwort konnte nicht geändert werden",
 "Current password" => "Aktuelles Passwort",
 "New password" => "Neues Passwort",
@@ -21,13 +23,14 @@
 "Change password" => "Passwort ändern",
 "Email" => "E-Mail",
 "Your email address" => "Ihre E-Mail Adresse",
-"Fill in an email address to enable password recovery" => "Tragen Sie eine E-Mail Adresse ein, um die Passwort-Wiederherstellung zu aktivieren",
+"Fill in an email address to enable password recovery" => "Trage eine E-Mail Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
 "Language" => "Sprache",
-"Help translate" => "Helfen Sie bei der Übersetzung",
-"use this address to connect to your ownCloud in your file manager" => "benutze diese Adresse, um deine ownCloud mit deinem Dateiverwalter zu verbinden",
+"Help translate" => "Hilf bei der Übersetzung!",
+"use this address to connect to your ownCloud in your file manager" => "Benutze diese Adresse, um deine ownCloud mit deinem Dateiverwalter zu verbinden.",
 "Name" => "Name",
 "Password" => "Passwort",
 "Groups" => "Gruppen",
 "Create" => "Anlegen",
+"Quota" => "Quota",
 "Delete" => "Löschen"
 );
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 0c55f462ba3..71659edaad7 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -3,6 +3,7 @@
 "Invalid request" => "Solicitud no válida",
 "OpenID Changed" => "OpenID Cambiado",
 "Language changed" => "Idioma cambiado",
+"__language_name__" => "Español",
 "Log level" => "Nivel de log",
 "Add your application" => "Añadir tu aplicación",
 "Select an App" => "Seleccionar una aplicación",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index c01c8400ca8..97a2887f70a 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,7 +1,10 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "e-posti on muudetud",
 "Invalid request" => "Vigane päring",
 "OpenID Changed" => "OpenID on muudetud",
 "Language changed" => "Keel on muudetud",
+"__language_name__" => "Eesti",
+"Log level" => "Logi tase",
 "Add your application" => "Lisa oma programm",
 "Select an App" => "Vali programm",
 "-licensed" => "-litsenseeritud",
@@ -18,11 +21,16 @@
 "New password" => "Uus parool",
 "show" => "näita",
 "Change password" => "Muuda parooli",
+"Email" => "E-post",
+"Your email address" => "Sinu e-posti aadress",
+"Fill in an email address to enable password recovery" => "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress",
 "Language" => "Keel",
+"Help translate" => "Aita tõlkida",
 "use this address to connect to your ownCloud in your file manager" => "kasuta seda aadressi oma ownCloudiga ühendamiseks failihalduriga",
 "Name" => "Nimi",
 "Password" => "Parool",
 "Groups" => "Grupid",
 "Create" => "Lisa",
+"Quota" => "Mahupiir",
 "Delete" => "Kustuta"
 );
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 43fbc22085b..27b8f7fc3c2 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -3,6 +3,7 @@
 "Invalid request" => "Petición non correcta",
 "OpenID Changed" => "Mudou o OpenID",
 "Language changed" => "O idioma mudou",
+"__language_name__" => "Galego",
 "Log level" => "Nivel de rexistro",
 "Add your application" => "Engada o seu aplicativo",
 "Select an App" => "Escolla un Aplicativo",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 41cb6ea9625..c27f7ed5974 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -3,6 +3,7 @@
 "Invalid request" => "Richiesta non valida",
 "OpenID Changed" => "OpenID Modificato",
 "Language changed" => "Lingua modificata",
+"__language_name__" => "Italiano",
 "Log level" => "Livello di log",
 "Add your application" => "Aggiungi un applicazione",
 "Select an App" => "Seleziona un applicazione",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index fe4eda3a13a..fecad92a6a0 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,7 +1,10 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "メールアドレスを変更しました",
 "Invalid request" => "無効なリクエストです",
 "OpenID Changed" => "OpenIDが変更されました",
 "Language changed" => "言語が変更されました",
+"__language_name__" => "Japanese(日本語)",
+"Log level" => "ログレベル",
 "Add your application" => "アプリを追加してください",
 "Select an App" => "アプリを選択してください",
 "-licensed" => "権利を保持されています",
@@ -18,11 +21,16 @@
 "New password" => "新しいパスワード",
 "show" => "表示",
 "Change password" => "パスワードを変更する",
+"Email" => "メールアドレス",
+"Your email address" => "あなたのメールアドレス",
+"Fill in an email address to enable password recovery" => "パスワードの回復を有効にするにはメールアドレスを入力してください",
 "Language" => "言語",
+"Help translate" => "翻訳を手伝う",
 "use this address to connect to your ownCloud in your file manager" => "ファイルマネージャーであなたのownCloudに接続するときはこのアドレスを使用してください",
 "Name" => "名前",
 "Password" => "パスワード",
 "Groups" => "グループ",
 "Create" => "作成",
+"Quota" => "クオータ",
 "Delete" => "削除"
 );
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 34af604ecef..3f75d3f1490 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -3,6 +3,7 @@
 "Invalid request" => "Ongeldig verzoek",
 "OpenID Changed" => "OpenID is aangepast",
 "Language changed" => "Taal aangepast",
+"__language_name__" => "Nederlands",
 "Log level" => "Logniveau",
 "Add your application" => "Voeg uw applicatie toe",
 "Select an App" => "Selecteer een app",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 88e51a0706b..63341156496 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -3,6 +3,7 @@
 "Invalid request" => "Nieprawidłowe żądanie",
 "OpenID Changed" => "Zmieniono OpenID",
 "Language changed" => "Język zmieniony",
+"__language_name__" => "Polski",
 "Log level" => "Poziom logowania",
 "Add your application" => "Dodaj własną aplikacje",
 "Select an App" => "Zaznacz aplikacje",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index a8faeb780f8..ef90adb0557 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "адрес электронной почты изменён",
 "Invalid request" => "Неверный запрос",
 "OpenID Changed" => "OpenID был изменён",
 "Language changed" => "Язык изменён",
+"Log level" => "Уровень детализации журнала",
 "Add your application" => "Добавить ваше приложение",
 "Select an App" => "Выберите приложение",
 "-licensed" => "-лицензия",
@@ -18,11 +20,16 @@
 "New password" => "Новый пароль",
 "show" => "показать",
 "Change password" => "Сменить пароль",
+"Email" => "e-mail",
+"Your email address" => "Ваш адрес электронной почты",
+"Fill in an email address to enable password recovery" => "Введите адрес электронной почты чтобы появилась возможность восстановления пароля",
 "Language" => "Язык",
+"Help translate" => "Помочь с переводом",
 "use this address to connect to your ownCloud in your file manager" => "используйте данный адрес для подключения к ownCloud в вашем файловом менеджере",
 "Name" => "Имя",
 "Password" => "Пароль",
 "Groups" => "Группы",
 "Create" => "Создать",
+"Quota" => "Квота",
 "Delete" => "Удалить"
 );
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
new file mode 100644
index 00000000000..ed706ae93ad
--- /dev/null
+++ b/settings/l10n/th_TH.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"email Changed" => "อีเมล์ถูกเปลี่ยนแล้ว",
+"Invalid request" => "คำร้องขอไม่ถูกต้อง",
+"OpenID Changed" => "เปลี่ยนชื่อบัญชี OpenID แล้ว",
+"Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
+"__language_name__" => "ภาษาไทย",
+"Log level" => "ระดับการเก็บบันทึก log",
+"Add your application" => "เพิ่มแอพพลิเคชั่นของคุณ",
+"Select an App" => "เลือก App",
+"-licensed" => "-ได้รับอนุญาติแล้ว",
+"by" => "โดย",
+"Ask a question" => "สอบถามข้อมูล",
+"Problems connecting to help database." => "เกิดปัญหาในการเชื่อมต่อกับฐานข้อมูลช่วยเหลือ",
+"Go there manually." => "ไปที่นั่นด้วยตนเอง",
+"Answer" => "คำตอบ",
+"You use" => "คุณใช้พื้นที่ไป",
+"of the available" => "จากจำนวนที่ใช้ได้",
+"Your password got changed" => "เปลี่ยนรหัสผ่านเรียบร้อยแล้ว",
+"Unable to change your password" => "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้",
+"Current password" => "รหัสผ่านปัจจุบัน",
+"New password" => "รหัสผ่านใหม่",
+"show" => "แสดง",
+"Change password" => "เปลี่ยนรหัสผ่าน",
+"Email" => "อีเมล์",
+"Your email address" => "ที่อยู่อีเมล์ของคุณ",
+"Fill in an email address to enable password recovery" => "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้",
+"Language" => "ภาษา",
+"Help translate" => "ช่วยกันแปล",
+"use this address to connect to your ownCloud in your file manager" => "ใช้ที่อยู่นี้ในการเชื่อมต่อกับบัญชี ownCloud ของคุณในเครื่องมือจัดการไฟล์ของคุณ",
+"Name" => "ชื่อ",
+"Password" => "รหัสผ่าน",
+"Groups" => "กลุ่ม",
+"Create" => "สร้าง",
+"Quota" => "พื้นที่",
+"Delete" => "ลบ"
+);
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 22ffce3b57e..cf554ed5ca9 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,7 +1,10 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "电子邮件已修改",
 "Invalid request" => "非法请求",
 "OpenID Changed" => "OpenID 已修改",
 "Language changed" => "语言已修改",
+"__language_name__" => "简体中文",
+"Log level" => "日志级别",
 "Add your application" => "加入您的应用程序",
 "Select an App" => "选择一个应用",
 "-licensed" => "-许可证",
@@ -18,11 +21,16 @@
 "New password" => "新密码",
 "show" => "显示",
 "Change password" => "修改密码",
+"Email" => "电子邮件",
+"Your email address" => "您的电子邮件",
+"Fill in an email address to enable password recovery" => "填写电子邮件地址以启用密码恢复",
 "Language" => "语言",
+"Help translate" => "帮助翻译",
 "use this address to connect to your ownCloud in your file manager" => "在文件管理器中使用这个地址来连接到您的 ownCloud",
 "Name" => "名称",
 "Password" => "密码",
 "Groups" => "组",
 "Create" => "创建",
+"Quota" => "配额",
 "Delete" => "删除"
 );
diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index 81177e0a258..621ee5ab55c 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -29,5 +29,17 @@ return array(
 'sr'=>'Српски',
 'sr@latin'=>'Srpski',
 'sv'=>'Svenska',
-'zh_CN'=>'中文'
+'zh_CN'=>'中文',
+'sk_SK'=>'Slovenčina',
+'hu_HU'=>'Magyar',
+'eu'=>'Euskara',
+'lt_LT'=>'Lietuvių',
+'eo'=>'Esperanto',
+'tr'=>'Türkçe',
+'hr'=>'Hrvatski',
+'ar'=>'العربية',
+'he'=>'עִבְרִית,',
+'ia'=>'Interlingua',
+'sl'=>'Slovenski',
+'nn_NO'=>'Nynorsk',
 );
diff --git a/settings/personal.php b/settings/personal.php
index 47cb2366f67..8e888760052 100755
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -34,7 +34,7 @@ $languageNames=include 'languageCodes.php';
 $languages=array();
 foreach($languageCodes as $lang){
 	$l=new OC_L10N('settings',$lang);
-	if($l->t('__language_name__')!='__language_name__'){//first check if the language name is in the translation file
+	if(substr($l->t('__language_name__'),0,1)!='_'){//first check if the language name is in the translation file
 		$languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__'));
 	}elseif(isset($languageNames[$lang])){
 		$languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]);
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 8c5de5ccf2a..80d2cb0a86f 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -51,6 +51,7 @@
 
 <p class="personalblock">
 	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?><br />
+	developed by the <a href="http://ownCloud.org/credits" target="_blank">ownCloud community</a><br />
 	<?php echo(OC_Updater::ShowUpdatingHint());     ?><br />
 	<a href="http://gitorious.org/owncloud" target="_blank">source code</a> licensed freely under <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank">AGPL</a>
 </p>