Merge branch 'master' into oc_avatars

Conflicts:
	config/config.sample.php

5 files changed, 25 insertions, 77 deletions

diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index 14bbf6f6a13..7a82f8f6a19 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud",
+"No app name specified" => "No se ha especificado nombre de la aplicación",
 "Help" => "Ayuda",
 "Personal" => "Personal",
 "Settings" => "Ajustes",
@@ -13,6 +15,15 @@ $TRANSLATIONS = array(
 "Back to Files" => "Volver a Archivos",
 "Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargue los archivos en trozos más pequeños, por separado o solicítelos amablemente su administrador.",
+"No source specified when installing app" => "No se ha especificado origen cuando se ha instalado la aplicación",
+"No href specified when installing app from http" => "No href especificado cuando se ha instalado la aplicación",
+"No path specified when installing app from local file" => "Sin path especificado  cuando se ha instalado la aplicación desde el fichero local",
+"Archives of type %s are not supported" => "Ficheros de tipo %s no son soportados",
+"Failed to open archive when installing app" => "Fallo de apertura de fichero mientras se instala la aplicación",
+"App does not provide an info.xml file" => "La aplicación no suministra un fichero info.xml",
+"App can't be installed because of not allowed code in the App" => "La aplicación no puede ser instalada por tener código no autorizado en la aplicación",
+"App can't be installed because it is not compatible with this version of ownCloud" => "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas",
 "Application is not enabled" => "La aplicación no está habilitada",
 "Authentication error" => "Error de autenticación",
 "Token expired. Please reload page." => "Token expirado. Por favor, recarga la página.",
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index a35027eb962..c3a040048ec 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -23,6 +23,7 @@ $TRANSLATIONS = array(
 "App does not provide an info.xml file" => "L'applicazione non fornisce un file info.xml",
 "App can't be installed because of not allowed code in the App" => "L'applicazione non può essere installata a causa di codice non consentito al suo interno",
 "App can't be installed because it is not compatible with this version of ownCloud" => "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "L'applicazione non può essere installata poiché contiene il tag <shipped>true<shipped> che non è permesso alle applicazioni non shipped",
 "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "L'applicazione non può essere installata poiché la versione in info.xml/version non è la stessa riportata dall'app store",
 "App directory already exists" => "La cartella dell'applicazione esiste già",
 "Can't create app folder. Please fix permissions. %s" => "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s",
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 902170524b9..e2b67e76187 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => " \"%s\" アプリは、このバージョンのownCloudと互換性がない為、インストールできません。",
+"No app name specified" => "アプリ名が未指定",
 "Help" => "ヘルプ",
 "Personal" => "個人",
 "Settings" => "設定",
@@ -13,6 +15,17 @@ $TRANSLATIONS = array(
 "Back to Files" => "ファイルに戻る",
 "Selected files too large to generate zip file." => "選択したファイルはZIPファイルの生成には大きすぎます。",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "ファイルは、小さいファイルに分割されてダウンロードされます。もしくは、管理者にお尋ねください。",
+"No source specified when installing app" => "アプリインストール時のソースが未指定",
+"No href specified when installing app from http" => "アプリインストール時のhttpの URL が未指定",
+"No path specified when installing app from local file" => "アプリインストール時のローカルファイルのパスが未指定",
+"Archives of type %s are not supported" => "\"%s\"タイプのアーカイブ形式は未サポート",
+"Failed to open archive when installing app" => "アプリをインストール中にアーカイブファイルを開けませんでした。",
+"App does not provide an info.xml file" => "アプリにinfo.xmlファイルが入っていません",
+"App can't be installed because of not allowed code in the App" => "アプリで許可されないコードが入っているのが原因でアプリがインストールできません",
+"App can't be installed because it is not compatible with this version of ownCloud" => "アプリは、このバージョンのownCloudと互換性がない為、インストールできません。",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "info.xml/versionのバージョンがアプリストアのバージョンと合っていない為、アプリはインストールされません",
+"App directory already exists" => "アプリディレクトリは既に存在します",
+"Can't create app folder. Please fix permissions. %s" => "アプリフォルダを作成出来ませんでした。%s のパーミッションを修正してください。",
 "Application is not enabled" => "アプリケーションは無効です",
 "Authentication error" => "認証エラー",
 "Token expired. Please reload page." => "トークンが無効になりました。ページを再読込してください。",
diff --git a/lib/ocs/activity.php b/lib/ocs/activity.php
deleted file mode 100644
index c30e21018d3..00000000000
--- a/lib/ocs/activity.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Frank Karlitschek
-* @copyright 2012 Frank Karlitschek frank@owncloud.org
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-class OC_OCS_Activity {
-
-	public static function activityGet($parameters){
-		// TODO
-	}
-}
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index bd0302a2a81..58636f806be 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -40,16 +40,6 @@ class OC_OCSClient{
 		return($url);
 	}
 
-	/**
-	 * @brief Get the url of the OCS KB server.
-	 * @returns string of the KB server
-	 * This function returns the url of the OCS knowledge base server. It´s
-	 * possible to set it in the config file or it will fallback to the default
-	 */
-	private static function getKBURL() {
-		$url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1');
-		return($url);
-	}
 
 	/**
 	 * @brief Get the content of an OCS url call.
@@ -214,44 +204,5 @@ class OC_OCSClient{
 	}
 
 
-	/**
-	 * @brief Get all the knowledgebase entries from the OCS server
-	 * @returns array with q and a data
-	 *
-	 * This function returns a list of all the knowledgebase entries from the OCS server
-	 */
-	public static function getKnownledgebaseEntries($page, $pagesize, $search='') {
-		$kbe = array('totalitems' => 0);
-		if(OC_Config::getValue('knowledgebaseenabled', true)) {
-			$p = (int) $page;
-			$s = (int) $pagesize;
-			$searchcmd = '';
-			if ($search) {
-				$searchcmd = '&search='.urlencode($search);
-			}
-			$url = OC_OCSClient::getKBURL().'/knowledgebase/data?type=150&page='. $p .'&pagesize='. $s . $searchcmd;
-			$xml = OC_OCSClient::getOCSresponse($url);
-			$data = @simplexml_load_string($xml);
-			if($data===false) {
-				OC_Log::write('core', 'Unable to parse knowledgebase content', OC_Log::FATAL);
-				return null;
-			}
-			$tmp = $data->data->content;
-			for($i = 0; $i < count($tmp); $i++) {
-				$kbe[] = array(
-					'id' => $tmp[$i]->id,
-					'name' => $tmp[$i]->name,
-					'description' => $tmp[$i]->description,
-					'answer' => $tmp[$i]->answer,
-					'preview1' => $tmp[$i]->smallpreviewpic1,
-					'detailpage' => $tmp[$i]->detailpage
-				);
-			}
-			$kbe['totalitems'] = $data->meta->totalitems;
-		}
-		return $kbe;
-	}
-
-
 
 }